Start to implement Seqhash and fix lots of stuff (the site is still broken)

classes/script_start.php

@@ -547,16 +547,6 @@ if (isset(G::$LoggedUser['LockedAccount']) && !in_array($Document, $AllowedPages
 
 $Debug->set_flag('completed module execution');
 
-/* Required in the absence of session_start() for providing that pages will change
-upon hit rather than being browser cached for changing content.
-
-Old versions of Internet Explorer choke when downloading binary files over HTTPS with disabled cache.
-Define the following constant in files that handle file downloads */
-if (!defined('SKIP_NO_CACHE_HEADERS')) {
-    header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
-    header('Pragma: no-cache');
-}
-
 // Flush to user
 ob_end_flush();
 

classes/security.class.php

@@ -6,6 +6,7 @@ declare(strict_types = 1);
  *
  * Designed to hold common authentication functions from various sources:
  *  - classes/script_start.php
+ *  - "Quick SQL injection check"
  */
 
 class Security
@@ -16,16 +17,17 @@ class Security
      * Makes sure a number ID is valid,
      * e.g., a page ID requested by GET.
      */
-    public function checkInt($IDs)
+    public function checkInt(mixed $ID)
+    #public function checkInt(int|array $ID) # Union types need PHP 8 - unbelievable!
     {
-        # Temporary failsafe
-        # (int) 'dingus' = 0
-        # (int) 3.14 = 3
-        $IDs = (is_array($IDs) ?: [(int) $IDs]);
-        foreach ($IDs as $ID) {
-            $ID = (int) $ID;
-
-            if (!is_int($ID) || $ID < 1) {
+        # Cast single ID to array
+        if (!is_array($ID)) {
+            $ID = [$ID];
+        }
+
+        # Check each ID supplied
+        foreach ($ID as $ID) {
+            if (!ID || !is_int($ID) || $ID < 1) {
                 error(400);
             }
         }
@@ -33,13 +35,14 @@ class Security
         return;
     }
 
+
     /**
      * Setup pitfalls
      *
      * A series of quick sanity checks during app init.
      * Previously in classes/script_start.php.
      */
-    public function SetupPitfalls()
+    public function setupPitfalls()
     {
         # short_open_tag
         if (!ini_get('short_open_tag')) {
@@ -63,6 +66,7 @@ class Security
         return;
     }
 
+
     /**
      * UserID checks
      *

classes/seqhash.class.php

@@ -0,0 +1,360 @@
+<?php
+#declare(strict_types = 1);
+# PHP Notice:  Trying to access array offset on value of type bool in /var/www/html/dev.biotorrents.de/classes/seqhash.class.php on line 233
+
+/**
+ * Seqhash
+ *
+ * Implements Keoni's Seqhash algorithm for DNA/RNA/protein sequences,
+ * e.g., v1_DCD_4b0616d1b3fc632e42d78521deb38b44fba95cca9fde159e01cd567fa996ceb9
+ *
+ * > The first element is the version tag (v1 for version 1).
+ * > If there is ever a Seqhash version 2, this tag will differentiate seqhashes.
+ *
+ * > The second element is the metadata tag, which has 3 letters.
+ * > The first letter codes for the sequenceType (D for DNA, R for RNA, and P for Protein).
+ * > The second letter codes for whether or not the sequence is circular (C for Circular, L for Linear).
+ * > The final letter codes for whether or not the sequence is double stranded (D for Double stranded, S for Single stranded).
+ *
+ * > The final element is the blake3 hash of the sequence (once rotated and complemented).
+ *
+ * Requires the php-blake3 extension from:
+ * https://github.com/cypherbits/php-blake3
+ *
+ * @see https://blog.libredna.org/post/seqhash/
+ * @see https://github.com/TimothyStiles/poly/blob/prime/hash.go
+ * @see https://github.com/TimothyStiles/poly/blob/prime/hash_test.go
+ */
+
+class Seqhash
+{
+    /**
+     * boothLeastRotation
+     *
+     * Gets the least rotation of a circular string.
+     * @see https://en.wikipedia.org/wiki/Lexicographically_minimal_string_rotation
+     */
+    public function boothLeastRotation(string $Sequence)
+    {
+        # First concatenate the sequence to itself to avoid modular arithmatic
+        # todo: Use buffers just for speed? May get annoying with larger sequences
+        $Sequence = $Sequence . $Sequence;
+        $LeastRotationIndex = 0;
+
+        # Initializing failure slice
+        $FailureSlice = array_fill(0, strlen($Sequence), -1);
+
+        /*
+        for ($i = 0; $i <= strlen($Sequence); $i++) {
+            $FailureSlice[$i] = -1;
+        }
+        */
+
+        # Iterate through each character in the doubled-over sequence
+        for ($CharacterIndex = 1; $CharacterIndex < strlen($Sequence); $CharacterIndex++) {
+
+            # Get character
+            $Character = $Sequence[$CharacterIndex];
+
+            # Get failure
+            $Failure = $FailureSlice[$CharacterIndex - $LeastRotationIndex - 1];
+
+            # While failure !== -1 and character !== the character found at the least rotation + failure + 1
+            while ($Failure !== -1 && $Character !== $Sequence[$LeastRotationIndex + $Failure + 1]) {
+
+                # If character is lexically less than whatever is at $LeastRotationIndex, update $LeastRotationIndex
+                if ($Character < $Sequence[$LeastRotationIndex + $Failure + 1]) {
+                    $LeastRotationIndex = $CharacterIndex - $Failure - 1;
+                }
+
+                # Update failure using previous failure as index?
+                $Failure = $FailureSlice[$Failure];
+            } # while
+
+            # If character does not equal whatever character is at leastRotationIndex plus failure
+            if ($Character !== $Sequence[$LeastRotationIndex + $Failure + 1]) {
+
+                # If character is lexically less then what is rotated, $LeastRotatationIndex gets value of $CharacterIndex
+                if ($Character < $Sequence[$LeastRotationIndex]) {
+                    $LeastRotationIndex = $CharacterIndex;
+                }
+
+                # Assign -1 to whatever is at the index of difference between character and rotation indices
+                $FailureSlice[$CharacterIndex - $LeastRotationIndex] = -1;
+    
+            # If character does equal whatever character is at $LeastRotationIndex + $Failure
+            } else {
+                # Assign $Failure + 1 at the index of difference between character and rotation indices
+                $FailureSlice[$CharacterIndex - $LeastRotationIndex] = $Failure + 1;
+            }
+        } # for
+
+        return $LeastRotationIndex;
+    }
+
+
+    /**
+     * rotateSequence
+     *
+     * Rotates circular sequences to a deterministic point.
+     */
+    public function rotateSequence(string $Sequence)
+    {
+        $RotationIndex = $this->boothLeastRotation($Sequence);
+
+        # Writing the same sequence twice
+        # PHP has no strings.Builder.WriteString
+        $ConcatenatedSequence = $Sequence . $Sequence;
+
+        # https://stackoverflow.com/a/2423867
+        $Length = $RotationIndex % strlen($Sequence);
+        return substr($Sequence, $Length) . substr($Sequence, 0, $Length);
+    }
+
+
+    /**
+     * reverseComplement
+     *
+     * Takes the reverse complement of a sequence.
+     * Doesn't validate the sequence alphabet first.
+     */
+    public function reverseComplement(string $Sequence)
+    {
+        # Normalize the sequence
+        $Sequence = strtoupper($Sequence);
+
+        /**
+         * Provides 1:1 mapping between bases and their complements.
+         * Kind of ghetto, but lowercase replaces help stop extra flips.
+         * @see https://github.com/TimothyStiles/poly/blob/prime/sequence.go
+         */
+        $RuneMap = [
+            'A' => 't',
+            'B' => 'v',
+            'C' => 'g',
+            'D' => 'h',
+            'G' => 'c',
+            'H' => 'd',
+            'K' => 'm',
+            'M' => 'k',
+            'N' => 'n',
+            'R' => 'y',
+            'S' => 's',
+            'T' => 'a',
+            'U' => 'a',
+            'V' => 'b',
+            'W' => 'w',
+            'Y' => 'r',
+        ];
+
+        return $ComplementString = strtoupper(
+            str_replace(
+                array_keys($RuneMap),
+                array_values($RuneMap),
+                $Sequence
+            )
+        );
+    }
+
+
+    /**
+     * hash
+     *
+     * Create a Seqhash from a string.
+     */
+    public function hash(
+        string $Sequence,
+        string $SequenceType,
+        bool   $Circular = false,
+        bool   $DoubleStranded = true
+    ) {
+        # Check for Blake3 support
+        if (!extension_loaded('blake3')) {
+            throw new Exception('Please install and enable the php-blake3 extension.');
+        }
+
+        # By definition, Seqhashes are of uppercase sequences
+        $Sequence = strtoupper($Sequence);
+
+        # If RNA, convert to a DNA sequence
+        # The hash itself between a DNA and RNA sequence will not be different,
+        # but their Seqhash will have a different metadata string (R vs. D)
+        if ($SequenceType === 'RNA') {
+            $Sequence = str_replace('T', 'U', $Sequence);
+        }
+
+        # Run checks on the input
+        if (!in_array($SequenceType, ['DNA', 'RNA', 'PROTEIN'])) {
+            throw new Exception("SequenceType must be one of [DNA, RNA, PROTEIN]. Got $SequenceType.");
+        }
+
+        # Check the alphabet used
+        $SequenceRegex = '/[ATUGCYRSWKMBDHVNZ]/';
+        $ProteinRegex = '/[ACDEFGHIKLMNPQRSTVWYUO*BXZ]/';
+
+        # todo: Refactor this to detect $SequenceType from alphabet
+        if ($SequenceType === 'DNA' || $SequenceType === 'RNA') {
+            foreach (str_split($Sequence) as $Letter) {
+                if (!preg_match($SequenceRegex, $Letter)) {
+                    throw new Exception("Only letters ATUGCYRSWKMBDHVNZ are allowed for DNA/RNA. Got $Letter.");
+                }
+            }
+        }
+
+        /**
+         * Selenocysteine (Sec; U) and pyrrolysine (Pyl; O) are added
+         * in accordance with https://www.uniprot.org/help/sequences
+         *
+         * The release notes https://web.expasy.org/docs/relnotes/relstat.html
+         * also state there are Asx (B), Glx (Z), and Xaa (X) amino acids,
+         * so these are added in as well.
+         */
+        else {
+            foreach (str_split($Sequence) as $Letter) {
+                if (!preg_match($ProteinRegex, $Letter)) {
+                    throw new Exception("Only letters ACDEFGHIKLMNPQRSTVWYUO*BXZ are allowed for proteins. Got $Letter.");
+                }
+            }
+        }
+    
+        # There is no check for circular proteins since proteins can be circular
+        if ($SequenceType === 'PROTEIN' && $DoubleStranded) {
+            throw new Exception("Proteins can't be double stranded.");
+        }
+
+        # Gets deterministic sequence based off of metadata + sequence
+        #switch ($Circular && $DoubleStranded) {
+        switch ([$Circular, $DoubleStranded]) {
+            #case (true && true):
+            case [true, true]:
+                $PotentialSequences = [
+                    $this->rotateSequence($Sequence),
+                    $this->rotateSequence($this->reverseComplement($Sequence)),
+                ];
+                $DeterministicSequence = sort($PotentialSequences)[0];
+                break;
+
+            #case (true && false):
+            case [true, false]:
+                $DeterministicSequence = $this->rotateSequence($Sequence);
+                break;
+
+            #case (false && true):
+            case [false, true]:
+                $PotentialSequences = [
+                    $Sequence,
+                    $this->reverseComplement($Sequence),
+                ];
+                $DeterministicSequence = sort($PotentialSequences)[0];
+                break;
+
+            #case (false && false):
+            case [false, false]:
+                $DeterministicSequence = $Sequence;
+                break;
+
+            default:
+                break;
+        }
+
+        /**
+         * Build 3 letter metadata
+         */
+
+        # Get first letter: D for DNA, R for RNA, and P for Protein
+        switch ($SequenceType) {
+            case 'DNA':
+                $SequenceTypeLetter = 'D';
+                break;
+            
+            case 'RNA':
+                $SequenceTypeLetter = 'R';
+                break;
+            
+            case 'PROTEIN':
+                $SequenceTypeLetter = 'P';
+                break;
+                
+            default:
+                break;
+            }
+
+        # Get 2nd letter: C for circular, L for Linear
+        if ($Circular) {
+            $CircularLetter = 'C';
+        } else {
+            $CircularLetter = 'L';
+        }
+
+        # Get 3rd letter: D for Double stranded, S for Single stranded
+        if ($DoubleStranded) {
+            $DoubleStrandedLetter = 'D';
+        } else {
+            $DoubleStrandedLetter = 'S';
+        }
+
+        # php-blake3 returns hex by default,
+        # binary if $rawOutput = true
+        return
+            'v1'
+          . '_'
+          . $SequenceTypeLetter
+          . $CircularLetter
+          . $DoubleStrandedLetter
+          . '_'
+          . blake3($DeterministicSequence);
+    }
+
+
+    /**
+     * validate
+     *
+     * Validates a Seqhash's metadata.
+     * Doesn't check the Blake3 hash itself,
+     * because php-blake3 has no such feature.
+     */
+    public function validate(string $Seqhash)
+    {
+        $Parts = explode('_', $Seqhash);
+
+        # Check version info
+        if ($Parts[0] !== 'v1') {
+            throw new Exception("Invalid version info. Got $Parts[0].");
+        }
+
+        # Check 3 letter metadata
+        $Meta = str_split($Parts[1]);
+        if (!in_array($Meta[0], ['D', 'R', 'P'])
+         || !in_array($Meta[1], ['C', 'L'])
+         || !in_array($Meta[2], ['D', 'S'])) {
+            throw new Exception("Invalid metadata. Got $Parts[1].");
+        }
+
+        # Check Blake3 hex and hash length
+        if (!ctype_xdigit($Parts[2]) || strlen($Parts[2] !== 64)) {
+            throw new Exception("Invalid Blake3 hash. Expected a 64-character hex string.");
+        }
+
+        return true;
+    }
+
+
+    /**
+     * gcContent
+     *
+     * Bonus feature!
+     * Calculate GC content of a DNA sequence.
+     * Shamelessly ripped from kennypavan/BioPHP.
+     *
+     * @see https://github.com/kennypavan/BioPHP/blob/master/BioPHP.php
+     */
+    public function gcContent(string $Sequence, int $Precision = 2)
+    {
+        $Sequence = strtoupper($Sequence);
+        
+        $G = substr_count($Sequence, 'G');
+        $C = substr_count($Sequence, 'C');
+
+        return number_format((($G + $C) / strlen($Sequence)) * 100, $Precision);
+    }
+}

gazelle.sql

@@ -1597,7 +1597,6 @@ CREATE TABLE `users_notify_filters` (
   `Media` varchar(500) NOT NULL DEFAULT '',
   `FromYear` int NOT NULL DEFAULT '0',
   `ToYear` int NOT NULL DEFAULT '0',
-  `ExcludeVA` enum('1','0') NOT NULL DEFAULT '0',
   `NewGroupsOnly` enum('1','0') NOT NULL DEFAULT '0',
   `ReleaseTypes` varchar(500) NOT NULL DEFAULT '',
   PRIMARY KEY (`ID`),

image.php

@@ -112,5 +112,4 @@ function image_height($Type, $Data)
   }
 }
 
-define('SKIP_NO_CACHE_HEADERS', 1);
 require_once 'classes/script_start.php'; // script_start.php contains all we need and includes sections/image/index.php

rules.php

@@ -1,4 +1,4 @@
 <?php
 declare(strict_types=1);
 
-require 'classes/script_start.php';
+require_once 'classes/script_start.php';

sections/ajax/torrent.php

@@ -1,7 +1,7 @@
 <?php
 #declare(strict_types=1);
 
-require SERVER_ROOT.'/sections/torrents/functions.php';
+require_once SERVER_ROOT.'/sections/torrents/functions.php';
 
 $TorrentID = (int) $_GET['id'];
 $TorrentHash = (string) $_GET['hash'];

sections/ajax/torrentgroup.php

@@ -1,7 +1,7 @@
 <?php
 #declare(strict_types=1);
 
-require SERVER_ROOT.'/sections/torrents/functions.php';
+require_once SERVER_ROOT.'/sections/torrents/functions.php';
 
 $GroupID = (int) $_GET['id'];
 $TorrentHash = (string) $_GET['hash'];

sections/ajax/torrentgroupalbumart.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-require SERVER_ROOT.'/sections/torrents/functions.php';
+require_once SERVER_ROOT.'/sections/torrents/functions.php';
 
 $GroupID = (int) $_GET['id'];
 if ($GroupID === 0) {

sections/api/torrents/torrentgroupalbumart.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-require SERVER_ROOT.'/sections/torrents/functions.php';
+require_once SERVER_ROOT.'/sections/torrents/functions.php';
 
 $GroupID = (int) $_GET['id'];
 if ($GroupID === 0) {

sections/artist/download.php

@@ -1,4 +1,6 @@
-<?
+<?php
+#declare(strict_types = 1);
+
 // todo: Freeleech in ratio hit calculations, in addition to a warning of whats freeleech in the Summary.txt
 /*
 This page is something of a hack so those
@@ -23,28 +25,6 @@ fashion.
 Thats all you get for a disclaimer, just
 remember, this page isn't for the faint of
 heart. -A9
-
-SQL template:
-SELECT
-  CASE
-    WHEN t.Format = 'MP3' AND t.Encoding = 'V0 (VBR)'
-      THEN 1
-    WHEN t.Format = 'MP3' AND t.Encoding = 'V2 (VBR)'
-      THEN 2
-    ELSE 100
-  END AS Rank,
-  t.GroupID,
-  t.Media,
-  t.Format,
-  t.Encoding,
-  IF(t.Year = 0, tg.Year, t.Year),
-  tg.Name,
-  a.Name,
-  t.Size
-FROM torrents AS t
-  INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1'
-  INNER JOIN artists_group AS a ON a.ArtistID = tg.ArtistID AND a.ArtistID = '59721'
-ORDER BY t.GroupID ASC, Rank DESC, t.Seeders ASC
 */
 
 if (
@@ -55,11 +35,11 @@ if (
   || $_REQUEST['preference'] > 2
   || count($_REQUEST['list']) === 0
 ) {
-  error(0);
+    error(0);
 }
 
 if (!check_perms('zip_downloader')) {
-  error(403);
+    error(403);
 }
 
 $Preferences = array('RemasterTitle DESC', 'Seeders ASC', 'Size ASC');
@@ -78,52 +58,13 @@ $DB->query("
   FROM torrents_artists
   WHERE ArtistID = '$ArtistID'");
 if (!$DB->has_results()) {
-  error(404);
+    error(404);
 }
 $Releases = $DB->to_array('GroupID', MYSQLI_ASSOC, false);
 $GroupIDs = array_keys($Releases);
 
-$SQL = 'SELECT CASE ';
-
-foreach ($_REQUEST['list'] as $Priority => $Selection) {
-  if (!is_number($Priority)) {
-    continue;
-  }
-  $SQL .= 'WHEN ';
-  switch ($Selection) {
-    case '00': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'V0 (VBR)'"; break;
-    case '01': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'APX (VBR)'"; break;
-    case '02': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '256 (VBR)'"; break;
-    case '03': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'V1 (VBR)'"; break;
-    case '10': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '224 (VBR)'"; break;
-    case '11': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'V2 (VBR)'"; break;
-    case '12': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'APS (VBR)'"; break;
-    case '13': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '192 (VBR)'"; break;
-    case '20': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '320'"; break;
-    case '21': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '256'"; break;
-    case '22': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '224'"; break;
-    case '23': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '192'"; break;
-    case '30': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'Vinyl'"; break;
-    case '31': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'DVD'"; break;
-    case '32': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'SACD'"; break;
-    case '33': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'WEB'"; break;
-    case '34': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100' AND HasCue = '1'"; break;
-    case '35': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100'"; break;
-    case '36': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1'"; break;
-    case '37': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless'"; break;
-    case '40': $SQL .= "t.Format = 'DTS'"; break;
-    case '42': $SQL .= "t.Format = 'AAC'  AND t.Encoding = '320'"; break;
-    case '43': $SQL .= "t.Format = 'AAC'  AND t.Encoding = '256'"; break;
-    case '44': $SQL .= "t.Format = 'AAC'  AND t.Encoding = 'q5.5'"; break;
-    case '45': $SQL .= "t.Format = 'AAC'  AND t.Encoding = 'q5'"; break;
-    case '46': $SQL .= "t.Format = 'AAC'  AND t.Encoding = '192'"; break;
-    default: error(0);
-  }
-  $SQL .= " THEN $Priority ";
-}
-$SQL .= "
-    ELSE 100
-  END AS Rank,
+$SQL = "
+SELECT
   t.GroupID,
   t.ID AS TorrentID,
   t.Media,
@@ -135,38 +76,36 @@ $SQL .= "
   t.Size
 FROM torrents AS t
   JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1' AND tg.ID IN (".implode(',', $GroupIDs).")
-ORDER BY t.GroupID ASC, Rank DESC, t.$Preference";
+ORDER BY t.GroupID ASC, Rank DESC, t.$Preference
+";
 
 $DownloadsQ = $DB->query($SQL);
 $Collector = new TorrentsDL($DownloadsQ, $ArtistName);
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
-  $Artists = Artists::get_artists($GroupIDs);
-  $TorrentIDs = array_keys($GroupIDs);
-  foreach ($TorrentIDs as $TorrentID) {
-    $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
-    $GroupID = $GroupIDs[$TorrentID];
-    $Download =& $Downloads[$GroupID];
-    $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
-    if ($Download['Rank'] == 100) {
-      $Collector->skip_file($Download);
-      continue;
-    }
-    if ($Releases[$GroupID]['Importance'] == 1) {
-      $ReleaseTypeName = $ReleaseTypes[$Download['ReleaseType']];
-    } elseif ($Releases[$GroupID]['Importance'] == 2) {
-      $ReleaseTypeName = 'Guest Appearance';
-    } elseif ($Releases[$GroupID]['Importance'] == 3) {
-      $ReleaseTypeName = 'Remixed By';
+    $Artists = Artists::get_artists($GroupIDs);
+    $TorrentIDs = array_keys($GroupIDs);
+    foreach ($TorrentIDs as $TorrentID) {
+        $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
+        $GroupID = $GroupIDs[$TorrentID];
+        $Download =& $Downloads[$GroupID];
+        $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
+        if ($Download['Rank'] == 100) {
+            $Collector->skip_file($Download);
+            continue;
+        }
+        if ($Releases[$GroupID]['Importance'] == 1) {
+            $ReleaseTypeName = $ReleaseTypes[$Download['ReleaseType']];
+        } elseif ($Releases[$GroupID]['Importance'] == 2) {
+            $ReleaseTypeName = 'Guest Appearance';
+        } elseif ($Releases[$GroupID]['Importance'] == 3) {
+            $ReleaseTypeName = 'Remixed By';
+        }
+        $Collector->add_file($TorrentFile, $Download, $ReleaseTypeName);
+        unset($Download);
     }
-    $Collector->add_file($TorrentFile, $Download, $ReleaseTypeName);
-    unset($Download);
-  }
 }
 $Collector->finalize();
 $Settings = array(implode(':', $_REQUEST['list']), $_REQUEST['preference']);
 if (!isset($LoggedUser['Collector']) || $LoggedUser['Collector'] != $Settings) {
-  Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
+    Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
 }
-
-define('SKIP_NO_CACHE_HEADERS', 1);
-?>

sections/better/covers.php

@@ -5,36 +5,46 @@ if (!empty($_GET['filter']) && $_GET['filter'] === 'all') {
     $Join = '';
     $All = true;
 } else {
-    $Join = 'JOIN torrents AS t ON t.GroupID=tg.ID
-           JOIN xbt_snatched AS x ON x.fid = t.ID AND x.uid = '.$LoggedUser['ID'];
+    $Join = "
+    JOIN `torrents` AS t
+    ON
+      t.`GroupID` = tg.`id`
+    JOIN `xbt_snatched` AS x
+    ON
+      x.`fid` = t.`ID` AND x.`uid` = $LoggedUser[ID]
+    ";
     $All = false;
 }
 
-View::show_header('Torrent groups with no covers');
 $DB->query("
-  SELECT
-    SQL_CALC_FOUND_ROWS
-    tg.ID
-  FROM torrents_group AS tg
-    $Join
-  WHERE tg.WikiImage=''
-  ORDER BY RAND()
-  LIMIT 20");
+SELECT SQL_CALC_FOUND_ROWS
+  tg.`id`
+FROM
+  `torrents_group` AS tg
+$Join
+WHERE
+  tg.`picture` = ''
+ORDER BY
+  RAND()
+LIMIT 20
+");
 
-$Groups = $DB->to_array('ID', MYSQLI_ASSOC);
+$Groups = $DB->to_array('id', MYSQLI_ASSOC);
 $DB->query('SELECT FOUND_ROWS()');
 list($NumResults) = $DB->next_record();
 $Results = Torrents::get_groups(array_keys($Groups));
+
+View::show_header('Torrent groups with no picture');
 ?>
 
 <div class="header">
   <?php if ($All) { ?>
   <h2>
-    All torrent groups with no cover
+    All torrent groups with no picture
   </h2>
   <?php } else { ?>
   <h2>
-    Torrent groups with no cover that you have snatched
+    Torrent groups with no picture that you have snatched
   </h2>
   <?php } ?>
 
@@ -57,21 +67,21 @@ $Results = Torrents::get_groups(array_keys($Groups));
     <?php
 foreach ($Results as $Result) {
     extract($Result);
-    $TorrentTags = new Tags($TagList);
+    $TorrentTags = new Tags($tag_list);
 
-    $DisplayName = "<a href='torrents.php?id=$ID' ";
+    $DisplayName = "<a href='torrents.php?id=$id' ";
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-        $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+        $DisplayName .= 'data-cover="'.ImageTools::process($picture, 'thumb').'" ';
     }
 
-    $DisplayName .= ">$Name</a>";
-    if ($Year > 0) {
-        $DisplayName .= " [$Year]";
+    $DisplayName .= ">$title</a>";
+    if ($published) {
+        $DisplayName .= " [$published]";
     } ?>
 
     <tr class="torrent">
       <td>
-        <div class="<?=Format::css_category($CategoryID)?>"></div>
+        <div class="<?=Format::css_category($category_id)?>"></div>
       </td>
 
       <td>

sections/collages/download.php

@@ -1,4 +1,4 @@
-<?
+<?php
 /*
 This page is something of a hack so those
 easily scared off by funky solutions, don't
@@ -22,29 +22,6 @@ fashion.
 Thats all you get for a disclaimer, just
 remember, this page isn't for the faint of
 heart. -A9
-
-SQL template:
-SELECT
-  CASE
-    WHEN t.Format = 'MP3' AND t.Encoding = 'V0 (VBR)'
-      THEN 1
-    WHEN t.Format = 'MP3' AND t.Encoding = 'V2 (VBR)'
-      THEN 2
-    ELSE 100
-  END AS Rank,
-  t.GroupID,
-  t.Media,
-  t.Format,
-  t.Encoding,
-  IF(t.Year = 0, tg.Year, t.Year),
-  tg.Name,
-  a.Name,
-  t.Size
-FROM torrents AS t
-  INNER JOIN collages_torrents AS c ON t.GroupID = c.GroupID AND c.CollageID = '8'
-  INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1'
-  LEFT JOIN artists_group AS a ON a.ArtistID = tg.ArtistID
-ORDER BY t.GroupID ASC, Rank DESC, t.Seeders ASC
 */
 
 if (
@@ -55,11 +32,11 @@ if (
   || $_REQUEST['preference'] > 2
   || count($_REQUEST['list']) === 0
 ) {
-  error(0);
+    error(0);
 }
 
 if (!check_perms('zip_downloader')) {
-  error(403);
+    error(403);
 }
 
 $Preferences = array('RemasterTitle DESC', 'Seeders ASC', 'Size ASC');
@@ -73,84 +50,55 @@ $DB->query("
   WHERE ID = '$CollageID'");
 list($CollageName) = $DB->next_record(MYSQLI_NUM, false);
 
-$SQL = 'SELECT CASE ';
-
-foreach ($_REQUEST['list'] as $Priority => $Selection) {
-  if (!is_number($Priority)) {
-    continue;
-  }
-  $SQL .= 'WHEN ';
-  switch ($Selection) {
-    case '00': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'V0 (VBR)'"; break;
-    case '01': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'APX (VBR)'"; break;
-    case '02': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '256 (VBR)'"; break;
-    case '03': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'V1 (VBR)'"; break;
-    case '10': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '224 (VBR)'"; break;
-    case '11': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'V2 (VBR)'"; break;
-    case '12': $SQL .= "t.Format = 'MP3'  AND t.Encoding = 'APS (VBR)'"; break;
-    case '13': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '192 (VBR)'"; break;
-    case '20': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '320'"; break;
-    case '21': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '256'"; break;
-    case '22': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '224'"; break;
-    case '23': $SQL .= "t.Format = 'MP3'  AND t.Encoding = '192'"; break;
-    case '30': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'Vinyl'"; break;
-    case '31': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'DVD'"; break;
-    case '32': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'SACD'"; break;
-    case '33': $SQL .= "t.Format = 'FLAC' AND t.Encoding = '24bit Lossless' AND t.Media = 'WEB'"; break;
-    case '34': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100' AND HasCue = '1'"; break;
-    case '35': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1' AND LogScore = '100'"; break;
-    case '36': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless' AND HasLog = '1'"; break;
-    case '37': $SQL .= "t.Format = 'FLAC' AND t.Encoding = 'Lossless'"; break;
-    case '40': $SQL .= "t.Format = 'DTS'"; break;
-    case '42': $SQL .= "t.Format = 'AAC'  AND t.Encoding = '320'"; break;
-    case '43': $SQL .= "t.Format = 'AAC'  AND t.Encoding = '256'"; break;
-    case '44': $SQL .= "t.Format = 'AAC'  AND t.Encoding = 'q5.5'"; break;
-    case '45': $SQL .= "t.Format = 'AAC'  AND t.Encoding = 'q5'"; break;
-    case '46': $SQL .= "t.Format = 'AAC'  AND t.Encoding = '192'"; break;
-    default: error(0);
-  }
-  $SQL .= " THEN $Priority ";
-}
-$SQL .= "
-    ELSE 100
-  END AS Rank,
-  t.GroupID,
-  t.ID AS TorrentID,
-  t.Media,
-  t.Format,
-  t.Encoding,
-  IF(t.RemasterYear = 0, tg.Year, t.RemasterYear) AS Year,
-  tg.Name,
-  t.Size
-FROM torrents AS t
-  INNER JOIN collages_torrents AS c ON t.GroupID = c.GroupID AND c.CollageID = '$CollageID'
-  INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID AND tg.CategoryID = '1'
-ORDER BY t.GroupID ASC, Rank DESC, t.$Preference";
+$SQL = "
+SELECT
+  t.`GroupID`,
+  t.`ID` AS `TorrentID`,
+  t.`Media`,
+  t.`Format`,
+  t.`Encoding`,
+  IF(
+    t.`RemasterYear` = 0,
+    tg.`published`,
+    t.`RemasterYear`
+  ) AS `Year`,
+  tg.`title`,
+  t.`Size`
+FROM
+  `torrents` AS t
+INNER JOIN `collages_torrents` AS c
+ON
+  t.`GroupID` = c.`GroupID` AND c.`CollageID` = '$CollageID'
+INNER JOIN `torrents_group` AS tg
+ON
+  tg.`id` = t.`GroupID` AND tg.`category_id` = '1'
+ORDER BY
+  t.`GroupID` ASC,
+  `Rank` DESC,
+  t.$Preference
+";
 
 $DownloadsQ = $DB->query($SQL);
 $Collector = new TorrentsDL($DownloadsQ, $CollageName);
 
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
-  $Artists = Artists::get_artists($GroupIDs);
-  $TorrentIDs = array_keys($GroupIDs);
-  foreach ($TorrentIDs as $TorrentID) {
-    file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
-    $GroupID = $GroupIDs[$TorrentID];
-    $Download =& $Downloads[$GroupID];
-    $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
-    if ($Download['Rank'] == 100) {
-      $Collector->skip_file($Download);
-      continue;
+    $Artists = Artists::get_artists($GroupIDs);
+    $TorrentIDs = array_keys($GroupIDs);
+    foreach ($TorrentIDs as $TorrentID) {
+        file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
+        $GroupID = $GroupIDs[$TorrentID];
+        $Download =& $Downloads[$GroupID];
+        $Download['Artist'] = Artists::display_artists($Artists[$Download['GroupID']], false, true, false);
+        if ($Download['Rank'] == 100) {
+            $Collector->skip_file($Download);
+            continue;
+        }
+        $Collector->add_file($TorrentFile, $Download);
+        unset($Download);
     }
-    $Collector->add_file($TorrentFile, $Download);
-    unset($Download);
-  }
 }
 $Collector->finalize();
 $Settings = array(implode(':', $_REQUEST['list']), $_REQUEST['preference']);
 if (!isset($LoggedUser['Collector']) || $LoggedUser['Collector'] != $Settings) {
-  Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
+    Users::update_site_options($LoggedUser['ID'], array('Collector' => $Settings));
 }
-
-define('SKIP_NO_CACHE_HEADERS', 1);
-?>

sections/schedule/daily/delete_dead_torrents.php

@@ -5,19 +5,23 @@
 //   (t.last_action < (NOW() - INTERVAL 28 DAY) AND t.last_action IS NOT NULL)
 
 $DB->query("
-  SELECT
-    t.ID,
-    t.GroupID,
-    tg.Name,
-    t.UserID,
-    t.Media,
-    HEX(t.info_hash) AS InfoHash
-  FROM torrents AS t
-    JOIN torrents_group AS tg ON tg.ID = t.GroupID
-  WHERE
-    (t.last_action < (NOW() - INTERVAL 365 DAY) AND t.last_action IS NOT NULL)
-    OR
-    (t.Time < (NOW() - INTERVAL 2 DAY) AND t.last_action IS NULL)");
+SELECT
+  t.`ID`,
+  t.`GroupID`,
+  tg.`title`,
+  t.`UserID`,
+  t.`Media`,
+  HEX(t.`info_hash`) AS InfoHash
+FROM
+  `torrents` AS t
+JOIN `torrents_group` AS tg
+ON
+  tg.`id` = t.`GroupID`
+WHERE
+  (t.`last_action` <(NOW() - INTERVAL 365 DAY) AND t.`last_action` IS NOT NULL)
+OR
+  (t.`Time` <(NOW() - INTERVAL 3 DAY) AND t.`last_action` IS NULL)
+");
 
 $Torrents = $DB->to_array(false, MYSQLI_NUM, false);
 echo 'Found '.count($Torrents)." inactive torrents to be deleted.\n";

sections/tools/data/database_specifics.php

@@ -26,7 +26,7 @@ if (!$Tables = $Cache->get_value('database_table_stats')) {
 }
 
 # todo: Remove Google Charts dependency
-require SERVER_ROOT.'/classes/charts.class.php';
+require_once SERVER_ROOT.'/classes/charts.class.php';
 $Pie = new PIE_CHART(750, 400, array('Other'=>1,'Percentage'=>1,'Sort'=>1));
 
 // Begin sorting

sections/torrents/download.php

@@ -211,4 +211,3 @@ $UserAnnounceList = (sizeof(ANNOUNCE_URLS[0]) === 1 && sizeof(ANNOUNCE_URLS[0][0
 #$UserAnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map("add_passkey", ANNOUNCE_URLS);
 
 echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);
-define('SKIP_NO_CACHE_HEADERS', 1);

sections/torrents/editgroup.php

@@ -8,7 +8,7 @@ declare(strict_types = 1);
  * and clears the cache for the torrent group page.
  */
 
-$GroupID = $_GET['groupid'];
+$GroupID = (int) $_GET['groupid'];
 Security::checkInt($GroupID);
 
 // Get the torrent group name and the body of the last revision
@@ -21,8 +21,8 @@ SELECT
   wt.`Body`,
   tg.`picture`,
   tg.`description`,
-  tg.`year`,
-  tg.`labratory`,
+  tg.`published`,
+  tg.`workgroup`,
   tg.`location`,
   tg.`identifier`,
   tg.`category_id`
@@ -39,7 +39,7 @@ $DB->exec_prepared_query();
 if (!$DB->has_results()) {
     error(404);
 }
-list($Name, $Title2, $NameJP, $Image, $Body, $WikiImage, $WikiBody, $Year, $Studio, $Series, $CatalogueNumber, $CategoryID) = $DB->next_record();
+list($title, $subject, $object, $Image, $Body, $picture, $description, $published, $workgroup, $location, $identifier, $category_id) = $DB->next_record();
 
 $DB->prepare_query("
 SELECT

sections/torrents/redownload.php

@@ -84,5 +84,3 @@ while (list($Downloads, $GroupIDs) = $Collector->get_downloads('TorrentID')) {
     }
 }
 $Collector->finalize(false);
-
-define('SKIP_NO_CACHE_HEADERS', 1);

sections/torrents/takedelete.php

@@ -1,15 +1,15 @@
-<?
+<?php
 #declare(strict_types = 1);
 
 authorize();
 
 $TorrentID = $_POST['torrentid'];
 if (!$TorrentID || !is_number($TorrentID)) {
-  error(404);
+    error(404);
 }
 
 if ($Cache->get_value("torrent_{$TorrentID}_lock")) {
-  error('Torrent cannot be deleted because the upload process is not completed yet. Please try again later.');
+    error('Torrent cannot be deleted because the upload process is not completed yet. Please try again later.');
 }
 
 $DB->query("
@@ -31,28 +31,28 @@ $DB->query("
 list($UploaderID, $GroupID, $Size, $InfoHash, $Name, $ArtistName, $Time, $Snatches) = $DB->next_record(MYSQLI_NUM, false);
 
 if ($LoggedUser['ID'] != $UploaderID && !check_perms('torrents_delete')) {
-  error(403);
+    error(403);
 }
 
 if (time_ago($Time) > 3600 * 24 * 7 && !check_perms('torrents_delete')) {
-  error('Torrent cannot be deleted because it is over one week old. If you think there is a problem, contact staff.');
+    error('Torrent cannot be deleted because it is over one week old. If you think there is a problem, contact staff.');
 }
 
 if ($Snatches > 4 && !check_perms('torrents_delete')) {
-  error('Torrent cannot be deleted because it has been snatched by more than 4 people. If you think there is a problem, contact staff.');
+    error('Torrent cannot be deleted because it has been snatched by more than 4 people. If you think there is a problem, contact staff.');
 }
 
 if ($ArtistName) {
-  $Name = "$ArtistName - $Name";
+    $Name = "$ArtistName - $Name";
 }
 
 if (isset($_SESSION['logged_user']['multi_delete'])) {
-  if ($_SESSION['logged_user']['multi_delete'] >= 3 && !check_perms('torrents_delete_fast')) {
-    error('You have recently deleted 3 torrents. Please contact a staff member if you need to delete more.');
-  }
-  $_SESSION['logged_user']['multi_delete']++;
+    if ($_SESSION['logged_user']['multi_delete'] >= 3 && !check_perms('torrents_delete_fast')) {
+        error('You have recently deleted 3 torrents. Please contact a staff member if you need to delete more.');
+    }
+    $_SESSION['logged_user']['multi_delete']++;
 } else {
-  $_SESSION['logged_user']['multi_delete'] = 1;
+    $_SESSION['logged_user']['multi_delete'] = 1;
 }
 
 $InfoHash = unpack('H*', $InfoHash);
@@ -65,5 +65,5 @@ View::show_header('Torrent deleted');
 <div>
   <h3>Torrent was successfully deleted.</h3>
 </div>
-<?
-View::show_footer();
+
+<?php View::show_footer();

sections/torrents/takegroupedit.php

@@ -1,30 +1,32 @@
 <?php
 #declare(strict_types = 1);
 
-authorize();
+/**
+ * Input validation
+ */
 
-// Quick SQL injection check
-if (!$_REQUEST['groupid'] || !is_number($_REQUEST['groupid'])) {
-    error(404);
-}
+# User permissions
+authorize();
 
 if (!check_perms('site_edit_wiki')) {
     error(403);
 }
 
-// Variables for database input
-$UserID = $LoggedUser['ID'];
-$GroupID = $_REQUEST['groupid'];
+# Variables for database input
+$UserID = (int) $LoggedUser['ID'];
+$GroupID = (int) $_REQUEST['groupid'];
 
-if (!empty($_GET['action']) && $_GET['action'] === 'revert') { // if we're reverting to a previous revision
-    $RevisionID = $_GET['revisionid'];
-    if (!is_number($RevisionID)) {
-        error(400);
-    }
+Security::checkInt([$UserID, $GroupID]);
+
+# If we're reverting to a previous revision
+if (!empty($_GET['action']) && $_GET['action'] === 'revert') {
+    $RevisionID = (int) $_GET['revisionid'];
+    Security::checkInt($RevisionID);
 
-    // To cite from merge: "Everything is legit, let's just confim they're not retarded"
+    # To cite from merge: "Everything is legit, let's just confim they're not retarded"
     if (empty($_GET['confirm'])) {
-        View::show_header(); ?>
+        View::show_header();
+    } ?>
 
 <!-- Start HTML -->
 <div class="center">
@@ -104,12 +106,15 @@ $Image = db_string($Image);
 
 // Update torrents table (technically, we don't need the RevisionID column, but we can use it for a join which is nice and fast)
 $DB->query("
-  UPDATE torrents_group
-  SET
-    RevisionID = '$RevisionID',
-    WikiBody = '$Body',
-    WikiImage = '$Image'
-  WHERE ID='$GroupID'");
+UPDATE
+  `torrents_group`
+SET
+  `revision_id` = '$RevisionID',
+  `description` = '$Body',
+  `picture` = '$Image'
+WHERE
+  `id` = '$GroupID'
+");
 
 // There we go, all done!
 

sections/torrents/user.php

@@ -49,10 +49,6 @@ $SearchWhere = [];
 if (!empty($_GET['format'])) {
     if (in_array($_GET['format'], $Formats)) {
         $SearchWhere[] = "t.Format = '".db_string($_GET['format'])."'";
-        /*
-        } elseif ($_GET['format'] === 'perfectflac') {
-            $_GET['filter'] = 'perfectflac';
-        */
     }
 }
 
@@ -227,32 +223,6 @@ switch ($_GET['type']) {
     error(404);
 }
 
-/*
-if (!empty($_GET['filter'])) {
-    if ($_GET['filter'] === 'perfectflac') {
-        if (!check_paranoia('perfectflacs', $User['Paranoia'], $UserClass, $UserID)) {
-            error(403);
-        }
-        $ExtraWhere .= " AND t.Format = 'FLAC'";
-        if (empty($_GET['media'])) {
-            $ExtraWhere .= "
-        AND (
-          t.LogScore = 100 OR
-          t.Media IN ('Vinyl', 'WEB', 'DVD', 'Soundboard', 'Cassette', 'SACD', 'Blu-ray', 'DAT')
-          )";
-        } elseif (strtoupper($_GET['media']) === 'CD' && empty($_GET['log'])) {
-            $ExtraWhere .= "
-        AND t.LogScore = 100";
-        }
-    } elseif ($_GET['filter'] === 'uniquegroup') {
-        if (!check_paranoia('uniquegroups', $User['Paranoia'], $UserClass, $UserID)) {
-            error(403);
-        }
-        $GroupBy = 'tg.ID';
-    }
-}
-*/
-
 if (empty($GroupBy)) {
     $GroupBy = 't.ID';
 }
@@ -534,15 +504,18 @@ foreach ($Categories as $CatKey => $CatName) {
         </td>
 
         <td class="sign snatches">
-          <a href="<?= header_link('Snatched') ?>">↻</a>
+          <a
+            href="<?= header_link('Snatched') ?>">↻</a>
         </td>
 
         <td class="sign seeders">
-          <a href="<?= header_link('Seeders') ?>">&uarr;</a>
+          <a
+            href="<?= header_link('Seeders') ?>">&uarr;</a>
         </td>
 
         <td class="sign leechers">
-          <a href="<?= header_link('Leechers') ?>">&darr;</a>
+          <a
+            href="<?= header_link('Leechers') ?>">&darr;</a>
         </td>
       </tr>
 

sections/upload/upload_handle.php

@@ -1,31 +1,34 @@
 <?php
 #declare(strict_types=1);
 
-//****************************************************************************//
-//--------------- Take upload ------------------------------------------------//
-// This pages handles the backend of the torrent upload function. It checks   //
-// the data, and if it all validates, it builds the torrent file, then writes //
-// the data to the database and the torrent to the disk.                      //
-//****************************************************************************//
+/**
+ * Take upload
+ *
+ * This pages handles the backend of the torrent upload function.
+ * It checks the data, and if it all validates, it builds the torrent file,
+ * then writes the data to the database and the torrent to the disk.
+ */
+
+$ENV = ENV::go();
+$Feed = new Feed;
+$Validate = new Validate;
 
-include SERVER_ROOT.'/classes/validate.class.php';
-include SERVER_ROOT.'/classes/feed.class.php';
-include SERVER_ROOT.'/sections/torrents/functions.php';
+require_once "$ENV->SERVER_ROOT/classes/feed.class.php";
+require_once "$ENV->SERVER_ROOT/classes/validate.class.php";
+require_once "$ENV->SERVER_ROOT/sections/torrents/functions.php";
 
 enforce_login();
 authorize();
 
-$ENV = ENV::go();
-$Validate = new Validate;
-$Feed = new Feed;
-
 
-//*****************************************************************************//
-//--------------- Set $Properties array ---------------------------------------//
-// This is used if the form doesn't validate, and when the time comes to enter //
-// it into the database.
-// todo: Do something about this mess
-//****************************************************************************//
+/**
+ * Set $Properties array
+ *
+ * This is used if the form doesn't validate,
+ * and when the time comes to enter it into the database.
+ *
+ * todo: Do something about this mess
+ */
 
 $Properties = [];
 $Type = $Categories[(int) $_POST['type']];
@@ -102,8 +105,10 @@ if (!empty($_POST['requestid'])) {
     $Properties['RequestID'] = $RequestID;
 }
 
-//******************************************************************************//
-//--------------- Validate data in upload form ---------------------------------//
+
+/**
+ * Validate data in upload form
+ */
 
 # Submit button
 $Validate->SetFields(
@@ -114,7 +119,7 @@ $Validate->SetFields(
     array('inarray' => array_keys($Categories))
 );
 
-# torrents_group.CategoryID
+# torrents_group.category_id
 $Validate->SetFields(
     'type',
     '1',
@@ -123,182 +128,154 @@ $Validate->SetFields(
     array('inarray' => array_keys($Categories))
 );
 
-# todo: Remove the switch statement
-switch ($Type) {
-    /*
-  case 'Imaging':
-    if (!isset($_POST['groupid']) || !$_POST['groupid']) {
-        # torrents.Media
-        $Validate->SetFields(
-            'media',
-            '1',
-            'inarray',
-            'Please select a valid platform.',
-            array('inarray' => array_merge($Media, $MediaManga, $Platform))
-        );
-
-        # torrents.Container
-        $Validate->SetFields(
-            'container',
-            '1',
-            'inarray',
-            'Please select a valid format.',
-            array('inarray' => array_merge($Containers, $ContainersGames))
-        );
-    }
-break;
-*/
+if (!$_POST['groupid']) {
+    # torrents_group.CatalogueNumber
+    $Validate->SetFields(
+        'catalogue',
+        '0',
+        'string',
+        'Accession Number must be between 0 and 50 characters.',
+        array('maxlength' => 50, 'minlength' => 0)
+    );
 
-default:
-    if (!isset($_POST['groupid']) || !$_POST['groupid']) {
-        # torrents_group.CatalogueNumber
-        $Validate->SetFields(
-            'catalogue',
-            '0',
-            'string',
-            'Accession Number must be between 0 and 50 characters.',
-            array('maxlength' => 50, 'minlength' => 0)
-        );
-
-        # torrents.Version
-        $Validate->SetFields(
-            'version',
-            '0',
-            'string',
-            'Version must be between 0 and 10 characters.',
-            array('maxlength' => 10, 'minlength' => 0)
-        );
-        
-        # torrents_group.Name
-        $Validate->SetFields(
-            'title',
-            '1',
-            'string',
-            'Torrent Title must be between 10 and 255 characters.',
-            array('maxlength' => 255, 'minlength' => 10)
-        );
-
-        # torrents_group.Title2
-        $Validate->SetFields(
-            'title_rj',
-            '0',
-            'string',
-            'Organism must be between 0 and 255 characters.',
-            array('maxlength' => 255, 'minlength' => 0)
-        );
-
-        # torrents_group.NameJP
-        $Validate->SetFields(
-            'title_jp',
-            '0',
-            'string',
-            'Strain/Variety must be between 0 and 255 characters.',
-            array('maxlength' => 255, 'minlength' => 0)
-        );
-
-        # torrents_group.Studio
-        $Validate->SetFields(
-            'studio',
-            '1',
-            'string',
-            'Department/Lab must be between 0 and 100 characters.',
-            array('maxlength' => 100, 'minlength' => 0)
-        );
-
-        # torrents_group.Series
-        $Validate->SetFields(
-            'series',
-            '0',
-            'string',
-            'Location must be between 0 and 100 characters.',
-            array('maxlength' => 100, 'minlength' => 0)
-        );
-
-        /* todo: Fix the year validation
-        # torrents_group.Year
-        $Validate->SetFields(
-            'year',
-            '1',
-            'number',
-            'The year of the original release must be entered.',
-            array('maxlength' => 4, 'minlength' => 4)
-        );
-        */
-
-        # torrents.Media
-        $Validate->SetFields(
-            'media',
-            '1',
-            'inarray',
-            'Please select a valid platform.',
-            array('inarray' => array_merge(
-                $SeqPlatforms,
-                $GraphPlatforms,
-                $ImgPlatforms,
-                $DocPlatforms,
-                $RawPlatforms
-            ))
-        );
-
-        /*
-        # torrents.Container
-        $Validate->SetFields(
-            'container',
-            '1',
-            'inarray',
-            'Please select a valid format.',
-            array('inarray' => array_merge($Containers, $ContainersGames))
-        );
-        */
-
-        # torrents.Resolution
-        $Validate->SetFields(
-            'resolution',
-            '1',
-            'string',
-            'Scope must be between 4 and 20 characters.',
-            array('maxlength' => 20, 'minlength' => 4)
-        );
+    # torrents.Version
+    $Validate->SetFields(
+        'version',
+        '0',
+        'string',
+        'Version must be between 0 and 10 characters.',
+        array('maxlength' => 10, 'minlength' => 0)
+    );
         
-        # torrents_group.TagList
-        $Validate->SetFields(
-            'tags',
-            '1',
-            'string',
-            'You must enter at least five tags. Maximum length is 500 characters.',
-            array('maxlength' => 500, 'minlength' => 10)
-        );
-
-        # torrents_group.WikiImage
-        $Validate->SetFields(
-            'image',
-            '0',
-            'link',
-            'The image URL you entered was invalid.',
-            array('maxlength' => 255, 'minlength' => 10) # x.yz/a.bc
-        );
-    }
+    # torrents_group.title
+    $Validate->SetFields(
+        'title',
+        '1',
+        'string',
+        'Torrent Title must be between 10 and 255 characters.',
+        array('maxlength' => 255, 'minlength' => 10)
+    );
+
+    # torrents_group.subject
+    $Validate->SetFields(
+        'title_rj',
+        '0',
+        'string',
+        'Organism must be between 0 and 255 characters.',
+        array('maxlength' => 255, 'minlength' => 0)
+    );
+
+    # torrents_group.object
+    $Validate->SetFields(
+        'title_jp',
+        '0',
+        'string',
+        'Strain/Variety must be between 0 and 255 characters.',
+        array('maxlength' => 255, 'minlength' => 0)
+    );
 
-    # torrents_group.WikiBody
+    # torrents_group.workgroup
     $Validate->SetFields(
-        'album_desc',
+        'studio',
         '1',
         'string',
-        'The description must be between 100 and 65535 characters.',
-        array('maxlength' => 65535, 'minlength' => 100)
+        'Department/Lab must be between 0 and 100 characters.',
+        array('maxlength' => 100, 'minlength' => 0)
     );
 
-    /* todo: Fix the Group ID validation
-    # torrents_group.ID
+    # torrents_group.location
     $Validate->SetFields(
-        'groupid',
+        'series',
         '0',
+        'string',
+        'Location must be between 0 and 100 characters.',
+        array('maxlength' => 100, 'minlength' => 0)
+    );
+
+    /* todo: Fix the year validation
+    # torrents_group.published
+    $Validate->SetFields(
+        'year',
+        '1',
         'number',
-        'Group ID was not numeric.'
+        'The year of the original release must be entered.',
+        array('maxlength' => 4, 'minlength' => 4)
+    );
+    */
+
+    # torrents.Media
+    $Validate->SetFields(
+        'media',
+        '1',
+        'inarray',
+        'Please select a valid platform.',
+        array('inarray' => array_merge(
+            $SeqPlatforms,
+            $GraphPlatforms,
+            $ImgPlatforms,
+            $DocPlatforms,
+            $RawPlatforms
+        ))
+    );
+
+    /*
+    # torrents.Container
+    $Validate->SetFields(
+        'container',
+        '1',
+        'inarray',
+        'Please select a valid format.',
+        array('inarray' => array_merge($Containers, $ContainersGames))
     );
     */
+
+    # torrents.Resolution
+    $Validate->SetFields(
+        'resolution',
+        '1',
+        'string',
+        'Scope must be between 4 and 20 characters.',
+        array('maxlength' => 20, 'minlength' => 4)
+    );
+        
+    # torrents_group.tag_list
+    $Validate->SetFields(
+        'tags',
+        '1',
+        'string',
+        'You must enter at least five tags. Maximum length is 500 characters.',
+        array('maxlength' => 500, 'minlength' => 10)
+    );
+
+    # torrents_group.picture
+    $Validate->SetFields(
+        'image',
+        '0',
+        'link',
+        'The image URL you entered was invalid.',
+        array('maxlength' => 255, 'minlength' => 10) # x.yz/a.bc
+    );
 }
 
+# torrents_group.description
+$Validate->SetFields(
+    'album_desc',
+    '1',
+    'string',
+    'The description must be between 100 and 65535 characters.',
+    array('maxlength' => 65535, 'minlength' => 100)
+);
+
+/* todo: Fix the Group ID validation
+# torrents_group.id
+$Validate->SetFields(
+    'groupid',
+    '0',
+    'number',
+    'Group ID was not numeric.'
+);
+*/
+
 $Err = $Validate->ValidateForm($_POST); // Validate the form
 
 # todo: Move all this validation code to the Validate class
@@ -351,20 +328,25 @@ if (empty($Properties['GroupID']) && empty($ArtistForm)) {
 
 if ($Err) { // Show the upload form, with the data the user entered
     $UploadForm = $Type;
-    include SERVER_ROOT.'/sections/upload/upload.php' ;
+    require_once SERVER_ROOT.'/sections/upload/upload.php' ;
     error(400, $NoHTML = true);
 }
 
 ImageTools::blacklisted($Properties['Image']);
 
-//******************************************************************************//
-//--------------- Make variables ready for database input ----------------------//
 
-// Prepared SQL statements do this for us, so there is nothing to do here anymore
+/**
+ * Make variables ready for database input
+ *
+ * Prepared SQL statements do this for us,
+ * so there is nothing to do here anymore.
+ */
 $T = $Properties;
 
-//******************************************************************************//
-//--------------- Generate torrent file ----------------------------------------//
+
+/**
+ * Generate torrent file
+ */
 
 $Tor = new BencodeTorrent($TorrentName, true);
 $PublicTorrent = $Tor->make_private(); // The torrent is now private
@@ -451,16 +433,19 @@ if (!preg_match('/^'.IMAGE_REGEX.'$/i', $T['Image'])) {
 // Does it belong in a group?
 if ($T['GroupID']) {
     $DB->query("
-      SELECT
-        ID,
-        WikiImage,
-        WikiBody,
-        RevisionID,
-        Name,
-        Year,
-        TagList
-      FROM torrents_group
-        WHERE id = ?", $T['GroupID']);
+    SELECT
+      `id`,
+      `picture`,
+      `description`,
+      `revision_id`,
+      `title`,
+      `published`,
+      `tag_list`
+    FROM
+      `torrents_group`
+    WHERE
+      `id` = $T[GroupID]
+    ");
 
     if ($DB->has_results()) {
         // Don't escape tg.Name. It's written directly to the log table
@@ -835,11 +820,12 @@ if (trim($T['Image']) !== '') {
     }
 }
 
-//******************************************************************************//
-//------------------------------- Post-processing ------------------------------//
-/* Because tracker updates and notifications can be slow, we're
- * redirecting the user to the destination page and flushing the buffers
- * to make it seem like the PHP process is working in the background.
+
+/**
+ * Post-processing
+ *
+ * Because tracker updates and notifications can be slow, we're redirecting the user to the destination page
+ * and flushing the buffers to make it seem like the PHP process is working in the background.
  */
 
 if ($PublicTorrent) {
@@ -879,8 +865,10 @@ if (function_exists('fastcgi_finish_request')) {
     ob_start(); // So we don't keep sending data to the client
 }
 
-//******************************************************************************//
-//--------------------------- IRC announce and feeds ---------------------------//
+
+/**
+ * IRC announce and feeds
+ */
 
 $Announce = '';
 
@@ -978,31 +966,13 @@ if (!empty($ArtistsUnescaped)) {
         $ArtistNameList[] = "Artists LIKE '%|".db_string(str_replace('\\', '\\\\', $Artist['name']), true)."|%'";
     }
 
-    // Don't add notification if >2 main artists or if tracked artist isn't a main artist
-    /*
-    if (count($ArtistNameList) > 2 || $Artist['name'] === 'Various Artists') {
-        $SQL .= " AND (ExcludeVA = '0' AND (";
-        $SQL .= implode(' OR ', array_merge($ArtistNameList, $GuestArtistNameList));
-        $SQL .= " OR Artists = '')) AND (";
-    } else {
-    */
-
     $SQL .= " AND (";
 
-    /*
-    if (!empty($GuestArtistNameList)) {
-        $SQL .= "(ExcludeVA = '0' AND (";
-        $SQL .= implode(' OR ', $GuestArtistNameList);
-        $SQL .= ')) OR ';
-    }
-    */
-
     if (count($ArtistNameList) > 0) {
         $SQL .= implode(' OR ', $ArtistNameList);
         $SQL .= " OR ";
     }
     $SQL .= "Artists = '') AND (";
-#}
 } else {
     $SQL .= "AND (Artists = '') AND (";
 }
@@ -1022,13 +992,6 @@ $SQL .= implode(' OR ', $TagSQL);
 $SQL .= ") AND !(".implode(' OR ', $NotTagSQL).')';
 $SQL .= " AND (Categories LIKE '%|".db_string(trim($Type))."|%' OR Categories = '') ";
 
-/*
-if ($T['ReleaseType']) {
-    $SQL .= " AND (ReleaseTypes LIKE '%|".db_string(trim($ReleaseTypes[$T['ReleaseType']]))."|%' OR ReleaseTypes = '') ";
-} else {
-    $SQL .= " AND (ReleaseTypes = '') ";
-}
-*/
 
 /*
   Notify based on the following:
@@ -1036,25 +999,17 @@ if ($T['ReleaseType']) {
     2. If they set NewGroupsOnly to 1, it must also be the first torrent in the group to match the formatbitrate filter on the notification
 */
 
-/*
 if ($T['Format']) {
     $SQL .= " AND (Formats LIKE '%|".db_string(trim($T['Format']))."|%' OR Formats = '') ";
 } else {
     $SQL .= " AND (Formats = '') ";
 }
 
-if ($_POST['bitrate']) {
-    $SQL .= " AND (Encodings LIKE '%|".db_string(trim($_POST['bitrate']))."|%' OR Encodings = '') ";
-} else {
-    $SQL .= " AND (Encodings = '') ";
-}
-
 if ($T['Media']) {
     $SQL .= " AND (Media LIKE '%|".db_string(trim($T['Media']))."|%' OR Media = '') ";
 } else {
     $SQL .= " AND (Media = '') ";
 }
-*/
 
 // Either they aren't using NewGroupsOnly
 $SQL .= "AND ((NewGroupsOnly = '0' ";
@@ -1062,14 +1017,12 @@ $SQL .= "AND ((NewGroupsOnly = '0' ";
 $SQL .= ") OR ( NewGroupsOnly = '1' ";
 $SQL .= '))';
 
-/*
 if ($T['Year']) {
     $SQL .= " AND (('".db_string(trim($T['Year']))."' BETWEEN FromYear AND ToYear)
       OR (FromYear = 0 AND ToYear = 0)) ";
 } else {
     $SQL .= " AND (FromYear = 0 AND ToYear = 0) ";
 }
-*/
 
 $SQL .= " AND UserID != '".$LoggedUser['ID']."' ";
 
@@ -1145,9 +1098,9 @@ $Feed->populate('torrents_all', $Item);
 $Feed->populate('torrents_'.strtolower($Type), $Item);
 $Debug->set_flag('upload: notifications handled');
 
-// Clear cache
+# Clear cache
 $Cache->delete_value("torrents_details_$GroupID");
 $Cache->delete_value("contest_scores");
 
-// Allow deletion of this torrent now
+# Allow deletion of this torrent now
 $Cache->delete_value("torrent_{$TorrentID}_lock");

sections/user/notify_edit.php

@@ -24,7 +24,6 @@ $DB->query("
     ID,
     Label,
     Artists,
-    ExcludeVA,
     NewGroupsOnly,
     Tags,
     NotTags,
@@ -46,7 +45,6 @@ $Notifications[] = array(
   'ID' => false,
   'Label' => '',
   'Artists' => '',
-  'ExcludeVA' => false,
   'NewGroupsOnly' => true,
   'Tags' => '',
   'NotTags' => '',
@@ -148,15 +146,6 @@ foreach ($Notifications as $N) { // $N stands for Notifications
           <textarea name="artists<?=$i?>" style="width: 100%;"
             rows="5"><?=display_str($N['Artists'])?></textarea>
           Comma-separated list, e.g., Yumeno Aika, Pink Pineapple
-          <!--
-          <input type="checkbox" name="excludeva<?=$i?>"
-          id="excludeva_<?=$N['ID']?>" <?php if ($N['ExcludeVA'] === '1') {
-        echo ' checked="checked"';
-    } ?>>
-          <label
-            for="excludeva_<?=$N['ID']?>">Exclude
-            Various Artists releases</label>
-          -->
         </td>
       </tr>
 

sections/user/notify_handle.php

@@ -33,13 +33,6 @@ if ($_POST['artists'.$FormID]) {
     }
 }
 
-if ($_POST['excludeva'.$FormID]) {
-    $ExcludeVA = '1';
-    $HasFilter = true;
-} else {
-    $ExcludeVA = '0';
-}
-
 if ($_POST['newgroupsonly'.$FormID]) {
     $NewGroupsOnly = '1';
     $HasFilter = true;
@@ -124,7 +117,6 @@ if ($_POST['id'.$FormID] && is_number($_POST['id'.$FormID])) {
     UPDATE users_notify_filters
     SET
       Artists='$ArtistList',
-      ExcludeVA='$ExcludeVA',
       NewGroupsOnly='$NewGroupsOnly',
       Tags='$TagList',
       NotTags='$NotTagList',
@@ -136,9 +128,9 @@ if ($_POST['id'.$FormID] && is_number($_POST['id'.$FormID])) {
 } else {
     $DB->query("
     INSERT INTO users_notify_filters
-      (UserID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, Categories, Media, Users)
+      (UserID, Label, Artists, NewGroupsOnly, Tags, NotTags, Categories, Media, Users)
     VALUES
-      ('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$ExcludeVA','$NewGroupsOnly','$TagList','$NotTagList','$CategoryList','$MediaList','$Users')");
+      ('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$NewGroupsOnly','$TagList','$NotTagList','$CategoryList','$MediaList','$Users')");
 }
 
 $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);

static/styles/beluga/beluga.scss

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

static/styles/bookish/bookish.scss

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

static/styles/bookish/scss/layout.scss

@@ -71,6 +71,7 @@ ol {
     /* border: 2px solid rgba(0, 0, 0, 0.01); */
     margin: auto;
     margin-bottom: 1rem;
+    width: 100%;
 }
 
 /* Main column and sidebar */

static/styles/development/development.scss

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

static/styles/genaviv/genaviv.scss

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

static/styles/matcha/matcha.scss

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

static/styles/oppai/oppai.scss

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

static/styles/postmod/postmod.scss

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

static/styles/public/public.scss

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