Skip to content

Commit 6a10868

Browse files
author
thom
committed
Make client protection configurable (#4048)
1 parent a94ccb9 commit 6a10868

28 files changed

+42
-6
lines changed

interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {
5454
$app->uses('getconf');
5555
$global_config = $app->getconf->get_global_config('sites');
5656
if($global_config['client_protection'] == 'y') {
57-
$app->db->query("UPDATE web_domain SET sys_groupid = ?, sys_perm_group = 'ru' WHERE domain_id = ?", $client_group_id, $this->id);
57+
$app->db->query("UPDATE web_domain SET sys_clientid = ?, sys_groupid = ?, sys_perm_group = 'ru' WHERE domain_id = ?", $client_group_id, $this->id);
5858
} else {
59-
$app->db->query("UPDATE web_domain SET sys_groupid = ?, sys_perm_group = 'riud' WHERE domain_id = ?", $client_group_id, $this->id);
59+
$app->db->query("UPDATE web_domain SET sys_clientid = ?, sys_groupid = ?, sys_perm_group = 'riud' WHERE domain_id = ?", $client_group_id, $this->id);
6060
}
6161
}
6262
if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($page_form->dataRecord["client_group_id"])) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@
148148
'width' => '30',
149149
'maxlength' => '255'
150150
),
151+
'client_protection' => array (
152+
'datatype' => 'VARCHAR',
153+
'formtype' => 'CHECKBOX',
154+
'default' => 'y',
155+
'value' => array(0 => 'n', 1 => 'y')
156+
),
151157
'vhost_subdomains' => array (
152158
'datatype' => 'VARCHAR',
153159
'formtype' => 'CHECKBOX',
@@ -795,4 +801,3 @@
795801
)
796802
)
797803
);
798-

interface/web/admin/lib/lang/ar_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ $wb['active_txt'] = 'Aktive';
9595
$wb['btn_save_txt'] = 'Save';
9696
$wb['btn_cancel_txt'] = 'Cancel';
9797
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
98+
$wb['client_protection_txt'] = 'Client protection';
9899
?>

interface/web/admin/lib/lang/bg_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ $wb['active_txt'] = 'Aktive';
9595
$wb['btn_save_txt'] = 'Save';
9696
$wb['btn_cancel_txt'] = 'Cancel';
9797
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
98+
$wb['client_protection_txt'] = 'Client protection';
9899
?>

interface/web/admin/lib/lang/br_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,5 @@ $wb['active_txt'] = 'Ativo';
9494
$wb['btn_save_txt'] = 'Salvar';
9595
$wb['btn_cancel_txt'] = 'Cancelar';
9696
$wb['web_php_options_txt'] = 'Manipulador do php (Somente apache)';
97+
$wb['client_protection_txt'] = 'Client protection';
9798
?>

interface/web/admin/lib/lang/ca_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ $wb['active_txt'] = 'Aktive';
9595
$wb['btn_save_txt'] = 'Save';
9696
$wb['btn_cancel_txt'] = 'Cancel';
9797
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
98+
$wb['client_protection_txt'] = 'Client protection';
9899
?>

interface/web/admin/lib/lang/cz_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ $wb['active_txt'] = 'Aktivní';
9595
$wb['btn_save_txt'] = 'Uložit';
9696
$wb['btn_cancel_txt'] = 'Zrušit';
9797
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
98+
$wb['client_protection_txt'] = 'Client protection';
9899
?>

interface/web/admin/lib/lang/de_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,5 @@ $wb['active_txt'] = 'Aktiv';
9999
$wb['btn_save_txt'] = 'Speichern';
100100
$wb['btn_cancel_txt'] = 'Abbrechen';
101101
$wb['web_php_options_txt'] = 'PHP Handler (Nur Apache)';
102+
$wb['client_protection_txt'] = 'Client protection';
102103
?>

interface/web/admin/lib/lang/dk_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ $wb['active_txt'] = 'Aktive';
9595
$wb['btn_save_txt'] = 'Save';
9696
$wb['btn_cancel_txt'] = 'Cancel';
9797
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
98+
$wb['client_protection_txt'] = 'Client protection';
9899
?>

interface/web/admin/lib/lang/el_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,5 @@ $wb['active_txt'] = 'Aktive';
9595
$wb['btn_save_txt'] = 'Save';
9696
$wb['btn_cancel_txt'] = 'Cancel';
9797
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
98+
$wb['client_protection_txt'] = 'Client protection';
9899
?>

0 commit comments

Comments
 (0)