Remove .txt torrent download option

ISPs can't see filenames through TLS. This option is useless in a
codebase that forces HTTPS, and only confuses users.

classes/torrentsdl.class.php

@@ -86,7 +86,7 @@ class TorrentsDL {
   public function add_file(&$TorrentData, $Info, $FolderName = '') {
     $FolderName = Misc::file_string($FolderName);
     $MaxPathLength = $FolderName ? (self::MaxPathLength - strlen($FolderName) - 1) : self::MaxPathLength;
-    $FileName = self::construct_file_name($Info['Artist'], $Info['Name'], $Info['Year'], $Info['Media'], $Info['Format'], $Info['Encoding'], $Info['TorrentID'], false, $MaxPathLength);
+    $FileName = self::construct_file_name($Info['Artist'], $Info['Name'], $Info['Year'], $Info['Media'], $Info['Format'], $Info['Encoding'], $Info['TorrentID'], $MaxPathLength);
     $this->Size += $Info['Size'];
     $this->NumAdded++;
     $this->Zip->add_file(self::get_file($TorrentData, $this->AnnounceURL, $this->AnnounceList), ($FolderName ? "$FolderName/" : "") . $FileName);
@@ -176,12 +176,11 @@ class TorrentsDL {
    *
    * @params most input variables are self-explanatory
    * @param int $TorrentID if given, append "-TorrentID" to torrent name
-   * @param bool $Txt whether to use .txt or .torrent as file extension
    * @param int $MaxLength maximum file name length
    * @return file name with at most $MaxLength characters
    */
-  public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $Txt = false, $MaxLength = self::MaxPathLength) {
-    $MaxLength -= ($Txt ? 4 : 8);
+  public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $MaxLength = self::MaxPathLength) {
+    $MaxLength -= 8; // ".torrent"
     if ($TorrentID !== false) {
       $MaxLength -= (strlen($TorrentID) + 1);
     }
@@ -216,9 +215,6 @@ class TorrentsDL {
     if ($TorrentID !== false) {
       $TorrentName .= "-$TorrentID";
     }
-    if ($Txt) {
-      return "$TorrentName.txt";
-    }
     return "$TorrentName.torrent";
   }
 

classes/users.class.php

@@ -18,11 +18,11 @@ class Users {
       $Classes = G::$DB->to_array('ID');
       $ClassLevels = G::$DB->to_array('Level');
       G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('classes', array($Classes, $ClassLevels), 0);
+      G::$Cache->cache_value('classes', [$Classes, $ClassLevels], 0);
     }
     $Debug->set_flag('Loaded permissions');
 
-    return array($Classes, $ClassLevels);
+    return [$Classes, $ClassLevels];
   }
 
 
@@ -77,29 +77,30 @@ class Users {
         GROUP BY m.ID");
 
       if (!G::$DB->has_results()) { // Deleted user, maybe?
-        $UserInfo = array(
-            'ID' => $UserID,
-            'Username' => '',
-            'PermissionID' => 0,
-            'Paranoia' => array(),
-            'Artist' => false,
-            'Donor' => false,
-            'Warned' => NULL,
-            'Avatar' => '',
-            'Enabled' => 0,
-            'Title' => '',
-            'CatchupTime' => 0,
-            'Visible' => '1',
-            'Levels' => '',
-            'Class' => 0);
+        $UserInfo = [
+          'ID'           => $UserID,
+          'Username'     => '',
+          'PermissionID' => 0,
+          'Paranoia'     => [],
+          'Artist'       => false,
+          'Donor'        => false,
+          'Warned'       => NULL,
+          'Avatar'       => '',
+          'Enabled'      => 0,
+          'Title'        => '',
+          'CatchupTime'  => 0,
+          'Visible'      => '1',
+          'Levels'       => '',
+          'Class'        => 0
+        ];
       } else {
-        $UserInfo = G::$DB->next_record(MYSQLI_ASSOC, array('Paranoia', 'Title'));
+        $UserInfo = G::$DB->next_record(MYSQLI_ASSOC, ['Paranoia', 'Title']);
         $UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
         if (!is_array($UserInfo['Paranoia'])) {
           $UserInfo['Paranoia'] = json_decode($UserInfo['Paranoia'], true);
         }
         if (!$UserInfo['Paranoia']) {
-          $UserInfo['Paranoia'] = array();
+          $UserInfo['Paranoia'] = [];
         }
         $UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];
       }
@@ -111,7 +112,7 @@ class Users {
       if (!empty($UserInfo['Levels'])) {
         $UserInfo['ExtraClasses'] = array_fill_keys(explode(',', $UserInfo['Levels']), 1);
       } else {
-        $UserInfo['ExtraClasses'] = array();
+        $UserInfo['ExtraClasses'] = [];
       }
       unset($UserInfo['Levels']);
       $EffectiveClass = $UserInfo['Class'];
@@ -169,7 +170,6 @@ class Users {
           i.DisableForums,
           i.DisableTagging,
           i.SiteOptions,
-          i.DownloadAlt,
           i.LastReadNews,
           i.LastReadBlog,
           i.RestrictedForums,
@@ -181,24 +181,22 @@ class Users {
         FROM users_main AS m
           INNER JOIN users_info AS i ON i.UserID = m.ID
         WHERE m.ID = '$UserID'");
-      $HeavyInfo = G::$DB->next_record(MYSQLI_ASSOC, array('CustomPermissions', 'SiteOptions'));
+      $HeavyInfo = G::$DB->next_record(MYSQLI_ASSOC, ['CustomPermissions', 'SiteOptions']);
 
+      $HeavyInfo['CustomPermissions'] = [];
       if (!empty($HeavyInfo['CustomPermissions'])) {
         $HeavyInfo['CustomPermissions'] = json_decode($HeavyInfo['CustomPermissions'], true);
-      } else {
-        $HeavyInfo['CustomPermissions'] = array();
       }
 
+      $RestrictedForums = [];
       if (!empty($HeavyInfo['RestrictedForums'])) {
         $RestrictedForums = array_map('trim', explode(',', $HeavyInfo['RestrictedForums']));
-      } else {
-        $RestrictedForums = array();
       }
       unset($HeavyInfo['RestrictedForums']);
+
+      $PermittedForums = [];
       if (!empty($HeavyInfo['PermittedForums'])) {
         $PermittedForums = array_map('trim', explode(',', $HeavyInfo['PermittedForums']));
-      } else {
-        $PermittedForums = array();
       }
       unset($HeavyInfo['PermittedForums']);
 
@@ -219,16 +217,15 @@ class Users {
         $PermittedForums = array_merge($PermittedForums, array_map('trim', explode(',', $Perms['PermittedForums'])));
       }
 
+      $HeavyInfo['CustomForums'] = null;
       if (!empty($PermittedForums) || !empty($RestrictedForums)) {
-        $HeavyInfo['CustomForums'] = array();
+        $HeavyInfo['CustomForums'] = [];
         foreach ($RestrictedForums as $ForumID) {
           $HeavyInfo['CustomForums'][$ForumID] = 0;
         }
         foreach ($PermittedForums as $ForumID) {
           $HeavyInfo['CustomForums'][$ForumID] = 1;
         }
-      } else {
-        $HeavyInfo['CustomForums'] = null;
       }
       if (isset($HeavyInfo['CustomForums'][''])) {
         unset($HeavyInfo['CustomForums']['']);
@@ -491,13 +488,12 @@ class Users {
       $GroupIDs = G::$DB->collect('GroupID');
       $BookmarkData = G::$DB->to_array('GroupID', MYSQLI_ASSOC);
       G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value("bookmarks_group_ids_$UserID",
-        array($GroupIDs, $BookmarkData), 3600);
+      G::$Cache->cache_value("bookmarks_group_ids_$UserID", [$GroupIDs, $BookmarkData], 3600);
     }
 
     $TorrentList = Torrents::get_groups($GroupIDs);
 
-    return array($GroupIDs, $BookmarkData, $TorrentList);
+    return [$GroupIDs, $BookmarkData, $TorrentList];
   }
 
   /**
@@ -669,7 +665,7 @@ class Users {
    */
   public static function auth_location($UserID, $Username, $ASN, $Email) {
     $AuthKey = Users::make_secret();
-    G::$Cache->cache_value('new_location_'.$AuthKey, array('UserID'=>$UserID, 'ASN'=>$ASN), 3600*2);
+    G::$Cache->cache_value('new_location_'.$AuthKey, ['UserID'=>$UserID, 'ASN'=>$ASN], 3600*2);
     require(SERVER_ROOT . '/classes/templates.class.php');
     $TPL = NEW TEMPLATE;
     $TPL->open(SERVER_ROOT . '/templates/new_location.tpl');

gazelle.sql

@@ -1457,7 +1457,6 @@ CREATE TABLE `users_info` (
   `ViewAvatars` enum('0','1') NOT NULL DEFAULT '1',
   `Donor` enum('0','1') NOT NULL DEFAULT '0',
   `Artist` enum('0','1') NOT NULL DEFAULT '0',
-  `DownloadAlt` enum('0','1') NOT NULL DEFAULT '0',
   `Warned` datetime,
   `SupportFor` varchar(255),
   `TorrentGrouping` enum('0','1','2') NOT NULL COMMENT '0=Open,1=Closed,2=Off',

sections/torrents/download.php

@@ -2,8 +2,7 @@
 if (!isset($_REQUEST['authkey']) || !isset($_REQUEST['torrent_pass'])) {
   enforce_login();
   $TorrentPass = $LoggedUser['torrent_pass'];
-  $DownloadAlt = $LoggedUser['DownloadAlt'];
-  $UserID     = $LoggedUser['ID'];
+  $UserID    = $LoggedUser['ID'];
   $AuthKey   = $LoggedUser['AuthKey'];
 } else {
   if (strpos($_REQUEST['torrent_pass'], '_') !== false) {
@@ -13,7 +12,7 @@ if (!isset($_REQUEST['authkey']) || !isset($_REQUEST['torrent_pass'])) {
   $UserInfo = $Cache->get_value('user_'.$_REQUEST['torrent_pass']);
   if (!is_array($UserInfo)) {
     $DB->query("
-      SELECT ID, DownloadAlt, la.UserID
+      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
@@ -23,7 +22,7 @@ if (!isset($_REQUEST['authkey']) || !isset($_REQUEST['torrent_pass'])) {
     $Cache->cache_value('user_'.$_REQUEST['torrent_pass'], $UserInfo, 3600);
   }
   $UserInfo = array($UserInfo);
-  list($UserID, $DownloadAlt, $Locked) = array_shift($UserInfo);
+  list($UserID, $Locked) = array_shift($UserInfo);
   if (!$UserID) {
     error(0);
   }
@@ -179,13 +178,9 @@ $DB->query("
 
 Torrents::set_snatch_update_time($UserID, Torrents::SNATCHED_UPDATE_AFTERDL);
 $Contents = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
-$FileName = TorrentsDL::construct_file_name($Info['PlainArtists'], $Name, $Year, $Media, $Format, $Encoding, $TorrentID, $DownloadAlt);
+$FileName = TorrentsDL::construct_file_name($Info['PlainArtists'], $Name, $Year, $Media, $Format, $Encoding, $TorrentID);
 
-if ($DownloadAlt) {
-  header('Content-Type: text/plain; charset=utf-8');
-} elseif (!$DownloadAlt || $Failed) {
-  header('Content-Type: application/x-bittorrent; charset=utf-8');
-}
+header('Content-Type: application/x-bittorrent; charset=utf-8');
 header('Content-disposition: attachment; filename="'.$FileName.'"');
 
 function add_passkey($ann) {

sections/user/edit.php

@@ -18,14 +18,13 @@ $DB->query("
     i.StyleURL,
     i.SiteOptions,
     i.UnseededAlerts,
-    i.DownloadAlt,
     p.Level AS Class,
     i.InfoTitle
   FROM users_main AS m
     JOIN users_info AS i ON i.UserID = m.ID
     LEFT JOIN permissions AS p ON p.ID = m.PermissionID
   WHERE m.ID = '".db_string($UserID)."'");
-list($Username, $TwoFactor, $Email, $IRCKey, $Paranoia, $Info, $Avatar, $StyleID, $StyleURL, $SiteOptions, $UnseededAlerts, $DownloadAlt, $Class, $InfoTitle) = $DB->next_record(MYSQLI_NUM, array(4, 9));
+list($Username, $TwoFactor, $Email, $IRCKey, $Paranoia, $Info, $Avatar, $StyleID, $StyleURL, $SiteOptions, $UnseededAlerts, $Class, $InfoTitle) = $DB->next_record(MYSQLI_NUM, array(4, 9));
 
 $TwoFA = new TwoFactorAuth();
 
@@ -324,13 +323,6 @@ echo $Val->GenerateJS('userform');
           <label for="novotelinks">Disable voting links</label>
         </td>
       </tr>
-      <tr id="tor_dltext_tr">
-        <td class="label tooltip" title="Some ISPs block the downloading of torrent files. Enable this option if you wish to download torrent files with a &quot;.txt&quot; file extension."><strong>Text file downloads</strong></td>
-        <td>
-          <input type="checkbox" name="downloadalt" id="downloadalt"<?=$DownloadAlt ? ' checked="checked"' : ''?> />
-          <label for="downloadalt">Enable downloading torrent files as text files</label>
-        </td>
-      </tr>
       <tr id="tor_hidequestionable_tr">
         <td class="label tooltip" title="Prevent torrents with these tags from showing up on the torrent search page"><strong>Content Filtering</strong></td>
         <td>

sections/user/take_edit.php

@@ -20,21 +20,21 @@ if ($UserID != $LoggedUser['ID'] && !check_perms('users_edit_profiles', $Permiss
 }
 
 $Val->SetFields('stylesheet', 1, "number", "You forgot to select a stylesheet.");
-$Val->SetFields('styleurl', 0, "regex", "You did not enter a valid stylesheet URL.", array('regex' => '/^'.CSS_REGEX.'$/i'));
+$Val->SetFields('styleurl', 0, "regex", "You did not enter a valid stylesheet URL.", ['regex' => '/^'.CSS_REGEX.'$/i']);
 // The next two are commented out because the drop-down menus were replaced with a check box and radio buttons
 //$Val->SetFields('disablegrouping', 0, "number", "You forgot to select your torrent grouping option.");
 //$Val->SetFields('torrentgrouping', 0, "number", "You forgot to select your torrent grouping option.");
-$Val->SetFields('postsperpage', 1, "number", "You forgot to select your posts per page option.", array('inarray' => array(25, 50, 100)));
-//$Val->SetFields('hidecollage', 1, "number", "You forgot to select your collage option.", array('minlength' => 0, 'maxlength' => 1));
+$Val->SetFields('postsperpage', 1, "number", "You forgot to select your posts per page option.", ['inarray' => [25, 50, 100]]);
+//$Val->SetFields('hidecollage', 1, "number", "You forgot to select your collage option.", ['minlength' => 0, 'maxlength' => 1]);
 $Val->SetFields('collagecovers', 1, "number", "You forgot to select your collage option.");
-$Val->SetFields('avatar', 0, "regex", "You did not enter a valid avatar URL.", array('regex' => "/^".IMAGE_REGEX."$/i"));
+$Val->SetFields('avatar', 0, "regex", "You did not enter a valid avatar URL.", ['regex' => "/^".IMAGE_REGEX."$/i"]);
 $Val->SetFields('email', 1, "email", "You did not enter a valid email address.");
-$Val->SetFields('twofa', 0, "regex", "You did not enter a valid 2FA verification code.", array('regex' => '/^[0-9]{6}$/'));
-$Val->SetFields('irckey', 0, "string", "You did not enter a valid IRC key. An IRC key must be between 6 and 32 characters long.", array('minlength' => 6, 'maxlength' => 32));
-$Val->SetFields('new_pass_1', 0, "regex", "You did not enter a valid password. A valid password is 6 characters or longer.", array('regex' => '/(?=^.{6,}$).*$/'));
-$Val->SetFields('new_pass_2', 1, "compare", "Your passwords do not match.", array('comparefield' => 'new_pass_1'));
+$Val->SetFields('twofa', 0, "regex", "You did not enter a valid 2FA verification code.", ['regex' => '/^[0-9]{6}$/']);
+$Val->SetFields('irckey', 0, "string", "You did not enter a valid IRC key. An IRC key must be between 6 and 32 characters long.", ['minlength' => 6, 'maxlength' => 32]);
+$Val->SetFields('new_pass_1', 0, "regex", "You did not enter a valid password. A valid password is 6 characters or longer.", ['regex' => '/(?=^.{6,}$).*$/']);
+$Val->SetFields('new_pass_2', 1, "compare", "Your passwords do not match.", ['comparefield' => 'new_pass_1']);
 if (check_perms('site_advanced_search')) {
-  $Val->SetFields('searchtype', 1, "number", "You forgot to select your default search preference.", array('minlength' => 0, 'maxlength' => 1));
+  $Val->SetFields('searchtype', 1, "number", "You forgot to select your default search preference.", ['minlength' => 0, 'maxlength' => 1]);
 }
 
 $Err = $Val->ValidateForm($_POST);
@@ -75,7 +75,7 @@ if (isset($_POST['p_snatched_c']) && isset($_POST['p_seeding_c']) && isset($_POS
 
 // if showing exactly 2 of stats, show all 3 of stats
 $StatsShown = 0;
-$Stats = array('downloaded', 'uploaded', 'ratio');
+$Stats = ['downloaded', 'uploaded', 'ratio'];
 foreach ($Stats as $S) {
   if (isset($_POST["p_$S"])) {
     $StatsShown++;
@@ -88,15 +88,15 @@ if ($StatsShown == 2) {
   }
 }
 
-$Paranoia = array();
-$Checkboxes = array('downloaded', 'uploaded', 'ratio', 'lastseen', 'requiredratio', 'invitedcount', 'artistsadded', 'notifications');
+$Paranoia = [];
+$Checkboxes = ['downloaded', 'uploaded', 'ratio', 'lastseen', 'requiredratio', 'invitedcount', 'artistsadded', 'notifications'];
 foreach ($Checkboxes as $C) {
   if (!isset($_POST["p_$C"])) {
     $Paranoia[] = $C;
   }
 }
 
-$SimpleSelects = array('torrentcomments', 'collages', 'collagecontribs', 'uploads', 'uniquegroups', 'perfectflacs', 'seeding', 'leeching', 'snatched');
+$SimpleSelects = ['torrentcomments', 'collages', 'collagecontribs', 'uploads', 'uniquegroups', 'perfectflacs', 'seeding', 'leeching', 'snatched'];
 foreach ($SimpleSelects as $S) {
   if (!isset($_POST["p_$S".'_c']) && !isset($_POST["p_$S".'_l'])) {
     // Very paranoid - don't show count or list
@@ -107,7 +107,7 @@ foreach ($SimpleSelects as $S) {
   }
 }
 
-$Bounties = array('requestsfilled', 'requestsvoted');
+$Bounties = ['requestsfilled', 'requestsvoted'];
 foreach ($Bounties as $B) {
   if (isset($_POST["p_$B".'_list'])) {
     $_POST["p_$B".'_count'] = 'on';
@@ -292,7 +292,7 @@ if (!empty($_POST['sorthide'])) {
     $Options['SortHide'][$E[0]] = $E[1];
   }
 } else {
-  $Options['SortHide'] = array();
+  $Options['SortHide'] = [];
 }
 
 if (check_perms('site_advanced_search')) {
@@ -306,7 +306,6 @@ unset($Options['ArtistNoRedirect']);
 unset($Options['ShowQueryList']);
 unset($Options['ShowCacheList']);
 
-$DownloadAlt = isset($_POST['downloadalt']) ? 1 : 0;
 $UnseededAlerts = isset($_POST['unseededalerts']) ? 1 : 0;
 
 Donations::update_rewards($UserID);
@@ -316,11 +315,11 @@ NotificationsManager::save_settings($UserID);
 if (!empty($_POST['badges'])) {
   $BadgeIDs = array_slice($_POST['badges'], 0, 5);
 } else {
-  $BadgeIDs = array();
+  $BadgeIDs = [];
 }
 
 $BadgesChanged = false;
-$NewBadges = array();
+$NewBadges = [];
 if ($Cache->get_value('user_badges_'.$UserID)) {
   $Badges = $Cache->get_value('user_badges_'.$UserID);
   foreach ($Badges as $Badge) {
@@ -334,7 +333,7 @@ if ($Cache->get_value('user_badges_'.$UserID)) {
       $Displayed = false;
       $BadgesChanged = true;
     }
-    $NewBadges[] = array('BadgeID' => $Badge['BadgeID'], 'Displayed' => $Displayed?'1':'0');
+    $NewBadges[] = ['BadgeID' => $Badge['BadgeID'], 'Displayed' => $Displayed?'1':'0'];
 
   }
 } else {
@@ -345,24 +344,18 @@ if ($BadgesChanged) {
 }
 // End Badge settings
 
-// Information on how the user likes to download torrents is stored in cache
-if ($DownloadAlt != $LoggedUser['DownloadAlt']) {
-  $Cache->delete_value('user_'.$LoggedUser['torrent_pass']);
-}
-
 $Cache->begin_transaction("user_info_$UserID");
-$Cache->update_row(false, array(
-    'Avatar' => display_str($_POST['avatar']),
-    'Paranoia' => $Paranoia
-));
+$Cache->update_row(false, [
+  'Avatar' => display_str($_POST['avatar']),
+  'Paranoia' => $Paranoia
+]);
 $Cache->commit_transaction(0);
 
 $Cache->begin_transaction("user_info_heavy_$UserID");
-$Cache->update_row(false, array(
-    'StyleID' => $_POST['stylesheet'],
-    'StyleURL' => display_str($_POST['styleurl']),
-    'DownloadAlt' => $DownloadAlt
-    ));
+$Cache->update_row(false, [
+  'StyleID' => $_POST['stylesheet'],
+  'StyleURL' => display_str($_POST['styleurl'])
+]);
 $Cache->update_row(false, $Options);
 $Cache->commit_transaction(0);
 
@@ -378,7 +371,6 @@ $SQL = "
     i.NotifyOnQuote = '".db_string($Options['NotifyOnQuote'])."',
     i.Info = '".db_string($_POST['info'])."',
     i.InfoTitle = '".db_string($_POST['profile_title'])."',
-    i.DownloadAlt = '$DownloadAlt',
     i.UnseededAlerts = '$UnseededAlerts',
     m.Email = '".DBCrypt::encrypt($_POST['email'])."',
     m.IRCKey = '".db_string($_POST['irckey'])."',
@@ -408,11 +400,11 @@ if (isset($_POST['resetpasskey'])) {
     VALUES
       ('$UserID', '$OldPassKey', '$NewPassKey', '$ChangerIP', '".sqltime()."')");
   $Cache->begin_transaction("user_info_heavy_$UserID");
-  $Cache->update_row(false, array('torrent_pass' => $NewPassKey));
+  $Cache->update_row(false, ['torrent_pass' => $NewPassKey]);
   $Cache->commit_transaction(0);
   $Cache->delete_value("user_$OldPassKey");
 
-  Tracker::update_tracker('change_passkey', array('oldpasskey' => $OldPassKey, 'newpasskey' => $NewPassKey));
+  Tracker::update_tracker('change_passkey', ['oldpasskey' => $OldPassKey, 'newpasskey' => $NewPassKey]);
 }
 
 $SQL .= "WHERE m.ID = '".db_string($UserID)."'";