From caea15af15e1b992d51878dd5b87c5c1acc6f7f6 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 25 May 2023 10:18:46 -0600
Subject: [PATCH] php 8.1 changes (#6718)

* Update database_edit.php

* Update databases.php

* Update default_setting_edit.php

* Update email_templates.php
---
 app/email_templates/email_templates.php       | 47 ++++++++++---------
 core/databases/database_edit.php              |  4 +-
 core/databases/databases.php                  | 23 +++++----
 .../default_settings/default_setting_edit.php | 22 ++++-----
 4 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php
index 7fbd241a5d..c3667bb66b 100644
--- a/app/email_templates/email_templates.php
+++ b/app/email_templates/email_templates.php
@@ -43,8 +43,11 @@
 	$language = new text;
 	$text = $language->get();
 
+//set from session variables
+	$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
+
 //get posted data
-	if (is_array($_POST['email_templates'])) {
+	if (!empty($_POST['email_templates'])) {
 		$action = $_POST['action'];
 		$category = $_POST['category'];
 		$search = $_POST['search'];
@@ -52,7 +55,7 @@
 	}
 
 //process the http post data by action
-	if ($action != '' && is_array($email_templates) && @sizeof($email_templates) != 0) {
+	if (!empty($action) && !empty($email_templates)) {
 		switch ($action) {
 			case 'copy':
 				if (permission_exists('email_template_add')) {
@@ -74,16 +77,16 @@
 				break;
 		}
 
-		header('Location: email_templates.php?'.($search != '' ? '&search='.urlencode($search) : null).($category != '' ? '&category='.urlencode($category) : null));
+		header('Location: email_templates.php?'.(!empty($search) ? '&search='.urlencode($search) : null).($category != '' ? '&category='.urlencode($category) : null));
 		exit;
 	}
 
 //get variables used to control the order
-	$order_by = $_GET["order_by"];
-	$order = $_GET["order"];
+	$order_by = $_GET["order_by"] ?? '';
+	$order = $_GET["order"] ?? '';
 
 //add the category
-	$category = strtolower($_GET["category"]);
+	$category = strtolower($_GET["category"] ?? '');
 	if ($category) {
 		$sql_category = "and (";
 		$sql_category .= " lower(template_category) = :category";
@@ -109,29 +112,29 @@
 
 //prepare to page the results
 	$sql = "select count(*) from v_email_templates where true ";
-	if ($_GET['show'] == "all" && permission_exists('email_template_all')) {
-		if ($sql_search != '') {
+	if (!empty($_GET['show']) == "all" && permission_exists('email_template_all')) {
+		if (!empty($sql_search)) {
 			$sql .= "and ".$sql_search;
 		}
 	}
 	else {
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
-		if ($sql_search != '') {
+		if (!empty($sql_search)) {
 			$sql .= "and ".$sql_search;
 		}
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$sql .= $sql_category;
+	$sql .= $sql_category ?? '';
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
+	$rows_per_page = (!empty($_SESSION['domain']['paging']['numeric'])) ? $_SESSION['domain']['paging']['numeric'] : 50;
 	$param = "&search=".$search;
-	if ($_GET['show'] == "all" && permission_exists('email_template_all')) {
+	if (!empty($_GET['show']) == "all" && permission_exists('email_template_all')) {
 		$param .= "&show=all";
 	}
-	$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
+	$page = isset($_GET['page']) ? $_GET['page'] : 0;
 	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
 	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
@@ -146,15 +149,15 @@
 	}
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
-	$result = $database->select($sql, $parameters, 'all');
+	$result = $database->select($sql, $parameters ?? '', 'all');
 	unset($sql, $parameters);
 
 //get email template categories
 	$sql = "select distinct template_category from v_email_templates ";
 	$sql .= "order by template_category asc ";
 	$database = new database;
-	$rows = $database->select($sql, $parameters, 'all');
-	if (is_array($rows) && @sizeof($rows) != 0) {
+	$rows = $database->select($sql, $parameters ?? '', 'all');
+	if (!empty($rows)) {
 		foreach ($rows as $row) {
 			$template_categories[$row['template_category']] = ucwords(str_replace('_',' ',$row['template_category']));
 		}
@@ -187,7 +190,7 @@
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	if (permission_exists('email_template_all')) {
-		if ($_GET['show'] == 'all') {
+		if (!empty($_GET['show']) == 'all') {
 			echo "		<input type='hidden' name='show' value='all'>";
 		}
 		else {
@@ -235,10 +238,10 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('email_template_add') || permission_exists('email_template_edit') || permission_exists('email_template_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".(!empty($result) ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
-	if ($_GET['show'] == "all" && permission_exists('email_template_all')) {
+	if (!empty($_GET['show']) == "all" && permission_exists('email_template_all')) {
 		echo "<th>".$text['label-domain']."</th>\n";
 		//echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param);
 	}
@@ -249,7 +252,7 @@
 	echo th_order_by('template_type', $text['label-template_type'], $order_by, $order, null, null, $param);
 	echo th_order_by('template_enabled', $text['label-template_enabled'], $order_by, $order, null, "class='center pct-10'", $param);
 	echo th_order_by('template_description', $text['label-template_description'], $order_by, $order, null, "class='hide-sm-dn'", $param);
-	if (permission_exists('email_template_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+	if (permission_exists('email_template_edit') && $list_row_edit_button == 'true') {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
 	echo "</tr>\n";
@@ -267,7 +270,7 @@
 				echo "		<input type='hidden' name='email_templates[$x][uuid]' value='".escape($row['email_template_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
-			if ($_GET['show'] == "all" && permission_exists('email_template_all')) {
+			if (!empty($_GET['show']) == "all" && permission_exists('email_template_all')) {
 				echo "	<td>";
 				if (is_uuid($row['domain_uuid'])) {
 					echo escape($_SESSION['domains'][$row['domain_uuid']]['domain_name']);
@@ -299,7 +302,7 @@
 			}
 			echo "	</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['template_description'])."</td>\n";
-			if (permission_exists('email_template_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+			if (permission_exists('email_template_edit') && $list_row_edit_button == 'true') {
 				echo "	<td class='action-button'>";
 				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
 				echo "	</td>\n";
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index 606fea8a88..402d8ee546 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -187,7 +187,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 }
 
 //pre-populate the form
-	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
+	if (count($_GET)>0 && empty($_POST["persistformvar"])) {
 		$database_uuid = $_GET["id"];
 		$sql = "select * from v_databases ";
 		$sql .= "where database_uuid = :database_uuid ";
@@ -421,4 +421,4 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 300c0163ac..b78c9f5aad 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -46,14 +46,17 @@
 	$language = new text;
 	$text = $language->get();
 
+//set from session variables
+	$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
+
 //get the http post data
-	if (is_array($_POST['databases'])) {
+	if (!empty($_POST['databases'])) {
 		$action = $_POST['action'];
 		$databases = $_POST['databases'];
 	}
 
 //process the http post data by action
-	if ($action != '' && is_array($databases) && @sizeof($databases) != 0) {
+	if (!empty($action) && !empty($databases)) {
 		switch ($action) {
 			case 'copy':
 				if (permission_exists('database_add')) {
@@ -74,8 +77,8 @@
 	}
 
 //get variables used to control the order
-	$order_by = $_GET["order_by"];
-	$order = $_GET["order"];
+	$order_by = $_GET["order_by"] ?? '';
+	$order = $_GET["order"] ?? '';
 
 //prepare to page the results
 	$sql = "select count(*) from v_databases ";
@@ -83,9 +86,9 @@
 	$num_rows = $database->select($sql, null, 'column');
 
 //prepare to page the results
-	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
+	$rows_per_page = (!empty($_SESSION['domain']['paging']['numeric'])) ? $_SESSION['domain']['paging']['numeric'] : 50;
 	$param = "";
-	$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
+	$page = isset($_GET['page']) ? $_GET['page'] : 0;
 	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
 	$offset = $rows_per_page * $page;
 
@@ -141,7 +144,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('database_add') || permission_exists('database_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($databases ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".(!empty($databases) ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('database_driver', $text['label-driver'], $order_by, $order);
@@ -149,12 +152,12 @@
 	echo th_order_by('database_host', $text['label-host'], $order_by, $order);
 	echo th_order_by('database_name', $text['label-name'], $order_by, $order);
 	echo th_order_by('database_description', $text['label-description'], $order_by, $order, null, "class='hide-sm-dn'");
-	if (permission_exists('database_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+	if (permission_exists('database_edit') && $list_row_edit_button == 'true') {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
 	echo "</tr>\n";
 
-	if (is_array($databases) && @sizeof($databases) != 0) {
+	if (!empty($databases)) {
 		$x = 0;
 		foreach ($databases as $row) {
 			$list_row_url = "database_edit.php?id=".urlencode($row['database_uuid']);
@@ -177,7 +180,7 @@
 			}
 			echo "	</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['database_description'])."&nbsp;</td>\n";
-			if (permission_exists('database_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+			if (permission_exists('database_edit') && $list_row_edit_button == 'true') {
 				echo "	<td class='action-button'>\n";
 				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
 				echo "	</td>\n";
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 762fa6666f..02cb0371ea 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -53,17 +53,17 @@
 	else {
 		$action = "add";
 	}
-	$search = $_REQUEST['search'];
-
+	$search = $_REQUEST['search'] ?? '';
+		
 //get http post variables and set them to php variables
-	if (count($_REQUEST) > 0) {
-		$default_setting_category = strtolower($_REQUEST["default_setting_category"]);
-		$default_setting_subcategory = strtolower($_POST["default_setting_subcategory"]);
-		$default_setting_name = strtolower($_POST["default_setting_name"]);
-		$default_setting_value = $_POST["default_setting_value"];
-		$default_setting_order = $_POST["default_setting_order"];
-		$default_setting_enabled = $_POST["default_setting_enabled"] ?: 'false';
-		$default_setting_description = $_POST["default_setting_description"];
+	if (!empty($_REQUEST)) {
+		$default_setting_category = strtolower($_REQUEST["default_setting_category"] ?? '');
+		$default_setting_subcategory = strtolower($_POST["default_setting_subcategory"] ?? '');
+		$default_setting_name = strtolower($_POST["default_setting_name"] ?? '');
+		$default_setting_value = $_POST["default_setting_value"] ?? '';
+		$default_setting_order = $_POST["default_setting_order"] ?? '';
+		$default_setting_enabled = $_POST["default_setting_enabled"] ?? '';
+		$default_setting_description = $_POST["default_setting_description"] ?? '';
 	}
 
 //sanitize the variables
@@ -226,7 +226,7 @@
 	} //(count($_POST)>0 && empty($_POST["persistformvar"]))
 
 //pre-populate the form
-	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
+	if (count($_GET) > 0 && empty($_POST["persistformvar"])) {
 		$default_setting_uuid = $_GET["id"];
 		$sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, default_setting_order, cast(default_setting_enabled as text), default_setting_description ";
 		$sql .= "from v_default_settings ";