.gitignore

@@ -33,3 +33,4 @@ __MACOSX/
 /static/common/badges/**
 /static/styles/**/*.css
 /static/styles/assets/fonts/**
+fonts.tgz

classes/autoload.php

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

classes/charts.class.php

@@ -168,66 +168,3 @@ class PIE_CHART extends GOOGLE_CHARTS
         $this->URL .= "&chl=".implode('|', $Labels).'&chd=e:'.implode('', $Data);
     }
 }
-
-/*
-class LOG_BAR_GRAPH extends GOOGLE_CHARTS
-{
-    // todo: Finish
-    public function __construct($Base, $Width, $Height, $Options = [])
-    {
-        parent::__construct('lc', $Width, $Height, $Options);
-    }
-
-    public function color($Color)
-    {
-        $this->URL .= '&chco='.$Color.'&chm=B,'.$Color.'50,0,0,0';
-    }
-
-    public function generate()
-    {
-        $Max = max($this->Data);
-        $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-        $Data = [];
-
-        foreach ($this->Data as $Value) {
-            $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
-        }
-        $this->URL .= "&chxt=y,x&chxs=0,h&chxl=1:|".implode('|', $this->Labels).'&chxr=0,'.$Min.','.($Max-$Min).'&chd=e:'.implode('', $Data);
-    }
-}
-*/
-
-/*
-class POLL_GRAPH extends GOOGLE_CHARTS
-{
-    public function __construct()
-    {
-        $this->URL .= '?cht=bhg';
-    }
-
-    public function add($Label, $Data)
-    {
-        if ($Label !== false) {
-            $this->Labels[] = Format::cut_string($Label, 35);
-        }
-        $this->Data[] = $Data;
-    }
-
-    public function generate()
-    {
-        $Count = count($this->Data);
-        $Height = (30 * $Count) + 20;
-        $Max = max($this->Data);
-        $Sum = array_sum($this->Data);
-        $Increment = ($Max / $Sum) * 25; // * 100% / 4divisions
-        $Data = [];
-        $Labels = [];
-
-        foreach ($this->Data as $Key => $Value) {
-            $Data[] = $this->encode(($Value / $Max) * 4095);
-            $Labels[] = '@t'.str_replace(array(' ', ','), array('+', '\,'), $this->Labels[$Key]).',000000,1,'.round((($Key + 1) / $Count) - (12 / $Height), 2).':0,12';
-        }
-        $this->URL .= "&chbh=25,0,5&chs=214x$Height&chl=0%|".round($Increment, 1)."%|".round($Increment * 2, 1)."%|".round($Increment * 3, 1)."%|".round($Increment * 4, 1)."%&chm=".implode('|', $Labels).'&chd=e:'.implode('', $Data);
-    }
-}
-*/

classes/config.template.php

@@ -1,3 +1,4 @@
+
 <?php
 declare(strict_types=1);
 
@@ -19,7 +20,7 @@ declare(strict_types=1);
  *   $LongArray = [];
  *   ENV::setPub(
  *     'CONFIG',
- *     new RecursiveArrayObject($LongArray)
+ *     $ENV->convert($LongArray)
  *   );
  *
  *   $ENV = ENV::go();
@@ -32,9 +33,8 @@ declare(strict_types=1);
  *
  *   var_dump(
  *     $ENV->dedupe(
- *       $ENV->CATS->SEQ->Platforms,
- *       $ENV->CATS->IMG->Platforms->toArray(),
- *       [$MapVectorFormats, $MapRasterFormats, $PlainFormats]
+ *       $ENV->META->Formats->Sequences,
+ *       $ENV->META->Formats->Proteins->toArray()
  *     )
  *   );
  */
@@ -42,6 +42,8 @@ declare(strict_types=1);
 # Initialize
 require_once 'env.class.php';
 $ENV = ENV::go();
+
+# Basic info
 ENV::setPub('PHP_MIN', '7.4.0');
 ENV::setPub('DEV', true);
 
@@ -132,7 +134,7 @@ $TechSupport = [
 ];
 ENV::setPub(
     'HELP',
-    new RecursiveArrayObject($TechSupport)
+    $ENV->convert($TechSupport)
 );
 
 
@@ -180,9 +182,9 @@ ENV::setPriv('SQLPORT', 3306);
 #ENV::setPriv('SQLSOCK', '/var/run/mysqld/mysqld.sock');
 
 # TLS client certs
-ENV::setPriv('SQL_CERT', "/var/www/sql-keys/client-cert.pem");
-ENV::setPriv('SQL_KEY', "/var/www/sql-keys/client-key.pem");
-ENV::setPriv('SQL_CA', "/var/www/sql-keys/ca.pem");
+ENV::setPriv('SQL_CERT', "$ENV->WEB_ROOT/sql-keys/client-cert.pem");
+ENV::setPriv('SQL_KEY', "$ENV->WEB_ROOT/sql-keys/client-key.pem");
+ENV::setPriv('SQL_CA', "$ENV->WEB_ROOT/sql-keys/ca.pem");
 
  # Production
  if (!$ENV->DEV) {
@@ -251,7 +253,7 @@ if (!$ENV->DEV) {
     ];
     ENV::setPub(
         'ANNOUNCE_URLS',
-        new RecursiveArrayObject($AnnounceURLs)
+        $ENV->convert($AnnounceURLs)
     );
 }
 
@@ -270,7 +272,7 @@ else {
     ];
     ENV::setPub(
         'ANNOUNCE_URLS',
-        new RecursiveArrayObject($AnnounceURLs)
+        $ENV->convert($AnnounceURLs)
     );
 }
 
@@ -378,6 +380,10 @@ ENV::setPub('FEATURE_SEND_EMAIL', true);
 # (should only be used for initial setup)
 ENV::setPub('FEATURE_SET_ENC_KEY_PUBLIC', false);
 
+# Attempt to support the Seqhash algorithm
+# https://blog.libredna.org/post/seqhash/
+ENV::setPub('FEATURE_BIOPHP', true);
+
 
 /**
  * Settings
@@ -592,7 +598,7 @@ $AutomatedBadgeIDs = [
 ];
 ENV::setPub(
     'AUTOMATED_BADGE_IDS',
-    new RecursiveArrayObject($AutomatedBadgeIDs)
+    $ENV->convert($AutomatedBadgeIDs)
 );
 
 
@@ -822,11 +828,13 @@ $DB = [
     'picture' => ['name' => 'Picture', 'desc' => 'A meaningful picture, e.g., the specimen or a thumbnail'],
 
     # From the non-renamed `torrents` table
-    'version' => ['name' => 'Version', 'desc' => 'Start with 0.1.0', 'note' => 'Please see <a href="https://semver.org target=" _blank">Semantic Versioning</a>'],
+    'version' => ['name' => 'Version', 'desc' => 'Start with 0.1.0', 'note' => 'Please see <a href="https://semver.org" target="_blank">Semantic Versioning</a>'],
+    'license' => ['name' => 'License', 'desc' => '', 'note' => 'Please see <a href="http://www.dcc.ac.uk/resources/how-guides/license-research-data" target="_blank">How to License Research Data</a>'],
+    'mirrors' => ['name' => 'Mirrors', 'desc' => 'Up to two FTP/HTTP addresses that either point directly to a file, or for multi-file torrents, to the enclosing folder'],
 ];
 ENV::setPub(
     'DB',
-    new RecursiveArrayObject($DB)
+    $ENV->convert($DB)
 );
 
 
@@ -947,7 +955,7 @@ $META = [
             'Binary',
             'Text',
         ],
-    ], # End $this->META->Platforms
+    ], # End $ENV->META->Platforms
 
     /**
      * 1.
@@ -1172,7 +1180,7 @@ $META = [
             'Jupyter'      => ['ipynb'],
             'Ontology'     => ['cgif', 'cl', 'clif', 'csv', 'htm', 'html', 'kif', 'obo', 'owl', 'rdf', 'rdfa', 'rdfs', 'rif', 'tsv', 'xcl', 'xht', 'xhtml', 'xml'],
         ],
-    ], # End $this->META->Formats
+    ], # End $ENV->META->Formats
 
 
     /**
@@ -1268,7 +1276,7 @@ $META = [
             'Velocity',
             'Weight',
         ],
-    ], # End $this->META->Scopes
+    ], # End $ENV->META->Scopes
 
     /**
      * 1.
@@ -1294,11 +1302,11 @@ $META = [
         'OpenMTA',
         'Public Domain',
         'Unspecified',
-    ], # End $this->META->Licenses
+    ], # End $ENV->META->Licenses
 ];
 ENV::setPub(
     'META',
-    new RecursiveArrayObject($META)
+    $ENV->convert($META)
 );
 
 
@@ -1322,16 +1330,16 @@ $CATS = [
         'Icon' => "$CatIcons/sequences.png",
         'Description' => "For data that's ACGT, ACGU, amino acid letters on disk.",
         'Platforms' => $ENV->META->Platforms->Sequences,
-        'Formats' => [
-            $ENV->META->Formats->Sequences,
-            $ENV->META->Formats->Proteins,
-            $ENV->META->Formats->Plain,
+        'Formats' => array_merge([
             /*
             'Sequences' => $ENV->META->Formats->Sequences,
             'Proteins' => $ENV->META->Formats->Proteins,
             'Plain' => $ENV->META->Formats->Plain,
             */
-        ],
+            $ENV->META->Formats->Sequences,
+            $ENV->META->Formats->Proteins,
+            $ENV->META->Formats->Plain,
+        ]),
     ],
 
     2 => [
@@ -1481,7 +1489,7 @@ $CATS = [
 ];
 ENV::setPub(
     'CATS',
-    new RecursiveArrayObject($CATS)
+    $ENV->convert($CATS)
 );
 
 

classes/env.class.php

@@ -43,19 +43,13 @@ class ENV
     # Prevents multiple instances
     public function __clone()
     {
-        return trigger_error(
-            'clone() not allowed',
-            E_USER_ERROR
-        );
+        return error('clone() not allowed.');
     }
 
     # Prevents unserializing
     public function __wakeup()
     {
-        return trigger_error(
-            'wakeup() not allowed',
-            E_USER_ERROR
-        );
+        return error('wakeup() not allowed.');
     }
 
     # $this->key returns public->key
@@ -112,8 +106,39 @@ class ENV
     }
 
 
+    /**
+     * convert
+     *
+     * Take a mixed input and returns a RecursiveArrayObject.
+     * This function is the sausage grinder, so to speak.
+     */
+    public function convert($obj)
+    {
+        switch (gettype($obj)) {
+            case 'string':
+                $out = json_decode($obj, true);
+                return (json_last_error() === JSON_ERROR_NONE)
+                    ? new RecursiveArrayObject($out)
+                    : error('json_last_error_msg(): ' . json_last_error_msg());
+                break;
+            
+            case 'array':
+            case 'object':
+                return new RecursiveArrayObject($obj);
+            
+            default:
+                return error('$ENV->convert() expects a JSON string, array, or object.');
+                break;
+        }
+    }
+
+
     /**
      * toArray
+     *
+     * Takes an object and returns an array.
+     * @param object|string $obj Thing to turn into an array
+     * @return $new New recursive array with $obj contents
      * @see https://ben.lobaugh.net/blog/567/php-recursively-convert-an-object-to-an-array
      */
     public function toArray($obj)
@@ -135,30 +160,6 @@ class ENV
     }
 
 
-    /**
-     * fromJson
-     *
-     * @param string $JSON Valid JavaScript object string
-     * @return RecursiveArrayObject Not stdClass as in json_decode()
-     */
-
-    public function fromJson($str)
-    {
-        if (!is_string($str) || is_empty($str)) {
-            error('$ENV->fromJson() expects a string.');
-        }
-
-        $json = json_decode($str, true);
-        
-        if (json_last_error() === JSON_ERROR_NONE) {
-            # Decode to array and construct RAO
-            return new RecursiveArrayObject($json);
-        } else {
-            error('Unable to parse JSON in $ENV->fromJson().');
-        }
-    }
-
-
     /**
      * dedupe
      *
@@ -181,18 +182,24 @@ class ENV
     /**
      * flatten
      *
-     * Takes an $ENV node (Recursive ArrayObject)
+     * Takes an $ENV node or array of them
      * and flattens out the multi-dimensionality.
-     * Returns a single, non-deduplicated array.
+     * It returns a flat array with keys intact.
      */
-    public function flatten($arr)
+    public function flatten($arr, int $lvl = null)
     {
+        if (!is_array($arr) && !is_object($arr)) {
+            return error('$ENV->flatten() expects an array or object, got ' . gettype($arr));
+        }
+
         $new = array();
 
         foreach ($arr as $k => $v) {
-            if (is_object($v)) {
+            /*
+             if (is_object($v)) {
                 $v = $this->toArray($v);
             }
+            */
     
             if (is_array($v)) {
                 $new = array_merge($new, $this->flatten($v));
@@ -212,7 +219,7 @@ class ENV
      * Maps a callback (or default) to an object.
      *
      * Example output:
-     * $Hashes = $ENV->map('md5', $ENV->CATS->SEQ);
+     * $Hashes = $ENV->map('md5', $ENV->CATS->{6});
      *
      * var_dump($Hashes);
      * object(RecursiveArrayObject)#324 (1) {
@@ -237,10 +244,10 @@ class ENV
      * string(32) "52963afccc006d2bce3c890ad9e8f73a"
      *
      * @param string $fn Callback function
-     * @param object $obj Object to operate on
+     * @param object|string $obj Object or property to operate on
      * @return object $RAO Mapped RecursiveArrayObject
      */
-    public function map($fn = '', $obj = null)
+    public function map(string $fn = '', $obj = null)
     {
         # Set a default function if desired
         if (empty($fn) && !is_object($fn)) {

classes/input.class.php

@@ -1,44 +0,0 @@
-<?php
-declare(strict_types=1);
-
-/**
- * Input class
- * 
- * An attempt to normalize and secure form inputs.
- */
-
-class Input {
-
-    /**
-     * passphrase
-     */
-    function passphrase(
-        string $Name = 'password',
-        string $ID = 'password',
-        string $Placeholder = 'Passphrase',
-        bool $Advice = false) {
-        $ENV = ENV::go();
-
-        # Input validation
-        if (!is_string($Name) || empty($Name)) {
-            error("Expected non-empty string, got \$Name = $Name in Input::passphrase.");
-        }
-
-        if (!empty($Advice) && $Advice !== true || $Advice !== false) {
-            error("Expected true|false, got \$Advice = $Advice in Input::passphrase.");
-        }
-
-        $Field = <<<HTML
-        <input type="password" name="$Name" id="$ID" placeholder="$Placeholder"
-          minlength="$ENV->PW_MIN" maxlength="$ENV->PW_MAX"
-          class="inputtext" autocomplete="off" required="required" />
-HTML;
-
-if ($Advice) {
-    return $Field . $ENV->PW_ADVICE;
-} else {
-    return $Field;
-}
-
-    }
-}

classes/mysql.class.php

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

classes/security.class.php

@@ -39,23 +39,43 @@ class Security
     {
         $ENV = ENV::go();
 
+        # Bad PHP version
+        if (version_compare(PHP_VERSION, $ENV->PHP_MIN, '<')) {
+            error("Gazelle requires PHP > $ENV->PHP_MIN.");
+        }
+
         # short_open_tag
         if (!ini_get('short_open_tag')) {
-            error('short_open_tag != On in php.ini');
+            error('short_open_tag != On in php.ini.');
         }
 
         # apcu
         if (!extension_loaded('apcu')) {
-            error('APCu extension not loaded');
+            error('APCu extension php-apcu not loaded.');
         }
 
-        # Bad PHP version
-        if (version_compare($ENV->PHP_MIN, '7.4.0', '<')) {
-            error("Gazelle requires PHP > $ENV->PHP_MIN.");
+        # mbstring
+        if (!extension_loaded('mbstring')) {
+            error('Multibyte string extension php-mbstring not loaded.');
+        }
+
+        # memcache
+        if (!extension_loaded('memcache')) {
+            error('memcached extension php-memcache not loaded.');
+        }
+
+        # mysqli
+        if (!extension_loaded('mysqli')) {
+            error('mysqli extension php-mysql not loaded.');
+        }
+        
+        # blake3
+        if ($ENV->FEATURE_BIOPHP && !extension_loaded('blake3')) {
+            error('Please install and enable the php-blake3 extension.');
         }
 
         # Deal with dumbasses
-        if (isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) {
+        if (isset($_REQUEST['info_hash']) || isset($_REQUEST['peer_id'])) {
             error(
                 'd14:failure reason40:Invalid .torrent, try downloading again.e',
                 $NoHTML = true,

classes/seqhash.class.php

@@ -1,360 +0,0 @@
-<?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);
-    }
-}

classes/torrent_form.class.php

@@ -76,7 +76,7 @@ class TorrentForm
 
     /**
      * ====================
-     * = Twig based class =
+     * = Twig-based class =
      * ====================
     */
 
@@ -388,8 +388,8 @@ HTML;
 
         echo <<<HTML
               <tr>
-                <td>
-                  <input id="post" type="submit" value="$Value" />
+                <td class="center">
+                  <input id="post" type="submit" value="$Value" class="button-primary" />
                 </td>
               </tr>
             </table> <!-- torrent_form -->
@@ -403,7 +403,7 @@ HTML;
      * upload_form
      *
      * Finally the "real" upload form.
-     * Contains all the field you'd expect.
+     * Contains all the fields you'd expect.
      *
      * This is currently one enormous function.
      * It has sub-functions, variables, and everything.
@@ -438,13 +438,13 @@ HTML;
 
 
         /**
-         * Semantic Version
+         * Version
          */
         
         $Version = display_str($Torrent['Version']);
 
         echo $Twig->render(
-            'torrent_form/identifier.html',
+            'torrent_form/version.html',
             [
               'db' => $ENV->DB->version,
               'version' => $Version,
@@ -583,7 +583,7 @@ HTML;
             'torrent_form/year.html',
             [
             'db' => $ENV->DB->year,
-            'location' => $TorrentYear,
+            'year' => $TorrentYear,
           ]
         );
 
@@ -699,7 +699,7 @@ HTML;
                 $trID = 'media_tr',
                 $Label = 'Platform',
                 $Torrent = $Torrent,
-                $Media = $ENV->META->Platforms->Sequences
+                $Media = $ENV->CATS->{1}->Platforms
             );
             
 
@@ -710,10 +710,7 @@ HTML;
                 $trID = 'media_graphs_tr',
                 $Label = 'Platform',
                 $Torrent = $Torrent,
-                $Media = $ENV->flatten([
-                    $ENV->META->Platforms->Graphs,
-                    $ENV->META->Platforms->Sequences
-                ])
+                $Media = $ENV->CATS->{2}->Platforms
             );
             
 
@@ -724,10 +721,7 @@ HTML;
                 $trID = 'media_scalars_vectors_tr',
                 $Label = 'Platform',
                 $Torrent = $Torrent,
-                $Media = $ENV->flatten([
-                    $ENV->META->Platforms->Graphs,
-                    $ENV->META->Platforms->Images
-                ])
+                $Media = $ENV->CATS->{5}->Platforms
             );
 
 
@@ -738,7 +732,7 @@ HTML;
                 $trID = 'media_images_tr',
                 $Label = 'Platform',
                 $Torrent = $Torrent,
-                $Media = $ENV->META->Platforms->Images
+                $Media = $ENV->CATS->{8}->Platforms
             );
 
 
@@ -749,7 +743,7 @@ HTML;
                 $trID = 'media_documents_tr',
                 $Label = 'Platform',
                 $Torrent = $Torrent,
-                $Media = $ENV->META->Platforms->Documents
+                $Media = $ENV->CATS->{11}->Platforms
             );
 
 
@@ -760,7 +754,7 @@ HTML;
                 $trID = 'media_machine_data_tr',
                 $Label = 'Platform',
                 $Torrent = $Torrent,
-                $Media = $ENV->META->Platforms->Raw
+                $Media = $ENV->CATS->{12}->Platforms
             );
         } # fi NewTorrent
         else {
@@ -780,6 +774,7 @@ HTML;
          */
         function formatSelect($trID = '', $Label = '', $Torrent = [], $FileTypes = [])
         {
+            #var_dump($FileTypes);
             echo <<<HTML
             <tr id="$trID">
               <td>
@@ -787,21 +782,24 @@ HTML;
                   $Label
                 <label>
               </td>
-              
+
               <td>
                 <select id="container" name="container">
                   <option value="Autofill">Autofill</option>
 HTML;
 
-            foreach ($FileTypes as $Type => $Extensions) {
-                echo "<option value='$Type'";
+            foreach ($FileTypes as $FileType) {
+                foreach ($FileType as $Type => $Extensions) {
+                    echo "<option value='$Type'";
 
-                if ($Type === ($Torrent['Container'] ?? false)) {
-                    echo ' selected';
-                }
+                    if ($Type === ($Torrent['Container'] ?? false)) {
+                        echo ' selected';
+                    }
 
-                echo ">$Type</option>\n";
+                    echo ">$Type</option>\n";
+                }
             }
+        
 
             echo <<<HTML
                 </select>
@@ -826,7 +824,7 @@ HTML;
             $trID = 'container_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge(($ENV->CATS->{1}->Formats))
+            $FileTypes = $ENV->CATS->{1}->Formats
         );
         
 
@@ -837,7 +835,8 @@ HTML;
             $trID = 'container_graphs_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->GraphXmlFormats, $this->GraphTxtFormats, $this->SeqFormats, $this->ProtFormats, $this->PlainFormats)
+            #$FileTypes = array_column($ENV->META, $Formats)
+            $FileTypes = $ENV->CATS->{2}->Formats
         );
 
 
@@ -848,7 +847,8 @@ HTML;
             $trID = 'container_scalars_vectors_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = $ENV->flatten($ENV->CATS->{5}->Formats)
+            #$FileTypes = $ENV->flatten($ENV->CATS->{5}->Formats)
+            $FileTypes = $ENV->CATS->{5}->Formats
         );
 
 
@@ -859,7 +859,8 @@ HTML;
             $trID = 'container_images_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->ImgFormats, $this->PlainFormats)
+            #$FileTypes = array_merge($this->ImgFormats)
+            $FileTypes = $ENV->CATS->{8}->Formats
         );
 
 
@@ -870,7 +871,8 @@ HTML;
             $trID = 'container_spatial_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->MapVectorFormats, $this->MapRasterFormats, $this->ImgFormats, $this->PlainFormats)
+            #$FileTypes = array_merge($this->MapVectorFormats, $this->MapRasterFormats, $this->ImgFormats, $this->PlainFormats)
+            $FileTypes = $ENV->CATS->{9}->Formats
         );
 
 
@@ -881,7 +883,8 @@ HTML;
             $trID = 'container_documents_tr',
             $Label = 'Format',
             $Torrent = $Torrent,
-            $FileTypes = array_merge($this->BinDocFormats, $this->CpuGenFormats, $this->PlainFormats)
+            #$FileTypes = array_merge($this->BinDocFormats, $this->CpuGenFormats, $this->PlainFormats)
+            $FileTypes = $ENV->CATS->{11}->Formats
         );
 
 
@@ -892,7 +895,8 @@ HTML;
             $trID = 'archive_tr',
             $Label = 'Archive',
             $Torrent = $Torrent,
-            $FileTypes = $this->Archives
+            # $ENV->Archives nests -1 deep
+            $FileTypes = [$ENV->META->Formats->Archives]
         );
 
 
@@ -1030,21 +1034,13 @@ HTML;
             $TorrentImage = display_str($Torrent['Image']);
             $Disabled = $this->Disabled;
 
-            echo <<<HTML
-            <tr id="cover_tr">
-            <td>
-              <label for="image">
-                Picture
-              </label>
-            </td>
-            
-            <td>
-              <input type="text" id="image" name="image" size="60"
-                placeholder="A meaningful picture, e.g., the specimen or a thumbnail"
-                value="$TorrentImage" $Disabled? />
-            </td>
-          </tr>
-HTML;
+            echo $Twig->render(
+                'torrent_form/picture.html',
+                [
+                    'db' => $ENV->DB->picture,
+                    'picture' => $TorrentImage,
+                ]
+            );
         }
 
 
@@ -1056,21 +1052,13 @@ HTML;
          */
         if (!$this->DisabledFlag && $this->NewTorrent) {
             $TorrentMirrors = display_str($Torrent['Mirrors']);
-            echo <<<HTML
-            <tr id="mirrors_tr">
-              <td>
-                <label for="mirrors">
-                  Mirrors
-                </label>
-              </td>
-              
-              <td>
-                <!-- Needs to be all on one line -->
-                <textarea rows="2" name="mirrors" id="mirrors"
-                  placeholder="Up to two FTP/HTTP addresses that either point directly to a file, or for multi-file torrents, to the enclosing folder">$TorrentMirrors</textarea>
-              </td>
-            </tr>
-HTML;
+            echo $Twig->render(
+                'torrent_form/mirrors.html',
+                [
+                  'db' => $ENV->DB->mirrors,
+                  'mirrors' => $TorrentMirrors,
+              ]
+            );
         }
 
 
@@ -1103,6 +1091,22 @@ HTML;
         }
 
 
+        /**
+         * Seqhash
+         */
+
+        if ($ENV->FEATURE_BIOPHP && !$this->DisabledFlag && $this->NewTorrent) {
+            $TorrentSeqhash = display_str($Torrent['Seqhash']);
+            echo $Twig->render(
+                'torrent_form/seqhash.html',
+                [
+                    'db' => $ENV->DB->seqhash,
+                    'seqhash' => $TorrentSeqhash,
+                ]
+            );
+        }
+
+
         /**
          * Torrent group description
          *

classes/twig.class.php

@@ -60,13 +60,16 @@ class Twig
     private static function factory(): \Twig\Environment
     {
         $ENV = ENV::go();
+
+        # https://twig.symfony.com/doc/3.x/api.html
         $Twig = new \Twig\Environment(
             new \Twig\Loader\FilesystemLoader("$ENV->SERVER_ROOT/templates"),
             [
                 'auto_reload' => true,
-                'autoescape' => 'html',
-                'cache' => "$ENV->WEB_ROOT/cache/twig"
-                #'debug' => DEBUG_MODE,
+                'autoescape' => 'name',
+                'cache' => "$ENV->WEB_ROOT/cache/twig",
+                'debug' => $ENV->DEV,
+                'strict_variables' => true,
         ]
         );
 

classes/util.php

@@ -383,14 +383,14 @@ function error($Error = 1, $NoHTML = false, $Log = false, $Debug = true) # , $JS
      * Append $Log
      * Formerly in sections/error/index.php
      */
-    if ($Log ?? false) {
+    if ($Log) {
         $Message .= " <a href='log.php?search=$Title'>Search Log</a>";
     }
 
     /**
      * Append $Debug
      */
-    if ($Debug ?? false) {
+    if ($Debug) {
         $DateTime = strftime('%c', $_SERVER['REQUEST_TIME']);
         $BackTrace = debug_string_backtrace();
 
@@ -516,7 +516,15 @@ function json_print($Status, $Message)
  */
 function json_error($Code)
 {
-    echo json_encode(add_json_info(['status' => 'failure', 'error' => $Code, 'response' => []]));
+    echo json_encode(
+        add_json_info(
+            [
+                'status' => 'failure',
+                'error' => $Code,
+                'response' => []
+            ]
+        )
+    );
     die();
 }
 

composer.json

@@ -1,36 +1,39 @@
 {
   "name": "biotorrents/gazelle",
   "description": "Web framework for private BitTorrent trackers using Ocelot",
-
   "type": "project",
   "license": "Unlicense",
-
   "authors": [
-    { "name": "What.cd" },
-    { "name": "Oppaitime" },
-    { "name": "BioTorrents.de" }
+    {
+      "name": "What.cd"
+    },
+    {
+      "name": "Oppaitime"
+    },
+    {
+      "name": "BioTorrents.de"
+    }
   ],
-
   "autoload": {
-    "classmap": ["classes/"],
-    "files": ["classes/autoload.php"]
+    "classmap": [
+      "classes/"
+    ],
+    "files": [
+      "classes/autoload.php"
+    ]
   },
-
   "config": {
     "sort-packages": true
   },
-
   "require": {
     "php": ">=7.4",
-
     "ext-apcu": "*",
-    "ext-blake3": "*",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-memcache": "*",
     "ext-mysqli": "*",
-
+    "biotorrents/biophp": "dev-master",
     "erusev/parsedown": "^1.8.0-beta-7",
     "erusev/parsedown-extra": "^0.8.1",
     "j7mbo/twitter-api-php": "^1.0.6",
@@ -38,13 +41,12 @@
     "robmorgan/phinx": "^0.12.7",
     "twig/twig": "^3.3.2"
   },
-
   "require-dev": {
+    "d11wtq/boris": "^1.0.10",
     "phpstan/phpstan": "^0.12.92",
     "phpunit/phpunit": "^9.5.6",
     "squizlabs/php_codesniffer": "^3.6.0"
   },
-
   "scripts": {
     "phpstan": "phpstan analyse",
     "test": "phpunit"

composer.lock

@@ -4,20 +4,66 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b306af0027bec610a1abaf7776f3253c",
+    "content-hash": "344f2e6f0358a24896af389a4bca5a1a",
     "packages": [
+        {
+            "name": "biotorrents/biophp",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/biotorrents/biophp.git",
+                "reference": "8b099fb0c78ec2a5dcab16c351e5d369853109ee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/biotorrents/biophp/zipball/8b099fb0c78ec2a5dcab16c351e5d369853109ee",
+                "reference": "8b099fb0c78ec2a5dcab16c351e5d369853109ee",
+                "shasum": ""
+            },
+            "require": {
+                "ext-blake3": "*",
+                "ext-curl": "*",
+                "pear/math_biginteger": "^1.0.3",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "d11wtq/boris": "^1.0.10"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "BioPHP\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "ohm",
+                    "email": "help@biotorrents.de"
+                }
+            ],
+            "description": "BioPHP implements some light tools for manipulating genomic data",
+            "support": {
+                "source": "https://github.com/biotorrents/biophp/tree/master"
+            },
+            "time": "2021-07-23T19:02:18+00:00"
+        },
         {
             "name": "cakephp/core",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/core.git",
-                "reference": "aa8b40e2adcfbe52c71ec273866628ffc6d87838"
+                "reference": "bed4b6f09550909beea5440627d5a6ff85fb1934"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/core/zipball/aa8b40e2adcfbe52c71ec273866628ffc6d87838",
-                "reference": "aa8b40e2adcfbe52c71ec273866628ffc6d87838",
+                "url": "https://api.github.com/repos/cakephp/core/zipball/bed4b6f09550909beea5440627d5a6ff85fb1934",
+                "reference": "bed4b6f09550909beea5440627d5a6ff85fb1934",
                 "shasum": ""
             },
             "require": {
@@ -61,11 +107,11 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/core"
             },
-            "time": "2021-05-24T17:26:44+00:00"
+            "time": "2021-06-26T14:06:56+00:00"
         },
         {
             "name": "cakephp/database",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/database.git",
@@ -120,16 +166,16 @@
         },
         {
             "name": "cakephp/datasource",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/datasource.git",
-                "reference": "cfc914efc099d48300c1a99316fc8d0d55babc67"
+                "reference": "cc101051e8d601cf6c2895d635ccefecca97ff4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/datasource/zipball/cfc914efc099d48300c1a99316fc8d0d55babc67",
-                "reference": "cfc914efc099d48300c1a99316fc8d0d55babc67",
+                "url": "https://api.github.com/repos/cakephp/datasource/zipball/cc101051e8d601cf6c2895d635ccefecca97ff4e",
+                "reference": "cc101051e8d601cf6c2895d635ccefecca97ff4e",
                 "shasum": ""
             },
             "require": {
@@ -174,11 +220,11 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/datasource"
             },
-            "time": "2021-05-24T17:26:44+00:00"
+            "time": "2021-07-03T10:28:16+00:00"
         },
         {
             "name": "cakephp/utility",
-            "version": "4.2.7",
+            "version": "4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cakephp/utility.git",
@@ -435,6 +481,59 @@
             },
             "time": "2020-10-12T00:27:44+00:00"
         },
+        {
+            "name": "pear/math_biginteger",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Math_BigInteger.git",
+                "reference": "33d4357543037a458fad3e8c837a01b93104e592"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Math_BigInteger/zipball/33d4357543037a458fad3e8c837a01b93104e592",
+                "reference": "33d4357543037a458fad3e8c837a01b93104e592",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=4.2.0"
+            },
+            "suggest": {
+                "ext-bcmath": "Allows using the BCMath extension internally for computation. Faster than native implementation.",
+                "ext-gmp": "Allows using the GNU Multiple Precision extension internally for computation. If you are doing a lot of computation this is the recommended extension."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Math_": "./"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net"
+                }
+            ],
+            "description": "Pure-PHP arbitrary precission integer arithmetic library. If GMP or BCMath are available they are used.",
+            "homepage": "https://github.com/pear/Math_BigInteger",
+            "keywords": [
+                "arbitrary",
+                "bcmath",
+                "gmp",
+                "integer",
+                "precision"
+            ],
+            "support": {
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Math_BigInteger",
+                "source": "https://github.com/pear/Math_BigInteger"
+            },
+            "time": "2016-04-12T05:46:52+00:00"
+        },
         {
             "name": "psr/container",
             "version": "2.0.1",
@@ -1768,6 +1867,46 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "d11wtq/boris",
+            "version": "v1.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/borisrepl/boris.git",
+                "reference": "31055b15e2d3fe47f31f6aa8e277f8f3fc7eb483"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/borisrepl/boris/zipball/31055b15e2d3fe47f31f6aa8e277f8f3fc7eb483",
+                "reference": "31055b15e2d3fe47f31f6aa8e277f8f3fc7eb483",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcntl": "*",
+                "ext-posix": "*",
+                "ext-readline": "*",
+                "php": ">=5.3.0"
+            },
+            "bin": [
+                "bin/boris"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Boris": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A tiny, but robust REPL (Read-Evaluate-Print-Loop) for PHP.",
+            "support": {
+                "issues": "https://github.com/borisrepl/boris/issues",
+                "source": "https://github.com/borisrepl/boris/tree/v1.0.10"
+            },
+            "time": "2015-03-01T08:05:19+00:00"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.4.0",
@@ -1897,16 +2036,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.11.0",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
-                "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
                 "shasum": ""
             },
             "require": {
@@ -1947,22 +2086,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
             },
-            "time": "2021-07-03T13:36:55+00:00"
+            "time": "2021-07-21T10:44:31+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -2007,9 +2146,9 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2020-06-27T14:33:11+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
@@ -2289,16 +2428,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.92",
+            "version": "0.12.93",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2"
+                "reference": "7b7602f05d340ffa418c59299f8c053ac6c3e7ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/64d4c5dc8ea96972bc18432d137a330239a5d2b2",
-                "reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7b7602f05d340ffa418c59299f8c053ac6c3e7ea",
+                "reference": "7b7602f05d340ffa418c59299f8c053ac6c3e7ea",
                 "shasum": ""
             },
             "require": {
@@ -2329,7 +2468,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.92"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.93"
             },
             "funding": [
                 {
@@ -2349,7 +2488,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-10T13:53:49+00:00"
+            "time": "2021-07-20T10:49:53+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2671,16 +2810,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.6",
+            "version": "9.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
+                "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0dc8b6999c937616df4fb046792004b33fd31c5",
+                "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5",
                 "shasum": ""
             },
             "require": {
@@ -2758,7 +2897,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.7"
             },
             "funding": [
                 {
@@ -2770,7 +2909,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-23T05:14:38+00:00"
+            "time": "2021-07-19T06:14:47+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -3625,6 +3764,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -3904,6 +4044,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "biotorrents/biophp": 20,
         "erusev/parsedown": 10
     },
     "prefer-stable": false,
@@ -3911,7 +4052,6 @@
     "platform": {
         "php": ">=7.4",
         "ext-apcu": "*",
-        "ext-blake3": "*",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

design/privatefooter.php

@@ -6,7 +6,7 @@ $Sep = ' ';
 
 # End <div#content>, begin <footer>
 # This needs to be <main>, in each page
-echo $HTML = '</div></main><footer class="halfwide">';
+echo $HTML = '</div></main><footer>';
 
 # Disclaimer
 #if (!empty($Options['disclaimer'])) {

design/privateheader.php

@@ -50,6 +50,7 @@ $Styles = array_filter(
         [
           'vendor/jquery-ui.min',
           'vendor/normalize',
+          'vendor/skeleton',
           #'assets/fonts/fa/css/all.min',
           'global'
         ],

design/publicfooter.php

@@ -8,6 +8,7 @@ echo <<<HTML
 
 <footer>
   <a href="https://github.com/biotorrents/gazelle" target="_blank">GitHub</a>
+  <a href="https://docs.biotorrents.de" target="_blank">API</a>
   <a href="/legal.php?p=privacy">Privacy</a>
   <a href="/legal.php?p=dmca">DMCA</a>
 </footer>

design/publicheader.php

@@ -41,7 +41,7 @@ foreach ($Scripts as $Script) {
 }
 
 # Load CSS
-$Styles = ['vendor/normalize', 'global', 'public'];
+$Styles = ['vendor/normalize', 'vendor/skeleton', 'global', 'public'];
 foreach ($Styles as $Style) {
     echo View::pushAsset(
         "$ENV->STATIC_SERVER/styles/$Style.css",
@@ -68,12 +68,15 @@ if ($ENV->OPEN_REGISTRATION) {
     echo '<a href="register.php">Register</a>';
 }
 
+/*
 $Email = $ENV->HELP->Email;
 $Subject = $ENV->HELP->Subject;
 $Body = $ENV->HELP->Body;
 echo "<a href='mailto:$Email?subject=$Subject&body=$Body'>Support</a>";
+*/
 
 echo <<<HTML
+    <a href="https://github.com/biotorrents/gazelle/issues" target="_blank">Support</a>
   </header>
 
 <main>

design/views/generic/reply/quickreply.php

@@ -200,7 +200,7 @@ if (!isset($InputTitle)) {
           class="hidden button_preview_<?=$ReplyText->getID()?>"
           tabindex="1" />
 
-        <input type="submit" value="Post" id="submit_button" tabindex="1" />
+        <input type="submit" class="button-primary" value="Post" id="submit_button" tabindex="1" />
       </div>
     </form>
   </div>

design/views/generic/reply/staffpm.php

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

readme.md

@@ -1,9 +1,11 @@
 # BioTorrents.de Gazelle
 
 This software is twice removed from the original
-[What.cd Gazelle](https://github.com/WhatCD/Gazelle):
-it's based on the security hardened PHP7 fork
+[What.cd Gazelle](https://github.com/WhatCD/Gazelle).
+It's based on the security hardened PHP7 fork
 [Oppaitime Gazelle](https://git.oppaiti.me/Oppaitime/Gazelle).
+It shares several features with
+[Orpheus Gazelle](https://github.com/OPSnet/Gazelle).
 The goal is to organize a functional database with pleasant interfaces,
 and render insightful views using data from robust external sources.
 
@@ -23,6 +25,7 @@ BioTorrents.de supports an array of
 with the appropriate bold/italic glyphs and monospace.
 These options are available to every theme.
 Font Awesome 5 is also universally available.
+[Download the fonts](https://docs.biotorrents.de/dl/fonts.tgz).
 
 ## Markdown support
 
@@ -36,30 +39,46 @@ Support for the default Gazelle recursive regex BBcode parser.
 ## $ENV recursive singleton
 
 [The site configuration](classes/config.template.php)
-is being migrated to a format govered by
-[the ENV special class](classes/env.class.php)
-for modified ArrayObjects.
-This is useful for several reasons:
-
-- prevents multiple configs loaded in memory;
-- ensures the config's immutability;
-- doesn't pollute the constants table;
-- allows public (echoed) and private (accessed) values;
-- supports large, nested static metadata structures;
-- able to scope access to the function level;
-- easy to extend ENV with new class methods;
-- good interoperability potential with JSON; and
-- native PHP ArrayObject support with Array compatibility.
+is being migrated to a format govered by the
+[ENV special class](classes/env.class.php)
+for modified recursive ArrayObjects.
 
 ## Twig template system
 
-Similar to ENV,
-[the Twig interface](classes/twig.class.php)
+Similar to ENV, the
+[Twig interface](classes/twig.class.php)
 operates as a singleton because it's an external module with its own cache.
 Twig provides a security benefit by escaping rendered output,
 and a secondary benefit of clarifying the PHP running the site sections.
-Several custom filters are available from
-[Orpheus Gazelle](https://github.com/OPSnet/Gazelle).
+Several custom filters are available from OPS.
+
+## Active data minimization
+
+BioTorrents.de has
+[real lawyer-vetted policies](templates/legal).
+In the process of matching the tech to the legal word,
+we dropped support for a number of compromising features:
+
+- Bitcoin, PayPal, and currency exchange API and system calls;
+- Bitcoin addresses, user donation history, and similar metadata; and
+- IP address and geolocation, email address, passphrase, and passkey history.
+
+Besides that, BioTorrents has several passive developments in progress:
+
+- prepare all queries with parameterized statements;
+- declare strict mode at the top of every PHP and JS file;
+- check strict equality and strong typing, including function arguments;
+- run all files through generic formatters such as PHP-CS-Fixer; and
+- move all external libraries to uncomplicated package management.
+
+## Minor changes
+
+- Database crypto bumped up to AES-256
+- Good subresource integrity support
+- Configurable HTTP status code errors
+- Integrated diceware passphrase generator
+- TLS database connections
+- Semantic HTML5 themes (WIP)
 
 # Changelog: WCD → OT
 

sections/api/autofill/doi.php

@@ -1,14 +1,32 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
+
+$ENV = ENV::go();
 
 if (!$_GET['doi']) {
-    json_die();
+    json_error('expected doi param');
+} elseif (!preg_match("/$ENV->DOI_REGEX/", strtoupper($_GET['doi']))) {
+    json_error('expected valid doi');
+} else {
+    $DOI = $_GET['doi'];
 }
 
+# https://weichie.com/blog/curl-api-calls-with-php/
+$curl = curl_init();
+curl_setopt($curl, CURLOPT_URL, "$ENV->SS/$DOI");
+curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+$output = curl_exec($curl);
+curl_close($curl);
+
+# I don't like this nested json_*code() business
+# It's slow and unnecesary since SS already outputs JSON
+# todo: At least cache the response, then refactor
 print
     json_encode(
         [
             'status' => 'success',
-            'response' => ['loadAverage' => sys_getloadavg()]
-        ]
+            'response' => json_decode($output, true),
+        ],
+        JSON_UNESCAPED_SLASHES
     );

sections/api/index.php

@@ -266,6 +266,7 @@ switch ($_GET['action']) {
   */
 
   case 'autofill':
+    require_once "$ENV->SERVER_ROOT/sections/api/autofill/doi.php";
     /*
     if ($_GET['cat'] === 'anime') {
         require_once "$ENV->SERVER_ROOT/sections/api/autofill/anime.php";

sections/better/better.php

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

sections/better/index.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-enforce_login();
+#enforce_login();
 
 if (isset($_GET['method'])) {
     switch ($_GET['method']) {
@@ -9,8 +9,8 @@ if (isset($_GET['method'])) {
       require_once SERVER_ROOT.'/sections/better/single.php';
       break;
   
-    case 'screenshots':
-      require_once SERVER_ROOT.'/sections/better/screenshots.php';
+    case 'literature':
+      require_once SERVER_ROOT.'/sections/better/literature.php';
       break;
 
     case 'covers':

sections/better/screenshots.php → sections/better/literature.php

@@ -3,57 +3,56 @@ declare(strict_types=1);
 
 $All = (!empty($_GET['filter']) && $_GET['filter'] === 'all');
 $Join = $All
-? ''
-: (
-    '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 `torrents` AS t ON t.`GroupID` = tg.`id`
+        JOIN `xbt_snatched` AS x ON x.`fid` = t.`ID`
+        AND x.`uid` = '$LoggedUser[ID]'
+    ");
 
 View::show_header('Torrent groups with no publications');
 
-$DB->query("
+$DB->prepared_query("
 SELECT SQL_CALC_FOUND_ROWS
-  tg.`ID`
+  tg.`id`
 FROM
   `torrents_group` AS tg
 $Join
 WHERE
-  tg.`ID` NOT IN(
+  tg.`id` NOT IN(
   SELECT DISTINCT
-    `TorrentID`
+    `group_id`
   FROM
-    `torrents_doi`
+    `literature`
   )
 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));
-?>
+$Results = Torrents::get_groups(array_keys($Groups)); ?>
 
 <div class="header">
   <?php if ($All) { ?>
   <h2>
-    All groups with no publications
+    All groups with no DOI numbers
   </h2>
 
   <?php } else { ?>
   <h2>
-    Torrent groups with no publications that you have snatched
+    Torrent groups with no DOI numbers that you have snatched
   </h2>
   <?php } ?>
 
   <div class="linkbox">
     <a href="better.php" class="brackets">Back to better.php list</a>
     <?php if ($All) { ?>
-    <a href="better.php?method=screenshots" class="brackets">Show only those you have snatched</a>
+    <a href="better.php?method=literature" class="brackets">Show only those you have snatched</a>
     <?php } else { ?>
-    <a href="better.php?method=screenshots&amp;filter=all" class="brackets">Show all</a>
+    <a href="better.php?method=literature&amp;filter=all" class="brackets">Show all</a>
     <?php } ?>
   </div>
 </div>
@@ -67,22 +66,22 @@ $Results = Torrents::get_groups(array_keys($Groups));
     <?php
 foreach ($Results as $Result) {
     extract($Result);
-    $LangName = $Name ? $Name : ($Title2 ? $Title2 : $NameJP);
-    $TorrentTags = new Tags($TagList);
+    $LangName = $title ? $title : ($subject ? $subject : $object);
+    $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 .= ">$LangName</a>";
 
-    if ($Year > 0) {
-        $DisplayName .= " [$Year]";
+    if ($year > 0) {
+        $DisplayName .= " [$year]";
     } ?>
 
     <tr class="torrent">
       <td>
-        <div class="<?=Format::css_category($CategoryID)?>"></div>
+        <div class="<?=Format::css_category($category_id)?>"></div>
       </td>
 
       <td>

sections/better/single.php

@@ -1,13 +1,15 @@
 <?php
+declare(strict_types = 1);
+
 if (($Results = $Cache->get_value('better_single_groupids')) === false) {
     $DB->query("
     SELECT
-      t.ID AS TorrentID,
-      t.GroupID AS GroupID
-    FROM xbt_files_users AS x
-      JOIN torrents AS t ON t.ID=x.fid
-    GROUP BY x.fid
-    HAVING COUNT(x.uid) = 1
+      t.`ID` AS `TorrentID`,
+      t.`GroupID` AS `GroupID`
+    FROM `xbt_files_users` AS x
+      JOIN `torrents` AS t ON t.`ID`=x.`fid`
+    GROUP BY x.`fid`
+    HAVING COUNT(x.`uid`) = 1
     LIMIT 30");
 
     $Results = $DB->to_pair('GroupID', 'TorrentID', false);
@@ -15,9 +17,7 @@ if (($Results = $Cache->get_value('better_single_groupids')) === false) {
 }
 
 $Groups = Torrents::get_groups(array_keys($Results));
-
-View::show_header('Single seeder torrents');
-?>
+View::show_header('Single seeder torrents'); ?>
 
 <div class="header">
   <h2>

sections/bookmarks/torrents.php

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

sections/collages/browse.php

@@ -180,7 +180,7 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
         <input type="hidden" name="action" value="search" />
       </div>
 
-      <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
+      <table cellpadding="6" cellspacing="1" border="0" class="layout torrent_search" width="100%">
         <tr id="search_terms">
           <td class="label"></td>
           <td>
@@ -262,7 +262,7 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
         </tr>
         <tr>
           <td colspan="2" class="center">
-            <input type="submit" value="Search" />
+            <input type="submit" class="button-primary" value="Search" />
           </td>
         </tr>
       </table>

sections/collages/edit.php

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

sections/collages/new.php

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

sections/collages/torrent_collage.php

@@ -231,11 +231,7 @@ foreach ($GroupIDs as $GroupID) {
   id="group_<?=$GroupID?>">
   <td></td>
 
-  <td class="center">
-    <div title="<?=$TorrentTags->title()?>"
-      class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
-    </div>
-  </td>
+  <td></td>
 
   <td>
     <span class="brackets">
@@ -584,13 +580,12 @@ foreach ($UserAdditions as $UserID => $Additions) {
             value="<?=$LoggedUser['AuthKey']?>" />
           <input type="hidden" name="collageid"
             value="<?=$CollageID?>" />
-          <div>
-            <input type="text" size="20" name="url" />
-          </div>
+
           <div class="submit_div">
-            <input type="submit" value="Add" />
+            <input type="text" size="20" name="url" />
+            <input type="submit" class="button-primary" value="Add" />
           </div>
-          <span style="font-style: italic;">Enter the URL of a torrent group on the site.</span>
+          <p>Enter the URL of a torrent group on the site.</p>
         </form>
       </div>
 
@@ -672,7 +667,7 @@ if (!$LoggedUser['DisablePosting']) {
             <textarea name="body" cols="24" rows="5"></textarea>
           </div>
           <div class="submit_div">
-            <input type="submit" id="submit_button" value="Post" />
+            <input type="submit" id="submit_button" class="button-primary" value="Post" />
           </div>
         </div>
       </form>

sections/comments/comments.php

@@ -1,5 +1,7 @@
 <?
-/*
+declare(strict_types=1);
+
+/**
  * $_REQUEST['action'] is artist, collages, requests or torrents (default torrents)
  * $_REQUEST['type'] depends on the page:
  *     collages:
@@ -16,17 +18,18 @@
 // User ID
 if (isset($_GET['id']) && is_number($_GET['id'])) {
   $UserID = (int)$_GET['id'];
-
   $UserInfo = Users::user_info($UserID);
-
   $Username = $UserInfo['Username'];
-  if ($LoggedUser['ID'] == $UserID) {
+
+  if ($LoggedUser['ID'] === $UserID) {
     $Self = true;
   } else {
     $Self = false;
   }
+
   $Perms = Permissions::get_permissions($UserInfo['PermissionID']);
   $UserClass = $Perms['Class'];
+
   if (!check_paranoia('torrentcomments', $UserInfo['Paranoia'], $UserClass, $UserID)) {
     error(403);
   }
@@ -49,91 +52,111 @@ if (!isset($_REQUEST['action'])) {
 } else {
   $Action = $_REQUEST['action'];
 }
+
 if (!isset($_REQUEST['type'])) {
   $Type = 'default';
 } else {
   $Type = $_REQUEST['type'];
 }
 
+
 // Construct the SQL query
+
 $Conditions = $Join = [];
 switch ($Action) {
+  # artist comments
   case 'artist':
-    $Field1 = 'artists_group.ArtistID';
-    $Field2 = 'artists_group.Name';
-    $Table = 'artists_group';
+    $Field1 = '`artists_group`.`ArtistID`';
+    $Field2 = '`artists_group`.`Name`';
+    $Table = '`artists_group`';
     $Title = 'Artist comments left by ' . ($Self ? 'you' : $Username);
     $Header = 'Artist comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
-    $Conditions[] = "comments.AuthorID = $UserID";
+    $Conditions[] = "`comments`.`AuthorID` = $UserID";
     break;
+
+  
+  # collage comments
   case 'collages':
-    $Field1 = 'collages.ID';
-    $Field2 = 'collages.Name';
-    $Table = 'collages';
-    $Conditions[] = "collages.Deleted = '0'";
+    $Field1 = '`collages`.`ID`';
+    $Field2 = '`collages`.`Name`';
+    $Table = '`collages`';
+    $Conditions[] = "`collages`.`Deleted` = '0'";
+
     if ($Type == 'created') {
-      $Conditions[] = "collages.UserID = $UserID";
-      $Conditions[] = "comments.AuthorID != $UserID";
+      $Conditions[] = "`collages`.`UserID` = $UserID";
+      $Conditions[] = "`comments`.`AuthorID` != $UserID";
       $Title = 'Comments left on collages ' . ($Self ? 'you' : $Username) . ' created';
       $Header = 'Comments left on collages ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false)) . ' created';
     } elseif ($Type == 'contributed') {
-      $Conditions[] = 'IF(collages.CategoryID = ' . array_search('Artists', $CollageCats) . ', collages_artists.ArtistID, collages_torrents.GroupID) IS NOT NULL';
-      $Conditions[] = "comments.AuthorID != $UserID";
-      $Join[] = "LEFT JOIN collages_torrents ON collages_torrents.CollageID = collages.ID AND collages_torrents.UserID = $UserID";
-      $Join[] = "LEFT JOIN collages_artists ON collages_artists.CollageID = collages.ID AND collages_artists.UserID = $UserID";
+      $Conditions[] = 'IF(`collages`.`CategoryID` = ' . array_search('Artists', $CollageCats) . ', `collages_artists`.`ArtistID`, `collages_torrents`.`GroupID`) IS NOT NULL';
+      $Conditions[] = "`comments`.`AuthorID` != $UserID";
+      $Join[] = "LEFT JOIN `collages_torrents` ON `collages_torrents`.`CollageID` = `collages`.`ID` AND `collages_torrents`.`UserID` = $UserID";
+      $Join[] = "LEFT JOIN `collages_artists` ON `collages_artists`.`CollageID` = `collages`.`ID` AND `collages_artists`.`UserID` = $UserID";
       $Title = 'Comments left on collages ' . ($Self ? 'you\'ve' : $Username . ' has') . ' contributed to';
       $Header = 'Comments left on collages ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false).' has') . ' contributed to';
     } else {
       $Type = 'default';
-      $Conditions[] = "comments.AuthorID = $UserID";
+      $Conditions[] = "`comments`.`AuthorID` = $UserID";
       $Title = 'Collage comments left by ' . ($Self ? 'you' : $Username);
       $Header = 'Collage comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
     }
     break;
+
+
+  # request comments
   case 'requests':
-    $Field1 = 'requests.ID';
-    $Field2 = 'requests.Title';
+    $Field1 = '`requests`.`ID`';
+    $Field2 = '`requests`.`Title`';
     $Table = 'requests';
+
     if ($Type == 'created') {
-      $Conditions[] = "requests.UserID = $UserID";
-      $Conditions[] = "comments.AuthorID != $UserID";
+      $Conditions[] = "`requests`.`UserID` = $UserID";
+      $Conditions[] = "`comments`.`AuthorID` != $UserID";
       $Title = 'Comments left on requests ' . ($Self ? 'you' : $Username) . ' created';
       $Header = 'Comments left on requests ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false)) . ' created';
     } elseif ($Type == 'voted') {
-      $Conditions[] = "requests_votes.UserID = $UserID";
-      $Conditions[] = "comments.AuthorID != $UserID";
-      $Join[] = 'JOIN requests_votes ON requests_votes.RequestID = requests.ID';
+      $Conditions[] = "`requests_votes`.`UserID` = $UserID";
+      $Conditions[] = "`comments`.`AuthorID` != $UserID";
+      $Join[] = 'JOIN `requests_votes` ON `requests_votes`.`RequestID` = `requests`.`ID`';
       $Title = 'Comments left on requests ' . ($Self ? 'you\'ve' : $Username . ' has') . ' voted on';
       $Header = 'Comments left on requests ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false) . ' has') . ' voted on';
     } else {
       $Type = 'default';
-      $Conditions[] = "comments.AuthorID = $UserID";
+      $Conditions[] = "`comments`.`AuthorID` = $UserID";
       $Title = 'Request comments left by ' . ($Self ? 'you' : $Username);
       $Header = 'Request comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
     }
     break;
+
+
+  # torrent comments
   case 'torrents':
   default:
     $Action = 'torrents';
-    $Field1 = 'torrents.GroupID';
-    $Field2 = "COALESCE(NULLIF(tg.Name,''),NULLIF(tg.Title2,''),tg.NameJP) AS Name";
-    $Table = 'torrents';
-    $Join[] = 'JOIN torrents_group AS tg ON torrents.GroupID = tg.ID';
+    $Field1 = '`torrents`.`GroupID`';
+    $Field2 = "COALESCE(NULLIF(tg.`title`,''),NULLIF(tg.`subject`,''),tg.`object`) AS Name";
+    $Table = '`torrents`';
+    $Join[] = 'JOIN `torrents_group` AS tg ON `torrents`.`GroupID` = tg.`id`';
+
     if ($Type == 'uploaded') {
-      $Conditions[] = "torrents.UserID = $UserID";
-      $Conditions[] = 'comments.AddedTime > torrents.Time';
-      $Conditions[] = "comments.AuthorID != $UserID";
+      $Conditions[] = "`torrents`.`UserID` = $UserID";
+      $Conditions[] = '`comments`.`AddedTime` > `torrents`.`Time`';
+      $Conditions[] = "`comments`.`AuthorID` != $UserID";
       $Title = 'Comments left on torrents ' . ($Self ? 'you\'ve' : $Username . ' has') . ' uploaded';
       $Header = 'Comments left on torrents ' . ($Self ? 'you\'ve' : Users::format_username($UserID, false, false, false) . ' has') . ' uploaded';
     } else {
       $Type = 'default';
-      $Conditions[] = "comments.AuthorID = $UserID";
+      $Conditions[] = "`comments`.`AuthorID` = $UserID";
       $Title = 'Torrent comments left by ' . ($Self ? 'you' : $Username);
       $Header = 'Torrent comments left by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
     }
     break;
 }
-$Join[] = "JOIN comments ON comments.Page = '$Action' AND comments.PageID = $Field1";
+
+# end SQL query constructor
+
+
+$Join[] = "JOIN `comments` ON `comments`.`Page` = '$Action' AND `comments`.`PageID` = $Field1";
 $Join = implode("\n\t\t", $Join);
 $Conditions = implode(" AND ", $Conditions);
 $Conditions = ($Conditions ? 'WHERE ' . $Conditions : '');
@@ -141,20 +164,20 @@ $Conditions = ($Conditions ? 'WHERE ' . $Conditions : '');
 $SQL = "
   SELECT
     SQL_CALC_FOUND_ROWS
-    comments.AuthorID,
-    comments.Page,
-    comments.PageID,
+    `comments`.`AuthorID`,
+    `comments`.`Page`,
+    `comments`.`PageID`,
     $Field2,
-    comments.ID,
-    comments.Body,
-    comments.AddedTime,
-    comments.EditedTime,
-    comments.EditedUserID
+    `comments`.`ID`,
+    `comments`.`Body`,
+    `comments`.`AddedTime`,
+    `comments`.`EditedTime`,
+    `comments`.`EditedUserID`
   FROM $Table
     $Join
   $Conditions
-  GROUP BY comments.ID
-  ORDER BY comments.ID DESC
+  GROUP BY `comments`.`ID`
+  ORDER BY `comments`.`ID` DESC
   LIMIT $Limit";
 
 $Comments = $DB->query($SQL);
@@ -163,65 +186,89 @@ $Count = $DB->record_count();
 $DB->query("SELECT FOUND_ROWS()");
 list($Results) = $DB->next_record();
 $Pages = Format::get_pages($Page, $Results, $PerPage, 11);
-
 $DB->set_query_id($Comments);
-if ($Action == 'requests') {
+
+# Remove the weird comment headings on torrent and request comments
+/*
+if ($Action === 'requests') {
   $RequestIDs = array_flip(array_flip($DB->collect('PageID')));
   $Artists = [];
+
   foreach ($RequestIDs as $RequestID) {
     $Artists[$RequestID] = Requests::get_artists($RequestID);
   }
   $DB->set_query_id($Comments);
-} elseif ($Action == 'torrents') {
+} elseif ($Action === 'torrents') {
   $GroupIDs = array_flip(array_flip($DB->collect('PageID')));
   $Artists = Artists::get_artists($GroupIDs);
   $DB->set_query_id($Comments);
 }
+*/
+
+# Replace the "shifting" main links with regular static ones
+# There are already shifting supplemental links for each type
+$ActionLinks[] = '<a href="comments.php?action=torrents' . $LinkID . '" class="brackets">Torrent comments</a>';
+$ActionLinks[] = '<a href="comments.php?action=collages' . $LinkID . '" class="brackets">Collections comments</a>';
+$ActionLinks[] = '<a href="comments.php?action=requests' . $LinkID . '" class="brackets">Request comments</a>';
+$ActionLinks[] = '<a href="comments.php?action=artist' . $LinkID . '" class="brackets">Artist comments</a>';
 
+/*
 $LinkID = (!$Self ? '&amp;id=' . $UserID : '');
 $ActionLinks = $TypeLinks = [];
-if ($Action != 'artist') {
+if ($Action !== 'artist') {
   $ActionLinks[] = '<a href="comments.php?action=artist' . $LinkID . '" class="brackets">Artist comments</a>';
 }
-if ($Action != 'collages') {
+
+if ($Action !== 'collages') {
   $ActionLinks[] = '<a href="comments.php?action=collages' . $LinkID . '" class="brackets">Collections comments</a>';
 }
-if ($Action != 'requests') {
+
+if ($Action !== 'requests') {
   $ActionLinks[] = '<a href="comments.php?action=requests' . $LinkID . '" class="brackets">Request comments</a>';
 }
-if ($Action != 'torrents') {
+
+if ($Action !== 'torrents') {
   $ActionLinks[] = '<a href="comments.php?action=torrents' . $LinkID . '" class="brackets">Torrent comments</a>';
 }
+*/
+
 switch ($Action) {
   case 'collages':
     $BaseLink = 'comments.php?action=collages' . $LinkID;
-    if ($Type != 'default') {
+    if ($Type !== 'default') {
       $TypeLinks[] = '<a href="' . $BaseLink . '" class="brackets">Display collage comments ' . ($Self ? 'you\'ve' : $Username . ' has') . ' made</a>';
     }
-    if ($Type != 'created') {
+
+    if ($Type !== 'created') {
       $TypeLinks[] = '<a href="' . $BaseLink . '&amp;type=created" class="brackets">Display comments left on ' . ($Self ? 'your collections' : 'collections created by ' .$Username) . '</a>';
     }
-    if ($Type != 'contributed') {
+
+    if ($Type !== 'contributed') {
       $TypeLinks[] = '<a href="' . $BaseLink . '&amp;type=contributed" class="brackets">Display comments left on collections ' . ($Self ? 'you\'ve' : $Username . ' has') . ' contributed to</a>';
     }
     break;
+
   case 'requests':
     $BaseLink = 'comments.php?action=requests' . $LinkID;
-    if ($Type != 'default') {
+    if ($Type !== 'default') {
       $TypeLinks[] = '<a href="' . $BaseLink . '" class="brackets">Display request comments you\'ve made</a>';
     }
-    if ($Type != 'created') {
+
+    if ($Type !== 'created') {
       $TypeLinks[] = '<a href="' . $BaseLink . '&amp;type=created" class="brackets">Display comments left on your requests</a>';
     }
-    if ($Type != 'voted') {
+
+    if ($Type !== 'voted') {
       $TypeLinks[] = '<a href="' . $BaseLink . '&amp;type=voted" class="brackets">Display comments left on requests you\'ve voted on</a>';
     }
     break;
+
   case 'torrents':
-    if ($Type != 'default') {
+    if ($Type !== 'default') {
       $TypeLinks[] = '<a href="comments.php?action=torrents' . $LinkID . '" class="brackets">Display comments you have made</a>';
     }
-    if ($Type != 'uploaded') {
+
+    if ($Type !== 'uploaded') {
       $TypeLinks[] = '<a href="comments.php?action=torrents' . $LinkID . '&amp;type=uploaded" class="brackets">Display comments left on your uploads</a>';
     }
     break;
@@ -250,12 +297,15 @@ if ($Count > 0) {
       case 'artist':
         $Header = " on <a href=\"artist.php?id=$PageID\">$Name</a>";
         break;
+
       case 'collages':
         $Header = " on <a href=\"collages.php?id=$PageID\">$Name</a>";
         break;
+
       case 'requests':
         $Header = ' on ' . Artists::display_artists($Artists[$PageID]) . " <a href=\"requests.php?action=view&id=$PageID\">$Name</a>";
         break;
+
       case 'torrents':
         $Header = ' on ' . Artists::display_artists($Artists[$PageID]) . " <a href=\"torrents.php?id=$PageID\">$Name</a>";
         break;
@@ -263,11 +313,10 @@ if ($Count > 0) {
     CommentsView::render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, false, $Header, false);
   }
 } else { ?>
-  <div class="center">No results.</div>
+  <h2 class="center">No results.</h2>
 <? } ?>
   <div class="linkbox">
     <?=$Pages?>
   </div>
 </div>
-<?
-View::show_footer();
+<? View::show_footer();

sections/comments/index.php

@@ -1,10 +1,12 @@
 <?
+declare(strict_types=1);
+
 enforce_login();
 
 // fix old links
-if ($_REQUEST['action'] == 'artists') {
+if ($_REQUEST['action'] === 'artists') {
   $_REQUEST['action'] = 'artist';
-} elseif ($_REQUEST['action'] == 'my_torrents') {
+} elseif ($_REQUEST['action'] === 'my_torrents') {
   $_REQUEST['action'] = 'torrents';
   $_REQUEST['type'] = 'uploaded';
 }
@@ -18,24 +20,31 @@ switch ($Action) {
   case 'take_post':
     require SERVER_ROOT . '/sections/comments/take_post.php';
     break;
+
   case 'take_edit':
     require SERVER_ROOT . '/sections/comments/take_edit.php';
     break;
+
   case 'take_delete':
     require SERVER_ROOT . '/sections/comments/take_delete.php';
     break;
+
   case 'warn':
     require SERVER_ROOT . '/sections/comments/warn.php';
     break;
+
   case 'take_warn':
     require SERVER_ROOT . '/sections/comments/take_warn.php';
     break;
+
   case 'get':
     require SERVER_ROOT . '/sections/comments/get.php';
     break;
+
   case 'jump':
     require SERVER_ROOT . '/sections/comments/jump.php';
     break;
+    
   case 'artist':
   case 'collages':
   case 'requests':

sections/donate/donate.php

@@ -55,7 +55,8 @@ View::show_header('Donate');
 
       <li>
         <strong>Domain.</strong>
-        The domain name is $15 per year.
+        The primary domain name (biotorrents.de) is $15 per year.
+        The secondary one (torrents.bio) is $80 per year.
         The TLS certificates are gratis.
       </li>
 
@@ -64,6 +65,19 @@ View::show_header('Donate');
         Omics Tools LLC is <?= $ENV->SITE_NAME ?>'s parent company.
         It's $50 per year for annual reports and $125 for resident agent services.
       </li>
+
+      <li>
+        <strong>Legal.</strong>
+        Registering a U.S. copyright agent is $6 per year.
+        The legal counsel is gratis.
+      </li>
+
+
+      <li>
+        <strong>Total.</strong>
+        Depending on the exchange rate, it costs about $350 per year to run <?= $ENV->SITE_NAME ?>.
+      </li>
+
     </ul>
   </div>
 

sections/forums/newthread.php

@@ -103,7 +103,7 @@ View::show_header(
       <input type="hidden" name="auth"
         value="<?=$LoggedUser['AuthKey']?>" />
       <input type="hidden" name="forum" value="<?=$ForumID?>" />
-      <table id="newthreadtext" class="layout">
+      <table id="newthreadtext" class="layout new_thread">
         <tr>
           <td class="label">Title</td>
           <td><input id="title" class="required" type="text" name="title" style="width: 98%;" /></td>
@@ -196,7 +196,7 @@ if (check_perms('forums_polls_create')) {
       <div id="buttons" class="center">
         <input type="button" value="Preview" onclick="Newthread_Preview(1);" id="newthreadpreviewbutton" />
         <input type="button" value="Editor" onclick="Newthread_Preview(0);" id="newthreadeditbutton" class="hidden" />
-        <input type="submit" class="submit" id="submit_button" value="Create" />
+        <input type="submit" class="submit button-primary" id="submit_button" value="Create" />
       </div>
     </form>
   </div>

sections/friends/friends.php

@@ -1,46 +1,43 @@
 <?php
 #declare(strict_types=1);
 
-/************************************************************************
-//------------// Main friends page //----------------------------------//
-This page lists a user's friends.
+/**
+ * Main friends page
+ * 
+ * This page lists a user's friends.
+ * There's no real point in caching this page.
+ * I doubt users load it that much.
+ */
 
-There's no real point in caching this page. I doubt users load it that
-much.
-************************************************************************/
+$ENV = ENV::go();
 
 // Number of users per page
 define('FRIENDS_PER_PAGE', '20');
-include_once(SERVER_ROOT.'/classes/paranoia.class.php');
-
-
+include_once "$ENV->SERVER_ROOT/classes/paranoia.class.php";
 
 View::show_header('Friends');
 
-
 $UserID = $LoggedUser['ID'];
-
-
 list($Page, $Limit) = Format::page_limit(FRIENDS_PER_PAGE);
 
 // Main query
 $DB->query("
   SELECT
     SQL_CALC_FOUND_ROWS
-    f.FriendID,
-    f.Comment,
-    m.Username,
-    m.Uploaded,
-    m.Downloaded,
-    m.PermissionID,
-    m.Paranoia,
-    m.LastAccess,
-    i.Avatar
-  FROM friends AS f
-    JOIN users_main AS m ON f.FriendID = m.ID
-    JOIN users_info AS i ON f.FriendID = i.UserID
-  WHERE f.UserID = '$UserID'
-  ORDER BY Username
+    f.`FriendID`,
+    f.`Comment`,
+    m.`Username`,
+    m.`Uploaded`,
+    m.`Downloaded`,
+    m.`PermissionID`,
+    m.`Paranoia`,
+    m.`LastAccess`,
+    i.`Avatar`
+  FROM `friends` AS f
+    JOIN `users_main` AS m ON f.`FriendID` = m.`ID`
+    JOIN `users_info` AS i ON f.`FriendID` = i.`UserID`
+  WHERE f.`UserID` = '$UserID'
+  ORDER BY `Username`
   LIMIT $Limit");
 $Friends = $DB->to_array(false, MYSQLI_BOTH, array(6, 'Paranoia'));
 
@@ -48,24 +45,26 @@ $Friends = $DB->to_array(false, MYSQLI_BOTH, array(6, 'Paranoia'));
 $DB->query('SELECT FOUND_ROWS()');
 list($Results) = $DB->next_record();
 
-// Start printing stuff
-?>
+// Start printing stuff ?>
+
 <div>
   <div class="header">
     <h2>Friends List</h2>
   </div>
+
   <div class="linkbox">
     <?php
 // Pagination
 $Pages = Format::get_pages($Page, $Results, FRIENDS_PER_PAGE, 9);
-echo $Pages;
-?>
+echo $Pages; ?>
   </div>
+
   <div class="box pad">
     <?php
-if ($Results == 0) {
+if ($Results === 0) {
     echo '<p>You have no friends! :(</p>';
 }
+
 // Start printing out friends
 foreach ($Friends as $Friend) {
     list($FriendID, $Comment, $Username, $Uploaded, $Downloaded, $Class, $Paranoia, $LastAccess, $Avatar) = $Friend; ?>
@@ -80,11 +79,13 @@ foreach ($Friends as $Friend) {
               &nbsp;Ratio: <strong><?=Format::get_ratio_html($Uploaded, $Downloaded)?></strong>
               <?php
   }
+
     if (check_paranoia('uploaded', $Paranoia, $Class, $FriendID)) {
         ?>
               &nbsp;Up: <strong><?=Format::get_size($Uploaded)?></strong>
               <?php
     }
+
     if (check_paranoia('downloaded', $Paranoia, $Class, $FriendID)) {
         ?>
               &nbsp;Down: <strong><?=Format::get_size($Downloaded)?></strong>
@@ -106,13 +107,23 @@ foreach ($Friends as $Friend) {
             <input type="hidden" name="friendid"
               value="<?=$FriendID?>" />
 
-            <textarea name="comment" rows="4"
-              cols="65"><?=$Comment?></textarea>
+            <textarea
+              name = "comment"
+              rows = "5"
+              cols = "50"
+              placeholder ="Your saved notes about this friend"
+              ><?=$Comment?></textarea>
           </td>
           <td class="left" valign="top">
-            <input type="submit" name="action" value="Update" /><br />
-            <input type="submit" name="action" value="Remove friend" /><br />
-            <input type="submit" name="action" value="Contact" /><br />
+          <p>
+            <input type="submit" name="action" value="Update" />
+            <input type="submit" name="action" value="Remove friend" />
+          </p>
+
+          <p>
+            <input type="submit" name="action" class="button-primary" value="Contact" />
+          </p>
+
           </td>
         </tr>
       </table>

sections/inbox/inbox.php

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

sections/login/login.php

@@ -1,6 +1,9 @@
 <?php
 declare(strict_types=1);
 
+$ENV = ENV::go();
+$Twig = Twig::go();
+
 View::show_header('Login'); ?>
 
 <p class="center mouseless">
@@ -36,18 +39,27 @@ if (!$Banned) { ?>
   </aside>
   <?php } ?>
 
-  <table>
+  <br />
+  <table class="login_form">
     <tr>
       <td colspan="2">
         <input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" name="username"
           id="username" class="inputtext" required="required" maxlength="20" pattern="[A-Za-z0-9_?]{1,20}"
-          autofocus="autofocus" placeholder="Username" size="40" autocomplete="username" />
+          autofocus="autofocus" placeholder="Username" size="35" autocomplete="username" />
       </td>
     </tr>
 
     <tr>
       <td>
-        <?= Input::passphrase() ?>
+        <?=
+        $Twig->render('input/passphrase.html', [
+          'name' => 'password',
+          'id' => 'password',
+          'placeholder' => 'Passphrase',
+          'pw_min' => $ENV->PW_MIN,
+          'pw_max' => $ENV->PW_MAX,
+          'advice' => false,
+        ]) ?>
       </td>
 
       <td>
@@ -58,9 +70,15 @@ if (!$Banned) { ?>
     </tr>
 
     <tr>
-      <td colspan="2">
-        <input type="submit" name="login" value="Log In" class="submit" />
+      <td colspan="4">
+        <input type="submit" name="login" value="Log In" class="submit button-primary" />
+
+        <?php if ($ENV->OPEN_REGISTRATION) { ?>
+          &ensp;
+          <a href="/register.php" class="button">Register</a>
+          <?php } ?>
       </td>
+
     </tr>
   </table>
 </form>
@@ -76,8 +94,8 @@ else { ?>
 
 if ($Attempts > 0) { ?>
 <p class="center">
-  Forgot your password?
-  <a href="login.php?act=recover" class="tooltip" title="Recover your password">Reset it here!</a>
+  Forgot your passphrase?
+  <a href="login.php?act=recover" class="tooltip" title="Recover your passphrase">Reset it here!</a>
 </p>
 
 <?php

sections/login/recover_step2.php

@@ -2,8 +2,9 @@
 declare(strict_types=1);
 
 $ENV = ENV::go();
-View::show_header('Recover Password', 'validate,password_validate');
+$Twig = Twig::go();
 
+View::show_header('Recover Password', 'validate,password_validate');
 echo '<h2>Reset your password</h2>';
 
 if (empty($PassWasReset)) {
@@ -22,11 +23,12 @@ if (empty($PassWasReset)) {
       </td>
 
       <td>
-        <?= Input::passphrase($Name = 'password', $ID='new_pass_1', $Placeholder = 'New passphrase') ?>
-        <!--
-        <input type="password" minlength="15" name="password" id="new_pass_1" class="inputtext" size="40"
-          placeholder="New Password" pattern=".{15,307200}" required style="width: 250px !important;">
-        -->
+        <?=
+        $Twig->render('input/passphrase.html', [
+          'name' => 'password',
+          'id' => 'new_pass_1',
+          'placeholder' => 'New passphrase'
+        ]) ?>
       </td>
     </tr>
 
@@ -35,11 +37,12 @@ if (empty($PassWasReset)) {
         <strong id="pass_match"></strong>
       </td>
       <td>
-        <?= Input::passphrase($Name = 'verifypassword', $ID='new_pass_2', $Placeholder = 'Confirm passphrase') ?>
-        <!--
-        <input type="password" minlength="15" name="verifypassword" id="new_pass_2" class="inputtext" size="40"
-          placeholder="Confirm Password" pattern=".{15,307200}" required style="width: 250px !important;">
-        -->
+      <?=
+        $Twig->render('input/passphrase.html', [
+          'name' => 'verifypassword',
+          'id' => 'new_pass_2',
+          'placeholder' => 'Confirm passphrase'
+        ]) ?>
       </td>
     </tr>
 

sections/register/step1.php

@@ -39,6 +39,7 @@ if (empty($Sent)) { ?>
           <strong>Don't choose one associated with your real name.</strong>
           If you do, we won't be changing it for you.
         </p>
+        <br />
 
         <input type="text" name="username" id="username" class="inputtext" placeholder="Username"
           value="<?=(!empty($_REQUEST['username']) ? display_str($_REQUEST['username']) : '')?>" />
@@ -96,7 +97,7 @@ if (empty($Sent)) { ?>
     </tr>
 
     <tr>
-      <td colspan="2" align="right"><input type="submit" name="submit" value="Submit" class="submit" /></td>
+      <td colspan="2" align="right"><input type="submit" name="submit" value="Submit" class="submit button-primary" /></td>
     </tr>
   </table>
 </form>

sections/reportsv2/report.php

@@ -1,12 +1,14 @@
 <?php
 #declare(strict_types=1);
 
-/*
+/**
  * This is the frontend of reporting a torrent, it's what users see when
  * they visit reportsv2.php?id=xxx
  */
 
-include(SERVER_ROOT.'/sections/torrents/functions.php');
+$ENV = ENV::go();
+
+require_once "$ENV->SERVER_ROOT/sections/torrents/functions.php";
 
 // If we're not coming from torrents.php, check we're being returned because of an error.
 if (!isset($_GET['id']) || !is_number($_GET['id'])) {
@@ -16,11 +18,11 @@ if (!isset($_GET['id']) || !is_number($_GET['id'])) {
 } else {
     $TorrentID = $_GET['id'];
     $DB->query("
-    SELECT tg.CategoryID, t.GroupID, u.Username
-    FROM torrents_group AS tg
-      LEFT JOIN torrents AS t ON t.GroupID = tg.ID
-      LEFT JOIN users_main AS u ON t.UserID = u.ID
-    WHERE t.ID = " . $_GET['id']);
+    SELECT tg.`category_id`, t.`GroupID`, u.`Username`
+    FROM `torrents_group` AS tg
+      LEFT JOIN `torrents` AS t ON t.`GroupID` = tg.`id`
+      LEFT JOIN `users_main` AS u ON t.`UserID` = u.`ID`
+    WHERE t.`ID` = " . $_GET['id']);
     list($CategoryID, $GroupID, $Username) = $DB->next_record();
     $Artists = Artists::get_artist($GroupID);
     $TorrentCache = get_group_info($GroupID, true);
@@ -137,7 +139,7 @@ View::show_header('Report', 'reportsv2,browse,torrent,bbcode,recommend');
 
       <div id="dynamic_form">
 <?php
-        /*
+        /**
          * THIS IS WHERE SEXY AJAX COMES IN
          * The following malarky is needed so that if you get sent back here, the fields are filled in.
          */
@@ -149,8 +151,7 @@ View::show_header('Report', 'reportsv2,browse,torrent,bbcode,recommend');
         <input id="extra" type="hidden" name="extra" value="<?=(!empty($_POST['extra']) ? display_str($_POST['extra']) : '')?>" />
       </div>
     </div>
-  <input type="submit" value="Report" />
+  <input type="submit" class="button-primary" value="Report" />
   </form>
 </div>
-<?php
-View::show_footer();
+<?php View::show_footer();

sections/reportsv2/takereport.php

@@ -1,5 +1,6 @@
 <?
-/*
+
+/**
  * This page handles the backend from when a user submits a report.
  * It checks for (in order):
  * 1. The usual POST injections, then checks that things.
@@ -56,8 +57,6 @@ if (!empty($_POST['sitelink'])) {
   } else {
     $Err = 'The permalink was incorrect. It should look like '.site_url().'torrents.php?torrentid=12345';
   }
-} else {
-  $ExtraIDs = '';
 }
 
 if (!empty($_POST['link'])) {
@@ -108,7 +107,7 @@ if (!$DB->has_results()) {
 list($GroupID) = $DB->next_record();
 
 if (!empty($Err)) {
-  error($Err);
+  error($Error = $Err, $Debug = false);
   include(SERVER_ROOT.'/sections/reportsv2/report.php');
   error();
 }

sections/requests/new_edit.php

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

sections/requests/request.php

@@ -244,7 +244,7 @@ $encoded_artist = urlencode($encoded_artist);
     <div class="box">
       <div class="head"><strong>Info</strong></div>
       <div class="pad">
-        <table class="layout">
+        <table class="layout request_form">
           <tr>
             <td class="label">Created</td>
             <td>
@@ -318,16 +318,16 @@ $encoded_artist = urlencode($encoded_artist);
           <tr id="voting">
             <td class="label">Custom Vote</td>
             <td>
-              These units are in base 2, not base 10, e.g., there are 1,024 MiB in 1 GiB
+              These units are in base 2, not base 10, e.g., there are 1,024 MiB in 1 GiB.
+              <strong>The system deducts <?= ($RequestTax * 100) ?>% as tax.</strong>
+              <br />
+
               <input type="text" id="amount_box" size="8" onchange="Calculate();" />
               <select id="unit" name="unit" onchange="Calculate();">
                 <option value="mb">MiB</option>
                 <option value="gb">GiB</option>
               </select>
               <input type="button" value="Preview" onclick="Calculate();" />
-              <strong>The system deducts <?= ($RequestTax * 100) ?>%
-                as tax</strong>
-
             </td>
           </tr>
           <tr>
@@ -361,7 +361,7 @@ $encoded_artist = urlencode($encoded_artist);
                   <li><strong>Ratio:</strong> <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span>
                   </li>
                 </ul>
-                <input type="button" id="button" value="Vote!" disabled="disabled" onclick="Vote();" />
+                <input type="button" id="button" value="Vote!" class="button-primary" disabled="disabled" onclick="Vote();" />
               </form>
             </td>
           </tr>
@@ -413,7 +413,7 @@ $encoded_artist = urlencode($encoded_artist);
                 </div>
                 <?php } ?>
                 <div class="submit_div">
-                  <input type="submit" value="Fill" />
+                  <input type="submit" class="button-primary" value="Fill" />
                 </div>
               </form>
             </td>

sections/requests/requests.php

@@ -359,7 +359,7 @@ View::show_header($Title, 'requests');
             value="<?=$_GET['userid']?>" />
         <?php } ?>
         <div class="box pad">
-            <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
+            <table cellpadding="6" cellspacing="1" border="0" class="layout torrent_requests" width="100%">
 
                 <tr id="search_terms">
                     <td class="label">
@@ -443,7 +443,7 @@ View::show_header($Title, 'requests');
             <table class="layout">
                 <tr>
                     <td colspan="2" class="center">
-                        <input type="submit" value="Search" />
+                        <input type="submit" class="button-primary" value="Search" />
                     </td>
                 </tr>
             </table>
@@ -456,37 +456,37 @@ View::show_header($Title, 'requests');
     <?php } ?>
     <table id="request_table" class="request_table border" cellpadding="6" cellspacing="1" border="0" width="100%">
         <tr class="colhead_dark">
-            <td class="small cats_col"></td>
-            <td style="width: 38%;" class="nobr">
+            <th class="small cats_col"></th>
+            <th style="width: 38%;" class="nobr">
                 <strong>Request Name</strong>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=votes&amp;sort=<?=($OrderBy === 'votes' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Votes</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=bounty&amp;sort=<?=($OrderBy === 'bounty' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Bounty</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=filled&amp;sort=<?=($OrderBy === 'filled' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Filled</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <strong>Filled by</strong>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <strong>Requested by</strong>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=created&amp;sort=<?=($OrderBy === 'created' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Created</strong></a>
-            </td>
-            <td class="nobr">
+            </th>
+            <th class="nobr">
                 <a
                     href="?order=lastvote&amp;sort=<?=($OrderBy === 'lastvote' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Last
                         vote</strong></a>
-            </td>
+            </th>
         </tr>
         <?php
     if ($NumResults === 0) {

sections/rules/clients.php

@@ -34,7 +34,7 @@ if (!$WhitelistedClients = $Cache->get_value('whitelisted_clients')) {
   </p>
   <br />
 
-  <table>
+  <table class="clients_table">
     <tr class="colhead">
       <td>
         <strong>Allowed Clients</strong>

sections/tools/tools.php

@@ -53,7 +53,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Administration</td>
         </tr>
@@ -72,7 +72,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Announcements</td>
         </tr>
@@ -89,7 +89,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Community</td>
         </tr>
@@ -107,7 +107,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Finances</td>
         </tr>
@@ -130,7 +130,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Queue</td>
         </tr>
@@ -149,7 +149,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Managers</td>
         </tr>
@@ -171,7 +171,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Development</td>
         </tr>
@@ -200,7 +200,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Site Information</td>
         </tr>
@@ -224,7 +224,7 @@ View::show_header('Staff Tools');
   if ($ToolsHTML) {
       ?>
     <div class="permission_subcontainer">
-      <table class="layout">
+      <table class="layout admin_tools">
         <tr class="colhead">
           <td>Torrents</td>
         </tr>

sections/top10/donors.php

@@ -65,7 +65,7 @@ function generate_user_table($Caption, $Results, $Limit)
     </small>
   </h3>
 
-  <table class="border">
+  <table class="border top10_table">
     <tr class="colhead">
       <td class="center">Position</td>
       <td>User</td>

sections/top10/tags.php

@@ -108,7 +108,7 @@ function generate_tag_table($Caption, $Tag, $Details, $Limit, $RequestsTable = f
     </small>
   </h3>
 
-  <table class="border">
+  <table class="border top10_table">
     <tr class="colhead">
       <td class="center">Rank</td>
       <td>Tag</td>

sections/top10/torrents.php

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

sections/top10/users.php

@@ -130,7 +130,7 @@ function generate_user_table($Caption, $Tag, $Details, $Limit)
       <?php } ?>
     </small>
   </h3>
-  <table class="border">
+  <table class="border top10_table">
     <tr class="colhead">
       <td class="center">Rank</td>
       <td>User</td>

sections/torrents/browse.php

@@ -195,7 +195,7 @@ View::show_header('Browse Torrents', 'browse');
         <?php
         } ?>
 
-        <table class="layout">
+        <table class="layout torrent_search">
           <tr id="numbers" class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
               <!--
@@ -607,17 +607,25 @@ View::show_header('Browse Torrents', 'browse');
           </tr>
         </table>
 
-        <!-- Result count and submit button -->
+        <!-- Result count, submit, and reset -->
         <div class="submit ft_submit">
-          <span class="float_left"><?=number_format($NumResults)?>
-            Results</span>
-          <input type="submit" value="Search" />
+          <span class="float_left">
+            <?=number_format($NumResults)?>
+            Results
+          </span>
+
+          <input type="submit" value="Search" class="button-primary"/>
+
           <input type="hidden" name="action" id="ft_type"
             value="<?=($AdvancedSearch ? 'advanced' : 'basic')?>" />
+
           <input type="hidden" name="searchsubmit" value="1" />
+
           <input type="button" value="Reset" <input type="button" value="Reset"
             onclick="window.location.href = 'torrents.php<?php if (isset($_GET['action']) && $_GET['action'] === 'advanced') { ?>?action=advanced<?php } ?>'" />
+
           &emsp;
+
           <?php if ($Search->has_filters()) { ?>
           <input type="submit" name="setdefault" value="Make Default" />
           <?php }

sections/torrents/details.php

@@ -322,7 +322,7 @@ $Index++;
             value="<?=$GroupID?>" />
           <input type="text" id="artist" name="artistname[]" <?php Users::has_autocomplete_enabled('other'); ?>
           />
-          <input type="submit" value="Add" />
+          <input type="submit" class="button-primary" value="Add" />
         </form>
       </div>
     </div>
@@ -396,7 +396,7 @@ $Index++;
             value="<?=$GroupID?>" />
           <input type="text" name="tagname" id="tagname" <?php Users::has_autocomplete_enabled('other'); ?>
           />
-          <input type="submit" value="Add" />
+          <input type="submit" class="button-primary" value="Add" />
         </form>
         <br />
         <strong><a href="rules.php?p=tag" class="brackets">View tagging rules</a></strong>
@@ -413,16 +413,16 @@ $Index++;
         class="torrent_table details<?=$GroupFlags['IsSnatched'] ? ' snatched' : ''?>"
         id="torrent_details">
         <tr class="colhead_dark">
-          <td width="80%"><strong>Torrents</strong></td>
-          <td><strong>Size</strong></td>
-          <td class="sign snatches">
+          <th width="80%"><strong>Torrents</strong></th>
+          <th><strong>Size</strong></th>
+          <th class="sign snatches">
             ↻
-          <td class="sign seeders">
+          <th class="sign seeders">
             &uarr;
-          </td>
-          <td class="sign leechers">
+          </th>
+          <th class="sign leechers">
             &darr;
-          </td>
+          </th>
         </tr>
         <?php
 function filelist($Str)
@@ -851,7 +851,7 @@ if (count($Collages) > 0) {
     <div class="box">
       <table class="collage_table" id="collages">
         <tr class="colhead">
-          <td width="75%"><a href="#">&uarr;</a>&nbsp;This content is in <?=number_format(count($Collages))?> collection<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?>
+          <td width="85%"><a href="#">&uarr;</a>&nbsp;This content is in <?=number_format(count($Collages))?> collection<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?>
           </td>
           <td># torrents</td>
         </tr>

sections/torrents/user.php

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

sections/upload/index.php

@@ -3,11 +3,11 @@ declare(strict_types=1);
 
 enforce_login();
 if (!check_perms('site_upload')) {
-    error(403);
+    error('Please read the site wiki for information on how to become a Member and gain upload privileges.', $Debug = false);
 }
 
 if ($LoggedUser['DisableUpload']) {
-    error('Your upload privileges have been revoked.');
+    error('Your upload privileges have been revoked.', $Debug = false);
 }
 
 // Build the page

sections/user/notify_edit.php

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

sections/user/user.php

@@ -1514,7 +1514,7 @@ if (!$DisablePoints) {
       <?php } ?>
     </table>
     <?php if (check_perms('users_disable_any')) { ?>
-    <table class="layout box">
+    <table class="layout box" id="user_lock_account">
       <tr class="colhead">
         <td colspan="2">
           Lock Account
@@ -1703,7 +1703,7 @@ if (!$DisablePoints) {
 
       <tr>
         <td align="right" colspan="2">
-          <input type="submit" value="Save changes" />
+          <input type="submit" class="button-primary" value="Save changes" />
         </td>
       </tr>
     </table>

sections/userhistory/subscriptions.php

@@ -1,7 +1,7 @@
 <?php
 #declare(strict_types=1);
 
-/*
+/**
  * User subscription page
  */
 
@@ -38,54 +38,54 @@ $ShowCollapsed = (!isset($_GET['collapse']) && !isset($HeavyInfo['SubscriptionsC
 $DB->query("
   (SELECT
     SQL_CALC_FOUND_ROWS
-    s.Page,
-    s.PageID,
-    lr.PostID,
+    s.`Page`,
+    s.`PageID`,
+    lr.`PostID`,
     null AS ForumID,
     null AS ForumName,
-    IF(s.Page = 'artist', a.Name, co.Name) AS Name,
-    c.ID AS LastPost,
-    c.AddedTime AS LastPostTime,
-    c_lr.Body AS LastReadBody,
-    c_lr.EditedTime AS LastReadEditedTime,
-    um.ID AS LastReadUserID,
-    um.Username AS LastReadUsername,
-    ui.Avatar AS LastReadAvatar,
-    c_lr.EditedUserID AS LastReadEditedUserID
-  FROM users_subscriptions_comments AS s
-    LEFT JOIN users_comments_last_read AS lr ON lr.UserID = $LoggedUser[ID] AND lr.Page = s.Page AND lr.PageID = s.PageID
-    LEFT JOIN artists_group AS a ON s.Page = 'artist' AND a.ArtistID = s.PageID
-    LEFT JOIN collages AS co ON s.Page = 'collages' AND co.ID = s.PageID
-    LEFT JOIN comments AS c ON c.ID = (
-          SELECT MAX(ID)
-          FROM comments
-          WHERE Page = s.Page
-            AND PageID = s.PageID
+    IF(s.`Page` = 'artist', a.`Name`, co.`Name`) AS Name,
+    c.`ID` AS LastPost,
+    c.`AddedTime` AS LastPostTime,
+    c_lr.`Body` AS LastReadBody,
+    c_lr.`EditedTime` AS LastReadEditedTime,
+    um.`ID` AS LastReadUserID,
+    um.`Username` AS LastReadUsername,
+    ui.`Avatar` AS LastReadAvatar,
+    c_lr.`EditedUserID` AS LastReadEditedUserID
+  FROM `users_subscriptions_comments` AS s
+    LEFT JOIN `users_comments_last_read` AS lr ON lr.`UserID` = $LoggedUser[ID] AND lr.`Page` = s.`Page` AND lr.`PageID` = s.`PageID`
+    LEFT JOIN `artists_group` AS a ON s.`Page` = 'artist' AND a.`ArtistID` = s.`PageID`
+    LEFT JOIN `collages` AS co ON s.`Page` = 'collages' AND co.`ID` = s.`PageID`
+    LEFT JOIN `comments` AS c ON c.`ID` = (
+          SELECT MAX(`ID`)
+          FROM `comments`
+          WHERE `Page` = s.`Page`
+            AND `PageID` = s.`PageID`
         )
-    LEFT JOIN comments AS c_lr ON c_lr.ID = lr.PostID
-    LEFT JOIN users_main AS um ON um.ID = c_lr.AuthorID
-    LEFT JOIN users_info AS ui ON ui.UserID = um.ID
-  WHERE s.UserID = $LoggedUser[ID] AND s.Page IN ('artist', 'collages', 'requests', 'torrents') AND (s.Page != 'collages' OR co.Deleted = '0')" . ($ShowUnread ? ' AND c.ID > IF(lr.PostID IS NULL, 0, lr.PostID)' : '') . "
-  GROUP BY s.PageID)
+    LEFT JOIN `comments` AS c_lr ON c_lr.`ID` = lr.`PostID`
+    LEFT JOIN `users_main` AS um ON um.`ID` = c_lr.`AuthorID`
+    LEFT JOIN `users_info` AS ui ON ui.`UserID` = um.`ID`
+  WHERE s.`UserID` = $LoggedUser[ID] AND s.`Page` IN ('artist', 'collages', 'requests', 'torrents') AND (s.`Page` != 'collages' OR co.`Deleted` = '0')" . ($ShowUnread ? ' AND c.`ID` > IF(lr.`PostID` IS NULL, 0, lr.`PostID`)' : '') . "
+  GROUP BY s.`PageID`)
   UNION ALL
-  (SELECT 'forums', s.TopicID, lr.PostID, f.ID, f.Name, t.Title, p.ID, p.AddedTime, p_lr.Body, p_lr.EditedTime, um.ID, um.Username, ui.Avatar, p_lr.EditedUserID
-  FROM users_subscriptions AS s
-    LEFT JOIN forums_last_read_topics AS lr ON lr.UserID = $LoggedUser[ID] AND s.TopicID = lr.TopicID
-    LEFT JOIN forums_topics AS t ON t.ID = s.TopicID
-    LEFT JOIN forums AS f ON f.ID = t.ForumID
-    LEFT JOIN forums_posts AS p ON p.ID = (
-          SELECT MAX(ID)
-          FROM forums_posts
-          WHERE TopicID = s.TopicID
+  (SELECT 'forums', s.`TopicID`, lr.`PostID`, f.`ID`, f.`Name`, t.`Title`, p.`ID`, p.`AddedTime`, p_lr.`Body`, p_lr.`EditedTime`, um.`ID`, um.`Username`, ui.`Avatar`, p_lr.`EditedUserID`
+  FROM `users_subscriptions` AS s
+    LEFT JOIN `forums_last_read_topics` AS lr ON lr.`UserID` = $LoggedUser[ID] AND s.`TopicID` = lr.`TopicID`
+    LEFT JOIN `forums_topics` AS t ON t.`ID` = s.`TopicID`
+    LEFT JOIN `forums` AS f ON f.`ID` = t.`ForumID`
+    LEFT JOIN `forums_posts` AS p ON p.`ID` = (
+          SELECT MAX(`ID`)
+          FROM `forums_posts`
+          WHERE `TopicID` = s.`TopicID`
         )
-    LEFT JOIN forums_posts AS p_lr ON p_lr.ID = lr.PostID
-    LEFT JOIN users_main AS um ON um.ID = p_lr.AuthorID
-    LEFT JOIN users_info AS ui ON ui.UserID = um.ID
-  WHERE s.UserID = $LoggedUser[ID]" .
-    ($ShowUnread ? " AND p.ID > IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", p.ID, IF(lr.PostID IS NULL, 0, lr.PostID))" : '') .
+    LEFT JOIN `forums_posts` AS p_lr ON p_lr.`ID` = lr.`PostID`
+    LEFT JOIN `users_main` AS um ON um.`ID` = p_lr.`AuthorID`
+    LEFT JOIN `users_info` AS ui ON ui.`UserID` = um.`ID`
+  WHERE s.`UserID` = $LoggedUser[ID]" .
+    ($ShowUnread ? " AND p.`ID` > IF(t.`IsLocked` = '1' AND t.`IsSticky` = '0'" . ", p.`ID`, IF(lr.`PostID` IS NULL, 0, lr.`PostID`))" : '') .
     ' AND ' . Forums::user_forums_sql() . "
-  GROUP BY t.ID)
-  ORDER BY LastPostTime DESC
+  GROUP BY t.`ID`)
+  ORDER BY `LastPostTime` DESC
   LIMIT $Limit");
 
 $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
@@ -162,41 +162,44 @@ if (!$NumResults) {
         $Links = 'Artist: <a href="artist.php?id=' . $Result['PageID'] . '">' . display_str($Result['Name']) . '</a>';
         $JumpLink = 'artist.php?id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
+
+
       case 'collages':
         $Links = 'Collage: <a href="collages.php?id=' . $Result['PageID'] . '">' . display_str($Result['Name']) . '</a>';
         $JumpLink = 'collages.php?action=comments&collageid=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
+
+
       case 'requests':
         if (!isset($Requests[$Result['PageID']])) {
             continue;
         }
+
         $Request = $Requests[$Result['PageID']];
         $CategoryName = $Categories[$CategoryID - 1];
 
         $Links = 'Request: ';
-        /*
-        if ($CategoryName == 'Music' || $CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') {
-            $Links .= ($CategoryName == 'Music' ? Artists::display_artists(Requests::get_artists($Result['PageID'])) : '') . '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '" dir="ltr">' . $Request['Title'] . " [" . $Request['Year'] . "]</a>";
-        } else {
-          */
             $Links .= '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '">' . $Request['Title'] . "</a>";
-        #} # else
         $JumpLink = 'requests.php?action=view&amp;id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
+
+
       case 'torrents':
         if (!isset($TorrentGroups[$Result['PageID']])) {
             continue;
         }
+
         $GroupInfo = $TorrentGroups[$Result['PageID']];
-        $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '<a href="torrents.php?id=' . $GroupInfo['ID'] . '" dir="ltr">' . $GroupInfo['Name'] . '</a>';
-        if ($GroupInfo['Year'] > 0) {
-            $Links .= " [" . $GroupInfo['Year'] . "]";
-        }
-        if ($GroupInfo['ReleaseType'] > 0) {
-            $Links .= " [" . $ReleaseTypes[$GroupInfo['ReleaseType']] . "]";
+        $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '<a href="torrents.php?id=' . $GroupInfo['id'] . '" dir="ltr">' . $GroupInfo['title'] . '</a>';
+       
+        if ($GroupInfo['year'] > 0) {
+            $Links .= " [" . $GroupInfo['year'] . "]";
         }
+
         $JumpLink = 'torrents.php?id=' . $GroupInfo['ID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
+
+
       case 'forums':
         $Links = 'Forums: <a href="forums.php?action=viewforum&amp;forumid=' . $Result['ForumID'] . '">' . display_str($Result['ForumName']) . '</a> &gt; ' .
           '<a href="forums.php?action=viewthread&amp;threadid=' . $Result['PageID'] .
@@ -205,6 +208,7 @@ if (!$NumResults) {
           '</a>';
         $JumpLink = 'forums.php?action=viewthread&amp;threadid=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
+
       default:
         error(0);
     } ?>

sections/wiki/article.php

@@ -83,7 +83,7 @@ View::show_header($Title, 'wiki,bbcode');
         <form class="search_form" name="articles" action="wiki.php" method="get">
           <input type="hidden" name="action" value="search" />
           <input type="search" placeholder="Search articles" name="search" size="20" />
-          <input value="Search" type="submit" class="hidden" />
+          <input value="Search" type="submit" class="hidden button-primary" />
         </form>
 
         <br style="line-height: 10px;" />

sections/wiki/wiki_browse.php

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

static/functions/upload.js

@@ -1,136 +1,163 @@
 /**
  * Categories
- * 
+ *
  * Toggle category metadata.
  * Displays dynamic selects on upload.php.
  * These change with each category.
  */
 function Categories() {
   let def = [
-    'javdb', // Accession Number
-    'audio', // Version
-    'title', // Torrent Title
-    'title_rj', // Organism
-    'title_jp', // Strain/Variety
-    'artists', // Authors(s)
-    'studio', // Department/Lab
-    'series', // Location
-    'year', // Year
-    'codec', // License
+    "javdb", // Accession Number
+    "audio", // Version
+    "title", // Torrent Title
+    "title_rj", // Organism
+    "title_jp", // Strain/Variety
+    "artists", // Authors(s)
+    "studio", // Department/Lab
+    "series", // Location
+    "year", // Year
+    "codec", // License
     // Platform *changes below*
-    'resolution', // Scope *changes below*
+    "resolution", // Scope *changes below*
     // Format *changes below*
-    'archive', // Archive
-    'tags', // Tags
-    'cover', // Picture
-    'mirrors', // Mirrors
-    'screenshots', // Publications
-    'group_desc', // Torrent Group Description
-    'release_desc', // Torrent Description
-    'censored', // Aligned/Annotated
-    'anon', // Upload Anonymously
-  ]
+    "archive", // Archive
+    "tags", // Tags
+    "cover", // Picture
+    "mirrors", // Mirrors
+    "screenshots", // Publications
+    //'seqhash', // Seqhash
+    "group_desc", // Torrent Group Description
+    "release_desc", // Torrent Description
+    "censored", // Aligned/Annotated
+    "anon", // Upload Anonymously
+  ];
 
   let cats = [
-    { // Sequences
-      'media': {}, // Platform
-      'container': {}, // Format
+    {
+      // Sequences
+      media: {}, // Platform
+      container: {}, // Format
+      seqhash: {}, // Seqhash
     },
-    { // Graphs
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Graphs
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Systems
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Systems
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Geometric
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Geometric
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Scalars/Vectors
-      'media_scalars_vectors': {}, // Platform
-      'container_scalars_vectors': {}, // Format
+    {
+      // Scalars/Vectors
+      media_scalars_vectors: {}, // Platform
+      container_scalars_vectors: {}, // Format
     },
-    { // Patterns
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Patterns
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Constraints
-      'media_graphs': {}, // Platform
-      'container_graphs': {}, // Format
+    {
+      // Constraints
+      media_graphs: {}, // Platform
+      container_graphs: {}, // Format
     },
-    { // Images
-      'media_images': {}, // Platform
-      'container_images': {}, // Format
+    {
+      // Images
+      media_images: {}, // Platform
+      container_images: {}, // Format
     },
-    { // Spatial
-      'media_graphs': {}, // Platform
-      'container_spatial': {}, // Format
+    {
+      // Spatial
+      media_graphs: {}, // Platform
+      container_spatial: {}, // Format
     },
-    { // Models
-      'media_graphs': {}, // Platform
-      'container_spatial': {}, // Format
+    {
+      // Models
+      media_graphs: {}, // Platform
+      container_spatial: {}, // Format
     },
-    { // Documents
-      'media_documents': {}, // Platform
-      'container_documents': {}, // Format
+    {
+      // Documents
+      media_documents: {}, // Platform
+      container_documents: {}, // Format
     },
-    { // Machine Data
-      'media_machine_data': {}, // Platform
-      'container': {}, // Format
+    {
+      // Machine Data
+      media_machine_data: {}, // Platform
+      container: {}, // Format
     },
-  ]
-
-  let active = {}
-  for (let field of def) active[field] = {}
-
-  let category = 0
-  if ($('input[name="type"]').raw()) category = $('input[name="type"]').raw().value
-  if ($('#categories').raw()) category = $('#categories').raw().value
-  active = Object.assign(active, cats[category])
-
-  let hide = el => {
-    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
-    $(el).ghide()
-  }
-
-  let show = el => {
-    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
-    $(el).gshow()
-  }
-
-  let trs = $('#dynamic_form tr')
+  ];
+
+  let active = {};
+  for (let field of def) active[field] = {};
+
+  let category = 0;
+  if ($('input[name="type"]').raw())
+    category = $('input[name="type"]').raw().value;
+  if ($("#categories").raw()) category = $("#categories").raw().value;
+  active = Object.assign(active, cats[category]);
+
+  let hide = (el) => {
+    Array.from(
+      $(`#${el.id} input, #${el.id} select, #${el.id} textarea`)
+    ).forEach((inp) => (inp.disabled = true));
+    $(el).ghide();
+  };
+
+  let show = (el) => {
+    Array.from(
+      $(`#${el.id} input, #${el.id} select, #${el.id} textarea`)
+    ).forEach((inp) => (inp.disabled = false));
+    $(el).gshow();
+  };
+
+  let trs = $("#dynamic_form tr");
   for (let tr of trs) {
-    let field = tr.id.slice(0, -3)
+    let field = tr.id.slice(0, -3);
     if (active[field]) {
       if (active[field].name) {
-        tr.children[0].innerHTML = active[field].name
+        tr.children[0].innerHTML = active[field].name;
       }
 
-      let notes = $(`#${tr.id} p.notes`).raw()
-      if (notes) notes.innerHTML = active[field].notes || ''
-      show(tr)
+      let notes = $(`#${tr.id} p.notes`).raw();
+      if (notes) notes.innerHTML = active[field].notes || "";
+      show(tr);
     } else {
-      hide(tr)
+      hide(tr);
     }
   }
 }
 
-
 /**
  * add_tag
  */
 function add_tag() {
-  if ($('#tags').raw().value == "") {
-    $('#tags').raw().value = $('#genre_tags').raw().options[$('#genre_tags').raw().selectedIndex].value;
-  } else if ($('#genre_tags').raw().options[$('#genre_tags').raw().selectedIndex].value == '---') {
+  if ($("#tags").raw().value == "") {
+    $("#tags").raw().value =
+      $("#genre_tags").raw().options[
+        $("#genre_tags").raw().selectedIndex
+      ].value;
+  } else if (
+    $("#genre_tags").raw().options[$("#genre_tags").raw().selectedIndex]
+      .value == "---"
+  ) {
   } else {
-    $('#tags').raw().value = $('#tags').raw().value + ', ' + $('#genre_tags').raw().options[$('#genre_tags').raw().selectedIndex].value;
+    $("#tags").raw().value =
+      $("#tags").raw().value +
+      ", " +
+      $("#genre_tags").raw().options[$("#genre_tags").raw().selectedIndex]
+        .value;
   }
 }
 
-
 /**
  * AddLogField
  */
@@ -146,13 +173,12 @@ function AddLogField() {
   LogField.name = "logfiles[]";
   LogField.size = 50;
 
-  var x = $('#logfields').raw();
+  var x = $("#logfields").raw();
   x.appendChild(document.createElement("br"));
   x.appendChild(LogField);
   LogCount++;
 }
 
-
 /**
  * RemoveLogField
  */
@@ -161,14 +187,13 @@ function RemoveLogField() {
     return;
   }
 
-  var x = $('#logfields').raw();
+  var x = $("#logfields").raw();
   for (i = 0; i < 2; i++) {
     x.removeChild(x.lastChild);
   }
   LogCount--;
 }
 
-
 /**
  * AddExtraLogField
  */
@@ -184,13 +209,12 @@ function AddExtraLogField(id) {
   LogField.name = "logfiles_" + id + "[]";
   LogField.size = 50;
 
-  var x = $('#logfields_' + id).raw();
+  var x = $("#logfields_" + id).raw();
   x.appendChild(document.createElement("br"));
   x.appendChild(LogField);
   LogCount++;
 }
 
-
 /**
  * RemoveLogField
  */
@@ -199,14 +223,13 @@ function RemoveLogField() {
     return;
   }
 
-  var x = $('#logfields').raw();
+  var x = $("#logfields").raw();
   for (i = 0; i < 2; i++) {
     x.removeChild(x.lastChild);
   }
   LogCount--;
 }
 
-
 /**
  * AddFormat
  */
@@ -217,11 +240,14 @@ function AddFormat() {
   }
 
   FormatCount++;
-  $('#extras').raw().value = FormatCount;
+  $("#extras").raw().value = FormatCount;
 
   var NewRow = document.createElement("tr");
   NewRow.id = "new_torrent_row" + FormatCount;
-  NewRow.setAttribute("style", "border-top-width: 5px; border-left-width: 5px; border-right-width: 5px;");
+  NewRow.setAttribute(
+    "style",
+    "border-top-width: 5px; border-left-width: 5px; border-right-width: 5px;"
+  );
 
   var NewCell1 = document.createElement("td");
   NewCell1.setAttribute("class", "label");
@@ -240,13 +266,17 @@ function AddFormat() {
 
   NewRow = document.createElement("tr");
   NewRow.id = "new_format_row" + FormatCount;
-  NewRow.setAttribute("style", "border-left-width: 5px; border-right-width: 5px;");
+  NewRow.setAttribute(
+    "style",
+    "border-left-width: 5px; border-right-width: 5px;"
+  );
   NewCell1 = document.createElement("td");
   NewCell1.setAttribute("class", "label");
   NewCell1.innerHTML = "Extra Format / Bitrate";
 
   NewCell2 = document.createElement("td");
-  tmp = '<select id="releasetype" name="extra_formats[]"><option value="">---</option>';
+  tmp =
+    '<select id="releasetype" name="extra_formats[]"><option value="">---</option>';
   var formats = ["Saab", "Volvo", "BMW"];
 
   for (var i in formats) {
@@ -255,7 +285,8 @@ function AddFormat() {
 
   tmp += "</select>";
   var bitrates = ["1", "2", "3"];
-  tmp += '<select id="releasetype" name="extra_bitrates[]"><option value="">---</option>';
+  tmp +=
+    '<select id="releasetype" name="extra_bitrates[]"><option value="">---</option>';
 
   for (var i in bitrates) {
     tmp += '<option value="' + bitrates[i] + '">' + bitrates[i] + "</option>\n";
@@ -266,22 +297,24 @@ function AddFormat() {
   NewRow.appendChild(NewCell1);
   NewRow.appendChild(NewCell2);
 
-
   NewRow = document.createElement("tr");
   NewRow.id = "new_description_row" + FormatCount;
-  NewRow.setAttribute("style", "border-bottom-width: 5px; border-left-width: 5px; border-right-width: 5px;");
+  NewRow.setAttribute(
+    "style",
+    "border-bottom-width: 5px; border-left-width: 5px; border-right-width: 5px;"
+  );
   NewCell1 = document.createElement("td");
   NewCell1.setAttribute("class", "label");
   NewCell1.innerHTML = "Extra Release Description";
 
   NewCell2 = document.createElement("td");
-  NewCell2.innerHTML = '<textarea name="extra_release_desc[]" id="release_desc" cols="60" rows="4"></textarea>';
+  NewCell2.innerHTML =
+    '<textarea name="extra_release_desc[]" id="release_desc" cols="60" rows="4"></textarea>';
 
   NewRow.appendChild(NewCell1);
   NewRow.appendChild(NewCell2);
 }
 
-
 /**
  * RemoveFormat
  */
@@ -290,27 +323,26 @@ function RemoveFormat() {
     return;
   }
 
-  $('#extras').raw().value = FormatCount;
+  $("#extras").raw().value = FormatCount;
 
-  var x = $('#new_torrent_row' + FormatCount).raw();
+  var x = $("#new_torrent_row" + FormatCount).raw();
   x.parentNode.removeChild(x);
 
-  x = $('#new_format_row' + FormatCount).raw();
+  x = $("#new_format_row" + FormatCount).raw();
   x.parentNode.removeChild(x);
 
-  x = $('#new_description_row' + FormatCount).raw();
+  x = $("#new_description_row" + FormatCount).raw();
   x.parentNode.removeChild(x);
 
   FormatCount--;
 }
 
-
 /**
  * AddArtistField
  */
 var ArtistCount = 1;
 function AddArtistField() {
-  window.getSelection().removeAllRanges()
+  window.getSelection().removeAllRanges();
   ArtistCount = $('input[name="artists[]"]').length;
 
   if (ArtistCount >= 200) {
@@ -323,47 +355,45 @@ function AddArtistField() {
   ArtistField.name = "artists[]";
   ArtistField.size = 45;
 
-  var x = $('#artistfields').raw();
+  var x = $("#artistfields").raw();
   x.appendChild(document.createElement("br"));
   x.appendChild(ArtistField);
-  x.appendChild(document.createTextNode('\n'));
+  x.appendChild(document.createTextNode("\n"));
 
   if ($("#artist_0").data("gazelle-autocomplete")) {
-    $(ArtistField).on('focus', function () {
+    $(ArtistField).on("focus", function () {
       $(ArtistField).autocomplete({
-        serviceUrl: ARTIST_AUTOCOMPLETE_URL
+        serviceUrl: ARTIST_AUTOCOMPLETE_URL,
       });
     });
   }
   ArtistCount++;
 }
 
-
 /**
  * RemoveArtistField
  */
 function RemoveArtistField() {
-  window.getSelection().removeAllRanges()
+  window.getSelection().removeAllRanges();
   ArtistCount = $('input[name="artists[]"]').length;
 
   if (ArtistCount == 1) {
     return;
   }
 
-  var x = $('#artistfields').raw();
+  var x = $("#artistfields").raw();
   for (i = 0; i < 3; i++) {
     x.removeChild(x.lastChild);
   }
   ArtistCount--;
 }
 
-
 /**
  * AddScreenshotField
  */
 function AddScreenshotField() {
-  var sss = $('[name="screenshots[]"]')
-  if (sss.length >= 10) return
+  var sss = $('[name="screenshots[]"]');
+  if (sss.length >= 10) return;
 
   var ScreenshotField = document.createElement("input");
   ScreenshotField.type = "text";
@@ -371,177 +401,184 @@ function AddScreenshotField() {
   ScreenshotField.name = "screenshots[]";
   ScreenshotField.size = 45;
 
-  var a = document.createElement("a")
-  a.className = "brackets"
-  a.innerHTML = "−"
-  a.onclick = function () { RemoveScreenshotField(this) }
+  var a = document.createElement("a");
+  a.className = "brackets";
+  a.innerHTML = "−";
+  a.onclick = function () {
+    RemoveScreenshotField(this);
+  };
 
-  var x = $('#screenshots').raw()
-  var y = document.createElement("div")
+  var x = $("#screenshots").raw();
+  var y = document.createElement("div");
   y.appendChild(ScreenshotField);
-  y.appendChild(document.createTextNode('\n'));
+  y.appendChild(document.createTextNode("\n"));
   y.appendChild(a);
   x.appendChild(y);
 }
 function RemoveScreenshotField(el) {
-  var sss = $('[name="screenshots[]"]')
-  el.parentElement.remove()
+  var sss = $('[name="screenshots[]"]');
+  el.parentElement.remove();
 }
 
-
 /**
  * AnimeAutofill
  */
 function AnimeAutofill() {
   var map = {
-    artist: 'artist_0',
-    title: 'title',
-    title_rj: 'title_rj',
-    title_jp: 'title_jp',
-    year: 'year',
-    description: 'album_desc'
-  }
-
-  var aid = $('#anidb').raw().value
-  $.getJSON('/api.php?action=autofill&cat=anime&aid=' + aid, function (data) {
-    if (data.status != "success") return
+    artist: "artist_0",
+    title: "title",
+    title_rj: "title_rj",
+    title_jp: "title_jp",
+    year: "year",
+    description: "album_desc",
+  };
+
+  var aid = $("#anidb").raw().value;
+  $.getJSON("/api.php?action=autofill&cat=anime&aid=" + aid, function (data) {
+    if (data.status != "success") return;
     for (i in data.response) {
-      if (map[i] && !($('#' + map[i]).raw().value)) {
-        $('#' + map[i]).raw().value = data.response[i]
+      if (map[i] && !$("#" + map[i]).raw().value) {
+        $("#" + map[i]).raw().value = data.response[i];
       }
     }
-  })
+  });
 }
 
-
 /**
  * JavAutofill
  */
 function JavAutofill() {
   var map = {
-    cn: 'javdb',
-    artists: 'artists',
-    title: 'title',
-    title_jp: 'title_jp',
-    year: 'year',
-    studio: 'studio',
-    image: 'image',
-    tags: 'tags',
-    description: 'album_desc'
-  }
-
-  var cn = $('#javdb_tr #catalogue').raw().value.toUpperCase()
-  $.getJSON('/api.php?action=autofill&cat=jav&cn=' + cn, function (data) {
+    cn: "javdb",
+    artists: "artists",
+    title: "title",
+    title_jp: "title_jp",
+    year: "year",
+    studio: "studio",
+    image: "image",
+    tags: "tags",
+    description: "album_desc",
+  };
+
+  var cn = $("#javdb_tr #catalogue").raw().value.toUpperCase();
+  $.getJSON("/api.php?action=autofill&cat=jav&cn=" + cn, function (data) {
     if (data.status != "success") {
-      $('#catalogue').raw().value = 'Failed'
-      return
+      $("#catalogue").raw().value = "Failed";
+      return;
     } else {
-      $('#catalogue').raw().value = data.response.cn
+      $("#catalogue").raw().value = data.response.cn;
     }
 
     for (i in data.response) {
       if (Array.isArray(data.response[i])) {
         for (j in data.response[i]) {
-          if (i == 'artists') {
-            if (!($('#' + map[i] + '_' + j).raw())) {
-              AddArtistField()
+          if (i == "artists") {
+            if (!$("#" + map[i] + "_" + j).raw()) {
+              AddArtistField();
             }
-            $('#' + map[i] + '_' + j).raw().value = data.response[i][j]
+            $("#" + map[i] + "_" + j).raw().value = data.response[i][j];
           }
-          if (map[i] == 'tags' && !($('#' + map[i]).raw().value)) {
-            $('#' + map[i]).raw().value = data.response[i].join(', ')
+          if (map[i] == "tags" && !$("#" + map[i]).raw().value) {
+            $("#" + map[i]).raw().value = data.response[i].join(", ");
           }
         }
       }
 
-      if (map[i] && $('#' + map[i]).raw() && !($('#' + map[i]).raw().value)) {
-        $('#' + map[i]).raw().value = data.response[i]
+      if (map[i] && $("#" + map[i]).raw() && !$("#" + map[i]).raw().value) {
+        $("#" + map[i]).raw().value = data.response[i];
       }
     }
 
     if (data.response.screens.length) {
-      $('#album_desc').raw().value = ('[spoiler=Automatically located thumbs][img]' + data.response.screens.join('[/img][img]') + '[/img][/spoiler]\n\n') + $('#album_desc').raw().value
+      $("#album_desc").raw().value =
+        "[spoiler=Automatically located thumbs][img]" +
+        data.response.screens.join("[/img][img]") +
+        "[/img][/spoiler]\n\n" +
+        $("#album_desc").raw().value;
     }
-  })
+  });
 }
 
-
 /**
  * MangaAutofill
  */
 function MangaAutofill() {
   var map = {
-    artists: 'artists',
-    title: 'title',
-    title_jp: 'title_jp',
-    year: 'year',
-    tags: 'tags',
-    lang: 'lang',
-    cover: 'image',
-    circle: 'series',
-    pages: 'pages',
-    description: 'release_desc'
-  }
-
-  var nh = $('#ehentai_tr #catalogue').raw().value
-  $.getJSON('/api.php?action=autofill&cat=manga&url=' + nh, function (data) {
+    artists: "artists",
+    title: "title",
+    title_jp: "title_jp",
+    year: "year",
+    tags: "tags",
+    lang: "lang",
+    cover: "image",
+    circle: "series",
+    pages: "pages",
+    description: "release_desc",
+  };
+
+  var nh = $("#ehentai_tr #catalogue").raw().value;
+  $.getJSON("/api.php?action=autofill&cat=manga&url=" + nh, function (data) {
     if (data.status != "success") {
-      $('#catalogue').raw().value = 'Failed'
-      return
+      $("#catalogue").raw().value = "Failed";
+      return;
     }
 
     for (i in data.response) {
       if (Array.isArray(data.response[i])) {
         for (j in data.response[i]) {
-          if (i == 'artists') {
-            if (!($('#' + map[i] + '_' + j).raw())) {
-              AddArtistField()
+          if (i == "artists") {
+            if (!$("#" + map[i] + "_" + j).raw()) {
+              AddArtistField();
             }
-            $('#' + map[i] + '_' + j).raw().value = data.response[i][j]
+            $("#" + map[i] + "_" + j).raw().value = data.response[i][j];
           }
-          if (map[i] == 'tags' && !($('#' + map[i]).raw().value)) {
-            $('#' + map[i]).raw().value = data.response[i].join(', ')
+          if (map[i] == "tags" && !$("#" + map[i]).raw().value) {
+            $("#" + map[i]).raw().value = data.response[i].join(", ");
           }
         }
       }
 
-      if (map[i] && $('#' + map[i]).raw() && (!($('#' + map[i]).raw().value) || $('#' + map[i]).raw().value == '---')) {
-        $('#' + map[i]).raw().value = data.response[i]
+      if (
+        map[i] &&
+        $("#" + map[i]).raw() &&
+        (!$("#" + map[i]).raw().value || $("#" + map[i]).raw().value == "---")
+      ) {
+        $("#" + map[i]).raw().value = data.response[i];
       }
     }
-  })
+  });
 }
 
-
 /**
  * SetResolution
  */
 function SetResolution() {
-  if ($('#ressel').raw().value != 'Other') {
-    $('#resolution').raw().value = $('#ressel').raw().value
-    $('#resolution').ghide()
+  if ($("#ressel").raw().value != "Other") {
+    $("#resolution").raw().value = $("#ressel").raw().value;
+    $("#resolution").ghide();
   } else {
-    $('#resolution').raw().value = ''
-    $('#resolution').gshow()
-    $('#resolution').raw().readOnly = false
+    $("#resolution").raw().value = "";
+    $("#resolution").gshow();
+    $("#resolution").raw().readOnly = false;
   }
 }
 
-
 /**
  * initAutofill
  */
 function initAutofill() {
-  $('[autofill]').each(function (i, el) {
-    el.addEventListener('click', function (event) {
-      ({ 'douj': MangaAutofill, 'anime': AnimeAutofill, 'jav': JavAutofill })[el.attributes['autofill'].value]()
-    })
-  })
+  $("[autofill]").each(function (i, el) {
+    el.addEventListener("click", function (event) {
+      ({ douj: MangaAutofill, anime: AnimeAutofill, jav: JavAutofill }[
+        el.attributes["autofill"].value
+      ]());
+    });
+  });
 }
 
 $(function () {
   Categories();
   initAutofill();
-  $(document).on('click', '.add_artist_button', AddArtistField);
-  $(document).on('click', '.remove_artist_button', RemoveArtistField);
-})
+  $(document).on("click", ".add_artist_button", AddArtistField);
+  $(document).on("click", ".remove_artist_button", RemoveArtistField);
+});

static/styles/bookish/scss/colors.scss

@@ -17,6 +17,11 @@ $lb700: #0288d1;
 $lb800: #0277bd;
 $lb900: #01579b;
 
+/* Skeleton CSS */
+$SkeletonDefault: #33c3f0;
+$SkeletonFocus: #1eaedb;
+$SkeletonHalfdark: scale-color($SkeletonFocus, $lightness: -50%);
+
 /* The shadow under floating elements */
 $shadow: 2px 2px 10px -2px slategray;
 
@@ -24,21 +29,6 @@ $shadow: 2px 2px 10px -2px slategray;
  * Common elements
  */
 
-.head {
-    background: #b3e5fc;
-    color: black;
-    padding: 0.5em 1rem;
-}
-
-/* Alternating tables */
-#request_table .request:nth-of-type(even) {
-    background: white;
-}
-
-#request_table .request:nth-of-type(odd) {
-    background: whitesmoke;
-}
-
 /**
  * RGB color intensity border
  * For semi-transparent elements,
@@ -51,37 +41,6 @@ $shadow: 2px 2px 10px -2px slategray;
 /**
  * Fancy torrent search input
  */
-@mixin common-elements() {
-    border: none;
-    background: white;
-    font-size: 100%;
-    margin: 0 0.25rem;
-    padding: 0.5rem;
-    outline: none;
-}
-
-input,
-input[type="search"],
-input[type="text"] {
-    @include common-elements;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    transition: ease-in-out 0.1s;
-
-    &:focus {
-        border-bottom: 1px solid $lb100;
-    }
-}
-
-select,
-input[type="select"] {
-    @include common-elements;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0;
-
-    appearance: none;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-}
 
 checkbox,
 input[type="checkbox"] {
@@ -93,58 +52,57 @@ input[type="file"] {
     border: none;
 }
 
-/* Buttons */
-button:not(.editor-toolbar button),
-input[type="button"],
-input[type="submit"] {
-    background: $lb200;
-    border: none;
-    border-radius: 0.25rem;
-    box-shadow: $shadow;
-    margin: 0 0.25rem;
-    padding: 0.75rem 1rem;
-    cursor: pointer;
-
-    &:hover {
-        background: $lb50;
-    }
-
-    &:focus {
-        background: $lb300;
-    }
-}
-
 /**
  * Alerts, Toolbox, etc.
  * Needs one unified error display
  * (torrent form, API keys use their own)
  */
+@mixin alertbar($bg) {
+    background: change-color($bg, $alpha: 0.25);
+    /* box-shadow: $shadow; */
+    text-align: center;
+    color: black;
+    font-weight: bold;
+    /* font-size: 0.95rem; */
+    width: 33%;
+    margin: 2em auto;
+    padding: 1rem;
+    border-radius: 4px;
+    border: 1px solid $bg;
+}
+
+/*
 @mixin alertbar($bg) {
     background: $bg;
     box-shadow: $shadow;
     text-align: center;
     color: black;
     font-weight: bold;
-    /* font-size: 0.95rem; */
+    /* font-size: 0.95rem; * /
     width: 33%;
     margin: 2em auto;
     padding: 1rem;
 }
+*/
 
 .alertbar {
-    @include alertbar($lb100);
+    @include alertbar(gold);
+    /* @include alertbar($lb100); */
 
     .warning {
-        background: #ffe0b2;
+        background: orange;
+        /* background: #ffe0b2; */
     }
 
     .error {
-        background: #ffcdd2;
+        background: red;
+        /* background: #ffcdd2; */
     }
 }
 
 .token_error {
-    @include alertbar(#ffcdd2);
+    @include alertbar(pink);
+    /* @include alertbar(#ffcdd2); */
 }
 
 .modbar a {

static/styles/bookish/scss/fonts.scss

@@ -27,6 +27,14 @@ header,
     text-align: center;
 }
 
+/* Section headers ("box" class heading) */
+.head {
+    padding: 0.5em 0;
+    font-size: 120%;
+    border-bottom: 1px solid #e1e1e1;
+    margin-bottom: 1rem;
+}
+
 /* Links */
 a {
     color: black;
@@ -34,7 +42,8 @@ a {
 }
 
 a:hover {
-    color: $lb900;
+    color: $SkeletonFocus;
+    /* color: $lb900; */
     text-decoration: none;
 }
 
@@ -94,7 +103,7 @@ pre {
 }
 
 ul {
-    margin-left: 1rem;
+    margin-left: 0.5rem;
 }
 
 /* Markdown Extra new features */

static/styles/bookish/scss/layout.scss

@@ -1,20 +1,3 @@
-/*
- * Body
- */
-
-* {
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    /* min-width: 800px; */
-}
-
-ol {
-    margin-left: 1rem;
-}
-
 /*
  * Basic structure
  */
@@ -26,10 +9,6 @@ ol {
     width: 100%;
 }
 
-.head {
-    margin-bottom: 0.5rem;
-}
-
 #content {
     margin: auto;
     margin-top: 2rem;
@@ -47,11 +26,11 @@ ol {
 
 /* Logo */
 #logo {
-    background: url("/static/common/logos/bookish.png") no-repeat center;
+    background: url("/static/common/logos/torrents.bio.png") no-repeat center;
     background-size: contain;
     width: 250px;
     height: 50px;
-    margin: 0 0 0 10%;
+    margin: 0.5rem 0 0.25rem 10%;
 
     a {
         border: none;
@@ -65,15 +44,6 @@ ol {
     }
 }
 
-/* Content container */
-.box {
-    background-color: white;
-    /* border: 2px solid rgba(0, 0, 0, 0.01); */
-    margin: auto;
-    margin-bottom: 1rem;
-    width: 100%;
-}
-
 /* Main column and sidebar */
 @mixin column-flex($width) {
     display: flex;
@@ -85,7 +55,7 @@ ol {
 }
 
 .main_column {
-    @include column-flex(65%);
+    @include column-flex(64%);
 
     table {
         margin-bottom: 1rem;
@@ -93,27 +63,21 @@ ol {
 }
 
 .sidebar {
-    @include column-flex(35%);
+    @include column-flex(34%);
     float: right;
 }
 
+/* Box: soon to be <section> */
+.box {
+    margin-bottom: 1rem;
+}
+
 /* Links */
 div.linkbox {
     text-align: center;
     padding: 0.5rem;
 }
 
-.pad {
-    padding: 0 !important;
-    /* padding: 1rem; */
-
-    h3,
-    h4 {
-        margin-top: 0;
-        padding-top: 0;
-    }
-}
-
 /* Misc */
 .torrents_nomatch {
     margin-top: 1rem;
@@ -128,7 +92,10 @@ div.linkbox {
     margin-top: 1rem;
 }
 
-/* Torrents page */
+/**
+ * Torrents page
+ */
+
 .show_torrents {
     width: 21px;
     height: 28px;
@@ -171,35 +138,20 @@ div.linkbox {
     border: none;
 }
 
-.torrent_table tr {
-    /* vertical-align: top; */
-    vertical-align: middle;
-}
-
 .torrent_table .number_column {
     text-align: center;
 }
 
-.torrent_table,
-.torrent_table td {
-    border: none;
-}
-
-/* Text elements */
-h1,
-h2,
-h3,
-h4 {
-    margin: 0.5em 0;
-    font-weight: bold;
-}
+/**
+ * Text elements
+ */
 
 p {
-    margin: 1em 0.5rem;
+    margin-bottom: 1rem;
 }
 
 li {
-    margin: 0.5em 2rem;
+    margin: 0 1rem;
 }
 
 .torrent_title {
@@ -286,7 +238,8 @@ ul .invitetree {
 
 .center_poll {
     height: 0.75rem;
-    background: $lb50;
+    background: $SkeletonDefault;
+    /* background: $lb50; */
     border-radius: 0;
     float: left;
     margin: 0.25rem 0;
@@ -355,8 +308,3 @@ ul .invitetree {
     }
     */
 }
-
-/* User and torrent stats */
-.chart {
-    max-height: 30rem;
-}

static/styles/bookish/scss/menus.scss

@@ -3,7 +3,8 @@
  */
 
 #menu {
-    background-color: $lb900;
+    background-color: $SkeletonHalfdark;
+    /* background-color: $lb900; */
     font-size: 1rem;
     text-align: center;
     width: 100%;
@@ -36,26 +37,28 @@
     max-width: 2.5rem;
 }
 
-#menu ul li a.active {
-    background-color: $lb700;
+#menu ul li a:active {
+    background-color: $SkeletonFocus;
+    /* background-color: $lb700; */
 }
 
 #menu ul li a:hover {
-    background-color: $lb700;
+    background-color: $SkeletonFocus;
+    /* background-color: $lb700; */
     color: white;
     text-decoration: none;
 }
 
 /* Dropdown */
 #menu .nav_dropdown {
-    background: #01579b;
+    background-color: $SkeletonHalfdark;
     margin-top: 0;
 }
 
 .nav_dropdown > div {
     box-shadow: $shadow;
     position: absolute;
-    background-color: #01579b;
+    background-color: $SkeletonHalfdark;
     width: 100%;
     z-index: 99999;
     margin-top: 2.5rem;
@@ -85,8 +88,6 @@
 
 #searchbars {
     text-align: center;
-    background-color: $lb200;
-    box-shadow: $shadow;
     box-sizing: content-box;
     padding: 0.5rem 10%;
     display: flex;
@@ -133,7 +134,7 @@
 }
 
 #searchbars ul li ul li {
-    margin: 0 0 0 0;
+    margin: 0;
     padding: 0;
     display: block;
     width: 100%;
@@ -152,7 +153,7 @@
  */
 #userinfo {
     color: black;
-    padding: 0.5em 0;
+    /* padding: 0.5em 0; */
     width: 100%;
     text-align: center;
 }

static/styles/bookish/scss/tables.scss

@@ -1,31 +1,60 @@
-@mixin center-all {
+/**
+ * Tables
+ */
+
+@mixin alternating-rows {
+    tr:nth-child(2n) {
+        background: whitesmoke;
+    }
+
+    tr:nth-child(2n-1) {
+        background: white;
+    }
 }
 
+/* Every table */
 table {
-    /* border: 2px solid rgba(0, 0, 0, 0.01); */
-    border-collapse: collapse;
     width: 100%;
 
-    /*
-    * {
-        vertical-align: middle;
+    th {
+        font-size: 120%;
     }
-    */
 
-    tr {
-        background-color: white;
+    td,
+    td:first-child {
+        padding: 0.5rem !important;
     }
+}
 
-    td,
-    th {
-        padding: 0.5rem;
-        text-align: left;
+/* Special tables */
+.torrent_table,
+.collage_table,
+.request_table,
+.top10_table {
+    @include alternating-rows;
+
+    th,
+    td {
+        border-bottom: 1px solid #e1e1e1;
+    }
+}
+
+.torrent_table,
+.collage_table {
+    div.tags {
+        font-weight: normal;
+        max-width: 500px;
+    }
+
+    span {
+        float: right;
     }
 }
 
 /**
  * Torrent form
  */
+
 .torrent_form,
 #dynamic_form {
     /* margin-bottom: 2rem; */
@@ -39,18 +68,16 @@ table {
     }
 }
 
-/* Classes */
+/**
+ * colhead
+ * The main table heading.
+ */
+
 .colhead {
-    background: $lb100;
+    padding: 0.5em 0;
+    border-bottom: 1px solid #e1e1e1;
+    font-size: 120%;
     font-weight: bold;
-    color: black;
-}
-
-td.colhead,
-.colhead td,
-.colhead th {
-    padding-left: 10px;
-    padding-right: 10px;
 }
 
 .colhead .sign,
@@ -66,72 +93,34 @@ td.colhead,
     font-weight: bold;
 }
 
-.colhead_dark {
-    background: $lb100;
-    color: black;
-}
-
 /* Torrent and collage tables */
-.torrent_table,
-.collage_table {
-    tr.group {
-        background-color: white;
-
-        td.center:first-child {
-            padding: 3px;
-            width: 21px;
-        }
-    }
-
-    tr.group_torrent {
-        background-color: white;
-
-        span {
-            float: right;
-        }
-    }
-
-    tr.torrent {
-        background-color: white;
-    }
-
-    tr.torrent:nth-child(2n),
-    tr.row:nth-child(2n) {
-        background-color: whitesmoke;
-    }
-
-    tr.torrent:nth-child(2n-1),
-    tr.row:nth-child(2n-1) {
-        background-color: white;
-    }
-
-    tr .center,
-    td {
-        vertical-align: middle;
-        /* text-align: center; */
-    }
-    div.tags {
-        font-weight: normal;
-        max-width: 500px;
-    }
-}
-
 .torrent_table .group_torrent .torrent span {
     font-weight: normal;
     float: right;
 }
 
-/* Forums */
+/**
+ * Forums
+ */
+
+@mixin forum-post($color) {
+    background-color: $color;
+    border-bottom: 1px solid #e1e1e1;
+    font-size: 120%;
+}
+
 .forum_post .colhead_dark {
-    background: $lb100;
+    @include forum-post(white);
+    /* background: $lb100; */
 }
 
 .forum_post.staff_post .colhead_dark {
-    background: $lb200;
+    @include forum-post(whitesmoke);
+    /* background: $lb200; */
 }
 
 .forum_post.sticky_post {
-    border: 2px solid $lb200;
+    border: 2px solid $SkeletonDefault;
 }
 
 td.label {

static/styles/global/global.scss

@@ -8,4 +8,5 @@
 @import "scss/layout";
 @import "scss/log";
 @import "scss/settings";
+@import "scss/skeleton-fixes";
 @import "scss/tables";

static/styles/global/scss/debug.scss

@@ -29,7 +29,7 @@
     border-radius: 100px;
 }
 
-/*
+/**
  * Fix long filename tables overflowing (Chrome only).
  * Stop various release page containers from overflowing with long input.
  * !! Be sure to test all major browsers before changing this section. !!

static/styles/global/scss/fonts.scss

@@ -1,7 +1,6 @@
 html {
     font-size: 16px;
     line-height: 1.6;
-    /* line-height: 1.6; */
 }
 
 /*

static/styles/global/scss/layout.scss

@@ -1,3 +1,12 @@
+/*
+ * Body
+ */
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
 /*
  * Flex elements
  */
@@ -50,6 +59,7 @@ aside {
     &.upload_notice {
         @include transparent-border($R: 255, $A: 0.5);
         margin: 1rem auto;
+        padding-top: 1rem;
         text-align: center;
     }
 
@@ -67,6 +77,19 @@ aside {
     }
 }
 
+/**
+ * Footer
+ */
+
+footer {
+    margin-top: 2rem;
+    width: 100%;
+
+    p {
+        text-align: center;
+    }
+}
+
 /*
  * Misc
  */
@@ -184,3 +207,8 @@ img {
         height: 2rem;
     }
 }
+
+/* User and torrent stats */
+.chart {
+    max-height: 30rem;
+}

static/styles/global/scss/legacy.scss

@@ -47,6 +47,7 @@ textarea {
     outline: none;
 }
 
+/* 2021-07-24
 select {
     padding: 5px 10px;
     background-color: white;
@@ -58,6 +59,7 @@ select {
     -moz-appearance: none;
     appearance: none;
 }
+*/
 
 h2 .group_cat {
     height: 16px;
@@ -129,6 +131,7 @@ div.collage_image {
     cursor: pointer;
 }
 
+/* 2021-07-24
 button,
 input[type="button"],
 input[type="submit"] {
@@ -139,6 +142,7 @@ input[type="submit"] {
     border: none;
     color: #000;
 }
+*/
 
 .spoilerButton {
     cursor: pointer;
@@ -582,6 +586,7 @@ tr.torrent .bookmark > a:after {
  * Fix long release descriptions overflowing containers (all browsers).
  * Fix flowing issues in the report resolving pages.
  */
+/* 2021-07-24
 .wrap_overflow,
 .filelist_table td,
 .reportinfo_table,
@@ -593,6 +598,7 @@ tr.torrent .bookmark > a:after {
     word-break: break-word;
     hyphens: auto;
 }
+*/
 
 .filelist_table td:first-child {
     word-break: break-all;
@@ -1051,21 +1057,29 @@ div.torrent_artists {
 }
 */
 
+/* 2021-07-24
 .flex {
     display: flex;
 }
+*/
 
+/* 2021-07-24
 .flex > .grow {
     flex-grow: 1;
 }
+*/
 
+/* 2021-07-24
 .flex > .shrink {
     flex-shrink: 1;
 }
+*/
 
+/* 2021-07-24
 input[type="search"] {
     -webkit-appearance: textfield;
 }
+*/
 
 #lightbox > img {
     max-width: 100%;
@@ -1089,10 +1103,12 @@ input[type="search"] {
     display: flex;
 }
 
+/* 2021-07-24
 #publickey {
     width: initial;
     font-family: monospace;
 }
+*/
 
 .hidden {
     display: none;
@@ -1103,12 +1119,15 @@ form.edit_form[name="screenshots_form"] img {
     width: 400px;
 }
 
+/* 2021-07-24
 #dbcrypt {
     position: fixed;
     top: 10px;
     right: 10px;
 }
+*/
 
+/* 2021-07-24
 #dbcrypt:after {
     content: "!";
     display: block;
@@ -1122,3 +1141,4 @@ form.edit_form[name="screenshots_form"] img {
     background: red;
     border-radius: 100px;
 }
+*/

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

@@ -0,0 +1,162 @@
+/**
+ * Fixes needed to use skeleton.css
+ * to its best no-fuss advantage
+ */
+
+/* Set heading fonts 50% of default and bump down a level */
+@mixin heading-attributes {
+    letter-spacing: -1px !important;
+    margin: 1rem 0 !important;
+}
+
+h1:not(#logo) {
+    font-size: 1.8rem !important;
+    @include heading-attributes;
+}
+
+h2 {
+    font-size: 1.5rem !important;
+    @include heading-attributes;
+}
+
+h3 {
+    font-size: 1.2rem !important;
+    @include heading-attributes;
+}
+
+h4 {
+    font-size: 0.9rem !important;
+    @include heading-attributes;
+}
+
+h5 {
+    font-size: 0.75rem !important;
+    @include heading-attributes;
+}
+
+h6 {
+    font-size: 0.75rem !important;
+    @include heading-attributes;
+}
+
+/* Larger than phablet */
+@media (min-width: 550px) {
+    h1 {
+        font-size: 1.8rem !important;
+    }
+
+    h2 {
+        font-size: 1.5rem !important;
+    }
+
+    h3 {
+        font-size: 1.2rem !important;
+    }
+
+    h4 {
+        font-size: 0.9rem !important;
+    }
+
+    h5 {
+        font-size: 0.75rem !important;
+    }
+
+    h6 {
+        font-size: 0.75rem !important;
+    }
+}
+
+/* Forum list headings */
+table.forum_index {
+    h4 {
+        margin: 0 !important;
+    }
+}
+
+/* Checkbox and radio labels */
+label,
+legend {
+    display: inline !important;
+}
+
+/* Tables usually containing forms */
+/* browse */
+table.torrent_search,
+/* request search */ table.torrent_requests,
+/* forum list */ table.forum_index,
+/* upload form */ table.torrent_form,
+/* requests? */ table.request_form,
+/* new request */ form#request_form,
+/* forum thread */ table.new_thread,
+/* toolbox */ table.admin_tools,
+/* BP */ table.store_table,
+/* rule sections */ div.rule_table,
+/* client rules */ table.clients_table,
+/* login */ table.login_form,
+/* requests? */form.create_form,
+/* top10 */ form.search_form,
+/* edit collage */ table.collage_edit,
+/* start user management */
+table#user_info_box,
+table#warn_user_box,
+table#user_lock_account,
+table#user_privs_box,
+table#session_box,
+table#donation_box,
+table#donor_points_box,
+table#submit_box,
+/* end user management */
+/* notif filters */ form[name="notification"],
+/* wiki search */ table.wiki_browse,
+/* better.php */ table.better_list {
+    th,
+    td {
+        border-bottom: 0 !important;
+        padding: 0.25rem !important;
+    }
+}
+
+/* Duplicate input rules here */
+input,
+input[type="search"],
+input[type="text"] {
+    margin: 0 !important;
+}
+
+input,
+textarea,
+select,
+fieldset {
+    margin-bottom: 0 !important;
+}
+
+/* Block elements */
+pre,
+blockquote,
+dl,
+figure,
+table,
+ul,
+ol,
+form {
+    margin-bottom: 0 !important;
+}
+
+/* Inline code */
+code {
+    padding: 0 !important;
+}
+
+/* Unordered lists */
+ul {
+    list-style: circle outside !important;
+}
+
+/* Nested lists */
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+    margin: 0 !important;
+    font-size: 100% !important;
+}

static/styles/public/scss/public.scss

@@ -1,3 +1,8 @@
+/* Skeleton CSS */
+$SkeletonDefault: #33c3f0;
+$SkeletonFocus: #1eaedb;
+$SkeletonHalfdark: scale-color($SkeletonFocus, $lightness: -50%);
+
 * {
     margin: 0;
     padding: 0;
@@ -49,7 +54,11 @@ p {
 }
 
 ul {
-    margin-left: 2rem;
+    margin-left: 0.5rem;
+
+    li {
+        margin-bottom: 0;
+    }
 
     &.p li {
         margin-bottom: 1rem;
@@ -64,7 +73,7 @@ h2 {
 /**
  * Inputs
  */
-
+/*
 input[type="text"],
 input[type="password"],
 input[type="email"] {
@@ -119,6 +128,7 @@ input[type="submit"]:hover {
     text-align: right;
     padding-right: 5px;
 }
+*/
 
 /**
  * Layout
@@ -126,10 +136,10 @@ input[type="submit"]:hover {
 
 header,
 footer {
-    height: 2rem;
-    line-height: 2rem;
+    height: 2.5rem;
+    line-height: 2.5rem;
     width: 100%;
-    background: #01579b;
+    background: $SkeletonHalfdark;
     position: fixed;
     left: 0;
 
@@ -156,16 +166,16 @@ footer {
 }
 
 main {
-    width: 250px;
+    width: 25%;
     height: calc(80% - 60px);
     margin: 0 auto;
     padding: 10% 0;
 }
 
 #logo {
-    width: 250px;
+    /* width: 250px; */
     height: 50px;
-    background-image: url("/static/common/logos/bookish.png");
+    background-image: url("/static/common/logos/torrents.bio.png");
     background-repeat: no-repeat;
     background-position: center;
     background-size: contain;
@@ -215,5 +225,5 @@ main {
     content: "℠";
     font-size: 0.75rem;
     font-weight: normal;
-    margin-left: 100%;
+    margin-left: 93%;
 }

templates/input/passphrase.html

@@ -0,0 +1,24 @@
+<input
+  type="password"
+  name="{{ name|default('password') }}"
+  id="{{ id|default('password') }}"
+  placeholder="{{ placeholder|default('passphrase') }}"
+  minlength="{{ pw_min|default('15') }}"
+  maxlength="{{ pw_max|default('10000') }}"
+  pattern=".{ {{ pw_min }},{{ pw_max }} }"
+  class="inputtext"
+  autocomplete="off"
+  required="required"
+/>
+
+<strong id="pass_match"></strong>
+
+{% if advice == true %}
+<p>
+  Any password {{ pw_min }} characters or longer is accepted, but a strong password
+  <ul>
+    <li>is a pass<em>phrase</em> of mixed case with many small words,</li>
+    <li>that contains complex characters including Unicode and emoji.</li>
+  </ul>
+</p>
+{% endif %}

templates/torrent_form/mirrors.html

@@ -0,0 +1,14 @@
+<tr id="mirrors_tr">
+  <td>
+    <label for="mirrors">{{ db.name }}</label>
+  </td>
+
+  <td>
+    <textarea
+      rows="2"
+      name="mirrors"
+      id="mirrors"
+      {# Needs to be all on one line #}
+      placeholder="{{ db.desc }}">{{ mirrors }}</textarea>
+  </td>
+</tr>

templates/torrent_form/picture.html

@@ -0,0 +1,16 @@
+<tr id="cover_tr">
+  <td>
+    <label for="image">{{db.name }}</label>
+  </td>
+
+  <td>
+    <input
+      type="text"
+      id="image"
+      name="image"
+      size="60"
+      placeholder="{{ db.desc }}"
+      value="{{ picture }}"
+    />
+  </td>
+</tr>

templates/torrent_form/seqhash.html

@@ -0,0 +1,54 @@
+<tr id="seqhash_tr">
+  <td>
+    <label for="seqhash">{{ db.name }}</label>
+    {#
+    <br />
+    <a class="add_artist_button brackets" onclick="AddArtistField()">+</a>
+    <a class="remove_artist_button brackets" onclick="RemoveArtistField()">&minus;</a>
+    #}
+  </td>
+
+  <td>
+    <textarea
+      rows="2"
+      name="seqhash"
+      id="seqhash"
+      {# Needs to be all on one line #}
+      placeholder="{{ db.desc }}">{{ seqhash }}</textarea>
+
+    <input type="radio" id="dna" name="seqhash_meta1" value="DNA" checked /> DNA
+    {# <label for="dna">DNA</label> #}
+
+    &emsp;
+
+    <input type="radio" id="rna" name="seqhash_meta1" value="RNA" /> RNA
+    {# <label for="rna">RNA</label> #}
+
+    &emsp;
+
+    <input type="radio" id="protein" name="seqhash_meta1" value="PROTEIN" /> Protein
+    {# <label for="protein">Protein</label> #}
+
+    <br />
+
+    <input type="radio" id="linear" name="seqhash_meta2" value="false" checked /> Linear
+    {# <label for="linear">Linear</label> #}
+
+    &emsp;
+
+    <input type="radio" id="circular" name="seqhash_meta2" value="true" /> Circular
+    {# <label for="circular">Circular</label> #}
+
+    <br />
+
+    <input type="radio" id="double_stranded" name="seqhash_meta3" value="true" checked /> Double-Stranded
+    {# <label for="double_stranded">Double-Stranded</label> #}
+
+    &emsp;
+
+    <input type="radio" id="single_stranded" name="seqhash_meta3" value="false" /> Single-Stranded
+    {# <label for="single_stranded">Single-Stranded</label> #}
+
+    <p>{{ db.note|raw }}</p>
+  </td>
+</tr>

templates/torrent_form/version.html

@@ -10,10 +10,10 @@
       name="version"
       size="12"
       pattern="\d+\.*\d*\.*\d*"
-      placeholder="{{ db.desc}}"
+      placeholder="{{ db.desc }}"
       value="{{ version }}"
     />
 
-    <p>{{ note }}</p>
+    <p>{{ db.note|raw }}</p>
   </td>
 </tr>

templates/wiki/browse.html

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

templates/wiki/browse.twig

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