Upload files to 'classes'

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;
+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;
+        }
     }
-  }
-
-  // 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);
-      }
-
-    } 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';
+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';
     }
-    $Str = 'l';
-    reset($this->Val);
-    foreach ($this->Val as $Value) {
-      $Str.=$this->encode($Value);
-    }
-    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';
+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';
     }
-    $Str = 'd';
-    reset($this->Val);
-    foreach ($this->Val as $Key => $Value) {
-      $Str.=strlen($Key).':'.$Key.$this->encode($Value);
-    }
-    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);
-  }
+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 dump_data() {
-    // Function which serializes $this->Val for storage
-    return base64_encode(serialize($this->Val));
-  }
+    public function dump_data()
+    {
+        // Function which serializes $this->Val for storage
+        return base64_encode(serialize($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;
+    }
 
-  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 set_announce_url($Announce)
+    {
+        $this->Val['announce'] = $Announce;
+        ksort($this->Val);
     }
-    $this->Val['announce-list'] = $AnnounceList;
-  }
-
-  function set_announce_url($Announce) {
-    $this->Val['announce'] = $Announce;
-    ksort($this->Val);
-  }
-
-  // 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;
-
-        $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_32bit.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 /*******************************************************************************
 |~~~~ Gazelle bencode parser                                               ~~~~|
 --------------------------------------------------------------------------------
@@ -72,248 +72,257 @@ coded up in around 4 minutes for STC when we discovered this problem, then
 discovered that floats aren't accurate enough to use. :(
 
 *******************************************************************************/
-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;
+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;
+        }
     }
-  }
-
-  // Decode an element based on the type
-  function decode($Type, $Key) {
-    if (ctype_digit($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 mark it as an int (on our version 64 bit box, we cast it to an int)
-      $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
-      ksort($this->Val[$Key]->Val);
-
-    } else {
-      die('Invalid torrent file');
+
+    // Decode an element based on the type
+    public function decode($Type, $Key)
+    {
+        if (ctype_digit($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 mark it as an int (on our version 64 bit box, we cast it to an int)
+            $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
+            ksort($this->Val[$Key]->Val);
+        } else {
+            die('Invalid torrent file');
+        }
     }
-  }
-
-  function encode($Val) {
-    if (is_string($Val)) {
-      if (substr($Val, 0, 7) == '[*INT*]') {
-        return 'i'.substr($Val,7).'e';
-      } else {
-        return strlen($Val).':'.$Val;
-      }
-    } elseif (is_object($Val)) {
-      return $Val->enc();
-    } else {
-      return 'fail';
+
+    public function encode($Val)
+    {
+        if (is_string($Val)) {
+            if (substr($Val, 0, 7) == '[*INT*]') {
+                return 'i'.substr($Val, 7).'e';
+            } else {
+                return strlen($Val).':'.$Val;
+            }
+        } elseif (is_object($Val)) {
+            return $Val->enc();
+        } else {
+            return 'fail';
+        }
     }
-  }
 }
 
-class BENCODE_LIST extends BENCODE2 {
-  function enc() {
-    $Str = 'l';
-    foreach ($this->Val as $Value) {
-      $Str.=$this->encode($Value);
+class BENCODE_LIST extends BENCODE2
+{
+    public function enc()
+    {
+        $Str = 'l';
+        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() {
-    $Str = 'd';
-    foreach ($this->Val as $Key => $Value) {
-      $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+class BENCODE_DICT extends BENCODE2
+{
+    public function enc()
+    {
+        $Str = 'd';
+        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));
-  }
-
-  function set_announce_url($Announce) {
-    $this->Val['announce'] = $Announce;
-    ksort($this->Val);
-  }
-
-  // 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 = substr($this->Val['info']->Val['length'],7);
-      $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 = substr($File->Val['length'], 7);
-        $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);
-      }
+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);
+    }
+
+    public function dump_data()
+    {
+        // Function which serializes $this->Val for storage
+        return base64_encode(serialize($this->Val));
     }
-    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 set_announce_url($Announce)
+    {
+        $this->Val['announce'] = $Announce;
+        ksort($this->Val);
+    }
+
+    // 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 = substr($this->Val['info']->Val['length'], 7);
+            $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 = substr($File->Val['length'], 7);
+                $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);
+    }
+
+    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
+        //----- End properties that do not affect the infohash
 
-    if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') {
-      return true;
-    } else {
-      // Torrent is not private!
-      // add private tracker flag and sort info dictionary
-      $this->Val['info']->Val['private'] = '[*INT*]1';
-      ksort($this->Val['info']->Val);
-      return false;
+        if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') {
+            return true;
+        } else {
+            // Torrent is not private!
+            // add private tracker flag and sort info dictionary
+            $this->Val['info']->Val['private'] = '[*INT*]1';
+            ksort($this->Val['info']->Val);
+            return false;
+        }
     }
-  }
 }
