maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

added new setting for domain validation, fixes #718

Browse Source 
Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>
This commit is contained in:
Christoph Burchert (Chb)
2011-04-16 15:13:43 +02:00
parent 5c980946a9
commit 7491442a25
6 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
actions/admin/settings/120.system.php
View File

@@ -68,6 +68,14 @@ return array(
'default' => false, 'default' => false,
'save_method' => 'storeSettingField', '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( 'system_stdsubdomain' => array(
'label' => $lng['serversettings']['stdsubdomainhost'], 'label' => $lng['serversettings']['stdsubdomainhost'],
'settinggroup' => 'system', 'settinggroup' => 'system',

3
admin_domains.php
View File

@@ -486,7 +486,8 @@ if($page == 'domains'
{ {
standard_error(array('stringisempty', 'mydomain')); 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')); standard_error(array('stringiswrong', 'mydomain'));
} }

1
install/froxlor.sql
View File

@@ -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_webmax', '90');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_trafficmax', '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 ('panel', 'default_theme', 'Froxlor');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'validate_domain', '1');
# -------------------------------------------------------- # --------------------------------------------------------

11
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -1490,3 +1490,14 @@ if(isFroxlorVersion('0.9.18.1'))
updateToVersion('0.9.19'); 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');
}

1
lng/english.lng.php
View File

@@ -1577,3 +1577,4 @@ $lng['emails']['back_to_overview'] = 'Back to overview';
// ADDED IN FROXLOR 0.9.20 // ADDED IN FROXLOR 0.9.20
$lng['error']['user_banned'] = 'Your account has been banned. Please contact your administrator for further information.'; $lng['error']['user_banned'] = 'Your account has been banned. Please contact your administrator for further information.';
$lng['serversettings']['validate_domain'] = 'Validate domain names';

1
lng/german.lng.php
View File

@@ -1559,3 +1559,4 @@ $lng['emails']['back_to_overview'] = 'Zur&uuml;ck zur &Uuml;bersicht';
// ADDED IN FROXLOR 0.9.20 // ADDED IN FROXLOR 0.9.20
$lng['error']['user_banned'] = 'Ihr Benutzerkonto wurde gesperrt. Bitte kontaktieren Sie Ihren Administrator f&uuml;r weitere Informationen.'; $lng['error']['user_banned'] = 'Ihr Benutzerkonto wurde gesperrt. Bitte kontaktieren Sie Ihren Administrator f&uuml;r weitere Informationen.';
$lng['serversettings']['validate_domain'] = 'Validiere Domainnamen';