From 0db11bf0f866168dd0945f2ac881475fd6918fd8 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 27 May 2010 10:20:37 +0000 Subject: [PATCH] - same with 05_froxlor_default_errorhandler.conf --- scripts/jobs/cron_tasks.inc.http.10.apache.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 0dbcaac2..7b1ee30b 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -111,7 +111,15 @@ class apache || $this->settings['defaultwebsrverrhandler']['err404'] != '' || $this->settings['defaultwebsrverrhandler']['err500'] != '') ) { - $vhosts_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/05_froxlor_default_errorhandler.conf'); + $vhosts_folder = ''; + if(is_dir($this->settings['system']['apacheconf_vhost'])) + { + $vhosts_folder = makeCorrectPath($this->settings['system']['apacheconf_vhost']); + } else { + $vhosts_folder = makeCorrectPath(dirname($this->settings['system']['apacheconf_vhost'])); + } + + $vhosts_filename = makeCorrectFile($vhosts_folder . '/05_froxlor_default_errorhandler.conf'); if(!isset($this->virtualhosts_data[$vhosts_filename])) {