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

remove debugging die, ensure reload login in every request as long as email_checked is false

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-07-10 08:44:46 +00:00
parent 5285015b02
commit 235fd6285f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Controller/AppController.php
View File

@ -158,12 +158,14 @@ class AppController extends Controller
if($session_id != 0) { if($session_id != 0) {
$userStored = $session->read('StateUser'); $userStored = $session->read('StateUser');
$transactionPendings = $session->read('Transactions.pending'); $transactionPendings = $session->read('Transactions.pending');
$transactionExecutings = $session->read('Transaction.executing'); $transactionExecutings = $session->read('Transaction.executing');
if($session->read('session_id') != $session_id || if($session->read('session_id') != $session_id ||
( $userStored && !isset($userStored['id'])) || ( $userStored && (!isset($userStored['id']) || !$userStored['email_checked'])) ||
intval($transactionPendings) > 0 || intval($transactionPendings) > 0 ||
intval($transactionExecutings) > 0 ) { intval($transactionExecutings) > 0 ) {
$http = new Client(); $http = new Client();
try { try {
@ -240,7 +242,7 @@ class AppController extends Controller
} else { } else {
$this->Flash->error(__('Konto ist nicht aktiviert!')); $this->Flash->error(__('Konto ist nicht aktiviert!'));
} }
die(json_encode($json)); //die(json_encode($json));
return $this->redirect($this->loginServerUrl . 'account/', 303); return $this->redirect($this->loginServerUrl . 'account/', 303);
} }
} }