From 217fed5c8a5be04c0c75b933417e81e80f228eb9 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Mon, 13 Jan 2020 11:26:00 +0000
Subject: [PATCH] fix session timeout, adding link, sorting lowercase

---
 src/Controller/AppController.php                  | 11 +++++++++--
 src/Controller/TransactionCreationsController.php |  2 +-
 src/Template/Layout/frontend.ctp                  |  7 +++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index b2a1f33cf..66a1b6cd5 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -121,7 +121,11 @@ class AppController extends Controller
             $GLOBALS["passed"] = $passedArguments[0];
         }
         $GLOBALS["subside"] = $subside;
-
+        
+        // server login
+        if($this->Auth->user('id')) {
+          $GLOBALS['ServerUser'] = $this->Auth->user();
+        }
 
     }
     
@@ -157,7 +161,10 @@ class AppController extends Controller
 
                 if($json['state'] === 'success' && intval($json['user']['email_checked']) === 1) {
                   //echo "email checked: " . $json['user']['email_checked'] . "; <br>";
-                  $session->destroy();
+                  if($session->read('session_id') != $session_id || 
+                    ( $userStored && !isset($userStored['id']))) {
+                    $session->destroy();
+                  }
                   foreach($json['user'] as $key => $value) {
                     $session->write('StateUser.' . $key, $value );
                   }
diff --git a/src/Controller/TransactionCreationsController.php b/src/Controller/TransactionCreationsController.php
index 9a301aa24..7a8c6e29e 100644
--- a/src/Controller/TransactionCreationsController.php
+++ b/src/Controller/TransactionCreationsController.php
@@ -238,7 +238,7 @@ class TransactionCreationsController extends AppController
           //}
         }
         usort($possibleReceiver, function($a, $b) {
-          return ($a['name'] <=> $b['name']);
+          return (strtolower ($a['name']) <=> strtolower ($b['name']));
         });
         //var_dump($possibleReceiver);
         $creationForm = new CreationForm();
diff --git a/src/Template/Layout/frontend.ctp b/src/Template/Layout/frontend.ctp
index 039a96bb3..609f059d9 100644
--- a/src/Template/Layout/frontend.ctp
+++ b/src/Template/Layout/frontend.ctp
@@ -1,4 +1,4 @@
-<?php
+ <?php
 use Cake\Routing\Router;
 
 /**
@@ -66,7 +66,10 @@ if(!isset($balance)) {
                     ?>
                 </li>
               <?php endif; ?>
-              <li><?= $this->Html->link(__('Startseite'), ['controller' => 'Dashboard'], ['class' => 'grd-nav-bn'])?>
+              <?php if(isset($GLOBALS['ServerUser'])) : ?> 
+                <li><?= $this->Html->link(__('Server'), ['controller' => 'Dashboard', 'action' => 'serverIndex'], ['class' => 'grd-nav-bn'])?></li>
+              <?php endif; ?>
+                <li><?= $this->Html->link(__('Startseite'), ['controller' => 'Dashboard'], ['class' => 'grd-nav-bn'])?></li>
               <!--<li><?= $this->Html->link(__('Kontostand'), ['controller' => 'StateBalances', 'action' => 'overview'], ['class' => 'grd-nav-bn']) ?>-->
               <?php if(intval($transactionPendings) > 0) : ?>
                 <li>