Fix strict typing errors

Author: peterpp

admin/check.inc.php

@@ -8,17 +8,17 @@
 
 if ($row) {
 	if (DIALECT == "sqlite") {
-		$result = recreate_table($TABLE, $TABLE, [], [], [], "", [], "$name", ($row["drop"] ? "" : $row["clause"]));
+		$success = recreate_table($TABLE, $TABLE, [], [], [], "", [], "$name", ($row["drop"] ? "" : $row["clause"]));
 	} else {
-		$result = ($name == "" || queries("ALTER TABLE " . table($TABLE) . " DROP CONSTRAINT " . idf_escape($name)));
+		$success = ($name == "" || queries("ALTER TABLE " . table($TABLE) . " DROP CONSTRAINT " . idf_escape($name)));
 		if (!$row["drop"]) {
-			$result = queries("ALTER TABLE " . table($TABLE) . " ADD" . ($row["name"] != "" ? " CONSTRAINT " . idf_escape($row["name"]) : "") . " CHECK ($row[clause])"); //! SQL injection
+			$success = (bool)queries("ALTER TABLE " . table($TABLE) . " ADD" . ($row["name"] != "" ? " CONSTRAINT " . idf_escape($row["name"]) : "") . " CHECK ($row[clause])"); //! SQL injection
 		}
 	}
 	queries_redirect(
 		ME . "table=" . urlencode($TABLE),
 		($row["drop"] ? lang('Check has been dropped.') : ($name != "" ? lang('Check has been altered.') : lang('Check has been created.'))),
-		$result
+		$success
 	);
 }
 

admin/edit.inc.php

@@ -28,7 +28,7 @@
 		queries_redirect(
 			$location,
 			lang('Item has been deleted.'),
-			Driver::get()->delete($TABLE, $query_where, $unique_array ? 0 : 1)
+			(bool)Driver::get()->delete($TABLE, $query_where, $unique_array ? 0 : 1)
 		);
 
 	} else {
@@ -47,7 +47,7 @@
 			queries_redirect(
 				$location,
 				lang('Item has been updated.'),
-				Driver::get()->update($TABLE, $set, $query_where, $unique_array ? 0 : 1)
+				(bool)Driver::get()->update($TABLE, $set, $query_where, $unique_array ? 0 : 1)
 			);
 			if (is_ajax()) {
 				page_headers();
@@ -57,7 +57,11 @@
 		} else {
 			$result = Driver::get()->insert($TABLE, $set);
 			$last_id = ($result ? last_id($result) : 0);
-			queries_redirect($location, lang('Item%s has been inserted.', ($last_id ? " $last_id" : "")), $result); //! link
+			queries_redirect(
+				$location,
+				lang('Item%s has been inserted.', ($last_id ? " $last_id" : "")),
+				(bool)$result
+			); //! link
 		}
 	}
 }

admin/event.inc.php

@@ -19,7 +19,7 @@
 			) . " ON COMPLETION" . ($row["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
 		;
 
-		queries_redirect(substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')), queries(($EVENT != ""
+		queries_redirect(substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')), (bool)queries(($EVENT != ""
 			? "ALTER EVENT " . idf_escape($EVENT) . $schedule
 			. ($EVENT != $row["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($row["EVENT_NAME"]) : "")
 			: "CREATE EVENT " . idf_escape($row["EVENT_NAME"]) . $schedule

admin/foreign.inc.php

@@ -29,7 +29,7 @@
 	queries_redirect(
 		ME . "table=" . urlencode($TABLE),
 		($row["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.'))),
-		$result
+		(bool)$result
 	);
 	if (!$row["drop"]) {
 		Admin::get()->addError(lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.')); //! no partitioning

admin/select.inc.php

@@ -181,27 +181,27 @@
 		if (!$_POST["val"]) {
 			Admin::get()->addError(lang('Ctrl+click on a value to modify it.'));
 		} else {
-			$result = true;
+			$success = true;
 			$affected = 0;
 			foreach ($_POST["val"] as $unique_idf => $row) {
 				$set = [];
 				foreach ($row as $key => $val) {
 					$key = bracket_escape($key, true);
 					$set[idf_escape($key)] = (preg_match('~char|text~', $fields[$key]["type"]) || $val != "" ? Admin::get()->processFieldInput($fields[$key], $val) : "NULL");
 				}
-				$result = Driver::get()->update(
+				$success = (bool)Driver::get()->update(
 					$TABLE,
 					$set,
 					" WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields),
 					($is_group || $primary ? 0 : 1),
 					" "
 				);
-				if (!$result) {
+				if (!$success) {
 					break;
 				}
 				$affected += Connection::get()->getAffectedRows();
 			}
-			queries_redirect(remove_from_uri(), lang('%d item(s) have been affected.', $affected), $result);
+			queries_redirect(remove_from_uri(), lang('%d item(s) have been affected.', $affected), $success);
 		}
 
 	} elseif (!is_string($file = get_file("csv_file", true))) {
@@ -231,11 +231,11 @@
 				$rows[] = $set;
 			}
 		}
-		$result = (!$rows || Driver::get()->insertUpdate($TABLE, $rows, $primary));
-		if ($result) {
+		$success = !$rows || Driver::get()->insertUpdate($TABLE, $rows, $primary);
+		if ($success) {
 			Driver::get()->commit();
 		}
-		queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
+		queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $success);
 		Driver::get()->rollback(); // after queries_redirect() to not overwrite error
 	}
 }

admin/sql.inc.php

@@ -187,7 +187,7 @@
 											echo "<div class='table-result'>\n";
 										}
 
-										$limit = $_POST["limit"];
+										$limit = (int)$_POST["limit"];
 										$orgtables = print_select_result($result, $connection2, [], $limit);
 
 										if (!$_POST["only_errors"]) {

admin/trigger.inc.php

@@ -3,7 +3,7 @@
 namespace AdminNeo;
 
 $TABLE = $_GET["trigger"];
-$name = $_GET["name"];
+$name = $_GET["name"] ?? "";
 $trigger_options = trigger_options();
 $row = trigger($name, $TABLE) + ["Trigger" => $TABLE . "_bi"];
 
@@ -22,7 +22,7 @@
 			queries_redirect(
 				$location,
 				($name != "" ? lang('Trigger has been altered.') : lang('Trigger has been created.')),
-				queries(create_trigger($on, $_POST))
+				(bool)queries(create_trigger($on, $_POST))
 			);
 			if ($name != "") {
 				queries(create_trigger($on, $row + ["Type" => reset($trigger_options["Type"])]));