Add OPS's prepared_query() SQL method

classes/autoload.php

@@ -11,8 +11,10 @@ declare(strict_types=1);
  * @see https://www.php.net/manual/en/language.oop5.autoload.php
  */
 spl_autoload_register(function ($ClassName) {
-    $FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
-    #$FilePath = $_SERVER['DOCUMENT_ROOT'] . '/classes/' . strtolower($ClassName) . '.class.php';
+  $ENV = ENV::go();
+
+  $classname = strtolower($ClassName);
+    $FilePath = "$ENV->SERVER_ROOT/classes/$classname.class.php";
 
     if (!file_exists($FilePath)) {
         // todo: Rename the following classes to conform with the code guidelines
@@ -43,24 +45,11 @@ spl_autoload_register(function ($ClassName) {
           $FileName = 'env.class';
           break;
 
-        case 'Parsedown':
-          $FileName = 'vendor/Parsedown';
-          break;
-
-        case 'ParsedownExtra':
-          $FileName = 'vendor/ParsedownExtra';
-          break;
-
-        case 'TwitterAPIExchange':
-          $FileName = 'vendor/TwitterAPIExchange';
-          break;
-
         default:
           error("Couldn't import class $ClassName");
     }
 
-        $FilePath = SERVER_ROOT . "/classes/$FileName.php";
-        #$FilePath = $_SERVER['DOCUMENT_ROOT'] . "/classes/$FileName.php";
+        $FilePath = "$ENV->SERVER_ROOT/classes/$FileName.php";
     }
 
     require_once $FilePath;

classes/mysql.class.php

@@ -111,10 +111,6 @@ set_query_id($ResultSet)
 -------------------------------------------------------------------------------------
 *///---------------------------------------------------------------------------------
 
-if (!extension_loaded('mysqli')) {
-    error('Mysqli Extension not loaded.');
-}
-
 
 /**
  * db_string
@@ -285,9 +281,27 @@ class DB_MYSQL
 
 
     /**
-     * prepare_query
+     * Prepare and execute a prepared query returning the result set.
+     *
+     * Utility function that wraps DB_MYSQL::prepare and DB_MYSQL::execute
+     * as most times, the query is going to be one-off and this will save
+     * on keystrokes. If you do plan to be executing a prepared query
+     * multiple times with different bound parameters, you'll want to call
+     * the two functions separately instead of this function.
+     *
+     * @param $Query
+     * @param mixed ...$Parameters
+     * @return bool|mysqli_result
+     */
+    public function prepared_query($Query, ...$Parameters) {
+        $this->prepare($Query);
+        return $this->execute(...$Parameters);
+    }
+
+    /**
+     * prepare
      */
-    public function prepare_query($Query, &...$BindVars)
+    public function prepare($Query, &...$BindVars)
     {
         $this->connect();
         $this->StatementID = mysqli_prepare($this->LinkID, $Query);
@@ -306,11 +320,17 @@ class DB_MYSQL
         return $this->StatementID;
     }
 
+    # Compatibility function for the old name
+    public function prepare_query($Query, &...$BindVars)
+    {
+        return $this->prepare($Query, $BindVars);
+    }
+
 
     /**
-     * exec_prepared_query
+     * execute
      */
-    public function exec_prepared_query()
+    public function execute()
     {
         $QueryStartTime = microtime(true);
         mysqli_stmt_execute($this->StatementID);
@@ -320,6 +340,12 @@ class DB_MYSQL
         $this->Time += $QueryRunTime;
     }
 
+    # Compatibility function for the old name
+    public function exec_prepared_query()
+    {
+        return $this->execute();
+    }
+
 
     /**
      * Runs a raw query assuming pre-sanitized input. However, attempting to self sanitize (such

classes/security.class.php

@@ -64,6 +64,11 @@ class Security
             error('memcached extension php-memcache not loaded.');
         }
 
+        # mysqli
+        if (!extension_loaded('mysqli')) {
+            error('mysqli extension php-mysql not loaded.');
+        }
+        
         # blake3
         if ($ENV->FEATURE_BIOPHP && !extension_loaded('blake3')) {
             error('Please install and enable the php-blake3 extension.');

classes/twig.class.php

@@ -68,7 +68,7 @@ class Twig
                 'auto_reload' => true,
                 'autoescape' => 'name',
                 'cache' => "$ENV->WEB_ROOT/cache/twig",
-                #'debug' => DEBUG_MODE,
+                'debug' => $ENV->DEV,
                 'strict_variables' => true,
         ]
         );

design/views/generic/reply/staffpm.php

@@ -32,7 +32,7 @@ $TextPrev = new TEXTAREA_PREVIEW(
 
     <input type="button" value="Preview"
       class="hidden button_preview_<?=$TextPrev->getID()?>" />
-    <input type="submit" value="Send message" />
+    <input type="submit" class="button-primary" value="Send message" />
     <input type="button" value="Hide" data-toggle-target="#compose" />
   </form>
 </div>

sections/better/better.php

@@ -24,7 +24,7 @@ View::show_header('Better');
 </h3>
 
 <div class="box pad">
-  <table>
+  <table class="better_list">
     <tr class="colhead">
       <td style="width: 150px;">Method</td>
       <td style="width: 400px;">Additional Information</td>
@@ -42,11 +42,11 @@ View::show_header('Better');
 
     <tr class="row">
       <td class="nobr">
-        <a href="better.php?method=literature&filter=all">Publications</a>
+        <a href="better.php?method=literature&filter=all">DOI numbers</a>
       </td>
 
       <td class="nobr">
-        When a torrent group doesn't have a publication
+        Torrent groups without citations, for enhanced metadata support
       </td>
     </tr>
 
@@ -55,7 +55,7 @@ View::show_header('Better');
         <a href="better.php?method=covers&filter=all">Pictures</a>
       </td>
       <td class="nobr">
-        When a torrent group doesn't have a picture
+        Torrent groups without pictures, for at-a-glance context
       </td>
     </tr>
 

sections/better/index.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-enforce_login();
+#enforce_login();
 
 if (isset($_GET['method'])) {
     switch ($_GET['method']) {

sections/better/literature.php

@@ -12,7 +12,7 @@ $Join = $All
 
 View::show_header('Torrent groups with no publications');
 
-$DB->query("
+$DB->prepared_query("
 SELECT SQL_CALC_FOUND_ROWS
   tg.`id`
 FROM
@@ -38,21 +38,21 @@ $Results = Torrents::get_groups(array_keys($Groups)); ?>
 <div class="header">
   <?php if ($All) { ?>
   <h2>
-    All groups with no publications
+    All groups with no DOI numbers
   </h2>
 
   <?php } else { ?>
   <h2>
-    Torrent groups with no publications that you have snatched
+    Torrent groups with no DOI numbers that you have snatched
   </h2>
   <?php } ?>
 
   <div class="linkbox">
     <a href="better.php" class="brackets">Back to better.php list</a>
     <?php if ($All) { ?>
-    <a href="better.php?method=screenshots" class="brackets">Show only those you have snatched</a>
+    <a href="better.php?method=literature" class="brackets">Show only those you have snatched</a>
     <?php } else { ?>
-    <a href="better.php?method=screenshots&amp;filter=all" class="brackets">Show all</a>
+    <a href="better.php?method=literature&amp;filter=all" class="brackets">Show all</a>
     <?php } ?>
   </div>
 </div>

sections/bookmarks/torrents.php

@@ -66,18 +66,19 @@ foreach ($GroupIDs as $GroupID) {
         }
     }
 
-    $TorrentTags = new Tags($TagList);
-    $DisplayName = Artists::display_artists($Artists);
-    $GroupName = empty($GroupName) ? (empty($GroupTitle2) ? $GroupNameJP : $GroupTitle2) : $GroupName;
+    $TorrentTags = new Tags($tag_list);
+    $DisplayName = '';
+    #$DisplayName = Artists::display_artists($Artists);
+    $GroupName = empty($title) ? (empty($subject) ? $object : $subject) : $title;
     
     $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-        $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+        $DisplayName .= 'data-cover="'.ImageTools::process($picture, 'thumb').'" ';
     }
 
     $DisplayName .= ' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
-    if ($GroupYear > 0) {
-        $DisplayName = "$DisplayName [$GroupYear]";
+    if ($year > 0) {
+        $DisplayName = "$DisplayName [$year]";
     }
     $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
 
@@ -159,11 +160,12 @@ foreach ($GroupIDs as $GroupID) {
         $TorrentID = key($Torrents);
         $Torrent = current($Torrents);
 
-        $DisplayName = Artists::display_artists(Artists::get_artist($GroupID));
+        $DisplayName = '';
+        #$DisplayName = Artists::display_artists(Artists::get_artist($GroupID));
         $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
 
         if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-            $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+            $DisplayName .= 'data-cover="'.ImageTools::process($picture, 'thumb').'" ';
         }
 
         $DisplayName .=' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
@@ -241,8 +243,8 @@ foreach ($GroupIDs as $GroupID) {
     #$DisplayName .= Artists::display_artists($Artists, false);
     $DisplayName .= $GroupName;
 
-    if ($GroupYear > 0) {
-        $DisplayName = "$DisplayName [$GroupYear]";
+    if ($year > 0) {
+        $DisplayName = "$DisplayName [$year]";
     }
 
     $Tags = display_str($TorrentTags->format());
@@ -252,12 +254,12 @@ foreach ($GroupIDs as $GroupID) {
   <a href="torrents.php?id=<?=$GroupID?>"
     class="bookmark_<?=$GroupID?>">
 
-    <?php if (!$WikiImage) {
-        $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
+    <?php if (!$picture) {
+        $picture = STATIC_SERVER.'common/noartwork/music.png';
     } ?>
 
     <img class="tooltip"
-      src="<?=ImageTools::process($WikiImage, 'thumb')?>"
+      src="<?=ImageTools::process($picture, 'thumb')?>"
       alt="<?=$DisplayName?>"
       title="<?=$DisplayName?>"
       data-title-plain="<?=$DisplayName?>" width="100%" />

sections/collages/edit.php

@@ -44,7 +44,7 @@ if (!empty($Err)) {
         value="<?=$LoggedUser['AuthKey']?>" />
       <input type="hidden" name="collageid"
         value="<?=$CollageID?>" />
-      <table id="edit_collage" class="layout">
+      <table id="edit_collage" class="layout collage_edit">
         <?php if (check_perms('site_collages_delete') || ($CategoryID == 0 && $UserID == $LoggedUser['ID'] && check_perms('site_collages_renamepersonal'))) { ?>
         <tr>
           <td class="label">Name</td>
@@ -117,7 +117,7 @@ if (check_perms('site_collages_delete')) { ?>
 
         <?php } ?>
         <tr>
-          <td colspan="2" class="center"><input type="submit" value="Edit" /></td>
+          <td colspan="2" class="center"><input type="submit" class="button-primary" value="Edit" /></td>
         </tr>
       </table>
     </form>

sections/collages/new.php

@@ -136,7 +136,7 @@ new TEXTAREA_PREVIEW(
 
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" value="Create" />
+            <input type="submit" class="button-primary" value="Create" />
           </td>
         </tr>
       </table>

sections/inbox/inbox.php

@@ -122,7 +122,7 @@ echo $Pages;
     <input type="hidden" name="action" value="masschange" />
     <input type="hidden" name="auth"
       value="<?=$LoggedUser['AuthKey']?>" />
-    <input type="submit" name="read" value="Mark as read" />
+    <input type="submit" name="read" class="button-primary" value="Mark as read" />
     <input type="submit" name="unread" value="Mark as unread" />
     <input type="submit" name="delete" value="Delete message(s)" />
 
@@ -181,12 +181,17 @@ echo $Pages;
       }
   } ?>
     </table>
-    <input type="submit" name="read" value="Mark as read" />
+    <?php
+    $MsgLimit = ($LoggedUser['PostsPerPage']) ? $LoggedUser['PostsPerPage'] : MESSAGES_PER_PAGE;
+    if ($Count > $MsgLimit) { ?>
+    <input type="submit" name="read" class="button-primary" value="Mark as read" />
     <input type="submit" name="unread" value="Mark as unread" />
     <input type="submit" name="delete" value="Delete message(s)" />
+    <?php } ?>
   </form>
   <?php } ?>
 </div>
+
 <div class="linkbox">
   <?= $Pages ?>
 </div>

sections/requests/new_edit.php

@@ -444,13 +444,13 @@ View::show_header(
         <!-- Submit -->
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" id="button" value="Create" disabled="disabled" />
+            <input type="submit" id="button" class="button-primary" value="Create" disabled="disabled" />
           </td>
         </tr>
         <?php } else { ?>
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" id="button" value="Edit" />
+            <input type="submit" id="button" class="button-primary" value="Edit" />
           </td>
         </tr>
         <?php } ?>

sections/requests/request.php

@@ -361,7 +361,7 @@ $encoded_artist = urlencode($encoded_artist);
                   <li><strong>Ratio:</strong> <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span>
                   </li>
                 </ul>
-                <input type="button" id="button" value="Vote!" disabled="disabled" onclick="Vote();" />
+                <input type="button" id="button" value="Vote!" class="button-primary" disabled="disabled" onclick="Vote();" />
               </form>
             </td>
           </tr>
@@ -413,7 +413,7 @@ $encoded_artist = urlencode($encoded_artist);
                 </div>
                 <?php } ?>
                 <div class="submit_div">
-                  <input type="submit" value="Fill" />
+                  <input type="submit" class="button-primary" value="Fill" />
                 </div>
               </form>
             </td>

sections/requests/requests.php

@@ -443,7 +443,7 @@ View::show_header($Title, 'requests');
             <table class="layout">
                 <tr>
                     <td colspan="2" class="center">
-                        <input type="submit" value="Search" />
+                        <input type="submit" class="button-primary" value="Search" />
                     </td>
                 </tr>
             </table>

sections/top10/torrents.php

@@ -92,7 +92,7 @@ if (check_perms('site_advanced_top10')) {
                 </tr>
                 <tr>
                     <td colspan="2" class="center">
-                        <input type="submit" value="Search" />
+                        <input type="submit" class="button-primary" value="Search" />
                     </td>
                 </tr>
             </table>

sections/torrents/details.php

@@ -851,7 +851,7 @@ if (count($Collages) > 0) {
     <div class="box">
       <table class="collage_table" id="collages">
         <tr class="colhead">
-          <td width="75%"><a href="#">&uarr;</a>&nbsp;This content is in <?=number_format(count($Collages))?> collection<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?>
+          <td width="85%"><a href="#">&uarr;</a>&nbsp;This content is in <?=number_format(count($Collages))?> collection<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?>
           </td>
           <td># torrents</td>
         </tr>

sections/torrents/user.php

@@ -50,43 +50,43 @@ if (!empty($_GET['way']) && array_key_exists($_GET['way'], $Ways)) {
 $SearchWhere = [];
 if (!empty($_GET['format'])) {
     if (in_array($_GET['format'], $Formats)) {
-        $SearchWhere[] = "t.Format = '".db_string($_GET['format'])."'";
+        $SearchWhere[] = "t.`Format` = '".db_string($_GET['format'])."'";
     }
 }
 
 # Get release specifics
 if (isset($_GET['container'])
  && in_array($_GET['container'], $ENV-flatten($ENV->META->Formats))) {
-    $SearchWhere[] = "t.Container = '".db_string($_GET['container'])."'";
+    $SearchWhere[] = "t.`Container` = '".db_string($_GET['container'])."'";
 }
 
 if (isset($_GET['bitrate'])
  && in_array($_GET['bitrate'], $Bitrates)) {
-    $SearchWhere[] = "t.Encoding = '".db_string($_GET['bitrate'])."'";
+    $SearchWhere[] = "t.`Encoding` = '".db_string($_GET['bitrate'])."'";
 }
 
 if (isset($_GET['media'])
  && in_array($_GET['media'], $ENV-flatten($ENV->META->Platforms))) {
-    $SearchWhere[] = "t.Media = '".db_string($_GET['media'])."'";
+    $SearchWhere[] = "t.`Media` = '".db_string($_GET['media'])."'";
 }
 
 if (isset($_GET['codec'])
  && in_array($_GET['codec'], $ENV->META->Licenses)) {
-    $SearchWhere[] = "t.Codec = '".db_string($_GET['codec'])."'";
+    $SearchWhere[] = "t.`Codec` = '".db_string($_GET['codec'])."'";
 }
 
 if (isset($_GET['version'])) {
-    $SearchWhere[] = "t.Version = '".db_string($_GET['version'])."'";
+    $SearchWhere[] = "t.`Version` = '".db_string($_GET['version'])."'";
 }
 
 if (isset($_GET['resolution'])
  && in_array($_GET['resolution'], $ENV->flatten($ENV->META->Scopes))) {
-    $SearchWhere[] = "t.Resolution = '".db_string($_GET['resolution'])."'";
+    $SearchWhere[] = "t.`Resolution` = '".db_string($_GET['resolution'])."'";
 }
 
 if (isset($_GET['censored'])
  && in_array($_GET['censored'], array(1, 0))) {
-    $SearchWhere[] = "t.Censored = '".db_string($_GET['censored'])."'";
+    $SearchWhere[] = "t.`Censored` = '".db_string($_GET['censored'])."'";
 }
 
 if (!empty($_GET['categories'])) {
@@ -95,7 +95,7 @@ if (!empty($_GET['categories'])) {
         if (!is_number($Cat)) {
             error(0);
         }
-        $Cats[] = "tg.CategoryID = '".db_string($Cat)."'";
+        $Cats[] = "tg.`category_id` = '".db_string($Cat)."'";
     }
     $SearchWhere[] = '('.implode(' OR ', $Cats).')';
 }
@@ -120,9 +120,9 @@ if (!empty($_GET['tags'])) {
             if (empty($Tag)) {
                 continue;
             }
-            $TagList[] = "tg.TagList NOT RLIKE '[[:<:]]".db_string($Tag)."(:[^ ]+)?[[:>:]]'";
+            $TagList[] = "tg.`tag_list` NOT RLIKE '[[:<:]]".db_string($Tag)."(:[^ ]+)?[[:>:]]'";
         } else {
-            $TagList[] = "tg.TagList RLIKE '[[:<:]]".db_string($Tag)."(:[^ ]+)?[[:>:]]'";
+            $TagList[] = "tg.`tag_list` RLIKE '[[:<:]]".db_string($Tag)."(:[^ ]+)?[[:>:]]'";
         }
     }
 
@@ -151,74 +151,74 @@ switch ($_GET['type']) {
     if (!check_paranoia('snatched', $User['Paranoia'], $UserClass, $UserID)) {
         error(403);
     }
-    $Time = 'xs.tstamp';
-    $UserField = 'xs.uid';
+    $Time = 'xs.`tstamp`';
+    $UserField = 'xs.`uid`';
     $ExtraWhere = '';
     $From = "
-      xbt_snatched AS xs
-        JOIN torrents AS t ON t.ID = xs.fid";
+      `xbt_snatched` AS xs
+        JOIN `torrents` AS t ON t.`ID` = xs.`fid`";
     break;
 
   case 'seeding':
     if (!check_paranoia('seeding', $User['Paranoia'], $UserClass, $UserID)) {
         error(403);
     }
-    $Time = '(xfu.mtime - xfu.timespent)';
-    $UserField = 'xfu.uid';
+    $Time = '(xfu.`mtime` - xfu.`timespent`)';
+    $UserField = 'xfu.`uid`';
     $ExtraWhere = '
-      AND xfu.active = 1
-      AND xfu.Remaining = 0';
+      AND xfu.`active` = 1
+      AND xfu.`Remaining` = 0';
     $From = "
-      xbt_files_users AS xfu
-        JOIN torrents AS t ON t.ID = xfu.fid";
+      `xbt_files_users` AS xfu
+        JOIN `torrents` AS t ON t.`ID` = xfu.`fid`";
     break;
 
   case 'contest':
-    $Time = 'unix_timestamp(t.Time)';
-    $UserField = 't.UserID';
+    $Time = 'unix_timestamp(t.`Time`)';
+    $UserField = 't.`UserID`';
     $ExtraWhere = "
-      AND t.ID IN (
-        SELECT TorrentID
-        FROM library_contest
-        WHERE UserID = $UserID
+      AND t.`ID` IN (
+        SELECT `TorrentID`
+        FROM `library_contest`
+        WHERE `UserID` = $UserID
       )";
-    $From = 'torrents AS t';
+    $From = '`torrents` AS t';
     break;
 
   case 'leeching':
     if (!check_paranoia('leeching', $User['Paranoia'], $UserClass, $UserID)) {
         error(403);
     }
-    $Time = '(xfu.mtime - xfu.timespent)';
-    $UserField = 'xfu.uid';
+    $Time = '(xfu.`mtime` - xfu.`timespent`)';
+    $UserField = 'xfu.`uid`';
     $ExtraWhere = '
-      AND xfu.active = 1
-      AND xfu.Remaining > 0';
+      AND xfu.`active` = 1
+      AND xfu.`Remaining` > 0';
     $From = "
-      xbt_files_users AS xfu
-        JOIN torrents AS t ON t.ID = xfu.fid";
+      `xbt_files_users` AS xfu
+        JOIN `torrents` AS t ON t.`ID` = xfu.`fid`";
     break;
 
   case 'uploaded':
     if ((empty($_GET['filter']) || $_GET['filter'] !== 'perfectflac') && !check_paranoia('uploads', $User['Paranoia'], $UserClass, $UserID)) {
         error(403);
     }
-    $Time = 'unix_timestamp(t.Time)';
-    $UserField = 't.UserID';
+    $Time = 'unix_timestamp(t.`Time`)';
+    $UserField = 't.`UserID`';
     $ExtraWhere = '';
-    $From = "torrents AS t";
+    $From = "`torrents` AS t";
     break;
 
   case 'downloaded':
     if (!check_perms('site_view_torrent_snatchlist')) {
         error(403);
     }
-    $Time = 'unix_timestamp(ud.Time)';
-    $UserField = 'ud.UserID';
+    $Time = 'unix_timestamp(ud.`Time`)';
+    $UserField = 'ud.`UserID`';
     $ExtraWhere = '';
     $From = "
-      users_downloads AS ud
-        JOIN torrents AS t ON t.ID = ud.TorrentID";
+      `users_downloads` AS ud
+        JOIN `torrents` AS t ON t.`ID` = ud.`TorrentID`";
     break;
     
   default:
@@ -226,7 +226,7 @@ switch ($_GET['type']) {
 }
 
 if (empty($GroupBy)) {
-    $GroupBy = 't.ID';
+    $GroupBy = 't.`ID`';
 }
 
 if ((empty($_GET['search'])
@@ -234,13 +234,13 @@ if ((empty($_GET['search'])
     $SQL = "
       SELECT
         SQL_CALC_FOUND_ROWS
-        t.GroupID,
-        t.ID AS TorrentID,
+        t.`GroupID`,
+        t.`ID` AS TorrentID,
         $Time AS Time,
-        COALESCE(NULLIF(tg.Name, ''), NULLIF(tg.Title2, ''), tg.NameJP) AS Name,
-        tg.CategoryID
+        COALESCE(NULLIF(tg.`title`, ''), NULLIF(tg. subject, ''), tg.`object`) AS Name,
+        tg.`category_id`
       FROM $From
-        JOIN torrents_group AS tg ON tg.ID = t.GroupID
+        JOIN `torrents_group` AS tg ON tg.`id` = t.`GroupID`
       WHERE $UserField = '$UserID'
         $ExtraWhere
         $SearchWhere
@@ -249,38 +249,38 @@ if ((empty($_GET['search'])
       LIMIT $Limit";
 } else {
     $DB->query("
-      CREATE TEMPORARY TABLE temp_sections_torrents_user (
-        GroupID int(10) unsigned not null,
-        TorrentID int(10) unsigned not null,
-        Time int(12) unsigned not null,
-        CategoryID int(3) unsigned,
-        Seeders int(6) unsigned,
-        Leechers int(6) unsigned,
-        Snatched int(10) unsigned,
-        Name mediumtext,
-        Size bigint(12) unsigned,
-      PRIMARY KEY (TorrentID)) CHARSET=utf8");
+      CREATE TEMPORARY TABLE `temp_sections_torrents_user` (
+        `GroupID` int(10) unsigned not null,
+        `TorrentID` int(10) unsigned not null,
+        `Time` int(12) unsigned not null,
+        `CategoryID` int(3) unsigned,
+        `Seeders` int(6) unsigned,
+        `Leechers` int(6) unsigned,
+        `Snatched` int(10) unsigned,
+        `Name` mediumtext,
+        `Size` bigint(12) unsigned,
+      PRIMARY KEY (`TorrentID`)) CHARSET=utf8");
 
     $DB->query("
-      INSERT IGNORE INTO temp_sections_torrents_user
+      INSERT IGNORE INTO `temp_sections_torrents_user`
       SELECT
-        t.GroupID,
-        t.ID AS TorrentID,
+        t.`GroupID`,
+        t.`ID` AS TorrentID,
         $Time AS Time,
-        tg.CategoryID,
-        t.Seeders,
-        t.Leechers,
-        t.Snatched,
-        CONCAT_WS(' ', GROUP_CONCAT(ag.Name SEPARATOR ' '), ' ', COALESCE(NULLIF(tg.Name,''), NULLIF(tg.Title2,''), tg.NameJP), ' ', tg.Year, ' ') AS Name,
-        t.Size
+        tg.`category_id`,
+        t.`Seeders`,
+        t.`Leechers`,
+        t.`Snatched`,
+        CONCAT_WS(' ', GROUP_CONCAT(ag.`Name` SEPARATOR ' '), ' ', COALESCE(NULLIF(tg.`title`,''), NULLIF(tg.`subject`,''), tg.`object`), ' ', tg.`year`, ' ') AS Name,
+        t.`Size`
       FROM $From
-        JOIN torrents_group AS tg ON tg.ID = t.GroupID
-        LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID
-        LEFT JOIN artists_group AS ag ON ag.ArtistID = ta.ArtistID
+        JOIN `torrents_group` AS tg ON tg.`id` = t.`GroupID`
+        LEFT JOIN `torrents_artists` AS ta ON ta.`GroupID` = tg.`id`
+        LEFT JOIN `artists_group` AS ag ON ag.`ArtistID` = ta.`ArtistID`
       WHERE $UserField = '$UserID'
         $ExtraWhere
         $SearchWhere
-      GROUP BY TorrentID, Time");
+      GROUP BY `TorrentID`, `Time`");
 
     if (!empty($_GET['search']) && trim($_GET['search']) !== '') {
         $Words = array_unique(explode(' ', db_string($_GET['search'])));
@@ -289,15 +289,15 @@ if ((empty($_GET['search'])
     $SQL = "
       SELECT
         SQL_CALC_FOUND_ROWS
-        GroupID,
-        TorrentID,
-        Time,
-        CategoryID
-      FROM temp_sections_torrents_user";
+        `GroupID`,
+        `TorrentID`,
+        `Time`,
+        `CategoryID`
+      FROM `temp_sections_torrents_user`";
 
     if (!empty($Words)) {
         $SQL .= "
-          WHERE Name LIKE '%".implode("%' AND Name LIKE '%", $Words)."%'";
+          WHERE `Name` LIKE '%".implode("%' AND `Name` LIKE '%", $Words)."%'";
     }
 
     $SQL .= "
@@ -470,7 +470,7 @@ foreach ($Categories as $CatKey => $CatName) {
           <?= number_format($TorrentCount) ?>
           Results
         </span>
-        <input type="submit" value="Search" />
+        <input type="submit" class="button-primary" value="Search" />
       </div>
     </form>
   </div>

sections/user/notify_edit.php

@@ -4,6 +4,7 @@
 if (!check_perms('site_torrents_notify')) {
     error(403);
 }
+
 View::show_header(
     'Manage notifications',
     'vendor/jquery.validate.min,form_validate'
@@ -21,22 +22,23 @@ View::show_header(
   <?php
 $DB->query("
   SELECT
-    ID,
-    Label,
-    Artists,
-    NewGroupsOnly,
-    Tags,
-    NotTags,
-    ReleaseTypes,
-    Categories,
-    Formats,
-    Encodings,
-    Media,
-    FromYear,
-    ToYear,
-    Users
-  FROM users_notify_filters
-  WHERE UserID=$LoggedUser[ID]");
+    `ID`,
+    `Label`,
+    `Artists`,
+    `NewGroupsOnly`,
+    `Tags`,
+    `NotTags`,
+    `ReleaseTypes`,
+    `Categories`,
+    `Formats`,
+    `Encodings`,
+    `Media`,
+    `FromYear`,
+    `ToYear`,
+    `Users`
+  FROM `users_notify_filters`
+  WHERE `UserID` = $LoggedUser[ID]
+");
 
 $NumFilters = $DB->record_count();
 
@@ -82,9 +84,11 @@ foreach ($Notifications as $N) { // $N stands for Notifications
     if ($N['FromYear'] === 0) {
         $N['FromYear'] = '';
     }
+
     if ($N['ToYear'] === 0) {
         $N['ToYear'] = '';
     }
+
     if ($NewFilter && $NumFilters > 0) {
         ?>
   <br><br>
@@ -207,7 +211,7 @@ foreach ($Notifications as $N) { // $N stands for Notifications
 
       <tr>
         <td colspan="2" class="center">
-          <input type="submit"
+          <input type="submit" class="button-primary"
             value="<?=($NewFilter ? 'Create' : 'Update')?>">
         </td>
       </tr>

sections/wiki/wiki_browse.php

@@ -68,7 +68,7 @@ while (list($ID, $Title, $Date, $UserID) = $DB->next_record()) { ?>
       <input type="hidden" name="action" value="search" />
       <input type="hidden" name="nojump" value="1" />
       <input type="search" name="search" size="80" />
-      <input value="Search" type="submit" class="hidden" />
+      <input value="Search" type="submit" class="hidden button-primary" />
     </form>
     <br />
 

static/styles/bookish/scss/colors.scss

@@ -29,17 +29,6 @@ $shadow: 2px 2px 10px -2px slategray;
  * Common elements
  */
 
-/* Alternating tables */
-/*
-#request_table .request:nth-of-type(even) {
-    background: white;
-}
-
-#request_table .request:nth-of-type(odd) {
-    background: whitesmoke;
-}
-*/
-
 /**
  * RGB color intensity border
  * For semi-transparent elements,
@@ -68,32 +57,52 @@ input[type="file"] {
  * Needs one unified error display
  * (torrent form, API keys use their own)
  */
+@mixin alertbar($bg) {
+    background: change-color($bg, $alpha: 0.25);
+    /* box-shadow: $shadow; */
+    text-align: center;
+    color: black;
+    font-weight: bold;
+    /* font-size: 0.95rem; */
+    width: 33%;
+    margin: 2em auto;
+    padding: 1rem;
+    border-radius: 4px;
+    border: 1px solid $bg;
+}
+
+/*
 @mixin alertbar($bg) {
     background: $bg;
     box-shadow: $shadow;
     text-align: center;
     color: black;
     font-weight: bold;
-    /* font-size: 0.95rem; */
+    /* font-size: 0.95rem; * /
     width: 33%;
     margin: 2em auto;
     padding: 1rem;
 }
+*/
 
 .alertbar {
-    @include alertbar($lb100);
+    @include alertbar(gold);
+    /* @include alertbar($lb100); */
 
     .warning {
-        background: #ffe0b2;
+        background: orange;
+        /* background: #ffe0b2; */
     }
 
     .error {
-        background: #ffcdd2;
+        background: red;
+        /* background: #ffcdd2; */
     }
 }
 
 .token_error {
-    @include alertbar(#ffcdd2);
+    @include alertbar(pink);
+    /* @include alertbar(#ffcdd2); */
 }
 
 .modbar a {

static/styles/bookish/scss/layout.scss

@@ -308,8 +308,3 @@ ul .invitetree {
     }
     */
 }
-
-/* User and torrent stats */
-.chart {
-    max-height: 30rem;
-}

static/styles/global/scss/layout.scss

@@ -207,3 +207,8 @@ img {
         height: 2rem;
     }
 }
+
+/* User and torrent stats */
+.chart {
+    max-height: 30rem;
+}

static/styles/global/scss/skeleton-fixes.scss

@@ -85,7 +85,8 @@ table.torrent_search,
 /* request search */ table.torrent_requests,
 /* forum list */ table.forum_index,
 /* upload form */ table.torrent_form,
-/* new request? */ table.request_form,
+/* requests? */ table.request_form,
+/* new request */ form#request_form,
 /* forum thread */ table.new_thread,
 /* toolbox */ table.admin_tools,
 /* BP */ table.store_table,
@@ -94,6 +95,7 @@ table.torrent_search,
 /* login */ table.login_form,
 /* requests? */form.create_form,
 /* top10 */ form.search_form,
+/* edit collage */ table.collage_edit,
 /* start user management */
 table#user_info_box,
 table#warn_user_box,
@@ -102,8 +104,11 @@ table#user_privs_box,
 table#session_box,
 table#donation_box,
 table#donor_points_box,
-table#submit_box
-/* end user management */ {
+table#submit_box,
+/* end user management */
+/* notif filters */ form[name="notification"],
+/* wiki search */ table.wiki_browse,
+/* better.php */ table.better_list {
     th,
     td {
         border-bottom: 0 !important;

templates/wiki/browse.html

@@ -0,0 +1,53 @@
+<section class="wiki_search">
+  <p>Search the wiki for user created tutorials and information.</p>
+
+  <form class="search_form" name="wiki" action="wiki.php" method="get">
+    <input type="hidden" name="action" value="search" />
+    <input type="hidden" name="nojump" value="1" />
+    <input type="search" name="search" size="80" />
+    <input value="Search" type="submit" class="hidden button-primary" />
+  </form>
+  <br />
+
+  <p>
+    Additionally, you can manually browse through the articles by their first letter.
+  </p>
+  
+  <span>
+    {% for letter in 'a'..'z' %}
+    <a href="wiki.php?action=browse&amp;letter={{ letter }}"
+      >{{ letter|upper }}</a
+    >&nbsp;&nbsp; {% endfor %}
+    <a href="wiki.php?action=browse&amp;letter=1">All</a>&nbsp;&nbsp;
+  </span>
+</section>
+
+<section class="wiki_results">
+  <div class="header">
+    <h2>{{ title }}</h2>
+  </div>
+  <div class="linkbox">
+    <a href="wiki.php?action=create" class="brackets">Create</a>
+  </div>
+
+
+  <table width="100%" style="margin-bottom: 10px">
+    <tr class="colhead">
+      <td>Article</td>
+      <td>Last updated on</td>
+      <td>Last edited by</td>
+    </tr>
+    {% for article in articles %}
+    <tr>
+      <td>
+        <a href="wiki.php?action=article&amp;id={{ article.ID }}"
+          >{{ article.Title }}</a
+        >
+      </td>
+      <td>{{ article.Date }}</td>
+      <td>{{ article.Author|user_url }}</td>
+    </tr>
+    {% endfor %}
+  </table>
+
+</section>

templates/wiki/browse.twig

@@ -1,49 +0,0 @@
-{% macro letter_box(show_search = true) %}
-    <div class="box pad center">
-        {% if show_search %}
-        <p>Search the wiki for user created tutorials and information.</p>
-        <form class="search_form" name="wiki" action="wiki.php" method="get">
-            <input type="hidden" name="action" value="search" />
-            <input type="hidden" name="nojump" value="1" />
-            <input type="search" name="search" size="80" />
-            <input value="Search" type="submit" class="hidden" />
-        </form>
-        <br />
-        <p>Additionally, you can manually browse through the articles by their first letter.</p>
-        {% endif %}
-        <span>
-            {% for letter in 'a'..'z' %}
-            <a href="wiki.php?action=browse&amp;letter={{ letter }}">{{ letter|upper }}</a>&nbsp;&nbsp;
-            {% endfor %}
-            <a href="wiki.php?action=browse&amp;letter=1">All</a>&nbsp;&nbsp;
-        </span>
-    </div>
-{% endmacro %}
-
-<div class="thin">
-    <div class="header">
-        <h2>{{ title }}</h2>
-    </div>
-    <div class="linkbox">
-        <a href="wiki.php?action=create" class="brackets">Create</a>
-    </div>
-
-    {{ _self.letter_box() }}
-
-    <table width="100%" style="margin-bottom: 10px;">
-        <tr class="colhead">
-            <td>Article</td>
-            <td>Last updated on</td>
-            <td>Last edited by</td>
-        </tr>
-        {% for article in articles %}
-        <tr>
-            <td><a href="wiki.php?action=article&amp;id={{ article.ID }}">{{ article.Title }}</a></td>
-            <td>{{ article.Date }}</td>
-            <td>{{ article.Author|user_url }}</td>
-        </tr>
-        {% endfor %}
-    </table>
-
-    {{ _self.letter_box(false) }}
-</div>