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

update search to react on users with public key but not activated account

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-07-08 15:48:41 +00:00
parent 3cc107aeb8
commit ec8f10059a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Controller/AppController.php
View File

@ -240,7 +240,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);
} }
} }
@ -253,6 +253,7 @@ class AppController extends Controller
} }
} else { } else {
// no login // no login
die("no login");
if(isset($loginServer['path'])) { if(isset($loginServer['path'])) {
return $this->redirect($loginServer['path'], 303); return $this->redirect($loginServer['path'], 303);
} else { } else {

20
src/Controller/StateUsersController.php
View File

@ -116,7 +116,7 @@ class StateUsersController extends AppController
if($dataJson['state'] != 'success') { if($dataJson['state'] != 'success') {
if($dataJson['msg'] == 'session not found') { if($dataJson['msg'] == 'session not found') {
$session->destroy(); $session->destroy();
return $this->redirect($this->loginServerUrl . 'account', 303); return $this->redirect(Router::url('/', true) . 'account', 303);
} }
} }
//var_dump($dataJson); //var_dump($dataJson);
@ -155,7 +155,7 @@ class StateUsersController extends AppController
if(!isset($pubkeySorted[$pubkey_hex])) { if(!isset($pubkeySorted[$pubkey_hex])) {
$pubkeySorted[$pubkey_hex] = ['login' => [], 'community' => []]; $pubkeySorted[$pubkey_hex] = ['login' => [], 'community' => []];
} }
array_push($pubkeySorted[$u['public_hex']]['community'], $u); array_push($pubkeySorted[$pubkey_hex]['community'], $u);
} }
$finalUserEntrys = []; $finalUserEntrys = [];
// detect states // detect states
@ -188,23 +188,25 @@ class StateUsersController extends AppController
if($user['login'][0]['email_checked'] == true) { if($user['login'][0]['email_checked'] == true) {
$state = 'email activated'; $state = 'email activated';
$color = 'primary'; $color = 'primary';
$l_user = $user['login'][0];
$finalUser['name'] = $l_user['first_name'] . ' ' . $l_user['last_name'];
$finalUser['first_name'] = $l_user['first_name'];
$finalUser['last_name'] = $l_user['last_name'];
$finalUser['email'] = $l_user['email'];
$finalUser['created'] = new FrozenTime($l_user['created']);
if(count($user['community']) == 1) { if(count($user['community']) == 1) {
$state = 'account copied to community'; $state = 'account copied to community';
$color = 'success'; $color = 'success';
//var_dump($user['community'][0]->state_balances[0]['amount']); //var_dump($user['community'][0]->state_balances[0]['amount']);
} }
} else { } else {
$state = 'email not activated'; $state = 'email not activated';
$color = 'warning'; $color = 'warning';
} }
$l_user = $user['login'][0];
$finalUser['name'] = $l_user['first_name'] . ' ' . $l_user['last_name'];
$finalUser['first_name'] = $l_user['first_name'];
$finalUser['last_name'] = $l_user['last_name'];
$finalUser['email'] = $l_user['email'];
$finalUser['created'] = new FrozenTime($l_user['created']);
} else { } else {
$state = 'account multiple times on login-server'; $state = 'account multiple times on login-server';
$color = 'danger'; $color = 'danger';