Skip to content

Commit 2155708

Browse files
author
Webslice
committed
#5387 add regex check to apache init script form input
1 parent b2d8559 commit 2155708

26 files changed

+29
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,10 @@
852852
'datatype' => 'VARCHAR',
853853
'formtype' => 'TEXT',
854854
'default' => '',
855+
'validators' => array( 0 => array('type' => 'REGEX',
856+
'regex' => '/^(|[a-zA-Z0-9\.\-\_]{1,128})$/',
857+
'errmsg' => 'apache_init_script_error_regex'),
858+
),
855859
'value' => '',
856860
'width' => '40',
857861
'maxlength' => '255'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
1111
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
1212
$wb['apache_init_script_txt'] = 'Apache init script';
1313
$wb['apache_init_script_note_txt'] = 'Leaving this empty will auto-detect the Apache init script';
14+
$wb['apache_init_script_error_regex'] = 'Invalid apache init script.';
1415
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
1516
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
1617
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
99
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
1010
$wb['apache_init_script_txt'] = 'Apache init скрипт';
1111
$wb['apache_init_script_note_txt'] = 'Оставянето на това празно ще открие автоматично скрипта за Apache init';
12+
$wb['apache_init_script_error_regex'] = 'Невалиден Apache скрипт за задействане.';
1213
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
1314
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
1415
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $wb['vhost_conf_dir_txt'] = 'Diretório de configuração vhost';
2121
$wb['vhost_conf_enabled_dir_txt'] = 'Diretório de configuração vhost habilitado';
2222
$wb['apache_init_script_txt'] = 'Script de inicialização do Apache';
2323
$wb['apache_init_script_note_txt'] = 'Deixando esta vontade vazio detectar automaticamente o script de inicialização do Apache';
24+
$wb["apache_init_script_error_regex"] = 'Script de inicialização do Apache inválido.';
2425
$wb['getmail_config_dir_txt'] = 'Diretório de configuração do getmail';
2526
$wb['fastcgi_starter_path_txt'] = 'Caminho de inicialização do FastCGI';
2627
$wb['fastcgi_starter_script_txt'] = 'Script de inicialização do FastCGI';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
2121
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
2222
$wb['apache_init_script_txt'] = 'Apache init script';
2323
$wb['apache_init_script_note_txt'] = 'Leaving this empty will auto-detect the Apache init script';
24+
$wb['apache_init_script_error_regex'] = 'Invalid Apache init script.';
2425
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
2526
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
2627
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['vhost_conf_dir_txt'] = 'Vhost config adresář';
1111
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled adresář';
1212
$wb['apache_init_script_txt'] = 'Inicializační skript Apache';
1313
$wb['apache_init_script_note_txt'] = 'Ponecháte-li toto prázdné, automaticky detekuje iniciační skript Apache';
14+
$wb['apache_init_script_error_regex'] = 'Neplatný iniciační skript Apache.';
1415
$wb['getmail_config_dir_txt'] = 'Getmail složka pro konfigurace';
1516
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter cesta';
1617
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter skript';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $wb['vhost_conf_dir_txt'] = 'vHost Konfigurationsverzeichnis';
1010
$wb['vhost_conf_enabled_dir_txt'] = 'vHost config enabled dir';
1111
$wb['apache_init_script_txt'] = 'Apache-Init-Skript';
1212
$wb['apache_init_script_note_txt'] = 'Wenn Sie dieses Feld leer lassen, wird das Apache-Init-Skript automatisch erkannt';
13+
$wb['apache_init_script_error_regex'] = 'Ungültiges Apache-Init-Skript.';
1314
$wb['getmail_config_dir_txt'] = 'Getmail Konfigurationsverzeichnis';
1415
$wb['fastcgi_starter_path_txt'] = 'FastCGI Starter Pfad';
1516
$wb['fastcgi_starter_script_txt'] = 'FastCGI Starter Script';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
2121
$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
2222
$wb['apache_init_script_txt'] = 'Apache init script';
2323
$wb['apache_init_script_note_txt'] = 'Forlader denne tomme vilje automatisk registrering Apache init-script';
24+
$wb['apache_init_script_error_regex'] = 'Ugyldigt Apache init-script.';
2425
$wb['getmail_config_dir_txt'] = 'Getmail config dir';
2526
$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
2627
$wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['vhost_conf_dir_txt'] = 'Φάκελος ρυθμίσεων Vhost';
1111
$wb['vhost_conf_enabled_dir_txt'] = 'Φάκελος ρυθμίσεων (ενεργών) Vhost';
1212
$wb['apache_init_script_txt'] = 'Apache script init';
1313
$wb['apache_init_script_note_txt'] = 'Εάν αφήσετε αυτό το κενό, θα ανιχνευθεί αυτόματα το σενάριο εισαγωγής Apache';
14+
$wb['apache_init_script_error_regex'] = 'Μη έγκυρη δέσμη ενεργειών Apache.';
1415
$wb['getmail_config_dir_txt'] = 'Φάκελος ρυθμίσεων Getmail';
1516
$wb['fastcgi_starter_path_txt'] = 'Διαδρομή εκκίνησης FastCGI';
1617
$wb['fastcgi_starter_script_txt'] = 'Script εκκίνησης FastCGI';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $wb["vhost_conf_dir_txt"] = 'Vhost config dir';
2121
$wb["vhost_conf_enabled_dir_txt"] = 'Vhost config enabled dir';
2222
$wb["apache_init_script_txt"] = 'Apache init script';
2323
$wb["apache_init_script_note_txt"] = 'Leaving this empty will auto-detect the Apache init script';
24+
$wb["apache_init_script_error_regex"] = 'Invalid Apache init script.';
2425
$wb["getmail_config_dir_txt"] = 'Getmail config dir';
2526
$wb["fastcgi_starter_path_txt"] = 'FastCGI starter path';
2627
$wb["fastcgi_starter_script_txt"] = 'FastCGI starter script';

0 commit comments

Comments
 (0)