From c99b5fc881cd00552bb02446d4963143c221c1f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan@opensupports.com>
Date: Thu, 5 Jan 2017 16:26:43 -0300
Subject: [PATCH] Ivan Diaz - update backend logs [skip ci]

---
 server/controllers/system/get-logs.php          |  2 +-
 server/controllers/ticket/change-department.php |  2 +-
 server/controllers/ticket/change-priority.php   |  2 +-
 server/controllers/ticket/close.php             |  2 +-
 server/controllers/ticket/comment.php           |  2 +-
 server/controllers/ticket/create.php            |  2 +-
 server/controllers/ticket/re-open.php           |  2 +-
 server/controllers/user/un-ban.php              |  1 -
 server/models/Log.php                           | 11 +++++++++--
 9 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/server/controllers/system/get-logs.php b/server/controllers/system/get-logs.php
index 52f0224b..90ffd6b9 100644
--- a/server/controllers/system/get-logs.php
+++ b/server/controllers/system/get-logs.php
@@ -17,7 +17,7 @@ class GetLogsController extends Controller {
     }
 
     public function handler() {
-        $page =Controller::request('page');
+        $page = Controller::request('page');
         $logList = Log::find('LIMIT ? OFFSET ?', [10, 10*($page-1)+1]);
 
         Response::respondSuccess($logList->toArray());
diff --git a/server/controllers/ticket/change-department.php b/server/controllers/ticket/change-department.php
index 2cfe0f25..398fde51 100644
--- a/server/controllers/ticket/change-department.php
+++ b/server/controllers/ticket/change-department.php
@@ -44,7 +44,7 @@ class ChangeDepartmentController extends Controller {
         $ticket->unread = true;
         $ticket->store();
 
-        Log::createLog('CHANGE_DEPARTMENT', $department);
+        Log::createLog('CHANGE_DEPARTMENT', $ticket->ticketNumber);
 
         Response::respondSuccess();
     }
diff --git a/server/controllers/ticket/change-priority.php b/server/controllers/ticket/change-priority.php
index 989fa5ec..1fbfcdb1 100644
--- a/server/controllers/ticket/change-priority.php
+++ b/server/controllers/ticket/change-priority.php
@@ -38,7 +38,7 @@ class ChangePriorityController extends Controller {
             $ticket->addEvent($event);
             $ticket->store();
 
-            Log::createLog('CHANGE_PRIORITY', $priority);
+            Log::createLog('CHANGE_PRIORITY', $ticket->ticketNumber);
             Response::respondSuccess();
         } else {
             Response::respondError(ERRORS::NO_PERMISSION);
diff --git a/server/controllers/ticket/close.php b/server/controllers/ticket/close.php
index 3080c7b2..f7829c1e 100644
--- a/server/controllers/ticket/close.php
+++ b/server/controllers/ticket/close.php
@@ -33,7 +33,7 @@ class CloseController extends Controller {
 
         $this->ticket->store();
         
-        Log::createLog('CLOSE_TICKET', $this->ticket);
+        Log::createLog('CLOSE_TICKET', $this->ticket->ticketNumber);
         
         Response::respondSuccess();
     }
diff --git a/server/controllers/ticket/comment.php b/server/controllers/ticket/comment.php
index b998ee5e..dd0792f5 100644
--- a/server/controllers/ticket/comment.php
+++ b/server/controllers/ticket/comment.php
@@ -31,7 +31,7 @@ class CommentController extends Controller {
         if ($session->isLoggedWithId($this->ticket->author->id) || Controller::isStaffLogged()) {
             $this->storeComment();
             
-            Log::createLog('COMMENT_TICKET', $this->ticket);
+            Log::createLog('COMMENT_TICKET', $this->ticket->ticketNumber);
             
             Response::respondSuccess();
         } else {
diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php
index 4818ca11..ac9f4c53 100644
--- a/server/controllers/ticket/create.php
+++ b/server/controllers/ticket/create.php
@@ -43,7 +43,7 @@ class CreateController extends Controller {
 
         $this->storeTicket();
 
-        Log::createLog('CREATE_TICKET', $this->title);
+        Log::createLog('CREATE_TICKET', $this->ticketNumber);
         Response::respondSuccess([
             'ticketNumber' => $this->ticketNumber
         ]);
diff --git a/server/controllers/ticket/re-open.php b/server/controllers/ticket/re-open.php
index b5f97713..cf6bd9a6 100644
--- a/server/controllers/ticket/re-open.php
+++ b/server/controllers/ticket/re-open.php
@@ -32,7 +32,7 @@ class ReOpenController extends Controller {
 
         $this->ticket->store();
 
-        Log::createLog('RE_OPEN_TICKET', $this->ticket);
+        Log::createLog('RE_OPEN_TICKET', $this->ticket->ticketNumber);
 
         Response::respondSuccess();
     }
diff --git a/server/controllers/user/un-ban.php b/server/controllers/user/un-ban.php
index 30a83e02..d1d53d52 100644
--- a/server/controllers/user/un-ban.php
+++ b/server/controllers/user/un-ban.php
@@ -29,7 +29,6 @@ class UnBanUserController extends Controller {
 
             Response::respondSuccess();
         }
-        
     }
         
 }
\ No newline at end of file
diff --git a/server/models/Log.php b/server/models/Log.php
index 30038d3c..ebe24469 100644
--- a/server/models/Log.php
+++ b/server/models/Log.php
@@ -17,7 +17,8 @@ class Log extends DataStore {
         if($author === null) {
             $author = Controller::getLoggedUser();    
         } 
-        $log =  new Log();
+        
+        $log = new Log();
 
         $log->setProperties(array(
             'type' => $type,
@@ -34,10 +35,16 @@ class Log extends DataStore {
     }
 
     public function toArray() {
+        $author = ($this->authorUser instanceof User) ? $this->authorUser : $this->authorStaff;
+        
         return [
             'type' => $this->type,
             'to' => $this->to,
-            'author' => ($this->authorUser instanceof User) ? $this->authorUser->toArray() : $this->authorStaff->toArray()
+            'author' => [
+                'name' => $author->name,
+                'id' => $author->id,
+                'staff' => $author instanceof Staff
+            ]
         ];
     }
 }
\ No newline at end of file