Donate and report pages mostly

_packages/extension-parser/classes/validate.class.php

@@ -55,6 +55,9 @@ class Validate
                     if (in_array($Match, $SearchMe[1])) {
                         return $SearchMe[0];
                         break;
+                    } else {
+                        return 'Other';
+                    break;
                     }
                 }
             }

_packages/extension-parser/sections/torrents/takeedit.php

@@ -0,0 +1,64 @@
+<?php
+
+# Line 28
+# todo: Associate containers with categories beforehand
+# It may have to happen structurally in config.php, e.g.,
+# $Categories = [
+#   'GazelleName' => [$Name, $Icon, $Description, $Containers],
+#    ...
+#  ];
+$Properties['CategoryID'] = $TypeID;
+$Properties['CategoryName'] = $Type;
+$Properties['FileTypes'] = [
+  'DNA'      => $Containers,
+  'RNA'      => $Containers,
+  'Proteins' => $ContainersProt,
+  'Imaging'  => $ContainersGames,
+  'Extras'   => $ContainersExtra
+];
+$Properties['ArchiveTypes'] = [
+  'DNA'      => $Archives,
+  'RNA'      => $Archives,
+  'Proteins' => $Archives,
+  'Imaging'  => $Archives,
+  'Extras'   => $Archives
+];
+# Line 49
+
+# Line 313
+$T['FileTypes'] = $Properties['FileTypes'];
+$T['ArchiveTypes'] = $Properties['FileTypes'];
+
+//******************************************************************************//
+//--------------- Autofill format and archive ----------------------------------//
+
+if ($T['Container'] === 'Autofill') {
+    # torrents.Container
+    $T['Container'] = $Validate->ParseExtensions(
+
+        # $FileList
+        $Tor->file_list(),
+
+        # $Category
+        $T['CategoryName'],
+
+        # $FileTypes
+        $T['FileTypes'],
+    );
+}
+
+if ($T['Archive'] === 'Autofill') {
+    # torrents.Archive
+    $T['Archive'] = $Validate->ParseExtensions(
+
+        # $FileList
+        $Tor->file_list(),
+
+        # $Category
+        $T['CategoryName'],
+
+        # $FileTypes
+        $T['ArchiveTypes'],
+    );
+}
+# Line 347

classes/validate.class.php

@@ -220,6 +220,9 @@ class Validate
                     if (in_array($Match, $SearchMe[1])) {
                         return $SearchMe[0];
                         break;
+                    } else {
+                        return 'Other';
+                    break;
                     }
                 }
             }

sections/donate/donate.php

@@ -22,11 +22,11 @@ View::show_header('Donate');
     <p>
       <?= SITE_NAME ?> has no advertisements, is not sponsored, and
       provides its services free of charge.
-      For these reasons, <?= SITE_NAME ?>'s financial obligations can
+      For these reasons, its financial obligations can
       only be met with the help of voluntary user donations.
       Supporting <?= SITE_NAME ?> is and will always remain
       voluntary.
-      If you are financially able, please help pay <?= SITE_NAME ?>'s
+      If you are financially able, please help pay its
       bills by donating.
     </p>
 
@@ -42,6 +42,13 @@ View::show_header('Donate');
       As a donor, your financial support is exclusively applied to operating costs.
       When you donate you are paying <?= SITE_NAME ?>'s bills.
     </p>
+
+    <p>
+    If you prefer to make a tax-deductible donation to an organization beyond my financial grasp, donations to the
+    <a href="https://www.boslab.org/donate" target="_blank">Boston Open Science Laboratory (BosLab)</a>
+    are honored the same as direct donations.
+    Please note in the comment field that your donation is on behalf of <?= SITE_NAME ?> from your username.
+    </p>
   </div>
 
   <span class="donation_info_title">What you will receive for donating</span>

