Fix 500 errors on torrent group editing and missing CSS assets

classes/mysql.class.php

@@ -118,7 +118,8 @@ if (!extension_loaded('mysqli')) {
 
 /**
  * db_string
- * Handles escaping
+ *
+ * Handles escaping.
  */
 function db_string($String, $DisableWildcards = false)
 {

classes/security.class.php

@@ -17,7 +17,7 @@ class Security
      * Makes sure a number ID is valid,
      * e.g., a page ID requested by GET.
      */
-    public function checkInt(mixed $ID)
+    public function checkInt($ID)
     #public function checkInt(int|array $ID) # Union types need PHP 8 - unbelievable!
     {
         # Cast single ID to array

classes/torrents.class.php

@@ -545,7 +545,7 @@ class Torrents
      *
      * @param int $GroupID
      */
-    public static function update_hash($GroupID)
+    public static function update_hash(int $GroupID)
     {
         $QueryID = G::$DB->get_query_id();
 
@@ -575,18 +575,19 @@ class Torrents
 
         // Fetch album artists
         G::$DB->query("
-        SELECT GROUP_CONCAT(ag.Name separator ' ')
-        FROM torrents_artists AS ta
-          JOIN artists_group AS ag ON ag.ArtistID = ta.ArtistID
-          WHERE ta.GroupID = ?
-        GROUP BY ta.GroupID", $GroupID);
+        SELECT GROUP_CONCAT(ag.`Name` separator ' ')
+        FROM `torrents_artists` AS `ta`
+          JOIN `artists_group` AS ag ON ag.`ArtistID` = ta.`ArtistID`
+          WHERE ta.`GroupID` = '$GroupID'
+        GROUP BY ta.`GroupID`
+        ");
         if (G::$DB->has_results()) {
             list($ArtistName) = G::$DB->next_record(MYSQLI_NUM, false);
         } else {
             $ArtistName = '';
         }
 
-        G::$DB->query("
+        G::$DB->prepare_query("
         REPLACE
         INTO sphinx_delta(
           `ID`,
@@ -619,28 +620,28 @@ class Torrents
         SELECT
           t.`ID`,
           g.`id`,
-          `Name`,
-          `Title2`,
-          `NameJP`,
-          `TagList`,
-          `Year`,
-          `CatalogueNumber`,
-          `CategoryID`,
+          g.`title`,
+          g.`subject`,
+          g.`object`,
+          g.`tag_list`,
+          g.`published`,
+          g.`identifier`,
+          g.`category_id`,
           UNIX_TIMESTAMP(t.`Time`),
-          `Size`,
-          `Snatched`,
-          `Seeders`,
-          `Leechers`,
-          `Censored`,
-          `Studio`,
-          `Series`,
+          t.`Size`,
+          t.`Snatched`,
+          t.`Seeders`,
+          t.`Leechers`,
+          t.`Censored`,
+          g.`workgroup`,
+          g.`location`,
           CAST(`FreeTorrent` AS CHAR),
-          `Media`,
-          `Container`,
-          `Codec`,
-          `Resolution`,
-          `Version`,
-          `Description`,
+          t.`Media`,
+          t.`Container`,
+          t.`Codec`,
+          t.`Resolution`,
+          t.`Version`,
+          t.`Description`,
         REPLACE
           (
         REPLACE
@@ -657,13 +658,13 @@ class Torrents
         WHERE
           g.`id` = '$GroupID'
         ");
+        G::$DB->exec_prepared_query();
 
         G::$Cache->delete_value("torrents_details_$GroupID");
         G::$Cache->delete_value("torrent_group_$GroupID");
         G::$Cache->delete_value("torrent_group_light_$GroupID");
 
         $ArtistInfo = Artists::get_artist($GroupID);
-
         G::$Cache->delete_value("groups_artists_$GroupID");
         G::$DB->set_query_id($QueryID);
     }

feeds.php

@@ -1,42 +1,58 @@
 <?php
 declare(strict_types = 1);
 
-/*-- Feed Start Class ----------------------------------*/
-/*------------------------------------------------------*/
-/* Simplified version of script_start, used for the     */
-/* sitewide RSS system.                                 */
-/*------------------------------------------------------*/
-/********************************************************/
-
-// Let's prevent people from clearing feeds
+/**
+ * Feed start class
+ *
+ * Simplified version of script_start,
+ * used for the sitewide RSS system.
+ */
+
+# Let's prevent people from clearing feeds
 if (isset($_GET['clearcache'])) {
     unset($_GET['clearcache']);
 }
 
 require_once 'classes/config.php';
-require_once SERVER_ROOT.'/classes/misc.class.php';
-require_once SERVER_ROOT.'/classes/cache.class.php';
-require_once SERVER_ROOT.'/classes/feed.class.php';
-
 $ENV = ENV::go();
-$Cache = new Cache($ENV->getPriv('MEMCACHED_SERVERS')); // Load the caching class
-$Feed = new Feed; // Load the time class
 
+require_once "$ENV->SERVER_ROOT/classes/misc.class.php";
+require_once "$ENV->SERVER_ROOT/classes/cache.class.php";
+require_once "$ENV->SERVER_ROOT/classes/feed.class.php";
+
+# Load the caching class
+$Cache = new Cache($ENV->getPriv('MEMCACHED_SERVERS'));
+
+# Load the time class
+$Feed = new Feed;
+
+
+/**
+ * check_perms
+ */
 function check_perms()
 {
     return false;
 }
 
+
+/**
+ * is_number
+ */
 function is_number($Str)
 {
     if ($Str < 0) {
         return false;
     }
 
-    // We're converting input to an int, then string, and comparing to the original
+    # We're converting input to an int, then string, and comparing to the original
     return ($Str === strval(intval($Str)));
 }
 
+
+/**
+ * display_str
+ */
 function display_str($Str)
 {
     if ($Str !== '') {
@@ -62,21 +78,29 @@ function display_str($Str)
 
         $Str = str_replace($Replace, $With, $Str);
     }
+
     return $Str;
 }
 
+
+/**
+ * make_utf8
+ */
 function make_utf8($Str)
 {
     if ($Str !== '') {
         if (is_utf8($Str)) {
             $Encoding = 'UTF-8';
         }
+
         if (empty($Encoding)) {
             $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
         }
+
         if (empty($Encoding)) {
             $Encoding = 'ISO-8859-1';
         }
+
         if ($Encoding === 'UTF-8') {
             return $Str;
         } else {
@@ -85,6 +109,10 @@ function make_utf8($Str)
     }
 }
 
+
+/**
+ * is_utf8
+ */
 function is_utf8($Str)
 {
     return preg_match(
@@ -102,6 +130,10 @@ function is_utf8($Str)
     );
 }
 
+
+/**
+ * display_array
+ */
 function display_array($Array, $Escape = [])
 {
     foreach ($Array as $Key => $Val) {
@@ -109,20 +141,29 @@ function display_array($Array, $Escape = [])
             $Array[$Key] = display_str($Val);
         }
     }
+
     return $Array;
 }
 
+
 /**
- * Print the site's URL including the appropriate URI scheme, including the trailing slash
+ * site_url
+ *
+ * Print the site's URL and appropriate URI scheme,
+ * including the trailing slash.
  */
 function site_url()
 {
-    return 'https://' . SITE_DOMAIN . '/';
+    $ENV = ENV::go();
+    return "https://$ENV->SITE_DOMAIN/";
 }
 
+
+# Set the headers
 header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
 header('Pragma:');
 header('Expires: '.date('D, d M Y H:i:s', time() + (2 * 60 * 60)).' GMT');
 header('Last-Modified: '.date('D, d M Y H:i:s').' GMT');
 
-require_once SERVER_ROOT.'/sections/feeds/index.php';
+# Load the feeds section
+require_once "$ENV->SERVER_ROOT/sections/feeds/index.php";

image.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-// Functions and headers needed by the image proxy
+# Functions and headers needed by the image proxy
 error_reporting(E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR);
 
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
@@ -9,107 +9,146 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
     error();
 }
 
-header('Expires: '.date('D, d-M-Y H:i:s \U\T\C', time() + 3600 * 24 * 120)); // 120 days
+header('Expires: '.date('D, d-M-Y H:i:s \U\T\C', time() + 3600 * 24 * 120)); # 120 days
 header('Last-Modified: '.date('D, d-M-Y H:i:s \U\T\C', time()));
 
 if (!extension_loaded('gd')) {
-    error('nogd');
+    error('Please install and enable the GD Graphics Library.');
 }
 
+
+/**
+ * img_error
+ */
 function img_error($Type)
 {
+    $ENV = ENV::go();
+
     header('Content-type: image/gif');
-    error(file_get_contents(SERVER_ROOT.'/sections/image/err_imgs/'.$Type.'.png'));
+    error(file_get_contents("$ENV->SERVER_ROOT/sections/image/err_imgs/$Type.png"));
 }
 
+
+/**
+ * invisible
+ */
 function invisible($Image)
 {
     $Count = imagecolorstotal($Image);
     if ($Count === 0) {
         return false;
     }
+
     $TotalAlpha = 0;
     for ($i = 0; $i < $Count; ++$i) {
         $Color = imagecolorsforindex($Image, $i);
         $TotalAlpha += $Color['alpha'];
     }
+
     return (($TotalAlpha / $Count) === 127);
 }
 
+
+/**
+ * verysmall
+ */
 function verysmall($Image)
 {
     return ((imagesx($Image) * imagesy($Image)) < 25);
 }
 
+
+/**
+ * image_type
+ */
 function image_type($Data)
 {
     if (!strncmp($Data, 'GIF', 3)) {
         return 'gif';
     }
+
     if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
         return 'png';
     }
+
     if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
         return 'jpeg';
     }
+
     if (!strncmp($Data, 'BM', 2)) {
         return 'bmp';
     }
+
     if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
         return 'tiff';
     }
+
     if (!substr_compare($Data, 'webm', 31, 4)) {
         return 'webm';
     }
 }
 
+
+/**
+ * image_height
+ */
 function image_height($Type, $Data)
 {
-    $Length = strlen($Data);
     global $URL, $_GET;
+    $Length = strlen($Data);
 
     switch ($Type) {
-    case 'jpeg':
-      // See http://www.obrador.com/essentialjpeg/headerinfo.htm
-      $i = 4;
-      $Data = (substr($Data, $i));
-      $Block = unpack('nLength', $Data);
-      $Data = substr($Data, $Block['Length']);
-      $i += $Block['Length'];
-      $Str []= 'Started 4, + '.$Block['Length'];
-
-      while ($Data !== '') { // Iterate through the blocks until we find the start of frame marker (FFC0)
-        $Block = unpack('CBlock/CType/nLength', $Data); // Get info about the block
-        if ($Block['Block'] !== '255') { // We should be at the start of a new block
-          break;
-        }
-
-          if ($Block['Type'] !== '192') { // C0
-          $Data = substr($Data, $Block['Length'] + 2); // Next block
-          $Str []= 'Started $i, + '.($Block['Length'] + 2);
-              $i += ($Block['Length'] + 2);
-          } else { // We're at the FFC0 block
-          $Data = substr($Data, 5); // Skip FF C0 Length(2) precision(1)
-          $i += 5;
-              $Height = unpack('nHeight', $Data);
-              return $Height['Height'];
-          }
-      }
-      break;
-
-    case 'gif':
-      $Data = substr($Data, 8);
-      $Height = unpack('vHeight', $Data);
-      return $Height['Height'];
-
-    case 'png':
-      $Data = substr($Data, 20);
-      $Height = unpack('NHeight', $Data);
-      return $Height['Height'];
-      
-    default:
-      return 0;
-  }
+        case 'jpeg':
+            # https://www.geocities.ws/crestwoodsdd/JPEG.htm
+            $i = 4;
+            $Data = (substr($Data, $i));
+            $Block = unpack('nLength', $Data);
+            $Data = substr($Data, $Block['Length']);
+            $i += $Block['Length'];
+            $Str []= 'Started 4, + '.$Block['Length'];
+
+            # Iterate through the blocks until we find the start of frame marker (FFC0)
+            while ($Data !== '') {
+                # Get info about the block
+                $Block = unpack('CBlock/CType/nLength', $Data);
+
+                # We should be at the start of a new block
+                if ($Block['Block'] !== '255') {
+                    break;
+                }
+
+                if ($Block['Type'] !== '192') { # C0
+                    $Data = substr($Data, $Block['Length'] + 2); # Next block
+                    $Str []= 'Started $i, + '.($Block['Length'] + 2);
+                    $i += ($Block['Length'] + 2);
+                }
+                
+                # We're at the FFC0 block
+                else {
+                    # Skip FF C0 Length(2) precision(1)
+                    $Data = substr($Data, 5);
+                    $i += 5;
+                    $Height = unpack('nHeight', $Data);
+                    return $Height['Height'];
+                }
+            }
+            break;
+            
+        case 'gif':
+            $Data = substr($Data, 8);
+            $Height = unpack('vHeight', $Data);
+            return $Height['Height'];
+        
+        case 'png':
+            $Data = substr($Data, 20);
+            $Height = unpack('NHeight', $Data);
+            return $Height['Height'];
+            
+        default:
+            return 0;
+    }
 }
 
-require_once 'classes/script_start.php'; // script_start.php contains all we need and includes sections/image/index.php
+
+# script_start.php contains all we need and includes sections/image/index.php
+require_once 'classes/script_start.php';

sections/collages/collage.php

@@ -1,13 +1,9 @@
 <?php
 #declare(strict_types=1);
 
-ini_set('max_execution_time', 600);
+$CollageID = (int) $_GET['id'];
+Security::checkInt($CollageID);
 
-if (empty($_GET['id']) || !is_number($_GET['id'])) {
-    error(0);
-}
-
-$CollageID = $_GET['id'];
 $CollageData = $Cache->get_value("collage_$CollageID");
 
 if ($CollageData) {

sections/collages/index.php

@@ -1,71 +1,73 @@
-<?
+<?php
+declare(strict_types=1);
+
 define('ARTIST_COLLAGE', 'Artists');
 enforce_login();
 
 if (empty($_REQUEST['action'])) {
-  $_REQUEST['action'] = '';
+    $_REQUEST['action'] = '';
 }
 
 switch ($_REQUEST['action']) {
   case 'new':
     if (!check_perms('site_collages_create')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/new.php');
     break;
   case 'new_handle':
     if (!check_perms('site_collages_create')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/new_handle.php');
     break;
   case 'add_torrent':
   case 'add_torrent_batch':
     if (!check_perms('site_collages_manage')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/add_torrent.php');
     break;
   case 'add_artist':
   case 'add_artist_batch':
     if (!check_perms('site_collages_manage')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/add_artist.php');
     break;
   case 'manage':
     if (!check_perms('site_collages_manage')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/manage.php');
     break;
   case 'manage_handle':
     if (!check_perms('site_collages_manage')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/manage_handle.php');
     break;
   case 'manage_artists':
     if (!check_perms('site_collages_manage')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/manage_artists.php');
     break;
   case 'manage_artists_handle':
     if (!check_perms('site_collages_manage')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/manage_artists_handle.php');
     break;
   case 'edit':
     if (!check_perms('site_edit_wiki')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/edit.php');
     break;
   case 'edit_handle':
     if (!check_perms('site_edit_wiki')) {
-      error(403);
+        error(403);
     }
     require(SERVER_ROOT.'/sections/collages/edit_handle.php');
     break;
@@ -90,19 +92,17 @@ switch ($_REQUEST['action']) {
     break;
   case 'create_personal':
     if (!check_perms('site_collages_personal')) {
-      error(403);
+        error(403);
     } else {
-      Collages::create_personal_collage();
+        Collages::create_personal_collage();
     }
     break;
 
   default:
     if (!empty($_GET['id'])) {
-      require(SERVER_ROOT.'/sections/collages/collage.php');
+        require(SERVER_ROOT.'/sections/collages/collage.php');
     } else {
-      require(SERVER_ROOT.'/sections/collages/browse.php');
+        require(SERVER_ROOT.'/sections/collages/browse.php');
     }
     break;
 }
-
-?>

sections/collages/torrent_collage.php

@@ -46,7 +46,7 @@ foreach ($GroupIDs as $GroupID) {
     $Group = $TorrentList[$GroupID];
     extract(Torrents::array_group($Group));
     $UserID = $Contributors[$GroupID];
-    $TorrentTags = new Tags($TagList);
+    $TorrentTags = new Tags($tag_list);
 
     // Handle stats and stuff
     $Number++;
@@ -74,28 +74,28 @@ foreach ($GroupIDs as $GroupID) {
     $DisplayName .= "<a class='torrent_title' 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').'" ';
     }
 
-    $GroupName = empty($GroupName) ? (empty($GroupTitle2) ? $GroupNameJP : $GroupTitle2) : $GroupName;
-    $DisplayName .= "dir='ltr'>$GroupName</a>";
+    $title = empty($title) ? (empty($subject) ? $object : $subject) : $title;
+    $DisplayName .= "dir='ltr'>$title</a>";
 
     # Year
-    if ($GroupYear) {
+    if ($published) {
         $Label = '<br />📅&nbsp;';
-        $DisplayName .= $Label."<a href='torrents.php?action=search&year=$GroupYear'>$GroupYear</a>";
+        $DisplayName .= $Label."<a href='torrents.php?action=search&year=$published'>$published</a>";
     }
           
     # Studio
-    if ($GroupStudio) {
+    if ($workgroup) {
         $Label = '&ensp;📍&nbsp;';
-        $DisplayName .= $Label."<a href='torrents.php?action=search&location=$GroupStudio'>$GroupStudio</a>";
+        $DisplayName .= $Label."<a href='torrents.php?action=search&location=$workgroup'>$workgroup</a>";
     }
 
     # Catalogue Number
-    if ($GroupCatalogueNumber) {
+    if ($identifier) {
         $Label = '&ensp;🔑&nbsp;';
-        $DisplayName .= $Label."<a href='torrents.php?action=search&numbers=$GroupCatalogueNumber'>$GroupCatalogueNumber</a>";
+        $DisplayName .= $Label."<a href='torrents.php?action=search&numbers=$identifier'>$identifier</a>";
     }
 
     # Authors
@@ -284,7 +284,7 @@ foreach ($GroupIDs as $GroupID) {
     $DisplayName = '';
 
     #$DisplayName .= Artists::display_artists($Artists, false);
-    $DisplayName .= $GroupName;
+    $DisplayName .= $title;
 
     if ($GroupYear > 0) {
         $DisplayName = "$DisplayName [$GroupYear]";
@@ -295,11 +295,11 @@ foreach ($GroupIDs as $GroupID) {
 
 <div class="collage_image image_group_<?=$GroupID?>">
   <a href="torrents.php?id=<?=$GroupID?>">
-    <?php if (!$WikiImage) {
-        $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
+    <?php if (!$picture) {
+        $picture = STATIC_SERVER.'common/noartwork/music.png';
     } ?>
     <img class="tooltip_interactive"
-      src="<?=ImageTools::process($WikiImage, 'thumb')?>"
+      src="<?=ImageTools::process($picture, 'thumb')?>"
       alt="<?=$DisplayName?>"
       title="<?=$DisplayName?>"
       data-title-plain="<?="$DisplayName ($PlainTags)"?>"

sections/schedule/daily/disable_inactive_users.php

@@ -1,27 +1,38 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
+/*
 $ENV = ENV::go();
 
-// The SQL query's lines below controls the notification clock
-//   AND um.LastAccess < (NOW() - INTERVAL 110 DAY)
-//   AND um.LastAccess > (NOW() - INTERVAL 111 DAY)
+# The SQL query's lines below controls the notification clock
+#   AND um.LastAccess < (NOW() - INTERVAL 110 DAY)
+#   AND um.LastAccess > (NOW() - INTERVAL 111 DAY)
 
 if (apcu_exists('DBKEY')) {
-    // Send email
+    # Send email
     $DB->query("
-      SELECT um.Username, um.Email
-      FROM users_info AS ui
-        JOIN users_main AS um ON um.ID = ui.UserID
-        LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
-      WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
-        AND um.LastAccess < (NOW() - INTERVAL 355 DAY)
-        AND um.LastAccess > (NOW() - INTERVAL 356 DAY)
-        AND um.LastAccess IS NOT NULL
-        AND ui.Donor = '0'
-        AND um.Enabled != '2'
-        AND ul.UserID IS NULL
-      GROUP BY um.ID");
+    SELECT
+      um.`Username`,
+      um.`Email`
+    FROM
+      `users_info` AS ui
+    JOIN `users_main` AS um
+    ON
+      um.`ID` = ui.`UserID`
+    LEFT JOIN `users_levels` AS ul
+    ON
+      ul.`UserID` = um.`ID` AND ul.`PermissionID` = '".CELEB."'
+    WHERE
+      um.`PermissionID` IN('".USER."', '".MEMBER ."')
+      AND um.`LastAccess` <(NOW() - INTERVAL 355 DAY)
+      AND um.`LastAccess` >(NOW() - INTERVAL 356 DAY)
+      AND um.`LastAccess` IS NOT NULL
+      AND ui.`Donor` = '0'
+      AND um.`Enabled` != '2'
+      AND ul.`UserID` IS NULL
+    GROUP BY
+      um.`ID`
+    ");
 
     while (list($Username, $Email) = $DB->next_record()) {
         $Email = Crypto::decrypt($Email);
@@ -32,19 +43,29 @@ if (apcu_exists('DBKEY')) {
     # The actual deletion clock
     #   AND um.LastAccess < (NOW() - INTERVAL 120 DAY)
     $DB->query("
-      SELECT um.ID
-      FROM users_info AS ui
-        JOIN users_main AS um ON um.ID = ui.UserID
-        LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
-      WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
-        AND um.LastAccess < (NOW() - INTERVAL 365 DAY)
-        AND um.LastAccess IS NOT NULL
-        AND ui.Donor = '0'
-        AND um.Enabled != '2'
-        AND ul.UserID IS NULL
-      GROUP BY um.ID");
+    SELECT
+      um.`ID`
+    FROM
+      `users_info` AS ui
+    JOIN `users_main` AS um
+    ON
+      um.`ID` = ui.`UserID`
+    LEFT JOIN `users_levels` AS ul
+    ON
+      ul.`UserID` = um.`ID` AND ul.`PermissionID` = '".CELEB."'
+    WHERE
+      um.`PermissionID` IN('".USER."', '".MEMBER ."')
+      AND um.`LastAccess` <(NOW() - INTERVAL 365 DAY)
+      AND um.`LastAccess` IS NOT NULL
+      AND ui.`Donor` = '0'
+      AND um.`Enabled` != '2'
+      AND ul.`UserID` IS NULL
+    GROUP BY
+      um.`ID`
+    ");
 
     if ($DB->has_results()) {
         Tools::disable_users($DB->collect('ID'), 'Disabled for inactivity.', 3);
     }
 }
+*/

sections/torrents/editgroup.php

@@ -64,8 +64,8 @@ if ($DB->has_results()) {
 $Artists = Artists::get_artists(array($GroupID))[$GroupID];
 
 if (!$Body) {
-    $Body = $WikiBody;
-    $Image = $WikiImage;
+    $Body = $description;
+    $Image = $picture;
 }
 
 View::show_header(
@@ -76,7 +76,7 @@ View::show_header(
 
 <h2 class="header">
   Edit
-  <a href="torrents.php?id=<?=$GroupID?>"><?=($Name ? $Name : ($Title2 ? $Title2 : $NameJP))?></a>
+  <a href="torrents.php?id=<?=$GroupID?>"><?=($title ? $title : ($subject ? $subject : $object))?></a>
 </h2>
 
 <div class="box pad">
@@ -101,7 +101,7 @@ View::show_header(
 
     <?php
 new TEXTAREA_PREVIEW(
-    'body', # $Name breaks "Rename (will not merge)"
+    'body', # $title breaks "Rename (will not merge)"
     $ID = 'body',
     $Value = display_str($Body) ?? '',
 );
@@ -308,7 +308,7 @@ new TEXTAREA_PREVIEW(
 
         <td>
           <input type="text" name="name" size="70"
-            value="<?=$Name?>" />
+            value="<?=$title?>" />
         </td>
       </tr>
 
@@ -318,8 +318,8 @@ new TEXTAREA_PREVIEW(
         </td>
 
         <td>
-          <input type="text" name="Title2" size="70"
-            value="<?=$Title2?>" />
+          <input type="text" name="subject" size="70"
+            value="<?=$subject?>" />
         </td>
       </tr>
 

sections/torrents/index.php

@@ -1,270 +1,307 @@
 <?php
 #declare(strict_types=1);
 
-//Function used for pagination of peer/snatch/download lists on details.php
-function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
-  $NumPages = ceil($NumResults / 100);
-  $PageLinks = [];
-  for ($i = 1; $i <= $NumPages; $i++) {
-    if ($i == $CurrentPage) {
-      $PageLinks[] = $i;
-    } else {
-      $PageLinks[] = "<a href=\"#\" onclick=\"$Action($TorrentID, $i)\">$i</a>";
+$ENV = ENV::go();
+
+// Function used for pagination of peer/snatch/download lists on details.php
+function js_pages($Action, $TorrentID, $NumResults, $CurrentPage)
+{
+    $NumPages = ceil($NumResults / 100);
+    $PageLinks = [];
+
+    for ($i = 1; $i <= $NumPages; $i++) {
+        if ($i === $CurrentPage) {
+            $PageLinks[] = $i;
+        } else {
+            $PageLinks[] = "<a href='#' onclick='$Action($TorrentID, $i)'>$i</a>";
+        }
     }
-  }
-  return implode(' | ', $PageLinks);
+  
+    return implode(' | ', $PageLinks);
 }
 
-// This gets used in a few places
-$ArtistTypes = array(1 => 'Main', 2 => 'Guest', 3 => 'Remixer', 4 => 'Composer', 5 => 'Conductor', 6 => 'DJ/Compiler', 7 => 'Producer');
 
+/**
+ * Main switchboard
+ */
 if (!empty($_REQUEST['action'])) {
-  switch ($_REQUEST['action']) {
-    case 'edit':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/edit.php');
-      break;
-
-    case 'editgroup':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/editgroup.php');
-      break;
-
-    case 'editgroupid':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/editgroupid.php');
-      break;
-
-    case 'changecategory':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/takechangecategory.php');
-      break;
-    case 'grouplog':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/grouplog.php');
-      break;
-    case 'takeedit':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/takeedit.php');
-      break;
-
-    case 'newgroup':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/takenewgroup.php');
-      break;
-
-    case 'peerlist':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/peerlist.php');
-      break;
-
-    case 'snatchlist':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/snatchlist.php');
-      break;
-
-    case 'downloadlist':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/downloadlist.php');
-      break;
-
-    case 'redownload':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/redownload.php');
-      break;
-
-    case 'revert':
-    case 'takegroupedit':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/takegroupedit.php');
-      break;
-
-    case 'screenshotedit':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/screenshotedit.php');
-      break;
-
-    case 'nonwikiedit':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/nonwikiedit.php');
-      break;
-
-    case 'rename':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/rename.php');
-      break;
-
-    case 'merge':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/merge.php');
-      break;
-
-    case 'add_alias':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/add_alias.php');
-      break;
-
-    case 'delete_alias':
-      enforce_login();
-      authorize();
-      include(SERVER_ROOT.'/sections/torrents/delete_alias.php');
-      break;
-
-    case 'history':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/history.php');
-      break;
-
-    case 'delete':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/delete.php');
-      break;
-
-    case 'takedelete':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/takedelete.php');
-      break;
-
-    case 'masspm':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/masspm.php');
-      break;
-
-    case 'reseed':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/reseed.php');
-      break;
-
-    case 'takemasspm':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/takemasspm.php');
-      break;
-
-    case 'add_tag':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/add_tag.php');
-      break;
-
-    case 'delete_tag':
-      enforce_login();
-      authorize();
-      include(SERVER_ROOT.'/sections/torrents/delete_tag.php');
-      break;
-
-    case 'notify':
-      enforce_login();
-      include(SERVER_ROOT.'/sections/torrents/notify.php');
-      break;
-
-    case 'manage_artists':
-      enforce_login();
-      require(SERVER_ROOT.'/sections/torrents/manage_artists.php');
-      break;
-
-    case 'notify_clear':
-    case 'notify_clear_item':
-    case 'notify_clear_items':
-    case 'notify_clearitem':
-    case 'notify_clear_filter':
-    case 'notify_cleargroup':
-    case 'notify_catchup':
-    case 'notify_catchup_filter':
-      authorize();
-      enforce_login();
-      require(SERVER_ROOT.'/sections/torrents/notify_actions.php');
-      break;
+    switch ($_REQUEST['action']) {
+        case 'edit':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/edit.php";
+            break;
+        
+        case 'editgroup':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/editgroup.php";
+            break;
+            
+        case 'editgroupid':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/editgroupid.php";
+            break;
+            
+        case 'changecategory':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/takechangecategory.php";
+            break;
+            
+        case 'grouplog':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/grouplog.php";
+            break;
+            
+        case 'takeedit':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/takeedit.php";
+            break;
+            
+        case 'newgroup':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/takenewgroup.php";
+            break;
+            
+        case 'peerlist':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/peerlist.php";
+            break;
+            
+        case 'snatchlist':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/snatchlist.php";
+            break;
+            
+        case 'downloadlist':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/downloadlist.php";
+            break;
+            
+        case 'redownload':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/redownload.php";
+            break;
+            
+        case 'revert':
+        case 'takegroupedit':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/takegroupedit.php";
+            break;
+            
+        case 'screenshotedit':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/screenshotedit.php";
+            break;
+            
+        case 'nonwikiedit':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/nonwikiedit.php";
+            break;
+            
+        case 'rename':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/rename.php";
+            break;
+            
+        case 'merge':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/merge.php";
+            break;
+            
+        case 'add_alias':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/add_alias.php";
+            break;
+            
+        case 'delete_alias':
+            enforce_login();
+            authorize();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/delete_alias.php";
+            break;
+            
+        case 'history':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/history.php";
+            break;
+            
+        case 'delete':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/delete.php";
+            break;
+            
+        case 'takedelete':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/takedelete.php";
+            break;
+            
+        case 'masspm':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/masspm.php";
+            break;
+            
+        case 'reseed':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/reseed.php";
+            break;
+            
+        case 'takemasspm':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/takemasspm.php";
+            break;
+            
+        case 'add_tag':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/add_tag.php";
+            break;
+            
+        case 'delete_tag':
+            enforce_login();
+            authorize();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/delete_tag.php";
+            break;
+            
+        case 'notify':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/notify.php";
+            break;
+            
+        case 'manage_artists':
+            enforce_login();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/manage_artists.php";
+            break;
+            
+        case 'notify_clear':
+        case 'notify_clear_item':
+        case 'notify_clear_items':
+        case 'notify_clearitem':
+        case 'notify_clear_filter':
+        case 'notify_cleargroup':
+        case 'notify_catchup':
+        case 'notify_catchup_filter':
+            enforce_login();
+            authorize();
+            require_once "$ENV->SERVER_ROOT/sections/torrents/notify_actions.php";
+            break;
+            
+        case 'download':
+            require_once "$ENV->SERVER_ROOT/sections/torrents/download.php";
+            break;
+            
+        case 'regen_filelist':
+            if (check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {
+                Torrents::regenerate_filelist($_GET['torrentid']);
+                header('Location: torrents.php?torrentid='.$_GET['torrentid']);
+                error();
+            } else {
+                error(403);
+            }
+            break;
+            
+        case 'fix_group':
+            if ((check_perms('users_mod') || check_perms('torrents_fix_ghosts')) && authorize() && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
+                $DB->prepare_query("
+                SELECT
+                  COUNT(`ID`)
+                FROM
+                  `torrents`
+                WHERE
+                  `GroupID` = '$_GET[groupid]'
+                ");
+                $DB->exec_prepared_query();
+                list($Count) = $DB->next_record();
+                
+                if ($Count === 0) {
+                    Torrents::delete_group($_GET['groupid']);
+                }
+                
+                if (!empty($_GET['artistid']) && is_number($_GET['artistid'])) {
+                    header('Location: artist.php?id='.$_GET['artistid']);
+                } else {
+                    header('Location: torrents.php?id='.$_GET['groupid']);
+                }
+            } else {
+                error(403);
+            }
+            break;
+            
+        case 'add_cover_art':
+            require_once "$ENV->SERVER_ROOT/sections/torrents/add_cover_art.php";
+            break;
+            
+        case 'remove_cover_art':
+            require_once "$ENV->SERVER_ROOT/sections/torrents/remove_cover_art.php";
+            break;
+            
+        case 'autocomplete_tags':
+            require_once "$ENV->SERVER_ROOT/sections/torrents/autocomplete_tags.php";
+            break;
+            
+        default:
+            enforce_login();
+            
+            if (!empty($_GET['id'])) {
+                require_once "$ENV->SERVER_ROOT/sections/torrents/details.php";
+            } elseif (isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
+                $DB->query("
+                SELECT
+                  `GroupID`
+                FROM
+                  `torrents`
+                WHERE
+                  `ID` = '$_GET[torrentid]'
+                ");
+                list($GroupID) = $DB->next_record();
+                
+                if ($GroupID) {
+                    header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid']);
+                }
+            } else {
+                require_once "$ENV->SERVER_ROOT/sections/torrents/browse.php";
+            }
+            break;
+    } # switch
+}
 
-    case 'download':
-      require(SERVER_ROOT.'/sections/torrents/download.php');
-      break;
+# If $_REQUEST['action'] is empty
+else {
+    enforce_login();
+
+    if (!empty($_GET['id'])) {
+        require_once "$ENV->SERVER_ROOT/sections/torrents/details.php";
+    } elseif (isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
+        $DB->query("
+        SELECT
+          `GroupID`
+        FROM
+          `torrents`
+        WHERE
+          `ID` = '$_GET[torrentid]'
+        ");
+        list($GroupID) = $DB->next_record();
 
-    case 'regen_filelist':
-      if (check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {
-        Torrents::regenerate_filelist($_GET['torrentid']);
-        header('Location: torrents.php?torrentid='.$_GET['torrentid']);
-        error();
-      } else {
-        error(403);
-      }
-      break;
-    case 'fix_group':
-      if ((check_perms('users_mod') || check_perms('torrents_fix_ghosts')) && authorize() && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
-        $DB->query('
-          SELECT COUNT(ID)
-          FROM torrents
-          WHERE GroupID = '.$_GET['groupid']);
-        list($Count) = $DB->next_record();
-        if ($Count == 0) {
-          Torrents::delete_group($_GET['groupid']);
-        }
-        if (!empty($_GET['artistid']) && is_number($_GET['artistid'])) {
-          header('Location: artist.php?id='.$_GET['artistid']);
+        if ($GroupID) {
+            header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid'].'#torrent'.$_GET['torrentid']);
         } else {
-          header('Location: torrents.php?id='.$_GET['groupid']);
+            header("Location: log.php?search=Torrent+$_GET[torrentid]");
         }
-      } else {
-        error(403);
-      }
-      break;
-    case 'add_cover_art':
-      include(SERVER_ROOT.'/sections/torrents/add_cover_art.php');
-      break;
-    case 'remove_cover_art':
-      include(SERVER_ROOT.'/sections/torrents/remove_cover_art.php');
-      break;
-    case 'autocomplete_tags':
-      include(SERVER_ROOT.'/sections/torrents/autocomplete_tags.php');
-      break;
-    default:
-      enforce_login();
-
-      if (!empty($_GET['id'])) {
-        include(SERVER_ROOT.'/sections/torrents/details.php');
-      } elseif (isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
-        $DB->query('
-          SELECT GroupID
-          FROM torrents
-          WHERE ID = '.$_GET['torrentid']);
+    } elseif (!empty($_GET['type'])) {
+        require_once "$ENV->SERVER_ROOT/sections/torrents/user.php";
+    } elseif (!empty($_GET['groupname']) && !empty($_GET['forward'])) {
+        $DB->prepare_query("
+        SELECT
+          `id`
+        FROM
+          `torrents_group`
+        WHERE
+          `title` LIKE '$_GET[groupname]'
+        ");
         list($GroupID) = $DB->next_record();
+
         if ($GroupID) {
-          header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid']);
+            header("Location: torrents.php?id=$GroupID");
+        } else {
+            require_once "$ENV->SERVER_ROOT/sections/torrents/browse.php";
         }
-      } else {
-        include(SERVER_ROOT.'/sections/torrents/browse.php');
-      }
-      break;
-  }
-} else {
-  enforce_login();
-
-  if (!empty($_GET['id'])) {
-    include(SERVER_ROOT.'/sections/torrents/details.php');
-  } elseif (isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
-    $DB->query("
-      SELECT GroupID
-      FROM torrents
-      WHERE ID = ".$_GET['torrentid']);
-    list($GroupID) = $DB->next_record();
-    if ($GroupID) {
-      header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid'].'#torrent'.$_GET['torrentid']);
-    } else {
-      header("Location: log.php?search=Torrent+$_GET[torrentid]");
-    }
-  } elseif (!empty($_GET['type'])) {
-    include(SERVER_ROOT.'/sections/torrents/user.php');
-  } elseif (!empty($_GET['groupname']) && !empty($_GET['forward'])) {
-    $DB->query("
-      SELECT ID
-      FROM torrents_group
-      WHERE Name LIKE '".db_string($_GET['groupname'])."'");
-    list($GroupID) = $DB->next_record();
-    if ($GroupID) {
-      header("Location: torrents.php?id=$GroupID");
     } else {
-      include(SERVER_ROOT.'/sections/torrents/browse.php');
+        require_once "$ENV->SERVER_ROOT/sections/torrents/browse.php";
     }
-  } else {
-    include(SERVER_ROOT.'/sections/torrents/browse.php');
-  }
 }
-?>

sections/torrents/manage_artists.php

@@ -1,9 +1,11 @@
-<?
+<?php
+#declare(strict_types = 1);
+
 if (empty($_POST['importance']) || empty($_POST['artists']) || empty($_POST['groupid']) || !is_number($_POST['importance']) || !is_number($_POST['groupid'])) {
-  error(0);
+    error(0);
 }
 if (!check_perms('torrents_edit')) {
-  error(403);
+    error(403);
 }
 authorize();
 
@@ -14,38 +16,38 @@ $ArtistIDs = [];
 $ArtistsString = '0';
 
 foreach ($Artists as $i => $Artist) {
-  list($Importance, $ArtistID) = explode(';', $Artist);
-  if (is_number($ArtistID) && is_number($Importance)) {
-    $CleanArtists[] = array($Importance, $ArtistID);
-    $ArtistIDs[] = $ArtistID;
-  }
+    list($Importance, $ArtistID) = explode(';', $Artist);
+    if (is_number($ArtistID) && is_number($Importance)) {
+        $CleanArtists[] = array($Importance, $ArtistID);
+        $ArtistIDs[] = $ArtistID;
+    }
 }
 
 if (count($CleanArtists) > 0) {
-  $ArtistsString = implode(',', $ArtistIDs);
-  if ($_POST['manager_action'] == 'delete') {
-    $DB->query("
+    $ArtistsString = implode(',', $ArtistIDs);
+    if ($_POST['manager_action'] == 'delete') {
+        $DB->query("
       SELECT Name
       FROM torrents_group
       WHERE ID = '".$_POST['groupid']."'");
-    list($GroupName) = $DB->next_record();
-    $DB->query("
+        list($GroupName) = $DB->next_record();
+        $DB->query("
       SELECT ArtistID, Name
       FROM artists_group
       WHERE ArtistID IN ($ArtistsString)");
-    $ArtistNames = $DB->to_array('ArtistID', MYSQLI_ASSOC, false);
-    foreach ($CleanArtists as $Artist) {
-      list($Importance, $ArtistID) = $Artist;
-      Misc::write_log('Artist ('.$ArtistTypes[$Importance].") $ArtistID (".$ArtistNames[$ArtistID]['Name'].") was removed from the group ".$_POST['groupid']." ($GroupName) by user ".$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
-      Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Removed artist ".$ArtistNames[$ArtistID]['Name']." (".$ArtistTypes[$Importance].")", 0);
-      $DB->query("
+        $ArtistNames = $DB->to_array('ArtistID', MYSQLI_ASSOC, false);
+        foreach ($CleanArtists as $Artist) {
+            list($Importance, $ArtistID) = $Artist;
+            Misc::write_log("Artist $ArtistID (".$ArtistNames[$ArtistID]['Name'].") was removed from the group ".$_POST['groupid']." ($GroupName) by user ".$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
+            Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Removed artist ".$ArtistNames[$ArtistID]['Name'], 0);
+            $DB->query("
         DELETE FROM torrents_artists
         WHERE GroupID = '$GroupID'
           AND ArtistID = '$ArtistID'
           AND Importance = '$Importance'");
-      $Cache->delete_value("artist_groups_$ArtistID");
-    }
-    $DB->query("
+            $Cache->delete_value("artist_groups_$ArtistID");
+        }
+        $DB->query("
       SELECT ArtistID
         FROM requests_artists
         WHERE ArtistID IN ($ArtistsString)
@@ -53,20 +55,19 @@ if (count($CleanArtists) > 0) {
       SELECT ArtistID
         FROM torrents_artists
         WHERE ArtistID IN ($ArtistsString)");
-    $Items = $DB->collect('ArtistID');
-    $EmptyArtists = array_diff($ArtistIDs, $Items);
-    foreach ($EmptyArtists as $ArtistID) {
-      Artists::delete_artist($ArtistID);
-    }
-  } else {
-    $DB->query("
+        $Items = $DB->collect('ArtistID');
+        $EmptyArtists = array_diff($ArtistIDs, $Items);
+        foreach ($EmptyArtists as $ArtistID) {
+            Artists::delete_artist($ArtistID);
+        }
+    } else {
+        $DB->query("
       UPDATE IGNORE torrents_artists
       SET Importance = '".$_POST['importance']."'
       WHERE GroupID = '$GroupID'
         AND ArtistID IN ($ArtistsString)");
-  }
-  $Cache->delete_value("groups_artists_$GroupID");
-  Torrents::update_hash($GroupID);
-  header("Location: torrents.php?id=$GroupID");
+    }
+    $Cache->delete_value("groups_artists_$GroupID");
+    Torrents::update_hash($GroupID);
+    header("Location: torrents.php?id=$GroupID");
 }
-?>

sections/torrents/nonwikiedit.php

@@ -12,7 +12,7 @@ if (!check_perms('torrents_edit')) {
     FROM
       `torrents`
     WHERE
-      `GroupID` = '$GroupID'
+      `GroupID` = '$group_id'
     ");
 
     if (!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
@@ -38,25 +38,25 @@ if (check_perms('torrents_freeleech')
         error(404);
     }
 
-    Torrents::freeleech_groups($GroupID, $Free, $FreeType);
+    Torrents::freeleech_groups($group_id, $Free, $FreeType);
 }
 
 $Artists = $_POST['idols'];
 
 // Escape fields
-$Studio = db_string($_POST['studio']);
-$Series = db_string($_POST['series']);
-$Year = db_string((int)$_POST['year']);
-$CatalogueNumber = db_string($_POST['catalogue']);
+$workgroup = db_string($_POST['studio']);
+$location = db_string($_POST['series']);
+$published = db_string((int)$_POST['year']);
+$identifier = db_string($_POST['catalogue']);
 
 // Get some info for the group log
 $DB->query("
 SELECT
-  `Year`
+  `published`
 FROM
   `torrents_group`
 WHERE
-  `ID` = '$GroupID'
+  `id` = '$group_id'
 ");
 list($OldYear) = $DB->next_record();
 
@@ -64,22 +64,22 @@ $DB->query("
 UPDATE
   `torrents_group`
 SET
-  `Year` = '$Year',
-  `CatalogueNumber` = '$CatalogueNumber',
-  `Studio` = '$Studio',
-  `Series` = '$Series'
+  `published` = '$published',
+  `identifier` = '$identifier',
+  `workgroup` = '$workgroup',
+  `location` = '$location'
 WHERE
-  `ID` = '$GroupID'
+  `id` = '$group_id'
 ");
 
-if ($OldYear !== $Year) {
-    $Message = db_string("Year changed from $OldYear to $Year");
+if ($OldYear !== $published) {
+    $Message = db_string("Year changed from $OldYear to $published");
+
     $DB->query("
-    INSERT INTO `group_log`
-      (`GroupID`, `UserID`, `Time`, `Info`)
+    INSERT INTO `group_log`(`GroupID`, `UserID`, `Time`, `Info`)
     VALUES(
-      '$GroupID',
-      ".$LoggedUser['ID'].",
+      '$group_id',
+      '$LoggedUser[ID]',
       NOW(),
       '$Message')
     ");
@@ -94,7 +94,7 @@ JOIN `torrents_artists` AS ta
 ON
   ag.`ArtistID` = ta.`ArtistID`
 WHERE
-  ta.`GroupID` = '$GroupID'
+  ta.`GroupID` = '$group_id'
 ");
 
 while ($r = $DB->next_record(MYSQLI_ASSOC, true)) {
@@ -123,18 +123,17 @@ foreach ($Artists as $Artist) {
             $ArtistID = $DB->inserted_id();
         }
 
-        $DB->query(
-            "
+        $DB->query("
         INSERT INTO `torrents_artists`(`GroupID`, `ArtistID`, `UserID`)
         VALUES(
-          '$GroupID',
+          '$group_id',
           '$ArtistID',
-          ".$LoggedUser['ID']."
+          '$LoggedUser[ID]'
         )
         ON DUPLICATE KEY
         UPDATE
-          `UserID` = ".$LoggedUser['ID']
-        ); // Why does this even happen
+          `UserID` = '$LoggedUser[ID]'
+        "); // Why does this even happen
         $Cache->delete_value('artist_groups_'.$ArtistID);
     }
 }
@@ -161,7 +160,7 @@ foreach ($CurrArtists as $CurrArtist) {
               `torrents_artists`
             WHERE
               `ArtistID` = '$ArtistID'
-              AND `GroupID` = '$GroupID'
+              AND `GroupID` = '$group_id'
             ");
 
             $DB->query("
@@ -200,13 +199,13 @@ SELECT
 FROM
   `torrents`
 WHERE
-  `GroupID` = '$GroupID'
+  `GroupID` = '$group_id'
 ");
 
 while (list($TorrentID) = $DB->next_record()) {
     $Cache->delete_value("torrent_download_$TorrentID");
 }
 
-Torrents::update_hash($GroupID);
-$Cache->delete_value("torrents_details_$GroupID");
-header("Location: torrents.php?id=$GroupID");
+Torrents::update_hash($group_id);
+$Cache->delete_value("torrents_details_$group_id");
+header("Location: torrents.php?id=$group_id");

sections/torrents/rename.php

@@ -1,58 +1,65 @@
 <?php
 #declare(strict_types=1);
 
+/**
+ * Input validation
+ */
+
 authorize();
 
-$GroupID = $_POST['groupid'];
-$NewTitle1 = $_POST['name'];
-$NewTitle2 = $_POST['Title2'];
-$NewTitle3 = $_POST['namejp'];
+$group_id = (int) $_POST['groupid'];
+Security::checkInt($group_id);
+
+$NewTitle = $_POST['name'];
+$NewSubject = $_POST['Title2'];
+$NewObject = $_POST['namejp'];
 
-$DB->query(
-    "
+$DB->prepare_query("
 SELECT
   `ID`
 FROM
   `torrents`
 WHERE
-  `GroupID` = ".db_string($GroupID)."
-  AND `UserID` = ".$LoggedUser['ID']
-);
-$Contributed = $DB->has_results();
-
-if (!$GroupID || !is_number($GroupID)) {
-    error(404);
-}
+  `GroupID` = '$group_id' AND `UserID` = '$LoggedUser[ID]'
+");
+$DB->exec_prepared_query();
 
+$Contributed = $DB->has_results();
 if (!($Contributed || check_perms('torrents_edit'))) {
     error(403);
 }
 
-#if (empty($NewName) && empty($NewRJ) && empty($NewJP)) {
-if (empty($NewTitle1)) { # Title2, Title3 optional
+# NewSubject, NewObject optional
+if (empty($NewTitle)) {
     error('Torrent groups must have a name');
 }
 
-$DB->query("
+$DB->prepare_query("
 UPDATE
   `torrents_group`
 SET
-  `Name` = '".db_string($NewTitle1)."',
-  `Title2` = '".db_string($NewTitle2)."',
-  `NameJP` = '".db_string($NewTitle3)."'
+  `title` = '$NewTitle',
+  `subject` = '$NewSubject',
+  `object` = '$NewObject'
 WHERE
-  `ID` = '$GroupID'
+  `id` = '$group_id'
 ");
-$Cache->delete_value("torrents_details_$GroupID");
+$DB->exec_prepared_query();
 
-Torrents::update_hash($GroupID);
+$Cache->delete_value("torrents_details_$group_id");
+Torrents::update_hash($group_id);
 
 $DB->query("
-  SELECT `Name`, `Title2`, `NameJP`
-  FROM `torrents_group`
-  WHERE `ID` = '$GroupID'
+SELECT
+  `title`,
+  `subject`,
+  `object`
+FROM
+  `torrents_group`
+WHERE
+  `id` = '$group_id'
 ");
-list($OldName, $OldRJ, $OldJP) = $DB->next_record(MYSQLI_NUM, false);
+list($OldTitle, $OldSubject, $OldObject) = $DB->next_record(MYSQLI_NUM, false);
 
 # Map metadata over generic database fields
 # todo: Work into $ENV in classes/config.php
@@ -60,19 +67,19 @@ $Title1 = 'Title';
 $Title2 = 'Organism';
 $Title3 = 'Strain/Variety';
 
-if ($OldName !== $NewTitle1) {
-    Misc::write_log("Torrent Group $GroupID ($OldName)'s $Title1 was changed to '$NewTitle1' from '$OldName' by ".$LoggedUser['Username']);
-    Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "$Title1 changed to '$NewTitle1' from '$OldName'", 0);
+if ($OldTitle !== $NewTitle) {
+    Misc::write_log("Torrent Group $group_id ($OldTitle)'s $Title1 was changed to '$NewTitle' from '$OldTitle' by ".$LoggedUser['Username']);
+    Torrents::write_group_log($group_id, 0, $LoggedUser['ID'], "$Title1 changed to '$NewTitle' from '$OldTitle'", 0);
 }
 
-if ($OldRJ !== $NewTitle2) {
-    Misc::write_log("Torrent Group $GroupID ($OldRJ)'s $Title2 was changed to '$NewTitle2' from '$OldRJ' by ".$LoggedUser['Username']);
-    Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "$Title2 changed to '$NewTitle2' from '$OldRJ'", 0);
+if ($OldSubject !== $NewSubject) {
+    Misc::write_log("Torrent Group $group_id ($OldSubject)'s $Title2 was changed to '$NewSubject' from '$OldSubject' by ".$LoggedUser['Username']);
+    Torrents::write_group_log($group_id, 0, $LoggedUser['ID'], "$Title2 changed to '$NewSubject' from '$OldSubject'", 0);
 }
 
-if ($OldJP !== $NewTitle3) {
-    Misc::write_log("Torrent Group $GroupID ($OldJP)'s $Title3 was changed to '$NewTitle3' from '$OldJP' by ".$LoggedUser['Username']);
-    Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "$Title3 changed to '$NewTitle3' from '$OldJP'", 0);
+if ($OldObject !== $NewObject) {
+    Misc::write_log("Torrent Group $group_id ($OldObject)'s $Title3 was changed to '$NewObject' from '$OldObject' by ".$LoggedUser['Username']);
+    Torrents::write_group_log($group_id, 0, $LoggedUser['ID'], "$Title3 changed to '$NewObject' from '$OldObject'", 0);
 }
 
-header("Location: torrents.php?id=$GroupID");
+header("Location: torrents.php?id=$group_id");

sections/torrents/takegroupedit.php

@@ -1,5 +1,5 @@
 <?php
-#declare(strict_types = 1);
+declare(strict_types = 1);
 
 /**
  * Input validation
@@ -13,139 +13,200 @@ if (!check_perms('site_edit_wiki')) {
 }
 
 # Variables for database input
-$UserID = (int) $LoggedUser['ID'];
-$GroupID = (int) $_REQUEST['groupid'];
-
-Security::checkInt([$UserID, $GroupID]);
+$user_id = (int) $LoggedUser['ID'];
+$group_id = (int) $_REQUEST['groupid'];
+Security::checkInt([$user_id, $group_id]);
 
 # If we're reverting to a previous revision
 if (!empty($_GET['action']) && $_GET['action'] === 'revert') {
-    $RevisionID = (int) $_GET['revisionid'];
-    Security::checkInt($RevisionID);
+    $revision_id = (int) $_GET['revisionid'];
+    Security::checkInt($revision_id);
 
     # To cite from merge: "Everything is legit, let's just confim they're not retarded"
     if (empty($_GET['confirm'])) {
         View::show_header();
     } ?>
 
-<!-- Start HTML -->
 <div class="center">
   <div class="header">
-    <h2>Revert Confirm!</h2>
+    <h2>
+      Revert Confirm!
+    </h2>
   </div>
-  <div class="box pad">
+
+  <div class="box">
     <form class="confirm_form" name="torrent_group" action="torrents.php" method="get">
       <input type="hidden" name="action" value="revert" />
       <input type="hidden" name="auth"
         value="<?=$LoggedUser['AuthKey']?>" />
       <input type="hidden" name="confirm" value="true" />
-      <input type="hidden" name="groupid" value="<?=$GroupID?>" />
+      <input type="hidden" name="groupid" value="<?=$group_id?>" />
       <input type="hidden" name="revisionid"
-        value="<?=$RevisionID?>" />
-      <h3>You are attempting to revert to the revision <a
-          href="torrents.php?id=<?=$GroupID?>&amp;revisionid=<?=$RevisionID?>"><?=$RevisionID?></a>.</h3>
+        value="<?=$revision_id?>" />
+
+      <h3>
+        You are attempting to revert to the revision
+        <a
+          href="torrents.php?id=<?=$group_id?>&amp;revisionid=<?=$revision_id?>"><?=$revision_id?></a>.
+      </h3>
       <input type="submit" value="Confirm" />
     </form>
   </div>
 </div>
+
 <?php
     View::show_footer();
-        error();
-    }
-} else { // with edit, the variables are passed with POST
-    $Body = $_POST['body'];
-    $Image = $_POST['image'];
+    error();
+}
 
-    if (($GroupInfo = $Cache->get_value('torrents_details_'.$GroupID)) && !isset($GroupInfo[0][0])) {
-        $GroupCategoryID = $GroupInfo[0]['CategoryID'];
+
+# With edit, the variables are passed with POST
+else {
+    $description = $_POST['body'];
+    $picture = $_POST['image'];
+
+    if (($GroupInfo = $Cache->get_value('torrents_details_'.$group_id)) && !isset($GroupInfo[0][0])) {
+        $GroupCategoryID = $GroupInfo[0]['category_id'];
     } else {
         $DB->query("
-      SELECT CategoryID
-      FROM torrents_group
-      WHERE ID = '$GroupID'");
+        SELECT
+          `category_id`
+        FROM
+          `torrents_group`
+        WHERE
+          `id` = '$group_id'
+        ");
         list($GroupCategoryID) = $DB->next_record();
     }
 
     // Trickery
-    if (!preg_match("/^".IMAGE_REGEX."$/i", $Image)) {
-        $Image = '';
+    if (!preg_match("/^".IMAGE_REGEX."$/i", $picture)) {
+        $picture = '';
     }
-    ImageTools::blacklisted($Image);
+
+    ImageTools::blacklisted($picture);
     $Summary = db_string($_POST['summary']);
 }
 
 // Insert revision
-if (empty($RevisionID)) { // edit
-  $DB->query("
-    INSERT INTO wiki_torrents
-      (PageID, Body, Image, UserID, Summary, Time)
-    VALUES
-      ('$GroupID', '".db_string($Body)."', '".db_string($Image)."', '$UserID', '$Summary', NOW())");
+if (empty($revision_id)) { // edit
+  $DB->prepare_query("
+  INSERT INTO `wiki_torrents`(
+    `PageID`,
+    `Body`,
+    `Image`,
+    `UserID`,
+    `Summary`,
+    `Time`
+  )
+  VALUES(
+    '$group_id',
+    '$description',
+    '$picture',
+    '$user_id',
+    '$Summary',
+    NOW()
+  )
+  ");
+    $DB->exec_prepared_query();
 } else { // revert
     $DB->query("
-    SELECT PageID, Body, Image
-    FROM wiki_torrents
-    WHERE RevisionID = '$RevisionID'");
+    SELECT
+      `PageID`,
+      `Body`,
+      `Image`
+    FROM
+      `wiki_torrents`
+    WHERE
+      `RevisionID` = '$revision_id'
+    ");
     list($PossibleGroupID, $Body, $Image) = $DB->next_record();
-    if ($PossibleGroupID != $GroupID) {
+
+    if ($PossibleGroupID !== $group_id) {
         error(404);
     }
 
     $DB->query("
-    INSERT INTO wiki_torrents
-      (PageID, Body, Image, UserID, Summary, Time)
-    SELECT '$GroupID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', NOW()
-    FROM wiki_artists
-    WHERE RevisionID = '$RevisionID'");
+    INSERT INTO `wiki_torrents`(
+      `PageID`,
+      `Body`,
+      `Image`,
+      `UserID`,
+      `Summary`,
+      `Time`
+    )
+    SELECT
+      '$group_id',
+      `Body`,
+      `Image`,
+      '$user_id',
+      'Reverted to revision $revision_id',
+      NOW()
+    FROM
+      `wiki_artists`
+    WHERE
+      `RevisionID` = '$revision_id'
+    ");
 }
 
-$RevisionID = $DB->inserted_id();
-
-$Body = db_string($Body);
-$Image = db_string($Image);
+$revision_id = $DB->inserted_id();
+$description = db_string($description);
+$picture = db_string($picture);
 
-// Update torrents table (technically, we don't need the RevisionID column, but we can use it for a join which is nice and fast)
+// Update torrents table (technically, we don't need the revision_id column, but we can use it for a join which is nice and fast)
 $DB->query("
 UPDATE
   `torrents_group`
 SET
-  `revision_id` = '$RevisionID',
-  `description` = '$Body',
-  `picture` = '$Image'
+  `revision_id` = '$revision_id',
+  `description` = '$description',
+  `picture` = '$picture'
 WHERE
-  `id` = '$GroupID'
+  `id` = '$group_id'
 ");
 
 // There we go, all done!
+$Cache->delete_value('torrents_details_'.$group_id);
+$Cache->delete_value('torrent_group_'.$group_id);
 
-$Cache->delete_value('torrents_details_'.$GroupID);
-$Cache->delete_value('torrent_group_'.$GroupID);
 $DB->query("
-  SELECT CollageID
-  FROM collages_torrents
-  WHERE GroupID = '$GroupID'");
+SELECT
+  `CollageID`
+FROM
+  `collages_torrents`
+WHERE
+  `GroupID` = '$group_id'
+");
+
 if ($DB->has_results()) {
     while (list($CollageID) = $DB->next_record()) {
         $Cache->delete_value('collage_'.$CollageID);
     }
 }
 
-//Fix Recent Uploads/Downloads for image change
+// Fix Recent Uploads/Downloads for image change
 $DB->query("
-  SELECT DISTINCT UserID
-  FROM torrents AS t
-    LEFT JOIN torrents_group AS tg ON t.GroupID=tg.ID
-  WHERE tg.ID = $GroupID");
-
-$UserIDs = $DB->collect('UserID');
-foreach ($UserIDs as $UserID) {
-    $RecentUploads = $Cache->get_value('recent_uploads_'.$UserID);
+SELECT DISTINCT
+  `UserID`
+FROM
+  `torrents` AS t
+LEFT JOIN `torrents_group` AS tg
+ON
+  t.`GroupID` = tg.`id`
+WHERE
+  tg.`id` = '$group_id'
+");
+
+$user_ids = $DB->collect('UserID');
+foreach ($user_ids as $user_id) {
+    $RecentUploads = $Cache->get_value('recent_uploads_'.$user_id);
+
     if (is_array($RecentUploads)) {
         foreach ($RecentUploads as $Key => $Recent) {
-            if ($Recent['ID'] == $GroupID) {
-                if ($Recent['WikiImage'] != $Image) {
-                    $Recent['WikiImage'] = $Image;
-                    $Cache->begin_transaction('recent_uploads_'.$UserID);
+            if ($Recent['id'] === $group_id) {
+                if ($Recent['picture'] !== $picture) {
+                    $Recent['picture'] = $picture;
+                    $Cache->begin_transaction('recent_uploads_'.$user_id);
                     $Cache->update_row($Key, $Recent);
                     $Cache->commit_transaction(0);
                 }
@@ -155,24 +216,35 @@ foreach ($UserIDs as $UserID) {
 }
 
 $DB->query("
-  SELECT ID
-  FROM torrents
-  WHERE GroupID = $GroupID");
+SELECT
+  `ID`
+FROM
+  `torrents`
+WHERE
+  `GroupID` = '$group_id'
+");
+
 if ($DB->has_results()) {
     $TorrentIDs = implode(',', $DB->collect('ID'));
     $DB->query("
-    SELECT DISTINCT uid
-    FROM xbt_snatched
-    WHERE fid IN ($TorrentIDs)");
+    SELECT DISTINCT
+      `uid`
+    FROM
+      `xbt_snatched`
+    WHERE
+      `fid` IN($TorrentIDs)
+    ");
+
     $Snatchers = $DB->collect('uid');
-    foreach ($Snatchers as $UserID) {
-        $RecentSnatches = $Cache->get_value('recent_snatches_'.$UserID);
+    foreach ($Snatchers as $user_id) {
+        $RecentSnatches = $Cache->get_value('recent_snatches_'.$user_id);
+
         if (is_array($RecentSnatches)) {
             foreach ($RecentSnatches as $Key => $Recent) {
-                if ($Recent['ID'] == $GroupID) {
-                    if ($Recent['WikiImage'] != $Image) {
-                        $Recent['WikiImage'] = $Image;
-                        $Cache->begin_transaction('recent_snatches_'.$UserID);
+                if ($Recent['id'] == $group_id) {
+                    if ($Recent['picture'] !== $picture) {
+                        $Recent['picture'] = $picture;
+                        $Cache->begin_transaction('recent_snatches_'.$user_id);
                         $Cache->update_row($Key, $Recent);
                         $Cache->commit_transaction(0);
                     }
@@ -182,4 +254,4 @@ if ($DB->has_results()) {
     }
 }
 
-header("Location: torrents.php?id=$GroupID");
+header("Location: torrents.php?id=$group_id");

static/styles/beluga/beluga.scss

@@ -1 +1,2 @@
+@import "../assets/go";
 @import "scss/beluga";

static/styles/bookish/bookish.scss

@@ -1,3 +1,4 @@
+@import "../assets/go";
 @import "scss/bookish";
 
 @import "scss/colors";

static/styles/development/development.scss

@@ -1 +1,2 @@
+@import "../assets/go";
 @import "scss/development";

static/styles/genaviv/genaviv.scss

@@ -1 +1,2 @@
+@import "../assets/go";
 @import "scss/genaviv";

static/styles/matcha/matcha.scss

@@ -1 +1,2 @@
+@import "../assets/go";
 @import "scss/matcha";

static/styles/oppai/oppai.scss

@@ -1 +1,2 @@
+@import "../assets/go";
 @import "scss/oppai";

static/styles/postmod/postmod.scss

@@ -1,3 +1,4 @@
+@import "../assets/go";
 @import "scss/postmod";
 
 @import "scss/colors";

static/styles/public/public.scss

@@ -1 +1,2 @@
+@import "../assets/go";
 @import "scss/public";