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

adding impressum, datenschutzerkalerung, update user search and version

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-01-20 10:32:14 +00:00
parent c2fa4b51ed
commit 571fda116b
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Controller/StateUsersController.php
View File

@ -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));

6
src/Template/Layout/frontend_ripple.ctp
View File

@ -42,7 +42,7 @@ $GLOBALS["self"] = $this;
<body class="header-fixed">
<div class="versionstring dev-info">
<p class="grd_small"><?= __("Community Server in Entwicklung") ?></p>
<p class="grd_small">Alpha 0.11.0</p>
<p class="grd_small">Alpha 0.20.KW03.01</p>
</div>
<nav class="t-header">
<div class="t-header-brand-wrapper">
@ -118,8 +118,8 @@ $GLOBALS["self"] = $this;
<div class="row">
<div class="col-sm-6 text-center text-sm-right order-sm-1">
<ul class="text-gray">
<li><a href="#">Terms of use</a></li>
<li><a href="#">Privacy Policy</a></li>
<li><a href="https://gradido.net/de/datenschutz/" target="_blank"><?= __("Datenschutzerklärung") ?></a></li>
<li><a href="https://gradido.net/de/impressum/" target="_blank"><?= __("Impressum") ?></a></li>
</ul>
</div>
<div class="col-sm-6 text-center text-sm-left mt-3 mt-sm-0">