-?>

classes/torrent_form.class.php

@@ -1,79 +1,81 @@
-<?
+<?php
 
 // This class is used in upload.php to display the upload form, and the edit
 // section of torrents.php to display a shortened version of the same form
 
-class TorrentForm {
-  var $UploadForm = '';
-  var $Categories = [];
-  var $Formats = [];
-  var $Bitrates = [];
-  var $Media = [];
-  var $MediaManaga = [];
-  var $Containers = [];
-  var $ContainersGames = [];
-  var $Codecs = [];
-  var $Resolutions = [];
-  var $AudioFormats = [];
-  var $Subbing = [];
-  var $Languages = [];
-  var $Platform = [];
-  var $NewTorrent = false;
-  var $Torrent = [];
-  var $Error = false;
-  var $TorrentID = false;
-  var $Disabled = '';
-  var $DisabledFlag = false;
+class TorrentForm
+{
+    public $UploadForm = '';
+    public $Categories = [];
+    public $Formats = [];
+    public $Bitrates = [];
+    public $Media = [];
+    public $MediaManaga = [];
+    public $Containers = [];
+    public $ContainersGames = [];
+    public $Codecs = [];
+    public $Resolutions = [];
+    public $AudioFormats = [];
+    public $Subbing = [];
+    public $Languages = [];
+    public $Platform = [];
+    public $NewTorrent = false;
+    public $Torrent = [];
+    public $Error = false;
+    public $TorrentID = false;
+    public $Disabled = '';
+    public $DisabledFlag = false;
 
-  function __construct($Torrent = false, $Error = false, $NewTorrent = true) {
+    public function __construct($Torrent = false, $Error = false, $NewTorrent = true)
+    {
+        $this->NewTorrent = $NewTorrent;
+        $this->Torrent = $Torrent;
+        $this->Error = $Error;
 
-    $this->NewTorrent = $NewTorrent;
-    $this->Torrent = $Torrent;
-    $this->Error = $Error;
+        global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $AudioFormats, $Subbing, $Languages, $Platform, $Archives, $ArchivesManga;
 
-    global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $AudioFormats, $Subbing, $Languages, $Platform, $Archives, $ArchivesManga;
+        $this->UploadForm = $UploadForm;
+        $this->Categories = $Categories;
+        $this->Formats = $Formats;
+        $this->Bitrates = $Bitrates;
+        $this->Media = $Media;
+        $this->MediaManga = $MediaManga;
+        $this->Containers = $Containers;
+        $this->ContainersGames = $ContainersGames;
+        $this->Codecs = $Codecs;
+        $this->Resolutions = $Resolutions;
+        $this->AudioFormats = $AudioFormats;
+        $this->Subbing = $Subbing;
+        $this->Languages = $Languages;
+        $this->TorrentID = $TorrentID;
+        $this->Platform = $Platform;
+        $this->Archives = $Archives;
+        $this->ArchivesManga = $ArchivesManga;
 
-    $this->UploadForm = $UploadForm;
-    $this->Categories = $Categories;
-    $this->Formats = $Formats;
-    $this->Bitrates = $Bitrates;
-    $this->Media = $Media;
-    $this->MediaManga = $MediaManga;
-    $this->Containers = $Containers;
-    $this->ContainersGames = $ContainersGames;
-    $this->Codecs = $Codecs;
-    $this->Resolutions = $Resolutions;
-    $this->AudioFormats = $AudioFormats;
-    $this->Subbing = $Subbing;
-    $this->Languages = $Languages;
-    $this->TorrentID = $TorrentID;
-    $this->Platform = $Platform;
-    $this->Archives = $Archives;
-    $this->ArchivesManga = $ArchivesManga;
-
-    if ($this->Torrent && $this->Torrent['GroupID']) {
-      $this->Disabled = ' readonly="readonly"';
-      $this->DisabledFlag = true;
+        if ($this->Torrent && $this->Torrent['GroupID']) {
+            $this->Disabled = ' readonly="readonly"';
+            $this->DisabledFlag = true;
+        }
     }
-  }
 
-  function head() {
-    G::$DB->query("
+    public function head()
+    {
+        G::$DB->query("
       SELECT COUNT(ID)
       FROM torrents
       WHERE UserID = ?", G::$LoggedUser['ID']);
-    list($Uploads) = G::$DB->next_record();
-?>
+        list($Uploads) = G::$DB->next_record(); ?>
 
 <div class="thin">
-<?    if ($this->NewTorrent) { ?>
+        <?php    if ($this->NewTorrent) { ?>
   <p style="text-align: center;">
     If you would like to use your own torrent file, add the following to it:<br />
-<?      $Announces = call_user_func_array('array_merge', ANNOUNCE_URLS);
-        foreach ($Announces as $Announce) {
-?>
+            <?php      $Announces = call_user_func_array('array_merge', ANNOUNCE_URLS);
+            foreach ($Announces as $Announce) {
+                ?>
     Announce: <input type="text" value="<?=$Announce . '/' . G::$LoggedUser['torrent_pass'] . '/announce'?>" size="74" onclick="this.select();" readonly="readonly" /> <br />
-<?      } ?>
+                <?php
+            } ?>
 Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20" onclick="this.select();" readonly="readonly" />
     <p style="text-align: center;">
         Otherwise, add none of it and simply redownload the torrent file after uploading it. All of the above data will be added to it by the site.<br /><br />
@@ -82,36 +84,34 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
       </strong>
     </p>
   </p>
-<?    }
-    if ($this->Error) {
-      echo "\t".'<p style="color: red; text-align: center;">'.$this->Error."</p>\n";
-    }
-?>
+        <?php    }
+        if ($this->Error) {
+            echo "\t".'<p style="color: red; text-align: center;">'.$this->Error."</p>\n";
+        } ?>
   <form class="create_form box pad" name="torrent" action="" enctype="multipart/form-data" method="post" onsubmit="$('#post').raw().disabled = 'disabled';">
     <div>
       <input type="hidden" name="submit" value="true" />
       <input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
-<?    if (!$this->NewTorrent) { ?>
+        <?php    if (!$this->NewTorrent) { ?>
       <input type="hidden" name="action" value="takeedit" />
       <input type="hidden" name="torrentid" value="<?=display_str($this->TorrentID)?>" />
       <input type="hidden" name="type" value="<?=display_str($this->Torrent['CategoryID']-1)?>" />
-<?
-    } else {
-      if ($this->Torrent && $this->Torrent['GroupID']) {
-?>
+            <?php
+        } else {
+            if ($this->Torrent && $this->Torrent['GroupID']) {
+                ?>
       <input type="hidden" name="groupid" value="<?=display_str($this->Torrent['GroupID'])?>" />
       <input type="hidden" name="type" value="<?=display_str($this->Torrent['CategoryID']-1)?>" />
-<?
-      }
-      if ($this->Torrent && ($this->Torrent['RequestID'] ?? false)) {
-?>
+                <?php
+            }
+            if ($this->Torrent && ($this->Torrent['RequestID'] ?? false)) {
+                ?>
       <input type="hidden" name="requestid" value="<?=display_str($this->Torrent['RequestID'])?>" />
-<?
-      }
-    }
-?>
+                <?php
+            }
+        } ?>
     </div>
-<?    if ($this->NewTorrent) { ?>
+        <?php    if ($this->NewTorrent) { ?>
     <table cellpadding="3" cellspacing="1" border="0" class="layout" width="100%">
       <tr>
         <td class="label">Torrent file</td>
@@ -121,108 +121,113 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td class="label">Type</td>
         <td>
           <select id="categories" name="type" onchange="Categories()"<?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
-<?
-      foreach (Misc::display_array($this->Categories) as $Index => $Cat) {
-        echo "\t\t\t\t\t\t<option value=\"$Index\"";
-        if ($Cat == $this->Torrent['CategoryName']) {
-          echo ' selected="selected"';
-        }
-        echo ">$Cat</option>\n";
-      }
-?>
+            <?php
+            foreach (Misc::display_array($this->Categories) as $Index => $Cat) {
+                echo "\t\t\t\t\t\t<option value=\"$Index\"";
+                if ($Cat == $this->Torrent['CategoryName']) {
+                    echo ' selected="selected"';
+                }
+                echo ">$Cat</option>\n";
+            }
+            ?>
           </select>
         </td>
       </tr>
     </table>
-<?    }//if ?>
+        <?php    }//if?>
     <div id="dynamic_form">
-<?
-  }
+        <?php
+    }
 
 
-  function foot() {
-    $Torrent = $this->Torrent;
-?>
+    public function foot()
+    {
+        $Torrent = $this->Torrent; ?>
     </div>
     <table cellpadding="3" cellspacing="1" border="0" class="layout slice" width="100%">
-<?
-    if (!$this->NewTorrent) {
-      if (check_perms('torrents_freeleech')) {
-?>
+        <?php
+        if (!$this->NewTorrent) {
+            if (check_perms('torrents_freeleech')) {
+                ?>
       <tr id="freetorrent">
         <td class="label">Freeleech</td>
         <td>
           <select name="freeleech">
-<?
-        $FL = array("Normal", "Free", "Neutral");
-        foreach ($FL as $Key => $Name) {
-?>
+                <?php
+                $FL = array("Normal", "Free", "Neutral");
+                foreach ($FL as $Key => $Name) {
+                    ?>
             <option value="<?=$Key?>"<?=($Key == $Torrent['FreeTorrent'] ? ' selected="selected"' : '')?>><?=$Name?></option>
-<?        } ?>
+                    <?php
+                } ?>
           </select>
           because
           <select name="freeleechtype">
-<?
-        $FL = array("N/A", "Staff Pick", "Perma-FL", "Freeleechizer", "Site-Wide FL");
-        foreach ($FL as $Key => $Name) {
-?>
+                <?php
+                $FL = array("N/A", "Staff Pick", "Perma-FL", "Freeleechizer", "Site-Wide FL");
+                foreach ($FL as $Key => $Name) {
+                    ?>
             <option value="<?=$Key?>"<?=($Key == $Torrent['FreeLeechType'] ? ' selected="selected"' : '')?>><?=$Name?></option>
-<?        } ?>
+                    <?php
+                } ?>
           </select>
         </td>
       </tr>
-<?
-      }
-    }
-?>
+                <?php
+            }
+        } ?>
       <tr>
         <td colspan="2" style="text-align: center;">
           <p>Be sure that your torrent is approved by the <a href="rules.php?p=upload" target="_blank">rules</a>. Not doing this will result in a <strong class="important_text">warning</strong> or <strong class="important_text">worse</strong>.</p>
-<?    if ($this->NewTorrent) { ?>
+        <?php    if ($this->NewTorrent) { ?>
           <p>After uploading the torrent, you will have a one hour grace period during which no one other than you can fill requests with this torrent. Make use of this time wisely, and <a href="requests.php">search the list of requests</a>.</p>
-<?    } ?>
-        <input id="post" type="submit"<? if ($this->NewTorrent) { echo ' value="Upload torrent"'; } else { echo ' value="Edit torrent"';} ?> />
+        <?php    } ?>
+        <input id="post" type="submit"<?php if ($this->NewTorrent) {
+            echo ' value="Upload torrent"';
+                                      } else {
+                                          echo ' value="Edit torrent"';
+                                      } ?> />
         </td>
       </tr>
     </table>
   </form>
 </div>
-<?
-  }
+        <?php
+    }
 
 
-  function upload_form() {
-    $QueryID = G::$DB->get_query_id();
-    $this->head();
-    $Torrent = $this->Torrent;
-?>
+    public function upload_form()
+    {
+        $QueryID = G::$DB->get_query_id();
+        $this->head();
+        $Torrent = $this->Torrent; ?>
     <table cellpadding="3" cellspacing="1" border="0" class="layout slice" width="100%">
-<? if ($this->NewTorrent) { ?>
+        <?php if ($this->NewTorrent) { ?>
       <tr id="javdb_tr">
         <td class="label tooltip" title='Enter a JAV catalogue number, e.g., "CND-060"'>Catalogue Number</td>
         <td>
           <input type="text" id="catalogue" name="catalogue" size="10" value="<?=display_str($Torrent['CatalogueNumber']) ?>" <?=$this->Disabled?>/>
-<? if (!$this->DisabledFlag) { ?>
+            <?php if (!$this->DisabledFlag) { ?>
           <input type="button" autofill="jav" value="Autofill"></input>
-<? } ?>
+            <?php } ?>
         </td>
       </tr>
       <tr id="anidb_tr" class="hidden">
         <td class="label">AniDB Autofill (optional)</td>
         <td>
           <input type="text" id="anidb" size="10" <?=$this->Disabled?>/>
-<? if (!$this->DisabledFlag) { ?>
+            <?php if (!$this->DisabledFlag) { ?>
           <input type="button" autofill="anime" value="Autofill"/>
-<? } ?>
+            <?php } ?>
         </td>
       </tr>
       <tr id="ehentai_tr" class="hidden">
         <td class="label">e-hentai URL (optional)</td>
         <td>
           <input type="text" id="catalogue" size="50" <?=$this->Disabled?> />
-<? if (!$this->DisabledFlag) { ?>
+            <?php if (!$this->DisabledFlag) { ?>
           <input type="button" autofill="douj" value="Autofill"/>
-<? } ?>
+            <?php } ?>
         </td>
       </tr>
       <tr id="title_tr">
@@ -240,17 +245,17 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
       <tr id="idols_tr">
         <td class="label">Idol(s)</td>
         <td id="idolfields">
-<?      if (!empty($Torrent['Artists'])) {
-          foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
+            <?php      if (!empty($Torrent['Artists'])) {
+                foreach ($Torrent['Artists'] as $Num => $Artist) { ?>
             <input type="text" id="idols_<?=$Num?>" name="idols[]" size="45" value="<?=display_str($Artist['name'])?>" <?=$this->Disabled?>/>
-            <? if ($Num == 0) { ?>
+                        <?php if ($Num == 0) { ?>
               <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
-            <? }
-            }
-          } else { ?>
+                        <?php }
+                }
+            } else { ?>
             <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?> />
             <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
-<?        } ?>
+            <?php        } ?>
         </td>
       </tr>
       <tr id="studio_tr">
@@ -273,21 +278,20 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td class="label">DLsite ID</td>
         <td><input type="text" id="dlsiteid" name="dlsiteid" size="8" maxlength="8" value="<?=display_str($Torrent['DLsiteID']??'')?>" <?=$this->Disabled?>/></td>
       </tr>
-<? } ?>
+        <?php } ?>
       <tr id="media_tr">
         <td class="label">Media</td>
         <td>
           <select name="media">
             <option>---</option>
-<?
-    foreach($this->Media as $Media) {
-      echo "\t\t\t\t\t\t<option value=\"$Media\"";
-      if ($Media == ($Torrent['Media'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Media</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Media as $Media) {
+            echo "\t\t\t\t\t\t<option value=\"$Media\"";
+            if ($Media == ($Torrent['Media'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Media</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -296,15 +300,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name="media">
             <option>---</option>
-<?
-    foreach($this->MediaManga as $Media) {
-      echo "\t\t\t\t\t\t<option value=\"$Media\"";
-      if ($Media == ($Torrent['Media'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Media</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->MediaManga as $Media) {
+            echo "\t\t\t\t\t\t<option value=\"$Media\"";
+            if ($Media == ($Torrent['Media'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Media</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -313,15 +316,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select id="platform" name="media">
             <option>---</option>
-<?
-    foreach($this->Platform as $Platform) {
-      echo "\t\t\t\t\t\t<option value=\"$Platform\"";
-      if ($Platform == ($Torrent['Media'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Platform</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Platform as $Platform) {
+            echo "\t\t\t\t\t\t<option value=\"$Platform\"";
+            if ($Platform == ($Torrent['Media'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Platform</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -330,15 +332,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name='archive'>
             <option>---</option>
-<?
-    foreach($this->Archives as $Archive) {
-      echo "\t\t\t\t\t\t<option value=\"$Archive\"";
-      if ($Archive == ($Torrent['Archive'] ?? false)) {
-        echo ' selected';
-      }
-      echo ">$Archive</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Archives as $Archive) {
+            echo "\t\t\t\t\t\t<option value=\"$Archive\"";
+            if ($Archive == ($Torrent['Archive'] ?? false)) {
+                echo ' selected';
+            }
+            echo ">$Archive</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -347,15 +348,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name='archive'>
             <option>---</option>
-<?
-    foreach(array_merge($this->Archives, $this->ArchivesManga) as $Archive) {
-      echo "\t\t\t\t\t\t<option value=\"$Archive\"";
-      if ($Archive == ($Torrent['Archive'] ?? false)) {
-        echo ' selected';
-      }
-      echo ">$Archive</option>\n";
-    }
-?>
+        <?php
+        foreach (array_merge($this->Archives, $this->ArchivesManga) as $Archive) {
+            echo "\t\t\t\t\t\t<option value=\"$Archive\"";
+            if ($Archive == ($Torrent['Archive'] ?? false)) {
+                echo ' selected';
+            }
+            echo ">$Archive</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -364,15 +364,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name="container">
             <option>---</option>
-<?
-    foreach($this->Containers as $Cont) {
-      echo "\t\t\t\t\t\t<option value=\"$Cont\"";
-      if ($Cont == ($Torrent['Container'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Cont</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Containers as $Cont) {
+            echo "\t\t\t\t\t\t<option value=\"$Cont\"";
+            if ($Cont == ($Torrent['Container'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Cont</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -381,15 +380,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select id="container" name="container">
             <option>---</option>
-<?
-    foreach($this->ContainersGames as $Container) {
-      echo "\t\t\t\t\t\t<option value=\"$Container\"";
-      if ($Container == ($Torrent['Container'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Container</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->ContainersGames as $Container) {
+            echo "\t\t\t\t\t\t<option value=\"$Container\"";
+            if ($Container == ($Torrent['Container'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Container</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -398,15 +396,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name="codec">
             <option>---</option>
-<?
-    foreach($this->Codecs as $Codec) {
-      echo "\t\t\t\t\t\t<option value=\"$Codec\"";
-      if ($Codec == ($Torrent['Codec'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Codec</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Codecs as $Codec) {
+            echo "\t\t\t\t\t\t<option value=\"$Codec\"";
+            if ($Codec == ($Torrent['Codec'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Codec</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -415,16 +412,15 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select id="ressel" name="ressel" onchange="SetResolution()">
             <option value="">---</option>
-<?
-    foreach($this->Resolutions as $Res) {
-      echo "\t\t\t\t\t\t<option value=\"$Res\"";
-      if ($Res == ($Torrent['Resolution'] ?? false) || (!isset($FoundRes) && ($Torrent['Resolution'] ?? false) && $Res == "Other")) {
-        echo " selected";
-        $FoundRes = true;
-      }
-      echo ">$Res</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Resolutions as $Res) {
+            echo "\t\t\t\t\t\t<option value=\"$Res\"";
+            if ($Res == ($Torrent['Resolution'] ?? false) || (!isset($FoundRes) && ($Torrent['Resolution'] ?? false) && $Res == "Other")) {
+                echo " selected";
+                $FoundRes = true;
+            }
+            echo ">$Res</option>\n";
+        } ?>
           </select>
           <input type="text" id="resolution" name="resolution" size="10" class="hidden tooltip" pattern="[0-9]+x[0-9]+" title='Enter "Other" resolutions in the form ###x###' value="<?=($Torrent['Resolution']??'')?>" readonly></input>
           <script>
@@ -440,15 +436,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name="audioformat">
             <option>---</option>
-<?
-    foreach($this->AudioFormats as $AudioFormat) {
-      echo "\t\t\t\t\t\t<option value=\"$AudioFormat\"";
-      if  ($AudioFormat == ($Torrent['AudioFormat'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$AudioFormat</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->AudioFormats as $AudioFormat) {
+            echo "\t\t\t\t\t\t<option value=\"$AudioFormat\"";
+            if ($AudioFormat == ($Torrent['AudioFormat'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$AudioFormat</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -457,15 +452,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name="lang">
             <option>---</option>
-<?
-    foreach($this->Languages as $Language) {
-      echo "\t\t\t\t\t\t<option value=\"$Language\"";
-      if ($Language == ($Torrent['Language'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Language</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Languages as $Language) {
+            echo "\t\t\t\t\t\t<option value=\"$Language\"";
+            if ($Language == ($Torrent['Language'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Language</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -474,15 +468,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td>
           <select name="sub">
             <option>---</option>
-<?
-    foreach($this->Subbing as $Subbing) {
-      echo "\t\t\t\t\t\t<option value=\"$Subbing\"";
-      if ($Subbing == ($Torrent['Subbing'] ?? false)) {
-        echo " selected";
-      }
-      echo ">$Subbing</option>\n";
-    }
-?>
+        <?php
+        foreach ($this->Subbing as $Subbing) {
+            echo "\t\t\t\t\t\t<option value=\"$Subbing\"";
+            if ($Subbing == ($Torrent['Subbing'] ?? false)) {
+                echo " selected";
+            }
+            echo ">$Subbing</option>\n";
+        } ?>
           </select>
         </td>
       </tr>
@@ -502,29 +495,29 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
           <textarea name="mediainfo" id="mediainfo" onchange="MediaInfoExtract()"  rows="8" cols="60"><?=display_str($Torrent['MediaInfo']??'')?></textarea>
         </td>
       </tr>
-<?    if ($this->NewTorrent) { ?>
+        <?php    if ($this->NewTorrent) { ?>
       <tr id="tags_tr">
         <td class="label tooltip" title="Comma seperated list of tags">Tags</td>
         <td>
-<?
-  $GenreTags = G::$Cache->get_value('genre_tags');
-  if (!$GenreTags) {
-    $DB->query("
+            <?php
+            $GenreTags = G::$Cache->get_value('genre_tags');
+            if (!$GenreTags) {
+                $DB->query("
       SELECT Name
       FROM tags
       WHERE TagType = 'genre'
       ORDER BY Name");
-    $GenreTags = $DB->collect('Name');
-    G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
-  }
-?>
+                $GenreTags = $DB->collect('Name');
+                G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
+            }
+            ?>
           <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" <?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
             <option>---</option>
-<? foreach (Misc::display_array($GenreTags) as $Genre) { ?>
+            <?php foreach (Misc::display_array($GenreTags) as $Genre) { ?>
             <option value="<?=$Genre?>"><?=$Genre?></option>
-<? } ?>
+            <?php } ?>
           </select>
-          <input type="text" id="tags" name="tags" size="60" value="<?=display_str(implode(', ', explode(',', $Torrent['TagList']))) ?>"<? Users::has_autocomplete_enabled('other'); ?> />
+          <input type="text" id="tags" name="tags" size="60" value="<?=display_str(implode(', ', explode(',', $Torrent['TagList']))) ?>"<?php Users::has_autocomplete_enabled('other'); ?> />
           <p class="min_padding notes"></p>
         </td>
       </tr>
@@ -532,7 +525,7 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td class="label">Cover Image</td>
         <td><input type="text" id="image" name="image" size="60" value="<?=display_str($Torrent['Image']) ?>"<?=$this->Disabled?> /></td>
       </tr>
-<? if (!$this->DisabledFlag && $this->NewTorrent) { ?>
+            <?php if (!$this->DisabledFlag && $this->NewTorrent) { ?>
       <tr id="screenshots_tr">
         <td class="label">Screenshots</td>
         <td>
@@ -540,20 +533,20 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
           <p>Enter up to 10 links to samples for the torrent, one per line. The system will automatically remove malformed or invalid links, as well as any links after the 10th. Remember to consult the <a href="/rules.php?p=upload#h1.4">rules for adding screenshots</a>.</p>
           <p class="min_padding notes"></p>
       </tr>
-<? } ?>
+            <?php } ?>
       <tr id="group_desc_tr">
         <td class="label">Torrent Group Description</td>
         <td>
           <p class="min_padding notes"></p>
-<?php new TEXTAREA_PREVIEW('album_desc', 'album_desc', display_str($Torrent['GroupDescription']), 60, 8, !$this->DisabledFlag, !$this->DisabledFlag, false, array($this->Disabled)); ?>
+            <?php new TEXTAREA_PREVIEW('album_desc', 'album_desc', display_str($Torrent['GroupDescription']), 60, 8, !$this->DisabledFlag, !$this->DisabledFlag, false, array($this->Disabled)); ?>
         </td>
       </tr>
-<?    } ?>
+        <?php    } ?>
       <tr id="release_desc_tr">
         <td class="label">Torrent Description (optional)</td>
         <td>
           <p class="min_padding notes"></p>
-<?php new TEXTAREA_PREVIEW('release_desc', 'release_desc', display_str($Torrent['TorrentDescription']??''), 60, 8); ?>
+        <?php new TEXTAREA_PREVIEW('release_desc', 'release_desc', display_str($Torrent['TorrentDescription']??''), 60, 8); ?>
         </td>
       </tr>
       <tr id="anon_tr">
@@ -562,10 +555,9 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
       </tr>
     </table>
 
-<?
-    $this->foot();
-    G::$DB->set_query_id($QueryID);
-  }
-
+        <?php
+        $this->foot();
+        G::$DB->set_query_id($QueryID);
+    }
 }
 ?>

classes/torrentsdl.class.php

@@ -1,245 +1,257 @@
-<?
+<?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";
+    /**
+     * 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));
     }
-    $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));
-  }
 
-  /**
-   * 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;
+    /**
+     * 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);
+            }
         }
-      }
-    }
-    $this->NumFound += $Found;
-    G::$DB->set_query_id($OldQuery);
-    if (empty($Downloads)) {
-      return 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"
-      . "\r\n"
-      . "User:    {$this->User[Username]}\r\n"
-      . "Passkey: {$this->User[torrent_pass]}\r\n"
-      . "\r\n"
-      . "Time:    $Time\r\n"
-      . "Used:    $Used\r\n"
-      . "Date:    $Date\r\n"
-      . "\r\n"
-      . ($FilterStats !== false
+    /**
+     * 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"
+        . "\r\n"
+        . "Time:    $Time\r\n"
+        . "Used:    $Used\r\n"
+        . "Date:    $Date\r\n"
+        . "\r\n"
+        . ($FilterStats !== false
         ? "Torrent groups analyzed: $this->NumFound\r\n"
           . "Torrent groups filtered: $NumSkipped\r\n"
         : "")
-      . "Torrents downloaded:   $this->NumAdded\r\n"
-      . "\r\n"
-      . "Total size of torrents (ratio hit): ".Format::get_size($this->Size)."\r\n"
-      . ($NumSkipped
+        . "Torrents downloaded:   $this->NumAdded\r\n"
+        . "\r\n"
+        . "Total size of torrents (ratio hit): ".Format::get_size($this->Size)."\r\n"
+        . ($NumSkipped
         ? "\r\n"
           . "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"
-      . "\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;
+    /**
+     * 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";
     }
 
-    $TorrentName = Format::cut_string($TorrentName . $TorrentInfo, $MaxLength, true, false);
-    if ($TorrentID !== false) {
-      $TorrentName .= "-$TorrentID";
-    }
-    return "$TorrentName.torrent";
-  }
+    /**
+     * 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;
+        }
 
-  /**
-   * 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();
-  }
 }