IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix session timeout, adding link, sorting lowercase

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-01-13 11:26:00 +00:00
parent 864ba53e4a
commit 217fed5c8a
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Controller/AppController.php
View File

@ -122,6 +122,10 @@ class AppController extends Controller
} }
$GLOBALS["subside"] = $subside; $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) { if($json['state'] === 'success' && intval($json['user']['email_checked']) === 1) {
//echo "email checked: " . $json['user']['email_checked'] . "; <br>"; //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) { foreach($json['user'] as $key => $value) {
$session->write('StateUser.' . $key, $value ); $session->write('StateUser.' . $key, $value );
} }

2
src/Controller/TransactionCreationsController.php
View File

@ -238,7 +238,7 @@ class TransactionCreationsController extends AppController
//} //}
} }
usort($possibleReceiver, function($a, $b) { usort($possibleReceiver, function($a, $b) {
return ($a['name'] <=> $b['name']); return (strtolower ($a['name']) <=> strtolower ($b['name']));
}); });
//var_dump($possibleReceiver); //var_dump($possibleReceiver);
$creationForm = new CreationForm(); $creationForm = new CreationForm();

7
src/Template/Layout/frontend.ctp
View File

@ -1,4 +1,4 @@
<?php <?php
use Cake\Routing\Router; use Cake\Routing\Router;
/** /**
@ -66,7 +66,10 @@ if(!isset($balance)) {
?> ?>
</li> </li>
<?php endif; ?> <?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']) ?>--> <!--<li><?= $this->Html->link(__('Kontostand'), ['controller' => 'StateBalances', 'action' => 'overview'], ['class' => 'grd-nav-bn']) ?>-->
<?php if(intval($transactionPendings) > 0) : ?> <?php if(intval($transactionPendings) > 0) : ?>
<li> <li>