From 1f8249f9ba81b1911148f0566f95dcdf442d1367 Mon Sep 17 00:00:00 2001 From: Xkeeper Date: Tue, 17 Sep 2024 01:16:03 -0700 Subject: [PATCH] forum listings are now slightly happier with php 8 --- forum.php | 25 +++++++++++++++---------- lib/function.php | 15 +++++++++++---- newreply.php | 2 +- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/forum.php b/forum.php index 0709c16..8d228ea 100644 --- a/forum.php +++ b/forum.php @@ -1,7 +1,12 @@ getresultsbykey("SELECT forum,readdate FROM forumread WHERE user=$loguserid", 'forum', 'readdate'); @@ -101,14 +106,14 @@ $hotcount = $sql->resultq('SELECT hotcount FROM misc',0,0); if ($hotcount <= 0) $hotcount = 0xFFFF; - $ppp = (($_GET['ppp']) ? intval($_GET['ppp']) : (($log) ? $loguser['postsperpage'] : 20)); - $ppp = max(min($ppp, 500), 1); + $ppp = intval($_GET['ppp'] ?? ($loguser['postsperpage'] ?? 20)); + $ppp = max(min($ppp, 500), 1); - $tpp = (($_GET['tpp']) ? intval($_GET['tpp']) : (($log) ? $loguser['threadsperpage'] : 50)); - $tpp = max(min($tpp, 500), 1); + $tpp = intval($_GET['tpp'] ?? ($loguser['threadsperpage'] ?? 50)); + $tpp = max(min($tpp, 500), 1); - $page = intval($_GET['page']); - $min = $page*$tpp; + $page = intval($_GET['page'] ?? 0); + $min = $page * $tpp; $newthreadbar = $forumlist = ''; if ($id) { @@ -134,7 +139,7 @@ $forumpagelinks = ''; if($threadcount > $tpp){ $query = ($id ? "id=$id" : ($user ? "user=$user" : "fav=1")); - if ($_GET['tpp']) $query .= "&tpp=$tpp"; + if ($_GET['tpp'] ?? null) $query .= "&tpp=$tpp"; $forumpagelinks = " $tccell1 style='width: 150px; max-width: 150px;'>Reply: - $tccell2l>$txta=message class='newposttextbox'>". htmlspecialchars($message, ENT_QUOTES) ." + $tccell2l>$txta=message class='newposttextbox' autofocus>". htmlspecialchars($message, ENT_QUOTES) ." $tccell1> $tccell2l> $inph=action VALUE=postreply>
Pages:"; @@ -241,7 +246,7 @@ } // Disabled polls - if ($forum['pollstyle'] == -2) + if (($forum['pollstyle'] ?? 0) == -2) $thread['poll'] = 0; $new = " "; diff --git a/lib/function.php b/lib/function.php index 65f36a7..2cb73dd 100644 --- a/lib/function.php +++ b/lib/function.php @@ -591,6 +591,7 @@ function doforumlist($id){ $forum1= $sql->query("SELECT id,title,catid FROM forums WHERE (minpower<=$power OR minpower<=0) AND `hidden` = '0' AND `id` != '0' OR `id` = '$id' ORDER BY forder") or print mysql_error(); while($forum=$sql->fetch($forum1)) { + if (!isset($fjump[$forum['catid']])) $fjump[$forum['catid']] = ""; $fjump[$forum['catid']] .=""; } @@ -777,9 +778,12 @@ function getuserlink(&$u, $substitutions = null, $urlclass = '') { if ($substitutions) $fn = array_merge($fn, $substitutions); - $akafield = htmlspecialchars($u[$fn['aka']], ENT_QUOTES); - $alsoKnownAs = (($u[$fn['aka']] && $u[$fn['aka']] != $u[$fn['name']]) - ? " title='Also known as: {$akafield}'" : ''); + $akafield = $alsoKnownAs = ""; + if ($u[$fn['aka']] ?? false) { + $akafield = htmlspecialchars($u[$fn['aka']], ENT_QUOTES); + $alsoKnownAs = (($u[$fn['aka']] && $u[$fn['aka']] != $u[$fn['name']]) + ? " title='Also known as: {$akafield}'" : ''); + } $u[$fn['name']] = htmlspecialchars($u[$fn['name']], ENT_QUOTES); @@ -934,8 +938,11 @@ function fonlineusers($id){ } $p = ($numon ? ':' : '.'); $s = ($numon != 1 ? 's' : ''); + $guests = ""; $numguests = $sql->resultq("SELECT count(*) AS n FROM guests WHERE date>$onlinetime AND lastforum=$id",0,0); - if($numguests) $guests="| $numguests guest".($numguests>1?'s':''); + if ($numguests) { + $guests = "| $numguests guest".($numguests>1?'s':''); + } return "$numon user$s currently in $forumname$p $onlineusers $guests"; } diff --git a/newreply.php b/newreply.php index 7eb74d9..26ad9b7 100644 --- a/newreply.php +++ b/newreply.php @@ -240,7 +240,7 @@ $userlogin