sections/reportsv2/ajax_report.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 /*
  * The backend to changing the report type when making a report.
  * It prints out the relevant report_messages from the array, then
@@ -8,81 +9,81 @@ authorize();
 
 ?>
 <ul>
-<?
+<?php
 $CategoryID = $_POST['categoryid'];
 
 if (array_key_exists($_POST['type'], $Types[$CategoryID])) {
-  $ReportType = $Types[$CategoryID][$_POST['type']];
-} elseif (array_key_exists($_POST['type'],$Types['master'])) {
-  $ReportType = $Types['master'][$_POST['type']];
+    $ReportType = $Types[$CategoryID][$_POST['type']];
+} elseif (array_key_exists($_POST['type'], $Types['master'])) {
+    $ReportType = $Types['master'][$_POST['type']];
 } else {
-  echo 'HAX IN REPORT TYPE';
-  die();
+    echo 'HAX IN REPORT TYPE';
+    die();
 }
 
 foreach ($ReportType['report_messages'] as $Message) {
-?>
+    ?>
   <li><?=$Message?></li>
-<?
+<?php
 }
 ?>
 </ul>
 <br />
 <table class="layout" cellpadding="3" cellspacing="1" border="0" width="100%">
-<?
+<?php
 if (array_key_exists('image', $ReportType['report_fields'])) {
-?>
+    ?>
   <tr>
     <td class="label">
-      Image(s)<?=($ReportType['report_fields']['image'] == '1' ? ' <strong class="important_text">(Required)</strong>:' : '')?>
+      Image(s)<?=($ReportType['report_fields']['image'] === '1' ? ' <strong class="important_text">*</strong>' : '')?>
     </td>
     <td>
       <input id="image" type="text" name="image" size="50" value="<?=(!empty($_POST['image']) ? display_str($_POST['image']) : '')?>" />
     </td>
   </tr>
-<?
+<?php
 }
 if (array_key_exists('track', $ReportType['report_fields'])) {
-?>
+    ?>
   <tr>
     <td class="label">
-      Track Number(s)<?=($ReportType['report_fields']['track'] == '1' || $ReportType['report_fields']['track'] == '2' ? ' <strong class="important_text">(Required)</strong>:' : '')?>
+      Track Number(s)<?=($ReportType['report_fields']['track'] === '1' || $ReportType['report_fields']['track'] === '2' ? ' <strong class="important_text">*</strong>' : '')?>
     </td>
     <td>
-      <input id="track" type="text" name="track" size="8" value="<?=(!empty($_POST['track']) ? display_str($_POST['track']) : '')?>" /><?=($ReportType['report_fields']['track'] == '1' ? '<input id="all_tracks" type="checkbox" onclick="AllTracks()" /> All' : '')?>
+      <input id="track" type="text" name="track" size="8" value="<?=(!empty($_POST['track']) ? display_str($_POST['track']) : '')?>" /><?=($ReportType['report_fields']['track'] === '1' ? '<input id="all_tracks" type="checkbox" onclick="AllTracks()" /> All' : '')?>
     </td>
   </tr>
-<?
+<?php
 }
 if (array_key_exists('link', $ReportType['report_fields'])) {
-?>
+    ?>
   <tr>
     <td class="label">
-      Link(s) to external source<?=($ReportType['report_fields']['link'] == '1' ? ' <strong class="important_text">(Required)</strong>:' : '')?>
+      Link(s) to external source<?=($ReportType['report_fields']['link'] === '1' ? ' <strong class="important_text">*</strong>' : '')?>
     </td>
     <td>
       <input id="link" type="text" name="link" size="50" value="<?=(!empty($_POST['link']) ? display_str($_POST['link']) : '')?>" />
     </td>
   </tr>
-<?
+<?php
 }
 if (array_key_exists('sitelink', $ReportType['report_fields'])) {
-?>
+    ?>
   <tr>
     <td class="label">
-      Permalink to <strong>other relevant</strong> torrent(s)<?=($ReportType['report_fields']['sitelink'] == '1' ? ' <strong class="important_text">(Required)</strong>:' : '')?>
+      Permalink to <strong>other relevant</strong> torrent(s)<?=($ReportType['report_fields']['sitelink'] === '1' ? ' <strong class="important_text">*</strong>' : '')?>
     </td>
     <td>
       <input id="sitelink" type="text" name="sitelink" size="50" value="<?=(!empty($_POST['sitelink']) ? display_str($_POST['sitelink']) : '')?>" />
     </td>
   </tr>
 
-<?
+<?php
 }
 ?>
   <tr>
     <td class="label">
-      Comments <strong class="important_text">(Required)</strong>:
+      Comments <strong class="important_text">*</strong>
     </td>
     <td>
       <textarea id="extra" rows="5" cols="60" name="extra"><?=display_str($_POST['extra'])?></textarea>

sections/reportsv2/report.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 /*
  * This is the frontend of reporting a torrent, it's what users see when
  * they visit reportsv2.php?id=xxx
@@ -6,60 +7,61 @@
 
 include(SERVER_ROOT.'/sections/torrents/functions.php');
 
-//If we're not coming from torrents.php, check we're being returned because of an error.
+// If we're not coming from torrents.php, check we're being returned because of an error.
 if (!isset($_GET['id']) || !is_number($_GET['id'])) {
-  if (!isset($Err)) {
-    error(404);
-  }
+    if (!isset($Err)) {
+        error(404);
+    }
 } else {
-  $TorrentID = $_GET['id'];
-  $DB->query("
+    $TorrentID = $_GET['id'];
+    $DB->query("
     SELECT tg.CategoryID, t.GroupID, u.Username
     FROM torrents_group AS tg
       LEFT JOIN torrents AS t ON t.GroupID = tg.ID
       LEFT JOIN users_main AS u ON t.UserID = u.ID
     WHERE t.ID = " . $_GET['id']);
-  list($CategoryID, $GroupID, $Username) = $DB->next_record();
-  $Artists = Artists::get_artist($GroupID);
-  $TorrentCache = get_group_info($GroupID, true);
-  $GroupDetails = $TorrentCache[0];
-  $TorrentList = $TorrentCache[1];
-  // Resolve the torrentlist to the one specific torrent being reported
-  foreach ($TorrentList as &$Torrent) {
-  // Remove unneeded entries
-  if ($Torrent['ID'] != $TorrentID)
-    unset($TorrentList[$Torrent['ID']]);
-  }
+    list($CategoryID, $GroupID, $Username) = $DB->next_record();
+    $Artists = Artists::get_artist($GroupID);
+    $TorrentCache = get_group_info($GroupID, true);
+    $GroupDetails = $TorrentCache[0];
+    $TorrentList = $TorrentCache[1];
+    // Resolve the torrentlist to the one specific torrent being reported
+    foreach ($TorrentList as &$Torrent) {
+        // Remove unneeded entries
+        if ($Torrent['ID'] != $TorrentID) {
+            unset($TorrentList[$Torrent['ID']]);
+        }
+    }
 
-  // Group details
-  list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP,
+    // Group details
+    list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP,
     $GroupYear, $GroupStudio, $GroupSeries, $GroupCatalogueNumber,
     $GroupCategoryID, $GroupDLSite, $GroupTime, $TorrentTags, $TorrentTagIDs,
     $TorrentTagUserIDs, $Screenshots, $GroupFlags) = array_values($GroupDetails);
 
-  $DisplayName = $GroupName;
-  $AltName = $GroupName; // Goes in the alt text of the image
-  $Title = $GroupName; // goes in <title>
+    $DisplayName = $GroupName;
+    $AltName = $GroupName; // Goes in the alt text of the image
+  $Title = $GroupName; // Goes in <title>
   $WikiBody = Text::full_format($WikiBody);
 
-  //Get the artist name, group name etc.
-  $Artists = Artists::get_artist($GroupID);
-  if ($Artists) {
-    $DisplayName = '<span dir="ltr">' . Artists::display_artists($Artists, true) . "<a href=\"torrents.php?torrentid=$TorrentID\">$DisplayName</a></span>";
-    $AltName = display_str(Artists::display_artists($Artists, false)) . $AltName;
-    $Title = $AltName;
-  }
-  if ($GroupYear > 0) {
-    $DisplayName .= " [$GroupYear]";
-    $AltName .= " [$GroupYear]";
-    $Title .= " [$GroupYear]";
-  }
-/*
-  if ($GroupCategoryID == 1) {
-    $DisplayName .= ' [' . $ReleaseTypes[$ReleaseType] . ']';
-    $AltName .= ' [' . $ReleaseTypes[$ReleaseType] . ']';
-  }
-*/
+    // Get the artist name, group name etc.
+    $Artists = Artists::get_artist($GroupID);
+    if ($Artists) {
+        $DisplayName = '<span dir="ltr">' . Artists::display_artists($Artists, true) . "<a href=\"torrents.php?torrentid=$TorrentID\">$DisplayName</a></span>";
+        $AltName = display_str(Artists::display_artists($Artists, false)) . $AltName;
+        $Title = $AltName;
+    }
+    if ($GroupYear > 0) {
+        $DisplayName .= " [$GroupYear]";
+        $AltName .= " [$GroupYear]";
+        $Title .= " [$GroupYear]";
+    }
+    /*
+      if ($GroupCategoryID === 1) {
+        $DisplayName .= ' [' . $ReleaseTypes[$ReleaseType] . ']';
+        $AltName .= ' [' . $ReleaseTypes[$ReleaseType] . ']';
+      }
+    */
 }
 
 View::show_header('Report', 'reportsv2,browse,torrent,bbcode,recommend');
