From 571fda116bd6a26d9239543c80e832c64bd40859 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Mon, 20 Jan 2020 10:32:14 +0000 Subject: [PATCH] adding impressum, datenschutzerkalerung, update user search and version --- src/Controller/StateUsersController.php | 15 +++++++-------- src/Template/Layout/frontend_ripple.ctp | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Controller/StateUsersController.php b/src/Controller/StateUsersController.php index 871e666f1..4e183575a 100644 --- a/src/Controller/StateUsersController.php +++ b/src/Controller/StateUsersController.php @@ -125,14 +125,13 @@ class StateUsersController extends AppController $communityUsers = $this->StateUsers ->find('all') ->contain(['StateBalances' => ['fields' => ['amount', 'state_user_id']]]); - if($searchType != 'email') { - $communityUsers->where(['OR' => [ - 'first_name LIKE' => $globalSearch, - 'last_name LIKE' => $globalSearch - ]]); - } else { - $communityUsers->where(['email LIKE' => $globalSearch]); - } + + $communityUsers->where(['OR' => [ + 'first_name LIKE' => $globalSearch, + 'last_name LIKE' => $globalSearch, + 'email LIKE' => $globalSearch + ]]); + //var_dump($communityUsers->toArray()); foreach($communityUsers as $u) { $pubkey_hex = bin2hex(stream_get_contents($u->public_key)); diff --git a/src/Template/Layout/frontend_ripple.ctp b/src/Template/Layout/frontend_ripple.ctp index 7a2b1724f..c3219b660 100644 --- a/src/Template/Layout/frontend_ripple.ctp +++ b/src/Template/Layout/frontend_ripple.ctp @@ -42,7 +42,7 @@ $GLOBALS["self"] = $this;

-

Alpha 0.11.0

+

Alpha 0.20.KW03.01