Support announce-list for old style torrent blobs

classes/bencodetorrent.class.php

@@ -122,11 +122,11 @@ class BencodeTorrent extends BencodeDecode {
    * Add the announce URL to a torrent
    */
   public static function add_announce_url($Data, $Url) {
-    return 'd8:announce'.strlen($Url).':'.$Url . substr($Data, 1);
+    return 'd8:announce'.strlen($Url).':'.$Url.substr($Data, 1);
   }
 
   /**
-   * Let's support announce lists
+   * Add list of announce URLs to a torrent
    */
   public static function add_announce_list($Data, $Urls) {
     $r = 'd13:announce-listl';
@@ -137,7 +137,6 @@ class BencodeTorrent extends BencodeDecode {
       }
       $r .= 'e';
     }
-    $r .= 'e' .substr($Data, 1);
-    return $r;
+    return $r.'e'.substr($Data, 1);
   }
 }

classes/torrent.class.php

@@ -236,19 +236,15 @@ class TORRENT extends BENCODE_DICT {
     return base64_encode(serialize($this->Val));
   }
 
-  /*
-  To use this, please remove the announce-list unset in make_private and be sure to still set_announce_url for backwards compatibility
-  function set_multi_announce() {
-    $Trackers = func_get_args();
-    $AnnounceList = new BENCODE_LIST(array(),true);
-    foreach ($Trackers as $Tracker) {
-      $SubList = new BENCODE_LIST(array($Tracker),true);
+  function set_announce_list($UrlsList) {
+    $AnnounceList = new BENCODE_LIST(array(), 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_url($Announce) {
     $this->Val['announce'] = $Announce;

classes/torrentsdl.class.php

@@ -239,6 +239,9 @@ class TorrentsDL {
     $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();