From 7491442a259b8fc2d5992428f6b35b7f74e9d339 Mon Sep 17 00:00:00 2001 From: "Christoph Burchert (Chb)" Date: Sat, 16 Apr 2011 15:13:43 +0200 Subject: [PATCH] added new setting for domain validation, fixes #718 Signed-off-by: Christoph Burchert (Chb) --- actions/admin/settings/120.system.php | 8 ++++++++ admin_domains.php | 3 ++- install/froxlor.sql | 1 + install/updates/froxlor/0.9/update_0.9.inc.php | 11 +++++++++++ lng/english.lng.php | 1 + lng/german.lng.php | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/actions/admin/settings/120.system.php b/actions/admin/settings/120.system.php index 3d1ee0ea..75e86985 100644 --- a/actions/admin/settings/120.system.php +++ b/actions/admin/settings/120.system.php @@ -68,6 +68,14 @@ return array( 'default' => false, 'save_method' => 'storeSettingField', ), + 'system_validatedomain' => array( + 'label' => $lng['serversettings']['validate_domain'], + 'settinggroup' => 'system', + 'varname' => 'validate_domain', + 'type' => 'bool', + 'default' => true, + 'save_method' => 'storeSettingField', + ), 'system_stdsubdomain' => array( 'label' => $lng['serversettings']['stdsubdomainhost'], 'settinggroup' => 'system', diff --git a/admin_domains.php b/admin_domains.php index 9473de45..61081c32 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -486,7 +486,8 @@ if($page == 'domains' { standard_error(array('stringisempty', 'mydomain')); } - elseif(!validateDomain($domain)) + /* Check whether domain validation is enabled and if, validate the domain */ + elseif($settings['system']['validate_domain'] && !validateDomain($domain)) { standard_error(array('stringiswrong', 'mydomain')); } diff --git a/install/froxlor.sql b/install/froxlor.sql index fe056153..8a13d4f0 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -617,6 +617,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_webmax', '90'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_trafficmax', '90'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'default_theme', 'Froxlor'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'validate_domain', '1'); # -------------------------------------------------------- diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 6d624255..95c85fab 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1490,3 +1490,14 @@ if(isFroxlorVersion('0.9.18.1')) updateToVersion('0.9.19'); } + +if(isFroxlorVersion('0.9.19')) +{ + showUpdateStep("Updating from 0.9.19 to 0.9.20"); + lastStepStatus(0); + + showUpdateStep("Adding new setting for domain validation"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'validate_domain', '1')"); + + updateToVersion('0.9.20'); +} diff --git a/lng/english.lng.php b/lng/english.lng.php index 09053ea1..f8205fc2 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1577,3 +1577,4 @@ $lng['emails']['back_to_overview'] = 'Back to overview'; // ADDED IN FROXLOR 0.9.20 $lng['error']['user_banned'] = 'Your account has been banned. Please contact your administrator for further information.'; +$lng['serversettings']['validate_domain'] = 'Validate domain names'; \ No newline at end of file diff --git a/lng/german.lng.php b/lng/german.lng.php index 38ead3fe..4cb8bfb6 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1559,3 +1559,4 @@ $lng['emails']['back_to_overview'] = 'Zurück zur Übersicht'; // ADDED IN FROXLOR 0.9.20 $lng['error']['user_banned'] = 'Ihr Benutzerkonto wurde gesperrt. Bitte kontaktieren Sie Ihren Administrator für weitere Informationen.'; +$lng['serversettings']['validate_domain'] = 'Validiere Domainnamen'; \ No newline at end of file