Miscellaneous Changes

* Added a new category
* Add deletion support to batch tag updater
* Bug fixes

classes/autoenable.class.php

@@ -11,10 +11,10 @@ class AutoEnable {
     const CACHE_KEY_NAME = 'num_enable_requests';
 
     // The default request rejected message
-    const REJECTED_MESSAGE = "Your request to re-enable your account has been rejected.<br />This may be because a request is already pending for your username, or because a recent request was denied.<br /><br />You are encouraged to discuss this with staff by visiting %s on %s";
+    const REJECTED_MESSAGE = "Your request to re-enable your account has been rejected.<br>This may be because a request is already pending for your username, or because a recent request was denied.<br><br>You are encouraged to discuss this with staff by visiting %s on %s";
 
     // The default request received message
-    const RECEIVED_MESSAGE = "Your request to re-enable your account has been received. You can expect a reply message in your email within 48 hours.<br />If you do not receive an email after 48 hours have passed, please visit us on IRC for assistance.";
+    const RECEIVED_MESSAGE = "Your request to re-enable your account has been received. Most requests are responded to within minutes. Remember to check your spam.<br>If you do not receive an email after 48 hours have passed, please visit us on IRC for assistance.";
 
     /**
      * Handle a new enable request
@@ -31,7 +31,7 @@ class AutoEnable {
 
         // Get the user's ID
         G::$DB->query("
-                SELECT um.ID
+                SELECT um.ID, ui.BanReason
                 FROM users_main AS um
                 JOIN users_info ui ON ui.UserID = um.ID
                 WHERE um.Username = '$Username'
@@ -39,7 +39,7 @@ class AutoEnable {
 
         if (G::$DB->has_results()) {
             // Make sure the user can make another request
-            list($UserID) = G::$DB->next_record();
+            list($UserID, $BanReason) = G::$DB->next_record();
             G::$DB->query("
             SELECT 1 FROM users_enable_requests
             WHERE UserID = '$UserID'
@@ -51,9 +51,8 @@ class AutoEnable {
                     OR
                     (
                       Timestamp > NOW() - INTERVAL 2 MONTH
-                        AND
-                          (Outcome = '".self::DENIED."'
-                             OR Outcome = '".self::DISCARDED."')
+                      AND
+                      Outcome = '".self::DENIED."'
                     )
                   )");
         }
@@ -75,12 +74,16 @@ class AutoEnable {
                 (UserID, Email, IP, UserAgent, Timestamp)
                 VALUES (?, ?, ?, ?, NOW())",
                 $UserID, Crypto::encrypt($Email), Crypto::encrypt($IP), $UserAgent);
+            $RequestID = G::$DB->inserted_id();
 
             // Cache the number of requests for the modbar
             G::$Cache->increment_value(self::CACHE_KEY_NAME);
             setcookie('username', '', time() - 60 * 60, '/', '', false);
             $Output = self::RECEIVED_MESSAGE;
             Tools::update_user_notes($UserID, sqltime() . " - Enable request " . G::$DB->inserted_id() . " received from $IP\n\n");
+            if ($BanReason == 3) {
+              //self::handle_requests([$RequestID], self::APPROVED, "Automatically approved (inactivity)");
+            }
         }
 
         return $Output;
@@ -140,8 +143,8 @@ class AutoEnable {
                     $Token = db_string(Users::make_secret());
                     G::$DB->query("
                         UPDATE users_enable_requests
-                        SET Token = '$Token'
-                        WHERE ID = '$ID'");
+                        SET Token = ?
+                        WHERE ID = ?", $Token, $ID);
                     $TPL->set('TOKEN', $Token);
                 }
 
@@ -159,11 +162,17 @@ class AutoEnable {
         }
 
         // User notes stuff
+        $StaffID = G::$LoggedUser['ID'] ?? 0;
         G::$DB->query("
             SELECT Username
             FROM users_main
-            WHERE ID = '" . G::$LoggedUser['ID'] . "'");
-        list($StaffUser) = G::$DB->next_record();
+            WHERE ID = ?", $StaffID);
+        if (G::$DB->has_results()) {
+          list($StaffUser) = G::$DB->next_record();
+        } else {
+          $StaffUser = "System";
+          $StaffID = 0;
+        }
 
         foreach ($UserInfo as $User) {
             list($ID, $UserID) = $User;
@@ -176,9 +185,9 @@ class AutoEnable {
         G::$DB->query("
                 UPDATE users_enable_requests
                 SET HandledTimestamp = NOW(),
-                    CheckedBy = '".G::$LoggedUser['ID']."',
-                    Outcome = '$Status'
-                WHERE ID IN (".implode(',', $IDs).")");
+                    CheckedBy = ?,
+                    Outcome = ?
+                WHERE ID IN (".implode(',', $IDs).")", $StaffID, $Status);
         G::$Cache->decrement_value(self::CACHE_KEY_NAME, count($IDs));
     }
 

classes/cache.class.php

@@ -102,9 +102,7 @@ class Cache extends MemcacheCompat {
   // Wrapper for Memcache::add, with the zlib option removed and default duration of 30 days
   public function add_value($Key, $Value, $Duration = 2592000) {
     $StartTime = microtime(true);
-    $AddParams = [$Key, $Value, false, $Duration];
-    if (is_subclass_of($this, 'Memcached')) unset($AddParams[2]);
-    $Added = $this->add(...$AddParams);
+    $Added = $this->add($Key, $Value, 0, $Duration);
     $this->Time += (microtime(true) - $StartTime) * 1000;
     return $Added;
   }

classes/config.template

@@ -162,7 +162,7 @@ $CategoryIcons = ['music.png', 'apps.png', 'ebook.png', 'audiobook.png', 'elearn
 
 $Media = ['TV', 'DVD', 'Bluray', 'HD DVD', 'VHS', 'VCD', 'LD', 'Web'];
 $MediaManga = ['Scan', 'Web'];
-$Platform = ['Windows', 'OS X', 'Linux', 'Multi-Platform', 'Flash', 'Java', 'Android', 'iOS', '3DS'];
+$Platform = ['Windows', 'OS X', 'Linux', 'BSD', 'Flash', 'Java', 'Android', 'iOS', '3DS'];
 $Containers = ['AVI', 'MKV', 'MP4', 'OGM', 'WMV', 'ISO', 'VOB IFO', 'TS', 'M2TS'];
 $ContainersGames = ['ISO', 'BIN-CUE', 'Installer', 'Loose'];
 $Codecs = ['h264', '10-bit h264', 'XviD', 'DivX', 'WMV', 'DVD5', 'DVD9', 'HEVC', 'MPEG-2'];

classes/debug.class.php

@@ -139,7 +139,7 @@ class DEBUG {
     $Return = [];
     foreach ($Array as $Key => $Val) {
       $Return[$Key] = '';
-      if (!is_int($Key) || $Key != $LastKey + 1) {
+      if (!is_int($Key) || !is_int($LastKey) || $Key != $LastKey + 1) {
         $Return[$Key] .= "'$Key' => ";
       }
         if ($Val === true) {

classes/torrent_form.class.php

@@ -274,6 +274,12 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td><input type="text" id="dlsiteid" name="dlsiteid" size="8" maxlength="8" value="<?=display_str($Torrent['DLsiteID']??'')?>" <?=$this->Disabled?>/></td>
       </tr>
 <? } ?>
+      <tr id="mediainfo_tr">
+        <td class="label">Media Info</td>
+        <td>
+          <textarea name="mediainfo" id="mediainfo" onchange="MediaInfoExtract()"  rows="8" cols="60"><?=display_str($Torrent['MediaInfo']??'')?></textarea>
+        </td>
+      </tr>
       <tr id="media_tr">
         <td class="label">Media</td>
         <td>
@@ -496,12 +502,6 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
           <input type="checkbox" name="censored" value="1" <?=(($Torrent['Censored'] ?? 1) ? 'checked ' : '')?>/>
         </td>
       </tr>
-      <tr id="mediainfo_tr">
-        <td class="label">Media Info</td>
-        <td>
-          <textarea name="mediainfo" id="mediainfo" onchange="MediaInfoExtract()"  rows="8" cols="60"><?=display_str($Torrent['MediaInfo']??'')?></textarea>
-        </td>
-      </tr>
 <?    if ($this->NewTorrent) { ?>
       <tr id="tags_tr">
         <td class="label tooltip" title="Comma seperated list of tags">Tags</td>

gazelle.sql

@@ -730,7 +730,7 @@ CREATE TABLE `requests` (
 CREATE TABLE `requests_artists` (
   `RequestID` int(10) unsigned NOT NULL,
   `ArtistID` int(10) NOT NULL,
-  PRIMARY KEY (`RequestID`)
+  PRIMARY KEY (`RequestID`, `ArtistID`)
 ) ENGINE=InnoDB CHARSET=utf8mb4;
 
 CREATE TABLE `requests_tags` (

sections/ajax/autofill/manga.php

@@ -23,6 +23,7 @@ if ($Cache->get_value('manga_fill_json_'.$gid)) {
   $data = json_encode(["method" => "gdata", "gidlist" => [[$gid, $token]], "namespace" => 1]);
   $curl = curl_init('http://api.e-hentai.org/api.php');
   curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "POST");
+  curl_setopt($curl, CURLOPT_TIMEOUT, 10);
   curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
   curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
   curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json', 'Content-Length: '.strlen($data)]);
@@ -76,16 +77,23 @@ if ($Cache->get_value('manga_fill_json_'.$gid)) {
     }
   }
 
+  $title = html_entity_decode($json['title'], ENT_QUOTES);
+  $title = preg_replace("/\(([^()]*+|(?R))*\)/","", $title);
+  $title = trim(preg_replace("/\[([^\[\]]*+|(?R))*\]/","", $title));
+  $title_jp = html_entity_decode($json['title_jpn'], ENT_QUOTES);
+  $title_jp = preg_replace("/\(([^()]*+|(?R))*\)/","", $title_jp);
+  $title_jp = trim(preg_replace("/\[([^\[\]]*+|(?R))*\]/","", $title_jp));
+
   $json_str = [
     'id'          => $gid,
-    'title'       => html_entity_decode($json['title'], ENT_QUOTES),
-    'title_jp'    => html_entity_decode($json['title_jpn'], ENT_QUOTES),
+    'title'       => $title,
+    'title_jp'    => $title_jp,
     'artists'     => $artists,
     'circle'      => $circle,
     'censored'    => $censored,
     'year'        => NULL,
     'tags'        => $tags,
-    'lang'        => $lang??'Japanese',
+    'lang'        => $lang ?? 'Japanese',
     'pages'       => $json['filecount'],
     'description' => '',
     'cover'       => $cover

sections/bookmarks/torrents.php

@@ -210,13 +210,15 @@ foreach ($GroupIDs as $GroupID) {
 
 $CollageCovers = isset($LoggedUser['CollageCovers']) ? (int)$LoggedUser['CollageCovers'] : 10;
 $CollagePages = [];
-for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
-  $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
-  $CollagePage = '';
-  foreach ($Groups as $Group) {
-    $CollagePage .= $Group;
+if ($CollageCovers > 0) {
+  for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
+    $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
+    $CollagePage = '';
+    foreach ($Groups as $Group) {
+      $CollagePage .= $Group;
+    }
+    $CollagePages[] = $CollagePage;
   }
-  $CollagePages[] = $CollagePage;
 }
 
 View::show_header($Title, 'browse,collage,wall');

sections/collages/edit.php

@@ -17,13 +17,13 @@ if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_colla
   error(403);
 }
 
-View::show_header('Edit collection');
+View::show_header('Edit collection', 'bbcode');
 
 if (!empty($Err)) {
   if (isset($ErrNoEscape)) {
-    echo '<div class="save_message error">'.$Err.'</div>';
+    echo '<div class="box save_message error">'.$Err.'</div>';
   } else {
-    echo '<div class="save_message error">'.display_str($Err).'</div>';
+    echo '<div class="box save_message error">'.display_str($Err).'</div>';
   }
 }
 ?>
@@ -65,7 +65,7 @@ if ($CategoryID > 0 || check_perms('site_collages_delete')) { ?>
       <tr>
         <td class="label">Description</td>
         <td>
-          <textarea name="description" id="description" cols="60" rows="10"><?=$Description?></textarea>
+          <textarea class="bbcode_editor" name="description" id="description" cols="60" rows="10"><?=$Description?></textarea>
         </td>
       </tr>
       <tr>

sections/collages/new.php

@@ -1,5 +1,5 @@
 <?
-View::show_header('Create a collection');
+View::show_header('Create a collection', 'bbcode');
 
 if (!check_perms('site_collages_renamepersonal')) {
   $ChangeJS = " onchange=\"if ( this.options[this.selectedIndex].value == '0') { $('#namebox').ghide(); $('#personal').gshow(); } else { $('#namebox').gshow(); $('#personal').ghide(); }\"";
@@ -66,7 +66,7 @@ if (($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('
       <tr>
         <td class="label">Description</td>
         <td>
-          <textarea name="description" id="description" cols="60" rows="10"><?=display_str($Description)?></textarea>
+          <textarea class="bbcode_editor" name="description" id="description" cols="60" rows="10"><?=display_str($Description)?></textarea>
         </td>
       </tr>
       <tr>

sections/collages/torrent_collage.php

@@ -236,13 +236,15 @@ if (!check_perms('site_collages_delete')
 $CollageCovers = isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1));
 $CollagePages = [];
 
-for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
-  $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
-  $CollagePage = '';
-  foreach ($Groups as $Group) {
-    $CollagePage .= $Group;
+if ($CollageCovers) {
+  for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
+    $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
+    $CollagePage = '';
+    foreach ($Groups as $Group) {
+      $CollagePage .= $Group;
+    }
+    $CollagePages[] = $CollagePage;
   }
-  $CollagePages[] = $CollagePage;
 }
 
 View::show_header($Name, 'browse,collage,bbcode,recommend,wall');

sections/forums/forum.php

@@ -152,7 +152,7 @@ $Pages = Format::get_pages($Page, $Forums[$ForumID]['NumTopics'], TOPICS_PER_PAG
 echo $Pages;
 ?>
   </div>
-  <table class="forum_index" width="100%">
+  <table class="forum_index alternate_rows" width="100%">
     <tr class="colhead">
       <td style="width: 2%;"></td>
       <td>Latest</td>

sections/forums/main.php

@@ -23,7 +23,7 @@ foreach ($Forums as $Forum) {
   </table>
 <? } ?>
 <h3><?=$ForumCats[$CategoryID]?></h3>
-  <table class="forum_index">
+  <table class="forum_index alternate_rows">
     <tr class="colhead">
       <td style="width: 2%;"></td>
       <td style="max-width: 25%;">Forum</td>

sections/login/disabled.php

@@ -9,29 +9,29 @@ if (isset($_POST['email']) && FEATURE_EMAIL_REENABLE) {
     $Output = "Please enter a valid email address.";
   }
 
-  $Output .= "<br /><br /><a href='login.php?action=disabled'>Back</a>";
+  $Output .= "<br><br><a href='login.php?action=disabled'>Back</a>";
 }
 
 if ((empty($_POST['submit']) || empty($_POST['username'])) && !isset($Output)) {
 ?>
 <p class="warning">
-Your account has been disabled.<br />
-This is either due to inactivity or rule violation(s).<br /><br /></p>
+Your account has been disabled.<br>
+This is either due to inactivity or rule violation(s).<br><br></p>
 <? if (FEATURE_EMAIL_REENABLE) { ?>
-If you believe your account was in good standing and was disabled for inactivity, you may request it be re-enabled via email using the form below.<br />
-Please note that you will need access to the email account associated with your account at <?=SITE_NAME?> for this to work;<br />
-if you do not, please see the section after this form.<br /><br />
+If you believe your account was in good standing and was disabled for inactivity, you may request it be re-enabled via email using the form below.<br>
+Please use an email service that actually delivers mail. Outlook/Hotmail is known not to.<br>
+Most requests are handled within minutes. If a day or two goes by without a response, try again with a different email or try asking in IRC.<br><br>
 <form action="" method="POST">
   <input type="email" class="inputtext" placeholder="Email Address" name="email" required /> <input type="submit" value="Submit" />
   <input type="hidden" name="username" value="<?=$_COOKIE['username']?>" />
 </form><br /><br />
 <? } ?>
-If you are unsure why your account is disabled, or you wish to discuss this with staff, come to our IRC network at: <?=BOT_SERVER?><br />
-And join <?=BOT_DISABLED_CHAN?><br /><br />
-<strong>Be honest.</strong> At this point, lying will get you nowhere.<br /><br /><br />
+If you are unsure why your account is disabled, or you wish to discuss this with staff, come to our IRC network at: <?=BOT_SERVER?><br>
+And join <?=BOT_DISABLED_CHAN?><br><br>
+<strong>Be honest.</strong> At this point, lying will get you nowhere.<br /><br><br>
 </p>
 
-<strong>Before joining the disabled channel, please read our <br /> <span style="color: gold;">Golden Rules</span> which can be found <a style="color: #1464F4;" href="#" onclick="toggle_visibility('golden_rules')">here</a>.</strong> <br /><br />
+<strong>Before joining the disabled channel, please read our <br> <span>Golden Rules</span> which can be found <a style="color: #1464F4;" href="#" onclick="toggle_visibility('golden_rules')">here</a>.</strong> <br><br>
 
 <script type="text/javascript">
 function toggle_visibility(id) {

sections/login/login.php

@@ -1,6 +1,5 @@
 <? View::show_header('Login'); ?>
   <span id="no-cookies" class="hidden warning">You appear to have cookies disabled.<br /><br /></span>
-  <noscript><span class="warning"><?=SITE_NAME?> requires JavaScript to function properly. Please enable JavaScript in your browser.</span><br /><br /></noscript>
 <?
 if (!$Banned) {
 ?>

sections/reports/ajax_add_notes.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!check_perms('site_moderate_forums') || empty($_POST['id'])) {
+if (!check_perms('admin_reports') || empty($_POST['id'])) {
   print
     json_encode(
       array(
@@ -12,13 +12,12 @@ if (!check_perms('site_moderate_forums') || empty($_POST['id'])) {
 
 $ID = (int)$_POST['id'];
 
-$Notes = str_replace("<br />", "\n", $_POST['notes']);
-$Notes = db_string($Notes);
+$Notes = $_POST['notes'];
 
 $DB->query("
   UPDATE reports
-  SET Notes = '$Notes'
-  WHERE ID = '$ID'");
+  SET Notes = ?
+  WHERE ID = ?", $Notes, $ID);
 print
   json_encode(
     array(

sections/reports/compose.php

@@ -1,5 +1,5 @@
 <?
-if (!check_perms('site_moderate_forums')) {
+if (!check_perms('admin_reports')) {
   error(403);
 }
 
@@ -30,7 +30,7 @@ if (!empty($LoggedUser['DisablePM']) && !isset($StaffIDs[$ToID])) {
 $DB->query("
   SELECT Username
   FROM users_main
-  WHERE ID = '$ToID'");
+  WHERE ID = ?", $ToID);
 list($ComposeToUsername) = $DB->next_record();
 if (!$ComposeToUsername) {
   error(404);
@@ -43,7 +43,7 @@ switch ($Type) {
     $DB->query("
       SELECT Username
       FROM users_main
-      WHERE ID = $ThingID");
+      WHERE ID = ?", $ThingID);
     if (!$DB->has_results()) {
       $Error = 'No user with the reported ID found';
     } else {
@@ -57,7 +57,7 @@ switch ($Type) {
     $DB->query("
       SELECT Title
       FROM requests
-      WHERE ID = $ThingID");
+      WHERE ID = ?", $ThingID);
     if (!$DB->has_results()) {
       $Error = 'No request with the reported ID found';
     } else {
@@ -70,7 +70,7 @@ switch ($Type) {
     $DB->query("
       SELECT Name
       FROM collages
-      WHERE ID = $ThingID");
+      WHERE ID = ?", $ThingID);
     if (!$DB->has_results()) {
       $Error = 'No collage with the reported ID found';
     } else {
@@ -83,7 +83,7 @@ switch ($Type) {
     $DB->query("
       SELECT Title
       FROM forums_topics
-      WHERE ID = $ThingID");
+      WHERE ID = ?", $ThingID);
     if (!$DB->has_results()) {
       $Error = 'No forum thread with the reported ID found';
     } else {
@@ -110,7 +110,7 @@ switch ($Type) {
             AND p2.ID <= p.ID
         ) AS PostNum
       FROM forums_posts AS p
-      WHERE p.ID = $ThingID");
+      WHERE p.ID = ?", $ThingID);
     if (!$DB->has_results()) {
       $Error = 'No forum post with the reported ID found';
     } else {
@@ -123,7 +123,7 @@ switch ($Type) {
     $DB->query("
       SELECT 1
       FROM comments
-      WHERE ID = $ThingID");
+      WHERE ID = ?", $ThingID);
     if (!$DB->has_results()) {
       $Error = 'No comment with the reported ID found';
     } else {
@@ -142,7 +142,7 @@ if (isset($Error)) {
 $DB->query("
   SELECT Reason
   FROM reports
-  WHERE ID = $ReportID");
+  WHERE ID = ?", $ReportID);
 list($Reason) = $DB->next_record();
 
 $Body = "You reported $TypeLink for the reason:\n[quote]{$Reason}[/quote]";

sections/reportsv2/report.php

@@ -32,10 +32,10 @@ if (!isset($_GET['id']) || !is_number($_GET['id'])) {
   }
 
   // Group details
-  list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameJP, $GroupYear,
-    $GroupStudio, $GroupSeries, $GroupCatalogueNumber, $GroupCategoryID,
-    $GroupDLSite, $GroupTime, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
-    $Screenshots, $GroupFlags) = array_values($GroupDetails);
+  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

sections/requests/new_edit.php

@@ -158,7 +158,7 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
 <?
       }
     } else {
-?>            <input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" onblur="CheckVA();" <?=$Disabled?>/>
+?>            <input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" <?=$Disabled?>/>
 <? if (empty($Disabled)) { ?>
             <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
 <? } ?>

sections/requests/take_new_edit.php

@@ -252,8 +252,8 @@ if ($NewRequest) {
     UPDATE requests
     SET CategoryID = $CategoryID,
       Title = '".db_string($Title)."',
-      TitleRJ = '".db_string($TitleRJ)."',
-      TitleJP = '".db_string($TitleJP)."',
+      TitleRJ = '".db_string($TitleRJ??"")."',
+      TitleJP = '".db_string($TitleJP??"")."',
       Image = '".db_string($Image)."',
       Description = '".db_string($Description)."',
       CatalogueNumber = '".db_string($CatalogueNumber)."',

sections/rules/upload.php

@@ -394,7 +394,6 @@ View::show_header('Uploading Rules', 'rules');
             <li id="r5.1.2"><a href="#5.1"><strong>&uarr;</strong></a> <a href="#5.1.2">5.1.2.</a>
               <strong>Some examples of acceptable content are:</strong>
               <ul>
-                <li>Erotic Audio</li>
                 <li>Official Image Packs</li>
                 <li>Sex Manuals</li>
               </ul>
@@ -405,7 +404,7 @@ View::show_header('Uploading Rules', 'rules');
           </ul>
         </div>
 
-      <h5 id="h5.3"><a href="#h5.3k"><strong>&uarr;</strong></a> <a href="#h5.3">5.3.</a> Duplicates &amp; Trumping</h5>
+      <h5 id="h5.2"><a href="#h5.2k"><strong>&uarr;</strong></a> <a href="#h5.2">5.2.</a> Duplicates &amp; Trumping</h5>
         <div class="box pad" style="padding: 10px 10px 10px 20px;">
           <ul>
             <li id="r5.2.1"><a href="#5.2"><strong>&uarr;</strong></a> <a href="#5.2.1">5.2.1.</a>

sections/schedule/hourly/bonus_points.php

@@ -3,6 +3,7 @@
 
 $getUsers = $DB->query("
   SELECT um.ID,
+         um.BonusPoints,
          COUNT(DISTINCT x.fid) AS Torrents,
          SUM(t.Size) AS Size,
          SUM(xs.seedtime) AS Seedtime,
@@ -21,11 +22,14 @@ $getUsers = $DB->query("
   GROUP BY um.ID");
 if ($DB->has_results()) {
   $QueryPart = '';
-  while (list($UserID, $NumTorr, $TSize, $TTime, $TSeeds) = $DB->next_record()) {
-    $Points = intval((0.5 + (0.55*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3)))**0.95);
+  while (list($UserID, $BonusPoints, $NumTorr, $TSize, $TTime, $TSeeds) = $DB->next_record()) {
+    $Points = (0.5 + (0.55*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3)))**0.95;
+    $Points = intval(max(min($Points, ($Points * 2) - ($BonusPoints/1440)), 0));
     if ($Points > 100000) $Points = 0;
-    $QueryPart .= "WHEN $UserID THEN BonusPoints+$Points ";
-    $Cache->delete_value('user_info_heavy_'.$UserID);
+    if ($Points > 0) {
+      $QueryPart .= "WHEN $UserID THEN BonusPoints+$Points ";
+      $Cache->delete_value('user_info_heavy_'.$UserID);
+    }
   }
 
   $DB->query("

sections/schedule/index.php

@@ -27,7 +27,7 @@ function run_all_in($Dir) {
   }
 }
 
-if ((!isset($_REQUEST['key']) || $_REQUEST['key'] != SCHEDULE_KEY) && !$AS) {
+if ((!isset($_REQUEST['key']) || $_REQUEST['key'] != SCHEDULE_KEY) && (!isset($argv[1]) || $argv[1] != SCHEDULE_KEY) && !$AS) {
   error(403);
 }
 

sections/store/100k_points.php

@@ -2,6 +2,9 @@
 $Purchase = "100,000 bonus points";
 $UserID = $LoggedUser['ID'];
 
+$GiB = 1024 * 1024 * 1024;
+$Cost = 130 * $GiB;
+
 $DB->query("
   SELECT Uploaded
   FROM users_main
@@ -9,11 +12,11 @@ $DB->query("
 if ($DB->has_results()) {
   list($Upload) = $DB->next_record();
 
-  if ($Upload >= 107374182400) {
+  if ($Upload >= $Cost) {
     $DB->query("
       UPDATE users_main
       SET BonusPoints = BonusPoints + 100000,
-          Uploaded    = Uploaded - 107374182400
+          Uploaded    = Uploaded - $Cost
       WHERE ID = $UserID");
     $DB->query("
       UPDATE users_info

sections/store/10k_points.php

@@ -2,6 +2,9 @@
 $Purchase = "10,000 bonus points";
 $UserID = $LoggedUser['ID'];
 
+$GiB = 1024 * 1024 * 1024;
+$Cost = 13 * $GiB;
+
 $DB->query("
   SELECT Uploaded
   FROM users_main
@@ -9,11 +12,11 @@ $DB->query("
 if ($DB->has_results()) {
   list($Upload) = $DB->next_record();
 
-  if ($Upload >= 10737418240) {
+  if ($Upload >= $Cost) {
     $DB->query("
       UPDATE users_main
       SET BonusPoints = BonusPoints + 10000,
-          Uploaded    = Uploaded - 10737418240
+          Uploaded    = Uploaded - $Cost
       WHERE ID = $UserID");
     $DB->query("
       UPDATE users_info

sections/store/1k_points.php

@@ -2,6 +2,9 @@
 $Purchase = "1,000 bonus points";
 $UserID = $LoggedUser['ID'];
 
+$GiB = 1024 * 1024 * 1024;
+$Cost = intval(1.3 * $GiB);
+
 $DB->query("
   SELECT Uploaded
   FROM users_main
@@ -9,11 +12,11 @@ $DB->query("
 if ($DB->has_results()) {
   list($Upload) = $DB->next_record();
 
-  if ($Upload >= 1073741824) {
+  if ($Upload >= $Cost) {
     $DB->query("
       UPDATE users_main
       SET BonusPoints = BonusPoints + 1000,
-          Uploaded    = Uploaded - 1073741824
+          Uploaded    = Uploaded - $Cost
       WHERE ID = $UserID");
     $DB->query("
       UPDATE users_info

sections/store/1m_points.php

@@ -3,6 +3,7 @@ $Purchase = "1,000,000 bonus points";
 $UserID = $LoggedUser['ID'];
 
 $GiB = 1024*1024*1024;
+$Cost = 1300 * $GiB;
 
 $DB->query("
   SELECT Uploaded
@@ -11,11 +12,11 @@ $DB->query("
 if ($DB->has_results()) {
   list($Upload) = $DB->next_record();
 
-  if ($Upload >= 1000*$GiB) {
+  if ($Upload >= $Cost) {
     $DB->query("
       UPDATE users_main
       SET BonusPoints = BonusPoints + 1000000,
-          Uploaded    = Uploaded - ".(1000*$GiB)."
+          Uploaded    = Uploaded - $Cost
       WHERE ID = $UserID");
     $DB->query("
       UPDATE users_info

sections/store/store.php

@@ -3,9 +3,10 @@ $UserID = $LoggedUser['ID'];
 $PermID = $LoggedUser['PermissionID'];
 
 if (!$LoggedUser['DisablePoints']) {
-  $PointsRate = 0.5;
+  $PointsRate = 0;
   $getTorrents = $DB->query("
-    SELECT COUNT(DISTINCT x.fid) AS Torrents,
+    SELECT um.BonusPoints,
+           COUNT(DISTINCT x.fid) AS Torrents,
            SUM(t.Size) AS Size,
            SUM(xs.seedtime) AS Seedtime,
            SUM(t.Seeders) AS Seeders
@@ -22,10 +23,10 @@ if (!$LoggedUser['DisablePoints']) {
       AND x.Remaining = 0
     GROUP BY um.ID", $UserID);
   if ($DB->has_results()) {
-    list($NumTorr, $TSize, $TTime, $TSeeds) = $DB->next_record();
-    $PointsRate += (0.55*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3));
+    list($BonusPoints, $NumTorr, $TSize, $TTime, $TSeeds) = $DB->next_record();
+    $PointsRate = (0.5 + (0.55*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3)))**0.95;
   }
-  $PointsRate = intval($PointsRate**0.95);
+  $PointsRate = intval(max(min($PointsRate, ($PointsRate * 2) - ($BonusPoints/1440)), 0));
   $PointsPerHour = number_format($PointsRate) . " ".BONUS_POINTS."/hour";
   $PointsPerDay = number_format($PointsRate*24) . " ".BONUS_POINTS."/day";
 } else {
@@ -52,7 +53,7 @@ View::show_header('Store');
           <a href="store.php?item=upload_1GB">1GiB Upload</a>
         </td>
         <td class="nobr">
-          1,000 <?=BONUS_POINTS?>
+          1,300 <?=BONUS_POINTS?>
         </td>
         <td class="nobr">
           Purchase 1GiB of upload
@@ -63,7 +64,7 @@ View::show_header('Store');
           <a href="store.php?item=upload_10GB">10GiB Upload</a>
         </td>
         <td class="nobr">
-          10,000 <?=BONUS_POINTS?>
+          13,000 <?=BONUS_POINTS?>
         </td>
         <td class="nobr">
           Purchase 10GiB of upload
@@ -74,7 +75,7 @@ View::show_header('Store');
           <a href="store.php?item=upload_100GB">100GiB Upload</a>
         </td>
         <td class="nobr">
-          100,000 <?=BONUS_POINTS?>
+          130,000 <?=BONUS_POINTS?>
         </td>
         <td class="nobr">
           Purchase 100GiB of upload
@@ -85,7 +86,7 @@ View::show_header('Store');
           <a href="store.php?item=upload_1000GB">1,000GiB Upload</a>
         </td>
         <td class="nobr">
-          1,000,000 <?=BONUS_POINTS?>
+          1,300,000 <?=BONUS_POINTS?>
         </td>
         <td class="nobr">
           Purchase 1,000GiB of upload
@@ -96,7 +97,7 @@ View::show_header('Store');
           <a href="store.php?item=1k_points">1,000 <?=BONUS_POINTS?></a>
         </td>
         <td class="nobr">
-          1GiB Upload
+          1.3GiB Upload
         </td>
         <td class="nobr">
           Purchase 1,000 <?=BONUS_POINTS?>
@@ -107,7 +108,7 @@ View::show_header('Store');
           <a href="store.php?item=10k_points">10,000 <?=BONUS_POINTS?></a>
         </td>
         <td class="nobr">
-          10GiB Upload
+          13GiB Upload
         </td>
         <td class="nobr">
           Purchase 10,000 <?=BONUS_POINTS?>
@@ -118,7 +119,7 @@ View::show_header('Store');
           <a href="store.php?item=100k_points">100,000 <?=BONUS_POINTS?></a>
         </td>
         <td class="nobr">
-          100GiB Upload
+          130GiB Upload
         </td>
         <td class="nobr">
           Purchase 100,000 <?=BONUS_POINTS?>
@@ -129,7 +130,7 @@ View::show_header('Store');
           <a href="store.php?item=1m_points">1,000,000 <?=BONUS_POINTS?></a>
         </td>
         <td class="nobr">
-          1,000GiB Upload
+          1,300GiB Upload
         </td>
         <td class="nobr">
           Purchase 1,000,000 <?=BONUS_POINTS?>

sections/store/upload_1000GB.php

@@ -1,6 +1,7 @@
 <?
 $Purchase = "1000GiB of upload";
 $UserID = $LoggedUser['ID'];
+$Cost = 1300000;
 
 $DB->query("
   SELECT BonusPoints
@@ -9,10 +10,10 @@ $DB->query("
 if ($DB->has_results()) {
   list($Points) = $DB->next_record();
 
-  if ($Points >= 1000000) {
+  if ($Points >= $Cost) {
     $DB->query("
       UPDATE users_main
-      SET BonusPoints = BonusPoints - 1000000,
+      SET BonusPoints = BonusPoints - $Cost,
           Uploaded    = Uploaded + 1073741824000
       WHERE ID = $UserID");
     $DB->query("

sections/store/upload_100GB.php

@@ -1,6 +1,7 @@
 <?
 $Purchase = "100GiB of upload";
 $UserID = $LoggedUser['ID'];
+$Cost = 130000;
 
 $DB->query("
   SELECT BonusPoints
@@ -9,10 +10,10 @@ $DB->query("
 if ($DB->has_results()) {
   list($Points) = $DB->next_record();
 
-  if ($Points >= 100000) {
+  if ($Points >= $Cost) {
     $DB->query("
       UPDATE users_main
-      SET BonusPoints = BonusPoints - 100000,
+      SET BonusPoints = BonusPoints - $Cost,
           Uploaded    = Uploaded + 107374182400
       WHERE ID = $UserID");
     $DB->query("

sections/store/upload_10GB.php

@@ -1,6 +1,7 @@
 <?
 $Purchase = "10GiB of upload";
 $UserID = $LoggedUser['ID'];
+$Cost = 13000;
 
 $DB->query("
   SELECT BonusPoints
@@ -9,10 +10,10 @@ $DB->query("
 if ($DB->has_results()) {
   list($Points) = $DB->next_record();
 
-  if ($Points >= 10000) {
+  if ($Points >= $Cost) {
     $DB->query("
       UPDATE users_main
-      SET BonusPoints = BonusPoints - 10000,
+      SET BonusPoints = BonusPoints - $Cost,
           Uploaded    = Uploaded + 10737418240
       WHERE ID = $UserID");
     $DB->query("

sections/store/upload_1GB.php

@@ -1,6 +1,7 @@
 <?
 $Purchase = "1GiB of upload";
 $UserID = $LoggedUser['ID'];
+$Cost = 1300;
 
 $DB->query("
   SELECT BonusPoints
@@ -9,10 +10,10 @@ $DB->query("
 if ($DB->has_results()) {
   list($Points) = $DB->next_record();
 
-  if ($Points >= 1000) {
+  if ($Points >= $Cost) {
     $DB->query("
       UPDATE users_main
-      SET BonusPoints = BonusPoints - 1000,
+      SET BonusPoints = BonusPoints - $Cost,
           Uploaded    = Uploaded + 1073741824
       WHERE ID = $UserID");
     $DB->query("

sections/tools/development/misc_values.php

@@ -40,7 +40,7 @@ if (isset($_POST['submit'])) {
   $Name = db_string($_POST['name']);
         $DB->query("DELETE FROM misc WHERE Name = '" . $Name . "'");
     } else {
-        $Val->SetFields('name', '1', 'regex', 'The name must be separated by underscores. No spaces are allowed.', array('regex' => '/^[a-z][_a-z0-9]{0,63}$/i'));
+        $Val->SetFields('name', '1', 'regex', 'The name must be separated by underscores. No spaces are allowed.', array('regex' => '/^[a-z][:_a-z0-9]{0,63}$/i'));
         $Val->SetFields('first', '1', 'string', 'You must specify the first value.');
         $Val->SetFields('second', '1', 'string', 'You must specify the second value.');
 

sections/tools/managers/enable_requests.php

@@ -312,9 +312,9 @@ if ($NumResults > 0) { ?>
 ?>
     </div>
 <div style="padding-bottom: 11px;">
-    <input type="submit" id="outcome" value="Approve Selected" />
-    <input type="submit" id="outcome" value="Reject Selected" />
-    <input type="submit" id="outcome" value="Discard Selected" />
+    <input type="submit" id="multi" value="Approve Selected" />
+    <input type="submit" id="multi" value="Reject Selected" />
+    <input type="submit" id="multi" value="Discard Selected" />
 </div>
 <? } else { ?>
     <h2 align="center">No new pending auto enable requests<?=($_GET['view'] == 'main') ? '' : ' in this view'?></h2>

sections/tools/misc/tags.php

@@ -5,18 +5,19 @@ if (!check_perms('users_mod')) {
 }
 
 // validation functions
-$Val->SetFields('tag', true, 'string', 'Enter a single tag to search for.', array('maxlength'=>'200', 'minlength'=>'2'));
-$Val->SetFields('replace', true, 'string', 'Enter a single replacement tag.', array('maxlength'=>'200', 'minlength'=>'2'));
+$Val->SetFields('tag', true, 'string', 'Enter a single tag to search for.', ['maxlength'=>'200', 'minlength'=>'2']);
+$Val->SetFields('replace', false, 'string', 'Enter a single replacement tag.', ['maxlength'=>'200', 'minlength'=>'2']);
 
 echo $Val->GenerateJS('tagform');
 
 // some constants to make programmers' lives easier
 define('MODE_RENAME', 0);
 define('MODE_MERGE', 1);
+define('MODE_DELETE', 2);
 
 ?>
 <div class="thin">
-  <h3>Merge/Rename Tags</h3>
+  <h3>Merge/Rename/Delete Tags</h3>
   <form action="tools.php" method="get" name="tagform" id="tagform" onsubmit="return formVal();">
     <input type="hidden" name="action" value="edit_tags" />
     <table>
@@ -28,7 +29,7 @@ define('MODE_MERGE', 1);
           <input type="text" name="tag" id="tag" />
         </td>
         <td class="label">
-          Rename to/merge with tag:
+          Rename to/merge with tag (empty to delete):
         </td>
         <td>
           <input type="text" name="replace" id="replace" />
@@ -39,7 +40,7 @@ define('MODE_MERGE', 1);
       </tr>
       <tr>
         <td class="center" colspan="5">
-          <input type="submit" value="Rename/Merge Tags" />
+          <input type="submit" value="Process Tag" />
         </td>
       </tr>
     </table>
@@ -74,8 +75,8 @@ if (isset($_GET['tag']) || isset($_GET['replace'])) {
     $DB->query("
       SELECT ID
       FROM tags
-      WHERE Name = '$Tag'
-      LIMIT 1;");
+      WHERE Name = ?
+      LIMIT 1", $Tag);
     if (!$DB->has_results()) {
       echo "
         <div class=\"box pad center\">
@@ -88,17 +89,22 @@ if (isset($_GET['tag']) || isset($_GET['replace'])) {
     list($TagID) = $DB->next_record();
 
     // 2) check if replacement exists
-    $DB->query("
-      SELECT ID
-      FROM tags
-      WHERE Name = '$Replacement'
-      LIMIT 1;");
-    if (!$DB->has_results() ) {
-      $Mode = MODE_RENAME;
+    $ReplacementID = null;
+    if ($Replacement) {
+      $DB->query("
+        SELECT ID
+        FROM tags
+        WHERE Name = ?
+        LIMIT 1", $Replacement);
+      if (!$DB->has_results() ) {
+        $Mode = MODE_RENAME;
+        list($ReplacementID) = $DB->next_record();
+      } else {
+        $Mode = MODE_MERGE;
+      }
     } else {
-      $Mode = MODE_MERGE;
+      $Mode = MODE_DELETE;
     }
-    list($ReplacementID) = $DB->next_record();
 
     if ($_GET['list']) {
       $AffectedTorrents = [];
@@ -113,7 +119,7 @@ if (isset($_GET['tag']) || isset($_GET['replace'])) {
           LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID
           LEFT JOIN artists_group AS ag ON ag.ArtistID = ta.ArtistID
           JOIN torrents_tags AS t ON t.GroupID = tg.ID
-        WHERE t.TagID = $TagID;");
+        WHERE t.TagID = ?", $TagID);
       while (list($TorrentID, $ArtistID, $ArtistName, $TorrentName) = $DB->next_record()) {
         $Row = ($ArtistName ? "<a href=\"artist.php?id=$ArtistID\">$ArtistName</a> - " : '');
         $Row.= "<a href=\"torrents.php?id=$TorrentID\">".display_str($TorrentName).'</a>';
@@ -131,7 +137,7 @@ if (isset($_GET['tag']) || isset($_GET['replace'])) {
           LEFT JOIN requests_artists AS ra ON r.ID = ra.RequestID
           LEFT JOIN artists_group AS ag ON ag.ArtistID = ra.ArtistID
           JOIN requests_tags AS t ON t.RequestID = r.ID
-        WHERE t.TagID = $TagID;");
+        WHERE t.TagID = ?", $TagID);
       while (list($RequestID, $ArtistID, $ArtistName, $RequestName) = $DB->next_record()) {
         $Row = ($ArtistName ? "<a href=\"artist.php?id=$ArtistID\">$ArtistName</a> - " : '');
         $Row.= "<a href=\"requests.php?action=viewrequest&amp;id=$RequestID\">".display_str($RequestName).'</a>';
@@ -160,7 +166,32 @@ if (isset($_GET['tag']) || isset($_GET['replace'])) {
           Torrents::update_hash($GroupID);
         }
       }
-    } else {
+    } elseif ($Mode == MODE_DELETE) {
+      // EASY! just delete the tag
+      // 5) delete the tag
+      $DB->query("
+        DELETE FROM tags
+        WHERE ID = ?", $TagID);
+
+      // 6) get a list of the affected groups
+      $DB->query("
+        SELECT GroupID
+        FROM torrents_tags
+        WHERE TagID = ?", $TagID);
+      $AffectedGroups = $DB->to_array();
+
+      // 7) remove the tag from the groups
+      $DB->query("
+        DELETE FROM torrents_tags
+        WHERE TagID = ?", $TagID);
+      $TotalAffected = $DB->affected_rows();
+
+      // 8) update the newly tagless groups
+      foreach ($AffectedGroups as $AffectedGroup) {
+        list($GroupID) = $AffectedGroup;
+        Torrents::update_hash($GroupID);
+      }
+    } elseif ($Mode == MODE_MERGE) {
       // HARD! merge two tags together and update usage
       // 5) remove dupe tags from torrents
       //  (torrents that have both "old tag" and "replacement tag" set)

sections/torrents/details.php

@@ -506,7 +506,7 @@ foreach ($TorrentList as $Torrent) {
   if (!empty(G::$LoggedUser) && (G::$LoggedUser['ShowMagnets'] ?? false)) {
     if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
       $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
-      $Tor = new BencodeTorrent($TorrentFile);
+      $Tor = new BencodeTorrent($TorrentFile, false, false);
       $TorrentFileName = $Tor->Dec['info']['name'];
       $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
     }

sections/torrents/edit.php

@@ -65,7 +65,7 @@ if (($LoggedUser['ID'] != $Properties['UserID'] && !check_perms('torrents_edit')
   error(403);
 }
 
-View::show_header('Edit torrent', 'upload,torrent');
+View::show_header('Edit torrent', 'upload,torrent,bbcode');
 
 $TorrentForm = new TorrentForm($Properties, $Err, false);
 

sections/torrents/editgroup.php

@@ -64,13 +64,13 @@ if (!$Body) {
   $Image = $WikiImage;
 }
 
-View::show_header('Edit torrent group', 'upload');
+View::show_header('Edit torrent group', 'upload,bbcode');
 
 // Start printing form
 ?>
 <div class="thin">
   <div class="header">
-    <h2>Edit <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></h2>
+    <h2>Edit <a href="torrents.php?id=<?=$GroupID?>"><?=($Name ? $Name : ($NameRJ ? $NameRJ : $NameJP))?></a></h2>
   </div>
   <div class="box pad">
     <form class="edit_form" name="torrent_group" action="torrents.php" method="post">
@@ -81,22 +81,8 @@ View::show_header('Edit torrent group', 'upload');
         <h3>Image:</h3>
         <input type="text" name="image" size="92" value="<?=$Image?>" /><br />
         <h3>Torrent group description:</h3>
-        <textarea name="body" cols="91" rows="20"><?=$Body?></textarea><br />
-<?/*  if ($CategoryID == 1) { ?>
-        <h3>Release type:
-          <select id="releasetype" name="releasetype">
-<?    foreach ($ReleaseTypes as $Key => $Val) { ?>
-            <option value="<?=$Key?>"<?=($Key == $ReleaseType ? ' selected="selected"' : '')?>><?=$Val?></option>
-<?    } ?>
-          </select>
-        </h3>
-<?    if (check_perms('torrents_edit_vanityhouse')) { ?>
-        <h3>
-          <label>Vanity House: <input type="checkbox" name="vanity_house" value="1" <?=($VanityHouse ? 'checked="checked" ' : '')?>/></label>
-        </h3>
+        <textarea class="bbcode_editor" name="body" cols="91" rows="20"><?=$Body?></textarea><br />
 <?
-    }
-  }*/
   $DB->query("
     SELECT UserID
     FROM torrents

sections/torrents/functions.php

@@ -413,7 +413,17 @@ function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $G
         <tr class="<?=(isset($ReleaseType)?'releases_'.$ReleaseType:'')?> groupid_<?=($GroupID)?> edition_<?=($EditionID)?> torrentdetails pad<? if (!isset($_GET['torrentid']) || $_GET['torrentid'] != $TorrentID) { ?> hidden<? } ?>" id="torrent_<?=($TorrentID)?>">
           <td colspan="5">
             <blockquote>
-              Uploaded by <?=(Users::format_username($UserID, false, false, false))?> <?=time_diff($TorrentTime);?>
+              Uploaded by <?
+  if ($Anonymous) {
+    if (check_perms('users_mod')) { ?>
+      <em class="tooltip" title="<?=Users::user_info($UserID)['Username']?>">Anonymous</em>
+<?  } else {
+      ?><em>Anonymous</em><?
+    }
+  } else {
+    print (Users::format_username($UserID, false, false, false));
+  }
+?> <?=time_diff($TorrentTime);?>
 <?  if ($Seeders == 0) {
     if ($LastActive && time() - strtotime($LastActive) >= 1209600) { ?>
                 <br /><strong>Last active: <?=time_diff($LastActive);?></strong>

sections/torrents/notify.php

@@ -248,6 +248,7 @@ if (empty($Results)) {
         // If $GroupInfo['ID'] is unset, the torrent group associated with the torrent doesn't exist
         continue;
       }
+      $GroupName = empty($GroupInfo['Name']) ? (empty($GroupInfo['NameRJ']) ? $GroupInfo['NameJP'] : $GroupInfo['NameRJ']) : $GroupInfo['Name'];
       $TorrentInfo = $GroupInfo['Torrents'][$TorrentID];
       // generate torrent's title
       $DisplayName = '';
@@ -267,7 +268,7 @@ if (empty($Results)) {
       if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
          $DisplayName .= 'data-cover="'.ImageTools::process($GroupInfo['WikiImage'], 'thumb').'" ';
       }
-      $DisplayName .= "class=\"tooltip\" title=\"View torrent\" dir=\"ltr\">" . $GroupInfo['Name'] . '</a>';
+      $DisplayName .= "class=\"tooltip\" title=\"View torrent\" dir=\"ltr\">" . $GroupName . '</a>';
 
       $GroupCategoryID = $GroupInfo['CategoryID'];
 /*

sections/upload/upload_handle.php

@@ -92,11 +92,11 @@ if (isset($Properties['GroupID'])) {
 
 if ($Type == 'Movies' || $Type == 'Manga' || $Type == 'Anime' || $Type == 'Games') {
   if (empty($_POST['idols'])) {
-    $Err = "You didn't enter any goils";
+    $Err = "You didn't enter any artists/idols";
   } else {
     $Artists = $_POST['idols'];
   }
-} elseif ($Type == 'Other') {
+} else {
   if (!empty($_POST['idols'])) {
     $Artists = $_POST['idols'];
   }
@@ -211,8 +211,8 @@ if (empty($Properties['GroupID']) && empty($ArtistForm)) {
     SELECT ta.ArtistID, ag.Name
     FROM torrents_artists AS ta
       JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
-    WHERE ta.GroupID = ".$Properties['GroupID']."
-    ORDER BY ag.Name ASC;");
+    WHERE ta.GroupID = ?
+    ORDER BY ag.Name ASC", $Properties['GroupID']);
   $ArtistForm = [];
   while (list($ArtistID, $ArtistName) = $DB->next_record(MYSQLI_BOTH, false)) {
     array_push($ArtistForm, array('id' => $ArtistID, 'name' => display_str($ArtistName)));
@@ -468,6 +468,9 @@ if (!$T['GroupID']) {
 
 
 // Use this section to control freeleeches
+$T['FreeTorrent'] = '0';
+$T['FreeLeechType'] = '0';
+
 $DB->query("
   SELECT Name, First, Second
   FROM misc
@@ -481,9 +484,6 @@ if ($DB->has_results()) {
       break;
     }
   }
-} else {
-  $T['FreeTorrent'] = '0';
-  $T['FreeLeechType'] = '0';
 }
 
 // movie and anime ISOs are neutral leech, and receive a BP bounty
@@ -525,7 +525,7 @@ $Debug->set_flag('upload: ocelot updated');
 $Cache->cache_value("torrent_{$TorrentID}_lock", true, 600);
 
 //give BP if necessary
-if (($Type == "Movies" || $Type == "Anime") && ($T['Container'] == "'ISO'" || $T['Container'] == "'M2TS'" || $T['Container'] == "'VOB IFO'")) {
+if (($Type == "Movies" || $Type == "Anime") && ($T['Container'] == 'ISO' || $T['Container'] == 'M2TS' || $T['Container'] == 'VOB IFO')) {
   $BPAmt = (int) 2*($TotalSize / (1024*1024*1024))*1000;
 
   $DB->query("

sections/user/invite.php

@@ -108,7 +108,7 @@ View::show_header('Invites', $JSIncludes);
       <a href="user.php?action=invitetree<? if ($Sneaky) { echo '&amp;userid='.$UserID; } ?>" class="brackets">Invite tree</a>
     </div>
   </div>
-<? if ($UserCount >= USER_LIMIT && USER_LIMIT != 0 && !check_perms('site_can_invite_always')) { ?>
+<? if ($UserCount >= USER_LIMIT && !check_perms('site_can_invite_always')) { ?>
   <div class="box pad notice">
     <p>Because the user limit has been reached you are unable to send invites at this time.</p>
   </div>

sections/user/user.php

@@ -237,7 +237,7 @@ if (check_perms('admin_manage_permissions', $Class)) {
     <a href="user.php?action=permissions&amp;userid=<?=$UserID?>" class="brackets">Permissions</a>
 <?
 }
-if (check_perms('users_view_ips', $Class)) {
+if ($LoggedUser['ID'] == $UserID || check_perms('users_view_ips', $Class)) {
 ?>
     <a href="user.php?action=sessions&amp;userid=<?=$UserID?>" class="brackets">Sessions</a>
 <?
@@ -1178,7 +1178,7 @@ if (check_perms('users_mod', $Class)) { ?>
           <input type="text" size="20" name="BonusPoints" value="<?=$BonusPoints?>" />
 <?
 if (!$DisablePoints) {
-  $PointsRate = 0.5;
+  $PointsRate = 0;
   $getTorrents = $DB->query("
     SELECT COUNT(DISTINCT x.fid) AS Torrents,
            SUM(t.Size) AS Size,
@@ -1198,9 +1198,9 @@ if (!$DisablePoints) {
     GROUP BY um.ID");
   if ($DB->has_results()) {
     list($NumTorr, $TSize, $TTime, $TSeeds) = $DB->next_record();
-    $PointsRate += (0.67*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3));
+    $PointsRate = (0.5 + (0.55*($NumTorr * (sqrt(($TSize/$NumTorr)/1073741824) * pow(1.5,($TTime/$NumTorr)/(24*365))))) / (max(1, sqrt(($TSeeds/$NumTorr)+4)/3)))**0.95;
   }
-  $PointsRate = intval($PointsRate**0.95);
+  $PointsRate = intval(max(min($PointsRate, ($PointsRate * 2) - ($BonusPoints/1440)), 0));
   $PointsPerHour = number_format($PointsRate)." ".BONUS_POINTS."/hour";
   $PointsPerDay = number_format($PointsRate*24)." ".BONUS_POINTS."/day";
 } else {

sections/userhistory/email_history_userview.php

@@ -55,7 +55,7 @@ if (!$Self) {
   <h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
 <? } ?>
 </div>
-<table width="100%">
+<table class="alternate_rows" width="100%">
   <tr class="colhead">
     <td>Email</td>
     <td>Expunge</td>

sections/userhistory/ip_history_userview.php

@@ -55,7 +55,7 @@ if (!$Self) {
   <h2>IP history for <a href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
 <? } ?>
 </div>
-<table width="100%">
+<table class="alternate_rows" width="100%">
   <tr class="colhead">
     <td>IP</td>
     <td>Expunge</td>

sections/userhistory/subscribed_collages.php

@@ -167,7 +167,12 @@ if (!$NumResults) {
         $TorrentID = key($Torrents);
         $Torrent = current($Torrents);
 
-        $DisplayName = "<a class=\"torrent_title\" href=\"torrents.php?id=$GroupID\" ";
+        $DisplayName = '';
+
+        if (isset($Artists)) {
+          $DisplayName .= '<div class="torrent_artists">'.Artists::display_artists($Artists).'</div> ';
+        }
+        $DisplayName .= "<a class=\"torrent_title\" href=\"torrents.php?id=$GroupID\" ";
         if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
           $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage).'" ';
         }

sections/userhistory/subscriptions.php

@@ -230,7 +230,7 @@ if (!$NumResults) {
     <tr class="row<?=$ShowCollapsed ? ' hidden' : '' ?>">
 <?      if (Users::has_avatars_enabled()) { ?>
       <td class="avatar" valign="top">
-        <?=Users::show_avatar($Result['LastReadAvatar'], $Result['LastReadUsername'], $HeavyInfo['DisableAvatars'])?>
+        <?=Users::show_avatar($Result['LastReadAvatar'], $Result['LastReadUserID'], $Result['LastReadUsername'], $HeavyInfo['DisableAvatars'])?>
       </td>
 <?      } ?>
       <td class="body" valign="top">

sections/wiki/article.php

@@ -48,7 +48,7 @@ View::show_header($Title,'wiki,bbcode');
     <div class="linkbox">
       <a href="wiki.php?action=create" class="brackets">Create</a>
 <? if ($Edit <= $LoggedUser['EffectiveClass']) { ?>
-      <a href="wiki.php?action=edit&amp;id=<?=$ArticleID?>" class="brackets">Contribute</a>
+      <a href="wiki.php?action=edit&amp;id=<?=$ArticleID?>" class="brackets">Edit</a>
       <a href="wiki.php?action=revisions&amp;id=<?=$ArticleID?>" class="brackets">History</a>
 <? } ?>
 <? if (check_perms('admin_manage_wiki') && $_GET['id'] != INDEX_ARTICLE) { ?>

static/functions/browse.js

@@ -274,10 +274,3 @@ function ToggleEditionRows() {
   $('#edition_label').gtoggle();
   $('#edition_catalogue').gtoggle();
 }
-
-$(function() {
-  if (!$('.group').length) {
-    var els = $('#torrent_table.grouping .colhead td:first-child(), #torrent_table.grouping .colhead_dark td:first-child(), #torrent_table.grouping .torrent td:first-child()')
-    for (var i = 0; i < els.length; i++) { els[i].style.display = 'none' }
-  }
-})

static/functions/comments.js

@@ -401,6 +401,7 @@ $(document).ready(function() {
               par.raw().style.height = par.height()+'px'
           }
       })
+      if (this.complete) $(this).load()
     }
 
   })

static/functions/global.js

@@ -29,7 +29,7 @@ function ratio(a, b) {
 
 function save_message(message, err = false) {
   var messageDiv = document.createElement("div");
-  messageDiv.className = err ? "error_message" : "save_message";
+  messageDiv.className = err ? "error_message box" : "save_message box";
   messageDiv.innerHTML = message;
   $("#content").raw().insertBefore(messageDiv,$("#content").raw().firstChild);
 }
@@ -360,3 +360,13 @@ $(function() {
     lightbox.init((e.target.attributes['lightbox-img']||[]).value||e.target.src, (e.target.attributes['lightbox-size']||[]).value||e.target.width)
   })
 })
+
+/*
+if ('serviceWorker' in navigator) {
+  navigator.serviceWorker.register('sw.js').then(reg => {
+    reg.update()
+  }).catch(err => {
+    console.log("Failed to register service worker: ", err)
+  })
+}
+*/

static/functions/reports.js

@@ -10,7 +10,6 @@ function toggleNotes(id) {
 
 function saveNotes(id) {
   var notes = $('#notes_' + id).raw().value;
-  notes = notes.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '<br />');
   var post = new Array();
   post['id'] = id;
   post['notes'] = notes;

static/functions/requests.js

@@ -139,6 +139,10 @@ function Categories() {
     $('#artist_tr').gshow();
     $('#dlsiteid_tr').gshow();
     $('#cataloguenumber_tr').ghide();
+  } else if (cat == "Audio") {
+    $('#artist_tr').gshow();
+    $('#dlsiteid_tr').ghide();
+    $('#cataloguenumber_tr').ghide();
   } else {
     $('#artist_tr').ghide();
     $('#cataloguenumber_tr').ghide();

static/functions/u2f.js

@@ -498,7 +498,7 @@ $(function() {
     var req = JSON.parse($('[name="u2f-request"]').raw().value);
     var sigs = JSON.parse($('[name="u2f-sigs"]').raw().value);
     if (req) {
-      u2f.register(req.appID, [req], sigs, function(data) {
+      u2f.register(req.appId, [req], sigs, function(data) {
         if (data.errorCode) {
           console.log('U2F Register Error: ' + Object.keys(u2f.ErrorCodes).find(k => u2f.ErrorCodes[k] == data.errorCode));
           return;

static/functions/upload.js

@@ -65,6 +65,17 @@ function Categories() {
     'screenshots': {name: 'Screenshots', notes: '<strong class="important_text">Promotional materials from a game\'s store page are NOT screenshots</strong>'},
     'group_desc': {notes: 'Contains information such as a description of the game, its mechanics, etc.'},
     'release_desc': {notes: 'Contains information such as <strong>version</strong>, install instructions, patching instructions, etc.'}
+  }, {
+    'idols': {name: 'Voices (Optional)'},
+    'studio': {name: 'Publisher (Optional)'},
+    'mediainfo': {},
+    'audio': {},
+    'year': false,
+    'lang': false,
+    'dlsite': {},
+    'screenshots': {name: 'Samples'},
+    'group_desc': {notes: 'Contains information such as a description of the audio work.'},
+    'release_desc': {notes: 'Contains information specific to the release.'}
   }, {
     'idols': {name: 'Creators/Authors (Optional)'},
     'studio': {name: 'Publisher (Optional)'},

static/functions/validate_upload.js

@@ -23,7 +23,7 @@ $(() => {
       soft_error('The file selected does not appear to be a .torrent file')
     }
     let mi = $('#mediainfo').raw().value
-    if (mi && (!mi.includes('General') || !mi.includes('Video'))) {
+    if (mi && (!mi.includes('General') || (!mi.includes('Video') && !mi.includes('Audio')))) {
       soft_error('Your MediaInfo does not appear to be from a valid MediaInfo utility')
     }
     if (!$('#image').raw().value) {

static/styles/beluga/style.css

@@ -18,14 +18,14 @@
   padding: 0
 }
 
-.cats_anime, .cats_movies, .cats_manga, .cats_games, .cats_other {
+.cats_anime, .cats_movies, .cats_manga, .cats_games, .cats_audio, .cats_other {
   width: 38px!important;
   height: 38px!important;
   line-height: 38px;
 }
 .group .cats_anime:after, .group .cats_movies:after,
 .group .cats_manga:after, .group .cats_games:after,
-.group .cats_other:after {
+.group .cats_audio:after, .group .cats_other:after {
   color: black!important;
 }
 .cats_anime:after {
@@ -52,6 +52,12 @@
   font-size: 16px;
 }
 .group .cats_games { background-color: #4DC593; }
+.cats_audio:after {
+  content: "AUD";
+  color: #77C5D4;
+  font-size: 18px;
+}
+.group .cats_audio { background-color: #77C5D4; }
 .cats_other:after {
   content: "OTH";
   color: #0D5968;
@@ -861,10 +867,10 @@ td {
   padding: 5px
 }
 
-td:first-child {
+#torrents .torrent_table td:first-child, td:first-child {
   padding-left: 12px;
 }
-td:last-child {
+#torrents .torrent_table td:last-child, td:last-child {
   padding-right: 12px;
 }
 
@@ -1030,7 +1036,7 @@ table.slice {
 
 .save_message {
   margin-top: 2px;
-  background-color: #93d4a2;
+  background-color: #93d4a2!important;
   text-align: center;
   color: #fff;
   padding: 10px
@@ -1192,10 +1198,8 @@ span.center_poll {
   white-space: nowrap
 }
 
-#collages .sign,#torrents .sign {
+#collages .sign, #torrents .sign {
   padding: 5px;
-  position: relative;
-  left: -5px
 }
 
 .filter_torrents {
@@ -1953,7 +1957,7 @@ a.last_read > svg {
 .forum_index td {
   position: relative;
 }
-.forum_index .row:nth-child(odd) {
+.alternate_rows .row:nth-child(odd) {
   background: #33363d;
 }
 .forum_index td.read:after, #forums td.unread:after {

static/styles/genaviv/style.css

@@ -101,7 +101,7 @@ li#nav_subscriptions.new-subscriptions a {
 .box.filter_torrents .head a:hover,.box.filter_torrents .head a:focus,.forum_post .colhead a:hover,.forum_post .colhead_dark a:focus,#inbox .box .head a:focus,#inbox .box .head a:hover {
   color:#32867d
 }
-#request_table .rowb td:first-of-type>a:nth-child(2n),#request_table .rowa td>a:nth-child(2n) {
+#request_table .row td:first-of-type > a:nth-child(2n) {
   color:#32867d
 }
 span.r99,.r09,.r10,.r20,.r30,.r40,.r50 {
@@ -687,7 +687,7 @@ form.search_form input[type="submit"],form.search_form input[type="button"] {
 .hidden,div#quickreplytext br {
   display:none
 }
-#request_table .rowb td:first-of-type>a,#request_table .rowa td>a {
+#request_table .rowa td > a {
   font-weight:600
 }
 .big_info .group_info.clear span {

static/styles/global.css

@@ -24,6 +24,10 @@
   width: 50%;
 }
 
+#contest div#content > div.flex > div.grow {
+  min-width: 50%;
+}
+
 input, textarea {
   border: 1px solid #c7c7c7;
   background-color: white;

static/styles/oppai/style.css

@@ -9,6 +9,7 @@
 .cats_movies { width: 28px; height: 28px; background: url('images/movies.png') no-repeat center center; }
 .cats_manga { width: 28px; height: 28px; background: url('images/manga.png') no-repeat center center; }
 .cats_games { width: 28px; height: 28px; background: url('images/games.png') no-repeat center center; }
+.cats_audio { width: 28px; height: 28px; background: url('images/audiobook.png') no-repeat center center; }
 .cats_other { width: 28px; height: 28px; background: url('images/other.png') no-repeat center center; }
 /* Global */
 * {
@@ -612,8 +613,7 @@ table.slice {
 }
 
 .error_message {
-  border: 1px solid #666;
-  padding: 3px 0px 3px 0px;
+  padding: 8px 0px;
   background-color: #AF2525;
   text-align: center;
   color: white;
@@ -621,11 +621,10 @@ table.slice {
 }
 
 .save_message {
-  border: 1px solid #666;
-  padding: 3px 0px 3px 0px;
-  background-color: #F4E649;
+  padding: 8px 0px;
+  background-color: #F8C2E8;
   text-align: center;
-  color: #492802;
+  color: #555555;
   font-weight: bold;
 }