From b2e812d1fbebdec1527a220d7aefa2f7bd797214 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Thu, 19 Dec 2019 12:21:13 +0000
Subject: [PATCH] sort konto overview, update menu title, tooltip for memo
 every time not only by long memos

---
 .../Component/JsonRequestClientComponent.php  |  9 ++-
 .../TransactionCreationsController.php        | 60 +++++++------------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/src/Controller/Component/JsonRequestClientComponent.php b/src/Controller/Component/JsonRequestClientComponent.php
index 169f7a56b..bf112bd4e 100644
--- a/src/Controller/Component/JsonRequestClientComponent.php
+++ b/src/Controller/Component/JsonRequestClientComponent.php
@@ -20,9 +20,16 @@ class JsonRequestClientComponent extends Component
     if(!is_numeric($user_balance) || intval($user_balance) < 0) {
       return ['state' => 'error', 'type' => 'parameter error', 'msg' => 'user_balance invalid'];
     }
-    if(!$this->is_base64($base64Message)) {
+    if(is_array($base64Message)) {
+      foreach($base64Message as $singleMessage) {
+        if(!$this->is_base64($singleMessage)) {
+          return ['state' => 'error', 'type' => 'parameter error', 'msg' => 'at least one base64Message contain invalid base64 characters'];
+        }
+      }
+    } else if(!$this->is_base64($base64Message)) {
       return ['state' => 'error', 'type' => 'parameter error', 'msg' => 'base64Message contain invalid base64 characters'];
     }
+    
     $http = new Client();
     
     $transactionbody = json_encode([
diff --git a/src/Controller/TransactionCreationsController.php b/src/Controller/TransactionCreationsController.php
index ced9727fb..651cda40a 100644
--- a/src/Controller/TransactionCreationsController.php
+++ b/src/Controller/TransactionCreationsController.php
@@ -282,40 +282,32 @@ class TransactionCreationsController extends AppController
             }
             $creationTransactionCount = count($transactions);
             if($creationTransactionCount > 0) {
-              $http = new Client();
-              try {
-                $loginServer = Configure::read('LoginServer');
-                $url = $loginServer['host'] . ':' . $loginServer['port'];
-                $session_id = $session->read('session_id');
-                /*
-                 *  $response = $http->post($url . '/checkTransaction', json_encode([
-                    'session_id' => $session_id,
-                    'transaction_base64' => base64_encode($builderResult['transactionBody']->serializeToString()),
-                    'balance' => $user['balance']
-                ]), ['type' => 'json']);
-                 */
-                $transactionbody = json_encode([
-                    'session_id' => $session_id,
-                    'transaction_base64' => $transactions,
-                    'balance' => $user['balance']
-                ]);
-                //die($transactionbody);
-                $response = $http->post($url . '/checkTransaction', $transactionbody, ['type' => 'json']);
-                //var_dump($response->getStringBody());
-                try {
-                  //$stringBody = $response->getStringBody();
-                  //var_dump($stringBody);
-                  $json = $response->getJson();
-                } catch(Exception $ex) {
-                    $this->Flash->error(__('result isn\'t json ') . $ex->getMessage());
+              $user_balance = 0;
+              if(isset($user['balance'])) {
+                $user_balance = $user['balance'];
+              }
+              // $session_id, $base64Message, $user_balance = 0
+              $requestResult = $this->JsonRequestClient->sendTransaction(
+                      $session->read('session_id'),
+                      $transactions,
+                      $user_balance
+              );
+              if($requestResult['state'] != 'success') {
+                $this->addAdminError('TransactionCreations', 'createMulti', $requestResult, $user['id']);
+                if($requestResult['type'] == 'request error') {
+                  $this->Flash->error(__('Error by requesting LoginServer, please try again'));
+                } else {
+                  $this->Flash->error(__('Error, please wait for the admin to fix it'));
                 }
+              } else {
+                $json = $requestResult['data'];
                 if($json['state'] != 'success') {
                   if($json['msg'] == 'session not found') {
                     $session->destroy();
                     return $this->redirect(Router::url('/', true) . 'account', 303);
-                    //$this->Flash->error(__('session not found, please login again'));
                   } else {
-                    $this->Flash->error(__('login server return error: ' . json_encode($json)));
+                    $this->addAdminError('TransactionCreations', 'createMulti', $json, $user['id']);
+                    $this->Flash->error(__('Login Server Error, please wait for the admin to fix it'));
                   }
                 } else {
                   $pendingTransactionCount = $session->read('Transactions.pending');
@@ -325,25 +317,17 @@ class TransactionCreationsController extends AppController
                     $pendingTransactionCount += $creationTransactionCount;
                   }
                   $session->write('Transactions.pending', $pendingTransactionCount);
-                  echo "pending: " . $pendingTransactionCount;
+                  //echo "pending: " . $pendingTransactionCount;
                   if($mode === 'next') {
                     return $this->redirect(Router::url('/', true) . 'account/checkTransactions', 303);
                   } else {
                     $this->Flash->success(__('Transaction submitted for review.'));
                   }
                 }
-                
-              } catch(\Exception $e) {
-                  $msg = $e->getMessage();
-                  $this->Flash->error(__('error http request: ') . $msg);
               }
-            }
-            
+            }           
           }
-          
         }
-        
-        
     }
 
     /**