@@ -87,7 +89,7 @@ View::show_header('Report', 'reportsv2,browse,torrent,bbcode,recommend');
           <a><svg width="11" height="15" fill="black" class="tooltip" alt="Leechers" title="Leechers"><polygon points="0,8 5.5,15 11,8 8,8 8,0 3,0 3,8"></polygon></svg></a>
         </td>
       </tr>
-      <?
+      <?php
       $LangName = $GroupName ? $GroupName : ($GroupNameRJ ? $GroupNameRJ : $GroupNameJP);
       build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $LangName, $GroupCategoryID, $TorrentList, $Types, $Username);
       ?>
@@ -106,35 +108,34 @@ View::show_header('Report', 'reportsv2,browse,torrent,bbcode,recommend');
     <div class="box pad">
       <table class="layout">
         <tr>
-          <td class="label">Reason:</td>
+          <td class="label">Reason</td>
           <td>
             <select id="type" name="type" class="change_report_type">
-<?
+<?php
         if (!empty($Types[$CategoryID])) {
-          $TypeList = $Types['master'] + $Types[$CategoryID];
-          $Priorities = [];
-          foreach ($TypeList as $Key => $Value) {
-            $Priorities[$Key] = $Value['priority'];
-          }
-          array_multisort($Priorities, SORT_ASC, $TypeList);
+            $TypeList = $Types['master'] + $Types[$CategoryID];
+            $Priorities = [];
+            foreach ($TypeList as $Key => $Value) {
+                $Priorities[$Key] = $Value['priority'];
+            }
+            array_multisort($Priorities, SORT_ASC, $TypeList);
         } else {
-          $TypeList = $Types['master'];
+            $TypeList = $Types['master'];
         }
         foreach ($TypeList as $Type => $Data) {
-          ?>
+            ?>
               <option value="<?=($Type)?>"><?=($Data['title'])?></option>
-<?        } ?>
+<?php
+        } ?>
             </select>
           </td>
         </tr>
       </table>
       <p>Fields that contain lists of values (for example, listing more than one track number) should be separated by a space.</p>
