From 2cb656cf7af0d018c36e36eccb53240a1dd384af Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 05 Sep 2012 04:52:45 -0400
Subject: [PATCH] Fixed: "old" style folder protection without comment lines in htaccess (3.0.4.6) get removed, too.
---
install/lib/installer_base.lib.php | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index b887a94..d11acd1 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1650,6 +1650,7 @@
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
+ $content = str_replace('{theme}', $conf['theme'], $content);
wf($install_dir.'/interface/lib/'.$configfile, $content);
@@ -1673,6 +1674,7 @@
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
+ $content = str_replace('{theme}', $conf['theme'], $content);
wf($install_dir.'/server/lib/'.$configfile, $content);
@@ -1960,9 +1962,9 @@
//* Create the ispconfig auth log file and set uid/gid
if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {
touch($conf['ispconfig_log_dir'].'/auth.log');
- exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log');
- exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log');
}
+ exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log');
+ exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log');
if(is_user('getmail')) {
rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh');
@@ -1993,6 +1995,11 @@
fclose($fh);
*/
}
+
+ //* Remove Domain module as its functions are available in the client module now
+ if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+
+
}
public function configure_dbserver() {
--
Gitblit v1.9.1