[WiP] Embed HTTP/FTP mirrors in torrent files

_packages/extension-parser/classes/config.php

@@ -1,6 +1,8 @@
 <?php
 
+# Line 224
 # Sequencing Formats
+#
 # https://www.ncbi.nlm.nih.gov/sra/docs/submitformats/
 $Containers = [
   'BAM'        => ['bam'],
@@ -26,13 +28,14 @@ $Containers = [
 ];
 
 # Imaging Formats
+#
 # https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3948928/
 $ContainersGames = [
   'Analyze'   => ['hdr', 'img'],
   'Interfile' => ['h33'],
-  'Dicom'     => ['dcm', 'dicom'],
-  'Nifti'     => ['nii', 'nifti'],
-  'Minc'      => ['minc', 'mnc'],
+  'DICOM'     => ['dcm', 'dicom'],
+  'NIfTI'     => ['nii', 'nifti'],
+  'MINC'      => ['minc', 'mnc'],
   'JPEG'      => ['jfif', 'jpeg', 'jpg'],
   'JPEG 2000' => ['j2k', 'jp2', 'jpf', 'jpm', 'jpx', 'mj2'],
   'PNG'       => ['png'],
@@ -42,8 +45,9 @@ $ContainersGames = [
 ];
 
 # Protein Formats
+# DON'T PARSE RAW FILES. TOO MANY COMPETING VENDORS
+#
 # https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3518119/
-# DO NOT PARSE RAW FILES. TOO MANY COMPETING VENDORS
 $ContainersProt = [
   'ABI/Sciex'      => ['t2d', 'wiff'],
   'APML'           => ['apml'],
@@ -57,28 +61,51 @@ $ContainersProt = [
   'MGF'            => ['mgf'],
   'MS2'            => ['ms2'],
   'MSF'            => ['msf'],
+  'mzData'         => ['mzdata'],
+  'mzML'           => ['mzml'],
+  'mzXML'          => ['mzxml'],
   'OMSSA'          => ['omssa', 'omx'],
   'PEFF'           => ['peff'],
+  'pepXML'         => ['pepxml'],
+  'protXML'        => ['protxml'],
   'Shimadzu'       => ['lcd', 'qgd', 'spc'],
   'Skyline'        => ['sky', 'skyd'],
   'TPP/SPC'        => ['dta'],
   'Tandem'         => ['tandem'],
   'TraML'          => ['traml'],
   'ULVAC-PHI'      => ['tdc'],
-  'mzML'           => ['mzml'],
-  'mzXML'          => ['mzxml'],
-  'mzData'         => ['mzdata'],
-  'pepXML'         => ['pepxml'],
-  'protXML'        => ['protxml'],
   'Plain'          => ['csv', 'txt'],
 ];
 
+# Extra Formats
+# DON'T PARSE IMG OR ISO FILES
+#
+# https://en.wikipedia.org/wiki/Disk_image#File_formats
+# https://en.wikipedia.org/wiki/OpenDocument
+# https://en.wikipedia.org/wiki/List_of_Microsoft_Office_filename_extensions
+# http://dcjtech.info/topic/python-file-extensions/
+$ContainersExtra = [
+  'Docker'           => ['dockerfile'],
+  'Hard Disk'        => ['fvd', 'dmg', 'esd', 'qcow', 'qcow2', 'qcow3', 'smi', 'swm', 'vdi', 'vhd', 'vhdx', 'vmdk', 'wim'],
+  'Optical Disc'     => ['bin', 'ccd', 'cso', 'cue', 'daa', 'isz', 'mdf', 'mds', 'mdx', 'nrg', 'uif'],
+  'Python'           => ['pxd', 'py', 'py3', 'pyc', 'pyd', 'pyde', 'pyi', 'pyo', 'pyp', 'pyt', 'pyw', 'pywz', 'pyx', 'pyz', 'rpy', 'xpy'],
+  'Jupyter Notebook' => ['ipynb'],
+  'Ontology'         => ['cgif', 'cl', 'clif', 'csv', 'htm', 'html', 'kif', 'obo', 'owl', 'rdf', 'rdfa', 'rdfs', 'rif', 'tsv', 'xcl', 'xht', 'xhtml', 'xml'],
+  'OpenDocument'     => ['odt', 'fodt', 'ods', 'fods', 'odp', 'fodp', 'odg', 'fodg', 'odf'],
+  'Word'             => ['doc', 'dot', 'wbk', 'docx', 'docm', 'dotx', 'dotm', 'docb'],
+  'Excel'            => ['xls', 'xlt', 'xlm', 'xlsx', 'xlsm', 'xltx', 'xltm', 'xlsb', 'xla', 'xlam', 'xll', 'xlw'],
+  'PowerPoint'       => ['ppt', 'pot', 'pps', 'pptx', 'pptm', 'potx', 'potm', 'ppam', 'ppsx', 'ppsm', 'sldx', 'sldm'],
+  'PDF'              => ['pdf', 'fdf', 'xfdf'],
+  'Other'            => [''],
+];
+
 $Archives = [
-  '7z'     => ['7z'],
-  'bzip2'  => ['bz2', 'bzip2'],
-  'gzip'   => ['gz', 'gzip', 'tgz', 'tpz'],
-  'Pickle' => ['pickle', 'pkl'],
-  'RAR'    => ['rar', 'rev'],
-  'ZIP'    => ['zip', 'zipx'],
-  'None'   => [''],
+  '7z'       => ['7z'],
+  'bzip2'    => ['bz2', 'bzip2'],
+  'gzip'     => ['gz', 'gzip', 'tgz', 'tpz'],
+  'Pickle'   => ['pickle', 'pkl'],
+  'RAR'      => ['rar', 'rev'],
+  'ZIP'      => ['zip', 'zipx'],
+  'None'     => [''],
 ];
+# Line 330

_packages/extension-parser/static/functions/upload.js

@@ -0,0 +1,83 @@
+// Line 11
+function Categories() {
+    let def = [
+        'javdb', // Accession Number
+        'audio', // Version
+        'title', // Torrent Title
+        'title_rj', // Organism
+        'title_jp', // Strain/Variety
+        'idols', // Authors(s)
+        'studio', // Department/Lab
+        'series', // Location
+        'year', // Year
+        'codec', // License
+        // Platform changes below
+        'resolution', // Assembly Level
+        // Format changes below
+        'archive', // Archive
+        'tags', // Tags
+        'cover', // Picture
+        'mirrors', // Mirrors
+        'screenshots', // Publications
+        'group_desc', // Torrent Group Description
+        'release_desc', // Torrent Description
+        'censored', // Aligned/Annotated
+        'anon', // Upload Anonymously
+    ]
+  
+    let cats = [
+        { // DNA
+            'media': {}, // Platform
+            'container': {}, // Format
+        },
+        { // RNA
+            'media': {}, // Platform
+            'container': {}, // Format
+        },
+        { // Proteins
+            'media': {}, // Platform
+            'container_prot': {}, // Format
+        },
+        { // Imaging
+            'media_manga': {}, // Platform
+            'container_games': {}, // Format
+        },
+        { // Extras
+            'media': {}, // Platform
+            'container_extra': {}, // Format
+        }
+    ]
+  
+    let active = {}
+    for (let field of def) active[field] = {}
+    let category = 0
+    if ($('input[name="type"]').raw()) category = $('input[name="type"]').raw().value
+    if ($('#categories').raw()) category = $('#categories').raw().value
+    active = Object.assign(active, cats[category])
+  
+    let hide = el => {
+        Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
+        $(el).ghide()
+    }
+  
+    let show = el => {
+        Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
+        $(el).gshow()
+    }
+  
+    let trs = $('#dynamic_form tr')
+    for (let tr of trs) {
+        let field = tr.id.slice(0, -3)
+        if (active[field]) {
+            if (active[field].name) {
+                tr.children[0].innerHTML = active[field].name
+            }
+            let notes = $(`#${tr.id} p.notes`).raw()
+            if (notes) notes.innerHTML = active[field].notes || ''
+            show(tr)
+        } else {
+            hide(tr)
+        }
+    }
+}
+// Line 91

_packages/web-seeds/classes/bencodetorrent.class.php

@@ -2,8 +2,8 @@
 
 class BencodeTorrent extends BencodeDecode
 {
-    # ...
-
+    
+    # Line 172
     /**
      * Add list of web seeds to a torrent
      */
@@ -20,5 +20,4 @@ class BencodeTorrent extends BencodeDecode
         return $r.'e'.substr($Data, 1);
     }
 }
-
 # EOF

_packages/web-seeds/classes/torrent_form.class.php

@@ -0,0 +1,13 @@
+<!-- Line 674 -->
+<!-- FTP/HTTP mirrors -->
+<?php if (!$this->DisabledFlag && $this->NewTorrent) { ?>
+  <tr id="mirrors_tr">
+    <td class="label">Mirrors</td>
+    <td>
+      <textarea rows="1" cols="60" name="mirrors"
+        id="mirrors"><?= display_str($Torrent['Mirrors'])?></textarea>
+      <strong class="important_text">Experimental.</strong>
+      Up to two FTP/HTTP addresses that either point directly to a file, or for multi-file torrents, to the enclosing folder
+  </tr>
+<?php } ?>
+<!-- Line 684 -->

_packages/web-seeds/classes/torrentsdl.class.php

@@ -0,0 +1,24 @@
+<?php
+
+class TorrentsDL
+{
+    # Line 21
+    private $AnnounceList;
+    private $WebSeeds;
+    # Line 22
+
+    # Line 31
+    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';
+        $this->WebSeeds = $WebSeeds;
+        # Line 39
+    }
+}
+
+# cont.

_packages/web-seeds/gazelle.sql

@@ -0,0 +1,10 @@
+-- Line 1239
+CREATE TABLE `torrents_mirrors` (
+  `ID` int(10) NOT NULL AUTO_INCREMENT,
+  `GroupID` int(10) NOT NULL,
+  `UserID` int(10) NOT NULL,
+  `Time` datetime,
+  `Resource` varchar(255) NOT NULL,
+  PRIMARY KEY (`ID`,`GroupID`,`Resource`)
+) ENGINE=InnoDB CHARSET=utf8mb4;
+-- Line 1246

_packages/web-seeds/sections/torrents/details.php

@@ -0,0 +1,58 @@
+<?php
+
+# Line 22
+// Group details
+list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupYear,
+  $GroupStudio, $GroupSeries, $GroupCatalogueNumber, $GroupPages, $GroupCategoryID,
+  $GroupDLsiteID, $GroupTime, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
+  $Screenshots, $Mirrors, $GroupFlags) = array_values($TorrentDetails);
+# Line 26
+?>
+
+<!-- Line 967 -->
+<!-- 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>
+<?php
+if (count($Mirrors) > 0) {
+    ?>
+<a class="float_right brackets" data-toggle-target=".torrent_mirrors" data-toggle-replace="Show">Hide</a>
+<?php
+}
+
+$DB->query("
+SELECT UserID
+FROM torrents
+WHERE GroupID = $GroupID");
+
+if (in_array($LoggedUser['ID'], $DB->collect('UserID'))
+ || check_perms('torrents_edit')
+ || check_perms('screenshots_add')
+ || check_perms('screenshots_delete')) {
+?>
+<a class="brackets"
+  href="torrents.php?action=editgroup&groupid=<?=$GroupID?>#mirrors_section">Add/Remove</a>
+<?php
+}
+?>
+  </div>
+
+  <div class="body torrent_mirrors">
+  <?php if (!empty($Mirrors)) {
+    echo '<p>Mirror links open in a new tab.</p>';
+  } ?>
+    <ul>
+      <?php
+        foreach ($Mirrors as $Mirror) {
+          echo '<li><a href="'.$Mirror['Resource'].'" target="_blank">'.$Mirror['Resource'].'</a></li>';
+        }
+      ?>
+    </ul>
+  </div>
+</div>
+<?php
+# Line 1005

_packages/web-seeds/sections/torrents/functions.php

@@ -0,0 +1,167 @@
+<?php
+
+# Line 3
+function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProperties = true, $ApiCall = false)
+{
+    global $Cache, $DB;
+    if (!$RevisionID) {
+        $TorrentCache = $Cache->get_value("torrents_details_$GroupID");
+    }
+    if ($RevisionID || !is_array($TorrentCache)) {
+        // Fetch the group details
+
+        $SQL = 'SELECT ';
+
+        if (!$RevisionID) {
+            $SQL .= '
+        g.WikiBody,
+        g.WikiImage, ';
+        } else {
+            $SQL .= '
+        w.Body,
+        w.Image, ';
+        }
+
+        $SQL .= "
+        g.ID,
+        g.Name,
+        g.NameRJ,
+        g.NameJP,
+        g.Year,
+        g.Studio,
+        g.Series,
+        g.CatalogueNumber,
+        g.Pages,
+        g.CategoryID,
+        g.DLsiteID,
+        g.Time,
+        GROUP_CONCAT(DISTINCT tags.Name SEPARATOR '|'),
+        GROUP_CONCAT(DISTINCT tags.ID SEPARATOR '|'),
+        GROUP_CONCAT(tt.UserID SEPARATOR '|')
+      FROM torrents_group AS g
+        LEFT JOIN torrents_tags AS tt ON tt.GroupID = g.ID
+        LEFT JOIN tags ON tags.ID = tt.TagID";
+
+        if ($RevisionID) {
+            $SQL .= "
+        LEFT JOIN wiki_torrents AS w ON w.PageID = '".db_string($GroupID)."'
+            AND w.RevisionID = '".db_string($RevisionID)."' ";
+        }
+
+        $SQL .= "
+      WHERE g.ID = '".db_string($GroupID)."'
+      GROUP BY NULL";
+
+        $DB->query($SQL);
+
+        $TorrentDetails = $DB->next_record(MYSQLI_ASSOC);
+        $TorrentDetails['Screenshots'] = [];
+        $TorrentDetails['Mirrors'] = [];
+
+        # Screenshots (Publications)
+        $DB->query("
+      SELECT
+        ID, UserID, Time, Image
+      FROM torrents_screenshots
+      WHERE GroupID = ".db_string($GroupID));
+
+        if ($DB->has_results()) {
+            while ($Screenshot = $DB->next_record(MYSQLI_ASSOC, true)) {
+                $TorrentDetails['Screenshots'][] = $Screenshot;
+            }
+        }
+
+        # Mirrors
+        $DB->query("
+        SELECT
+          ID, UserID, Time, Resource
+        FROM torrents_mirrors
+        WHERE GroupID = ".db_string($GroupID));
+  
+        if ($DB->has_results()) {
+            while ($Mirror = $DB->next_record(MYSQLI_ASSOC, true)) {
+                $TorrentDetails['Mirrors'][] = $Mirror;
+            }
+        }
+  
+        // Fetch the individual torrents
+        $DB->query("
+      SELECT
+        t.ID,
+        t.Media,
+        t.Container,
+        t.Codec,
+        t.Resolution,
+        t.AudioFormat,
+        t.Subbing,
+        t.Subber,
+        t.Language,
+        t.Censored,
+        t.Anonymous,
+        t.Archive,
+        t.FileCount,
+        t.Size,
+        t.Seeders,
+        t.Leechers,
+        t.Snatched,
+        t.FreeTorrent,
+        t.FreeLeechType,
+        t.Time,
+        t.Description,
+        t.MediaInfo,
+        t.FileList,
+        t.FilePath,
+        t.UserID,
+        t.last_action,
+        HEX(t.info_hash) AS InfoHash,
+        tbt.TorrentID AS BadTags,
+        tbf.TorrentID AS BadFolders,
+        tfi.TorrentID AS BadFiles,
+        t.LastReseedRequest,
+        tln.TorrentID AS LogInDB,
+        t.ID AS HasFile
+      FROM torrents AS t
+        LEFT JOIN torrents_bad_tags AS tbt ON tbt.TorrentID = t.ID
+        LEFT JOIN torrents_bad_folders AS tbf ON tbf.TorrentID = t.ID
+        LEFT JOIN torrents_bad_files AS tfi ON tfi.TorrentID = t.ID
+        LEFT JOIN torrents_logs_new AS tln ON tln.TorrentID = t.ID
+      WHERE t.GroupID = '".db_string($GroupID)."'
+      GROUP BY t.ID
+      ORDER BY
+        t.Media ASC,
+        t.ID");
+
+        $TorrentList = $DB->to_array('ID', MYSQLI_ASSOC);
+        if (count($TorrentList) === 0 && $ApiCall == false) {
+            header('Location: log.php?search='.(empty($_GET['torrentid']) ? "Group+$GroupID" : "Torrent+$_GET[torrentid]"));
+            die();
+        } elseif (count($TorrentList) === 0 && $ApiCall == true) {
+            return null;
+        }
+        if (in_array(0, $DB->collect('Seeders'))) {
+            $CacheTime = 600;
+        } else {
+            $CacheTime = 3600;
+        }
+        // Store it all in cache
+        if (!$RevisionID) {
+            $Cache->cache_value("torrents_details_$GroupID", array($TorrentDetails, $TorrentList), $CacheTime);
+        }
+    } else { // If we're reading from cache
+        $TorrentDetails = $TorrentCache[0];
+        $TorrentList = $TorrentCache[1];
+    }
+
+    if ($PersonalProperties) {
+        // Fetch all user specific torrent and group properties
+        $TorrentDetails['Flags'] = array('IsSnatched' => false, 'IsLeeching' => false, 'IsSeeding' => false);
+        foreach ($TorrentList as &$Torrent) {
+            Torrents::torrent_properties($Torrent, $TorrentDetails['Flags']);
+        }
+    }
+
+    if ($Return) {
+        return array($TorrentDetails, $TorrentList);
+    }
+}
+# Line 165

_packages/web-seeds/sections/upload/upload_handle.php

@@ -0,0 +1,107 @@
+<?php
+
+# Line 88
+$Properties['Screenshots'] = isset($_POST['screenshots']) ? $_POST['screenshots'] : '';
+$Properties['Mirrors'] = isset($_POST['mirrors']) ? $_POST['mirrors'] : '';
+# Line 89
+
+# Line 512
+if (!isset($GroupID) || !$GroupID) {
+    // Create torrent group
+    $DB->query(
+        "
+    INSERT INTO torrents_group
+      (CategoryID, Name, NameRJ, NameJP, Year,
+      Series, Studio, CatalogueNumber, Pages, Time,
+      WikiBody, WikiImage, DLsiteID)
+    VALUES
+      ( ?, ?, ?, ?, ?,
+        ?, ?, ?, ?, NOW(),
+        ?, ?, ? )",
+        $TypeID,
+        $T['Title'],
+        $T['TitleRJ'],
+        $T['TitleJP'],
+        $T['Year'],
+        $T['Series'],
+        $T['Studio'],
+        $T['CatalogueNumber'],
+        $T['Pages'],
+        $Body,
+        $T['Image'],
+        $T['DLsiteID']
+    );
+    $GroupID = $DB->inserted_id();
+    foreach ($ArtistForm as $Num => $Artist) {
+        $DB->query("
+      INSERT IGNORE INTO torrents_artists (GroupID, ArtistID, UserID)
+      VALUES ( ?, ?, ? )", $GroupID, $Artist['id'], $LoggedUser['ID']);
+        $Cache->increment('stats_album_count');
+        $Cache->delete_value('artist_groups_'.$Artist['id']);
+    }
+    $Cache->increment('stats_group_count');
+
+    // Add screenshots
+    // todo: Clear DB_MYSQL::exec_prepared_query() errors
+    $Screenshots = explode("\n", $T['Screenshots']);
+    $Screenshots = array_map('trim', $Screenshots);
+
+    $Screenshots = array_filter($Screenshots, function ($s) {
+        return preg_match('/^'.DOI_REGEX.'$/i', $s);
+    });
+
+    $Screenshots = array_unique($Screenshots);
+    $Screenshots = array_slice($Screenshots, 0, 10);
+
+    # Add optional web seeds similar to screenshots
+    # Support an arbitrary and limited number of sources
+    $Mirrors = explode("\n", $T['Mirrors']);
+    $Mirrors = array_map('trim', $Mirrors);
+
+    $Mirrors = array_filter($Mirrors, function ($s) {
+        return preg_match('/^'.URL_REGEX.'$/i', $s);
+    });
+
+    $Mirrors = array_unique($Mirrors);
+    $Mirrors = array_slice($Mirrors, 0, 2);
+
+    # Downgrade TLS on resource URIs
+    # Required for BEP 19 compatibility
+    $Mirrors = str_ireplace('tps://', 'tp://', $Mirrors);
+
+    # Perform the DB inserts here
+    # Screenshots (publications)
+    if (!empty($Screenshots)) {
+        $Screenshot = '';
+        $DB->prepare_query("
+      INSERT INTO torrents_screenshots
+        (GroupID, UserID, Time, Image)
+      VALUES (?, ?, NOW(), ?)", $GroupID, $LoggedUser['ID'], $Screenshot);
+        foreach ($Screenshots as $Screenshot) {
+            $DB->exec_prepared_query();
+        }
+    }
+
+    # Mirrors
+    if (!empty($Mirrors)) {
+        $Mirror = '';
+        $DB->prepare_query("
+  INSERT INTO torrents_mirrors
+    (GroupID, UserID, Time, Resource)
+  VALUES (?, ?, NOW(), ?)", $GroupID, $LoggedUser['ID'], $Mirror);
+        foreach ($Mirrors as $Mirror) {
+            $DB->exec_prepared_query();
+        }
+    }
+
+# Main if/else
+} else {
+    $DB->query("
+    UPDATE torrents_group
+    SET Time = NOW()
+    WHERE ID = ?", $GroupID);
+    $Cache->delete_value("torrent_group_$GroupID");
+    $Cache->delete_value("torrents_details_$GroupID");
+    $Cache->delete_value("detail_files_$GroupID");
+}
+# Line 609

classes/torrent_form.class.php

@@ -2,24 +2,24 @@
 
 // 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
 {
     public $UploadForm = '';
     public $Categories = [];
-    #var $Formats = [];
-    #var $Bitrates = [];
+    #public $Formats = [];
+    #public $Bitrates = [];
     public $Media = [];
     public $MediaManga = [];
     public $Containers = [];
     public $ContainersGames = [];
     public $ContainersProt = [];
+    public $ContainersExtra = [];
     public $Codecs = [];
     public $Resolutions = [];
-    public $AudioFormats = [];
-    #var $Subbing = [];
-    #var $Languages = [];
-    #var $Platform = [];
+    #public $AudioFormats = [];
+    #public $Subbing = [];
+    #public $Languages = [];
+    #public $Platform = [];
     public $NewTorrent = false;
     public $Torrent = [];
     public $Error = false;
@@ -33,7 +33,7 @@ class TorrentForm
         $this->Torrent = $Torrent;
         $this->Error = $Error;
 
-        global $UploadForm, $Categories, $Media,  $MediaManga, $TorrentID, $Containers, $ContainersGames, $ContainersProt, $Codecs, $Resolutions, $Archives;
+        global $UploadForm, $Categories, $Media,  $MediaManga, $TorrentID, $Containers, $ContainersGames, $ContainersProt, $ContainersExtra, $Codecs, $Resolutions, $Archives;
         #global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $AudioFormats, $Subbing, $Languages, $Platform, $Archives, $ArchivesManga;
 
         $this->UploadForm = $UploadForm;
@@ -45,9 +45,10 @@ class TorrentForm
         $this->Containers = $Containers;
         $this->ContainersGames = $ContainersGames;
         $this->ContainersProt = $ContainersProt;
+        $this->ContainersExtra = $ContainersExtra;
         $this->Codecs = $Codecs;
         $this->Resolutions = $Resolutions;
-        $this->AudioFormats = $AudioFormats;
+        #$this->AudioFormats = $AudioFormats;
         #$this->Subbing = $Subbing;
         #$this->Languages = $Languages;
         $this->TorrentID = $TorrentID;
@@ -69,7 +70,10 @@ class TorrentForm
           WHERE UserID = ?", G::$LoggedUser['ID']);
         list($Uploads) = G::$DB->next_record(); ?>
 
-<!-- Everything until the catalogue number field-->
+<!--
+  Everything until the catalogue number field
+  Server-side torrent scrubbing admonishment
+-->
 <div class="thin">
   <?php if ($this->NewTorrent) { ?>
   <p style="text-align: center;">
@@ -80,6 +84,11 @@ class TorrentForm
       <a href="wiki.php?action=article&name=uploadingpitfalls">uploading pitfalls</a></strong>.
   </p>
 
+  <!--
+    Announce URLs displayed on the form
+    They're added to torrents in classes/torrentsdl.class.php
+    BioTorrents.de Gazelle supports tiered swarms, T1 private and T2 public
+  -->
   <p style="text-align: center;">
     <?php
       $Announces = ANNOUNCE_URLS[0];
@@ -95,6 +104,7 @@ class TorrentForm
       }
     ?>
 
+    <!-- Source -->
     <strong>Source</strong>
     <input type="text" value="<?= Users::get_upload_sources()[0] ?>"
       size="20" onclick="this.select();" readonly="readonly" />
@@ -185,6 +195,7 @@ class TorrentForm
       <?php
     }
 
+    # Make the endmatter
     public function foot()
     {
         $Torrent = $this->Torrent; ?>
@@ -258,17 +269,17 @@ class TorrentForm
   </form>
 </div>
 
-<!-- Okay, finally the real form -->
 <?php
     } # End
 
+    # Okay, finally the real form
     public function upload_form()
     {
         $QueryID = G::$DB->get_query_id();
         $this->head();
         $Torrent = $this->Torrent; ?>
 
-<!-- Catalogue number field -->
+<!-- Catalogue number autofill -->
 <table cellpadding="3" cellspacing="1" border="0" class="layout slice" width="100%">
   <?php if ($this->NewTorrent) { ?>
 
@@ -288,7 +299,7 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- Other autofill options -->
+  <!-- Autofill 2 -->
   <tr id="anidb_tr" class="hidden">
     <td class="label">AniDB Autofill (optional)</td>
     <td>
@@ -299,6 +310,7 @@ class TorrentForm
     </td>
   </tr>
 
+  <!-- Autofill 3 -->
   <tr id="ehentai_tr" class="hidden">
     <td class="label">e-hentai URL (optional)</td>
     <td>
@@ -334,6 +346,7 @@ class TorrentForm
     </td>
   </tr>
 
+  <!-- 2 -->
   <tr id="title_rj_tr">
     <td class="label" title="">Organism</td>
     <td>
@@ -344,6 +357,7 @@ class TorrentForm
     </td>
   </tr>
 
+  <!-- 3 -->
   <tr id="title_jp_tr">
     <td class="label">Strain/Variety</td>
     <td>
@@ -493,53 +507,37 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- Resolution -->
-  <tr id="resolution_tr">
+  <!-- Multiple container fields -->
+  <tr id="container_tr">
     <td class="label">
-      Assembly Level
+      Format
       <strong class="important_text">*</strong>
     </td>
     <td>
-      <select id="ressel" name="ressel" onchange="SetResolution()">
+      <select name="container">
         <option value="">---</option>
+        <option value="Autofill">Autofill</option>
         <?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";
+          foreach ($this->Containers as $Name => $Container) {
+              echo "<option value='$Name'>$Name</option>\n";
           } ?>
-      </select>
-
-      <input type="text" id="resolution" name="resolution" size="10" class="hidden"
-        value="<?= ($Torrent['Resolution']??'') ?>"
-        readonly>
-      </input>
-      <script>
-        if ($('#ressel').raw().value == "Other") {
-          $('#resolution').raw().readOnly = false
-          $('#resolution').gshow()
-        }
-      </script><br />
-      How complete the data is, specifically or conceptually
+      </select><br />
+      Data file format, or detect from file list
     </td>
   </tr>
 
-  <!-- Three container fields -->
-  <tr id="container_tr">
+  <!-- 2 -->
+  <tr id="container_games_tr">
     <td class="label">
       Format
       <strong class="important_text">*</strong>
     </td>
     <td>
-      <select name="container">
+      <select id="container" name="container">
         <option value="">---</option>
+        <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->Containers as $Name => $Container) {
+          foreach ($this->ContainersGames as $Name => $Container) {
               echo "<option value='$Name'>$Name</option>\n";
           } ?>
       </select><br />
@@ -547,8 +545,8 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- 2 -->
-  <tr id="container_games_tr">
+  <!-- 3 -->
+  <tr id="container_prot_tr">
     <td class="label">
       Format
       <strong class="important_text">*</strong>
@@ -556,8 +554,9 @@ class TorrentForm
     <td>
       <select id="container" name="container">
         <option value="">---</option>
+        <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->ContainersGames as $Name => $Container) {
+          foreach ($this->ContainersProt as $Name => $Container) {
               echo "<option value='$Name'>$Name</option>\n";
           } ?>
       </select><br />
@@ -565,8 +564,8 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- 3 -->
-  <tr id="container_prot_tr">
+    <!-- 4 -->
+    <tr id="container_extra_tr">
     <td class="label">
       Format
       <strong class="important_text">*</strong>
@@ -574,8 +573,9 @@ class TorrentForm
     <td>
       <select id="container" name="container">
         <option value="">---</option>
+        <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->ContainersProt as $Name => $Container) {
+          foreach ($this->ContainersExtra as $Name => $Container) {
               echo "<option value='$Name'>$Name</option>\n";
           } ?>
       </select><br />
@@ -592,6 +592,7 @@ class TorrentForm
     <td>
       <select name='archive'>
         <option value="">---</option>
+        <option value="Autofill">Autofill</option>
         <?php
           foreach ($this->Archives as $Name => $Archive) {
               echo "\t\t\t\t\t\t<option value=\"$Name\"";
@@ -605,6 +606,42 @@ class TorrentForm
     </td>
   </tr>
 
+    <!-- Resolution -->
+    <tr id="resolution_tr">
+    <td class="label">
+      Assembly Level
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="ressel" name="ressel" onchange="SetResolution()">
+        <option value="">---</option>
+        <?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"
+        value="<?= ($Torrent['Resolution']??'') ?>"
+        readonly>
+      </input>
+      <script>
+        if ($('#ressel').raw().value === 'Other') {
+          $('#resolution').raw().readOnly = false
+          $('#resolution').gshow()
+        }
+      </script><br />
+      How complete the data is, specifically or conceptually
+    </td>
+  </tr>
+
   <!-- Tags -->
   <?php if ($this->NewTorrent) { ?>
   <tr id="tags_tr">
@@ -651,6 +688,18 @@ class TorrentForm
     </td>
   </tr>
 
+  <!-- FTP/HTTP mirrors -->
+  <?php if (!$this->DisabledFlag && $this->NewTorrent) { ?>
+  <tr id="mirrors_tr">
+    <td class="label">Mirrors</td>
+    <td>
+      <textarea rows="1" cols="60" name="mirrors"
+        id="mirrors"><?= display_str($Torrent['Mirrors'])?></textarea>
+        <strong class="important_text">Experimental.</strong>
+      Up to two FTP/HTTP addresses that either point directly to a file, or for multi-file torrents, to the enclosing folder
+  </tr>
+  <?php } ?>
+  
   <!-- Sample pictures/links -->
   <?php if (!$this->DisabledFlag && $this->NewTorrent) { ?>
   <tr id="screenshots_tr">
@@ -685,7 +734,7 @@ class TorrentForm
       General info about the torrent subject's function or significance
     </td>
   </tr>
-  <?php } # Ends if NewTorrent line 499?>
+  <?php } # Ends if NewTorrent line 646?>
 
   <!-- Torrent description -->
   <tr id="release_desc_tr">

classes/torrentsdl.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Class for functions related to the features involving torrent downloads
  */
@@ -18,6 +19,7 @@ class TorrentsDL
     private $User;
     private $AnnounceURL;
     private $AnnounceList;
+    private $WebSeeds;
 
     /**
      * Create a Zip object and store the query results
@@ -42,6 +44,7 @@ class TorrentsDL
 
         $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->Zip = new Zip(Misc::file_string($Title));
     }
 
@@ -242,23 +245,28 @@ class TorrentsDL
     {
         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);
             }
-            /* todo: Support web seeds
+
+            # 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']);
+
         if (!empty($AnnounceList)) {
             $Tor->set_announce_list($AnnounceList);
         }
-        unset($Tor->Val['url-list']);
+
+        #unset($Tor->Val['url-list']);
         unset($Tor->Val['libtorrent_resume']);
         return $Tor->enc();
     }

gazelle.sql

@@ -1236,6 +1236,15 @@ CREATE TABLE `torrents_screenshots` (
   PRIMARY KEY (`ID`,`GroupID`,`Image`)
 ) ENGINE=InnoDB CHARSET=utf8mb4;
 
+CREATE TABLE `torrents_mirrors` (
+  `ID` int(10) NOT NULL AUTO_INCREMENT,
+  `GroupID` int(10) NOT NULL,
+  `UserID` int(10) NOT NULL,
+  `Time` datetime,
+  `Resource` varchar(255) NOT NULL,
+  PRIMARY KEY (`ID`,`GroupID`,`Resource`)
+) ENGINE=InnoDB CHARSET=utf8mb4;
+
 CREATE TABLE `torrents_tags` (
   `TagID` int(10) NOT NULL DEFAULT '0',
   `GroupID` int(10) NOT NULL DEFAULT '0',

sections/ajax/torrentgroup.php

@@ -6,38 +6,38 @@ $GroupID = (int)$_GET['id'];
 $TorrentHash = (string)$_GET['hash'];
 
 if ($GroupID && $TorrentHash) {
-  json_die("failure", "bad parameters");
+    json_die("failure", "bad parameters");
 }
 
 if ($TorrentHash) {
-  if (!is_valid_torrenthash($TorrentHash)) {
-    json_die("failure", "bad hash parameter");
-  } else {
-    $GroupID = (int)torrenthash_to_groupid($TorrentHash);
-    if (!$GroupID) {
-      json_die("failure", "bad hash parameter");
+    if (!is_valid_torrenthash($TorrentHash)) {
+        json_die("failure", "bad hash parameter");
+    } else {
+        $GroupID = (int)torrenthash_to_groupid($TorrentHash);
+        if (!$GroupID) {
+            json_die("failure", "bad hash parameter");
+        }
     }
-  }
 }
 
 if ($GroupID <= 0) {
-  json_die("failure", "bad id parameter");
+    json_die("failure", "bad id parameter");
 }
 
 $TorrentCache = get_group_info($GroupID, true, 0, true, true);
 
 if (!$TorrentCache) {
-  json_die("failure", "bad id parameter");
+    json_die("failure", "bad id parameter");
 }
 
 list($TorrentDetails, $TorrentList) = $TorrentCache;
 
 $Artists = pullmediainfo(Artists::get_artist($GroupID));
 
-if ($TorrentDetails['CategoryID'] == 0) {
-  $CategoryName = 'Unknown';
+if ($TorrentDetails['CategoryID'] === 0) {
+    $CategoryName = 'Unknown';
 } else {
-  $CategoryName = $Categories[$TorrentDetails['CategoryID'] - 1];
+    $CategoryName = $Categories[$TorrentDetails['CategoryID'] - 1];
 }
 
 $TagList = explode('|', $TorrentDetails['GROUP_CONCAT(DISTINCT tags.Name SEPARATOR \'|\')']);
@@ -62,17 +62,17 @@ $JsonTorrentDetails = [
 
 $JsonTorrentList = [];
 foreach ($TorrentList as $Torrent) {
-  // Convert file list back to the old format
-  $FileList = explode("\n", $Torrent['FileList']);
-  foreach ($FileList as &$File) {
-    $File = Torrents::filelist_old_format($File);
-  }
-  unset($File);
-  $FileList = implode('|||', $FileList);
-  $Userinfo = Users::user_info($Torrent['UserID']);
-  $Reports = Torrents::get_reports($Torrent['ID']);
-  $Torrent['Reported'] = count($Reports) > 0;
-  $JsonTorrentList[] = [
+    // Convert file list back to the old format
+    $FileList = explode("\n", $Torrent['FileList']);
+    foreach ($FileList as &$File) {
+        $File = Torrents::filelist_old_format($File);
+    }
+    unset($File);
+    $FileList = implode('|||', $FileList);
+    $Userinfo = Users::user_info($Torrent['UserID']);
+    $Reports = Torrents::get_reports($Torrent['ID']);
+    $Torrent['Reported'] = count($Reports) > 0;
+    $JsonTorrentList[] = [
     'id'          => (int)$Torrent['ID'],
     'infoHash'    => $Torrent['InfoHash'],
     'media'       => $Torrent['Media'],

sections/ajax/torrentgroupalbumart.php

@@ -1,9 +1,10 @@
 <?php
+
 require(SERVER_ROOT.'/sections/torrents/functions.php');
 
 $GroupID = (int)$_GET['id'];
 if ($GroupID === 0) {
-  error('Bad ID parameter', true);
+    error('Bad ID parameter', true);
 }
 
 $TorrentDetails = get_group_info($GroupID, true, 0, false);

sections/artist/notify.php

@@ -1,11 +1,12 @@
-<?
+<?php
+
 authorize();
 if (!check_perms('site_torrents_notify')) {
-  error(403);
+    error(403);
 }
 $ArtistID = $_GET['artistid'];
 if (!is_number($ArtistID)) {
-  error(0);
+    error(0);
 }
 /*
 $DB->query("
@@ -20,11 +21,11 @@ $DB->query("
   SELECT Name
   FROM artists_group
   WHERE ArtistID = '$ArtistID'");
-list($ArtistAliases) = $DB->next_record(MYSQLI_NUM, FALSE);
+list($ArtistAliases) = $DB->next_record(MYSQLI_NUM, false);
 
 $Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID']);
 if (empty($Notify)) {
-  $DB->query("
+    $DB->query("
     SELECT ID, Artists
     FROM users_notify_filters
     WHERE Label = 'Artist notifications'
@@ -32,31 +33,30 @@ if (empty($Notify)) {
     ORDER BY ID
     LIMIT 1");
 } else {
-  $DB->query("
+    $DB->query("
     SELECT ID, Artists
     FROM users_notify_filters
     WHERE ID = '$Notify[ID]'");
 }
 if (empty($Notify) && !$DB->has_results()) {
-  $DB->query("
+    $DB->query("
     INSERT INTO users_notify_filters
       (UserID, Label, Artists)
     VALUES
       ('$LoggedUser[ID]', 'Artist notifications', '|".db_string($ArtistAliases)."|')");
-  $FilterID = $DB->inserted_id();
-  $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
-  $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
+    $FilterID = $DB->inserted_id();
+    $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
+    $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
 } else {
-  list($ID, $ArtistNames) = $DB->next_record(MYSQLI_NUM, FALSE);
-  if (stripos($ArtistNames, "|$ArtistAliases|") === false) {
-    $ArtistNames .= "$ArtistAliases|";
-    $DB->query("
+    list($ID, $ArtistNames) = $DB->next_record(MYSQLI_NUM, false);
+    if (stripos($ArtistNames, "|$ArtistAliases|") === false) {
+        $ArtistNames .= "$ArtistAliases|";
+        $DB->query("
       UPDATE users_notify_filters
       SET Artists = '".db_string($ArtistNames)."'
       WHERE ID = '$ID'");
-    $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
-    $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
-  }
+        $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
+        $Cache->delete_value('notify_artists_'.$LoggedUser['ID']);
+    }
 }
 header('Location: '.$_SERVER['HTTP_REFERER']);
-?>

sections/torrents/details.php

@@ -23,7 +23,7 @@ $TorrentList = $TorrentCache[1];
 list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupYear,
   $GroupStudio, $GroupSeries, $GroupCatalogueNumber, $GroupPages, $GroupCategoryID,
   $GroupDLsiteID, $GroupTime, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
-  $Screenshots, $GroupFlags) = array_values($TorrentDetails);
+  $Screenshots, $Mirrors, $GroupFlags) = array_values($TorrentDetails);
 
 if (!$GroupName) {
     if (!$GroupNameRJ) {
@@ -951,6 +951,8 @@ if (count($PersonalCollages) > 0) {
     <?php
 }
 ?>
+
+    <!-- Torrent group description -->
     <div class="box torrent_description">
       <div class="head"><a href="#">&uarr;</a>&nbsp;<strong><?=(!empty($ReleaseType) ? $ReleaseTypes[$ReleaseType].' info' : 'Info')?></strong>
       </div>
@@ -961,6 +963,48 @@ if (count($PersonalCollages) > 0) {
 } ?>
       </div>
     </div>
+
+        <!-- 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>
+        <?php
+    if (count($Mirrors) > 0) {
+        ?>
+        <a class="float_right brackets" data-toggle-target=".torrent_mirrors" data-toggle-replace="Show">Hide</a>
+        <?php
+    }
+
+    $DB->query("
+      SELECT UserID
+      FROM torrents
+      WHERE GroupID = $GroupID");
+
+    if (in_array($LoggedUser['ID'], $DB->collect('UserID')) || check_perms('torrents_edit') || check_perms('screenshots_add') || check_perms('screenshots_delete')) {
+        ?>
+        <a class="brackets"
+          href="torrents.php?action=editgroup&groupid=<?=$GroupID?>#mirrors_section">Add/Remove</a>
+        <?php
+    }
+?>
+      </div>
+      <div class="body torrent_mirrors">
+        <?php if (!empty($Mirrors)) {
+    echo '<p>Mirror links open in a new tab.</p>';
+} ?>
+        <ul>
+          <?php
+    foreach ($Mirrors as $Mirror) {
+        echo '<li><a href="'.$Mirror['Resource'].'" target="_blank">'.$Mirror['Resource'].'</a></li>';
+    }
+?>
+        </ul>
+      </div>
+    </div>
+
+    <!-- Screenshots (Publications) -->
     <div class="box torrent_screenshots_box <?php if (!count($Screenshots)) {
     echo 'dead';
 } ?>">
@@ -1018,6 +1062,7 @@ if (count($PersonalCollages) > 0) {
         } catch (e) {}
       </script>
     </div>
+
     <?php
 // --- Comments ---
 $Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');

sections/torrents/download.php

@@ -1,4 +1,5 @@
 <?php
+
 if (!isset($_REQUEST['authkey']) || !isset($_REQUEST['torrent_pass'])) {
     enforce_login();
     $TorrentPass = $LoggedUser['torrent_pass'];
@@ -12,40 +13,41 @@ 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("
@@ -54,6 +56,7 @@ 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();
@@ -72,29 +75,36 @@ 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, $Size, $FreeTorrent, $InfoHash) = array_shift($Info); // used for generating the filename
+
+list($Media, $Format, $Encoding, $Year, $GroupID, $Name, $Image, $CategoryID, $Resources, $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'];
@@ -110,7 +120,6 @@ if ($_REQUEST['usetoken'] && $FreeTorrent == '0') {
     }
 
     // First make sure this isn't already FL, and if it is, do nothing
-
     if (!Torrents::has_token($TorrentID)) {
         if ($FLTokens <= 0) {
             error('You do not have any freeleech tokens left. Please use the regular DL link.');
@@ -126,16 +135,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);
@@ -150,7 +159,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)) {
@@ -192,6 +201,6 @@ $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);
 
-echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);
+echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList, $Resources);
 
 define('SKIP_NO_CACHE_HEADERS', 1);

sections/torrents/functions.php

@@ -1,25 +1,26 @@
-<?
-function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProperties = true, $ApiCall = false) {
-  global $Cache, $DB;
-  if (!$RevisionID) {
-    $TorrentCache = $Cache->get_value("torrents_details_$GroupID");
-  }
-  if ($RevisionID || !is_array($TorrentCache)) {
-    // Fetch the group details
-
-    $SQL = 'SELECT ';
+<?php
 
+function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProperties = true, $ApiCall = false)
+{
+    global $Cache, $DB;
     if (!$RevisionID) {
-      $SQL .= '
+        $TorrentCache = $Cache->get_value("torrents_details_$GroupID");
+    }
+    if ($RevisionID || !is_array($TorrentCache)) {
+        // Fetch the group details
+        $SQL = 'SELECT ';
+
+        if (!$RevisionID) {
+            $SQL .= '
         g.WikiBody,
         g.WikiImage, ';
-    } else {
-      $SQL .= '
+        } else {
+            $SQL .= '
         w.Body,
         w.Image, ';
-    }
+        }
 
-    $SQL .= "
+        $SQL .= "
         g.ID,
         g.Name,
         g.NameRJ,
@@ -39,35 +40,50 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProp
         LEFT JOIN torrents_tags AS tt ON tt.GroupID = g.ID
         LEFT JOIN tags ON tags.ID = tt.TagID";
 
-    if ($RevisionID) {
-      $SQL .= "
+        if ($RevisionID) {
+            $SQL .= "
         LEFT JOIN wiki_torrents AS w ON w.PageID = '".db_string($GroupID)."'
             AND w.RevisionID = '".db_string($RevisionID)."' ";
-    }
+        }
 
-    $SQL .= "
+        $SQL .= "
       WHERE g.ID = '".db_string($GroupID)."'
       GROUP BY NULL";
 
-    $DB->query($SQL);
-
-    $TorrentDetails = $DB->next_record(MYSQLI_ASSOC);
-    $TorrentDetails['Screenshots'] = [];
-
-    $DB->query("
-      SELECT
-        ID, UserID, Time, Image
-      FROM torrents_screenshots
-      WHERE GroupID = ".db_string($GroupID));
-
-    if ($DB->has_results()) {
-      while ($Screenshot = $DB->next_record(MYSQLI_ASSOC, true)) {
-        $TorrentDetails['Screenshots'][] = $Screenshot;
-      }
-    }
-
-    // Fetch the individual torrents
-    $DB->query("
+        $DB->query($SQL);
+
+        $TorrentDetails = $DB->next_record(MYSQLI_ASSOC);
+        $TorrentDetails['Screenshots'] = [];
+        $TorrentDetails['Mirrors'] = [];
+
+        # Screenshots (Publications)
+        $DB->query("
+        SELECT
+          ID, UserID, Time, Image
+        FROM torrents_screenshots
+        WHERE GroupID = ".db_string($GroupID));
+
+        if ($DB->has_results()) {
+            while ($Screenshot = $DB->next_record(MYSQLI_ASSOC, true)) {
+                $TorrentDetails['Screenshots'][] = $Screenshot;
+            }
+        }
+
+        # Mirrors
+        $DB->query("
+        SELECT
+          ID, UserID, Time, Resource
+        FROM torrents_mirrors
+        WHERE GroupID = ".db_string($GroupID));
+  
+        if ($DB->has_results()) {
+            while ($Mirror = $DB->next_record(MYSQLI_ASSOC, true)) {
+                $TorrentDetails['Mirrors'][] = $Mirror;
+            }
+        }
+  
+        // Fetch the individual torrents
+        $DB->query("
       SELECT
         t.ID,
         t.Media,
@@ -113,115 +129,121 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProp
         t.Media ASC,
         t.ID");
 
-    $TorrentList = $DB->to_array('ID', MYSQLI_ASSOC);
-    if (count($TorrentList) === 0 && $ApiCall == false) {
-      header('Location: log.php?search='.(empty($_GET['torrentid']) ? "Group+$GroupID" : "Torrent+$_GET[torrentid]"));
-      die();
-    } elseif (count($TorrentList) === 0 && $ApiCall == true) {
-      return null;
-    }
-    if (in_array(0, $DB->collect('Seeders'))) {
-      $CacheTime = 600;
-    } else {
-      $CacheTime = 3600;
+        $TorrentList = $DB->to_array('ID', MYSQLI_ASSOC);
+        if (count($TorrentList) === 0 && $ApiCall == false) {
+            header('Location: log.php?search='.(empty($_GET['torrentid']) ? "Group+$GroupID" : "Torrent+$_GET[torrentid]"));
+            die();
+        } elseif (count($TorrentList) === 0 && $ApiCall == true) {
+            return null;
+        }
+        if (in_array(0, $DB->collect('Seeders'))) {
+            $CacheTime = 600;
+        } else {
+            $CacheTime = 3600;
+        }
+        // Store it all in cache
+        if (!$RevisionID) {
+            $Cache->cache_value("torrents_details_$GroupID", array($TorrentDetails, $TorrentList), $CacheTime);
+        }
+    } else { // If we're reading from cache
+        $TorrentDetails = $TorrentCache[0];
+        $TorrentList = $TorrentCache[1];
     }
-    // Store it all in cache
-    if (!$RevisionID) {
-      $Cache->cache_value("torrents_details_$GroupID", array($TorrentDetails, $TorrentList), $CacheTime);
-    }
-  } else { // If we're reading from cache
-    $TorrentDetails = $TorrentCache[0];
-    $TorrentList = $TorrentCache[1];
-  }
 
-  if ($PersonalProperties) {
-    // Fetch all user specific torrent and group properties
-    $TorrentDetails['Flags'] = array('IsSnatched' => false, 'IsLeeching' => false, 'IsSeeding' => false);
-    foreach ($TorrentList as &$Torrent) {
-      Torrents::torrent_properties($Torrent, $TorrentDetails['Flags']);
+    if ($PersonalProperties) {
+        // Fetch all user specific torrent and group properties
+        $TorrentDetails['Flags'] = array('IsSnatched' => false, 'IsLeeching' => false, 'IsSeeding' => false);
+        foreach ($TorrentList as &$Torrent) {
+            Torrents::torrent_properties($Torrent, $TorrentDetails['Flags']);
+        }
     }
-  }
-
-  if ($Return) {
-    return array($TorrentDetails, $TorrentList);
-  }
-}
 
-function get_torrent_info($TorrentID, $Return = true, $RevisionID = 0, $PersonalProperties = true, $ApiCall = false) {
-  global $Cache, $DB;
-  $GroupID = (int)torrentid_to_groupid($TorrentID);
-  $GroupInfo = get_group_info($GroupID, $Return, $RevisionID, $PersonalProperties, $ApiCall);
-  if ($GroupInfo) {
-    foreach ($GroupInfo[1] as &$Torrent) {
-      //Remove unneeded entries
-      if ($Torrent['ID'] != $TorrentID) {
-        unset($GroupInfo[1][$Torrent['ID']]);
-      }
-      if ($Return) {
-        return $GroupInfo;
-      }
-    }
-  } else {
     if ($Return) {
-      return null;
+        return array($TorrentDetails, $TorrentList);
     }
-  }
 }
 
-//Check if a givin string can be validated as a torrenthash
-function is_valid_torrenthash($Str) {
-  //6C19FF4C 6C1DD265 3B25832C 0F6228B2 52D743D5
-  $Str = str_replace(' ', '', $Str);
-  if (preg_match('/^[0-9a-fA-F]{40}$/', $Str))
-    return $Str;
-  return false;
+function get_torrent_info($TorrentID, $Return = true, $RevisionID = 0, $PersonalProperties = true, $ApiCall = false)
+{
+    global $Cache, $DB;
+    $GroupID = (int)torrentid_to_groupid($TorrentID);
+    $GroupInfo = get_group_info($GroupID, $Return, $RevisionID, $PersonalProperties, $ApiCall);
+    if ($GroupInfo) {
+        foreach ($GroupInfo[1] as &$Torrent) {
+            // Remove unneeded entries
+            if ($Torrent['ID'] != $TorrentID) {
+                unset($GroupInfo[1][$Torrent['ID']]);
+            }
+            if ($Return) {
+                return $GroupInfo;
+            }
+        }
+    } else {
+        if ($Return) {
+            return null;
+        }
+    }
 }
 
-//Functionality for the API to resolve input into other data.
+// Check if a givin string can be validated as a torrenthash
+function is_valid_torrenthash($Str)
+{
+    // 6C19FF4C 6C1DD265 3B25832C 0F6228B2 52D743D5
+    $Str = str_replace(' ', '', $Str);
+    if (preg_match('/^[0-9a-fA-F]{40}$/', $Str)) {
+        return $Str;
+    }
+    return false;
+}
 
-function torrenthash_to_torrentid($Str) {
-  global $Cache, $DB;
-  $DB->query("
+// Functionality for the API to resolve input into other data
+function torrenthash_to_torrentid($Str)
+{
+    global $Cache, $DB;
+    $DB->query("
     SELECT ID
     FROM torrents
     WHERE HEX(info_hash) = '".db_string($Str)."'");
-  $TorrentID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
-  if ($TorrentID) {
-    return $TorrentID;
-  }
-  return null;
+    $TorrentID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
+    if ($TorrentID) {
+        return $TorrentID;
+    }
+    return null;
 }
 
-function torrenthash_to_groupid($Str) {
-  global $Cache, $DB;
-  $DB->query("
+function torrenthash_to_groupid($Str)
+{
+    global $Cache, $DB;
+    $DB->query("
     SELECT GroupID
     FROM torrents
     WHERE HEX(info_hash) = '".db_string($Str)."'");
-  $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
-  if ($GroupID) {
-    return $GroupID;
-  }
-  return null;
+    $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
+    if ($GroupID) {
+        return $GroupID;
+    }
+    return null;
 }
 
-function torrentid_to_groupid($TorrentID) {
-  global $Cache, $DB;
-  $DB->query("
+function torrentid_to_groupid($TorrentID)
+{
+    global $Cache, $DB;
+    $DB->query("
     SELECT GroupID
     FROM torrents
     WHERE ID = '".db_string($TorrentID)."'");
-  $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
-  if ($GroupID) {
-    return $GroupID;
-  }
-  return null;
+    $GroupID = (int)array_pop($DB->next_record(MYSQLI_ASSOC));
+    if ($GroupID) {
+        return $GroupID;
+    }
+    return null;
 }
 
-//After adjusting / deleting logs, recalculate the score for the torrent.
-function set_torrent_logscore($TorrentID) {
-  global $DB;
-  $DB->query("
+// After adjusting / deleting logs, recalculate the score for the torrent
+function set_torrent_logscore($TorrentID)
+{
+    global $DB;
+    $DB->query("
     UPDATE torrents
     SET LogScore = (
         SELECT FLOOR(AVG(Score))
@@ -231,84 +253,86 @@ function set_torrent_logscore($TorrentID) {
     WHERE ID = $TorrentID");
 }
 
-function get_group_requests($GroupID) {
-  if (empty($GroupID) || !is_number($GroupID)) {
-    return [];
-  }
-  global $DB, $Cache;
+function get_group_requests($GroupID)
+{
+    if (empty($GroupID) || !is_number($GroupID)) {
+        return [];
+    }
+    global $DB, $Cache;
 
-  $Requests = $Cache->get_value("requests_group_$GroupID");
-  if ($Requests === false) {
-    $DB->query("
+    $Requests = $Cache->get_value("requests_group_$GroupID");
+    if ($Requests === false) {
+        $DB->query("
       SELECT ID
       FROM requests
       WHERE GroupID = $GroupID
         AND TimeFilled IS NULL");
-    $Requests = $DB->collect('ID');
-    $Cache->cache_value("requests_group_$GroupID", $Requests, 0);
-  }
-  return Requests::get_requests($Requests);
+        $Requests = $DB->collect('ID');
+        $Cache->cache_value("requests_group_$GroupID", $Requests, 0);
+    }
+    return Requests::get_requests($Requests);
 }
 
-//Used by both sections/torrents/details.php and sections/reportsv2/report.php
-function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $GroupCategoryID, $TorrentList, $Types, $Username) {
-
-  function filelist($Str) {
-    return "</td>\n<td>" . Format::get_size($Str[1]) . "</td>\n</tr>";
-  }
-  $EditionID = 0;
-  foreach ($TorrentList as $Torrent) {
-  list($TorrentID, $Media, $Container, $Codec, $Resolution, $AudioFormat, $Subbing,
+// Used by both sections/torrents/details.php and sections/reportsv2/report.php
+function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $GroupCategoryID, $TorrentList, $Types, $Username)
+{
+    function filelist($Str)
+    {
+        return "</td>\n<td>" . Format::get_size($Str[1]) . "</td>\n</tr>";
+    }
+    $EditionID = 0;
+    foreach ($TorrentList as $Torrent) {
+        list($TorrentID, $Media, $Container, $Codec, $Resolution, $AudioFormat, $Subbing,
   $Subber, $Language, $Censored, $Anonymous, $Archive, $FileCount, $Size, $Seeders, $Leechers, $Snatched,
   $FreeTorrent, $FreeLeechType, $TorrentTime, $Description, $MediaInfo, $FileList, $FilePath, $UserID,
   $LastActive, $InfoHash, $BadTags, $BadFolders, $BadFiles, $LastReseedRequest,
   $LogInDB, $HasFile, $PersonalFL, $IsSnatched, $IsSeeding, $IsLeeching) = array_values($Torrent);
 
-  $Reported = false;
-  $Reports = Torrents::get_reports($TorrentID);
-  $NumReports = count($Reports);
+        $Reported = false;
+        $Reports = Torrents::get_reports($TorrentID);
+        $NumReports = count($Reports);
 
-  if ($NumReports > 0) {
-    $Reported = true;
-    include(SERVER_ROOT.'/sections/reportsv2/array.php');
-    $ReportInfo = '
+        if ($NumReports > 0) {
+            $Reported = true;
+            include(SERVER_ROOT.'/sections/reportsv2/array.php');
+            $ReportInfo = '
     <table class="reportinfo_table">
       <tr class="colhead_dark" style="font-weight: bold;">
         <td>This torrent has '.$NumReports.' active '.($NumReports === 1 ? 'report' : 'reports').":</td>
       </tr>";
 
-    foreach ($Reports as $Report) {
-      if (check_perms('admin_reports')) {
-        $ReporterID = $Report['ReporterID'];
-        $Reporter = Users::user_info($ReporterID);
-        $ReporterName = $Reporter['Username'];
-        $ReportLinks = "<a href=\"user.php?id=$ReporterID\">$ReporterName</a> <a href=\"reportsv2.php?view=report&amp;id=$Report[ID]\">reported it</a>";
-      } else {
-        $ReportLinks = 'Someone reported it';
-      }
-
-      if (isset($Types[$GroupCategoryID][$Report['Type']])) {
-        $ReportType = $Types[$GroupCategoryID][$Report['Type']];
-      } elseif (isset($Types['master'][$Report['Type']])) {
-        $ReportType = $Types['master'][$Report['Type']];
-      } else {
-        //There was a type but it wasn't an option!
-        $ReportType = $Types['master']['other'];
-      }
-      $ReportInfo .= "
+            foreach ($Reports as $Report) {
+                if (check_perms('admin_reports')) {
+                    $ReporterID = $Report['ReporterID'];
+                    $Reporter = Users::user_info($ReporterID);
+                    $ReporterName = $Reporter['Username'];
+                    $ReportLinks = "<a href=\"user.php?id=$ReporterID\">$ReporterName</a> <a href=\"reportsv2.php?view=report&amp;id=$Report[ID]\">reported it</a>";
+                } else {
+                    $ReportLinks = 'Someone reported it';
+                }
+
+                if (isset($Types[$GroupCategoryID][$Report['Type']])) {
+                    $ReportType = $Types[$GroupCategoryID][$Report['Type']];
+                } elseif (isset($Types['master'][$Report['Type']])) {
+                    $ReportType = $Types['master'][$Report['Type']];
+                } else {
+                    // There was a type but it wasn't an option!
+                    $ReportType = $Types['master']['other'];
+                }
+                $ReportInfo .= "
       <tr>
         <td>$ReportLinks ".time_diff($Report['ReportedTime'], 2, true, true).' for the reason "'.$ReportType['title'].'":
           <blockquote>'.Text::full_format($Report['UserComment']).'</blockquote>
         </td>
       </tr>';
-    }
-    $ReportInfo .= "\n\t\t</table>";
-  }
+            }
+            $ReportInfo .= "\n\t\t</table>";
+        }
 
-  $CanEdit = (check_perms('torrents_edit') || (($UserID == $LoggedUser['ID'] && !$LoggedUser['DisableWiki'])));
+        $CanEdit = (check_perms('torrents_edit') || (($UserID == $LoggedUser['ID'] && !$LoggedUser['DisableWiki'])));
 
-  $RegenLink = check_perms('users_mod') ? ' <a href="torrents.php?action=regen_filelist&amp;torrentid=' . $TorrentID . '" class="brackets">Regenerate</a>' : '';
-  $FileTable = '
+        $RegenLink = check_perms('users_mod') ? ' <a href="torrents.php?action=regen_filelist&amp;torrentid=' . $TorrentID . '" class="brackets">Regenerate</a>' : '';
+        $FileTable = '
   <table class="filelist_table">
     <tr class="colhead_dark">
       <td>
@@ -319,88 +343,88 @@ function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $G
         <strong>Size</strong>
       </td>
     </tr>';
-  if (substr($FileList, -3) == '}}}') { // Old style
-    $FileListSplit = explode('|||', $FileList);
-    foreach ($FileListSplit as $File) {
-    $NameEnd = strrpos($File, '{{{');
-    $Name = substr($File, 0, $NameEnd);
-    if ($Spaces = strspn($Name, ' ')) {
-      $Name = str_replace(' ', '&nbsp;', substr($Name, 0, $Spaces)) . substr($Name, $Spaces);
-    }
-    $FileSize = substr($File, $NameEnd + 3, -3);
-    $FileTable .= sprintf("\n<tr class=\"row\"><td>%s</td><td class=\"number_column\">%s</td></tr>", $Name, Format::get_size($FileSize));
-    }
-  } else {
-    $FileListSplit = explode("\n", $FileList);
-    foreach ($FileListSplit as $File) {
-    $FileInfo = Torrents::filelist_get_file($File);
-    $FileTable .= sprintf("\n<tr class=\"row\"><td>%s</td><td class=\"number_column\">%s</td></tr>", $FileInfo['name'], Format::get_size($FileInfo['size']));
-    }
-  }
-  $FileTable .= '
+        if (substr($FileList, -3) == '}}}') { // Old style
+            $FileListSplit = explode('|||', $FileList);
+            foreach ($FileListSplit as $File) {
+                $NameEnd = strrpos($File, '{{{');
+                $Name = substr($File, 0, $NameEnd);
+                if ($Spaces = strspn($Name, ' ')) {
+                    $Name = str_replace(' ', '&nbsp;', substr($Name, 0, $Spaces)) . substr($Name, $Spaces);
+                }
+                $FileSize = substr($File, $NameEnd + 3, -3);
+                $FileTable .= sprintf("\n<tr class=\"row\"><td>%s</td><td class=\"number_column\">%s</td></tr>", $Name, Format::get_size($FileSize));
+            }
+        } else {
+            $FileListSplit = explode("\n", $FileList);
+            foreach ($FileListSplit as $File) {
+                $FileInfo = Torrents::filelist_get_file($File);
+                $FileTable .= sprintf("\n<tr class=\"row\"><td>%s</td><td class=\"number_column\">%s</td></tr>", $FileInfo['name'], Format::get_size($FileInfo['size']));
+            }
+        }
+        $FileTable .= '
   </table>';
 
-  $ExtraInfo = ''; // String that contains information on the torrent (e.g. format and encoding)
+        $ExtraInfo = ''; // String that contains information on the torrent (e.g. format and encoding)
   $AddExtra = ''; // Separator between torrent properties
 
   $TorrentUploader = $Username; // Save this for "Uploaded by:" below
-  // similar to Torrents::torrent_info()
-  if (!$ExtraInfo) {
-    $ExtraInfo = $GroupName;
-    $AddExtra = ' / ';
-  }
-  if ($IsLeeching) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Leeching');
-    $AddExtra = ' / ';
-  } else if ($IsSeeding) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Seeding');
-    $AddExtra = ' / ';
-  } else if ($IsSnatched) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Snatched!');
-    $AddExtra = ' / ';
-  }
-  if ($FreeTorrent == '1') {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Freeleech!');
-    $AddExtra = ' / ';
-  }
-  if ($FreeTorrent == '2') {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Neutral Leech!');
-    $AddExtra = ' / ';
-  }
-  if ($PersonalFL) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Personal Freeleech!');
-    $AddExtra = ' / ';
-  }
-  if ($Reported) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Reported');
-    $AddExtra = ' / ';
-  }
-  if (!empty($BadTags)) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Tags');
-    $AddExtra = ' / ';
-  }
-  if (!empty($BadFolders)) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Folders');
-    $AddExtra = ' / ';
-  }
-  if (!empty($BadFiles)) {
-    $ExtraInfo .= $AddExtra . Format::torrent_label('Bad File Names');
-    $AddExtra = ' / ';
-  }
-    ?>
+        // Similar to Torrents::torrent_info()
+        if (!$ExtraInfo) {
+            $ExtraInfo = $GroupName;
+            $AddExtra = ' / ';
+        }
+        if ($IsLeeching) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Leeching');
+            $AddExtra = ' / ';
+        } elseif ($IsSeeding) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Seeding');
+            $AddExtra = ' / ';
+        } elseif ($IsSnatched) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Snatched!');
+            $AddExtra = ' / ';
+        }
+        # todo: Check strict equality
+        if ($FreeTorrent == '1') {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Freeleech!');
+            $AddExtra = ' / ';
+        }
+        if ($FreeTorrent == '2') {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Neutral Leech!');
+            $AddExtra = ' / ';
+        }
+        if ($PersonalFL) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Personal Freeleech!');
+            $AddExtra = ' / ';
+        }
+        if ($Reported) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Reported');
+            $AddExtra = ' / ';
+        }
+        if (!empty($BadTags)) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Tags');
+            $AddExtra = ' / ';
+        }
+        if (!empty($BadFolders)) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Folders');
+            $AddExtra = ' / ';
+        }
+        if (!empty($BadFiles)) {
+            $ExtraInfo .= $AddExtra . Format::torrent_label('Bad File Names');
+            $AddExtra = ' / ';
+        } ?>
         <tr class="torrent_row<?=(isset($ReleaseType)?' releases_'.$ReleaseType:'')?> groupid_<?=($GroupID)?> edition_<?=($EditionID)?> group_torrent<?=($IsSnatched ? ' snatched_torrent' : '')?>" style="font-weight: normal;" id="torrent<?=($TorrentID)?>">
           <td>
             <span>[ <a href="torrents.php?action=download&amp;id=<?=($TorrentID)?>&amp;authkey=<?=($LoggedUser['AuthKey'])?>&amp;torrent_pass=<?=($LoggedUser['torrent_pass'])?>" class="tooltip" title="Download"><?=($HasFile ? 'DL' : 'Missing')?></a>
-<?  if (Torrents::can_use_token($Torrent)) { ?>
+<?php  if (Torrents::can_use_token($Torrent)) { ?>
               | <a href="torrents.php?action=download&amp;id=<?=($TorrentID)?>&amp;authkey=<?=($LoggedUser['AuthKey'])?>&amp;torrent_pass=<?=($LoggedUser['torrent_pass'])?>&amp;usetoken=1" class="tooltip" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-<?  } ?>
+<?php  } ?>
               | <a href="reportsv2.php?action=report&amp;id=<?=($TorrentID)?>" class="tooltip" title="Report">RP</a>
-<?  if ($CanEdit) { ?>
+<?php  if ($CanEdit) { ?>
               | <a href="torrents.php?action=edit&amp;id=<?=($TorrentID)?>" class="tooltip" title="Edit">ED</a>
-<?  }
-  if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?>
+<?php  }
+        if (check_perms('torrents_delete') || $UserID == $LoggedUser['ID']) { ?>
               | <a href="torrents.php?action=delete&amp;torrentid=<?=($TorrentID)?>" class="tooltip" title="Remove">RM</a>
-<?  } ?>
+<?php  } ?>
               | <a href="torrents.php?torrentid=<?=($TorrentID)?>" class="tooltip" title="Permalink">PL</a>
             ]</span>
             &raquo; <a data-toggle-target="#torrent_<?=($TorrentID)?>"><?=($ExtraInfo)?></a>
@@ -410,61 +434,61 @@ function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $G
           <td class="number_column"><?=(number_format($Seeders))?></td>
           <td class="number_column"><?=(number_format($Leechers))?></td>
         </tr>
-        <tr class="<?=(isset($ReleaseType)?'releases_'.$ReleaseType:'')?> groupid_<?=($GroupID)?> edition_<?=($EditionID)?> torrentdetails pad<? if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?> hidden<? } ?>" id="torrent_<?=($TorrentID)?>">
+        <tr class="<?=(isset($ReleaseType)?'releases_'.$ReleaseType:'')?> groupid_<?=($GroupID)?> edition_<?=($EditionID)?> torrentdetails pad<?php if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?> hidden<?php } ?>" id="torrent_<?=($TorrentID)?>">
           <td colspan="5">
             <blockquote>
-              Uploaded by <?
+              Uploaded by <?php
   if ($Anonymous) {
-    if (check_perms('users_mod')) { ?>
+      if (check_perms('users_mod')) { ?>
       <em class="tooltip" title="<?=Users::user_info($UserID)['Username']?>">Anonymous</em>
-<?  } else {
-      ?><em>Anonymous</em><?
-    }
+<?php  } else {
+          ?><em>Anonymous</em><?php
+      }
   } else {
-    print (Users::format_username($UserID, false, false, false));
-  }
-?> <?=time_diff($TorrentTime);?>
-<?  if ($Seeders == 0) {
-    if ($LastActive && time() - strtotime($LastActive) >= 1209600) { ?>
+      print(Users::format_username($UserID, false, false, false));
+  } ?> <?=time_diff($TorrentTime); ?>
+<?php  if ($Seeders === 0) {
+      if ($LastActive && time() - strtotime($LastActive) >= 1209600) { ?>
                 <br /><strong>Last active: <?=time_diff($LastActive);?></strong>
-<?    } else { ?>
+<?php    } else { ?>
                 <br />Last active: <?=time_diff($LastActive);?>
-<?    }
-    if ($LastActive && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
+<?php    }
+      if ($LastActive && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
                 <br /><a href="torrents.php?action=reseed&amp;torrentid=<?=($TorrentID)?>&amp;groupid=<?=($GroupID)?>" class="brackets">Request re-seed</a>
-<?    }
+<?php    }
   } ?>
             </blockquote>
-<?  if (check_perms('site_moderate_requests')) { ?>
+<?php  if (check_perms('site_moderate_requests')) { ?>
             <div class="linkbox">
               <a href="torrents.php?action=masspm&amp;id=<?=($GroupID)?>&amp;torrentid=<?=($TorrentID)?>" class="brackets">Mass PM snatchers</a>
             </div>
-<?  } ?>
+<?php  } ?>
             <div class="linkbox">
               <a href="#" class="brackets" onclick="show_peers('<?=($TorrentID)?>', 0); return false;">View peer list</a>
-<?  if (check_perms('site_view_torrent_snatchlist')) { ?>
+<?php  if (check_perms('site_view_torrent_snatchlist')) { ?>
               <a href="#" class="brackets tooltip" onclick="show_downloads('<?=($TorrentID)?>', 0); return false;" title="View the list of users that have clicked the &quot;DL&quot; button.">View download list</a>
               <a href="#" class="brackets tooltip" onclick="show_snatches('<?=($TorrentID)?>', 0); return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a>
-<?  } ?>
+<?php  } ?>
               <a href="#" class="brackets" onclick="show_files('<?=($TorrentID)?>'); return false;">View file list</a>
-<?  if ($Reported) { ?>
+<?php  if ($Reported) { ?>
               <a href="#" class="brackets" onclick="show_reported('<?=($TorrentID)?>'); return false;">View report information</a>
-<?  } ?>
+<?php  } ?>
             </div>
             <div id="peers_<?=($TorrentID)?>" class="hidden"></div>
             <div id="downloads_<?=($TorrentID)?>" class="hidden"></div>
             <div id="snatches_<?=($TorrentID)?>" class="hidden"></div>
             <div id="files_<?=($TorrentID)?>" class="hidden"><?=($FileTable)?></div>
-<?  if ($Reported) { ?>
+<?php  if ($Reported) { ?>
             <div id="reported_<?=($TorrentID)?>" class="hidden"><?=($ReportInfo)?></div>
-<?  }
-  if (!empty($Description)) {
-    echo "\n\t\t\t\t\t\t<blockquote>" . Text::full_format($Description) . '</blockquote>';
-  } if (!empty($MediaInfo)) {
-    echo "\n\t\t\t\t\t\t<blockquote>" . MediaInfo::parse($MediaInfo) . "</blockquote>";
-  } ?>
+<?php  }
+        if (!empty($Description)) {
+            echo "\n\t\t\t\t\t\t<blockquote>" . Text::full_format($Description) . '</blockquote>';
+        }
+        if (!empty($MediaInfo)) {
+            echo "\n\t\t\t\t\t\t<blockquote>" . MediaInfo::parse($MediaInfo) . "</blockquote>";
+        } ?>
           </td>
         </tr>
-<?
-  }
+<?php
+    }
 }

sections/upload/upload_handle.php

@@ -86,6 +86,7 @@ $Properties['GroupDescription'] = trim($_POST['album_desc']);
 $Properties['TorrentDescription'] = $_POST['release_desc'];
 $Properties['MediaInfo'] = 'nil';
 $Properties['Screenshots'] = isset($_POST['screenshots']) ? $_POST['screenshots'] : '';
+$Properties['Mirrors'] = isset($_POST['mirrors']) ? $_POST['mirrors'] : '';
 
 if ($_POST['album_desc']) {
     $Properties['GroupDescription'] = trim($_POST['album_desc']);
@@ -406,9 +407,9 @@ if (!empty($Err)) { // Show the upload form, with the data the user entered
 if ($T['Container'] === 'Autofill' || $T['Archive'] === 'Autofill') {
     # torrents.Container
     $Validate->ParseExtensions(
-    $Tor->file_list(),
-    array_merge($Containers, $ContainersGames, $ContainersProt)
-);
+        $Tor->file_list(),
+        array_merge($Containers, $ContainersGames, $ContainersProt)
+    );
     /*
     # torrents.Archive
     $Validate->ParseExtensions(
@@ -555,6 +556,25 @@ if (!isset($GroupID) || !$GroupID) {
     $Screenshots = array_unique($Screenshots);
     $Screenshots = array_slice($Screenshots, 0, 10);
 
+
+    # Add optional web seeds similar to screenshots
+    # Support an arbitrary and limited number of sources
+    $Mirrors = explode("\n", $T['Mirrors']);
+    $Mirrors = array_map('trim', $Mirrors);
+
+    $Mirrors = array_filter($Mirrors, function ($s) {
+        return preg_match('/^'.URL_REGEX.'$/i', $s);
+    });
+
+    $Mirrors = array_unique($Mirrors);
+    $Mirrors = array_slice($Mirrors, 0, 2);
+
+    # Downgrade TLS on resource URIs
+    # Required for BEP 19 compatibility
+    $Mirrors = str_ireplace('tps://', 'tp://', $Mirrors);
+
+    # Perform the DB inserts here
+    # Screenshots (Publications)
     if (!empty($Screenshots)) {
         $Screenshot = '';
         $DB->prepare_query("
@@ -565,6 +585,20 @@ if (!isset($GroupID) || !$GroupID) {
             $DB->exec_prepared_query();
         }
     }
+
+    # Mirrors
+    if (!empty($Mirrors)) {
+        $Mirror = '';
+        $DB->prepare_query("
+        INSERT INTO torrents_mirrors
+          (GroupID, UserID, Time, Resource)
+        VALUES (?, ?, NOW(), ?)", $GroupID, $LoggedUser['ID'], $Mirror);
+        foreach ($Mirrors as $Mirror) {
+            $DB->exec_prepared_query();
+        }
+    }
+
+# Main if/else
 } else {
     $DB->query("
     UPDATE torrents_group

static/functions/upload.js

@@ -9,79 +9,52 @@ function DisplayTrans() {
 }
 
 function Categories() {
-  let def = ['title', 'title_rj', 'title_jp', 'year', 'lang', 'censored', 'tags', 'cover', 'group_desc', 'release_desc', 'anon']
+  let def = [
+      'javdb', // Accession Number
+      'audio', // Version
+      'title', // Torrent Title
+      'title_rj', // Organism
+      'title_jp', // Strain/Variety
+      'idols', // Authors(s)
+      'studio', // Department/Lab
+      'series', // Location
+      'year', // Year
+      'codec', // License
+      // Platform changes below
+      'resolution', // Assembly Level
+      // Format changes below
+      'archive', // Archive
+      'tags', // Tags
+      'cover', // Picture
+      'mirrors', // Mirrors
+      'screenshots', // Publications
+      'group_desc', // Torrent Group Description
+      'release_desc', // Torrent Description
+      'censored', // Aligned/Annotated
+      'anon', // Upload Anonymously
+  ]
+
   let cats = [
-    { // DNA
-      'javdb': {},
-      'audio': {},
-      'idols': {},
-      'studio': {},
-      'series': {},
-      'media': {},
-      'container': {},
-      'resolution': {},
-      'archive': {},
-      'codec': {},
-      'screenshots': {},
-      'group_desc': {},
-      'release_desc': {}
-    }, { // RNA
-      'javdb': {},
-      'audio': {},
-      'idols': {},
-      'studio': {},
-      'series': {},
-      'media': {},
-      'container': {},
-      'resolution': {},
-      'archive': {},
-      'codec': {},
-      'screenshots': {},
-      'group_desc': {},
-      'release_desc': {}
-    }, { // Protein
-      'javdb': {},
-      'audio': {},
-      'idols': {},
-      'studio': {},
-      'series': {},
-      'media': {},
-      'container_prot': {},
-      'resolution': {},
-      'archive': {},
-      'codec': {},
-      'screenshots': {},
-      'group_desc': {},
-      'release_desc': {}
-    }, { // Imaging
-      'javdb': {},
-      'audio': {},
-      'idols': {},
-      'studio': {},
-      'series': {},
-      'media_manga': {},
-      'container_games': {},
-      'resolution': {},
-      'archive': {},
-      'codec': {},
-      'screenshots': {},
-      'group_desc': {},
-      'release_desc': {}
-    }, { // Extras
-      'javdb': {},
-      'audio': {},
-      'idols': {},
-      'studio': {},
-      'series': {},
-      'media': {},
-      'container': {},
-      'resolution': {},
-      'archive': {},
-      'codec': {},
-      'screenshots': {},
-      'group_desc': {},
-      'release_desc': {}
-    }
+      { // DNA
+          'media': {}, // Platform
+          'container': {}, // Format
+      },
+      { // RNA
+          'media': {}, // Platform
+          'container': {}, // Format
+      },
+      { // Proteins
+          'media': {}, // Platform
+          'container_prot': {}, // Format
+      },
+      { // Imaging
+          'media_manga': {}, // Platform
+          'container_games': {}, // Format
+      },
+      { // Extras
+          'media': {}, // Platform
+          'container_extra': {}, // Format
+      }
   ]
 
   let active = {}
@@ -92,27 +65,28 @@ function Categories() {
   active = Object.assign(active, cats[category])
 
   let hide = el => {
-    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
-    $(el).ghide()
+      Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
+      $(el).ghide()
   }
+
   let show = el => {
-    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
-    $(el).gshow()
+      Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
+      $(el).gshow()
   }
 
   let trs = $('#dynamic_form tr')
   for (let tr of trs) {
-    let field = tr.id.slice(0, -3)
-    if (active[field]) {
-      if (active[field].name) {
-        tr.children[0].innerHTML = active[field].name
+      let field = tr.id.slice(0, -3)
+      if (active[field]) {
+          if (active[field].name) {
+              tr.children[0].innerHTML = active[field].name
+          }
+          let notes = $(`#${tr.id} p.notes`).raw()
+          if (notes) notes.innerHTML = active[field].notes || ''
+          show(tr)
+      } else {
+          hide(tr)
       }
-      let notes = $(`#${tr.id} p.notes`).raw()
-      if (notes) notes.innerHTML = active[field].notes || ''
-      show(tr)
-    } else {
-      hide(tr)
-    }
   }
 }