From 130397e2bb24b9a818d44b1205ddcc722f4581fc Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Wed, 3 Mar 2021 13:54:53 +0000 Subject: [PATCH] fix naming --- src/Controller/AppController.php | 22 +++++++++++----------- src/Template/Element/navi_notify.ctp | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php index 41ce0ff6a..82880ff1e 100644 --- a/src/Controller/AppController.php +++ b/src/Controller/AppController.php @@ -161,11 +161,11 @@ class AppController extends Controller if ($session_id != 0) { $userStored = $session->read('StateUser'); - - $transactionPendings = $session->read('Transaction.pending'); - $transactionExecutings = $session->read('Transaction.executing'); - $transaction_can_signed = $session->read('Transaction.can_signed'); - + + $transactionPendings = $session->read('Transactions.pending'); + $transactionExecutings = $session->read('Transactions.executing'); + $transaction_can_signed = $session->read('Transactions.can_signed'); + if ($session->read('session_id') != $session_id || ( $userStored && (!isset($userStored['id']) || !$userStored['email_checked'])) || intval($transactionPendings) > 0 || @@ -192,13 +192,13 @@ class AppController extends Controller $session->write('StateUser.' . $key, $value); } //var_dump($json); - $transactionPendings = $json['Transaction.pending']; - $transactionExecuting = $json['Transaction.executing']; - $transaction_can_signed = $json['Transaction.can_signed']; + $transactionPendings = $json['Transactions.pending']; + $transactionExecuting = $json['Transactions.executing']; + $transaction_can_signed = $json['Transactions.can_signed']; //echo "read transaction pending: $transactionPendings
"; - $session->write('Transaction.pending', $transactionPendings); - $session->write('Transaction.executing', $transactionExecuting); - $session->write('Transaction.can_signed', $transaction_can_signed); + $session->write('Transactions.pending', $transactionPendings); + $session->write('Transactions.executing', $transactionExecuting); + $session->write('Transactions.can_signed', $transaction_can_signed); $session->write('session_id', $session_id); $stateUserTable = TableRegistry::getTableLocator()->get('StateUsers'); diff --git a/src/Template/Element/navi_notify.ctp b/src/Template/Element/navi_notify.ctp index 61e6cdd5b..12ae74465 100644 --- a/src/Template/Element/navi_notify.ctp +++ b/src/Template/Element/navi_notify.ctp @@ -11,7 +11,7 @@ use Cake\Routing\Router; $session = $this->getRequest()->getSession(); $errorCount = intval($session->read('StateUser.errorCount')); $transactionPendings = $session->read('Transactions.pending'); -$transactionPendings += $session->read('Transaction.can_signed'); +$transactionPendings += $session->read('Transactions.can_signed'); /* class NavHeaderEntry