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

Merge branch 'master' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-04-14 09:49:37 +02:00
parent 4994a90be9 d73e5f8dc7
commit 0336f7ccf8
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
admin_domains.php
View File

@@ -351,7 +351,14 @@ if ($page == 'domains'
$admin = $userinfo; $admin = $userinfo;
} }
$documentroot = $customer['documentroot']; // set default path if admin/reseller has "change_serversettings == false" but we still
// need to respect the documentroot_use_default_value - setting
$path_suffix = '';
if (Settings::Get('system.documentroot_use_default_value') == 1) {
$path_suffix = '/'.$domain;
}
$documentroot = makeCorrectDir($customer['documentroot'] . $path_suffix);
$registration_date = trim($_POST['registration_date']); $registration_date = trim($_POST['registration_date']);
$registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array('0000-00-00', '0', '')); $registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array('0000-00-00', '0', ''));

2
lib/functions/froxlor/function.checkCrondConfigurationFile.php
View File

@@ -95,6 +95,8 @@ function checkCrondConfigurationFile() {
// oh snap cannot create new crond-file // oh snap cannot create new crond-file
die("Oh snap, we cannot create the cron.d file. This should not happen.\nPlease check the path and permissions, the cron will keep trying if you don't stop the cron-service.\n\n"); die("Oh snap, we cannot create the cron.d file. This should not happen.\nPlease check the path and permissions, the cron will keep trying if you don't stop the cron-service.\n\n");
} }
// correct permissions
chmod(Settings::Get("system.cronconfig"), 0640);
// remove all re-generation tasks // remove all re-generation tasks
Database::query("DELETE FROM `" . TABLE_PANEL_TASKS . "` WHERE `type` = '99'"); Database::query("DELETE FROM `" . TABLE_PANEL_TASKS . "` WHERE `type` = '99'");