Random small formattings re: store and FL search

classes/rules.class.php

@@ -157,7 +157,7 @@ class Rules
 <li>Flooding is irritating and you'll get kicked for it. This includes "now playing" scripts, large amounts of
   irrelevant text such as lorem ipsum, and unfunny non sequiturs.</li>
 
-<li>Impersonating other members &mdash; particularly staff members &mdash; will not go unpunished. Please remember that
+<li>Impersonating other members, particularly staff members, will not go unpunished. Please remember that
   the Slack channels are publicly accessible.</li>
 
 <li>Please use the threaded conversations feature in Slack and avoid replying to threads with new messages or

classes/torrentsearch.class.php

@@ -71,7 +71,7 @@ class TorrentSearch
     'searchstr' => 1,
     'series' => 1, # Location
     'studio' => 1, # Department/Lab
-    'location' => 1,
+    'location' => 1, # Combined ↑
     'subber' => 1,
     'subbing' => 1,
     'taglist' => 1
@@ -698,6 +698,22 @@ class TorrentSearch
      * @return bool True if it's a real hit
      */
     private function filter_torrent_internal($Torrent)
+    {
+        if (isset($this->UsedTorrentAttrs['freetorrent'])) {
+            $FilterValue = $this->UsedTorrentAttrs['freetorrent'];
+            if ($FilterValue === 3 && $Torrent['FreeTorrent'] === 0) {
+                // Either FL or NL is ok
+                return false;
+            } elseif ($FilterValue !== 3 && $FilterValue !== (int)$Torrent['FreeTorrent']) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+/* Not integers
+    private function filter_torrent_internal($Torrent)
     {
         if (isset($this->UsedTorrentAttrs['freetorrent'])) {
             $FilterValue = $this->UsedTorrentAttrs['freetorrent'];
@@ -711,3 +727,4 @@ class TorrentSearch
         return true;
     }
 }
+*/

sections/requests/requests.php

@@ -560,7 +560,7 @@ View::show_header($Title, 'requests');
           <a href="user.php?id=<?=$FillerInfo['ID']?>"><?=$FillerInfo['Username']?></a>
 <?php      }
             } else { ?>
-        &mdash;
+        &ndash;
 <?php    } ?>
       </td>
       <td>

sections/store/badge.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $UserID = $LoggedUser['ID'];
 $BadgeID = $_GET['badge'];
 
@@ -6,72 +7,78 @@ $ShopBadgeIDs = [100, 101, 102, 103, 104, 105, 106, 107];
 $Prices = [100 => 5000, 101 => 10000, 102 => 25000, 103 => 50000, 104 => 100000, 105 => 250000, 106 => 500000, 107 => 1000000];
 
 if (!$BadgeID) {
-  $Err = 'No badge specified.';
+    $Err = 'No badge specified';
 } elseif (!in_array($BadgeID, $ShopBadgeIDs)) {
-  $Err = 'Invalid badge ID.';
+    $Err = 'Invalid badge ID';
 } elseif (Badges::has_badge($UserID, $BadgeID)) {
-  $Err = 'You already have this badge.';
-} elseif ($BadgeID != $ShopBadgeIDs[0] && !Badges::has_badge($UserID, $ShopBadgeIDs[array_search($BadgeID, $ShopBadgeIDs)-1])) {
-  $Err = 'You haven\'t purchased the badges before this one!';
+    $Err = 'You already have this badge';
+} elseif ($BadgeID !== $ShopBadgeIDs[0] && !Badges::has_badge($UserID, $ShopBadgeIDs[array_search($BadgeID, $ShopBadgeIDs)-1])) {
+    $Err = "You haven't purchased the badges before this one!";
 }
 
