From 4e0d44a43eb508bdd5bb1e37712a8d1953f57d01 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Wed, 10 Jun 2020 08:16:01 +0000 Subject: [PATCH] fix some possible errors --- src/Controller/AppController.php | 3 ++- src/Controller/StateBalancesController.php | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php index c0fb8796c..073b2af01 100644 --- a/src/Controller/AppController.php +++ b/src/Controller/AppController.php @@ -258,7 +258,7 @@ class AppController extends Controller public function addAdminError($controller, $action, array $returnTable, $state_user_id) { if(!is_array($returnTable)) { - $this->addAdminError('AppController', 'addAdminError', ['state' => 'error', 'msg' => 'returnTable isn\'t array', 'details' => gettype($returnTable)]); + $this->addAdminError('AppController', 'addAdminError', ['state' => 'error', 'msg' => 'returnTable isn\'t array', 'details' => gettype($returnTable)], $state_user_id); return false; } $adminErrorTable = TableRegistry::getTableLocator()->get('AdminErrors'); @@ -277,6 +277,7 @@ class AppController extends Controller $this->Flash->error( __('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()), ['escape' => false]); + } return true; } diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php index 10a625b25..32f58d3a8 100644 --- a/src/Controller/StateBalancesController.php +++ b/src/Controller/StateBalancesController.php @@ -57,7 +57,11 @@ class StateBalancesController extends AppController if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { $gdtSum = intval($gdtEntries['data']['sum']); } else { - $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user->id); + if($user) { + $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id']); + } else { + $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, 0); + } } //} // @@ -205,7 +209,7 @@ class StateBalancesController extends AppController $this->set('publishers', $publishers); } } else { - $this->addAdminError('StateBalancesController', 'overviewGdt', $requestResult, $user->id); + $this->addAdminError('StateBalancesController', 'overviewGdt', $requestResult, $user['id']); $this->Flash->error(__('Fehler beim GDT Server, bitte abwarten oder den Admin benachrichtigen!')); }