Add support for multiple tracker tiers

_packages/tracker-tiers/classes/config.template

@@ -0,0 +1,13 @@
+<?php
+
+// Tracker urls to be added to torrent files à la http://bittorrent.org/beps/bep_0012.html
+define('ANNOUNCE_URLS', [
+  [ # Tier 1
+    'https://track.biotorrents.de:443',
+  ],
+  [ # Tier 2
+    'udp://tracker.coppersurfer.tk:6969/announce',
+    'udp://tracker.cyberia.is:6969/announce',
+    'udp://tracker.leechers-paradise.org:6969/announce'
+  ]
+]);

_packages/tracker-tiers/classes/torrent_form.class

@@ -0,0 +1,19 @@
+<p style="text-align: center;">
+  <?php
+    $Announces = ANNOUNCE_URLS[0];
+    #$Announces = call_user_func_array('array_merge', ANNOUNCE_URLS);
+    foreach ($Announces as $Announce) {
+      # Loop through tracker URLs
+  ?>
+  <strong>Announce</strong>
+  <input type="text"
+    value="<?= $Announce . '/' . G::$LoggedUser['torrent_pass'] . '/announce' ?>"
+    size="74" onclick="this.select();" readonly="readonly" /> <br />
+  <?php
+    }
+  ?>
+
+  <strong>Source</strong>
+  <input type="text" value="<?= Users::get_upload_sources()[0] ?>"
+    size="20" onclick="this.select();" readonly="readonly" />
+</p>

_packages/tracker-tiers/classes/torrentsdl.class.php

@@ -0,0 +1,34 @@
+<?php
+
+class TorrentsDL
+{
+    # ...
+
+    /**
+     * Create a Zip object and store the query results
+     *
+     * @param mysqli_result $QueryResult results from a query on the collector pages
+     * @param string $Title name of the collection that will be created
+     * @param string $AnnounceURL URL to add to the created torrents
+     */
+    public function __construct(&$QueryResult, $Title)
+    {
+        G::$Cache->InternalCache = false; // The internal cache is almost completely useless for this
+        Zip::unlimit(); // Need more memory and longer timeout
+        $this->QueryResult = $QueryResult;
+        $this->Title = $Title;
+        $this->User = G::$LoggedUser;
+        $this->AnnounceURL = ANNOUNCE_URLS[0][0].'/'.G::$LoggedUser['torrent_pass'].'/announce';
+
+        function add_passkey($Ann)
+        {
+            return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann.'/'.G::$LoggedUser['torrent_pass'].'/announce';
+        }
+
+        $this->AnnounceList = array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
+        #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
+        $this->Zip = new Zip(Misc::file_string($Title));
+    }
+
+    # ...
+}

_packages/tracker-tiers/readme.md

@@ -0,0 +1,10 @@
+# Multiple tracker tiers
+
+BioTorrents.de supports two tiers of trackers:
+
+  - Tier 1: Authenticated private tracker URLs using the familiar Gazelle/Ocelot features
+  - Tier 2: A list of standalone public trackers as backups, in case the main tracker goes down
+
+Please note that all torrent contents are hashed with the private flag, so the normal protections against DHT, PEX, etc., work as expected.
+
+Support for multiple trackers does not extend to magnet links!

_packages/tracker-tiers/sections/torrents/download.php

@@ -0,0 +1,20 @@
+<?php
+
+# ...
+
+header('Content-Type: application/x-bittorrent; charset=utf-8');
+header('Content-disposition: attachment; filename="'.$FileName.'"');
+
+function add_passkey($Ann)
+{
+    global $TorrentPass;
+    return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann.'/'.$TorrentPass.'/announce';
+}
+
+$UserAnnounceURL = ANNOUNCE_URLS[0][0].'/'.$TorrentPass.'/announce';
+$UserAnnounceList = array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
+#$UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
+
+echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);
+
+define('SKIP_NO_CACHE_HEADERS', 1);

classes/torrent.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 /*******************************************************************************
 |~~~~ Gazelle bencode parser                         ~~~~|
 --------------------------------------------------------------------------------
@@ -63,266 +63,275 @@ the BENCODE_DICT class.
 
 
 *******************************************************************************/
