From a7041e0399a12bcf6c744aefd94ee57be1da16cf Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 28 Apr 2010 07:04:01 +0000 Subject: [PATCH] - don't spam "PHP Warning: readdir() expects parameter 1 to be resource, boolean given" when webserver-configuration-directories do not exist in wipeOutOldConfigs --- .../filedir/function.isConfigDir.php | 13 +++++++++--- .../jobs/cron_tasks.inc.http.10.apache.php | 20 +++++++++---------- .../jobs/cron_tasks.inc.http.20.lighttpd.php | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/lib/functions/filedir/function.isConfigDir.php b/lib/functions/filedir/function.isConfigDir.php index aeb58960..ad75fc19 100644 --- a/lib/functions/filedir/function.isConfigDir.php +++ b/lib/functions/filedir/function.isConfigDir.php @@ -27,7 +27,7 @@ * @author Florian Lippert */ -function isConfigDir($dir) +function isConfigDir($dir, $ifexists = false) { if(file_exists($dir)) { @@ -42,9 +42,16 @@ function isConfigDir($dir) } else { - if(substr($dir, -1) == '/') + if(!$ifexists) { - $returnval = true; + if(substr($dir, -1) == '/') + { + $returnval = true; + } + else + { + $returnval = false; + } } else { diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 294f25a9..6c1b6281 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -914,14 +914,8 @@ class apache mkdir($this->settings['system']['apacheconf_htpasswddir'], 0751); umask($umask); } - elseif(!is_dir($this->settings['system']['apacheconf_htpasswddir'])) - { - fwrite($this->debugHandler, ' cron_tasks: WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!' . "\n"); - echo 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!'; - $this->logger->logAction(CRON_ACTION, LOG_WARNING, 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!'); - } - if(is_dir($this->settings['system']['apacheconf_htpasswddir'])) + if(isConfigDir($this->settings['system']['apacheconf_htpasswddir'], true)) { foreach($this->htpasswds_data as $htpasswd_filename => $htpasswd_file) { @@ -933,6 +927,12 @@ class apache $this->wipeOutOldHtpasswdConfigs(); } + else + { + fwrite($this->debugHandler, ' cron_tasks: WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!' . "\n"); + echo 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!'; + $this->logger->logAction(CRON_ACTION, LOG_WARNING, 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!'); + } } // Write virtualhosts @@ -1006,7 +1006,7 @@ class apache fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: cleaning ' . $this->settings['system']['apacheconf_vhost'] . "\n"); $this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_vhost']); - if(isConfigDir($this->settings['system']['apacheconf_vhost'])) + if(isConfigDir($this->settings['system']['apacheconf_vhost'], true)) { $vhost_file_dirhandle = opendir($this->settings['system']['apacheconf_vhost']); @@ -1035,7 +1035,7 @@ class apache fwrite($this->debugHandler, ' apache::wipeOutOldDiroptionConfigs: cleaning ' . $this->settings['system']['apacheconf_diroptions'] . "\n"); $this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_diroptions']); - if(isConfigDir($this->settings['system']['apacheconf_diroptions'])) + if(isConfigDir($this->settings['system']['apacheconf_diroptions'], true)) { $diroptions_file_dirhandle = opendir($this->settings['system']['apacheconf_diroptions']); @@ -1064,7 +1064,7 @@ class apache fwrite($this->debugHandler, ' apache::wipeOutOldHtpasswdConfigs: cleaning ' . $this->settings['system']['apacheconf_htpasswddir'] . "\n"); $this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_htpasswddir']); - if(isConfigDir($this->settings['system']['apacheconf_htpasswddir'])) + if(isConfigDir($this->settings['system']['apacheconf_htpasswddir'], true)) { $htpasswds_file_dirhandle = opendir($this->settings['system']['apacheconf_htpasswddir']); diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 680a25de..2ffec90a 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -831,7 +831,7 @@ class lighttpd fwrite($this->debugHandler, ' lighttpd::wipeOutOldConfigs: cleaning ' . $this->settings['system']['apacheconf_vhost'] . "\n"); $this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_vhost']); - if(isConfigDir($this->settings['system']['apacheconf_vhost'])) + if(isConfigDir($this->settings['system']['apacheconf_vhost'], true)) { $vhost_file_dirhandle = opendir($this->settings['system']['apacheconf_vhost']);