-if (isset($_GET['confirm']) && $_GET['confirm'] == 1) {
-  if (!isset($Err)) {
-    $DB->query("
+if (isset($_GET['confirm']) && $_GET['confirm'] === 1) {
+    if (!isset($Err)) {
+        $DB->query("
       SELECT BonusPoints
       FROM users_main
       WHERE ID = $UserID");
-    if ($DB->has_results()) {
-      list($BP) =  $DB->next_record();
-      $BP = (int)$BP;
+        if ($DB->has_results()) {
+            list($BP) =  $DB->next_record();
+            $BP = (int)$BP;
 
-      if ($BP >= $Prices[$BadgeID]) {
-        if (!Badges::award_badge($UserID, $BadgeID)) {
-          $Err = 'Could not award badge, unknown error occurred.';
-        } else {
-          $DB->query("
+            if ($BP >= $Prices[$BadgeID]) {
+                if (!Badges::award_badge($UserID, $BadgeID)) {
+                    $Err = 'Could not award badge, unknown error occurred.';
+                } else {
+                    $DB->query("
             UPDATE users_main
             SET BonusPoints = BonusPoints - " . $Prices[$BadgeID] ."
             WHERE ID = $UserID");
 
-          $DB->query("
+                    $DB->query("
             UPDATE users_info
             SET AdminComment = CONCAT('".sqltime()." - Purchased badge $BadgeID from store\n\n', AdminComment)
             WHERE UserID = $UserID");
 
-          $Cache->delete_value("user_info_heavy_$UserID");
+                    $Cache->delete_value("user_info_heavy_$UserID");
+                }
+            } else {
+                $Err = 'Not enough '.BONUS_POINTS.'.';
+            }
         }
-      } else {
-        $Err = 'Not enough '.BONUS_POINTS.'.';
-      }
     }
-  }
 
-  View::show_header('Store'); ?>
+    View::show_header('Store'); ?>
 <div class='thin'>
-  <h2 id='general'>Purchase <?=isset($Err)?'Failed':'Successful'?></h2>
+  <h2 id='general'>Purchase <?=isset($Err)?'Failed':'Successful'?>
+  </h2>
   <div class='box pad' style='padding: 10px 10px 10px 20px;'>
-    <p><?=isset($Err)?'Error: '.$Err:'You have purchased a badge'?></p>
+    <p><?=isset($Err)?'Error: '.$Err:'You have purchased a badge'?>
+    </p>
     <p><a href='/store.php'>Back to Store</a></p>
   </div>
 </div>
-<? } else {
-  View::show_header('Store'); ?>
+<?php
+} else {
+        View::show_header('Store'); ?>
 <div class='thin'>
   <h2 id='general'>Purchase Badge?</h2>
   <div class='box pad' style='padding: 10px 10px 10px 20px;'>
-    <p>Badge cost: <?=number_format($Prices[$BadgeID])?> <?=BONUS_POINTS?></p>
-    <? if (isset($Err)) { ?>
-    <p>Error: <?=$Err?></p>
-    <? } else { ?>
+    <p>Badge cost: <?=number_format($Prices[$BadgeID])?> <?=BONUS_POINTS?>
+    </p>
+    <?php if (isset($Err)) { ?>
+    <p>Error: <?=$Err?>
+    </p>
+    <?php } else { ?>
     <form action="store.php">
       <input type="hidden" name="item" value="badge">
       <input type="hidden" name="badge" value="<?=$BadgeID?>">
       <input type="hidden" name="confirm" value="1">
       <input type="submit" value="Purchase">
-    <? } ?>
-    <p><a href='/store.php'>Back to Store</a></p>
+      <?php } ?>
+      <p><a href='/store.php'>Back to Store</a></p>
   </div>
 </div>
-<? }
-View::show_footer(); ?>
+<?php
+    }
+View::show_footer();

sections/store/freeleechpool.php

@@ -1,49 +1,48 @@
-<?
-if (isset($_POST['donation'])) {
+<?php
 
-  $Donation = $_POST['donation'];
-  if (!is_numeric($Donation) || $Donation < 1) {
-    error('Invalid donation');
-  }
+if (isset($_POST['donation'])) {
+    $Donation = $_POST['donation'];
+    if (!is_numeric($Donation) || $Donation < 1) {
+        error('Invalid donation');
+    }
 
-  $UserID = $LoggedUser['ID'];
+    $UserID = $LoggedUser['ID'];
 
-  $DB->query("
+    $DB->query("
     SELECT BonusPoints
     FROM users_main
     WHERE ID = $UserID");
-  if ($DB->has_results()) {
-    list($Points) = $DB->next_record();
+    if ($DB->has_results()) {
+        list($Points) = $DB->next_record();
 
-    if ($Points >= $Donation) {
+        if ($Points >= $Donation) {
+            $PoolTipped = false;
 
-      $PoolTipped = false;
-
-      $DB->query("
+            $DB->query("
         UPDATE users_main
         SET BonusPoints = BonusPoints - $Donation
         WHERE ID = $UserID");
-      $DB->query("
+            $DB->query("
         UPDATE misc
         SET First = First + $Donation
         WHERE Name = 'FreeleechPool'");
-      $Cache->delete_value('user_info_heavy_'.$UserID);
+            $Cache->delete_value('user_info_heavy_'.$UserID);
 
-      // Check to see if we're now over the target pool size
-      $DB->query("
+            // Check to see if we're now over the target pool size
+            $DB->query("
         SELECT First, Second
         FROM misc
         WHERE Name = 'FreeleechPool'");
-      if ($DB->has_results()) {
-        list($Pool, $Target) = $DB->next_record();
+            if ($DB->has_results()) {
+                list($Pool, $Target) = $DB->next_record();
 
-        if ($Pool > $Target) {
-          $PoolTipped = true;
-          $NumTorrents = rand(2, 6);
-          $Torrents = [];
-          for ($i = 0; $i < $NumTorrents; $i++) {
-            $TorrentSize = intval($Pool * (($i==$NumTorrents-1)?1:(rand(10,80)/100)) * 100000);
-            $DB->query("
+                if ($Pool > $Target) {
+                    $PoolTipped = true;
+                    $NumTorrents = rand(2, 6);
+                    $Torrents = [];
+                    for ($i = 0; $i < $NumTorrents; $i++) {
+                        $TorrentSize = intval($Pool * (($i===$NumTorrents-1)?1:(rand(10, 80)/100)) * 100000); # todo
+                        $DB->query("
               SELECT ID, Size
               FROM torrents
               WHERE Size < $TorrentSize
@@ -52,74 +51,73 @@ if (isset($_POST['donation'])) {
                 AND FreeLeechType = '0'
               ORDER BY Seeders ASC, Size DESC
               LIMIT 1");
-            if ($DB->has_results()) {
-              list($TorrentID, $Size) = $DB->next_record();
-              $DB->query("
+                        if ($DB->has_results()) {
+                            list($TorrentID, $Size) = $DB->next_record();
+                            $DB->query("
                 INSERT INTO shop_freeleeches
                 (TorrentID, ExpiryTime)
                 VALUES($TorrentID, NOW() + INTERVAL 2 DAY)");
-              Torrents::freeleech_torrents($TorrentID, 1, 3);
-              $Pool -= $TorrentSize/100000;
-            } else {
-              // Failed to find a torrent. Maybe try again with a new value, maybe move on
-              if (rand(1,5) > 1) { $i--; }
-            }
-          }
+                            Torrents::freeleech_torrents($TorrentID, 1, 3);
+                            $Pool -= $TorrentSize/100000;
+                        } else {
+                            // Failed to find a torrent. Maybe try again with a new value, maybe move on
+                            if (rand(1, 5) > 1) {
+                                $i--;
+                            }
+                        }
+                    }
 
-          $Target = rand(10000, 100000);
-          $DB->query("
+                    $Target = rand(10000, 100000);
+                    $DB->query("
             UPDATE misc
             SET First = 0,
                 Second = $Target
             WHERE Name = 'FreeleechPool'");
+                }
+            }
+            $Cache->delete_value('shop_freeleech_list');
+        } else {
+            error("Not enough points to donate");
         }
-      }
-      $Cache->delete_value('shop_freeleech_list');
-    } else {
-      error("Not enough points to donate");
     }
-  }
 
-  View::show_header('Store'); ?>
-  <div class="thin">
-    <h2 id="general">Donation Successful</h2>
-    <div class="box pad" style="padding: 10px 10px 10px 20px;">
-      <p>You donated <?=number_format($Donation)?> <?=BONUS_POINTS?> to the Freeleech Pool</p>
-<? if ($PoolTipped) { ?>
-      <p>Your donation triggered a freeleech!</p>
-<? } ?>
-      <p><a href="/store.php">Back to Store</a></p>
-    </div>
+    View::show_header('Store'); ?>
+<div class="thin">
+  <h2 id="general">Donation Successful</h2>
+  <div class="box pad" style="padding: 10px 10px 10px 20px;">
+    <p>You donated <?=number_format($Donation)?> <?=BONUS_POINTS?> to the Freeleech Pool</p>
+    <?php if ($PoolTipped) { ?>
+    <p>Your donation triggered a freeleech!</p>
+    <?php } ?>
+    <p><a href="/store.php">Back to Store</a></p>
   </div>
-  <? View::show_footer();
-
+</div>
+<?php View::show_footer();
 } else {
-
-  $DB->query("
+    $DB->query("
     SELECT First
     FROM misc
     WHERE Name = 'FreeleechPool'");
-  if ($DB->has_results()) {
-    list($Pool) = $DB->next_record();
-  } else {
-    $Pool = 0;
-  }
+    if ($DB->has_results()) {
+        list($Pool) = $DB->next_record();
+    } else {
+        $Pool = 0;
+    }
 
-  View::show_header('Store'); ?>
-  <div class="thin">
-    <div class="box pad" style="padding: 10px 10px 10px 20px; text-align: center;">
-      <form action="store.php" method="POST">
-        <input type="hidden" name="item" value="freeleechpool">
-        <strong>
+    View::show_header('Store'); ?>
+<div class="thin">
+  <div class="box pad" style="padding: 10px 10px 10px 20px; text-align: center;">
+    <form action="store.php" method="POST">
+      <input type="hidden" name="item" value="freeleechpool">
+      <strong>
         There are currently <?=number_format($Pool)?> <?=BONUS_POINTS?> in the Freeleech Pool
-        </strong>
-        <br><br>
-        <input type="text" name="donation" value="">
-        <input type="submit" value="Donate">
-      </form>
-      <p><a href="/store.php">Back to Store</a></p>
-    </div>
+      </strong>
+      <br><br>
+      <input type="text" name="donation" value="">
+      <input type="submit" value="Donate">
+    </form>
+    <p><a href="/store.php">Back to Store</a></p>
   </div>
-  <? View::show_footer();
+</div>
+<?php View::show_footer();
 }
-?>

sections/store/promotion.php

@@ -1,4 +1,7 @@
-<?
+<?php
+
+# todo: I like the idea of store-based promotions expanded to other factors,
+# e.g., under an HnR threshold or minimum account age
 $UserID = $LoggedUser['ID'];
 $GiB = 1024*1024*1024;
 
@@ -13,6 +16,7 @@ $Classes = array(
     'MinRatio'    => 0.7, // minimum ratio
     'TorUnique'   => false // do the uploads have to be unique groups?
   ),
+
   POWER => array(
     'Name'        => 'Well Endowed',
     'Price'       => 10000,
@@ -23,6 +27,7 @@ $Classes = array(
     'MinRatio'    => 1.1,
     'TorUnique'   => false
   ),
+
   ELITE => array(
     'Name'        => 'Bombshell',
     'Price'       => 30000,
@@ -33,6 +38,7 @@ $Classes = array(
     'MinRatio'    => 1.2,
     'TorUnique'   => false
   ),
+
   TORRENT_MASTER => array(
     'Name'        => 'Top Heavy',
     'Price'       => 60000,
@@ -43,6 +49,7 @@ $Classes = array(
     'MinRatio'    => 1.3,
     'TorUnique'   => false
   ),
+  
   POWER_TM => array(
     'Name'        => 'Titty Monster',
     'Price'       => 100000,
@@ -65,9 +72,9 @@ $DB->query("
   WHERE users_main.ID = $UserID");
 
 if ($DB->has_results()) {
-  list($PermID, $BP, $Warned, $Upload, $Download, $Ratio, $Enabled, $Uploads, $Groups) = $DB->next_record();
+    list($PermID, $BP, $Warned, $Upload, $Download, $Ratio, $Enabled, $Uploads, $Groups) = $DB->next_record();
 
-  switch ($PermID) {
+    switch ($PermID) {
     case USER:
       $To = MEMBER;
       break;
@@ -87,15 +94,14 @@ if ($DB->has_results()) {
       $To = -1;
   }
 
-  if ($To == -1) {
-    $Err[] = "Your user class is not eligible for promotions";
-  } elseif ($Enabled != 1) {
-    $Err[] = "This account is disabled, how did you get here?";
-  } else {
-
-    if ($Classes[$To]['NonSmall'] > 0) {
-      //
-      $DB->query("
+    if ($To == -1) {
+        $Err[] = "Your user class is not eligible for promotions";
+    } elseif ($Enabled != 1) {
+        $Err[] = "This account is disabled, how did you get here?";
+    } else {
+        if ($Classes[$To]['NonSmall'] > 0) {
+            //
+            $DB->query("
         SELECT COUNT(torrents.ID)
         FROM torrents
           JOIN torrents_group ON torrents.GroupID = torrents_group.ID
@@ -103,80 +109,81 @@ if ($DB->has_results()) {
           OR (torrents_group.CategoryID = 3 AND torrents_group.Pages >= 50))
           AND torrents.UserID = $UserID");
 
-      if ($DB->has_results()) {
-        list($NonSmall) = $DB->next_record();
+            if ($DB->has_results()) {
+                list($NonSmall) = $DB->next_record();
 
-        if ($NonSmall < $Classes[$To]['NonSmall']) {
-          $Err[] = "You do not have enough large uploads.";
+                if ($NonSmall < $Classes[$To]['NonSmall']) {
+                    $Err[] = "You do not have enough large uploads.";
+                }
+            } else {
+                $Err[] = "You do not have enough large uploads.";
+            }
         }
-      } else {
-        $Err[] = "You do not have enough large uploads.";
-      }
-
-    }
 
-    if ($Warned) {
-      $Err[] = "You cannot be promoted while warned";
-    }
+        if ($Warned) {
+            $Err[] = "You cannot be promoted while warned";
+        }
 
-    if ($LoggedUser['DisablePromotion']) {
-      $Err[] = "You have been banned from purchasing promotions";
-    }
+        if ($LoggedUser['DisablePromotion']) {
+            $Err[] = "You have been banned from purchasing promotions";
+        }
 
-    if ($BP < $Classes[$To]['Price']) {
-      $Err[] = "Not enough points";
-    }
+        if ($BP < $Classes[$To]['Price']) {
+            $Err[] = "Not enough points";
+        }
 
-    if ($Ratio < $Classes[$To]['MinRatio']) {
-      $Err[] = "Your ratio is too low to be promoted. The minimum ratio required for this promotion is ".$Classes[$To]['MinRatio'].".";
-    }
+        if ($Ratio < $Classes[$To]['MinRatio']) {
+            $Err[] = "Your ratio is too low to be promoted. The minimum ratio required for this promotion is ".$Classes[$To]['MinRatio'].".";
+        }
 
-    if ($Upload < $Classes[$To]['MinUpload']*$GiB) {
-      if ($Classes[$To]['MinUpload'] >= 1024) {
-        $Amount = $Classes[$To]['MinUpload']/1024;
-        $Unit = 'TiB';
-      } else {
-        $Amount = $Classes[$To]['MinUpload'];
-        $Unit = 'GiB';
-      }
-      $Err[] = "You have not uploaded enough to be promoted. The minimum uploaded amount for this promotion is ".$Amount."".$Unit.".";
-    }
+        if ($Upload < $Classes[$To]['MinUpload']*$GiB) {
+            if ($Classes[$To]['MinUpload'] >= 1024) {
+                $Amount = $Classes[$To]['MinUpload']/1024;
+                $Unit = 'TiB';
+            } else {
+                $Amount = $Classes[$To]['MinUpload'];
+                $Unit = 'GiB';
+            }
+            $Err[] = "You have not uploaded enough to be promoted. The minimum uploaded amount for this promotion is ".$Amount."".$Unit.".";
+        }
 
-    if ($Download < $Classes[$To]['MinDownload']*$GiB) {
-      $Err[] = "You have not downloaded enough to be promoted. The minimum downloaded amount for this promotion is ".$Classes[$To]['MinDownload']."GiB.";
-    }
+        if ($Download < $Classes[$To]['MinDownload']*$GiB) {
+            $Err[] = "You have not downloaded enough to be promoted. The minimum downloaded amount for this promotion is ".$Classes[$To]['MinDownload']."GiB.";
+        }
 
-    if ($Uploads < $Classes[$To]['MinUploads']) {
-      $Err[] = "You have not uploaded enough torrents to be promoted. The minimum number of uploaded torrents for this promotion is ".$Classes[$To]['MinUploads'].".";
-    }
+        if ($Uploads < $Classes[$To]['MinUploads']) {
+            $Err[] = "You have not uploaded enough torrents to be promoted. The minimum number of uploaded torrents for this promotion is ".$Classes[$To]['MinUploads'].".";
+        }
 
-    if ($Classes[$To]['UniqueTor'] && $Groups < $Classes[$To]['MinUploads']) {
-      $Err[] = "You have not uploaded to enough unique torrent groups to be promoted. The minimum number of unique groups for this promotion is ".$Classes[$To]['MinUploads'].".";
-    }
+        if ($Classes[$To]['UniqueTor'] && $Groups < $Classes[$To]['MinUploads']) {
+            $Err[] = "You have not uploaded to enough unique torrent groups to be promoted. The minimum number of unique groups for this promotion is ".$Classes[$To]['MinUploads'].".";
+        }
 
-    if (!isset($Err)) {
-      $DB->query("
+        if (!isset($Err)) {
+            $DB->query("
         UPDATE users_main
         SET
           BonusPoints = BonusPoints - ".$Classes[$To]['Price'].",
           PermissionID = $To
         WHERE ID = $UserID");
-      $DB->query("
+            $DB->query("
         UPDATE users_info
         SET AdminComment = CONCAT('".sqltime()." - Class changed to ".Users::make_class_string($To)." via store purchase\n\n', AdminComment)
         WHERE UserID = $UserID");
-      $Cache->delete_value("user_info_$UserID");
-      $Cache->delete_value("user_info_heavy_$UserID");
+            $Cache->delete_value("user_info_$UserID");
+            $Cache->delete_value("user_info_heavy_$UserID");
+        }
     }
-  }
 }
 
 View::show_header('Store'); ?>
 <div class="thin">
-  <h2 id="general">Purchase <?=isset($Err)?"Failed":"Successful"?></h2>
+  <h2 id="general">Purchase <?=isset($Err)?"Failed":"Successful"?>
+  </h2>
   <div class="box pad" style="padding: 10px 10px 10px 20px;">
-    <p><?=isset($Err)?"Error: ".implode("<br />Error: ", $Err):"You have been promoted to ".$Classes[$To]['Name']."!"?></p>
+    <p><?=isset($Err)?"Error: ".implode("<br />Error: ", $Err):"You have been promoted to ".$Classes[$To]['Name']."!"?>
+    </p>
     <p><a href="/store.php">Back to Store</a></p>
   </div>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer();

sections/store/token.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $Purchase = "1 freeleech token";
 $UserID = $LoggedUser['ID'];
 
@@ -7,32 +8,34 @@ $DB->query("
   FROM users_main
   WHERE ID = $UserID");
 if ($DB->has_results()) {
-  list($Points) = $DB->next_record();
+    list($Points) = $DB->next_record();
 
-  if ($Points >= 10000) {
-    $DB->query("
+    if ($Points >= 10000) {
+        $DB->query("
       UPDATE users_main
       SET BonusPoints = BonusPoints - 10000,
           FLTokens    = FLTokens + 1
       WHERE ID = $UserID");
-    $DB->query("
+        $DB->query("
       UPDATE users_info
       SET AdminComment = CONCAT('".sqltime()." - Purchased a freeleech token from the store\n\n', AdminComment)
       WHERE UserID = $UserID");
-    $Cache->delete_value('user_info_heavy_'.$UserID);
-    $Worked = true;
-  } else {
-    $Worked = false;
-    $ErrMessage = "Not enough ".BONUS_POINTS.".";
-  }
+        $Cache->delete_value('user_info_heavy_'.$UserID);
+        $Worked = true;
+    } else {
+        $Worked = false;
+        $ErrMessage = "Not enough ".BONUS_POINTS.".";
+    }
 }
 
 View::show_header('Store'); ?>
 <div class="thin">
-  <h2 id="general">Purchase <?print $Worked?"Successful":"Failed"?></h2>
+  <h2 id="general">Purchase <?print $Worked?"Successful":"Failed"?>
+  </h2>
   <div class="box pad" style="padding: 10px 10px 10px 20px;">
-    <p><?print $Worked?("You purchased ".$Purchase):("Error: ".$ErrMessage)?></p>
+    <p><?print $Worked?("You purchased ".$Purchase):("Error: ".$ErrMessage)?>
+    </p>
     <p><a href="/store.php">Back to Store</a></p>
   </div>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer();

sections/torrents/browse.php

@@ -708,7 +708,6 @@ die();
 
       # Similar to the logic down the page, and on
       # torrents.class.php and sections/artist/artist.php
-      # todo: Find out exactly whhere this displays (it's not the search results)
       if ($GroupResults && (count($Torrents) > 1 && isset($GroupedCategories[$CategoryID - 1]))) {
           // These torrents are in a group
           $CoverArt = $GroupInfo['WikiImage'];
@@ -859,11 +858,9 @@ die();
           class="tooltip" title="Report">RP</a> ]
       </span>
           <a
-          href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"
-          class="torrent_label tl_reported tooltip search_link">
-            <strong>[Details]</strong>
-            <?=Torrents::torrent_info($Data)?>
-          </a>
+          href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>#torrent<?=$TorrentID?>"
+          class="torrent_label tl_reported tooltip search_link"><strong>Details</strong></a>
+          / <?=Torrents::torrent_info($Data)?>
           <?php if ($Reported) { ?>
             / <strong
               class="torrent_label tl_reported tooltip search_link important_text"
@@ -1005,8 +1002,9 @@ die();
         </div>
         <?=$DisplayName?>
         <br />
-        <div style="display: inline;" class="torrent_info"><?=$ExtraInfo?><?php if ($Reported) { ?> / <strong
-            class="torrent_label tl_reported tooltip"
+        <div style="display: inline;" class="torrent_info"><?=$ExtraInfo?><?php if ($Reported) { ?>
+        / <strong
+            class="torrent_label tl_reported tooltip important_text"
             title="Type: <?=ucfirst($Reports[0]['Type'])?><br>Comment: <?=htmlentities(htmlentities($Reports[0]['UserComment']))?>">Reported</strong><?php } ?>
         </div>
         <div class="tags"><?=$TorrentTags->format("torrents.php?$Action&amp;taglist=")?>

sections/torrents/details.php

@@ -525,28 +525,28 @@ foreach ($TorrentList as $Torrent) {
 
   // Similar to Torrents::torrent_info()
     if ($Media) {
-        $ExtraInfo.=display_str($Media);
-        $AddExtra=" / ";
+        $ExtraInfo .= display_str($Media);
+        $AddExtra = " / ";
     }
 
     if ($Container) {
-        $ExtraInfo.=$AddExtra.display_str($Container);
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . display_str($Container);
+        $AddExtra = ' / ';
     }
 
     if ($Archive) {
-        $ExtraInfo .= $AddExtra.display_str($Archive);
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . display_str($Archive);
+        $AddExtra = ' / ';
     }
 
     if ($Codec) {
-        $ExtraInfo.=$AddExtra.display_str($Codec);
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . display_str($Codec);
+        $AddExtra = ' / ';
     }
 
     if ($Resolution) {
-        $ExtraInfo.=$AddExtra.display_str($Resolution);
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . display_str($Resolution);
+        $AddExtra = ' / ';
     }
 
     /*
@@ -579,41 +579,41 @@ foreach ($TorrentList as $Torrent) {
     */
 
     if ($Censored) {
-        $ExtraInfo .= $AddExtra.display_str('Aligned');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . display_str('Aligned');
+        $AddExtra = ' / ';
     } else {
-        $ExtraInfo .= $AddExtra.display_str('Not Aligned');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . display_str('Not Aligned');
+        $AddExtra = ' / ';
     }
 
     if (!$ExtraInfo) {
         $ExtraInfo = $GroupName;
-        $AddExtra=' / ';
+        $AddExtra = ' / ';
     }
 
     if ($IsLeeching) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Leeching', 'important_text');
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Leeching', 'important_text');
         $AddExtra=' / ';
     } elseif ($IsSeeding) {
-        $ExtraInfo.=$AddExtra . Format::torrent_label('Seeding', 'important_text_alt');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Seeding', 'important_text_alt');
+        $AddExtra = ' / ';
     } elseif ($IsSnatched) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Snatched!', 'bold');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Snatched!', 'bold');
+        $AddExtra = ' / ';
     }
 
     if ($FreeTorrent === '1') {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Freeleech!', 'important_text_alt');
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Freeleech!', 'important_text_alt');
         $AddExtra=' / ';
     }
 
     if ($FreeTorrent === '2') {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Neutral Leech!', 'bold');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Neutral Leech!', 'bold');
+        $AddExtra = ' / ';
     }
 
     // Freleechizer
-    if ($FreeLeechType == '3') {
+    if ($FreeLeechType === '3') {
         $DB->query("
       SELECT UNIX_TIMESTAMP(ExpiryTime)
       FROM shop_freeleeches
@@ -625,30 +625,30 @@ foreach ($TorrentList as $Torrent) {
     }
 
     if ($PersonalFL) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Personal Freeleech!', 'important_text_alt');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Personal Freeleech!', 'important_text_alt');
+        $AddExtra = ' / ';
     }
 
     if ($Reported) {
         $HtmlReportType = ucfirst($Reports[0]['Type']);
         $HtmlReportComment = htmlentities(htmlentities($Reports[0]['UserComment']));
-        $ExtraInfo.=$AddExtra. "<strong class='torrent_label tl_reported tooltip' title='Type: $HtmlReportType<br>Comment: HtmlReportComment'>".Format::torrent_label('Reported', 'important_text')."</strong>";
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . "<strong class='torrent_label tl_reported tooltip' title='Type: $HtmlReportType<br>Comment: $HtmlReportComment'>".Format::torrent_label('Reported', 'important_text')."</strong>";
+        $AddExtra = ' / ';
     }
 
     if (!empty($BadTags)) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Tags', 'important_text');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Tags', 'important_text');
+        $AddExtra = ' / ';
     }
 
     if (!empty($BadFolders)) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Folders', 'important_text');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Folders', 'important_text');
+        $AddExtra = ' / ';
     }
 
     if (!empty($BadFiles)) {
-        $ExtraInfo.=$AddExtra. Format::torrent_label('Bad File Names', 'important_text');
-        $AddExtra=' / ';
+        $ExtraInfo .= $AddExtra . Format::torrent_label('Bad File Names', 'important_text');
+        $AddExtra = ' / ';
     }
 
     $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];

sections/torrents/takeedit.php

@@ -231,6 +231,7 @@ switch ($Type) {
     }
     */
 
+    /* Broken 2020-03-10
     $Validate->SetFields(
         'media',
         '1',
@@ -238,6 +239,7 @@ switch ($Type) {
         'Not a valid media',
         array('inarray' => $Media)
     );
+    */
 
     /*
     $Validate->SetFields(

sections/upload/upload_handle.php

@@ -232,10 +232,10 @@ default:
         # torrents_group.Studio
         $Validate->SetFields(
             'studio',
-            '0',
+            '1',
             'string',
-            'Department/Lab must be between 0 and 100 characters.',
-            array('maxlength' => 100, 'minlength' => 0)
+            'Department/Lab must be between 10 and 100 characters.',
+            array('maxlength' => 100, 'minlength' => 10)
         );
 
         # torrents_group.Series