-class BENCODE2 {
-  var $Val; // Decoded array
-  var $Pos = 1; // Pointer that indicates our position in the string
-  var $Str = ''; // Torrent string
-
-  function __construct($Val, $IsParsed = false) {
-    if (!$IsParsed) {
-      $this->Str = $Val;
-      $this->dec();
-    } else {
-      $this->Val = $Val;
-    }
-  }
-
-  // Decode an element based on the type. The type is really just an indicator.
-  function decode($Type, $Key) {
-    if (is_number($Type)) { // Element is a string
-      // Get length of string
-      $StrLen = $Type;
-      while ($this->Str[$this->Pos + 1] != ':') {
-        $this->Pos++;
-        $StrLen.=$this->Str[$this->Pos];
-      }
-      $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
-
-      $this->Pos += $StrLen;
-      $this->Pos += 2;
-
-    } elseif ($Type == 'i') { // Element is an int
-      $this->Pos++;
-
-      // Find end of integer (first occurance of 'e' after position)
-      $End = strpos($this->Str, 'e', $this->Pos);
-
-      // Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string
-      $this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos);
-      $this->Pos = $End + 1;
-
-    } elseif ($Type == 'l') { // Element is a list
-      $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
-      $this->Pos += $this->Val[$Key]->Pos;
-
-    } elseif ($Type == 'd') { // Element is a dictionary
-      $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
-      $this->Pos += $this->Val[$Key]->Pos;
-      // Sort by key to respect spec
-      if (!empty($this->Val[$Key]->Val)) {
-        ksort($this->Val[$Key]->Val);
+class BENCODE2
+{
+    public $Val; // Decoded array
+  public $Pos = 1; // Pointer that indicates our position in the string
+  public $Str = ''; // Torrent string
+
+  public function __construct($Val, $IsParsed = false)
+  {
+      if (!$IsParsed) {
+          $this->Str = $Val;
+          $this->dec();
+      } else {
+          $this->Val = $Val;
       }
+  }
 
-    } else {
-      die('Invalid torrent file');
+    // Decode an element based on the type. The type is really just an indicator.
+    public function decode($Type, $Key)
+    {
+        if (is_number($Type)) { // Element is a string
+            // Get length of string
+            $StrLen = $Type;
+            while ($this->Str[$this->Pos + 1] !== ':') {
+                $this->Pos++;
+                $StrLen.=$this->Str[$this->Pos];
+            }
+            $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
+
+            $this->Pos += $StrLen;
+            $this->Pos += 2;
+        } elseif ($Type === 'i') { // Element is an int
+            $this->Pos++;
+
+            // Find end of integer (first occurance of 'e' after position)
+            $End = strpos($this->Str, 'e', $this->Pos);
+
+            // Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string
+            $this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos);
+            $this->Pos = $End + 1;
+        } elseif ($Type === 'l') { // Element is a list
+            $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
+            $this->Pos += $this->Val[$Key]->Pos;
+        } elseif ($Type === 'd') { // Element is a dictionary
+            $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
+            $this->Pos += $this->Val[$Key]->Pos;
+            // Sort by key to respect spec
+            if (!empty($this->Val[$Key]->Val)) {
+                ksort($this->Val[$Key]->Val);
+            }
+        } else {
+            die('Invalid torrent file');
+        }
     }
-  }
 
-  function encode($Val) {
-    if (is_int($Val)) { // Integer
-      return 'i'.$Val.'e';
-    } elseif (is_string($Val)) {
-      return strlen($Val).':'.$Val;
-    } elseif (is_object($Val)) {
-      return $Val->enc();
-    } else {
-      return 'fail';
+    public function encode($Val)
+    {
+        if (is_int($Val)) { // Integer
+            return 'i'.$Val.'e';
+        } elseif (is_string($Val)) {
+            return strlen($Val).':'.$Val;
+        } elseif (is_object($Val)) {
+            return $Val->enc();
+        } else {
+            return 'fail';
+        }
     }
-  }
 }
 
-class BENCODE_LIST extends BENCODE2 {
-  function enc() {
-    if (empty($this->Val)) {
-      return 'le';
-    }
-    $Str = 'l';
-    reset($this->Val);
-    foreach ($this->Val as $Value) {
-      $Str.=$this->encode($Value);
+class BENCODE_LIST extends BENCODE2
+{
+    public function enc()
+    {
+        if (empty($this->Val)) {
+            return 'le';
+        }
+        $Str = 'l';
+        reset($this->Val);
+        foreach ($this->Val as $Value) {
+            $Str.=$this->encode($Value);
+        }
+        return $Str.'e';
     }
-    return $Str.'e';
-  }
-
-  // Decode a list
-  function dec() {
-    $Key = 0; // Array index
-    $Length = strlen($this->Str);
-    while ($this->Pos < $Length) {
-      $Type = $this->Str[$this->Pos];
-      // $Type now indicates what type of element we're dealing with
-      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-      if ($Type == 'e') { // End of list
-        $this->Pos += 1;
-        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-        return;
-      }
 
-      // Decode the bencoded element.
-      // This function changes $this->Pos and $this->Val, so you don't have to.
-      $this->decode($Type, $Key);
-      ++$Key;
+    // Decode a list
+    public function dec()
+    {
+        $Key = 0; // Array index
+        $Length = strlen($this->Str);
+        while ($this->Pos < $Length) {
+            $Type = $this->Str[$this->Pos];
+            // $Type now indicates what type of element we're dealing with
+            // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+            if ($Type === 'e') { // End of list
+                $this->Pos += 1;
+                unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+                return;
+            }
+
+            // Decode the bencoded element.
+            // This function changes $this->Pos and $this->Val, so you don't have to.
+            $this->decode($Type, $Key);
+            ++$Key;
+        }
+        return true;
     }
-    return true;
-  }
 }
 
-class BENCODE_DICT extends BENCODE2 {
-  function enc() {
-    if (empty($this->Val)) {
-      return 'de';
-    }
-    $Str = 'd';
-    reset($this->Val);
-    foreach ($this->Val as $Key => $Value) {
-      $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+class BENCODE_DICT extends BENCODE2
+{
+    public function enc()
+    {
+        if (empty($this->Val)) {
+            return 'de';
+        }
+        $Str = 'd';
+        reset($this->Val);
+        foreach ($this->Val as $Key => $Value) {
+            $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+        }
+        return $Str.'e';
     }
-    return $Str.'e';
-  }
-
-  // Decode a dictionary
-  function dec() {
-    $Length = strlen($this->Str);
-    while ($this->Pos<$Length) {
-
-      if ($this->Str[$this->Pos] == 'e') { // End of dictionary
-        $this->Pos += 1;
-        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-        return;
-      }
-
-      // Get the dictionary key
-      // Length of the key, in bytes
-      $KeyLen = $this->Str[$this->Pos];
-
-      // Allow for multi-digit lengths
-      while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
-        $this->Pos++;
-        $KeyLen.=$this->Str[$this->Pos];
-      }
-      // $this->Pos is now on the last letter of the key length
-      // Adding 2 brings it past that character and the ':' to the beginning of the string
-      $this->Pos += 2;
-
-      // Get the name of the key
-      $Key = substr($this->Str, $this->Pos, $KeyLen);
-
-      // Move the position past the key to the beginning of the element
-      $this->Pos += $KeyLen;
-      $Type = $this->Str[$this->Pos];
-      // $Type now indicates what type of element we're dealing with
-      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-      // Decode the bencoded element.
-      // This function changes $this->Pos and $this->Val, so you don't have to.
-      $this->decode($Type, $Key);
-
 
+    // Decode a dictionary
+    public function dec()
+    {
+        $Length = strlen($this->Str);
+        while ($this->Pos<$Length) {
+            if ($this->Str[$this->Pos] === 'e') { // End of dictionary
+                $this->Pos += 1;
+                unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+                return;
+            }
+
+            // Get the dictionary key
+            // Length of the key, in bytes
+            $KeyLen = $this->Str[$this->Pos];
+
+            // Allow for multi-digit lengths
+            while ($this->Str[$this->Pos + 1] !== ':' && $this->Pos + 1 < $Length) {
+                $this->Pos++;
+                $KeyLen.=$this->Str[$this->Pos];
+            }
+            // $this->Pos is now on the last letter of the key length
+            // Adding 2 brings it past that character and the ':' to the beginning of the string
+            $this->Pos += 2;
+
+            // Get the name of the key
+            $Key = substr($this->Str, $this->Pos, $KeyLen);
+
+            // Move the position past the key to the beginning of the element
+            $this->Pos += $KeyLen;
+            $Type = $this->Str[$this->Pos];
+            // $Type now indicates what type of element we're dealing with
+            // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+            // Decode the bencoded element.
+            // This function changes $this->Pos and $this->Val, so you don't have to.
+            $this->decode($Type, $Key);
+        }
+        return true;
     }
-    return true;
-  }
 }
 
 
-class TORRENT extends BENCODE_DICT {
-  function dump() {
-    // Convenience function used for testing and figuring out how we store the data
-    print_r($this->Val);
-  }
-
-  function dump_data() {
-    // Function which serializes $this->Val for storage
-    return base64_encode(serialize($this->Val));
-  }
+class TORRENT extends BENCODE_DICT
+{
+    public function dump()
+    {
+        // Convenience function used for testing and figuring out how we store the data
+        print_r($this->Val);
+    }
 
-  function set_announce_list($UrlsList) {
-    $AnnounceList = new BENCODE_LIST([], true);
-    foreach ($UrlsList as $Urls) {
-      $SubList = new BENCODE_LIST($Urls, true);
-      unset($SubList->Str);
-      $AnnounceList->Val[] = $SubList;
+    public function dump_data()
+    {
+        // Function which serializes $this->Val for storage
+        return base64_encode(serialize($this->Val));
     }
-    $this->Val['announce-list'] = $AnnounceList;
-  }
 
-  function set_announce_url($Announce) {
-    $this->Val['announce'] = $Announce;
-    ksort($this->Val);
-  }
+    public function set_announce_list($UrlsList)
+    {
+        $AnnounceList = new BENCODE_LIST([], true);
+        foreach ($UrlsList as $Urls) {
+            $SubList = new BENCODE_LIST($Urls, true);
+            unset($SubList->Str);
+            $AnnounceList->Val[] = $SubList;
+        }
+        $this->Val['announce-list'] = $AnnounceList;
+    }
 
-  // Returns an array of:
-  //  * the files in the torrent
-  //  * the total size of files described therein
-  function file_list() {
-    $FileList = [];
-    if (!isset($this->Val['info']->Val['files'])) { // Single file mode
-      $TotalSize = $this->Val['info']->Val['length'];
-      $FileList[] = array($TotalSize, $this->get_name());
-    } else { // Multiple file mode
-      $FileNames = [];
-      $FileSizes = [];
-      $TotalSize = 0;
-      $Files = $this->Val['info']->Val['files']->Val;
-      if (isset($Files[0]->Val['path.utf-8'])) {
-        $PathKey = 'path.utf-8';
-      } else {
-        $PathKey = 'path';
-      }
-      foreach ($Files as $File) {
-        $FileSize = $File->Val['length'];
-        $TotalSize += $FileSize;
+    public function set_announce_url($Announce)
+    {
+        $this->Val['announce'] = $Announce;
+        ksort($this->Val);
+    }
 
-        $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
-        $FileSizes[] = $FileSize;
-        $FileNames[] = $FileName;
-      }
-      natcasesort($FileNames);
-      foreach ($FileNames as $Index => $FileName) {
-        $FileList[] = array($FileSizes[$Index], $FileName);
-      }
+    // Returns an array of:
+    //  * the files in the torrent
+    //  * the total size of files described therein
+    public function file_list()
+    {
+        $FileList = [];
+        if (!isset($this->Val['info']->Val['files'])) { // Single file mode
+            $TotalSize = $this->Val['info']->Val['length'];
+            $FileList[] = array($TotalSize, $this->get_name());
+        } else { // Multiple file mode
+            $FileNames = [];
+            $FileSizes = [];
+            $TotalSize = 0;
+            $Files = $this->Val['info']->Val['files']->Val;
+            if (isset($Files[0]->Val['path.utf-8'])) {
+                $PathKey = 'path.utf-8';
+            } else {
+                $PathKey = 'path';
+            }
+            foreach ($Files as $File) {
+                $FileSize = $File->Val['length'];
+                $TotalSize += $FileSize;
+
+                $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
+                $FileSizes[] = $FileSize;
+                $FileNames[] = $FileName;
+            }
+            natcasesort($FileNames);
+            foreach ($FileNames as $Index => $FileName) {
+                $FileList[] = array($FileSizes[$Index], $FileName);
+            }
+        }
+        return array($TotalSize, $FileList);
     }
-    return array($TotalSize, $FileList);
-  }
 
-  function get_name() {
-    if (isset($this->Val['info']->Val['name.utf-8'])) {
-      return $this->Val['info']->Val['name.utf-8'];
-    } else {
-      return $this->Val['info']->Val['name'];
+    public function get_name()
+    {
+        if (isset($this->Val['info']->Val['name.utf-8'])) {
+            return $this->Val['info']->Val['name.utf-8'];
+        } else {
+            return $this->Val['info']->Val['name'];
+        }
     }
-  }
 
-  function make_private() {
-    //----- The following properties do not affect the infohash:
+    public function make_private()
+    {
+        //----- The following properties do not affect the infohash:
 
-    // anounce-list is an unofficial extension to the protocol
-    // that allows for multiple trackers per torrent
-    unset($this->Val['announce-list']);
+        // anounce-list is an unofficial extension to the protocol
+        // that allows for multiple trackers per torrent
+        unset($this->Val['announce-list']);
 
-    // Bitcomet & Azureus cache peers in here
-    unset($this->Val['nodes']);
+        // Bitcomet & Azureus cache peers in here
+        unset($this->Val['nodes']);
 
-    // Azureus stores the dht_backup_enable flag here
-    unset($this->Val['azureus_properties']);
+        // Azureus stores the dht_backup_enable flag here
+        unset($this->Val['azureus_properties']);
 
-    // Remove web-seeds
-    unset($this->Val['url-list']);
+        // Remove web-seeds
+        #unset($this->Val['url-list']);
 
-    // Remove libtorrent resume info
-    unset($this->Val['libtorrent_resume']);
+        // Remove libtorrent resume info
+        unset($this->Val['libtorrent_resume']);
 
-    //----- End properties that do not affect the infohash
-    if ($this->Val['info']->Val['private']) {
-      return true; // Torrent is private
-    } else {
-      // Torrent is not private!
-      // add private tracker flag and sort info dictionary
-      $this->Val['info']->Val['private'] = 1;
-      ksort($this->Val['info']->Val);
-      return false;
+        //----- End properties that do not affect the infohash
+        if ($this->Val['info']->Val['private']) {
+            return true; // Torrent is private
+        } else {
+            // Torrent is not private!
+            // add private tracker flag and sort info dictionary
+            $this->Val['info']->Val['private'] = 1;
+            ksort($this->Val['info']->Val);
+            return false;
+        }
     }
-  }
 }
-
-?>

classes/torrent_form.class.php

@@ -16,7 +16,7 @@ class TorrentForm
     public $ContainersProt = [];
     public $Codecs = [];
     public $Resolutions = [];
-    var $AudioFormats = [];
+    public $AudioFormats = [];
     #var $Subbing = [];
     #var $Languages = [];
     #var $Platform = [];
@@ -82,26 +82,18 @@ class TorrentForm
 
   <p style="text-align: center;">
     <?php
-      $Announces = call_user_func_array('array_merge', ANNOUNCE_URLS);
-        foreach ($Announces as $Announce) {
-            # Loop through tracker URLs?>
+      $Announces = ANNOUNCE_URLS[0];
+      #$Announces = call_user_func_array('array_merge', ANNOUNCE_URLS);
+      foreach ($Announces as $Announce) {
+          # Loop through tracker URLs
+            ?>
     <strong>Announce</strong>
-
-    <?php
-    # Buying into the shit coding style
-    # Just trying to mirror content on a Tier 2 public tracker
-    if (!strstr($Announce, 'openbittorrent')) {
-        ?>
     <input type="text"
       value="<?= $Announce . '/' . G::$LoggedUser['torrent_pass'] . '/announce' ?>"
       size="74" onclick="this.select();" readonly="readonly" /> <br />
     <?php
-    } else { ?>
-    <input type="text" value="<?= $Announce ?>" size="74"
-      onclick="this.select();" readonly="readonly" /> <br />
-    <?php
-    }
-        } ?>
+      }
+    ?>
 
     <strong>Source</strong>
     <input type="text" value="<?= Users::get_upload_sources()[0] ?>"
@@ -156,8 +148,8 @@ class TorrentForm
 
       <tr>
         <td class="label">
-        Torrent File
-        <strong class="important_text">*</strong>
+          Torrent File
+          <strong class="important_text">*</strong>
         </td>
         <td><input id="file" type="file" name="file_input" size="50" /><br />
           Use the above announce URL and set the private flag in your BitTorrent client, e.g.,
@@ -167,8 +159,8 @@ class TorrentForm
 
       <tr>
         <td class="label">
-        Category
-        <strong class="important_text">*</strong>
+          Category
+          <strong class="important_text">*</strong>
         </td>
         <td>
           <select id="categories" name="type" onchange="Categories()" <?= ($this->DisabledFlag) ? ' disabled="disabled"' : '' ?>>
@@ -318,13 +310,13 @@ class TorrentForm
   </tr>
 
   <!-- Semantic Versioning -->
-    <tr id="audio_tr">
+  <tr id="audio_tr">
     <td class="label">Version</td>
     <td>
-      <input type="text" id="audioformat" name="audioformat" size="10"
-        pattern="\d+\.\d+\.\d+" value="<?= display_str($Torrent['AudioFormat']) ?>"
+      <input type="text" id="audioformat" name="audioformat" size="10" pattern="\d+\.\d+\.\d+"
+        value="<?= display_str($Torrent['AudioFormat']) ?>"
         <?= $this->Disabled ?>/><br />
-      Please see <a href="https://semver.org target="_blank">Semantic Versioning</a>; start with 0.1.0
+      Please see <a href="https://semver.org target=" _blank">Semantic Versioning</a>; start with 0.1.0
     </td>
   </tr>
 
@@ -465,7 +457,7 @@ class TorrentForm
     </td>
     <td>
       <select name="media">
-      <option value="">---</option>
+        <option value="">---</option>
         <?php
           foreach ($this->Media as $Media) {
               echo "\t\t\t\t\t\t<option value=\"$Media\"";
@@ -545,7 +537,7 @@ class TorrentForm
     </td>
     <td>
       <select name="container">
-      <option value="">---</option>
+        <option value="">---</option>
         <?php
           foreach ($this->Containers as $Name => $Container) {
               echo "<option value='$Name'>$Name</option>\n";
@@ -563,7 +555,7 @@ class TorrentForm
     </td>
     <td>
       <select id="container" name="container">
-      <option value="">---</option>
+        <option value="">---</option>
         <?php
           foreach ($this->ContainersGames as $Name => $Container) {
               echo "<option value='$Name'>$Name</option>\n";
@@ -581,7 +573,7 @@ class TorrentForm
     </td>
     <td>
       <select id="container" name="container">
-      <option value="">---</option>
+        <option value="">---</option>
         <?php
           foreach ($this->ContainersProt as $Name => $Container) {
               echo "<option value='$Name'>$Name</option>\n";
@@ -599,7 +591,7 @@ class TorrentForm
     </td>
     <td>
       <select name='archive'>
-      <option value="">---</option>
+        <option value="">---</option>
         <?php
           foreach ($this->Archives as $Name => $Archive) {
               echo "\t\t\t\t\t\t<option value=\"$Name\"";

classes/torrentsdl.class.php

@@ -1,142 +1,154 @@
-<?
+<?php
 /**
  * Class for functions related to the features involving torrent downloads
  */
-class TorrentsDL {
-  const ChunkSize = 100;
-  const MaxPathLength = 200;
-  private $QueryResult;
-  private $QueryRowNum = 0;
-  private $Zip;
-  private $IDBoundaries;
-  private $FailedFiles = [];
-  private $NumAdded = 0;
-  private $NumFound = 0;
-  private $Size = 0;
-  private $Title;
-  private $User;
-  private $AnnounceURL;
-  private $AnnounceList;
+class TorrentsDL
+{
+    const ChunkSize = 100;
+    const MaxPathLength = 200;
+    private $QueryResult;
+    private $QueryRowNum = 0;
+    private $Zip;
+    private $IDBoundaries;
+    private $FailedFiles = [];
+    private $NumAdded = 0;
+    private $NumFound = 0;
+    private $Size = 0;
+    private $Title;
+    private $User;
+    private $AnnounceURL;
+    private $AnnounceList;
 
-  /**
-   * Create a Zip object and store the query results
-   *
-   * @param mysqli_result $QueryResult results from a query on the collector pages
-   * @param string $Title name of the collection that will be created
-   * @param string $AnnounceURL URL to add to the created torrents
-   */
-  public function __construct(&$QueryResult, $Title) {
-    G::$Cache->InternalCache = false; // The internal cache is almost completely useless for this
-    Zip::unlimit(); // Need more memory and longer timeout
-    $this->QueryResult = $QueryResult;
-    $this->Title = $Title;
-    $this->User = G::$LoggedUser;
-    $this->AnnounceURL = ANNOUNCE_URLS[0][0]."/".G::$LoggedUser['torrent_pass']."/announce";
-    function add_passkey($Ann) {
-      return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann."/".G::$LoggedUser['torrent_pass']."/announce";
-    }
-    $this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
-    $this->Zip = new Zip(Misc::file_string($Title));
-  }
+    /**
+     * Create a Zip object and store the query results
+     *
+     * @param mysqli_result $QueryResult results from a query on the collector pages
+     * @param string $Title name of the collection that will be created
+     * @param string $AnnounceURL URL to add to the created torrents
+     */
+    public function __construct(&$QueryResult, $Title)
+    {
+        G::$Cache->InternalCache = false; // The internal cache is almost completely useless for this
+        Zip::unlimit(); // Need more memory and longer timeout
+        $this->QueryResult = $QueryResult;
+        $this->Title = $Title;
+        $this->User = G::$LoggedUser;
+        $this->AnnounceURL = ANNOUNCE_URLS[0][0].'/'.G::$LoggedUser['torrent_pass'].'/announce';
 
-  /**
-   * Store the results from a DB query in smaller chunks to save memory
-   *
-   * @param string $Key the key to use in the result hash map
-   * @return array with results and torrent group IDs or false if there are no results left
-   */
-  public function get_downloads($Key) {
-    $GroupIDs = $Downloads = [];
-    $OldQuery = G::$DB->get_query_id();
-    G::$DB->set_query_id($this->QueryResult);
-    if (!isset($this->IDBoundaries)) {
-      if ($Key == 'TorrentID') {
-        $this->IDBoundaries = false;
-      } else {
-        $this->IDBoundaries = G::$DB->to_pair($Key, 'TorrentID', false);
-      }
-    }
-    $Found = 0;
-    while ($Download = G::$DB->next_record(MYSQLI_ASSOC, false)) {
-      if (!$this->IDBoundaries || $Download['TorrentID'] == $this->IDBoundaries[$Download[$Key]]) {
-        $Found++;
-        $Downloads[$Download[$Key]] = $Download;
-        $GroupIDs[$Download['TorrentID']] = $Download['GroupID'];
-        if ($Found >= self::ChunkSize) {
-          break;
+        function add_passkey($Ann)
+        {
+            return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann.'/'.G::$LoggedUser['torrent_pass'].'/announce';
         }
-      }
+
+        $this->AnnounceList = array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
+        #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
+        $this->Zip = new Zip(Misc::file_string($Title));
     }
-    $this->NumFound += $Found;
-    G::$DB->set_query_id($OldQuery);
-    if (empty($Downloads)) {
-      return false;
+
+    /**
+     * Store the results from a DB query in smaller chunks to save memory
+     *
+     * @param string $Key the key to use in the result hash map
+     * @return array with results and torrent group IDs or false if there are no results left
+     */
+    public function get_downloads($Key)
+    {
+        $GroupIDs = $Downloads = [];
+        $OldQuery = G::$DB->get_query_id();
+        G::$DB->set_query_id($this->QueryResult);
+        if (!isset($this->IDBoundaries)) {
+            if ($Key == 'TorrentID') {
+                $this->IDBoundaries = false;
+            } else {
+                $this->IDBoundaries = G::$DB->to_pair($Key, 'TorrentID', false);
+            }
+        }
+        $Found = 0;
+        while ($Download = G::$DB->next_record(MYSQLI_ASSOC, false)) {
+            if (!$this->IDBoundaries || $Download['TorrentID'] == $this->IDBoundaries[$Download[$Key]]) {
+                $Found++;
+                $Downloads[$Download[$Key]] = $Download;
+                $GroupIDs[$Download['TorrentID']] = $Download['GroupID'];
+                if ($Found >= self::ChunkSize) {
+                    break;
+                }
+            }
+        }
+        $this->NumFound += $Found;
+        G::$DB->set_query_id($OldQuery);
+        if (empty($Downloads)) {
+            return false;
+        }
+        return array($Downloads, $GroupIDs);
     }
-    return array($Downloads, $GroupIDs);
-  }
 
-  /**
-   * Add a file to the zip archive
-   *
-   * @param string $TorrentData bencoded torrent without announce url (new format) or TORRENT object (old format)
-   * @param array $Info file info stored as an array with at least the keys
-   *  Artist, Name, Year, Media, Format, Encoding and TorrentID
-   * @param string $FolderName folder name
-   */
-  public function add_file(&$TorrentData, $Info, $FolderName = '') {
-    $FolderName = Misc::file_string($FolderName);
-    $MaxPathLength = $FolderName ? (self::MaxPathLength - strlen($FolderName) - 1) : self::MaxPathLength;
-    $FileName = self::construct_file_name($Info['Artist'], $Info['Name'], $Info['Year'], $Info['Media'], $Info['Format'], $Info['Encoding'], $Info['TorrentID'], $MaxPathLength);
-    $this->Size += $Info['Size'];
-    $this->NumAdded++;
-    $this->Zip->add_file(self::get_file($TorrentData, $this->AnnounceURL, $this->AnnounceList), ($FolderName ? "$FolderName/" : "") . $FileName);
-    usleep(25000); // We don't want to send much faster than the client can receive
-  }
+    /**
+     * Add a file to the zip archive
+     *
+     * @param string $TorrentData bencoded torrent without announce url (new format) or TORRENT object (old format)
+     * @param array $Info file info stored as an array with at least the keys
+     *  Artist, Name, Year, Media, Format, Encoding and TorrentID
+     * @param string $FolderName folder name
+     */
+    public function add_file(&$TorrentData, $Info, $FolderName = '')
+    {
+        $FolderName = Misc::file_string($FolderName);
+        $MaxPathLength = $FolderName ? (self::MaxPathLength - strlen($FolderName) - 1) : self::MaxPathLength;
+        $FileName = self::construct_file_name($Info['Artist'], $Info['Name'], $Info['Year'], $Info['Media'], $Info['Format'], $Info['Encoding'], $Info['TorrentID'], $MaxPathLength);
+        $this->Size += $Info['Size'];
+        $this->NumAdded++;
+        $this->Zip->add_file(self::get_file($TorrentData, $this->AnnounceURL, $this->AnnounceList), ($FolderName ? "$FolderName/" : "") . $FileName);
+        usleep(25000); // We don't want to send much faster than the client can receive
+    }
 
-  /**
-   * Add a file to the list of files that could not be downloaded
-   *
-   * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
-   */
-  public function fail_file($Info) {
-    $this->FailedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
-  }
+    /**
+     * Add a file to the list of files that could not be downloaded
+     *
+     * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
+     */
+    public function fail_file($Info)
+    {
+        $this->FailedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
+    }
 
-  /**
-   * Add a file to the list of files that did not match the user's format or quality requirements
-   *
-   * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
-   */
-  public function skip_file($Info) {
-    $this->SkippedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
-  }
+    /**
+     * Add a file to the list of files that did not match the user's format or quality requirements
+     *
+     * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
+     */
+    public function skip_file($Info)
+    {
+        $this->SkippedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
+    }
 
-  /**
-   * Add a summary to the archive and include a list of files that could not be added. Close the zip archive
-   *
-   * @param bool $FilterStats whether to include filter stats in the report
-   */
-  public function finalize($FilterStats = true) {
-    $this->Zip->add_file($this->summary($FilterStats), "Summary.txt");
-    if (!empty($this->FailedFiles)) {
-      $this->Zip->add_file($this->errors(), "Errors.txt");
+    /**
+     * Add a summary to the archive and include a list of files that could not be added. Close the zip archive
+     *
+     * @param bool $FilterStats whether to include filter stats in the report
+     */
+    public function finalize($FilterStats = true)
+    {
+        $this->Zip->add_file($this->summary($FilterStats), "Summary.txt");
+        if (!empty($this->FailedFiles)) {
+            $this->Zip->add_file($this->errors(), "Errors.txt");
+        }
+        $this->Zip->close_stream();
     }
-    $this->Zip->close_stream();
-  }
 
-  /**
-   * Produce a summary text over the collector results
-   *
-   * @param bool $FilterStats whether to include filter stats in the report
-   * @return summary text
-   */
-  public function summary($FilterStats) {
-    global $ScriptStartTime;
-    $Time = number_format(1000 * (microtime(true) - $ScriptStartTime), 2)." ms";
-    $Used = Format::get_size(memory_get_usage(true));
-    $Date = date("M d Y, H:i");
-    $NumSkipped = count($this->SkippedFiles);
-    return "Collector Download Summary for $this->Title - " . SITE_NAME . "\r\n"
+    /**
+     * Produce a summary text over the collector results
+     *
+     * @param bool $FilterStats whether to include filter stats in the report
+     * @return summary text
+     */
+    public function summary($FilterStats)
+    {
+        global $ScriptStartTime;
+        $Time = number_format(1000 * (microtime(true) - $ScriptStartTime), 2)." ms";
+        $Used = Format::get_size(memory_get_usage(true));
+        $Date = date("M d Y, H:i");
+        $NumSkipped = count($this->SkippedFiles);
+        return "Collector Download Summary for $this->Title - " . SITE_NAME . "\r\n"
       . "\r\n"
       . "User:    {$this->User[Username]}\r\n"
       . "Passkey: {$this->User[torrent_pass]}\r\n"
@@ -157,89 +169,92 @@ class TorrentsDL {
           . "Albums unavailable within your criteria (consider making a request for your desired format):\r\n"
           . implode("\r\n", $this->SkippedFiles) . "\r\n"
         : "");
-  }
+    }
 
-  /**
-   * Compile a list of files that could not be added to the archive
-   *
-   * @return list of files
-   */
-  public function errors() {
-    return "A server error occurred. Please try again at a later time.\r\n"
+    /**
+     * Compile a list of files that could not be added to the archive
+     *
+     * @return list of files
+     */
+    public function errors()
+    {
+        return "A server error occurred. Please try again at a later time.\r\n"
       . "\r\n"
       . "The following torrents could not be downloaded:\r\n"
       . implode("\r\n", $this->FailedFiles) . "\r\n";
-  }
-
-  /**
-   * Combine a bunch of torrent info into a standardized file name
-   *
-   * @params most input variables are self-explanatory
-   * @param int $TorrentID if given, append "-TorrentID" to torrent name
-   * @param int $MaxLength maximum file name length
-   * @return file name with at most $MaxLength characters
-   */
-  public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $MaxLength = self::MaxPathLength) {
-    $MaxLength -= 8; // ".torrent"
-    if ($TorrentID !== false) {
-      $MaxLength -= (strlen($TorrentID) + 1);
-    }
-    $TorrentArtist = Misc::file_string($Artist);
-    $TorrentName = Misc::file_string($Album);
-    if ($Year > 0) {
-      $TorrentName .= " - $Year";
-    }
-    $TorrentInfo = [];
-    if ($Media != '') {
-      $TorrentInfo[] = $Media;
-    }
-    if ($Format != '') {
-      $TorrentInfo[] = $Format;
-    }
-    if ($Encoding != '') {
-      $TorrentInfo[] = $Encoding;
-    }
-    if (!empty($TorrentInfo)) {
-      $TorrentInfo = ' (' . Misc::file_string(implode(' - ', $TorrentInfo)) . ')';
-    } else {
-      $TorrentInfo = '';
     }
 
-    if (!$TorrentName) {
-      $TorrentName = 'No Name';
-    } elseif (mb_strlen($TorrentArtist . $TorrentName . $TorrentInfo, 'UTF-8') <= $MaxLength) {
-      $TorrentName = $TorrentArtist . $TorrentName;
-    }
+    /**
+     * Combine a bunch of torrent info into a standardized file name
+     *
+     * @params most input variables are self-explanatory
+     * @param int $TorrentID if given, append "-TorrentID" to torrent name
+     * @param int $MaxLength maximum file name length
+     * @return file name with at most $MaxLength characters
+     */
+    public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $MaxLength = self::MaxPathLength)
+    {
+        $MaxLength -= 8; // ".torrent"
+        if ($TorrentID !== false) {
+            $MaxLength -= (strlen($TorrentID) + 1);
+        }
+        $TorrentArtist = Misc::file_string($Artist);
+        $TorrentName = Misc::file_string($Album);
+        if ($Year > 0) {
+            $TorrentName .= " - $Year";
+        }
+        $TorrentInfo = [];
+        if ($Media != '') {
+            $TorrentInfo[] = $Media;
+        }
+        if ($Format != '') {
+            $TorrentInfo[] = $Format;
+        }
+        if ($Encoding != '') {
+            $TorrentInfo[] = $Encoding;
+        }
+        if (!empty($TorrentInfo)) {
+            $TorrentInfo = ' (' . Misc::file_string(implode(' - ', $TorrentInfo)) . ')';
+        } else {
+            $TorrentInfo = '';
+        }
 
-    $TorrentName = Format::cut_string($TorrentName . $TorrentInfo, $MaxLength, true, false);
-    if ($TorrentID !== false) {
-      $TorrentName .= "-$TorrentID";
-    }
-    return "$TorrentName.torrent";
-  }
+        if (!$TorrentName) {
+            $TorrentName = 'No Name';
+        } elseif (mb_strlen($TorrentArtist . $TorrentName . $TorrentInfo, 'UTF-8') <= $MaxLength) {
+            $TorrentName = $TorrentArtist . $TorrentName;
+        }
 
-  /**
-   * Convert a stored torrent into a binary file that can be loaded in a torrent client
-   *
-   * @param mixed $TorrentData bencoded torrent without announce URL (new format) or TORRENT object (old format)
-   * @return bencoded string
-   */
-  public static function get_file(&$TorrentData, $AnnounceURL, $AnnounceList = []) {
-    if (Misc::is_new_torrent($TorrentData)) {
-      $Bencode = BencodeTorrent::add_announce_url($TorrentData, $AnnounceURL);
-      if (!empty($AnnounceList)) {
-        $Bencode = BencodeTorrent::add_announce_list($Bencode, $AnnounceList);
-      }
-      return $Bencode;
+        $TorrentName = Format::cut_string($TorrentName . $TorrentInfo, $MaxLength, true, false);
+        if ($TorrentID !== false) {
+            $TorrentName .= "-$TorrentID";
+        }
+        return "$TorrentName.torrent";
     }
-    $Tor = new TORRENT(unserialize(base64_decode($TorrentData)), true);
-    $Tor->set_announce_url($AnnounceURL);
-    unset($Tor->Val['announce-list']);
-    if (!empty($AnnounceList)) {
-      $Tor->set_announce_list($AnnounceList);
+
+    /**
+     * Convert a stored torrent into a binary file that can be loaded in a torrent client
+     *
+     * @param mixed $TorrentData bencoded torrent without announce URL (new format) or TORRENT object (old format)
+     * @return bencoded string
+     */
+    public static function get_file(&$TorrentData, $AnnounceURL, $AnnounceList = [])
+    {
+        if (Misc::is_new_torrent($TorrentData)) {
+            $Bencode = BencodeTorrent::add_announce_url($TorrentData, $AnnounceURL);
+            if (!empty($AnnounceList)) {
+                $Bencode = BencodeTorrent::add_announce_list($Bencode, $AnnounceList);
+            }
+            return $Bencode;
+        }
+        $Tor = new TORRENT(unserialize(base64_decode($TorrentData)), true);
+        $Tor->set_announce_url($AnnounceURL);
+        unset($Tor->Val['announce-list']);
+        if (!empty($AnnounceList)) {
+            $Tor->set_announce_list($AnnounceList);
+        }
+        unset($Tor->Val['url-list']);
+        unset($Tor->Val['libtorrent_resume']);
+        return $Tor->enc();
     }
-    unset($Tor->Val['url-list']);
-    unset($Tor->Val['libtorrent_resume']);
-    return $Tor->enc();
-  }
 }

sections/torrents/download.php

@@ -1,38 +1,38 @@
-<?
+<?php
 if (!isset($_REQUEST['authkey']) || !isset($_REQUEST['torrent_pass'])) {
-  enforce_login();
-  $TorrentPass = $LoggedUser['torrent_pass'];
-  $UserID    = $LoggedUser['ID'];
-  $AuthKey   = $LoggedUser['AuthKey'];
+    enforce_login();
+    $TorrentPass = $LoggedUser['torrent_pass'];
+    $UserID    = $LoggedUser['ID'];
+    $AuthKey   = $LoggedUser['AuthKey'];
 } else {
-  if (strpos($_REQUEST['torrent_pass'], '_') !== false) {
-    error(404);
-  }
+    if (strpos($_REQUEST['torrent_pass'], '_') !== false) {
+        error(404);
+    }
 
-  $UserInfo = $Cache->get_value('user_'.$_REQUEST['torrent_pass']);
-  if (!is_array($UserInfo)) {
-    $DB->query("
+    $UserInfo = $Cache->get_value('user_'.$_REQUEST['torrent_pass']);
+    if (!is_array($UserInfo)) {
+        $DB->query("
       SELECT ID, la.UserID
       FROM users_main AS m
         INNER JOIN users_info AS i ON i.UserID = m.ID
         LEFT JOIN locked_accounts AS la ON la.UserID = m.ID
       WHERE m.torrent_pass = '".db_string($_REQUEST['torrent_pass'])."'
         AND m.Enabled = '1'");
-    $UserInfo = $DB->next_record();
-    $Cache->cache_value('user_'.$_REQUEST['torrent_pass'], $UserInfo, 3600);
-  }
-  $UserInfo = array($UserInfo);
-  list($UserID, $Locked) = array_shift($UserInfo);
-  if (!$UserID) {
-    error(0);
-  }
-  $TorrentPass = $_REQUEST['torrent_pass'];
-  $AuthKey = $_REQUEST['authkey'];
-
-  if ($Locked == $UserID) {
-    header('HTTP/1.1 403 Forbidden');
-    die();
-  }
+        $UserInfo = $DB->next_record();
+        $Cache->cache_value('user_'.$_REQUEST['torrent_pass'], $UserInfo, 3600);
+    }
+    $UserInfo = array($UserInfo);
+    list($UserID, $Locked) = array_shift($UserInfo);
+    if (!$UserID) {
+        error(0);
+    }
+    $TorrentPass = $_REQUEST['torrent_pass'];
+    $AuthKey = $_REQUEST['authkey'];
+
+    if ($Locked == $UserID) {
+        header('HTTP/1.1 403 Forbidden');
+        die();
+    }
 }
 
 $TorrentID = $_REQUEST['id'];
@@ -40,7 +40,7 @@ $TorrentID = $_REQUEST['id'];
 
 
 if (!is_number($TorrentID)) {
-  error(0);
+    error(0);
 }
 
 /* uTorrent Remote and various scripts redownload .torrent files periodically.
@@ -48,21 +48,21 @@ if (!is_number($TorrentID)) {
   if the .torrent file has been downloaded four times before */
 $ScriptUAs = array('BTWebClient*', 'Python-urllib*', 'python-requests*');
 if (Misc::in_array_partial($_SERVER['HTTP_USER_AGENT'], $ScriptUAs)) {
-  $DB->query("
+    $DB->query("
     SELECT 1
     FROM users_downloads
     WHERE UserID = $UserID
       AND TorrentID = $TorrentID
     LIMIT 4");
-  if ($DB->record_count() === 4) {
-    error('You have already downloaded this torrent file four times. If you need to download it again, please do so from your browser.', true);
-    die();
-  }
+    if ($DB->record_count() === 4) {
+        error('You have already downloaded this torrent file four times. If you need to download it again, please do so from your browser.', true);
+        die();
+    }
 }
 
 $Info = $Cache->get_value('torrent_download_'.$TorrentID);
 if (!is_array($Info) || !array_key_exists('PlainArtists', $Info) || empty($Info[10])) {
-  $DB->query("
+    $DB->query("
     SELECT
       t.Media,
       t.AudioFormat,
@@ -78,17 +78,17 @@ if (!is_array($Info) || !array_key_exists('PlainArtists', $Info) || empty($Info[
     FROM torrents AS t
       INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID
     WHERE t.ID = '".db_string($TorrentID)."'");
-  if (!$DB->has_results()) {
-    error(404);
-  }
-  $Info = array($DB->next_record(MYSQLI_NUM, array(4, 5, 6, 10)));
-  $Artists = Artists::get_artist($Info[0][4], false);
-  $Info['Artists'] = Artists::display_artists($Artists, false, true);
-  $Info['PlainArtists'] = Artists::display_artists($Artists, false, true, false);
-  $Cache->cache_value("torrent_download_$TorrentID", $Info, 0);
+    if (!$DB->has_results()) {
+        error(404);
+    }
+    $Info = array($DB->next_record(MYSQLI_NUM, array(4, 5, 6, 10)));
+    $Artists = Artists::get_artist($Info[0][4], false);
+    $Info['Artists'] = Artists::display_artists($Artists, false, true);
+    $Info['PlainArtists'] = Artists::display_artists($Artists, false, true, false);
+    $Cache->cache_value("torrent_download_$TorrentID", $Info, 0);
 }
 if (!is_array($Info[0])) {
-  error(404);
+    error(404);
 }
 list($Media, $Format, $Encoding, $Year, $GroupID, $Name, $Image, $CategoryID, $Size, $FreeTorrent, $InfoHash) = array_shift($Info); // used for generating the filename
 $Artists = $Info['Artists'];
@@ -96,80 +96,79 @@ $Artists = $Info['Artists'];
 // If he's trying use a token on this, we need to make sure he has one,
 // deduct it, add this to the FLs table, and update his cache key.
 if ($_REQUEST['usetoken'] && $FreeTorrent == '0') {
-  if (isset($LoggedUser)) {
-    $FLTokens = $LoggedUser['FLTokens'];
-    if ($LoggedUser['CanLeech'] != '1') {
-      error('You cannot use tokens while leech disabled.');
-    }
-  }
-  else {
-    $UInfo = Users::user_heavy_info($UserID);
-    if ($UInfo['CanLeech'] != '1') {
-      error('You may not use tokens while leech disabled.');
+    if (isset($LoggedUser)) {
+        $FLTokens = $LoggedUser['FLTokens'];
+        if ($LoggedUser['CanLeech'] != '1') {
+            error('You cannot use tokens while leech disabled.');
+        }
+    } else {
+        $UInfo = Users::user_heavy_info($UserID);
+        if ($UInfo['CanLeech'] != '1') {
+            error('You may not use tokens while leech disabled.');
+        }
+        $FLTokens = $UInfo['FLTokens'];
     }
-    $FLTokens = $UInfo['FLTokens'];
-  }
 
-  // First make sure this isn't already FL, and if it is, do nothing
-
-  if (!Torrents::has_token($TorrentID)) {
-    if ($FLTokens <= 0) {
-      error('You do not have any freeleech tokens left. Please use the regular DL link.');
-    }
-    if ($Size >= 10737418240) {
-      error('This torrent is too large. Please use the regular DL link.');
-    }
-
-    // Let the tracker know about this
-    if (!Tracker::update_tracker('add_token', ['info_hash' => substr('%'.chunk_split($InfoHash,2,'%'),0,-1), 'userid' => $UserID])) {
-      error('Sorry! An error occurred while trying to register your token. Most often, this is due to the tracker being down or under heavy load. Please try again later.');
-    }
+    // First make sure this isn't already FL, and if it is, do nothing
 
     if (!Torrents::has_token($TorrentID)) {
-      $DB->query("
+        if ($FLTokens <= 0) {
+            error('You do not have any freeleech tokens left. Please use the regular DL link.');
+        }
+        if ($Size >= 10737418240) {
+            error('This torrent is too large. Please use the regular DL link.');
+        }
+
+        // Let the tracker know about this
+        if (!Tracker::update_tracker('add_token', ['info_hash' => substr('%'.chunk_split($InfoHash, 2, '%'), 0, -1), 'userid' => $UserID])) {
+            error('Sorry! An error occurred while trying to register your token. Most often, this is due to the tracker being down or under heavy load. Please try again later.');
+        }
+
+        if (!Torrents::has_token($TorrentID)) {
+            $DB->query("
         INSERT INTO users_freeleeches (UserID, TorrentID, Time)
         VALUES ($UserID, $TorrentID, NOW())
         ON DUPLICATE KEY UPDATE
           Time = VALUES(Time),
           Expired = FALSE,
           Uses = Uses + 1");
-      $DB->query("
+            $DB->query("
         UPDATE users_main
         SET FLTokens = FLTokens - 1
         WHERE ID = $UserID");
 
-      // Fix for downloadthemall messing with the cached token count
-      $UInfo = Users::user_heavy_info($UserID);
-      $FLTokens = $UInfo['FLTokens'];
+            // Fix for downloadthemall messing with the cached token count
+            $UInfo = Users::user_heavy_info($UserID);
+            $FLTokens = $UInfo['FLTokens'];
 
-      $Cache->begin_transaction("user_info_heavy_$UserID");
-      $Cache->update_row(false, array('FLTokens' => ($FLTokens - 1)));
-      $Cache->commit_transaction(0);
+            $Cache->begin_transaction("user_info_heavy_$UserID");
+            $Cache->update_row(false, array('FLTokens' => ($FLTokens - 1)));
+            $Cache->commit_transaction(0);
 
-      $Cache->delete_value("users_tokens_$UserID");
+            $Cache->delete_value("users_tokens_$UserID");
+        }
     }
-  }
 }
 
 //Stupid Recent Snatches On User Page
 if ($Image != '') {
-  $RecentSnatches = $Cache->get_value("recent_snatches_$UserID");
-  if (!empty($RecentSnatches)) {
-    $Snatch = array(
+    $RecentSnatches = $Cache->get_value("recent_snatches_$UserID");
+    if (!empty($RecentSnatches)) {
+        $Snatch = array(
         'ID' => $GroupID,
         'Name' => $Name,
         'Artist' => $Artists,
         'WikiImage' => $Image);
-    if (!in_array($Snatch, $RecentSnatches)) {
-      if (count($RecentSnatches) === 5) {
-        array_pop($RecentSnatches);
-      }
-      array_unshift($RecentSnatches, $Snatch);
-    } elseif (!is_array($RecentSnatches)) {
-      $RecentSnatches = array($Snatch);
+        if (!in_array($Snatch, $RecentSnatches)) {
+            if (count($RecentSnatches) === 5) {
+                array_pop($RecentSnatches);
+            }
+            array_unshift($RecentSnatches, $Snatch);
+        } elseif (!is_array($RecentSnatches)) {
+            $RecentSnatches = array($Snatch);
+        }
+        $Cache->cache_value("recent_snatches_$UserID", $RecentSnatches, 0);
     }
-    $Cache->cache_value("recent_snatches_$UserID", $RecentSnatches, 0);
-  }
 }
 
 $DB->query("
@@ -183,12 +182,15 @@ $FileName = TorrentsDL::construct_file_name($Info['PlainArtists'], $Name, $Year,
 header('Content-Type: application/x-bittorrent; charset=utf-8');
 header('Content-disposition: attachment; filename="'.$FileName.'"');
 
-function add_passkey($ann) {
-  global $TorrentPass;
-  return (is_array($ann)) ? array_map("add_passkey", $ann) : $ann."/".$TorrentPass."/announce";
+function add_passkey($Ann)
+{
+    global $TorrentPass;
+    return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann.'/'.$TorrentPass.'/announce';
 }
-$UserAnnounceURL = ANNOUNCE_URLS[0][0]."/".$TorrentPass."/announce";
-$UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map("add_passkey", ANNOUNCE_URLS);
+
+$UserAnnounceURL = ANNOUNCE_URLS[0][0].'/'.$TorrentPass.'/announce';
+$UserAnnounceList = array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
+#$UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
 
 echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);