From e3fd06a0ed3b614793403b8099f842e0238b616c Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 16 Nov 2017 08:25:27 +0100
Subject: [PATCH] 0004082: Missing file errors and fix

---
 includes/current_user.inc |  2 ++
 includes/hooks.inc        | 12 +++++++-----
 includes/session.inc      |  6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 20ce1e0f..52fafa53 100644
--- 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 501d4a0f..393fc872 100644
--- 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 bba6496f..5008d028 100644
--- 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();
-- 
2.30.2