Web seeds will come with OPS's bencode libraries

classes/bencode.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * If we're running a 32bit PHP version, we use small objects to store ints.
  * Overhead from the function calls is small enough to not worry about

classes/bencodedecode.class.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * The decode class is simple and straightforward. The only thing to
  * note is that empty dictionaries are represented by boolean trues
@@ -93,7 +92,7 @@ class BencodeDecode extends Bencode
       case 'i':
         $this->Pos++;
         $Value = substr($this->Data, $this->Pos, strpos($this->Data, 'e', $this->Pos) - $this->Pos);
-        if (!ctype_digit($Value) && !($Value[0] === '-' && ctype_digit(substr($Value, 1)))) {
+        if (!ctype_digit($Value) && !($Value[0] == '-' && ctype_digit(substr($Value, 1)))) {
             return $this->error();
         }
         $this->Pos += strlen($Value) + 1;
@@ -102,7 +101,7 @@ class BencodeDecode extends Bencode
       case 'l':
         $Value = [];
         $this->Pos++;
-        while ($this->Data[$this->Pos] !== 'e') {
+        while ($this->Data[$this->Pos] != 'e') {
             if ($this->Pos >= $this->Length) {
                 return $this->error();
             }
@@ -114,7 +113,7 @@ class BencodeDecode extends Bencode
       case 'd':
         $Value = [];
         $this->Pos++;
-        while ($this->Data[$this->Pos] !== 'e') {
+        while ($this->Data[$this->Pos] != 'e') {
             $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
             if (!ctype_digit($Length)) {
                 return $this->error();

classes/bencodetorrent.class.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Torrent class that contains some convenient functions related to torrent meta data
  */
@@ -93,9 +92,8 @@ class BencodeTorrent extends BencodeDecode
         if (empty($this->Dec)) {
             return false;
         }
-        return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) === 1;
+        return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1;
     }
-    
     /**
      * Add the "private" flag to the torrent
      *
@@ -125,7 +123,7 @@ class BencodeTorrent extends BencodeDecode
         if (empty($this->Dec)) {
             return false;
         }
-        if (isset($this->Dec['info']['source']) && ($this->Dec['info']['source'] === $Sources[0] || $this->Dec['info']['source'] === $Sources[1])) {
+        if (isset($this->Dec['info']['source']) && ($this->Dec['info']['source'] == $Sources[0] || $this->Dec['info']['source'] == $Sources[1])) {
             return false;
         }
         $this->Dec['info']['source'] = $Sources[0];
@@ -169,20 +167,4 @@ class BencodeTorrent extends BencodeDecode
         }
         return $r.'e'.substr($Data, 1);
     }
-
-    /**
-     * Add list of web seeds to a torrent
-     */
-    public static function add_web_seeds($Data, $Urls)
-    {
-        $r = 'd8:url-listl';
-        for ($i = 0; $i < count($Urls); $i++) {
-            $r .= 'l';
-            for ($j = 0; $j < count($Urls[$i]); $j++) {
-                $r .= strlen($Urls[$i][$j]).':'.$Urls[$i][$j];
-            }
-            $r .= 'e';
-        }
-        return $r.'e'.substr($Data, 1);
-    }
 }

classes/file_checker.class.php

@@ -1,78 +1,87 @@
 <?php
+
 $ComicsExtensions = array_fill_keys(array('cbr', 'cbz', 'gif', 'jpeg', 'jpg', 'pdf', 'png'), true);
 $MusicExtensions = array_fill_keys(
-  array(
+    array(
     'ac3', 'accurip', 'azw3', 'chm', 'cue', 'djv', 'djvu', 'doc', 'dts', 'epub', 'ffp',
     'flac', 'gif', 'htm', 'html', 'jpeg', 'jpg', 'lit', 'log', 'm3u', 'm3u8', 'm4a', 'm4b',
     'md5', 'mobi', 'mp3', 'mp4', 'nfo', 'pdf', 'pls', 'png', 'rtf', 'sfv', 'txt'),
-  true);
+    true
+);
 $Keywords = array(
   'ahashare.com', 'demonoid.com', 'demonoid.me', 'djtunes.com', 'h33t', 'housexclusive.net',
   'limetorrents.com', 'mixesdb.com', 'mixfiend.blogstop', 'mixtapetorrent.blogspot',
   'plixid.com', 'reggaeme.com' , 'scc.nfo', 'thepiratebay.org', 'torrentday');
 
-function check_file($Type, $Name) {
-  check_name($Name);
-  check_extensions($Type, $Name);
+function check_file($Type, $Name)
+{
+    check_name($Name);
+    check_extensions($Type, $Name);
 }
 
-function check_name($Name) {
-  global $Keywords;
-  $NameLC = strtolower($Name);
-  foreach ($Keywords as &$Value) {
-    if (strpos($NameLC, $Value) !== false) {
-      forbidden_error($Name);
+function check_name($Name)
+{
+    global $Keywords;
+    $NameLC = strtolower($Name);
+    foreach ($Keywords as &$Value) {
+        if (strpos($NameLC, $Value) !== false) {
+            forbidden_error($Name);
+        }
+    }
+    if (preg_match('/INCOMPLETE~\*/i', $Name)) {
+        forbidden_error($Name);
     }
-  }
-  if (preg_match('/INCOMPLETE~\*/i', $Name)) {
-    forbidden_error($Name);
-  }
 
-  /*
-   * These characters are invalid in NTFS on Windows systems:
-   *    : ? / < > \ * | "
-   *
-   * todo: Add "/" to the blacklist. Adding "/" to the blacklist causes problems with nested dirs, apparently
-   *
-   * Only the following characters need to be escaped (see the link below):
-   *    \ - ^ ]
-   *
-   * http://www.php.net/manual/en/regexp.reference.character-classes.php
-   */
-  $AllBlockedChars = ' : ? < > \ * | " ';
-  if (preg_match('/[\\:?<>*|"]/', $Name, $Matches)) {
-    character_error($Matches[0], $AllBlockedChars);
-  }
+    /*
+     * These characters are invalid in NTFS on Windows systems:
+     *    : ? / < > \ * | "
+     *
+     * todo: Add "/" to the blacklist. Adding "/" to the blacklist causes problems with nested dirs, apparently
+     *
+     * Only the following characters need to be escaped (see the link below):
+     *    \ - ^ ]
+     *
+     * http://www.php.net/manual/en/regexp.reference.character-classes.php
+     */
+    $AllBlockedChars = ' : ? < > \ * | " ';
+    if (preg_match('/[\\:?<>*|"]/', $Name, $Matches)) {
+        character_error($Matches[0], $AllBlockedChars);
+    }
 }
 
-function check_extensions($Type, $Name) {
-  global $MusicExtensions, $ComicsExtensions;
-  if ($Type == 'Music' || $Type == 'Audiobooks' || $Type == 'Comedy' || $Type == 'E-Books') {
-    if (!isset($MusicExtensions[get_file_extension($Name)])) {
-      invalid_error($Name);
-    }
-  } elseif ($Type == 'Comics') {
-    if (!isset($ComicsExtensions[get_file_extension($Name)])) {
-      invalid_error($Name);
+function check_extensions($Type, $Name)
+{
+    global $MusicExtensions, $ComicsExtensions;
+    if ($Type == 'Music' || $Type == 'Audiobooks' || $Type == 'Comedy' || $Type == 'E-Books') {
+        if (!isset($MusicExtensions[get_file_extension($Name)])) {
+            invalid_error($Name);
+        }
+    } elseif ($Type == 'Comics') {
+        if (!isset($ComicsExtensions[get_file_extension($Name)])) {
+            invalid_error($Name);
+        }
     }
-  }
 }
 
-function get_file_extension($FileName) {
-  return strtolower(substr(strrchr($FileName, '.'), 1));
+function get_file_extension($FileName)
+{
+    return strtolower(substr(strrchr($FileName, '.'), 1));
 }
 
-function invalid_error($Name) {
-  global $Err;
-  $Err = 'The torrent contained one or more invalid files (' . display_str($Name) . ')';
+function invalid_error($Name)
+{
+    global $Err;
+    $Err = 'The torrent contained one or more invalid files (' . display_str($Name) . ')';
 }
 
-function forbidden_error($Name) {
-  global $Err;
-  $Err = 'The torrent contained one or more forbidden files (' . display_str($Name) . ')';
+function forbidden_error($Name)
+{
+    global $Err;
+    $Err = 'The torrent contained one or more forbidden files (' . display_str($Name) . ')';
 }
 
-function character_error($Character, $AllBlockedChars) {
-  global $Err;
-  $Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.<br /><br />\nNote: The complete list of characters that are disallowed are shown below:<br />\n\t\t$AllBlockedChars";
+function character_error($Character, $AllBlockedChars)
+{
+    global $Err;
+    $Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.<br /><br />\nNote: The complete list of characters that are disallowed are shown below:<br />\n\t\t$AllBlockedChars";
 }

classes/torrents.class.php

@@ -2,7 +2,7 @@
 
 class Torrents
 {
-  const FILELIST_DELIM = 0xF7; // Hex for ÷ Must be the same as phrase_boundary in sphinx.conf!
+    const FILELIST_DELIM = 0xF7; // Hex for ÷ Must be the same as phrase_boundary in sphinx.conf!
   const SNATCHED_UPDATE_INTERVAL = 3600; // How often we want to update users' snatch lists
   const SNATCHED_UPDATE_AFTERDL = 300; // How long after a torrent download we want to update a user's snatch lists
 
@@ -1230,7 +1230,7 @@ class Torrents
         return $EditionName;
     }
 
-    //Used to get reports info on a unison cache in both browsing pages and torrent pages.
+    // Used to get reports info on a unison cache in both browsing pages and torrent pages.
     public static function get_reports($TorrentID)
     {
         $Reports = G::$Cache->get_value("reports_torrent_$TorrentID");

classes/torrentsdl.class.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Class for functions related to the features involving torrent downloads
  */
@@ -19,7 +18,6 @@ class TorrentsDL
     private $User;
     private $AnnounceURL;
     private $AnnounceList;
-    private $WebSeeds;
 
     /**
      * Create a Zip object and store the query results
@@ -31,20 +29,17 @@ class TorrentsDL
     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;
+    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';
-
+        $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';
+            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(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->WebSeeds = [];
+        #$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));
     }
 
@@ -241,38 +236,22 @@ class TorrentsDL
      * @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 = [], $WebSeeds = [])
+    public static function get_file(&$TorrentData, $AnnounceURL, $AnnounceList = [])
     {
         if (Misc::is_new_torrent($TorrentData)) {
             $Bencode = BencodeTorrent::add_announce_url($TorrentData, $AnnounceURL);
-
-            # Announce list
             if (!empty($AnnounceList)) {
                 $Bencode = BencodeTorrent::add_announce_list($Bencode, $AnnounceList);
             }
-
-            # Web seeds
-            if (!empty($WebSeeds)) {
-                $Bencode = BencodeTorrent::add_web_seeds($Bencode, $WebSeeds);
-            }
             return $Bencode;
         }
-
         $Tor = new TORRENT(unserialize(base64_decode($TorrentData)), true);
         $Tor->set_announce_url($AnnounceURL);
         unset($Tor->Val['announce-list']);
-
-        # Announce list
         if (!empty($AnnounceList)) {
             $Tor->set_announce_list($AnnounceList);
         }
-
-        # Web seeds
-        if (!empty($WebSeeds)) {
-            $Tor->add_web_seeds($WebSeeds);
-        }
-        
-        #unset($Tor->Val['url-list']);
+        unset($Tor->Val['url-list']);
         unset($Tor->Val['libtorrent_resume']);
         return $Tor->enc();
     }

sections/requests/new_edit.php

@@ -121,8 +121,8 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
       <!-- Main table -->
       <table class="layout">
         <tr>
-          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the
-              request rules</a>!</td>
+          <td colspan="2" class="center">Please make sure your request follows the
+            <a href="rules.php?p=requests">request rules</a>!</td>
         </tr>
         <?php  if ($NewRequest || $CanEdit) { ?>
 

sections/torrents/browse.php

@@ -250,7 +250,7 @@ View::show_header('Browse Torrents', 'browse');
             <td class="nobr ft_ripspecifics">
 
               <select name="media" class="ft_media fti_advanced">
-                <option value="">DNA/RNA/Proteins</option>
+                <option value="">Sequencing</option>
                 <?php  foreach ($Media as $MediaName) { ?>
                 <option value="<?=display_str($MediaName); ?>"
                 <?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?>
@@ -318,7 +318,7 @@ View::show_header('Browse Torrents', 'browse');
                 <option value="">Assembly Level</option>
                 <?php  foreach ($Resolutions as $Resolution) { ?>
                 <option value="<?=display_str($Resolution); ?>"
-                <?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?>"
+                <?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?>
                 </option>
                 <?php  } ?>
               </select>

sections/torrents/details.php

@@ -1,4 +1,5 @@
 <?php
+
 function compare($X, $Y)
 {
     return($Y['name'] < $X['name']);
@@ -964,12 +965,12 @@ if (count($PersonalCollages) > 0) {
       </div>
     </div>
 
-        <!-- Mirrors -->
-        <div class="box torrent_mirrors_box <?php if (!count($Mirrors)) {
+    <!-- Mirrors -->
+    <div class="box torrent_mirrors_box <?php if (!count($Mirrors)) {
     echo 'dead';
 } ?>">
       <div class="head"><a href="#">&uarr;</a>&nbsp;<strong>
-      Mirrors (<?= count($Mirrors) ?>)</strong>
+          Mirrors (<?= count($Mirrors) ?>)</strong>
         <?php
     if (count($Mirrors) > 0) {
         ?>

sections/torrents/download.php

@@ -13,41 +13,40 @@ if (!isset($_REQUEST['authkey']) || !isset($_REQUEST['torrent_pass'])) {
     $UserInfo = $Cache->get_value('user_'.$_REQUEST['torrent_pass']);
     if (!is_array($UserInfo)) {
         $DB->query("
-        SELECT ID, la.UserID
-          FROM users_main AS m
+      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'");
+      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) {
+    if ($Locked == $UserID) {
         header('HTTP/1.1 403 Forbidden');
         die();
     }
 }
 
 $TorrentID = $_REQUEST['id'];
+
 if (!is_number($TorrentID)) {
     error(0);
 }
 
 /*
- * uTorrent Remote and various scripts redownload .torrent files periodically.
- * To prevent this retardation from blowing bandwidth etc., let's block it
- * if the .torrent file has been downloaded four times before
-*/
+  uTorrent Remote and various scripts redownload .torrent files periodically.
+  To prevent this retardation from blowing bandwidth etc., let's block it
+  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("
@@ -56,7 +55,6 @@ if (Misc::in_array_partial($_SERVER['HTTP_USER_AGENT'], $ScriptUAs)) {
     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();
@@ -75,36 +73,29 @@ if (!is_array($Info) || !array_key_exists('PlainArtists', $Info) || empty($Info[
       COALESCE(NULLIF(tg.Name,''), NULLIF(tg.NameRJ,''), tg.NameJP) AS Name,
       tg.WikiImage,
       tg.CategoryID,
-      tm.Resource,
       t.Size,
       t.FreeTorrent,
       HEX(t.info_hash)
     FROM torrents AS t
       INNER JOIN torrents_group AS tg ON tg.ID = t.GroupID
-      LEFT JOIN torrents_mirrors AS tm ON tm.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 (!is_array($Info[0])) {
     error(404);
 }
-
-list($Media, $Format, $Encoding, $Year, $GroupID, $Name, $Image, $CategoryID, $Resources, $Size, $FreeTorrent, $InfoHash) = array_shift($Info); // Used for generating the filename
+list($Media, $Format, $Encoding, $Year, $GroupID, $Name, $Image, $CategoryID, $Size, $FreeTorrent, $InfoHash) = array_shift($Info); // used for generating the filename
 $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.
-// todo: Make sure strict equality works
 if ($_REQUEST['usetoken'] && $FreeTorrent == '0') {
     if (isset($LoggedUser)) {
         $FLTokens = $LoggedUser['FLTokens'];
@@ -135,16 +126,16 @@ if ($_REQUEST['usetoken'] && $FreeTorrent == '0') {
 
         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");
+        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("
-            UPDATE users_main
-            SET FLTokens = FLTokens - 1
-            WHERE ID = $UserID");
+        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);
@@ -159,7 +150,7 @@ if ($_REQUEST['usetoken'] && $FreeTorrent == '0') {
     }
 }
 
-// Stupid Recent Snatches on User Page
+// Stupid Recent Snatches On User Page
 if ($Image != '') {
     $RecentSnatches = $Cache->get_value("recent_snatches_$UserID");
     if (!empty($RecentSnatches)) {
@@ -191,16 +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)
+function add_passkey($ann)
 {
     global $TorrentPass;
-    return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann.'/'.$TorrentPass.'/announce';
+    return (is_array($ann)) ? array_map("add_passkey", $ann) : $ann."/".$TorrentPass."/announce";
 }
-
-$UserAnnounceURL = ANNOUNCE_URLS[0][0].'/'.$TorrentPass.'/announce';
+$UserAnnounceURL = ANNOUNCE_URLS[0][0]."/".$TorrentPass."/announce";
 $UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : 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);
+#$UserAnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map("add_passkey", ANNOUNCE_URLS);
 
-echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList, $Resources);
+echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);
 
 define('SKIP_NO_CACHE_HEADERS', 1);