vwemirror/PQS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add centralized DB helper; fix legacy mysql_error() landmines

Browse Source 
- includes/db.php: shared mysqli connection + parameterized query helpers
  (pqs_db/pqs_exec/pqs_rows/pqs_row/pqs_val), targets PHP 7.4+.
- Replace 11 mysql_error() calls (undefined function on PHP 7+) with
  mysqli_error($link) / mysqli_connect_error() across getFSgame, getFSplayers,
  config, callsign, console. Only affected already-failed error paths.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Cyd
2026-07-01 12:51:13 -05:00
co-authored by Claude Opus 4.8
parent 7d643dde17
commit 061291c951
6 changed files with 82 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
callsign.php
+3 -3
View File
@@ -275,7 +275,7 @@ if (isset($_GET['submit'])) {
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysqli_error($link));
mysqli_select_db($link, 'pqs') or die('Could not select database');
$query = "SELECT `numpods` FROM `pqs_gameconfig` WHERE 1";
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
$line = mysqli_fetch_array($result);
$i = 2;
$max = intval($line[0]);
@@ -292,7 +292,7 @@ if (isset($_GET['submit'])) {
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysqli_error($link));
mysqli_select_db($link, 'pqs') or die('Could not select database');
$query = "SELECT DISTINCT left(`CallSign`,LOCATE('-',`CallSign`)-1) FROM `pqs_queue` WHERE `CallSign` like '%-%'";
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
while ($line = mysqli_fetch_array($result)) {
echo "<option value=$line[0]";if(strcmp($_GET['who'], $line[0])==0){echo " selected ";} echo ">$line[0]</option>
";}
@@ -319,7 +319,7 @@ if (isset($_GET['submit'])) {
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysqli_error($link));
mysqli_select_db($link, 'pqs') or die('Could not select database');
$query = "SELECT * FROM pqs_mechinfo WHERE `Class` IN ($wclass) ORDER BY mechname";
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
while ($line = mysqli_fetch_array($result)) {
echo "<option value=$line[0]>$line[1]</option>
";
console.php
+3 -3
View File
@@ -169,10 +169,10 @@ echo "<div class='consolediv'><div id='configform'>";
echo "<font size='6'>Configuration</font><br><br>";
echo "<form name='submit-config' action='console.php'>";
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysql_error());
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysqli_connect_error());
mysqli_select_db($link, 'pqs') or die('Could not select database');
$query = 'SELECT * FROM pqs_gameconfig';
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
while ($line = mysqli_fetch_array($result)) {
$numpods = $line[1];
$timepergame = $line[2];
@@ -198,7 +198,7 @@ while ($line = mysqli_fetch_array($result)) {
}
$query = 'SELECT * FROM pqs_pods';
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
while ($line = mysqli_fetch_array($result)) {
$pod01 = $line[0];
$pod02 = $line[1];
getFSgame.php
+1 -1
View File
@@ -9,7 +9,7 @@ mysqli_select_db($link, 'pqs') or die('Could not select database');
// get current pods
$query = 'SELECT * FROM pqs_gameconfig';
$result = mysqli_query($link, $query) or die('Query failed 12: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed 12: ' . mysqli_error($link));
$line = mysqli_fetch_array($result);
$visibility = $line[7];
getFSplayers.php
+1 -1
View File
@@ -7,7 +7,7 @@ $link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' .
mysqli_select_db($link, 'pqs') or die('Could not select database');
// get current pods
$query = 'SELECT * FROM pqs_pods';
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
$line = mysqli_fetch_array($result);
$pod01 = $line[0];
$pod02 = $line[1];
includes/config.php
+3 -3
View File
@@ -1,9 +1,9 @@
<?php
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysql_error());
$link = mysqli_connect('localhost', 'pqs', 'pqs') or die('Could not connect: ' . mysqli_connect_error());
mysqli_select_db($link, 'pqs') or die('Could not select database');
$query = 'SELECT * FROM pqs_gameconfig';
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
while ($line = mysqli_fetch_array($result)) {
$numpods[$line[0]] = $line[1];
$timepergame[$line[0]] = $line[2];
@@ -11,7 +11,7 @@ while ($line = mysqli_fetch_array($result)) {
$groupAvalible[$line[0]] = $line[23];
}
$query = 'SELECT * FROM pqs_pods';
$result = mysqli_query($link, $query) or die('Query failed: ' . mysql_error());
$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link));
$pod01 = $line[0];
$pod02 = $line[1];
$pod03 = $line[2];
includes/db.php
+71
View File
@@ -0,0 +1,71 @@
<?php
/**
* Centralized database access for PQS.
*
* Credentials live here intentionally: PQS runs on an air-gapped LAN where the
* localhost pqs/pqs account is a formality (see docs/ARCHITECTURE.md §1, §7).
*
* Targets PHP 7.4+ with mysqlnd (local test stack: PHP 8.3 / MariaDB; see
* dev/README.md). All new code should go through these helpers so queries are
* parameterized and the connection is opened once per request.
*/
const PQS_DB_HOST = 'localhost';
const PQS_DB_USER = 'pqs';
const PQS_DB_PASS = 'pqs';
const PQS_DB_NAME = 'pqs';
/**
* Shared mysqli connection, opened once per request.
* mysqli is put into exception-reporting mode (the default since PHP 8.1) so
* failures raise mysqli_sql_exception instead of silently returning false.
*/
function pqs_db(): mysqli
{
static $link = null;
if ($link === null) {
mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
$link = new mysqli(PQS_DB_HOST, PQS_DB_USER, PQS_DB_PASS, PQS_DB_NAME);
}
return $link;
}
/**
* Prepare, bind and execute a parameterized statement; return the statement.
* $types is a mysqli bind_param type string, e.g. "si" for (string, int).
*/
function pqs_exec(string $sql, string $types = '', array $params = []): mysqli_stmt
{
$stmt = pqs_db()->prepare($sql);
if ($types !== '') {
$stmt->bind_param($types, ...$params);
}
$stmt->execute();
return $stmt;
}
/** Run a query and return all rows as associative arrays. */
function pqs_rows(string $sql, string $types = '', array $params = []): array
{
$stmt = pqs_exec($sql, $types, $params);
$res = $stmt->get_result();
$rows = $res ? $res->fetch_all(MYSQLI_ASSOC) : [];
$stmt->close();
return $rows;
}
/** Run a query and return the first row (assoc) or null. */
function pqs_row(string $sql, string $types = '', array $params = []): ?array
{
return pqs_rows($sql, $types, $params)[0] ?? null;
}
/** Run a query and return a single scalar (first column of first row) or null. */
function pqs_val(string $sql, string $types = '', array $params = [])
{
$stmt = pqs_exec($sql, $types, $params);
$res = $stmt->get_result();
$val = ($res && ($r = $res->fetch_row())) ? $r[0] : null;
$stmt->close();
return $val;
}