From 81b63b311918840eb9fa60290ec08aa432bc1f66 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Tue, 19 May 2020 07:17:43 +0000
Subject: [PATCH] Forward User with not activated account back to login

---
 src/Controller/AppController.php           | 13 ++++++++-----
 src/Controller/DashboardController.php     |  1 +
 src/Controller/StateBalancesController.php |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index 94bd06099..c0fb8796c 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -160,7 +160,6 @@ class AppController extends Controller
               
               $response = $http->get($url . '/login', ['session_id' => $session_id]);
               $json = $response->getJson();
-
               if(isset($json) && count($json) > 0) {
 
                 if($json['state'] === 'success' && intval($json['user']['email_checked']) === 1) {
@@ -225,9 +224,11 @@ class AppController extends Controller
                   }
                 } else {
                   if($json['state'] === 'not found' ) {
-                    $this->Flash->error(__('invalid session'));
-                    return $this->redirect(Router::url('/', true) . 'account/', 303);
+                    $this->Flash->error(__('invalid session'));                    
+                  } else {
+                    $this->Flash->error(__('Konto ist nicht aktiviert!'));
                   }
+                  return $this->redirect(Router::url('/', true) . 'account/', 303);
                 }
               }
             } catch(\Exception $e) {
@@ -273,12 +274,14 @@ class AppController extends Controller
         $adminErrorEntity->details = $returnTable['details'];
       }
       if(!$adminErrorTable->save($adminErrorEntity)) {
-        $this->Flash->error(__('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()));
+        $this->Flash->error(
+                __('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()),
+                ['escape' => false]);
       }
       return true;
     }
     
-    public function getAdminEmailLink($text) {
+    public function getAdminEmailLink($text = '') {
       $serverAdminEmail = Configure::read('ServerAdminEmail');    
       return '<a href="mailto:' . $serverAdminEmail . '">'. $serverAdminEmail . '</a>';
     }
diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
index cf242b5a0..a52e67a3c 100644
--- a/src/Controller/DashboardController.php
+++ b/src/Controller/DashboardController.php
@@ -40,6 +40,7 @@ class DashboardController extends AppController
         }
         $user = $session->read('StateUser');
         
+        //var_dump($user);
         $serverUser = $this->Auth->user('id');
         if($serverUser) {
           $adminErrorsTable = TableRegistry::getTableLocator()->get('AdminErrors');
diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php
index 10a625b25..cebfa1e7f 100644
--- a/src/Controller/StateBalancesController.php
+++ b/src/Controller/StateBalancesController.php
@@ -49,7 +49,7 @@ class StateBalancesController extends AppController
         // sendRequestGDT
         // listPerEmailApi
         
-        //var_dump($user);
+        var_dump($user);
         $gdtSum = 0;
         //if('admin' === $user['role']) {
           $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi');