0004082: Missing file errors and fix

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 20ce1e0fc9599f8d178f34c07146603497ba18e2..52fafa53e690e785dd8b3bb845c2636a312ae6f2 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -732,6 +732,8 @@ function recalculate_cols(&$cols)
 
 function flush_dir($path, $wipe = false) 
 {
+       if (!file_exists($path))
+               return;
        $dir = @opendir($path);
        if(!$dir)
                return;

diff --git a/includes/hooks.inc b/includes/hooks.inc
index 501d4a0f7eb1ca441a103b2d4efc85773e75899d..393fc8720a96a1d45116931554b76576c25304c4 100644 (file)
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -235,11 +235,13 @@ function install_hooks()
                unset($code, $hook_class);
        }
        // install hooks provided by active extensions
-       foreach($installed_extensions as $ext) {
-               $hook_class = 'hooks_'.$ext['package'];
-               if ($ext['active'] && class_exists($hook_class)) {
-                       $Hooks[$ext['package']] = new $hook_class;
-               }
+       if (isset($installed_extensions) && !empty($installed_extensions)) {
+               foreach($installed_extensions as $ext) {
+                       $hook_class = 'hooks_'.$ext['package'];
+                       if ($ext['active'] && class_exists($hook_class)) {
+                               $Hooks[$ext['package']] = new $hook_class;
+                       }
+               }       
        }
 }
 /*

diff --git a/includes/session.inc b/includes/session.inc
index bba6496fddd1dc6a861c9db4b149cf63aabe734b..5008d028027623253e0a94397116ae2f1020a786 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -436,8 +436,8 @@ header("Cache-control: private");
 
 get_text_init();
 
-if ($SysPrefs->login_delay > 0)
-       @include_once($path_to_root . "/tmp/faillog.php");
+if ($SysPrefs->login_delay > 0 && file_exists($path_to_root . "/tmp/faillog.php"))
+       include_once($path_to_root . "/tmp/faillog.php");
 
 // Page Initialisation
 if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in()
@@ -486,7 +486,7 @@ if (!defined('FA_LOGOUT_PHP_FILE')){
 
        login_timeout();
 
-       if (!$_SESSION["wa_current_user"]->old_db)
+       if (!$_SESSION["wa_current_user"]->old_db && file_exists($path_to_root . '/company/'.user_company().'/installed_extensions.php'))
                include($path_to_root . '/company/'.user_company().'/installed_extensions.php');
 
        install_hooks();