Update torrent search and display, also cosmetic

classes/comments.class.php

@@ -1,442 +1,457 @@
-<?
-class Comments {
-  /*
-   * For all functions:
-   * $Page = 'artist', 'collages', 'requests' or 'torrents'
-   * $PageID = ArtistID, CollageID, RequestID or GroupID, respectively
-   */
-
-  /**
-   * Post a comment on an artist, request or torrent page.
-   * @param string $Page
-   * @param int $PageID
-   * @param string $Body
-   * @return int ID of the new comment
-   */
-  public static function post($Page, $PageID, $Body) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-      SELECT
+<?php
+
+class Comments
+{
+    /*
+     * For all functions:
+     * $Page = 'artist', 'collages', 'requests' or 'torrents'
+     * $PageID = ArtistID, CollageID, RequestID or GroupID, respectively
+     */
+
+    /**
+     * Post a comment on an artist, request or torrent page.
+     * @param string $Page
+     * @param int $PageID
+     * @param string $Body
+     * @return int ID of the new comment
+     */
+    public static function post($Page, $PageID, $Body)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
+        SELECT
         CEIL(
           (
             SELECT COUNT(ID) + 1
             FROM comments
             WHERE Page = '$Page'
-              AND PageID = $PageID
-          ) / " . TORRENT_COMMENTS_PER_PAGE . "
-        ) AS Pages");
-    list($Pages) = G::$DB->next_record();
-
-    G::$DB->query("
-      INSERT INTO comments (Page, PageID, AuthorID, AddedTime, Body)
-      VALUES ('$Page', $PageID, " . G::$LoggedUser['ID'] . ", NOW(), '" . db_string($Body) . "')");
-    $PostID = G::$DB->inserted_id();
-
-    $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $Pages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-    G::$Cache->delete_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
-    G::$Cache->delete_value($Page.'_comments_'.$PageID);
-
-    Subscriptions::flush_subscriptions($Page, $PageID);
-    Subscriptions::quote_notify($Body, $PostID, $Page, $PageID);
-
-    G::$DB->set_query_id($QueryID);
-
-    return $PostID;
-  }
-
-  /**
-   * Edit a comment
-   * @param int $PostID
-   * @param string $NewBody
-   * @param bool $SendPM If true, send a PM to the author of the comment informing him about the edit
-   * 
-   * todo: Move permission check out of here/remove hardcoded error(404)
-   */
-  public static function edit($PostID, $NewBody, $SendPM = false) {
-    $QueryID = G::$DB->get_query_id();
-
-    G::$DB->query("
-      SELECT
-        Body,
-        AuthorID,
-        Page,
-        PageID,
-        AddedTime
-      FROM comments
-      WHERE ID = $PostID");
-    if (!G::$DB->has_results()) {
-      return false;
-    }
-    list($OldBody, $AuthorID, $Page, $PageID, $AddedTime) = G::$DB->next_record();
+            AND PageID = $PageID
+            ) / " . TORRENT_COMMENTS_PER_PAGE . "
+          ) AS Pages");
+        list($Pages) = G::$DB->next_record();
 
-    if (G::$LoggedUser['ID'] != $AuthorID && !check_perms('site_moderate_forums')) {
-      return false;
-    }
+        G::$DB->query("
+        INSERT INTO comments (Page, PageID, AuthorID, AddedTime, Body)
+        VALUES ('$Page', $PageID, " . G::$LoggedUser['ID'] . ", NOW(), '" . db_string($Body) . "')");
+        $PostID = G::$DB->inserted_id();
 
-    G::$DB->query("
-      SELECT CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
-      FROM comments
-      WHERE Page = '$Page'
-        AND PageID = $PageID
-        AND ID <= $PostID");
-    list($CommPage) = G::$DB->next_record();
-
-    // Perform the update
-    G::$DB->query("
-      UPDATE comments
-      SET
-        Body = '" . db_string($NewBody) . "',
-        EditedUserID = " . G::$LoggedUser['ID'] . ",
-        EditedTime = NOW()
-      WHERE ID = $PostID");
-
-    // Update the cache
-    $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-    G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $CatalogueID);
-
-    if ($Page == 'collages') {
-      // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
-      G::$Cache->delete_value('collage_' . $PageID);
-    }
+        $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $Pages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        G::$Cache->delete_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
+        G::$Cache->delete_value($Page.'_comments_'.$PageID);
 
-    G::$DB->query("
-      INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
-      VALUES ('$Page', $PostID, " . G::$LoggedUser['ID'] . ", NOW(), '" . db_string($OldBody) . "')");
+        Subscriptions::flush_subscriptions($Page, $PageID);
+        Subscriptions::quote_notify($Body, $PostID, $Page, $PageID);
 
-    G::$DB->set_query_id($QueryID);
+        G::$DB->set_query_id($QueryID);
 
-    if ($SendPM && G::$LoggedUser['ID'] != $AuthorID) {
-      // Send a PM to the user to notify them of the edit
-      $PMSubject = "Your comment #$PostID has been edited";
-      $PMurl = site_url()."comments.php?action=jump&postid=$PostID";
-      $ProfLink = '[url='.site_url().'user.php?id='.G::$LoggedUser['ID'].']'.G::$LoggedUser['Username'].'[/url]';
-      $PMBody = "One of your comments has been edited by $ProfLink: [url]{$PMurl}[/url]";
-      Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
+        return $PostID;
     }
 
-    return true; // todo: This should reflect whether or not the update was actually successful, e.g., by checking G::$DB->affected_rows after the UPDATE query
-  }
-
-  /**
-   * Delete a comment
-   * @param int $PostID
-   */
-  public static function delete($PostID) {
-    $QueryID = G::$DB->get_query_id();
-    // Get page, pageid
-    G::$DB->query("SELECT Page, PageID FROM comments WHERE ID = $PostID");
-    if (!G::$DB->has_results()) {
-      // no such comment?
-      G::$DB->set_query_id($QueryID);
-      return false;
-    }
-    list ($Page, $PageID) = G::$DB->next_record();
-    // get number of pages
-    G::$DB->query("
-      SELECT
-        CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages,
-        CEIL(SUM(IF(ID <= $PostID, 1, 0)) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
-      FROM comments
-      WHERE Page = '$Page'
-        AND PageID = $PageID
-      GROUP BY PageID");
-    if (!G::$DB->has_results()) {
-      // the comment $PostID was probably not posted on $Page
-      G::$DB->set_query_id($QueryID);
-      return false;
-    }
-    list($CommPages, $CommPage) = G::$DB->next_record();
-
-    // $CommPages = number of pages in the thread
-    // $CommPage = which page the post is on
-    // These are set for cache clearing.
-
-    G::$DB->query("
-      DELETE FROM comments
-      WHERE ID = $PostID");
-    G::$DB->query("
-      DELETE FROM comments_edits
-      WHERE Page = '$Page'
-        AND PostID = $PostID");
-
-    G::$DB->query("
-      DELETE FROM users_notify_quoted
-      WHERE Page = '$Page'
-        AND PostID = $PostID");
-
-    Subscriptions::flush_subscriptions($Page, $PageID);
-    Subscriptions::flush_quote_notifications($Page, $PageID);
-
-    //We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
-    $ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-    $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-    for ($i = $ThisCatalogue; $i <= $LastCatalogue; ++$i) {
-      G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
-    }
+    /**
+     * Edit a comment
+     * @param int $PostID
+     * @param string $NewBody
+     * @param bool $SendPM If true, send a PM to the author of the comment informing him about the edit
+     *
+     * todo: Move permission check out of here/remove hardcoded error(404)
+     */
+    public static function edit($PostID, $NewBody, $SendPM = false)
+    {
+        $QueryID = G::$DB->get_query_id();
 
-    G::$Cache->delete_value($Page . '_comments_' . $PageID);
+        G::$DB->query("
+        SELECT
+          Body,
+          AuthorID,
+          Page,
+          PageID,
+          AddedTime
+        FROM comments
+          WHERE ID = $PostID");
+        if (!G::$DB->has_results()) {
+            return false;
+        }
+        list($OldBody, $AuthorID, $Page, $PageID, $AddedTime) = G::$DB->next_record();
 
-    if ($Page == 'collages') {
-      // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
-      G::$Cache->delete_value("collage_$PageID");
-    }
+        if (G::$LoggedUser['ID'] != $AuthorID && !check_perms('site_moderate_forums')) {
+            return false;
+        }
 
-    G::$DB->set_query_id($QueryID);
-
-    return true;
-  }
-
-  /**
-   * Get the URL to a comment, already knowing the Page and PostID
-   * @param string $Page
-   * @param int $PageID
-   * @param int $PostID
-   * @return string|bool The URL to the comment or false on error
-   */
-  public static function get_url($Page, $PageID, $PostID = null) {
-    $Post = (!empty($PostID) ? "&postid=$PostID#post$PostID" : '');
-    switch ($Page) {
-      case 'artist':
-        return "artist.php?id=$PageID$Post";
-      case 'collages':
-        return "collages.php?action=comments&collageid=$PageID$Post";
-      case 'requests':
-        return "requests.php?action=view&id=$PageID$Post";
-      case 'torrents':
-        return "torrents.php?id=$PageID$Post";
-      default:
-        return false;
-    }
-  }
-
-  /**
-   * Get the URL to a comment
-   * @param int $PostID
-   * @return string|bool The URL to the comment or false on error
-   */
-  public static function get_url_query($PostID) {
-    $QueryID = G::$DB->get_query_id();
-
-    G::$DB->query("
-      SELECT Page, PageID
-      FROM comments
-      WHERE ID = $PostID");
-    if (!G::$DB->has_results()) {
-      error(404);
-    }
-    list($Page, $PageID) = G::$DB->next_record();
-
-    G::$DB->set_query_id($QueryID);
-
-    return self::get_url($Page, $PageID, $PostID);
-  }
-
-  /**
-   * Load a page's comments. This takes care of `postid` and (indirectly) `page` parameters passed in $_GET.
-   * Quote notifications and last read are also handled here, unless $HandleSubscriptions = false is passed.
-   * @param string $Page
-   * @param int $PageID
-   * @param bool $HandleSubscriptions Whether or not to handle subscriptions (last read & quote notifications)
-   * @return array ($NumComments, $Page, $Thread, $LastRead)
-   *     $NumComments: the total number of comments on this artist/request/torrent group
-   *     $Page: the page we're currently on
-   *     $Thread: an array of all posts on this page
-   *     $LastRead: ID of the last comment read by the current user in this thread;
-   *                will be false if $HandleSubscriptions == false or if there are no comments on this page
-   */
-  public static function load($Page, $PageID, $HandleSubscriptions = true) {
-    $QueryID = G::$DB->get_query_id();
-
-    // Get the total number of comments
-    $NumComments = G::$Cache->get_value($Page."_comments_$PageID");
-    if ($NumComments === false) {
-      G::$DB->query("
-        SELECT COUNT(ID)
+        G::$DB->query("
+        SELECT CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
         FROM comments
-        WHERE Page = '$Page'
-          AND PageID = $PageID");
-      list($NumComments) = G::$DB->next_record();
-      G::$Cache->cache_value($Page."_comments_$PageID", $NumComments, 0);
+          WHERE Page = '$Page'
+          AND PageID = $PageID
+          AND ID <= $PostID");
+        list($CommPage) = G::$DB->next_record();
+
+        // Perform the update
+        G::$DB->query("
+        UPDATE comments
+        SET
+          Body = '" . db_string($NewBody) . "',
+          EditedUserID = " . G::$LoggedUser['ID'] . ",
+          EditedTime = NOW()
+        WHERE ID = $PostID");
+
+        // Update the cache
+        $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $CatalogueID);
+
+        if ($Page == 'collages') {
+            // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
+            G::$Cache->delete_value('collage_' . $PageID);
+        }
+
+        G::$DB->query("
+        INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
+        VALUES ('$Page', $PostID, " . G::$LoggedUser['ID'] . ", NOW(), '" . db_string($OldBody) . "')");
+
+        G::$DB->set_query_id($QueryID);
+
+        if ($SendPM && G::$LoggedUser['ID'] != $AuthorID) {
+            // Send a PM to the user to notify them of the edit
+            $PMSubject = "Your comment #$PostID has been edited";
+            $PMurl = site_url()."comments.php?action=jump&postid=$PostID";
+            $ProfLink = '[url='.site_url().'user.php?id='.G::$LoggedUser['ID'].']'.G::$LoggedUser['Username'].'[/url]';
+            $PMBody = "One of your comments has been edited by $ProfLink: [url]{$PMurl}[/url]";
+            Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
+        }
+
+        return true; // todo: This should reflect whether or not the update was actually successful, e.g., by checking G::$DB->affected_rows after the UPDATE query
     }
 
-    // If a postid was passed, we need to determine which page that comment is on.
-    // Format::page_limit handles a potential $_GET['page']
-    if (isset($_GET['postid']) && is_number($_GET['postid']) && $NumComments > TORRENT_COMMENTS_PER_PAGE) {
-      G::$DB->query("
-        SELECT COUNT(ID)
+    /**
+     * Delete a comment
+     * @param int $PostID
+     */
+    public static function delete($PostID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        // Get page, pageid
+        G::$DB->query("SELECT Page, PageID FROM comments WHERE ID = $PostID");
+        if (!G::$DB->has_results()) {
+            // no such comment?
+            G::$DB->set_query_id($QueryID);
+            return false;
+        }
+        list($Page, $PageID) = G::$DB->next_record();
+        // get number of pages
+        G::$DB->query("
+        SELECT
+          CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages,
+          CEIL(SUM(IF(ID <= $PostID, 1, 0)) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
         FROM comments
-        WHERE Page = '$Page'
+          WHERE Page = '$Page'
           AND PageID = $PageID
-          AND ID <= $_GET[postid]");
-      list($PostNum) = G::$DB->next_record();
-      list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $PostNum);
-    } else {
-      list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $NumComments);
-    }
+        GROUP BY PageID");
+        if (!G::$DB->has_results()) {
+            // the comment $PostID was probably not posted on $Page
+            G::$DB->set_query_id($QueryID);
+            return false;
+        }
+        list($CommPages, $CommPage) = G::$DB->next_record();
+
+        // $CommPages = number of pages in the thread
+        // $CommPage = which page the post is on
+        // These are set for cache clearing.
 
-    // Get the cache catalogue
-    $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        G::$DB->query("
+        DELETE FROM comments
+          WHERE ID = $PostID");
+        G::$DB->query("
+        DELETE FROM comments_edits
+          WHERE Page = '$Page'
+          AND PostID = $PostID");
 
-    // Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
-    $Catalogue = G::$Cache->get_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
-    if ($Catalogue === false) {
-      $CatalogueLimit = $CatalogueID * THREAD_CATALOGUE . ', ' . THREAD_CATALOGUE;
-      G::$DB->query("
-        SELECT
-          c.ID,
-          c.AuthorID,
-          c.AddedTime,
-          c.Body,
-          c.EditedUserID,
-          c.EditedTime,
-          u.Username
-        FROM comments AS c
-          LEFT JOIN users_main AS u ON u.ID = c.EditedUserID
-        WHERE c.Page = '$Page'
-          AND c.PageID = $PageID
-        ORDER BY c.ID
-        LIMIT $CatalogueLimit");
-      $Catalogue = G::$DB->to_array(false, MYSQLI_ASSOC);
-      G::$Cache->cache_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
+        G::$DB->query("
+        DELETE FROM users_notify_quoted
+          WHERE Page = '$Page'
+          AND PostID = $PostID");
+
+        Subscriptions::flush_subscriptions($Page, $PageID);
+        Subscriptions::flush_quote_notifications($Page, $PageID);
+
+        // We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
+        $ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        for ($i = $ThisCatalogue; $i <= $LastCatalogue; ++$i) {
+            G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
+        }
+
+        G::$Cache->delete_value($Page . '_comments_' . $PageID);
+
+        if ($Page === 'collages') {
+            // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
+            G::$Cache->delete_value("collage_$PageID");
+        }
+
+        G::$DB->set_query_id($QueryID);
+
+        return true;
     }
 
-    //This is a hybrid to reduce the catalogue down to the page elements: We use the page limit % catalogue
-    $Thread = array_slice($Catalogue, ((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) % THREAD_CATALOGUE), TORRENT_COMMENTS_PER_PAGE, true);
+    /**
+     * Get the URL to a comment, already knowing the Page and PostID
+     * @param string $Page
+     * @param int $PageID
+     * @param int $PostID
+     * @return string|bool The URL to the comment or false on error
+     */
+    public static function get_url($Page, $PageID, $PostID = null)
+    {
+        $Post = (!empty($PostID) ? "&postid=$PostID#post$PostID" : '');
+        switch ($Page) {
+        case 'artist':
+            return "artist.php?id=$PageID$Post";
+        case 'collages':
+            return "collages.php?action=comments&collageid=$PageID$Post";
+        case 'requests':
+            return "requests.php?action=view&id=$PageID$Post";
+        case 'torrents':
+            return "torrents.php?id=$PageID$Post";
+        default:
+            return false;
+        }
+    }
 
-    if ($HandleSubscriptions && count($Thread) > 0) {
-      // quote notifications
-      $LastPost = end($Thread);
-      $LastPost = $LastPost['ID'];
-      $FirstPost = reset($Thread);
-      $FirstPost = $FirstPost['ID'];
-      G::$DB->query("
-        UPDATE users_notify_quoted
-        SET UnRead = false
-        WHERE UserID = " . G::$LoggedUser['ID'] . "
-          AND Page = '$Page'
+    /**
+     * Get the URL to a comment
+     * @param int $PostID
+     * @return string|bool The URL to the comment or false on error
+     */
+    public static function get_url_query($PostID)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
+        SELECT Page, PageID
+        FROM comments
+          WHERE ID = $PostID");
+
+        if (!G::$DB->has_results()) {
+            error(404);
+        }
+
+        list($Page, $PageID) = G::$DB->next_record();
+        G::$DB->set_query_id($QueryID);
+
+        return self::get_url($Page, $PageID, $PostID);
+    }
+
+    /**
+     * Load a page's comments. This takes care of `postid` and (indirectly) `page` parameters passed in $_GET.
+     * Quote notifications and last read are also handled here, unless $HandleSubscriptions = false is passed.
+     * @param string $Page
+     * @param int $PageID
+     * @param bool $HandleSubscriptions Whether or not to handle subscriptions (last read & quote notifications)
+     * @return array ($NumComments, $Page, $Thread, $LastRead)
+     *     $NumComments: the total number of comments on this artist/request/torrent group
+     *     $Page: the page we're currently on
+     *     $Thread: an array of all posts on this page
+     *     $LastRead: ID of the last comment read by the current user in this thread;
+     *                will be false if $HandleSubscriptions == false or if there are no comments on this page
+     */
+    public static function load($Page, $PageID, $HandleSubscriptions = true)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        // Get the total number of comments
+        $NumComments = G::$Cache->get_value($Page."_comments_$PageID");
+        if ($NumComments === false) {
+            G::$DB->query("
+            SELECT COUNT(ID)
+            FROM comments
+              WHERE Page = '$Page'
+              AND PageID = $PageID");
+            list($NumComments) = G::$DB->next_record();
+            G::$Cache->cache_value($Page."_comments_$PageID", $NumComments, 0);
+        }
+
+        // If a postid was passed, we need to determine which page that comment is on.
+        // Format::page_limit handles a potential $_GET['page']
+        if (isset($_GET['postid']) && is_number($_GET['postid']) && $NumComments > TORRENT_COMMENTS_PER_PAGE) {
+            G::$DB->query("
+        SELECT COUNT(ID)
+        FROM comments
+        WHERE Page = '$Page'
           AND PageID = $PageID
-          AND PostID >= $FirstPost
-          AND PostID <= $LastPost");
-      if (G::$DB->affected_rows()) {
-        G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']);
-      }
-
-      // last read
-      G::$DB->query("
+          AND ID <= $_GET[postid]");
+            list($PostNum) = G::$DB->next_record();
+            list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $PostNum);
+        } else {
+            list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $NumComments);
+        }
+
+        // Get the cache catalogue
+        $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+
+        // Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
+        $Catalogue = G::$Cache->get_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
+        if ($Catalogue === false) {
+            $CatalogueLimit = $CatalogueID * THREAD_CATALOGUE . ', ' . THREAD_CATALOGUE;
+            G::$DB->query("
+                SELECT
+                  c.ID,
+                  c.AuthorID,
+                  c.AddedTime,
+                  c.Body,
+                  c.EditedUserID,
+                  c.EditedTime,
+                  u.Username
+                FROM comments AS c
+                  LEFT JOIN users_main AS u ON u.ID = c.EditedUserID
+                  WHERE c.Page = '$Page'
+                  AND c.PageID = $PageID
+                ORDER BY c.ID
+                LIMIT $CatalogueLimit");
+            $Catalogue = G::$DB->to_array(false, MYSQLI_ASSOC);
+            G::$Cache->cache_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
+        }
+
+        // This is a hybrid to reduce the catalogue down to the page elements: We use the page limit % catalogue
+        $Thread = array_slice($Catalogue, ((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) % THREAD_CATALOGUE), TORRENT_COMMENTS_PER_PAGE, true);
+
+        if ($HandleSubscriptions && count($Thread) > 0) {
+            // Quote notifications
+            $LastPost = end($Thread);
+            $LastPost = $LastPost['ID'];
+            $FirstPost = reset($Thread);
+            $FirstPost = $FirstPost['ID'];
+            G::$DB->query("
+                UPDATE users_notify_quoted
+                SET UnRead = false
+                  WHERE UserID = " . G::$LoggedUser['ID'] . "
+                  AND Page = '$Page'
+                  AND PageID = $PageID
+                  AND PostID >= $FirstPost
+                  AND PostID <= $LastPost");
+            if (G::$DB->affected_rows()) {
+                G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']);
+            }
+
+            // Last read
+            G::$DB->query("
         SELECT PostID
         FROM users_comments_last_read
-        WHERE UserID = " . G::$LoggedUser['ID'] . "
+          WHERE UserID = " . G::$LoggedUser['ID'] . "
           AND Page = '$Page'
           AND PageID = $PageID");
-      list($LastRead) = G::$DB->next_record();
-      if ($LastRead < $LastPost) {
-        G::$DB->query("
+            list($LastRead) = G::$DB->next_record();
+            if ($LastRead < $LastPost) {
+                G::$DB->query("
           INSERT INTO users_comments_last_read
             (UserID, Page, PageID, PostID)
           VALUES
             (" . G::$LoggedUser['ID'] . ", '$Page', $PageID, $LastPost)
           ON DUPLICATE KEY UPDATE
             PostID = $LastPost");
-        G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
-      }
-    } else {
-      $LastRead = false;
-    }
+                G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
+            }
+        } else {
+            $LastRead = false;
+        }
 
-    G::$DB->set_query_id($QueryID);
-
-    return array($NumComments, $CommPage, $Thread, $LastRead);
-  }
-
-  /**
-   * Merges all comments from $Page/$PageID into $Page/$TargetPageID. This also takes care of quote notifications, subscriptions and cache.
-   * @param type $Page
-   * @param type $PageID
-   * @param type $TargetPageID
-   */
-  public static function merge($Page, $PageID, $TargetPageID) {
-    $QueryID = G::$DB->get_query_id();
-
-    G::$DB->query("
-      UPDATE comments
-      SET PageID = $TargetPageID
-      WHERE Page = '$Page'
-        AND PageID = $PageID");
-
-    // quote notifications
-    G::$DB->query("
-      UPDATE users_notify_quoted
-      SET PageID = $TargetPageID
-      WHERE Page = '$Page'
-        AND PageID = $PageID");
-
-    // comment subscriptions
-    Subscriptions::move_subscriptions($Page, $PageID, $TargetPageID);
-
-    // cache (we need to clear all comment catalogues)
-    G::$DB->query("
-      SELECT
-        CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
-      FROM comments
-      WHERE Page = '$Page'
-        AND PageID = $TargetPageID
-      GROUP BY PageID");
-    list($CommPages) = G::$DB->next_record();
-    $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-    for ($i = 0; $i <= $LastCatalogue; ++$i) {
-      G::$Cache->delete_value($Page . "_comments_$TargetPageID" . "_catalogue_$i");
-    }
-    G::$Cache->delete_value($Page."_comments_$TargetPageID");
-    G::$DB->set_query_id($QueryID);
-  }
-
-  /**
-   * Delete all comments on $Page/$PageID (deals with quote notifications and subscriptions as well)
-   * @param string $Page
-   * @param int $PageID
-   * @return boolean
-   */
-  public static function delete_page($Page, $PageID) {
-    $QueryID = G::$DB->get_query_id();
-
-    // get number of pages
-    G::$DB->query("
-      SELECT
-        CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
-      FROM comments
-      WHERE Page = '$Page'
-        AND PageID = $PageID
-      GROUP BY PageID");
-    if (!G::$DB->has_results()) {
-      return false;
+        G::$DB->set_query_id($QueryID);
+
+        return array($NumComments, $CommPage, $Thread, $LastRead);
     }
-    list($CommPages) = G::$DB->next_record();
-
-    // Delete comments
-    G::$DB->query("
-      DELETE FROM comments
-      WHERE Page = '$Page'
-        AND PageID = $PageID");
-
-    // Delete quote notifications
-    Subscriptions::flush_quote_notifications($Page, $PageID);
-    G::$DB->query("
-      DELETE FROM users_notify_quoted
-      WHERE Page = '$Page'
-        AND PageID = $PageID");
-
-    // Deal with subscriptions
-    Subscriptions::move_subscriptions($Page, $PageID, null);
-
-    // Clear cache
-    $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-    for ($i = 0; $i <= $LastCatalogue; ++$i) {
-      G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
+
+    /**
+     * Merges all comments from $Page/$PageID into $Page/$TargetPageID. This also takes care of quote notifications, subscriptions and cache.
+     * @param type $Page
+     * @param type $PageID
+     * @param type $TargetPageID
+     */
+    public static function merge($Page, $PageID, $TargetPageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
+        UPDATE comments
+        SET PageID = $TargetPageID
+          WHERE Page = '$Page'
+          AND PageID = $PageID");
+
+        // quote notifications
+        G::$DB->query("
+        UPDATE users_notify_quoted
+        SET PageID = $TargetPageID
+          WHERE Page = '$Page'
+          AND PageID = $PageID");
+
+        // comment subscriptions
+        Subscriptions::move_subscriptions($Page, $PageID, $TargetPageID);
+
+        // cache (we need to clear all comment catalogues)
+        G::$DB->query("
+        SELECT
+          CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
+        FROM comments
+          WHERE Page = '$Page'
+          AND PageID = $TargetPageID
+        GROUP BY PageID");
+
+        list($CommPages) = G::$DB->next_record();
+        $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        
+        for ($i = 0; $i <= $LastCatalogue; ++$i) {
+            G::$Cache->delete_value($Page . "_comments_$TargetPageID" . "_catalogue_$i");
+        }
+
+        G::$Cache->delete_value($Page."_comments_$TargetPageID");
+        G::$DB->set_query_id($QueryID);
     }
-    G::$Cache->delete_value($Page.'_comments_'.$PageID);
 
-    G::$DB->set_query_id($QueryID);
+    /**
+     * Delete all comments on $Page/$PageID (deals with quote notifications and subscriptions as well)
+     * @param string $Page
+     * @param int $PageID
+     * @return boolean
+     */
+    public static function delete_page($Page, $PageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        // get number of pages
+        G::$DB->query("
+        SELECT
+          CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
+        FROM comments
+          WHERE Page = '$Page'
+          AND PageID = $PageID
+        GROUP BY PageID");
+
+        if (!G::$DB->has_results()) {
+            return false;
+        }
+        list($CommPages) = G::$DB->next_record();
+
+        // Delete comments
+        G::$DB->query("
+        DELETE FROM comments
+          WHERE Page = '$Page'
+          AND PageID = $PageID");
 
-    return true;
-  }
+        // Delete quote notifications
+        Subscriptions::flush_quote_notifications($Page, $PageID);
+        G::$DB->query("
+        DELETE FROM users_notify_quoted
+          WHERE Page = '$Page'
+          AND PageID = $PageID");
+
+        // Deal with subscriptions
+        Subscriptions::move_subscriptions($Page, $PageID, null);
+
+        // Clear cache
+        $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+        for ($i = 0; $i <= $LastCatalogue; ++$i) {
+            G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
+        }
+
+        G::$Cache->delete_value($Page.'_comments_'.$PageID);
+        G::$DB->set_query_id($QueryID);
+
+        return true;
+    }
 }

classes/format.class.php

@@ -1,4 +1,5 @@
 <?php
+
 class Format
 {
 
@@ -47,7 +48,7 @@ class Format
     public static function cut_string($Str, $Length, $Hard = false, $ShowDots = true)
     {
         if (mb_strlen($Str, 'UTF-8') > $Length) {
-            if ($Hard == 0) {
+            if ($Hard === 0) {
                 // Not hard, cut at closest word
                 $CutDesc = mb_substr($Str, 0, $Length, 'UTF-8');
                 $DescArr = explode(' ', $CutDesc);
@@ -130,7 +131,7 @@ class Format
         $Ratio = self::get_ratio($Dividend, $Divisor);
 
         if ($Ratio === false) {
-            return '--';
+            return '&ndash;';
         }
         if ($Ratio === '∞') {
             return '<span class="tooltip r99" title="Infinite">∞</span>';
@@ -156,10 +157,10 @@ class Format
      */
     public static function get_ratio($Dividend, $Divisor, $Decimal = 2)
     {
-        if ($Divisor == 0 && $Dividend == 0) {
+        if ($Divisor === 0 && $Dividend === 0) {
             return false;
         }
-        if ($Divisor == 0) {
+        if ($Divisor === 0) {
             return '∞';
         }
         return number_format(max($Dividend / $Divisor - (0.5 / pow(10, $Decimal)), 0), $Decimal);
@@ -206,6 +207,7 @@ class Format
     {
         if (!isset($_GET['page'])) {
             $Page = ceil($DefaultResult / $PerPage);
+            # todo: Strict equality breaks comment fetching
             if ($Page == 0) {
                 $Page = 1;
             }
@@ -224,7 +226,7 @@ class Format
     }
 
     // A9 magic. Some other poor soul can write the phpdoc.
-    // For data stored in memcached catalogues (giant arrays), e.g. forum threads
+    // For data stored in memcached catalogues (giant arrays), e.g., forum threads
     public static function catalogue_limit($Page, $PerPage, $CatalogueSize = 500)
     {
         $CatalogueID = floor(($PerPage * $Page - $PerPage) / $CatalogueSize);
@@ -237,7 +239,8 @@ class Format
         return array_slice($Catalogue, (($PerPage * $Page - $PerPage) % $CatalogueSize), $PerPage, true);
     }
 
-    /* Get pages
+    /*
+     * Get pages
      * Returns a page list, given certain information about the pages.
      *
      * @param int $StartPage: The current record the page you're on starts with.
@@ -285,7 +288,7 @@ class Format
             $StartPosition = max($StartPosition, 1);
 
             $QueryString = self::get_url(array('page', 'post'));
-            if ($QueryString != '') {
+            if ($QueryString !== '') {
                 $QueryString = "&amp;$QueryString";
             }
 
@@ -299,7 +302,7 @@ class Format
 
             if (!$Mobile) {
                 for ($i = $StartPosition; $i <= $StopPage; $i++) {
-                    if ($i != $StartPage) {
+                    if ($i !== $StartPage) {
                         $Pages .= "<a href=\"$Location?page=$i$QueryString$Anchor\">";
                     }
                     $Pages .= '<strong>';
@@ -310,7 +313,7 @@ class Format
                     }
 
                     $Pages .= '</strong>';
-                    if ($i != $StartPage) {
+                    if ($i !== $StartPage) {
                         $Pages .= '</a>';
                     }
                     if ($i < $StopPage) {
@@ -346,7 +349,7 @@ class Format
         $Size = (double)$Size;
         for ($Steps = 0; abs($Size) >= 1024 && $Steps < count($Units); $Size /= 1024, $Steps++) {
         }
-        if (func_num_args() == 1 && $Steps >= 4) {
+        if (func_num_args() === 1 && $Steps >= 4) {
             $Levels++;
         }
         return number_format($Size, $Levels) . ' ' . $Units[$Steps];
@@ -445,7 +448,7 @@ class Format
             $Array = $_GET;
         }
         if (isset($Array[$Name]) && $Array[$Name] !== '') {
-            if ($Array[$Name] == $Value) {
+            if ($Array[$Name] === $Value) {
                 echo " $Attribute=\"$Attribute\"";
             }
         }
@@ -515,7 +518,7 @@ class Format
      */
     public static function make_utf8($Str)
     {
-        if ($Str != '') {
+        if ($Str !== '') {
             if (self::is_utf8($Str)) {
                 $Encoding = 'UTF-8';
             }
@@ -525,7 +528,7 @@ class Format
             if (empty($Encoding)) {
                 $Encoding = 'ISO-8859-1';
             }
-            if ($Encoding == 'UTF-8') {
+            if ($Encoding === 'UTF-8') {
                 return $Str;
             } else {
                 return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
@@ -543,15 +546,15 @@ class Format
     {
         return preg_match(
             '%^(?:
-      [\x09\x0A\x0D\x20-\x7E]              // ASCII
-      | [\xC2-\xDF][\x80-\xBF]             // non-overlong 2-byte
-      | \xE0[\xA0-\xBF][\x80-\xBF]         // excluding overlongs
-      | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  // straight 3-byte
-      | \xED[\x80-\x9F][\x80-\xBF]         // excluding surrogates
-      | \xF0[\x90-\xBF][\x80-\xBF]{2}      // planes 1-3
-      | [\xF1-\xF3][\x80-\xBF]{3}          // planes 4-15
-      | \xF4[\x80-\x8F][\x80-\xBF]{2}      // plane 16
-      )*$%xs',
+            [\x09\x0A\x0D\x20-\x7E]            // ASCII
+          | [\xC2-\xDF][\x80-\xBF]             // Non-overlong 2-byte
+          | \xE0[\xA0-\xBF][\x80-\xBF]         // Excluding overlongs
+          | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  // Straight 3-byte
+          | \xED[\x80-\x9F][\x80-\xBF]         // Excluding surrogates
+          | \xF0[\x90-\xBF][\x80-\xBF]{2}      // Planes 1-3
+          | [\xF1-\xF3][\x80-\xBF]{3}          // Planes 4-15
+          | \xF4[\x80-\x8F][\x80-\xBF]{2}      // Plane 16
+            )*$%xs',
             $Str
         );
     }

classes/sphinxql.class.php

@@ -1,4 +1,5 @@
 <?php
+
 if (!extension_loaded('mysqli')) {
     error('Mysqli Extension not loaded.');
 }
@@ -15,7 +16,6 @@ class Sphinxql extends mysqli
     public static $Queries = [];
     public static $Time = 0.0;
 
-
     /**
      * Initialize Sphinxql object
      *

classes/sphinxqlquery.class.php

@@ -1,4 +1,5 @@
 <?php
+
 class SphinxqlQuery
 {
     private $Sphinxql;

classes/sphinxqlresult.class.php

@@ -1,4 +1,5 @@
 <?php
+
 class SphinxqlResult
 {
     private $Result;

classes/torrents.class.php

@@ -60,7 +60,7 @@ class Torrents
                 continue;
             }
             $Data = G::$Cache->get_value($Key . $GroupID, true);
-            if (!empty($Data) && is_array($Data) && $Data['ver'] == Cache::GROUP_VERSION) {
+            if (!empty($Data) && is_array($Data) && $Data['ver'] === Cache::GROUP_VERSION) {
                 unset($NotFound[$GroupID]);
                 $Found[$GroupID] = $Data['d'];
             }
@@ -83,10 +83,10 @@ class Torrents
             $NotFound = [];
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          ID, Name, NameRJ, NameJP, Year, CatalogueNumber, Pages, Studio, Series, DLSiteID, TagList, WikiImage, CategoryID
-        FROM torrents_group
-        WHERE ID IN ($IDs)");
+                SELECT
+                 ID, Name, NameRJ, NameJP, Year, CatalogueNumber, Pages, Studio, Series, DLSiteID, TagList, WikiImage, CategoryID
+                FROM torrents_group
+                WHERE ID IN ($IDs)");
 
             while ($Group = G::$DB->next_record(MYSQLI_ASSOC, true)) {
                 $NotFound[$Group['ID']] = $Group;
@@ -115,15 +115,15 @@ class Torrents
             if ($Torrents) {
                 $QueryID = G::$DB->get_query_id();
                 G::$DB->query("
-          SELECT
-            ID, GroupID, Media, Container, Codec, Resolution, AudioFormat,
-            Language, Subbing, Subber, Censored, Archive, FileCount, FreeTorrent,
-            Size, Leechers, Seeders, Snatched, Time, f.ExpiryTime, ID AS HasFile,
-            FreeLeechType, hex(info_hash) as info_hash
-          FROM torrents
-          LEFT JOIN shop_freeleeches AS f ON f.TorrentID=ID
-          WHERE GroupID IN ($IDs)
-          ORDER BY GroupID, Media, Container, Codec, ID");
+                    SELECT
+                      ID, GroupID, Media, Container, Codec, Resolution, AudioFormat,
+                      Language, Subbing, Subber, Censored, Archive, FileCount, FreeTorrent,
+                      Size, Leechers, Seeders, Snatched, Time, f.ExpiryTime, ID AS HasFile,
+                      FreeLeechType, hex(info_hash) as info_hash
+                    FROM torrents
+                      LEFT JOIN shop_freeleeches AS f ON f.TorrentID=ID
+                    WHERE GroupID IN ($IDs)
+                    ORDER BY GroupID, Media, Container, Codec, ID");
                 while ($Torrent = G::$DB->next_record(MYSQLI_ASSOC, true)) {
                     $NotFound[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
                 }
@@ -137,7 +137,7 @@ class Torrents
             $Found = $NotFound + $Found;
         }
 
-        // Filter out orphans (elements that are == false)
+        // Filter out orphans (elements that are === false)
         $Found = array_filter($Found);
 
         if ($GetArtists) {
@@ -208,20 +208,25 @@ class Torrents
      */
     public static function torrent_properties(&$Torrent, &$Flags)
     {
+        # FL Token
         $Torrent['PersonalFL'] = empty($Torrent['FreeTorrent']) && self::has_token($Torrent['ID']);
-        if ($Torrent['IsSnatched'] = self::has_snatched($Torrent['ID'])) {
+
+        # Snatched
+        if ($Torrent['IsSnatched'] === self::has_snatched($Torrent['ID'])) {
             $Flags['IsSnatched'] = true;
         } else {
             $Flags['IsSnatched'] = false;
         }
 
-        if ($Torrent['IsSeeding'] = self::is_seeding($Torrent['ID'])) {
+        # Seeding
+        if ($Torrent['IsSeeding'] === self::is_seeding($Torrent['ID'])) {
             $Flags['IsSeeding'] = true;
         } else {
             $Flags['IsSeeding'] = false;
         }
 
-        if ($Torrent['IsLeeching'] = self::is_leeching($Torrent['ID'])) {
+        # Leeching
+        if ($Torrent['IsLeeching'] === self::is_leeching($Torrent['ID'])) {
             $Flags['IsLeeching'] = true;
         } else {
             $Flags['IsLeeching'] = false;
@@ -664,23 +669,45 @@ class Torrents
     public static function torrent_info($Data, $ShowMedia = true, $ShowEdition = false, $HTMLy = true)
     {
         $Info = [];
+
+        # Platform
         if ($ShowMedia && !empty($Data['Media'])) {
-            $Info[] = $Data['Media'];
+            $Info[] = display_str($Data['Media']);
         }
+
+        # Format
         if (!empty($Data['Container'])) {
-            $Info[] = $Data['Container'];
+            $Info[] = display_str($Data['Container']);
         }
-        if (!empty($Data['Codec'])) {
-            $Info[] = $Data['Codec'];
+
+        # Archive
+        if (!empty($Data['Archive'])) {
+            $Info[] = display_str($Data['Archive']);
         }
+
+        # Resolution
         if (!empty($Data['Resolution'])) {
-            $Info[] = $Data['Resolution'];
+            $Info[] = display_str($Data['Resolution']);
+        }
+        
+        # License
+        if (!empty($Data['Codec'])) {
+            $Info[] = display_str($Data['Codec']);
+        }
+
+        # Alignned/Annotated
+        if ($Data['Censored'] === 1) {
+            $Info[] = 'Aligned';
+        } else {
+            $Info[] = 'Unaligned';
         }
+
         /*
         if (!empty($Data['AudioFormat'])) {
           $Info[] = $Data['AudioFormat'];
         }
         */
+
         /*
         if (!empty($Data['Language'])) {
           if (!empty($Data['Subber']) && isset($Data['CategoryID']) && ($Data['CategoryID'] == 3 || $Data['CategoryID'] == 4)) {
@@ -690,6 +717,7 @@ class Torrents
           }
         }
         */
+
         /*
         if (!empty($Data['Subbing'])) {
           if (!empty($Data['Subber'])) {
@@ -701,38 +729,31 @@ class Torrents
           }
         }
         */
-        if (!empty($Data['Archive'])) {
-            $Info[] = $Data['Archive'];
-        }
-        if ($Data['Censored'] === 1) {
-            $Info[] = 'Aligned';
-        } else {
-            $Info[] = 'Unaligned';
-        }
+
         if ($Data['IsLeeching']) {
-            $Info[] = $HTMLy ? Format::torrent_label('Leeching') : 'Leeching';
+            $Info[] = $HTMLy ? Format::torrent_label('Leeching', 'important_text') : 'Leeching';
         } elseif ($Data['IsSeeding']) {
-            $Info[] = $HTMLy ? Format::torrent_label('Seeding') : 'Seeding';
+            $Info[] = $HTMLy ? Format::torrent_label('Seeding', 'important_text_alt') : 'Seeding';
         } elseif ($Data['IsSnatched']) {
-            $Info[] = $HTMLy ? Format::torrent_label('Snatched') : 'Snatched';
+            $Info[] = $HTMLy ? Format::torrent_label('Snatched', 'bold') : 'Snatched';
         }
-        # todo: Check strict equality
-        if ($Data['FreeTorrent'] == '1') {
-            if ($Data['FreeLeechType'] == '3') {
+
+        if ($Data['FreeTorrent'] === '1') {
+            if ($Data['FreeLeechType'] === '3') {
                 if ($Data['ExpiryTime']) {
-                    $Info[] = ($HTMLy ? Format::torrent_label('Freeleech!') : 'Freeleech!') . ($HTMLy ? " <strong>(" : " (") . str_replace(['week','day','hour','min','Just now','s',' '], ['w','d','h','m','0m'], time_diff(max(strtotime($Data['ExpiryTime']), time()), 1, false)) . ($HTMLy ? ")</strong>" : ")");
+                    $Info[] = ($HTMLy ? Format::torrent_label('Freeleech!', 'important_text_alt') : 'Freeleech!') . ($HTMLy ? " <strong>(" : " (") . str_replace(['week','day','hour','min','Just now','s',' '], ['w','d','h','m','0m'], time_diff(max(strtotime($Data['ExpiryTime']), time()), 1, false)) . ($HTMLy ? ")</strong>" : ")");
                 } else {
-                    $Info[] = $HTMLy ? Format::torrent_label('Freeleech!') : 'Freeleech!';
+                    $Info[] = $HTMLy ? Format::torrent_label('Freeleech!', 'important_text_alt') : 'Freeleech!';
                 }
             } else {
-                $Info[] = $HTMLy ? Format::torrent_label('Freeleech!') : 'Freeleech!';
+                $Info[] = $HTMLy ? Format::torrent_label('Freeleech!', 'important_text_alt') : 'Freeleech!';
             }
         }
         if ($Data['FreeTorrent'] == '2') {
-            $Info[] = $HTMLy ? Format::torrent_label('Neutral Leech!') : 'Neutral Leech!';
+            $Info[] = $HTMLy ? Format::torrent_label('Neutral Leech!', 'bold') : 'Neutral Leech!';
         }
         if ($Data['PersonalFL']) {
-            $Info[] = $HTMLy ? Format::torrent_label('Personal Freeleech!') : 'Personal Freeleech!';
+            $Info[] = $HTMLy ? Format::torrent_label('Personal Freeleech!', 'important_text_alt') : 'Personal Freeleech!';
         }
         return implode(' / ', $Info);
     }

classes/torrentsearch.class.php

@@ -1,4 +1,5 @@
 <?php
+
 class TorrentSearch
 {
     const TAGS_ANY = 0;
@@ -50,26 +51,28 @@ class TorrentSearch
 
     // List of fields that can be used for fulltext searches
     private static $Fields = [
-    'artistname' => 1,
-    'audioformat' => 1,
-    'cataloguenumber' => 1,
-    'codec' => 1,
-    'container' => 1,
-    'description' => 1,
-    #'dlsiteid' => 1,
+    'artistname' => 1, # Author
+    'audioformat' => 1, # Version
+    'cataloguenumber' => 1, # Accession Number
+    'numbers' => 1, # Combined ↑
+    'codec' => 1, # License
+    'container' => 1, # Format
+    'description' => 1, # Not group desc
+    'dlsiteid' => 1,
     'filelist' => 1,
-    'groupname' => 1,
-    'groupnamerj' => 1,
-    'groupnamejp' => 1,
+    'groupname' => 1, # Title
+    'groupnamerj' => 1, # Organism
+    'groupnamejp' => 1, # Strain
     'advgroupname' => 1,
-    #'language' => 1,
-    'media' => 1,
-    'resolution' => 1,
+    'language' => 1,
+    'media' => 1, # Platform
+    'resolution' => 1, # Assembly Level
     'searchstr' => 1,
-    'series' => 1,
-    'studio' => 1,
-    #'subber' => 1,
-    #'subbing' => 1,
+    'series' => 1, # Location
+    'studio' => 1, # Department/Lab
+    'location' => 1,
+    'subber' => 1,
+    'subbing' => 1,
     'taglist' => 1
   ];
 
@@ -86,9 +89,11 @@ class TorrentSearch
 
     // Some form field names don't match the ones in the index
     private static $FormsToFields = [
-        # todo: Make these filters significantly less broad
+        # todo: Keep testing the granularity of filter combos
         'searchstr' => '*',
-        'advgroupname' => '*'
+        'advgroupname' => '*', # todo: Fix this ;)
+        'numbers' => '(cataloguenumber,audioformat)',
+        'location' => '(studio,series)'
         #'searchstr' => '(groupname,groupnamerj,groupnamejp,artistname,studio,series,dlsiteid,cataloguenumber,yearfulltext)',
         #'advgroupname' => '(groupname,groupnamerj,groupnamejp)'
   ];

sections/torrents/browse.php

@@ -25,7 +25,7 @@ if (!empty($_GET['searchstr']) || !empty($_GET['groupname'])) {
         $InfoHash = $_GET['groupname'];
     }
 
-    // Search by infohash
+    // Search by info hash
     if ($InfoHash = is_valid_torrenthash($InfoHash)) {
         $InfoHash = db_string(pack('H*', $InfoHash));
         $DB->query("
@@ -111,15 +111,22 @@ if (empty($_GET['order_by']) || !isset(TorrentSearch::$SortOrders[$_GET['order_b
 
 $Page = !empty($_GET['page']) ? (int) $_GET['page'] : 1;
 $Search = new TorrentSearch($GroupResults, $OrderBy, $OrderWay, $Page, TORRENTS_PER_PAGE);
+
+# Three profile toggle options
 if (isset($LoggedUser['HideLolicon']) && $LoggedUser['HideLolicon'] === 1) {
     $Search->insert_hidden_tags('!lolicon !shotacon !toddlercon');
 }
+
+# 2
 if (isset($LoggedUser['HideScat']) && $LoggedUser['HideScat'] === 1) {
     $Search->insert_hidden_tags('!scat');
 }
+
+# 3
 if (isset($LoggedUser['HideSnuff']) && $LoggedUser['HideSnuff'] === 1) {
     $Search->insert_hidden_tags('!snuff');
 }
+
 $Results = $Search->query($_GET);
 $Groups = $Search->get_groups();
 $NumResults = $Search->record_count();
@@ -140,9 +147,11 @@ if ($AdvancedSearch) {
 }
 
 # Start the search form
+# Fortunately it's very easy to search via
+# torrentsearch.class.php
 View::show_header('Browse Torrents', 'browse');
-
 ?>
+
 <div class="thin widethin">
   <div class="header">
     <h2>Torrents</h2>
@@ -162,35 +171,42 @@ View::show_header('Browse Torrents', 'browse');
       </div>
       <div id="ft_container"
         class="pad<?=$HideFilter ? ' hidden' : ''?>">
-        <?php if ((isset($LoggedUser['HideLolicon']) && $LoggedUser['HideLolicon'] === 1)
-   || (isset($LoggedUser['HideScat'])    && $LoggedUser['HideScat']    === 1)
-   || (isset($LoggedUser['HideSnuff'])   && $LoggedUser['HideSnuff']   === 1)
-   ) { ?>
+        <?php
+        # Three profile toggles
+        if ((isset($LoggedUser['HideLolicon']) && $LoggedUser['HideLolicon'] === 1)
+         || (isset($LoggedUser['HideScat'])    && $LoggedUser['HideScat']    === 1)
+         || (isset($LoggedUser['HideSnuff'])   && $LoggedUser['HideSnuff']   === 1)
+        ) { ?>
         <svg title="Your profile settings exclude some results" class="search_warning tooltip" width="10" height="15">
           <rect x=3 width="4" height="10" rx="2" ry="2" />
           <circle cx="5" cy="13" r="2" /></svg>
-        <?php } ?>
+        <?php
+        } ?>
+
         <table class="layout">
-          <tr id="catalogue_number"
+          <tr id="numbers"
             class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!-- Catalogue Number -->
+              <!--
+                Catalogue Number / AudioFormat
+                Accession Number / Version
+              -->
             </td>
-            <td class="ft_cataloguenumber">
-              <input type="search" size="19" name="cataloguenumber" class="inputtext smallest fti_advanced"
-                placeholder="Accession Number"
-                value="<?Format::form('cataloguenumber')?>" />
+            <td class="ft_numbers">
+              <input type="search" size="30" name="numbers" class="inputtext smallest fti_advanced"
+                placeholder="Accession Number / Version"
+                value="<?Format::form('numbers')?>" />
             </td>
           </tr>
 
           <tr id="album_torrent_name"
             class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!-- Torrent Name -->
+              <!-- Torrent Title / Organism / Strain or Variety -->
             </td>
             <td class="ft_groupname">
               <input type="search" spellcheck="false" size="65" name="advgroupname"
-                class="inputtext smaller fti_advanced" placeholder="Torrent Title"
+                class="inputtext smaller fti_advanced" placeholder="Torrent Title / Organism / Strain or Variety"
                 value="<?Format::form('advgroupname')?>" />
             </td>
           </tr>
@@ -202,20 +218,26 @@ View::show_header('Browse Torrents', 'browse');
             </td>
             <td class="ft_artistname">
               <input type="search" spellcheck="false" size="65" id="artist" name="artistname"
-                class="inputtext smaller fti_advanced" placeholder="Author Name"
+                class="inputtext smaller fti_advanced" placeholder="Author (ORCiD pending)"
                 value="<?Format::form('artistname')?>"
                 <?php Users::has_autocomplete_enabled('other'); ?>/>
             </td>
           </tr>
 
-          <tr id="year" class="ftr_advanced<?=$HideAdvanced?>">
+          <tr id="location" class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!-- Year -->
+              <!-- Studio / Series -->
             </td>
-            <td class="ft_year">
+            <td class="ft_location">
+              <input type="search" name="location" class="inputtext smallest fti_advanced"
+                placeholder="Department or Lab / Location"
+                value="<?Format::form('location')?>"
+                size="40" />
+
+              <!-- Year -->
               <input type="search" name="year" class="inputtext smallest fti_advanced" placeholder="Year"
                 value="<?Format::form('year')?>"
-                size="12" />
+                size="20" />
             </td>
           </tr>
 
@@ -239,7 +261,8 @@ View::show_header('Browse Torrents', 'browse');
             <td class="ft_filelist">
               <input type="search" spellcheck="false" size="65" name="filelist" class="inputtext fti_advanced"
                 placeholder="File List"
-                value="<?Format::form('filelist')?>" />
+                value="<?Format::form('filelist')?>" /><br /><br />
+              Universal Search finds info hashes
             </td>
           </tr>
 
@@ -252,7 +275,7 @@ View::show_header('Browse Torrents', 'browse');
               <select name="media" class="ft_media fti_advanced">
                 <option value="">Sequencing</option>
                 <?php  foreach ($Media as $MediaName) { ?>
-                <option value="<?=display_str($MediaName); ?>"
+                <option value="<?=display_str($MediaName); # pcs-comment-start; keep quote ?>"
                 <?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?>
                 </option>
                 <?php  } ?>
@@ -261,7 +284,7 @@ View::show_header('Browse Torrents', 'browse');
               <select name="media" class="ft_media fti_advanced">
                 <option value="">Imaging</option>
                 <?php  foreach ($MediaManga as $MediaName) { ?>
-                <option value="<?=display_str($MediaName); ?>"
+                <option value="<?=display_str($MediaName); # pcs-comment-start; keep quote ?>"
                 <?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?>
                 </option>
                 <?php  } ?>
@@ -275,36 +298,40 @@ View::show_header('Browse Torrents', 'browse');
             <td class="label">Formats</td>
             <td class="nobr ft_ripspecifics">
 
+              <!-- 1 -->
               <select id=" container" name="container" class="ft_container fti_advanced">
                 <option value="">DNA/RNA</option>
-                <?php  foreach ($Containers as $Key => $Container) { ?>
+                <?php foreach ($Containers as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
-                <?php  } ?>
+                <?php } ?>
               </select>
 
+              <!-- 2 -->
               <select id=" container" name="container" class="ft_container fti_advanced">
                 <option value="">Proteins</option>
-                <?php  foreach ($ContainersProt as $Key => $Container) { ?>
+                <?php foreach ($ContainersProt as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
-                <?php  } ?>
+                <?php } ?>
               </select>
 
+              <!-- 3 -->
               <select id=" container" name="container" class="ft_container fti_advanced">
                 <option value="">Imaging</option>
-                <?php  foreach ($ContainersGames as $Key => $Container) { ?>
+                <?php foreach ($ContainersGames as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
-                <?php  } ?>
+                <?php } ?>
               </select>
 
+              <!-- 4 -->
               <select id=" container" name="container" class="ft_container fti_advanced">
                 <option value="">Extras</option>
-                <?php  foreach ($ContainersExtra as $Key => $Container) { ?>
-                <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
+                <?php foreach ($ContainersExtra as $Key => $Container) { ?>
+                  <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
-                <?php  } ?>
+                <?php } ?>
               </select>
             </td>
           </tr>
@@ -317,12 +344,13 @@ View::show_header('Browse Torrents', 'browse');
               <select name="resolution" class="ft_resolution fti_advanced">
                 <option value="">Assembly Level</option>
                 <?php  foreach ($Resolutions as $Resolution) { ?>
-                <option value="<?=display_str($Resolution); ?>"
+                <option value="<?=display_str($Resolution); # pcs-comment-start; keep quote ?>"
                 <?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?>
                 </option>
                 <?php  } ?>
               </select>
 
+              <!-- Aligned/Censored -->
               <select name=" censored" class="ft_censored fti_advanced">
                 <option value="">Alignment</option>
                 <option value="1" <?Format::selected('censored', 1)?>>Aligned
@@ -331,6 +359,7 @@ View::show_header('Browse Torrents', 'browse');
                 </option>
               </select>
 
+              <!-- Leech Status -->
               <select name="freetorrent" class="ft_freetorrent fti_advanced">
                 <option value="">Leech Status</option>
                 <option value="1" <?Format::selected('freetorrent', 1)?>>Freeleech
@@ -343,6 +372,7 @@ View::show_header('Browse Torrents', 'browse');
                 </option>
               </select>
 
+              <!-- Codec/License -->
               <select name="codec" class="ft_codec fti_advanced">
                 <option value="">License</option>
                 <?php  foreach ($Codecs as $Codec) { ?>
@@ -383,11 +413,11 @@ View::show_header('Browse Torrents', 'browse');
           <!-- Start basic search options -->
           <tr id="search_terms" class="ftr_basic<?=$HideBasic?>">
             <td class="label">
-              <!-- Search Terms -->
+              <!-- Universal Search -->
             </td>
             <td class="ftb_searchstr">
               <input type="search" spellcheck="false" size="48" name="searchstr" class="inputtext fti_basic"
-                placeholder="Search Terms"
+                placeholder="Universal Search"
                 value="<?Format::form('searchstr')?>"
                 aria-label="Terms to search">
             </td>
@@ -411,6 +441,7 @@ View::show_header('Browse Torrents', 'browse');
             </td>
           </tr>
 
+          <!-- Order By -->
           <tr id="order">
             <td class="label">Order By</td>
             <td class="ft_order">
@@ -442,6 +473,7 @@ View::show_header('Browse Torrents', 'browse');
             </td>
           </tr>
 
+          <!-- Use torrent groups? -->
           <tr id="search_group_results">
             <td class="label">
               <label for="group_results">Group Torrents</label>
@@ -455,19 +487,19 @@ View::show_header('Browse Torrents', 'browse');
 
         <table class="layout cat_list ft_cat_list">
           <?php
-  $x = 0;
-  reset($Categories);
-  foreach ($Categories as $CatKey => $CatName) {
-      if ($x % 7 === 0) {
-          if ($x > 0) {
-              ?>
+            $x = 0;
+            reset($Categories);
+            foreach ($Categories as $CatKey => $CatName) {
+                if ($x % 7 === 0) {
+                    if ($x > 0) {
+                        ?>
           </tr>
           <?php
-          } ?>
+                    } ?>
           <tr>
             <?php
-      }
-      $x++; ?>
+                }
+                $x++; ?>
             <td>
               <input type="checkbox"
                 name="filter_cat[<?=($CatKey + 1)?>]"
@@ -476,8 +508,7 @@ View::show_header('Browse Torrents', 'browse');
               <label for="cat_<?=($CatKey + 1)?>"><?=$CatName?></label>
             </td>
             <?php
-  }
-  ?>
+            } ?>
           </tr>
         </table>
         <table
@@ -490,7 +521,7 @@ View::show_header('Browse Torrents', 'browse');
       $DB->query('
       SELECT Name
       FROM tags
-      WHERE TagType = \'genre\'
+        WHERE TagType = \'genre\'
       ORDER BY Name');
       $GenreTags = $DB->collect('Name');
       $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
@@ -516,6 +547,8 @@ View::show_header('Browse Torrents', 'browse');
             <?php } ?>
           </tr>
         </table>
+
+        <!-- Categories -->
         <table class="layout cat_list">
           <tr>
             <td class="label">
@@ -524,6 +557,8 @@ View::show_header('Browse Torrents', 'browse');
             </td>
           </tr>
         </table>
+
+        <!-- Result count and submit button -->
         <div class="submit ft_submit">
           <span class="float_left"><?=number_format($NumResults)?>
             Results</span>
@@ -534,21 +569,23 @@ View::show_header('Browse Torrents', 'browse');
           <input type="button" value="Reset"
             onclick="location.href = 'torrents.php<?php if (isset($_GET['action']) && $_GET['action'] === 'advanced') { ?>?action=advanced<?php } ?>'" />
           &nbsp;&nbsp;
-          <?php    if ($Search->has_filters()) { ?>
+          <?php if ($Search->has_filters()) { ?>
           <input type="submit" name="setdefault" value="Make Default" />
-          <?php    }
+          <?php }
 
       if (!empty($LoggedUser['DefaultSearch'])) { ?>
           <input type="submit" name="cleardefault" value="Clear Default" />
-          <?php    } ?>
+          <?php } ?>
         </div>
       </div>
     </div>
   </form>
+
+  <!-- No results message -->
   <?php if ($NumResults === 0) { ?>
   <div class="torrents_nomatch box pad" align="center">
-    <h2>Your search did not match anything.</h2>
-    <p>Make sure all names are spelled correctly, or try making your search less specific.</p>
+    <h2>Your search did not match anything</h2>
+    <p>Make sure all names are spelled correctly, or try making your search less specific</p>
   </div>
 </div>
 <?php
@@ -559,14 +596,17 @@ die();
   if ($NumResults < ($Page - 1) * TORRENTS_PER_PAGE + 1) {
       $LastPage = ceil($NumResults / TORRENTS_PER_PAGE);
       $Pages = Format::get_pages(0, $NumResults, TORRENTS_PER_PAGE); ?>
+
 <div class="torrents_nomatch box pad" align="center">
-  <h2>The requested page contains no matches.</h2>
+  <h2>The requested page contains no matches</h2>
   <p>You are requesting page <?=$Page?>, but the search returned only
-    <?=number_format($LastPage) ?> pages.</p>
+    <?=number_format($LastPage) ?> pages</p>
 </div>
+
 <div class="linkbox">Go to page <?=$Pages?>
 </div>
 </div>
+
 <?php
     View::show_footer();
       die();
@@ -581,6 +621,7 @@ die();
 <div class="linkbox"><?=$Pages?>
 </div>
 
+<!-- Results table headings -->
 <table
   class="box torrent_table cats <?=$GroupResults ? 'grouping' : 'no_grouping'?>"
   id="torrent_table">
@@ -669,28 +710,44 @@ die();
           // These torrents are in a group
           $CoverArt = $GroupInfo['WikiImage'];
           $DisplayName .= "<a class=\"torrent_title\" href=\"torrents.php?id=$GroupID\" ";
+
+          # No cover art
           if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
               $DisplayName .= 'data-cover="'.ImageTools::process($CoverArt, 'thumb').'" ';
           }
+
+          # Japanese
           $DisplayName .= "dir=\"ltr\">$GroupName</a>";
+
+          # Year
           if ($GroupYear) {
-              $DisplayName .= " [$GroupYear]";
+              $DisplayName .= "<br />$GroupYear";
           }
+        
+          # Studio
           if ($GroupStudio) {
-              $DisplayName .= " [$GroupStudio]";
+              $DisplayName .= " / $GroupStudio";
           }
+
+          # Catalogue Number
           if ($GroupCatalogueNumber) {
-              $DisplayName .= " [$GroupCatalogueNumber]";
+              $DisplayName .= " / $GroupCatalogueNumber";
           }
+
+          /*
           if ($GroupPages) {
               $DisplayName .= " [{$GroupPages}p]";
           }
+          */
+
+          /*
           if ($GroupDLsiteID) {
               $DisplayName .= " [$GroupDLsiteID]";
-          } ?>
+          }
+          */ ?>
   <tr class="group<?=$SnatchedGroupClass?>">
     <?php
-$ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1); ?>
+      $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1); ?>
     <td class="center">
       <div id="showimg_<?=$GroupID?>"
         class="<?=($ShowGroups ? 'hide' : 'show')?>_torrents">
@@ -699,14 +756,19 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
           title="Toggle this group (Hold &quot;Shift&quot; to toggle all groups)"></a>
       </div>
     </td>
+
+    <!-- Category icon -->
     <td class="center cats_col">
       <div title="<?=Format::pretty_category($CategoryID)?>"
         class="tooltip <?=Format::css_category($CategoryID)?>">
       </div>
     </td>
+
+    <!-- [ DL | RP ] and [Bookmark] -->
     <td colspan="2" class="big_info">
       <div class="group_info clear">
         <?=$DisplayName?>
+
         <?php  if (in_array($GroupID, $Bookmarks)) { ?>
         <span class="remove_bookmark float_right">
           <a href="#" id="bookmarklink_torrent_<?=$GroupID?>"
@@ -714,6 +776,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
             onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove
             bookmark</a>
         </span>
+
         <?php  } else { ?>
         <span class="add_bookmark float_right">
           <a href="#" id="bookmarklink_torrent_<?=$GroupID?>"
@@ -722,14 +785,21 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
         </span>
         <?php  } ?>
         <br />
+
+        <!-- Tags -->
         <div class="tags"><?=$TorrentTags->format('torrents.php?'.$Action.'&amp;taglist=')?>
         </div>
       </div>
     </td>
+
+    <!-- Time -->
     <td class="nobr"><?=time_diff($GroupTime, 1)?>
     </td>
-    <td class="number_column nobr"><?=Format::get_size($MaxSize)?>
-      (Max)</td>
+
+    <!-- Size -->
+    <td class="number_column nobr"><?=Format::get_size($MaxSize)?>(Max)</td>
+
+    <!-- Snatches, seeders, and leechers -->
     <td class="number_column"><?=number_format($TotalSnatched)?>
     </td>
     <td
@@ -739,6 +809,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     <td class="number_column"><?=number_format($TotalLeechers)?>
     </td>
   </tr>
+
   <?php
     foreach ($Torrents as $TorrentID => $Data) {
         $Data['CategoryID'] = $CategoryID;
@@ -761,6 +832,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
                 $TorrentFileName = $Tor->Dec['info']['name'];
                 $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
             }
+            # Magnet link 1337 h4x
             $TorrentMG = "magnet:?dn=".rawurlencode($TorrentFileName)."&xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;', '%26', $TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=", ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
         } ?>
   <tr
@@ -769,16 +841,16 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
       <span>
         [ <a href="<?=$TorrentDL?>" class="tooltip"
           title="Download"><?=$Data['HasFile'] ? 'DL' : 'Missing'?></a>
-        <?php      if (isset($TorrentMG)) { ?>
+        <?php if (isset($TorrentMG)) { ?>
         | <a href="<?=$TorrentMG?>" class="tooltip"
           title="Magnet Link">MG</a>
-        <?php      }
+        <?php }
         if (Torrents::can_use_token($Data)) { ?>
         | <a
           href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1"
           class="tooltip" title="Use a FL Token"
           onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-        <?php      } ?>
+        <?php } ?>
         | <a
           href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>"
           class="tooltip" title="Report">RP</a> ]
@@ -807,7 +879,6 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     }
       } else {
           // Viewing a type that does not require grouping
-
           $TorrentID = key($Torrents);
           $Data = current($Torrents);
 
@@ -817,29 +888,47 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
               $Reported = true;
           }
 
+          # Main search result title link
           $Data['CategoryID'] = $CategoryID;
           $CoverArt = $GroupInfo['WikiImage'];
           $DisplayName .= "<a class=\"torrent_name\" href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
+
           if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
               $DisplayName .= 'data-cover="'.ImageTools::process($CoverArt, 'thumb').'" ';
           }
+
+          # Japanese
           $DisplayName .= "dir=\"ltr\">$GroupName</a>";
+
           if (isset($GroupedCategories[$CategoryID - 1])) {
+              # Year
+              # Sh!t h4x; Year is mandatory
               if ($GroupYear) {
-                  $DisplayName .= " [$GroupYear]";
+                  $DisplayName .= "<br /> $GroupYear";
               }
+
+              # Studio
               if ($GroupStudio) {
-                  $DisplayName .= " [$GroupStudio]";
+                  $DisplayName .= " &ndash; $GroupStudio";
               }
+
+              # Catalogue Number
               if ($GroupCatalogueNumber) {
-                  $DisplayName .= " [$GroupCatalogueNumber]";
+                  $DisplayName .= " &ndash; $GroupCatalogueNumber";
               }
+
+              /*
               if ($GroupPages) {
                   $DisplayName .= " [{$GroupPages}p]";
               }
+              */
+
+              /*
               if ($GroupDLsiteID) {
                   $DisplayName .= " [$GroupDLsiteID]";
               }
+              */
+              
               $ExtraInfo = Torrents::torrent_info($Data, true, true);
           } elseif ($Data['IsSnatched']) {
               $ExtraInfo = Format::torrent_label('Snatched!');
@@ -860,9 +949,9 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
           } ?>
   <tr
     class="torrent<?=$SnatchedTorrentClass . $SnatchedGroupClass?>">
-    <?php    if ($GroupResults) { ?>
+    <?php if ($GroupResults) { ?>
     <td></td>
-    <?php    } ?>
+    <?php } ?>
     <td class="center cats_col">
       <div title="<?=Format::pretty_category($CategoryID)?>"
         class="tooltip <?=Format::css_category($CategoryID)?>"></div>
@@ -873,35 +962,35 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
           <span>
             [ <a href="<?=$TorrentDL?>" class="tooltip"
               title="Download">DL</a>
-            <?php    if (isset($TorrentMG)) { ?>
+            <?php if (isset($TorrentMG)) { ?>
             | <a href="<?=$TorrentMG?>" class="tooltip"
               title="Magnet Link">MG</a>
-            <?php    }
+            <?php }
           if (Torrents::can_use_token($Data)) { ?>
             | <a
               href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1"
               class="tooltip" title="Use a FL Token"
               onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-            <?php    } ?>
+            <?php } ?>
             | <a
               href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>"
               class="tooltip" title="Report">RP</a> ]
           </span>
           <br />
-          <?php  if (in_array($GroupID, $Bookmarks)) { ?>
+          <?php if (in_array($GroupID, $Bookmarks)) { ?>
           <span class="remove_bookmark float_right">
             <a href="#" id="bookmarklink_torrent_<?=$GroupID?>"
               class="brackets"
               onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove
               bookmark</a>
           </span>
-          <?php  } else { ?>
+          <?php } else { ?>
           <span class="add_bookmark float_right">
             <a href="#" id="bookmarklink_torrent_<?=$GroupID?>"
               class="brackets"
               onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
           </span>
-          <?php  } ?>
+          <?php } ?>
         </div>
         <?=$DisplayName?>
         <br />
@@ -936,4 +1025,5 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
 <div class="linkbox"><?=$Pages?>
 </div>
 </div>
-<?php View::show_footer();
+<?php
+View::show_footer();

sections/torrents/details.php

@@ -1,9 +1,10 @@
 <?php
 
-function compare($X, $Y)
+function compare($x, $y)
 {
-    return($Y['name'] < $X['name']);
+    return($y['name'] < $x['name']);
 }
+
 define('MAX_PERS_COLLAGES', 3); // How many personal collages should be shown by default
 define('MAX_COLLAGES', 5); // How many normal collages should be shown by default
 
@@ -16,6 +17,7 @@ if (!empty($_GET['revisionid']) && is_number($_GET['revisionid'])) {
 
 include(SERVER_ROOT.'/sections/torrents/functions.php');
 include(SERVER_ROOT.'/classes/mediainfo.class.php');
+
 $TorrentCache = get_group_info($GroupID, true, $RevisionID);
 $TorrentDetails = $TorrentCache[0];
 $TorrentList = $TorrentCache[1];
@@ -34,19 +36,24 @@ if (!$GroupName) {
     }
 }
 
-$DisplayName = "<span dir='ltr'>$GroupName</span><br />";
+# Make the main headings
+$DisplayName = "$GroupName<br />";
 $AltName = $GroupName; // Goes in the alt text of the image
 $Title = $GroupName; // Goes in <title>
 $WikiBody = Text::full_format($WikiBody);
 
 $Artists = Artists::get_artist($GroupID);
 
-if ($GroupNameRJ && $GroupNameRJ != $GroupName) {
-    $DisplayName .= "<span dir='ltr'>$GroupNameRJ</span><br />";
+if ($GroupNameRJ && $GroupNameRJ !== $GroupName) {
+    $DisplayName .= "<em>$GroupNameRJ</em> ";
 }
 
-if ($GroupNameJP && $GroupNameJP != $GroupName) {
-    $DisplayName .= "<span dir='ltr'>$GroupNameJP</span><br />";
+if ($GroupNameJP && $GroupNameJP !== $GroupName) {
+    $DisplayName .= "$GroupNameJP";
+}
+
+if ($GroupNameRJ || $GroupNameJP) {
+    $DisplayName .= '<br />';
 }
 
 if ($Artists) {
@@ -60,29 +67,33 @@ if ($GroupCategoryID) {
 }
 
 if ($GroupYear > 0) {
-    $DisplayName .= " [$GroupYear]";
+    $DisplayName .= "$GroupYear";
     $AltName .= " [$GroupYear]";
     $Title .= " [$GroupYear]";
 }
 
 if ($GroupStudio) {
-    $DisplayName .= " [$GroupStudio]";
+    $DisplayName .= " &ndash; $GroupStudio";
 }
 
 if ($GroupCatalogueNumber) {
-    $DisplayName .= " [$GroupCatalogueNumber]";
+    $DisplayName .= "  &ndash; $GroupCatalogueNumber";
 }
 
+/*
 if ($GroupPages) {
     $DisplayName .= " [{$GroupPages}p]";
 }
+*/
 
+/*
 if ($GroupDLsiteID) {
     $DisplayName .= " [$GroupDLsiteID]";
 }
+*/
 
 $Tags = [];
-if ($TorrentTags != '') {
+if ($TorrentTags !== '') {
     $TorrentTags = explode('|', $TorrentTags);
     $TorrentTagIDs = explode('|', $TorrentTagIDs);
     $TorrentTagUserIDs = explode('|', $TorrentTagUserIDs);
@@ -104,7 +115,7 @@ if (!$CoverArt) {
     $DB->query("
     SELECT ID, Image, Summary, UserID, Time
     FROM cover_art
-    WHERE GroupID = '$GroupID'
+      WHERE GroupID = '$GroupID'
     ORDER BY Time ASC");
     $CoverArt = [];
     $CoverArt = $DB->to_array();
@@ -119,69 +130,71 @@ list($NumComments, $Page, $Thread, $LastRead) = Comments::load('torrents', $Grou
 // Start output
 View::show_header($Title, 'browse,comments,torrent,bbcode,recommend,cover_art,subscriptions');
 ?>
+
 <div class="thin">
   <div class="header">
     <h2><?=$DisplayName?>
     </h2>
     <div class="linkbox">
-      <?php  if (check_perms('site_edit_wiki')) { ?>
+      <?php if (check_perms('site_edit_wiki')) { ?>
       <a href="torrents.php?action=editgroup&amp;groupid=<?=$GroupID?>"
         class="brackets">Edit group</a>
-      <?php  } ?>
+      <?php } ?>
       <a href="torrents.php?action=history&amp;groupid=<?=$GroupID?>"
         class="brackets">View history</a>
-      <?php  if ($RevisionID && check_perms('site_edit_wiki')) { ?>
+      <?php if ($RevisionID && check_perms('site_edit_wiki')) { ?>
       <a href="torrents.php?action=revert&amp;groupid=<?=$GroupID ?>&amp;revisionid=<?=$RevisionID ?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
         class="brackets">Revert to this revision</a>
       <?php
-  }
-  if (Bookmarks::has_bookmarked('torrent', $GroupID)) {
-      ?>
+      }
+      if (Bookmarks::has_bookmarked('torrent', $GroupID)) {
+          ?>
       <a href="#" id="bookmarklink_torrent_<?=$GroupID?>"
         class="remove_bookmark brackets"
         onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove
         bookmark</a>
       <?php
-  } else { ?>
+      } else { ?>
       <a href="#" id="bookmarklink_torrent_<?=$GroupID?>"
         class="add_bookmark brackets"
         onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
-      <?php  } ?>
+      <?php } ?>
       <a href="#" id="subscribelink_torrents<?=$GroupID?>"
         class="brackets"
         onclick="SubscribeComments('torrents', <?=$GroupID?>); return false;"><?=Subscriptions::has_subscribed_comments('torrents', $GroupID) !== false ? 'Unsubscribe' : 'Subscribe'?></a>
       <?php
-  if ($Categories[$GroupCategoryID-1] == 'Movies' || $Categories[$GroupCategoryID-1] == 'Anime' || $Categories[$GroupCategoryID-1] == 'Manga' || $Categories[$GroupCategoryID-1] == 'Games') { ?>
+      # Remove category-specific options to add a new format
+      if ($Categories[$GroupCategoryID-1]) { ?>
       <a href="upload.php?groupid=<?=$GroupID?>" class="brackets">Add
         format</a>
       <?php
-  }
-  if (check_perms('site_submit_requests')) { ?>
+      }
+      if (check_perms('site_submit_requests')) { ?>
       <a href="requests.php?action=new&amp;groupid=<?=$GroupID?>"
         class="brackets">Request format</a>
-      <?php  } ?>
+      <?php } ?>
       <a href="torrents.php?action=grouplog&amp;groupid=<?=$GroupID?>"
         class="brackets">View log</a>
     </div>
   </div>
-  <?php /* Misc::display_recommend($GroupID, "torrent"); */ ?>
+  <?php Misc::display_recommend($GroupID, "torrent"); ?>
   <div class="sidebar">
     <div class="box box_image box_image_albumart box_albumart">
       <!-- .box_albumart deprecated -->
       <div class="head">
         <strong><?=(count($CoverArt) > 0 ? 'Pictures (' . (count($CoverArt) + 1) . ')' : 'Picture')?></strong>
         <?php
-      if (count($CoverArt) > 0) {
-          if (empty($LoggedUser['ShowExtraCovers'])) {
-              for ($Index = 0; $Index <= count($CoverArt); $Index++) { ?>
+        if (count($CoverArt) > 0) {
+            if (empty($LoggedUser['ShowExtraCovers'])) {
+                for ($Index = 0; $Index <= count($CoverArt); $Index++) { ?>
         <span id="cover_controls_<?=($Index)?>" <?=($Index > 0 ? ' style="display: none;"' : '')?>>
-          <?php            if ($Index == count($CoverArt)) { ?>
+          <?php if ($Index === count($CoverArt)) { ?>
           <a class="brackets prev_cover"
             data-gazelle-prev-cover="<?=($Index - 1)?>"
             href="#">Prev</a>
           <a class="brackets show_all_covers" href="#">Show all</a>
           <span class="brackets next_cover">Next</span>
-          <?php            } elseif ($Index > 0) { ?>
+          <?php } elseif ($Index > 0) { ?>
           <a class="brackets prev_cover"
             data-gazelle-prev-cover="<?=($Index - 1)?>"
             href="#">Prev</a>
@@ -189,33 +202,34 @@ View::show_header($Title, 'browse,comments,torrent,bbcode,recommend,cover_art,su
           <a class="brackets next_cover"
             data-gazelle-next-cover="<?=($Index + 1)?>"
             href="#">Next</a>
-          <?php            } elseif ($Index == 0 && count($CoverArt) > 0) { ?>
+          <?php } elseif ($Index === 0 && count($CoverArt) > 0) { ?>
           <span class="brackets prev_cover">Prev</span>
           <a class="brackets show_all_covers" href="#">Show all</a>
           <a class="brackets next_cover"
             data-gazelle-next-cover="<?=($Index + 1)?>"
             href="#">Next</a>
-          <?php            } ?>
+          <?php } ?>
         </span>
         <?php
           }
-          } else { ?>
+            } else { ?>
         <span>
           <a class="brackets show_all_covers" href="#">Hide</a>
         </span>
         <?php
+          }
         }
-      } ?>
+        ?>
       </div>
       <?php $Index = 0; ?>
       <div id="covers">
         <div id="cover_div_<?=$Index?>">
-          <?php  if ($WikiImage != '') { ?>
+          <?php if ($WikiImage !== '') { ?>
           <div><img width="100%" class="lightbox-init"
               src="<?=ImageTools::process($WikiImage, 'thumb')?>"
               lightbox-img="<?=ImageTools::process($WikiImage)?>"
               alt="<?=$AltName?>" /></div>
-          <?php  } else { ?>
+          <?php } else { ?>
           <div><img width="100%"
               src="<?=STATIC_SERVER?>common/noartwork/music.png"
               alt="<?=$Categories[$GroupCategoryID - 1]?>"
@@ -226,8 +240,9 @@ View::show_header($Title, 'browse,comments,torrent,bbcode,recommend,cover_art,su
 $Index++;
 ?>
         </div>
-        <?php      foreach ($CoverArt as $Cover) {
-    list($ImageID, $Image, $Summary, $AddedBy) = $Cover; ?>
+        <?php
+        foreach ($CoverArt as $Cover) {
+            list($ImageID, $Image, $Summary, $AddedBy) = $Cover; ?>
         <div id="cover_div_<?=$Index?>" <?=(empty($LoggedUser['ShowExtraCovers']) ? ' style="display: none;"' : '')?>>
           <div>
             <?php
@@ -244,18 +259,18 @@ $Index++;
               <?=$Summary?>
               <?=(check_perms('users_mod') ? ' added by ' . Users::format_username($AddedBy, false, false, false, false, false) : '')?>
               <span class="remove remove_cover_art"><a href="#"
-                  onclick="if (confirm('Do not delete valid alternative cover art. Are you sure you want to delete this cover art?') == true) { ajax.get('torrents.php?action=remove_cover_art&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;id=<?=$ImageID?>&amp;groupid=<?=$GroupID?>'); this.parentNode.parentNode.parentNode.style.display = 'none'; this.parentNode.parentNode.parentNode.previousElementSibling.style.display = 'none'; } else { return false; }"
+                  onclick="if (confirm('Do not delete useful alternative pictures. Are you sure you want to delete this picture?') === true) { ajax.get('torrents.php?action=remove_cover_art&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;id=<?=$ImageID?>&amp;groupid=<?=$GroupID?>'); this.parentNode.parentNode.parentNode.style.display = 'none'; this.parentNode.parentNode.parentNode.previousElementSibling.style.display = 'none'; } else { return false; }"
                   class="brackets tooltip" title="Remove image">X</a></span>
             </li>
           </ul>
         </div>
         <?php
         $Index++;
-} ?>
+        } ?>
       </div>
 
       <?php
-    if (check_perms('site_edit_wiki') && $WikiImage != '') { ?>
+    if (check_perms('site_edit_wiki') && $WikiImage !== '') { ?>
       <div id="add_cover_div">
         <div style="padding: 10px;">
           <span class="additional_add_artists float_right">
@@ -274,7 +289,7 @@ $Index++;
           </form>
         </div>
       </div>
-      <?php    } ?>
+      <?php } ?>
 
     </div>
     <div class="box box_artists">
@@ -282,7 +297,7 @@ $Index++;
         <?=check_perms('torrents_edit') ? '<span class="edit_artists"><a onclick="ArtistManager(); return false;" href="#" class="brackets float_right">Edit</a></span>' : ''?>
       </div>
       <ul class="stats nobullet" id="artist_list">
-        <?php      foreach ($Artists as $Num => $Artist) { ?>
+        <?php foreach ($Artists as $Num => $Artist) { ?>
         <li class="artist"><?=Artists::display_artist($Artist)?>
           <?php if (check_perms('torrents_edit')) { ?>
           <span class="remove remove_artist float_right"><a href="javascript:void(0);"
@@ -290,10 +305,11 @@ $Index++;
               class="brackets tooltip" title="Remove artist">X</a></span>
           <?php } ?>
         </li>
-        <?php        } ?>
+        <?php } ?>
       </ul>
     </div>
-    <?php    if (check_perms('torrents_add_artist')) { ?>
+    <?php
+    if (check_perms('torrents_add_artist')) { ?>
     <div class="box box_addartists">
       <div class="head"><strong>Add Author</strong></div>
       <div class="body">
@@ -310,8 +326,8 @@ $Index++;
       </div>
     </div>
     <?php
-    }
-?>
+    } ?>
+
     <div class="box box_tags">
       <div class="head">
         <strong>Tags</strong>
@@ -330,46 +346,44 @@ $Index++;
         </form>
         <a class="brackets" href="#" onclick="$('#undo_tag_delete_form').raw().submit(); return false;">Undo delete</a>
 
-        <?php        } ?>
+        <?php } ?>
       </div>
       <?php
-if (count($Tags) > 0) {
-            ?>
+      if (count($Tags) > 0) {
+          ?>
       <ul class="stats nobullet">
         <?php
-  foreach ($Tags as $TagKey=>$Tag) {
-      ?>
+        foreach ($Tags as $TagKey=>$Tag) {
+            ?>
         <li>
           <a href="torrents.php?taglist=<?=$Tag['name']?>"
             class="<?=display_str($Tag['class'])?>"><?=display_str($Tag['display'])?></a>
           <div class="edit_tags_votes float_right">
-            <?php    if (check_perms('users_warn')) { ?>
+            <?php if (check_perms('users_warn')) { ?>
             <a href="user.php?id=<?=$Tag['userid']?>"
               title="View the profile of the user that added this tag" class="brackets tooltip view_tag_user">U</a>
-            <?php    } ?>
-            <?php    if (empty($LoggedUser['DisableTagging']) && check_perms('site_delete_tag')) { ?>
+            <?php } ?>
+            <?php if (empty($LoggedUser['DisableTagging']) && check_perms('site_delete_tag')) { ?>
             <span class="remove remove_tag"><a
                 href="torrents.php?action=delete_tag&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
                 class="brackets tooltip" title="Remove tag">X</a></span>
-            <?php    } ?>
+            <?php } ?>
           </div>
         </li>
         <?php
-  } ?>
+        } ?>
       </ul>
       <?php
-        } else { // The "no tags to display" message was wrapped in <ul> tags to pad the text.
-?>
+      } else { // The "no tags to display" message was wrapped in <ul> tags to pad the text
+      ?>
       <ul>
-        <li>There are no tags to display.</li>
+        <li>There are no tags to display</li>
       </ul>
-      <?php
-}
-?>
+      <?php } ?>
     </div>
     <?php
-if (empty($LoggedUser['DisableTagging'])) {
-    ?>
+    if (empty($LoggedUser['DisableTagging'])) {
+        ?>
     <div class="box box_addtag">
       <div class="head"><strong>Add Tag</strong></div>
       <div class="body">
@@ -388,9 +402,10 @@ if (empty($LoggedUser['DisableTagging'])) {
       </div>
     </div>
     <?php
-}
-?>
+    } ?>
   </div>
+
+  <!-- Main torrent display -->
   <div class="main_column">
     <div class="box">
       <table
@@ -417,9 +432,9 @@ if (empty($LoggedUser['DisableTagging'])) {
         </tr>
         <?php
 function filelist($Str)
-{
-    return "</td><td>".Format::get_size($Str[1])."</td></tr>";
-}
+    {
+        return "</td><td>".Format::get_size($Str[1])."</td></tr>";
+    }
 
 foreach ($TorrentList as $Torrent) {
     list($TorrentID, $Media, $Container, $Codec, $Resolution, $AudioFormat, $Subbing,
@@ -484,7 +499,7 @@ foreach ($TorrentList as $Torrent) {
         <strong>Size</strong>
       </td>
     </tr>';
-    if (substr($FileList, -3) == '}}}') { // Old style
+    if (substr($FileList, -3) === '}}}') { // Old style
         $FileListSplit = explode('|||', $FileList);
         foreach ($FileListSplit as $File) {
             $NameEnd = strrpos($File, '{{{');
@@ -505,31 +520,41 @@ foreach ($TorrentList as $Torrent) {
     $FileTable .= '
   </table>';
 
-    $ExtraInfo = ''; // String that contains information on the torrent (e.g. format and encoding)
-  $AddExtra = ''; // Separator between torrent properties
+    $ExtraInfo = ''; // String that contains information on the torrent (e.g., format and encoding)
+    $AddExtra = ''; // Separator between torrent properties
 
   // Similar to Torrents::torrent_info()
     if ($Media) {
         $ExtraInfo.=display_str($Media);
         $AddExtra=" / ";
     }
+
     if ($Container) {
         $ExtraInfo.=$AddExtra.display_str($Container);
         $AddExtra=' / ';
     }
+
+    if ($Archive) {
+        $ExtraInfo .= $AddExtra.display_str($Archive);
+        $AddExtra=' / ';
+    }
+
     if ($Codec) {
         $ExtraInfo.=$AddExtra.display_str($Codec);
         $AddExtra=' / ';
     }
+
     if ($Resolution) {
         $ExtraInfo.=$AddExtra.display_str($Resolution);
         $AddExtra=' / ';
     }
+
     /*
     if ($AudioFormat) {
       $ExtraInfo.=$AddExtra.display_str($AudioFormat);
       $AddExtra=' / '; }
       */
+
     /*
     if ($Language) {
       if ($Subber && ($GroupCategoryID == 3 || $GroupCategoryID == 4)) {
@@ -540,6 +565,7 @@ foreach ($TorrentList as $Torrent) {
       }
     }
     */
+
     /*
     if ($Subbing) {
       if ($Subber) {
@@ -551,10 +577,7 @@ foreach ($TorrentList as $Torrent) {
       }
     }
     */
-    if ($Archive) {
-        $ExtraInfo .= $AddExtra.display_str($Archive);
-        $AddExtra=' / ';
-    }
+
     if ($Censored) {
         $ExtraInfo .= $AddExtra.display_str('Aligned');
         $AddExtra=' / ';
@@ -562,28 +585,33 @@ foreach ($TorrentList as $Torrent) {
         $ExtraInfo .= $AddExtra.display_str('Unaligned');
         $AddExtra=' / ';
     }
+
     if (!$ExtraInfo) {
         $ExtraInfo = $GroupName;
         $AddExtra=' / ';
     }
+
     if ($IsLeeching) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Leeching');
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Leeching', 'important_text');
         $AddExtra=' / ';
     } elseif ($IsSeeding) {
-        $ExtraInfo.=$AddExtra . Format::torrent_label('Seeding');
+        $ExtraInfo.=$AddExtra . Format::torrent_label('Seeding', 'important_text_alt');
         $AddExtra=' / ';
     } elseif ($IsSnatched) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Snatched!');
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Snatched!', 'bold');
         $AddExtra=' / ';
     }
-    if ($FreeTorrent == '1') {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Freeleech!');
+
+    if ($FreeTorrent === '1') {
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Freeleech!', 'important_text_alt');
         $AddExtra=' / ';
     }
-    if ($FreeTorrent == '2') {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Neutral Leech!');
+
+    if ($FreeTorrent === '2') {
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Neutral Leech!', 'bold');
         $AddExtra=' / ';
     }
+
     // Freleechizer
     if ($FreeLeechType == '3') {
         $DB->query("
@@ -595,24 +623,31 @@ foreach ($TorrentList as $Torrent) {
             $ExtraInfo .= " <strong>(" . str_replace(['week','day','hour','min','Just now','s',' '], ['w','d','h','m','0m'], time_diff(max($ExpiryTime, time()), 1, false)) . ")</strong>";
         }
     }
+
     if ($PersonalFL) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Personal Freeleech!');
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Personal Freeleech!', 'important_text_alt');
         $AddExtra=' / ';
     }
+
     if ($Reported) {
-        $ExtraInfo.=$AddExtra.'<strong class="torrent_label tl_reported tooltip" title="Type: '.ucfirst($Reports[0]['Type']).'<br>Comment: '.htmlentities(htmlentities($Reports[0]['UserComment'])).'">Reported</strong>';
+        $HtmlReportType = ucfirst($Reports[0]['Type']);
+        $HtmlReportComment = htmlentities(htmlentities($Reports[0]['UserComment']));
+        $ExtraInfo.=$AddExtra. "<strong class='torrent_label tl_reported tooltip' title='Type: $HtmlReportType<br>Comment: HtmlReportComment'>".Format::torrent_label('Reported', 'important_text')."</strong>";
         $AddExtra=' / ';
     }
+
     if (!empty($BadTags)) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Tags');
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Tags', 'important_text');
         $AddExtra=' / ';
     }
+
     if (!empty($BadFolders)) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Folders');
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Folders', 'important_text');
         $AddExtra=' / ';
     }
+
     if (!empty($BadFiles)) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad File Names');
+        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad File Names', 'important_text');
         $AddExtra=' / ';
     }
 
@@ -624,6 +659,7 @@ foreach ($TorrentList as $Torrent) {
             $TorrentFileName = $Tor->Dec['info']['name'];
             $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
         }
+        # Magnet link h4x
         $TorrentMG = "magnet:?dn=".rawurlencode($TorrentFileName)."&xt=urn:btih:".$InfoHash."&as=https://".SITE_DOMAIN."/".str_replace('&amp;', '%26', $TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=", ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Size;
     } ?>
 
@@ -633,29 +669,29 @@ foreach ($TorrentList as $Torrent) {
           <td>
             <span>[ <a href="<?=$TorrentDL?>" class="tooltip"
                 title="Download"><?=($HasFile ? 'DL' : 'Missing')?></a>
-              <?php  if (isset($TorrentMG)) { ?>
+              <?php if (isset($TorrentMG)) { ?>
               | <a href="<?=$TorrentMG?>" class="tooltip"
                 title="Magnet Link">MG</a>
-              <?php  }
+              <?php }
     if (Torrents::can_use_token($Torrent)) { ?>
               | <a
                 href="torrents.php?action=download&amp;id=<?=$TorrentID ?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1"
                 class="tooltip" title="Use a FL Token"
                 onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-              <?php  } ?>
+              <?php } ?>
               | <a
                 href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>"
                 class="tooltip" title="Report">RP</a>
-              <?php  if ($CanEdit) { ?>
+              <?php if ($CanEdit) { ?>
               | <a
                 href="torrents.php?action=edit&amp;id=<?=$TorrentID ?>"
                 class="tooltip" title="Edit release">ED</a>
-              <?php  }
+              <?php }
     if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?>
               | <a
                 href="torrents.php?action=delete&amp;torrentid=<?=$TorrentID ?>"
                 class="tooltip" title="Remove">RM</a>
-              <?php  } ?>
+              <?php } ?>
               | <a href="torrents.php?torrentid=<?=$TorrentID ?>"
                 class="tooltip" title="Permalink">PL</a>
               ]</span>
@@ -688,47 +724,47 @@ foreach ($TorrentList as $Torrent) {
   } else {
       print Users::format_username($UserID, false, false, false);
   } ?> <?=time_diff($TorrentTime); ?>
-                <?php  if ($Seeders == 0) {
+                <?php if ($Seeders === 0) {
       if ($LastActive && time() - strtotime($LastActive) >= 1209600) { ?>
                 <br /><strong>Last active: <?=time_diff($LastActive); ?></strong>
-                <?php    } else { ?>
+                <?php } else { ?>
                 <br />Last active: <?=time_diff($LastActive); ?>
-                <?php    }
+                <?php }
   }
 
-    if (($Seeders == 0 && $LastActive && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?>
+    if (($Seeders === 0 && $LastActive && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?>
                 <br /><a
                   href="torrents.php?action=reseed&amp;torrentid=<?=$TorrentID?>&amp;groupid=<?=$GroupID?>"
                   class="brackets">Request re-seed</a>
-                <?php  } ?>
+                <?php } ?>
               </blockquote>
             </div>
-            <?php  if (check_perms('site_moderate_requests')) { ?>
+            <?php if (check_perms('site_moderate_requests')) { ?>
             <div class="linkbox">
               <a href="torrents.php?action=masspm&amp;id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"
                 class="brackets">Mass PM snatchers</a>
             </div>
-            <?php  } ?>
+            <?php } ?>
             <div class="linkbox">
               <a href="#" class="brackets"
                 onclick="show_peers('<?=$TorrentID?>', 0); return false;">View
                 peer list</a>
-              <?php  if (check_perms('site_view_torrent_snatchlist')) { ?>
+              <?php if (check_perms('site_view_torrent_snatchlist')) { ?>
               <a href="#" class="brackets tooltip"
                 onclick="show_downloads('<?=$TorrentID?>', 0); return false;"
                 title="View the list of users that have clicked the &quot;DL&quot; button.">View download list</a>
               <a href="#" class="brackets tooltip"
                 onclick="show_snatches('<?=$TorrentID?>', 0); return false;"
                 title="View the list of users that have reported a snatch to the tracker.">View snatch list</a>
-              <?php  } ?>
+              <?php } ?>
               <a href="#" class="brackets"
                 onclick="show_files('<?=$TorrentID?>'); return false;">View
                 file list</a>
-              <?php  if ($Reported) { ?>
+              <?php if ($Reported) { ?>
               <a href="#" class="brackets"
                 onclick="show_reported('<?=$TorrentID?>'); return false;">View
                 report information</a>
-              <?php  } ?>
+              <?php } ?>
             </div>
             <div id="peers_<?=$TorrentID?>" class="hidden"></div>
             <div id="downloads_<?=$TorrentID?>" class="hidden"></div>

static/styles/global.css

@@ -235,6 +235,10 @@ strong.important_text_alt {
   font-weight: bold;
 }
 
+strong.bold {
+  font-weight: bold;
+}
+
 .invalid, .warning, .error, .new {
   color: #ff0000;
 }