From f6f7b2e4bea683aad2dd31a2755431c8c28e8c29 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Wed, 19 May 2010 12:29:32 +0000 Subject: [PATCH] Fixing it on the right place, d00p was correct, i apologize -.- --- install/install.php | 4 +--- scripts/jobs/cron_tasks.inc.http.10.apache.php | 2 +- scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/install/install.php b/install/install.php index 245a9ea4..6acdc1c0 100644 --- a/install/install.php +++ b/install/install.php @@ -629,7 +629,6 @@ if(isset($_POST['installstep']) $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'"); $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/froxlor-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'"); $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/apache2 reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'"); - $ssettings = 'DocumentRoot \"".$db->escape(dirname(dirname(__FILE__))) . "\"'; } elseif($webserver == "lighttpd") { @@ -661,8 +660,7 @@ if(isset($_POST['installstep']) `port` = '80', `namevirtualhost_statement` = '1', `vhostcontainer` = '1', - `vhostcontainer_servername_statement` = '1', - `specialsettings` = '".$ssettings."'"; + `vhostcontainer_servername_statement` = '1'"; $db->query($query); $defaultip = $db->insert_id(); diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 318c8a16..a1730cb3 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -177,7 +177,7 @@ class apache /** * add 'real'-vhost content here, like doc-root :) */ - $mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); + $mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__))))); $this->virtualhosts_data[$vhosts_filename].= 'DocumentRoot "'.$mypath.'"'."\n"; if($row_ipsandports['vhostcontainer_servername_statement'] == '1') diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 2ffec90a..5ffa7ef1 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -107,7 +107,7 @@ class lighttpd $this->lighttpd_data[$vhost_filename].= '# Froxlor default vhost' . "\n"; $this->lighttpd_data[$vhost_filename].= '$HTTP["host"] =~ "^(?:www\.|)' . $myhost . '$" {' . "\n"; - $mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); + $mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__))))); $this->lighttpd_data[$vhost_filename].= ' server.document-root = "'.$mypath.'"'."\n"; /**