-      <br />
-      <p><strong>Following the below report type specific guidelines will help the moderators deal with your report in a timely fashion. </strong></p>
-      <br />
+      <p><strong>Following the below report type specific guidelines will help the moderators deal with your report in a timely fashion.</strong></p>
 
       <div id="dynamic_form">
-<?
+<?php
         /*
          * THIS IS WHERE SEXY AJAX COMES IN
          * The following malarky is needed so that if you get sent back here, the fields are filled in.
@@ -147,9 +148,8 @@ View::show_header('Report', 'reportsv2,browse,torrent,bbcode,recommend');
         <input id="extra" type="hidden" name="extra" value="<?=(!empty($_POST['extra']) ? display_str($_POST['extra']) : '')?>" />
       </div>
     </div>
-  <input type="submit" value="Submit report" />
+  <input type="submit" value="Report" />
   </form>
 </div>
-<?
+<?php
 View::show_footer();
-?>

sections/torrents/browse.php

@@ -261,7 +261,12 @@ View::show_header('Browse Torrents', 'browse');
                 <?php  foreach ($Containers as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
-                <?php  } foreach ($ContainersProt as $Key => $ContainerProt) { ?>
+                <?php  } ?>
+              </select>
+
+              <select id=" container" name="container" class="ft_container fti_advanced">
+                <option value="">Prot Format</option>
+                <?php  foreach ($Containers as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
                 <?php  } ?>

sections/torrents/edit.php

@@ -32,6 +32,7 @@ $DB->query("
     t.FreeTorrent,
     t.FreeLeechType,
     t.Description AS TorrentDescription,
+    t.FileList,
     t.MediaInfo,
     tg.CategoryID,
     tg.Name AS Title,
@@ -62,7 +63,7 @@ if (!$Properties) {
 
 $UploadForm = $Categories[$Properties['CategoryID'] - 1];
 
-if (($LoggedUser['ID'] != $Properties['UserID'] && !check_perms('torrents_edit')) || $LoggedUser['DisableWiki']) {
+if (($LoggedUser['ID'] !== $Properties['UserID'] && !check_perms('torrents_edit')) || $LoggedUser['DisableWiki']) {
     error(403);
 }
 
@@ -73,11 +74,14 @@ $TorrentForm = new TorrentForm($Properties, $Err, false);
 $TorrentForm->upload_form();
 
 if (check_perms('torrents_edit') || check_perms('users_mod')) {
+    # Start the HTML edit form
     ?>
 <div class="thin">
   <?php
-  if ($Properties['CategoryID'] != 5) {
+  #if ($Properties['CategoryID'] !== 5) {
       ?>
+
+  <br />
   <div class="header">
     <h2>Change Group</h2>
   </div>
@@ -107,6 +111,8 @@ if (check_perms('torrents_edit') || check_perms('users_mod')) {
       </table>
     </form>
   </div>
+  <br />
+
   <h2>Split off into new group</h2>
   <div class="box pad">
     <form class="split_form" name="torrent_group" action="torrents.php" method="post">
@@ -158,8 +164,9 @@ if (check_perms('torrents_edit') || check_perms('users_mod')) {
     </form>
   </div>
   <br />
+
   <?php
-  }
+  #}
     if (check_perms('users_mod')) { ?>
   <h2>Change Category</h2>
   <div class="box pad">
@@ -186,17 +193,7 @@ if (check_perms('torrents_edit') || check_perms('users_mod')) {
               <?php    } ?>
             </select>
           </td>
-        <tr id="split_releasetype">
-          <td class="label">Release type</td>
-          <td>
-            <select name="releasetype">
-              <?php    foreach ($ReleaseTypes as $RTID => $ReleaseType) { ?>
-              <option value="<?=($RTID)?>"><?=($ReleaseType)?>
-              </option>
-              <?php    } ?>
-            </select>
-          </td>
-        </tr>
+          </tr>
         <tr id="split_artist">
           <td class="label">Artist</td>
           <td>

sections/torrents/takeedit.php

@@ -25,27 +25,6 @@ $TypeID = (int)$_POST['type'];
 $Type = $Categories[$TypeID-1];
 $TorrentID = (int)$_POST['torrentid'];
 
-# todo: Associate containers with categories beforehand
-# It may have to happen structurally in config.php, e.g.,
-# $Categories = [
-#   'GazelleName' => [$Name, $Icon, $Description, $Containers],
-#    ...
-#  ];
-$Properties['FileTypes'] = [
-  'DNA'      => $Containers,
-  'RNA'      => $Containers,
-  'Proteins' => $ContainersProt,
-  'Imaging'  => $ContainersGames,
-  'Extras'   => $ContainersExtra
-];
-$Properties['ArchiveTypes'] = [
-  'DNA'      => $Archives,
-  'RNA'      => $Archives,
-  'Proteins' => $Archives,
-  'Imaging'  => $Archives,
-  'Extras'   => $Archives
-];
-
 $Properties['Remastered'] = (isset($_POST['remaster']))? 1 : 0;
 if ($Properties['Remastered']) {
     $Properties['UnknownRelease'] = (isset($_POST['unknown'])) ? 1 : 0;
@@ -76,7 +55,7 @@ $Properties['Subber']= $_POST['subber'];
 
 $Properties['Censored'] = (isset($_POST['censored'])) ? '1' : '0';
 $Properties['Anonymous'] = (isset($_POST['anonymous'])) ? '1' : '0';
-$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] != '---') ? $_POST['archive'] : '';
+$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== '---') ? $_POST['archive'] : '';
 
 if ($_POST['album_desc']) {
     $Properties['GroupDescription'] = $_POST['album_desc'];
@@ -126,7 +105,8 @@ if ($LoggedUser['ID'] != $UserID && !check_perms('torrents_edit')) {
     error(403);
 }
 
-/* todo: Check strict equality and untangle features
+/*
+todo: Check strict equality and untangle features
 if ($Remastered === '1' && !$RemasterYear && !check_perms('edit_unknowns')) {
   error(403);
 }
@@ -281,14 +261,12 @@ if ($Properties['Remastered'] && !$Properties['RemasterYear']) {
 }
 
 // Strip out Amazon's padding
-/*
 $AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
 $Matches = [];
 if (preg_match($RegX, $Properties['Image'], $Matches)) {
     $Properties['Image'] = $Matches[1].'.jpg';
 }
 ImageTools::blacklisted($Properties['Image']);
-*/
 
 if ($Err) { // Show the upload form, with the data the user entered
     if (check_perms('site_debug')) {
@@ -312,6 +290,55 @@ foreach ($Properties as $Key => $Value) {
 $T['Censored'] = $Properties['Censored'];
 $T['Anonymous'] = $Properties['Anonymous'];
 
+//******************************************************************************//
+//--------------- Autofill format and archive ----------------------------------//
+
+# Load FileList in lieu of $Tor object
+$T['FileList'] = $DB->query("
+  SELECT FileList
+  FROM torrents
+  WHERE ID = $TorrentID");
+
+if (!$DB->has_results()) {
+    error(404);
+}
+
+# Call the extension parser
+if ($T['Container'] === 'Autofill') {
+    # torrents.Container
+    $T['Container'] = $Validate->ParseExtensions(
+
+        # $FileList
+        $T['FileList'],
+
+        # $Category
+        $T['CategoryName'],
+
+        # $FileTypes
+        $T['FileTypes'],
+    );
+}
+
+if ($T['Archive'] === 'Autofill') {
+    # torrents.Archive
+    $T['Archive'] = $Validate->ParseExtensions(
+
+        # $FileList
+        $Tor->file_list(),
+
+        # $Category
+        $T['CategoryName'],
+
+        # $FileTypes
+        $T['ArchiveTypes'],
+    );
+}
+
+print_r('<pre>');
+var_dump($T['FileList']);
+var_dump($T['CategoryName'],);
+var_dump($T['FileTypes'],);
+var_dump($T['ArchiveTypes'],);
 
 //******************************************************************************//
 //--------------- Start database stuff -----------------------------------------//