Skip to content

Commit c9a99a9

Browse files
committed
Fixes #6889 and #6890
1 parent 1acc63c commit c9a99a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+126
-43
lines changed

interface/web/admin/directive_snippets_del.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
//* Check permissions for module
4646
$app->auth->check_module_permissions('admin');
47+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
4748

4849
$app->load("tform_actions");
4950

interface/web/admin/directive_snippets_edit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
//* Check permissions for module
4545
$app->auth->check_module_permissions('admin');
46+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
4647

4748
// Loading classes
4849
$app->uses('tpl,tform,tform_actions');

interface/web/admin/directive_snippets_list.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
//* Check permissions for module
4545
$app->auth->check_module_permissions('admin');
46+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
4647

4748
$app->uses('listform_actions');
4849

interface/web/admin/extension_edit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
//* Check permissions for module
3535
$app->auth->check_module_permissions('admin');
36+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
3637

3738
//* load language file
3839
$lng_file = 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_extension_install_list.lng';

interface/web/admin/extension_install_list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
$app->auth->check_module_permissions('admin');
3636

3737
//* This is only allowed for administrators
38-
if(!$app->auth->is_admin()) die('only allowed for administrators.');
38+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
3939

4040
$app->uses('tpl,extension_installer');
4141

interface/web/admin/extension_repo_list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
$app->auth->check_module_permissions('admin');
3636

3737
//* This is only allowed for administrators
38-
if(!$app->auth->is_admin()) die('only allowed for administrators.');
38+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
3939

4040
$app->uses('tpl,extension_installer');
4141

interface/web/admin/firewall_del.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
$app->auth->check_module_permissions('admin');
4747
$app->auth->check_security_permissions('admin_allow_firewall_config');
4848

49+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
50+
4951
$app->uses("tform_actions");
5052
$app->tform_actions->onDelete();
5153

interface/web/admin/firewall_edit.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
$app->auth->check_module_permissions('admin');
4646
$app->auth->check_security_permissions('admin_allow_firewall_config');
4747

48+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
49+
4850
// Loading classes
4951
$app->uses('tpl,tform,tform_actions');
5052
$app->load('tform_actions');

interface/web/admin/firewall_list.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
//* Check permissions for module
4545
$app->auth->check_module_permissions('admin');
46+
if(!$app->auth->is_admin()) die('Allowed for administrators only.');
4647

4748
$app->uses('listform_actions');
4849

interface/web/admin/form/server.tform.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,15 @@
6767
1 => array( 'event' => 'SAVE',
6868
'type' => 'STRIPNL')
6969
),
70+
'validators' => array(
71+
0 => array( 'type' => 'REGEX',
72+
'regex' => '/^[a-zA-Z0-9\s\-\._()]+$/',
73+
'errmsg' => 'server_name_error_regex')
74+
),
7075
'default' => '',
7176
'value' => '',
7277
'width' => '30',
73-
'maxlength' => '255'
78+
'maxlength' => '60'
7479
),
7580
'mail_server' => array (
7681
'datatype' => 'INTEGER',

0 commit comments

Comments
 (0)