Improve quote notifications page

sections/userhistory/quote_notifications.php

@@ -4,11 +4,11 @@ if (!empty($LoggedUser['DisableForums'])) {
 }
 
 $UnreadSQL = 'AND q.UnRead';
-if ($_GET['showall']) {
+if ($_GET['showall'] ?? false) {
   $UnreadSQL = '';
 }
 
-if ($_GET['catchup']) {
+if ($_GET['catchup'] ?? false) {
   $DB->query("UPDATE users_notify_quoted SET UnRead = '0' WHERE UserID = '$LoggedUser[ID]'");
   $Cache->delete_value('notify_quoted_' . $LoggedUser['ID']);
   header('Location: userhistory.php?action=quote_notifications');
@@ -97,54 +97,34 @@ View::show_header('Quote Notifications');
   <br />
 <?
 foreach ($Results as $Result) {
-  switch ($Result['Page']) {
-    case 'forums':
-      $Links = 'Forums: <a href="forums.php?action=viewforum&amp;forumid=' . $Result['ForumID'] . '">' . display_str($Result['ForumName']) . '</a> &gt; ' .
-          '<a href="forums.php?action=viewthread&amp;threadid=' . $Result['PageID'] . '" class="tooltip" title="' . display_str($Result['ForumTitle']) . '">' . Format::cut_string($Result['ForumTitle'], 75) . '</a>';
-      $JumpLink = 'forums.php?action=viewthread&amp;threadid=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
-      break;
-    case 'artist':
-      $Links = 'Artist: <a href="artist.php?id=' . $Result['PageID'] . '">' . display_str($Result['ArtistName']) . '</a>';
-      $JumpLink = 'artist.php?id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
-      break;
-    case 'collages':
-      $Links = 'Collage: <a href="collages.php?id=' . $Result['PageID'] . '">' . display_str($Result['CollageName']) . '</a>';
-      $JumpLink = 'collages.php?action=comments&amp;collageid=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
-      break;
-    case 'requests':
-      if (!isset($Requests[$Result['PageID']])) {
-        // Deleted request
-        continue 2;
-      }
-      $Request = $Requests[$Result['PageID']];
-      $CategoryName = $Categories[$Request['CategoryID'] - 1];
-      $Links = 'Request: ';
-      if ($CategoryName == 'Music') {
-        $Links .= Artists::display_artists(Requests::get_artists($Result['PageID'])) . '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '" dir="ltr">' . $Request['Title'] . " [" . $Request['Year'] . "]</a>";
-      } elseif ($CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
-        $Links .= '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '" dir="ltr">' . $Request['Title'] . " [" . $Request['Year'] . "]</a>";
-      } else {
-        $Links .= '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '">' . $Request['Title'] . "</a>";
-      }
-      $JumpLink = 'requests.php?action=view&amp;id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
-      break;
-    case 'torrents':
-      if (!isset($TorrentGroups[$Result['PageID']])) {
-        // Deleted or moved torrent group
-        continue 2;
-      }
-      $GroupInfo = $TorrentGroups[$Result['PageID']];
-      $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '<a href="torrents.php?id=' . $GroupInfo['ID'] . '" dir="ltr">' . $GroupInfo['Name'] . '</a>';
-      if ($GroupInfo['Year'] > 0) {
-        $Links .= " [" . $GroupInfo['Year'] . "]";
-      }
-      if ($GroupInfo['ReleaseType'] > 0) {
-        $Links .= " [" . $ReleaseTypes[$GroupInfo['ReleaseType']] . "]";
-      }
-      $JumpLink = 'torrents.php?id=' . $GroupInfo['ID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
-      break;
-    default:
-      continue 2;
+  if ($Result['Page'] == 'forums') {
+    $Links = 'Forums: <a href="forums.php?action=viewforum&amp;forumid=' . $Result['ForumID'] . '">' . display_str($Result['ForumName']) . '</a> &gt; ';
+    $Links .= '<a href="forums.php?action=viewthread&amp;threadid=' . $Result['PageID'] . '" class="tooltip" title="' . display_str($Result['ForumTitle']) . '">' . Format::cut_string($Result['ForumTitle'], 75) . '</a> &gt; ';
+    $Links .= '<a href="forums.php?action=viewthread&amp;threadid=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'] . '">' . 'Post #' . $Result['PostID'] . '</a>';
+  } elseif ($Result['Page'] == 'artist') {
+    $Links = 'Artist: <a href="artist.php?id=' . $Result['PageID'] . '">' . display_str($Result['ArtistName']) . '</a> &gt; ';
+    $Links .= '<a href="artist.php?id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'] . '">Post #' . $Result['PostID'] . '</a>';
+  } elseif ($Result['Page'] == 'collages') {
+    $Links = 'Collage: <a href="collages.php?id=' . $Result['PageID'] . '">' . display_str($Result['CollageName']) . '</a> &gt; ';
+    $Links .= '<a href="collages.php?action=comments&amp;collageid=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'] . '">Post #' . $Result['PostID'] . '</a>';
+  } elseif ($Result['Page'] == 'requests') {
+    if (!isset($Requests[$Result['PageID']])) {
+      continue;
+    }
+    $Request = $Requests[$Result['PageID']];
+    $CategoryName = $Categories[$Request['CategoryID'] - 1];
+    $Links = 'Request: ';
+    $Links .= Artists::display_artists(Requests::get_artists($Result['PageID'])) . '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '">' . $Request['Title'] . "</a> &gt; ";
+    $Links .= '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'] . '"> Post #' . $Result['PostID'] . '</a>';
+  } elseif ($Result['Page'] == 'torrents') {
+    if (!isset($TorrentGroups[$Result['PageID']])) {
+      continue;
+    }
+    $GroupInfo = $TorrentGroups[$Result['PageID']];
+    $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '<a href="torrents.php?id=' . $GroupInfo['ID'] . '">' . ($GroupInfo['Name'] ? $GroupInfo['Name'] : ($GroupInfo['NameRJ'] ? $GroupInfo['NameRJ'] : $GroupInfo['NameJP'])) . '</a> &gt; ';
+    $Links .= '<a href="torrents.php?id=' . $GroupInfo['ID'] . '&postid=' . $Result['PostID'] . '#post' . $Result['PostID'] . '"> Post #' . $Result['PostID'] . '</a>';
+  } else {
+    continue;
   }
 ?>
   <table class="forum_post box vertical_margin noavatar">
@@ -152,14 +132,11 @@ foreach ($Results as $Result) {
       <td colspan="2">
         <span class="float_left">
           <?=$Links?>
-          &gt; Quoted by <?=Users::format_username($Result['QuoterID'], false, false, false, false) . ' ' . time_diff($Result['Date']) ?>
           <?=($Result['UnRead'] ? ' <span class="new">(New!)</span>' : '')?>
         </span>
-        <span class="float_left tooltip last_read" title="Jump to quote">
-          <a href="<?=$JumpLink?>"></a>
-        </span>
+      <td colspan="1">
         <span class="float_right">
-          <a href="#">&uarr;</a>
+          Quoted by <?=Users::format_username($Result['QuoterID'], false, false, false, false) . ' ' . time_diff($Result['Date']) ?>
         </span>
       </td>
     </tr>