cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop

pull/196/head
iglocska 2024-11-28 09:25:47 +01:00
parent 0131422ab8 f7f9392cfe
commit 39e9fb4a76
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/UsersController.php
View File

@ -487,7 +487,7 @@ class UsersController extends AppController
{ {
$editingAnotherUser = false; $editingAnotherUser = false;
$currentUser = $this->ACL->getUser(); $currentUser = $this->ACL->getUser();
if ((empty($currentUser['role']['perm_community_admin']) && empty($currentUser['role']['perm_group_admin'])) || $user_id == $currentUser->id) { if ((empty($currentUser['role']['perm_community_admin']) && empty($currentUser['role']['perm_group_admin'])) || empty($user_id) || $user_id == $currentUser->id) {
$user = $currentUser; $user = $currentUser;
} else { } else {
$user = $this->Users->get($user_id, [ $user = $this->Users->get($user_id, [

2
src/Model/Table/SettingProviders/CerebrateSettingsProvider.php
View File

@ -136,12 +136,14 @@ class CerebrateSettingsProvider extends BaseSettingsProvider
'Proxy' => [ 'Proxy' => [
'Proxy.host' => [ 'Proxy.host' => [
'name' => __('Host'), 'name' => __('Host'),
'severity' => 'info',
'type' => 'string', 'type' => 'string',
'description' => __('The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy.'), 'description' => __('The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy.'),
'test' => 'testHostname', 'test' => 'testHostname',
], ],
'Proxy.port' => [ 'Proxy.port' => [
'name' => __('Port'), 'name' => __('Port'),
'severity' => 'info',
'type' => 'integer', 'type' => 'integer',
'description' => __('The TCP port for the HTTP proxy.'), 'description' => __('The TCP port for the HTTP proxy.'),
'test' => 'testForRangeXY', 'test' => 'testForRangeXY',

2
src/Model/Table/UserSettingsTable.php
View File

@ -103,7 +103,7 @@ class UserSettingsTable extends AppTable
'name' => $data['bookmark_name'], 'name' => $data['bookmark_name'],
'url' => $data['bookmark_url'], 'url' => $data['bookmark_url'],
]; ];
$restricted_domains = Configure::read('Security.restrictions.allowed_bookmark_domains'); $restricted_domains = Configure::read('security.restrictions.allowed_bookmark_domains');
if (!empty($restricted_domains)) { if (!empty($restricted_domains)) {
$restricted_domains = explode(',', $restricted_domains); $restricted_domains = explode(',', $restricted_domains);
$parsed = parse_url($bookmarkData['url']); $parsed = parse_url($bookmarkData['url']);