From 214a39ccb46b642bf8427df1131f7fd408e075d1 Mon Sep 17 00:00:00 2001
From: Joe <joe.hunt.consulting@gmail.com>
Date: Thu, 27 Jun 2024 10:53:43 +0200
Subject: [PATCH] Some troubles Installation on PHP 8. Fixed.

---
 access/login.php                  | 18 ++++++++++--------
 includes/db/connect_db_mysqli.inc |  3 +++
 includes/session.inc              | 18 ++++++++++--------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/access/login.php b/access/login.php
index c1d1ebf9..2e8e9d26 100644
--- a/access/login.php
+++ b/access/login.php
@@ -112,14 +112,16 @@ function defaultCompany()
 			$coy =  user_company();
 			if (!isset($coy))
 				$coy = $def_coy;
-			if (!@$SysPrefs->text_company_selection) {
-				echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
-				for ($i = 0; $i < count($db_connections); $i++)
-					echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
-				echo "</select>\n";
-				echo "</td></tr>";
-			} else {
-				text_row(_("Company"), "company_login_nickname", "", 20, 50);
+			if (isset($db_connections)) {
+				if (!@$SysPrefs->text_company_selection) {
+					echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
+					for ($i = 0; $i < count($db_connections); $i++)
+						echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
+					echo "</select>\n";
+					echo "</td></tr>";
+				} else {
+					text_row(_("Company"), "company_login_nickname", "", 20, 50);
+				}
 			}
 		}
 	}
diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 87660a4f..d0290b3e 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -27,6 +27,9 @@ function set_global_connection($company=-1)
 
 	$_SESSION["wa_current_user"]->cur_con = $company;
 
+    if (!is_string($db_connections[$company]['tbpref'])) 
+		$db_connections[$company]['tbpref'] = '';
+
 	$connection = $db_connections[$company];
 
 	$db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"], "", 
diff --git a/includes/session.inc b/includes/session.inc
index 5f9240eb..458f5852 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -447,16 +447,18 @@ if ($SysPrefs->login_delay > 0 && file_exists(VARLIB_PATH."/faillog.php"))
 	include_once(VARLIB_PATH."/faillog.php");
 
 // Page Initialisation
-if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in()
-	|| !isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language'))
+if (isset($dflt_lang) && isset($installed_languages))
 {
-	$l = array_search_value($dflt_lang, $installed_languages,  'code');
-	$_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],
-	 (isset($l['rtl']) && $l['rtl'] === true) ? 'rtl' : 'ltr');
-}
-
-$_SESSION['language']->set_language($_SESSION['language']->code);
+	if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in()
+		|| !isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language'))
+	{
+		$l = array_search_value($dflt_lang, $installed_languages,  'code');
+		$_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],
+	 	(isset($l['rtl']) && $l['rtl'] === true) ? 'rtl' : 'ltr');
+	}
 
+	$_SESSION['language']->set_language($_SESSION['language']->code);
+}
 
 include_once($path_to_root . "/includes/access_levels.inc");
 include_once($path_to_root . "/version.php");
-- 
2.30.2