diff --git a/history.php b/history.php index 6df2ce9..2a496c0 100644 --- a/history.php +++ b/history.php @@ -6,39 +6,26 @@ $maxmission) { $index = $minmission; } - } +if (isset($_GET['next']) && isset($_GET['index'])) { + $index = (int)$_GET['index'] + 1; + if ($index > $maxmission) { $index = $minmission; } } if ($index == $maxmission) { $fl = "(Last Mission)"; } if ($index == $minmission) { $fl = "(First Mission)"; } -$query = "SELECT callsign, mech, pqs_pastmissions.missionid, missiondate, nummercs, missionsize, numplayers, missiontime FROM pqs_pastmissions inner join pqs_mission where pqs_pastmissions.missionid = pqs_mission.missionid HAVING pqs_pastmissions.missionid = $index"; -$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link)); +$rows = pqs_rows("SELECT callsign, mech, pqs_pastmissions.missionid, missiondate, nummercs, missionsize, numplayers, missiontime FROM pqs_pastmissions inner join pqs_mission where pqs_pastmissions.missionid = pqs_mission.missionid HAVING pqs_pastmissions.missionid = ?", 'i', array($index)); if (isset($_GET['launch'])) { if ($_GET['launch'] == 'console') { @@ -50,24 +37,24 @@ if (isset($_GET['launch'])) { echo "Mission #$index $fl"; echo "CallsignMech"; -while ($line = mysqli_fetch_array($result)) { - echo "$line[0]$line[1]"; - $cfull = $line[3]; +foreach ($rows as $line) { + echo "$line[callsign]$line[mech]"; + $cfull = $line['missiondate']; $cyear = substr($cfull,0,4); $cmonth = substr($cfull,4,2); $cday = substr($cfull,6); $mdate = date("l, F jS, o", mktime(0,0,0, $cmonth,$cday,$cyear)); - $mercs = $line[4]; - $pods = $line[5]; - $numplayers = $line[6]; - if (strlen($line[7]) == 3) { - $mtime = substr($line[7], 0, 1); + $mercs = $line['nummercs']; + $pods = $line['missionsize']; + $numplayers = $line['numplayers']; + if (strlen($line['missiontime']) == 3) { + $mtime = substr($line['missiontime'], 0, 1); $mtime = $mtime . ":"; - $mtime = $mtime . (substr($line[7], 1,2)); + $mtime = $mtime . (substr($line['missiontime'], 1,2)); } else { - $mtime = substr($line[7], 0, 2); + $mtime = substr($line['missiontime'], 0, 2); $mtime = $mtime . ":"; - $mtime = $mtime . (substr($line[7], 2,2)); + $mtime = $mtime . (substr($line['missiontime'], 2,2)); } } echo " "; @@ -83,8 +70,6 @@ if (isset($_GET['launch'])) { } echo "Prev"; echo "CloseNext"; -mysqli_free_result($result); -mysqli_close($link); echo ""; ?> diff --git a/search.php b/search.php index 2bfadc5..e3e468a 100644 --- a/search.php +++ b/search.php @@ -35,48 +35,30 @@ echo "Mission(s) : $ //echo "CallSignMissionETDMechEdit/Delete"; echo "CallSignMissionETDMech"; -$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'); +require_once("includes/db.php"); // get last commit time and mission id -$query = "SELECT max(MissionID), max(UNIX_TIMESTAMP(ctime)) FROM pqs_pastmissions"; -$getlct = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link)); -$rs2 = mysqli_fetch_array($getlct); -$lastmission = $rs2[0]; -if(is_null($lastmission)){$lastmission = 0;} -$lastCommitTime = $rs2[1];//-(6*60*60); -if(is_null($lastCommitTime)){$lastCommitTime = time();}//-(6*60*60);} -//echo"$lastCommitTime"; -//$d=strtotime("+$mtd Minutes",$lastCommitTime); -//$etd = date("h:i", $d); +$rs2 = pqs_row("SELECT max(MissionID) AS m, max(UNIX_TIMESTAMP(ctime)) AS t FROM pqs_pastmissions"); +$lastmission = (int)($rs2['m'] ?? 0); +$lastCommitTime = $rs2['t'] ?? null; +if(is_null($lastCommitTime)){$lastCommitTime = time();} // get time per game // -$query = "SELECT timepergame, timetoreset FROM pqs_gameconfig"; -$gettpg = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link)); -$rs1 = mysqli_fetch_array($gettpg); -$tpg = $rs1[0]+$rs1[1]; +$cfg = pqs_row("SELECT timepergame, timetoreset FROM pqs_gameconfig"); +$tpg = (int)$cfg['timepergame'] + (int)$cfg['timetoreset']; // fetch data // -$query = "SELECT * FROM pqs_queue WHERE CallSign LIKE '$cs'"; -$result = mysqli_query($link, $query) or die('Query failed: ' . mysqli_error($link)); - -while ($line = mysqli_fetch_array($result)) { - - $mtd = ($line[3] - $lastmission) * $tpg; +foreach (pqs_rows("SELECT * FROM pqs_queue WHERE CallSign LIKE ?", 's', array($cs)) as $line) { + $mtd = ($line['MissionID'] - $lastmission) * $tpg; $d=strtotime("+$mtd Minutes",$lastCommitTime); $etd = date("h:i", $d); - - echo "$line[0]$line[3]$etd$line[1]"; -// echo "  "; -// echo "  "; - + + echo "$line[CallSign]$line[MissionID]$etd$line[Mech]"; echo ""; } echo " "; echo ""; -mysqli_free_result($result); -mysqli_close($link); echo ""; ?>