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

Forward User with not activated account back to login

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-05-19 07:17:43 +00:00 committed by Dario via Pythagoras
parent 7a389c6862
commit 4465f3ad6f
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Controller/AppController.php
View File

@ -161,7 +161,6 @@ class AppController extends Controller
$response = $http->get($url . '/login', ['session_id' => $session_id]); $response = $http->get($url . '/login', ['session_id' => $session_id]);
$json = $response->getJson(); $json = $response->getJson();
if(isset($json) && count($json) > 0) { if(isset($json) && count($json) > 0) {
if($json['state'] === 'success' && intval($json['user']['email_checked']) === 1) { if($json['state'] === 'success' && intval($json['user']['email_checked']) === 1) {
@ -227,8 +226,10 @@ class AppController extends Controller
} else { } else {
if($json['state'] === 'not found' ) { if($json['state'] === 'not found' ) {
$this->Flash->error(__('invalid session')); $this->Flash->error(__('invalid session'));
return $this->redirect(Router::url('/', true) . 'account/', 303); } else {
$this->Flash->error(__('Konto ist nicht aktiviert!'));
} }
return $this->redirect(Router::url('/', true) . 'account/', 303);
} }
} }
} catch(\Exception $e) { } catch(\Exception $e) {
@ -276,12 +277,14 @@ class AppController extends Controller
$adminErrorEntity->details = $returnTable['details']; $adminErrorEntity->details = $returnTable['details'];
} }
if(!$adminErrorTable->save($adminErrorEntity)) { 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; return true;
} }
public function getAdminEmailLink($text) { public function getAdminEmailLink($text = '') {
$serverAdminEmail = Configure::read('ServerAdminEmail'); $serverAdminEmail = Configure::read('ServerAdminEmail');
return '<a href="mailto:' . $serverAdminEmail . '">'. $serverAdminEmail . '</a>'; return '<a href="mailto:' . $serverAdminEmail . '">'. $serverAdminEmail . '</a>';
} }

1
src/Controller/DashboardController.php
View File

@ -44,7 +44,6 @@ class DashboardController extends AppController
return $result; return $result;
} }
$user = $session->read('StateUser'); $user = $session->read('StateUser');
$serverUser = $this->Auth->user('id'); $serverUser = $this->Auth->user('id');
if($serverUser) { if($serverUser) {
$adminErrorsTable = TableRegistry::getTableLocator()->get('AdminErrors'); $adminErrorsTable = TableRegistry::getTableLocator()->get('AdminErrors');

1
src/Controller/StateBalancesController.php
View File

@ -59,6 +59,7 @@ class StateBalancesController extends AppController
// listPerEmailApi // listPerEmailApi
//var_dump($user); //var_dump($user);
$gdtSum = 0; $gdtSum = 0;
//if('admin' === $user['role']) { //if('admin' === $user['role']) {
$gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi'); $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi');