Housekeeping and bug fixes

classes/config.template

@@ -73,7 +73,7 @@ ENV::setPub('SEP', '⸬'); # e.g., News ⸬ BioTorrents.de
 ENV::setPub('CRUMB', '›'); # e.g., Forums › Board › Thread
 
 # The FQDN of your site, e.g., dev.biotorrents.de
-( # Old format: ternary
+( # Old format
     !$ENV->DEV
         ? define('SITE_DOMAIN', 'biotorrents.de') # Production
         : define('SITE_DOMAIN', 'dev.biotorrents.de') # Development
@@ -90,7 +90,7 @@ ENV::setPub(
 ENV::setPub('IMAGE_DOMAIN', 'pics.biotorrents.de');
 
 # The root of the server, used for includes, e.g., /var/www/html/dev.biotorrents.de/
-( # Old format: ternary
+( # Old format
     !$ENV->DEV
         ? define('SERVER_ROOT', '/var/www/html/biotorrents.de/') # Production
         : define('SERVER_ROOT', '/var/www/html/dev.biotorrents.de/') # Development
@@ -104,7 +104,7 @@ ENV::setPub(
 );
 
 # Where torrent files are stored, e.g., /var/www/torrents-dev/
-( # Old format: ternary
+( # Old format
     !$ENV->DEV
         ? define('TORRENT_STORE', '/var/www/torrents/') # Production
         : define('TORRENT_STORE', '/var/www/torrents-dev/') # Development
@@ -125,6 +125,21 @@ ENV::setPub('STATIC_SERVER', '/static/');
 ENV::setPub('SRI', 'sha384');
 
 
+/**
+ * Tech support
+ */
+
+$TechSupport = [
+  'Email' => 'help@biotorrents.de',
+  'Subject' => '[TxID '.strtoupper(bin2hex(random_bytes(2))).'] Specific subject line with TxID intact',
+  'Body' => 'A detailed description of how you reach the error and the full text of any site messages you may receive.'
+];
+ENV::setPub(
+    'HELP',
+    new RecursiveArrayObject($TechSupport)
+);
+
+
 /**
  * App keys
  *
@@ -141,22 +156,16 @@ if (!$ENV->DEV) {
     ENV::setPriv('ENCKEY', '00000000000000000000000000000000');
   
     # Alphanumeric random key. This key must be the argument to schedule.php for the schedule to work
-    define('SCHEDULE_KEY', '00000000000000000000000000000000');
     ENV::setPriv('SCHEDULE_KEY', '00000000000000000000000000000000');
   
     # Random key. Used for generating unique RSS auth key
-    define('RSS_HASH', '00000000000000000000000000000000');
     ENV::setPriv('RSS_HASH', '00000000000000000000000000000000');
 }
 
 # Development
 else {
     ENV::setPriv('ENCKEY', '00000000000000000000000000000000');
-
-    define('SCHEDULE_KEY', '00000000000000000000000000000000');
     ENV::setPriv('SCHEDULE_KEY', '00000000000000000000000000000000');
-    
-    define('RSS_HASH', '00000000000000000000000000000000');
     ENV::setPriv('RSS_HASH', '00000000000000000000000000000000');
 }
 
@@ -190,32 +199,23 @@ else {
  */
 
 # Ocelot connection, e.g., 0.0.0.0
-define('TRACKER_HOST', '0.0.0.0');
 ENV::setPriv('TRACKER_HOST', '0.0.0.0');
 
  # Production
- if (!$ENV->DEV) {
-     define('TRACKER_PORT', 34000);
-     ENV::setPriv('TRACKER_PORT', 34000);
+if (!$ENV->DEV) {
+    ENV::setPriv('TRACKER_PORT', 34000);
   
-     # Must be 32 alphanumeric characters and match site_password in ocelot.conf
-     define('TRACKER_SECRET', '00000000000000000000000000000000');
-     ENV::setPriv('TRACKER_SECRET', '00000000000000000000000000000000');
+    # Must be 32 alphanumeric characters and match site_password in ocelot.conf
+    ENV::setPriv('TRACKER_SECRET', '00000000000000000000000000000000');
 
-     # Must be 32 alphanumeric characters and match report_password in ocelot.conf
-     define('TRACKER_REPORTKEY', '00000000000000000000000000000000');
-     ENV::setPriv('TRACKER_REPORTKEY', '00000000000000000000000000000000');
- }
+    # Must be 32 alphanumeric characters and match report_password in ocelot.conf
+    ENV::setPriv('TRACKER_REPORTKEY', '00000000000000000000000000000000');
+}
 
 # Development
 else {
-    define('TRACKER_PORT', 34001);
     ENV::setPriv('TRACKER_PORT', 34001);
-  
-    define('TRACKER_SECRET', '00000000000000000000000000000000');
     ENV::setPriv('TRACKER_SECRET', '00000000000000000000000000000000');
-  
-    define('TRACKER_REPORTKEY', '00000000000000000000000000000000');
     ENV::setPriv('TRACKER_REPORTKEY', '00000000000000000000000000000000');
 }
 
@@ -254,13 +254,13 @@ if (!$ENV->DEV) {
 else {
     define('ANNOUNCE_URLS', [
       [ # Tier 1
-        'https://devtr.biotorrents.de:443',
+        'https://trx.biotorrents.de:443',
       ], [] # Tier 2
     ]);
 
     $AnnounceURLs = [
       [ # Tier 1
-        'https://devtr.biotorrents.de:443',
+        'https://trx.biotorrents.de:443',
       ], [], # Tier 2
     ];
     ENV::setPub(
@@ -398,8 +398,6 @@ ENV::setPub('USER_LIMIT', 0);
 ENV::setPub('STARTING_INVITES', 2);
 ENV::setPub('STARTING_TOKENS', 2);
 ENV::setPub('STARTING_UPLOAD', 5368709120);
-
-define('DONOR_INVITES', 2);
 ENV::setPub('DONOR_INVITES', 2);
 
 # Bonus Points
@@ -426,10 +424,10 @@ ENV::setPub(
     'PASSWORD_ADVICE',
     <<<HTML
     <p>
-      Any password of 15 characters or longer will be accepted, but a strong password
+      Any password 15 characters or longer is accepted, but a strong password
       <ul>
-        <li>is really a pass<em>phrase</em> with uppercase and lowercase letters and many small words,</li>
-        <li>that contains numbers and symbols, including complex Unicode characters like emoji.</li>
+        <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>
 HTML
@@ -470,21 +468,21 @@ ENV::setPub(
  */
 
 #       Name of class     Class ID (not level)
-define('ADMIN',          '1');
-define('USER',           '2');
-define('MEMBER',         '3');
-define('POWER',          '4');
-define('ELITE',          '5');
-define('LEGEND',         '8');
-define('MOD',            '11');
-define('SYSOP',          '15');
-define('ARTIST',         '19');
-define('DONOR',          '20');
-define('VIP',            '21');
+define('ADMIN', '1');
+define('USER', '2');
+define('MEMBER', '3');
+define('POWER', '4');
+define('ELITE', '5');
+define('LEGEND', '8');
+define('MOD', '11');
+define('SYSOP', '15');
+define('ARTIST', '19');
+define('DONOR', '20');
+define('VIP', '21');
 define('TORRENT_MASTER', '23');
-define('POWER_TM',       '24');
-define('FLS_TEAM',       '33');
-define('FORUM_MOD',      '9001');
+define('POWER_TM', '24');
+define('FLS_TEAM', '33');
+define('FORUM_MOD', '9001');
 
 
 /**
@@ -563,15 +561,15 @@ $AutomatedBadgeIDs = [
   ],
 
   'Posts' => [
-    '5'    => 60,
-    '10'   => 61,
-    '25'   => 62,
-    '50'   => 63,
-    '100'  => 64,
-    '250'  => 65,
-    '500'  => 66,
-    '1000' => 67,
-    '2500' => 68,
+    '5'    => 30,
+    '10'   => 31,
+    '25'   => 32,
+    '50'   => 33,
+    '100'  => 34,
+    '250'  => 35,
+    '500'  => 36,
+    '1000' => 37,
+    '2500' => 38,
   ]
 ];
 ENV::setPub(
@@ -608,7 +606,7 @@ ENV::setPub(
  *     . $InstanceID;
  */
 
-$DatabaseFields = [
+$DB = [
   'AccessionNumber' => [
     'Label' => 'Accession Number',
     'Selector' => ['DOI' => 'javdb', 'RefSeq' => 'anidb', 'UniProt' => 'ehentai'],
@@ -639,8 +637,8 @@ $DatabaseFields = [
   # etc.
 ];
 ENV::setPub(
-    'DBMAP',
-    new RecursiveArrayObject($DatabaseFields)
+    'META',
+    new RecursiveArrayObject($DB)
 );
 
 

classes/script_start.php

@@ -303,7 +303,7 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
 
     // Create LoggedUser array
     $LoggedUser = array_merge($HeavyInfo, $LightInfo, $UserStats);
-    $LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . RSS_HASH . $LoggedUser['torrent_pass']);
+    $LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . $ENV->getPriv('RSS_HASH') . $LoggedUser['torrent_pass']);
 
     // $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
     $LoggedUser['RatioWatch'] = (

classes/torrent_form.class.php

@@ -355,7 +355,7 @@ HTML;
                   <p id="category_description" class="">
                   <!-- $Cat->Description will live here -->
                   Please see the
-                  <a href="https://dev.biotorrents.de/wiki.php?action=article&name=categories">Categories Wiki</a>
+                  <a href="/wiki.php?action=article&name=categories">Categories Wiki</a>
                   for details
                   </p>
                 </td>

classes/tracker.class.php

@@ -20,8 +20,10 @@ class Tracker
      */
     public static function update_tracker($Action, $Updates, $ToIRC = false)
     {
+        $ENV = ENV::go();
+
         // Build request
-        $Get = TRACKER_SECRET . "/update?action=$Action";
+        $Get = $ENV->getPriv('TRACKER_SECRET') . "/update?action=$Action";
         foreach ($Updates as $Key => $Value) {
             $Get .= "&$Key=$Value";
         }
@@ -102,10 +104,13 @@ class Tracker
      */
     private static function get_stats($Type, $Params = false)
     {
-        if (!defined('TRACKER_REPORTKEY')) {
+        $ENV = ENV::go();
+
+        if (!defined($ENV->getPriv('TRACKER_REPORTKEY'))) {
             return false;
         }
-        $Get = TRACKER_REPORTKEY . '/report?';
+
+        $Get = $ENV->getPriv('TRACKER_REPORTKEY') . '/report?';
         if ($Type === self::STATS_MAIN) {
             $Get .= 'get=stats';
         } elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
@@ -113,10 +118,12 @@ class Tracker
         } else {
             return false;
         }
+
         $Response = self::send_request($Get);
         if ($Response === false) {
             return false;
         }
+
         $Stats = [];
         foreach (explode("\n", $Response) as $Stat) {
             list($Val, $Key) = explode(" ", $Stat, 2);
@@ -125,6 +132,7 @@ class Tracker
         return $Stats;
     }
 
+
     /**
      * Send a request to the tracker
      *
@@ -135,6 +143,8 @@ class Tracker
      */
     private static function send_request($Get, $MaxAttempts = 1, &$Err = false)
     {
+        $ENV = ENV::go();
+
         $Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
         $Attempts = 0;
         $Sleep = 0;
@@ -152,7 +162,13 @@ class Tracker
             }
 
             // Send request
-            $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
+            $File = fsockopen(
+                $ENV->getPriv('TRACKER_HOST'),
+                $ENV->getPriv('TRACKER_PORT'),
+                $ErrorNum,
+                $ErrorString
+            );
+            
             if ($File) {
                 if (fwrite($File, $Header) === false) {
                     $Err = "Failed to fwrite()";
@@ -169,6 +185,7 @@ class Tracker
             while (!feof($File)) {
                 $Response .= fread($File, 1024);
             }
+
             $DataStart = strpos($Response, "\r\n\r\n") + 4;
             $DataEnd = strrpos($Response, "\n");
             if ($DataEnd > $DataStart) {
@@ -176,17 +193,20 @@ class Tracker
             } else {
                 $Data = "";
             }
+
             $Status = substr($Response, $DataEnd + 1);
             if ($Status == "success") {
                 $Success = true;
             }
         }
-        $Request = array(
-      'path' => substr($Get, strpos($Get, '/')),
-      'response' => ($Success ? $Data : $Response),
-      'status' => ($Success ? 'ok' : 'failed'),
-      'time' => 1000 * (microtime(true) - $StartTime)
-    );
+
+        $Request = [
+            'path' => substr($Get, strpos($Get, '/')),
+            'response' => ($Success ? $Data : $Response),
+            'status' => ($Success ? 'ok' : 'failed'),
+            'time' => 1000 * (microtime(true) - $StartTime)
+        ];
+
         self::$Requests[] = $Request;
         if ($Success) {
             return $Data;

sections/feeds/index.php

@@ -23,6 +23,7 @@ if (
     error(400, $NoHTML = true);
 }
 
+# Initialize
 require_once 'classes/env.class.php';
 $ENV = ENV::go();
 
@@ -45,7 +46,7 @@ if (!$Enabled = $Cache->get_value("enabled_$User")) {
 }
 
 # Check for RSS auth
-if (md5($User.RSS_HASH.$_GET['passkey']) !== $_GET['auth'] || (int) $Enabled !== 1) {
+if (md5($User.$ENV->getPriv('RSS_HASH').$_GET['passkey']) !== $_GET['auth'] || (int) $Enabled !== 1) {
     $Feed->open_feed();
     $Feed->channel('Blocked', 'RSS feed.');
     $Feed->close_feed();

sections/peerupdate/index.php

@@ -1,7 +1,11 @@
 <?php
+#declare(strict_types=1);
+
+$ENV = ENV::go();
 
 // We keep torrent groups cached. However, the peer counts change often, so our solutions are to not cache them for long, or to update them. Here is where we updated them.
-if ((!isset($argv[1]) || $argv[1]!=SCHEDULE_KEY) && !check_perms('admin_schedule')) { // authorization, Fix to allow people with perms hit this page.
+if ((!isset($argv[1]) || $argv[1]!== $ENV->getPriv('SCHEDULE_KEY'))
+&& !check_perms('admin_schedule')) { // auth fix to let people with perms hit this page
     error(403);
 }
 
@@ -50,6 +54,7 @@ $RowNum = 0;
 $LastGroupID = 0;
 $UpdatedKeys = $UncachedGroups = 0;
 list($TorrentID, $GroupID, $Seeders, $Leechers, $Snatches) = $DB->next_record(MYSQLI_NUM, false);
+
 while ($TorrentID) {
     if ($LastGroupID != $GroupID) {
         $CachedData = $Cache->get_value("torrent_group_$GroupID");
@@ -62,6 +67,7 @@ while ($TorrentID) {
         }
         $LastGroupID = $GroupID;
     }
+
     while ($LastGroupID == $GroupID) {
         $RowNum++;
         if (isset($CachedStats) && is_array($CachedStats[$TorrentID])) {
@@ -72,6 +78,7 @@ while ($TorrentID) {
             $Changed = true;
             unset($OldValues);
         }
+
         if (!($RowNum % $StepSize)) {
             $DB->query("
         SELECT *
@@ -84,6 +91,7 @@ while ($TorrentID) {
         $LastGroupID = $GroupID;
         list($TorrentID, $GroupID, $Seeders, $Leechers, $Snatches) = $DB->next_record(MYSQLI_NUM, false);
     }
+    
     if ($Changed) {
         $Cache->cache_value("torrent_group_$LastGroupID", $CachedData, 0);
         unset($CachedStats);

sections/requests/take_new_edit.php

@@ -190,7 +190,7 @@ if ($NewRequest) {
       TitleJP = '".db_string($TitleJP??"")."',
       Image = '".db_string($Image)."',
       Description = '".db_string($Description)."',
-      CatalogueNumber = '".db_string($CatalogueNumber)."',
+      CatalogueNumber = '".db_string($CatalogueNumber)."'
     WHERE ID = $RequestID");
 
     // We need to be able to delete artists/tags

sections/schedule/index.php

@@ -1,4 +1,7 @@
 <?php
+#declare(strict_types=1);
+
+$ENV = ENV::go();
 
 // This page is run every 15 minutes by cron
 // todo: See if strict equality will break everything
@@ -31,8 +34,8 @@ function run_all_in($Dir)
     }
 }
 
-if ((!isset($_REQUEST['key']) || $_REQUEST['key'] !== SCHEDULE_KEY)
-    #&& (!isset($argv[1]) || $argv[1] !== SCHEDULE_KEY)
+if ((!isset($_REQUEST['key']) || $_REQUEST['key'] !== $ENV->getPriv('SCHEDULE_KEY'))
+    #|| (!isset($argv[1]) || $argv[1] !== $ENV->getPriv('SCHEDULE_KEY'))
     && !$AS) {
     error(403);
 }

sections/tools/managers/ocelot.php

@@ -1,51 +1,54 @@
-<?
+<?php
+#declare(strict_types=1);
+
+$ENV = ENV::go();
+
 $Key = $_REQUEST['key'];
 $Type = $_REQUEST['type'];
 
-if (($Key != TRACKER_SECRET) || $_SERVER['REMOTE_ADDR'] != TRACKER_HOST) {
-  send_irc(DEBUG_CHAN, 'Ocelot Auth Failure '.$_SERVER['REMOTE_ADDR']);
-  error(403);
+if (($Key !== $ENV->getPriv('TRACKER_SECRET')) || $_SERVER['REMOTE_ADDR'] !== $ENV->getPriv('TRACKER_HOST')) {
+    send_irc(DEBUG_CHAN, 'Ocelot Auth Failure '.$_SERVER['REMOTE_ADDR']);
+    error(403);
 }
 
 switch ($Type) {
   case 'expiretoken':
     if (isset($_GET['tokens'])) {
-      $Tokens = explode(',', $_GET['tokens']);
-      if (empty($Tokens)) {
-        error(0);
-      }
-      $Cond = $UserIDs = [];
-      foreach ($Tokens as $Key => $Token) {
-        list($UserID, $TorrentID) = explode(':', $Token);
-        if (!is_number($UserID) || !is_number($TorrentID)) {
-          continue;
+        $Tokens = explode(',', $_GET['tokens']);
+        if (empty($Tokens)) {
+            error(0);
         }
-        $Cond[] = "(UserID = $UserID AND TorrentID = $TorrentID)";
-        $UserIDs[] = $UserID;
-      }
-      if (!empty($Cond)) {
-        $Query = "
+        $Cond = $UserIDs = [];
+        foreach ($Tokens as $Key => $Token) {
+            list($UserID, $TorrentID) = explode(':', $Token);
+            if (!is_number($UserID) || !is_number($TorrentID)) {
+                continue;
+            }
+            $Cond[] = "(UserID = $UserID AND TorrentID = $TorrentID)";
+            $UserIDs[] = $UserID;
+        }
+        if (!empty($Cond)) {
+            $Query = "
           UPDATE users_freeleeches
           SET Expired = TRUE
           WHERE ".implode(" OR ", $Cond);
-        $DB->query($Query);
-        foreach ($UserIDs as $UserID) {
-          $Cache->delete_value("users_tokens_$UserID");
+            $DB->query($Query);
+            foreach ($UserIDs as $UserID) {
+                $Cache->delete_value("users_tokens_$UserID");
+            }
         }
-      }
     } else {
-      $TorrentID = $_REQUEST['torrentid'];
-      $UserID = $_REQUEST['userid'];
-      if (!is_number($TorrentID) || !is_number($UserID)) {
-        error(403);
-      }
-      $DB->query("
+        $TorrentID = $_REQUEST['torrentid'];
+        $UserID = $_REQUEST['userid'];
+        if (!is_number($TorrentID) || !is_number($UserID)) {
+            error(403);
+        }
+        $DB->query("
         UPDATE users_freeleeches
         SET Expired = TRUE
         WHERE UserID = $UserID
           AND TorrentID = $TorrentID");
-      $Cache->delete_value("users_tokens_$UserID");
+        $Cache->delete_value("users_tokens_$UserID");
     }
     break;
 }
-?>

sections/upload/upload_handle.php

@@ -256,8 +256,8 @@ default:
             'resolution',
             '1',
             'string',
-            'Scope must be between 5 and 20 characters.',
-            array('maxlength' => 20, 'minlength' => 5)
+            'Scope must be between 4 and 20 characters.',
+            array('maxlength' => 20, 'minlength' => 4)
         );
         
         # torrents_group.TagList

static/styles/bookish/scss/fonts.scss

@@ -27,19 +27,6 @@ header,
     text-align: center;
 }
 
-.torrent_form {
-    label {
-        font-weight: bold;
-    }
-
-    .required {
-        &:after {
-            color: red;
-            content: "*";
-        }
-    }
-}
-
 /* Links */
 a {
     color: black;

static/styles/global/scss/fonts.scss

@@ -5,7 +5,7 @@ html {
 }
 
 /*
- * Classes
+ * Spacing classes
  */
 
 .center {
@@ -54,6 +54,23 @@ code br {
     display: none;
 }
 
+/*
+ * Torrent form
+*/
+
+.torrent_form {
+    label {
+        font-weight: bold;
+    }
+
+    .required {
+        &:after {
+            color: red;
+            content: "*";
+        }
+    }
+}
+
 /* Good/bad examples on rules pages */
 .important_text {
     color: red;