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

fix mpm-itk stuff, thx to Ithariel; minor fixes in updater

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2015-04-22 15:58:04 +02:00
parent bf30c1a3d7
commit e0ef3e9984
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -643,7 +643,7 @@ if (isFroxlorVersion('0.9.6-svn5')) {
WHERE loginname = SUBSTRING_INDEX('" . $row_ftp_users['username'] . "', '" . Settings::Get('customer.ftpprefix') . "', 1);"
);
$row_ftp_quota = $result_ftp_quota_stmt->fetch(PDO::FETCH_ASSOC);
Database::query("INSERT INTO `ftp_quotatallies` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $row_ftp_users['username'] . "', 'user', '" . $row_ftp_quota[0] . "'*1024, '0', '0', '0', '0', '0');");
Database::query("INSERT INTO `ftp_quotatallies` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $row_ftp_users['username'] . "', 'user', '" . $row_ftp_quota['diskspace_used'] . "'*1024, '0', '0', '0', '0', '0');");
}
lastStepStatus(0);
@@ -800,6 +800,7 @@ if (isFroxlorVersion('0.9.9')) {
);
Database::pexecute($stmt, array(':user' => $update_httpuser));
lastStepStatus(0);
Settings::Set('system.httpuser', $update_httpuser);
}
if ($update_httpgroup !== false) {
@@ -813,6 +814,7 @@ if (isFroxlorVersion('0.9.9')) {
);
Database::pexecute($stmt, array(':grp' => $update_httpgroup));
lastStepStatus(0);
Settings::Set('system.httpgroup', $update_httpgroup);
}
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'debug_cron'");
@@ -1428,7 +1430,7 @@ if (isFroxlorVersion('0.9.16')) {
`lastrun` = :lastrun,
`isactive` = :isactive"
);
Database::pexecute($stmt, array('lastrun' => $clastrun, 'isactive' => update_system_report_enable));
Database::pexecute($stmt, array('lastrun' => $clastrun, 'isactive' => $update_system_report_enable));
lastStepStatus(0);
showUpdateStep("Updating various database-fields");

6
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -412,9 +412,9 @@ class apache {
* why is this here? Because it only works with mod_php
*/
if (Settings::get('system.apacheitksupport') == 1) {
$vhost_content.= ' <IfModule mpm_itk_module>' . "\n";
$vhost_content.= ' AssignUserID '. $domain['loginname'] . ' ' . $domain['loginname'] . "\n";
$vhost_content.= ' </IfModule>' . "\n";
$php_options_text .= ' <IfModule mpm_itk_module>' . "\n";
$php_options_text .= ' AssignUserID '. $domain['loginname'] . ' ' . $domain['loginname'] . "\n";
$php_options_text .= ' </IfModule>' . "\n";
}
return $php_options_text;