This is a good place to stop

classes/artists.class.php

@@ -95,29 +95,30 @@ class Artists
         if (!empty($Artists)) {
             $ampersand = ($Escape) ? ' & ' : ' & ';
             $link = '';
-
+    
             switch (count($Artists)) {
-        case 0:
-          break;
-        case 3:
-          $link .= Artists::display_artist($Artists[2], $MakeLink, $Escape). ", ";
-        break;
-        case 2:
-          $link .= Artists::display_artist($Artists[1], $MakeLink, $Escape). ", ";
-        break;
-        case 1:
-          $link .= Artists::display_artist($Artists[0], $MakeLink, $Escape).($IncludeHyphen?' – ':'');
-          break;
-        default:
-        $link = Artists::display_artist($Artists[0], $MakeLink, $Escape).' et al.'.($IncludeHyphen?' – ':'');
-      }
-
+            case 0:
+              break;
+            case 3:
+              $link .= Artists::display_artist($Artists[2], $MakeLink, $Escape). ", ";
+              // no break
+            case 2:
+              $link .= Artists::display_artist($Artists[1], $MakeLink, $Escape). ", ";
+              // no break
+            case 1:
+              $link .= Artists::display_artist($Artists[0], $MakeLink, $Escape).($IncludeHyphen? ' – ':'');
+              break;
+            default:
+            $link = Artists::display_artist($Artists[0], $MakeLink, $Escape).'  et al.'.($IncludeHyphen? ' – ':'');
+            #$link = "Various".($IncludeHyphen?' – ':'');
+        }
+    
             return $link;
         } else {
             return '';
         }
     }
-
+    
     /**
      * Formats a single artist name.
      *

classes/torrent_form.class.php

@@ -13,6 +13,7 @@ class TorrentForm
     public $MediaManga = [];
     public $Containers = [];
     public $ContainersGames = [];
+    public $ContainersProt = [];
     public $Codecs = [];
     public $Resolutions = [];
     #var $AudioFormats = [];
@@ -32,7 +33,7 @@ class TorrentForm
         $this->Torrent = $Torrent;
         $this->Error = $Error;
 
-        global $UploadForm, $Categories, $Media,  $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $Archives;
+        global $UploadForm, $Categories, $Media,  $MediaManga, $TorrentID, $Containers, $ContainersGames, $ContainersProt, $Codecs, $Resolutions, $Archives;
         #global $UploadForm, $Categories, $Formats, $Bitrates, $Media, $MediaManga, $TorrentID, $Containers, $ContainersGames, $Codecs, $Resolutions, $AudioFormats, $Subbing, $Languages, $Platform, $Archives, $ArchivesManga;
 
         $this->UploadForm = $UploadForm;
@@ -43,6 +44,7 @@ class TorrentForm
         $this->MediaManga = $MediaManga;
         $this->Containers = $Containers;
         $this->ContainersGames = $ContainersGames;
+        $this->ContainersProt = $ContainersProt;
         $this->Codecs = $Codecs;
         $this->Resolutions = $Resolutions;
         #$this->AudioFormats = $AudioFormats;
@@ -153,10 +155,7 @@ class TorrentForm
     <table cellpadding="3" cellspacing="1" border="0" class="layout" width="100%">
 
       <tr>
-        <td class="label">
-          Torrent File
-          <strong class="important_text">*</strong>
-        </td>
+        <td class="label">Torrent File</td>
         <td><input id="file" type="file" name="file_input" size="50" /><br />
           Use the above announce URL and set the private flag in your BitTorrent client, e.g.,
           <code>mktorrent -p -a &lt;announce&gt; &lt;target folder&gt;</code>
@@ -164,10 +163,7 @@ class TorrentForm
       </tr>
 
       <tr>
-        <td class="label">
-          Type
-          <strong class="important_text">*</strong>
-        </td>
+        <td class="label">Type</td>
         <td>
           <select id="categories" name="type" onchange="Categories()" <?= ($this->DisabledFlag) ? ' disabled="disabled"' : '' ?>>
             <?php
@@ -419,9 +415,32 @@ class TorrentForm
       Original publication year
     </td>
   </tr>
+  <?php } # Ends if NewTorrent line 256?>
+
+    <!-- Encoding -->
+    <tr id="codec_tr">
+    <td class="label">
+      License
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select name="codec">
+        <option>---</option>
+        <?php
+          foreach ($this->Codecs as $Codec) {
+              echo "\t\t\t\t\t\t<option value=\"$Codec\"";
+              if ($Codec === ($Torrent['Codec'] ?? false)) {
+                  echo " selected";
+              }
+              echo ">$Codec</option>\n";
+          } ?>
+      </select><br />
+      Please see <a href="http://www.dcc.ac.uk/resources/how-guides/license-research-data" target="_blank">How to
+        License Research Data</a>
+    </td>
+  </tr>
 
   <!-- Media type -->
-  <?php } # Ends if NewTorrent line 256?>
   <tr id="media_tr">
     <td class="label">
       Platform
@@ -429,7 +448,6 @@ class TorrentForm
     </td>
     <td>
       <select name="media">
-        <option>---</option>
         <?php
           foreach ($this->Media as $Media) {
               echo "\t\t\t\t\t\t<option value=\"$Media\"";
@@ -465,6 +483,42 @@ class TorrentForm
     </td>
   </tr>
 
+    <!-- Resolution -->
+    <tr id="resolution_tr">
+    <td class="label">
+      Assembly Level
+      <strong class="important_text">*</strong>
+    </td>
+    <td>
+      <select id="ressel" name="ressel" onchange="SetResolution()">
+        <option value="">---</option>
+        <?php
+          foreach ($this->Resolutions as $Res) {
+              echo "\t\t\t\t\t\t<option value=\"$Res\"";
+              if ($Res === ($Torrent['Resolution'] ?? false)
+              || (!isset($FoundRes) && ($Torrent['Resolution'] ?? false)
+              && $Res === 'Other')) {
+                  echo " selected";
+                  $FoundRes = true;
+              }
+              echo ">$Res</option>\n";
+          } ?>
+      </select>
+
+      <input type="text" id="resolution" name="resolution" size="10" class="hidden"
+        value="<?= ($Torrent['Resolution']??'') ?>"
+        readonly>
+      </input>
+      <script>
+        if ($('#ressel').raw().value == "Other") {
+          $('#resolution').raw().readOnly = false
+          $('#resolution').gshow()
+        }
+      </script><br />
+      How complete the data is
+    </td>
+  </tr>
+
   <!-- Container -->
   <tr id="container_tr">
     <td class="label">
@@ -487,7 +541,7 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- Alternate container -->
+  <!-- Alternate container 1 -->
   <tr id="container_games_tr">
     <td class="label">
       Format
@@ -509,39 +563,25 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- Resolution -->
-  <tr id="resolution_tr">
+    <!-- Alternate container 2 -->
+    <tr id="container_prot_tr">
     <td class="label">
-      Assembly Level
+      Format
       <strong class="important_text">*</strong>
     </td>
     <td>
-      <select id="ressel" name="ressel" onchange="SetResolution()">
-        <option value="">---</option>
+      <select id="container" name="container">
+        <option value="Autofill">Autofill</option>
         <?php
-          foreach ($this->Resolutions as $Res) {
-              echo "\t\t\t\t\t\t<option value=\"$Res\"";
-              if ($Res === ($Torrent['Resolution'] ?? false)
-              || (!isset($FoundRes) && ($Torrent['Resolution'] ?? false)
-              && $Res === 'Other')) {
+          foreach ($this->ContainersProt as $Container) {
+              echo "\t\t\t\t\t\t<option value=\"$Container\"";
+              if ($Container === ($Torrent['Container'] ?? false)) {
                   echo " selected";
-                  $FoundRes = true;
               }
-              echo ">$Res</option>\n";
+              echo ">$Container</option>\n";
           } ?>
-      </select>
-
-      <input type="text" id="resolution" name="resolution" size="10" class="hidden"
-        value="<?= ($Torrent['Resolution']??'') ?>"
-        readonly>
-      </input>
-      <script>
-        if ($('#ressel').raw().value == "Other") {
-          $('#resolution').raw().readOnly = false
-          $('#resolution').gshow()
-        }
-      </script><br />
-      How complete the data is
+      </select><br />
+      Data file format, or detect from file list
     </td>
   </tr>
 
@@ -567,29 +607,6 @@ class TorrentForm
     </td>
   </tr>
 
-  <!-- Encoding -->
-  <tr id="codec_tr">
-    <td class="label">
-      License
-      <strong class="important_text">*</strong>
-    </td>
-    <td>
-      <select name="codec">
-        <option>---</option>
-        <?php
-          foreach ($this->Codecs as $Codec) {
-              echo "\t\t\t\t\t\t<option value=\"$Codec\"";
-              if ($Codec === ($Torrent['Codec'] ?? false)) {
-                  echo " selected";
-              }
-              echo ">$Codec</option>\n";
-          } ?>
-      </select><br />
-      Please see <a href="http://www.dcc.ac.uk/resources/how-guides/license-research-data" target="_blank">How to
-        License Research Data</a>
-    </td>
-  </tr>
-
   <!-- Tags -->
   <?php if ($this->NewTorrent) { ?>
   <tr id="tags_tr">

classes/validate.class.php

@@ -44,6 +44,7 @@ class Validate
         foreach ($this->Fields as $FieldKey => $Field) {
             $ValidateVar = $ValidateArray[$FieldKey];
 
+            # @todo Change this to a switch statement
             if ($ValidateVar !== '' || !empty($Field['Required']) || $Field['Type'] === 'date') {
                 if ($Field['Type'] === 'string') {
                     if (isset($Field['MaxLength'])) {

gazelle.sql

@@ -1,3 +1,14 @@
+-- Please see the limits for kinds of fields below.
+--
+--   * Gazelle ID numbers: int(10)
+--   * Accession numbers:  varchar(50)
+--   * Gazelle titles:     varchar(50)
+--   * Torrent titles:     varchar(255)
+--   * Ocelot tokens:      char(32)
+--   * Tag lists:          varchar(500)
+--
+-- @todo Finish explaining the schema
+
 SET FOREIGN_KEY_CHECKS = 0;
 
 CREATE DATABASE gazelle_production CHARACTER SET utf8mb4;
@@ -7,7 +18,7 @@ USE gazelle_production;
 CREATE TABLE `api_applications` (
   `ID` int(10) NOT NULL AUTO_INCREMENT,
   `UserID` int(10) NOT NULL,
-  `Token` char(32) NOT NULL,
+  `Token` char(32) NOT NULL, -- Ocelot 32-character limit
   `Name` varchar(50) NOT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB CHARSET=utf8mb4;
@@ -15,7 +26,7 @@ CREATE TABLE `api_applications` (
 CREATE TABLE `api_users` (
   `UserID` int(10) NOT NULL,
   `AppID` int(10) NOT NULL,
-  `Token` char(32) NOT NULL,
+  `Token` char(32) NOT NULL, -- Ocelot 32-character limit
   `State` enum('0','1','2') NOT NULL DEFAULT '0',
   `Time` datetime,
   `Access` text,
@@ -677,7 +688,7 @@ CREATE TABLE `reportsv2` (
   `ID` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `ReporterID` int(10) unsigned NOT NULL DEFAULT '0',
   `TorrentID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Type` varchar(20) DEFAULT '',
+  `Type` varchar(25) DEFAULT '',
   `UserComment` text,
   `ResolverID` int(10) unsigned NOT NULL DEFAULT '0',
   `Status` enum('New','InProgress','Resolved') DEFAULT 'New',
@@ -822,9 +833,9 @@ CREATE TABLE `sphinx_delta` (
   `Resolution` varchar(255) DEFAULT NULL,
   `AudioFormat` varchar(255) DEFAULT NULL,
   `Subbing` varchar(255) DEFAULT NULL,
-  `Studio` varchar(80) DEFAULT NULL,
-  `Series` varchar(80) DEFAULT NULL,
-  `DLsiteID` varchar(20) DEFAULT NULL,
+  `Studio` varchar(100) DEFAULT NULL,
+  `Series` varchar(100) DEFAULT NULL,
+  `DLsiteID` varchar(25) DEFAULT NULL,
   `Language` varchar(255) DEFAULT NULL,
   `Censored` tinyint(1) NOT NULL DEFAULT '1',
   `FileList` mediumtext,
@@ -834,7 +845,7 @@ CREATE TABLE `sphinx_delta` (
   PRIMARY KEY (`ID`),
   KEY `GroupID` (`GroupID`),
   KEY `Size` (`Size`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `sphinx_index_last_pos` (
   `Type` varchar(16) NOT NULL DEFAULT '',
@@ -911,13 +922,13 @@ CREATE TABLE `sphinx_t` (
   `leechers` int(11) NOT NULL,
   `time` int(11) NOT NULL,
   `freetorrent` tinyint(4) NOT NULL,
-  `media` varchar(15) NOT NULL,
-  `container` varchar(15) NOT NULL,
-  `resolution` varchar(15) NOT NULL,
-  `codec` varchar(15) NOT NULL,
-  `audioformat` varchar(15) NOT NULL,
-  `subbing` varchar(15) NOT NULL,
-  `language` varchar(15) NOT NULL,
+  `media` varchar(25) NOT NULL,
+  `container` varchar(25) NOT NULL,
+  `resolution` varchar(25) NOT NULL,
+  `codec` varchar(25) NOT NULL,
+  `audioformat` varchar(25) NOT NULL,
+  `subbing` varchar(25) NOT NULL,
+  `language` varchar(25) NOT NULL,
   `filelist` mediumtext,
   `description` text,
   `subber` varchar(30) NOT NULL,
@@ -928,14 +939,14 @@ CREATE TABLE `sphinx_t` (
 
 CREATE TABLE `sphinx_tg` (
   `id` int(11) NOT NULL,
-  `name` varchar(300) DEFAULT NULL,
-  `namerj` varchar(300) DEFAULT NULL,
-  `namejp` varchar(500) DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `namerj` varchar(255) DEFAULT NULL,
+  `namejp` varchar(255) DEFAULT NULL,
   `tags` varchar(500) DEFAULT NULL,
   `year` smallint(6) DEFAULT NULL,
-  `cnumber` varchar(80) DEFAULT NULL,
-  `studio` varchar(300) DEFAULT NULL,
-  `series` varchar(300) DEFAULT NULL,
+  `cnumber` varchar(50) DEFAULT NULL,
+  `studio` varchar(255) DEFAULT NULL,
+  `series` varchar(255) DEFAULT NULL,
   `catid` smallint(6) DEFAULT NULL,
   `dlsid` varchar(15) NOT NULL,
   PRIMARY KEY (`id`)
@@ -1069,13 +1080,13 @@ CREATE TABLE `torrents` (
   `ID` int(10) NOT NULL AUTO_INCREMENT,
   `GroupID` int(10) NOT NULL DEFAULT '0',
   `UserID` int(10) DEFAULT NULL,
-  `Media` varchar(20) DEFAULT NULL,
-  `Container` varchar(20) DEFAULT NULL,
-  `Codec` varchar(20) DEFAULT NULL,
-  `Resolution` varchar(20) DEFAULT NULL,
+  `Media` varchar(25) DEFAULT NULL,
+  `Container` varchar(25) DEFAULT NULL,
+  `Codec` varchar(25) DEFAULT NULL,
+  `Resolution` varchar(25) DEFAULT NULL,
   `AudioFormat` varchar(10) DEFAULT NULL,
   `Subbing` varchar(10) DEFAULT NULL,
-  `Language` varchar(20) DEFAULT NULL,
+  `Language` varchar(25) DEFAULT NULL,
   `Censored` tinyint(1) NOT NULL DEFAULT '1',
   `Anonymous` tinyint(1) NOT NULL DEFAULT '0',
   `info_hash` blob NOT NULL,
@@ -1094,7 +1105,7 @@ CREATE TABLE `torrents` (
   `Snatched` int(10) unsigned NOT NULL DEFAULT '0',
   `balance` bigint(20) NOT NULL DEFAULT '0',
   `LastReseedRequest` datetime,
-  `Subber` varchar(300) NOT NULL DEFAULT '',
+  `Subber` varchar(255) NOT NULL DEFAULT '',
   `Archive` varchar(10) NOT NULL DEFAULT '',
   PRIMARY KEY (`ID`),
   UNIQUE KEY `InfoHash` (`info_hash`(40)),
@@ -1153,16 +1164,16 @@ CREATE TABLE `torrents_group` (
   `NameRJ` varchar(255) DEFAULT NULL,
   `NameJP` varchar(255) DEFAULT NULL,
   `Year` int(4) DEFAULT NULL,
-  `Studio` varchar(80) NOT NULL DEFAULT '',
-  `Series` varchar(80) NOT NULL DEFAULT '',
-  `CatalogueNumber` varchar(80) NOT NULL DEFAULT '',
+  `Studio` varchar(100) NOT NULL DEFAULT '',
+  `Series` varchar(100) NOT NULL DEFAULT '',
+  `CatalogueNumber` varchar(50) NOT NULL DEFAULT '',
   `Pages` smallint(5) unsigned DEFAULT NULL,
   `TagList` varchar(500) NOT NULL DEFAULT '',
   `Time` datetime,
   `RevisionID` int(12) DEFAULT NULL,
   `WikiBody` text,
   `WikiImage` varchar(255) NOT NULL,
-  `DLsiteID` varchar(20) NOT NULL DEFAULT '',
+  `DLsiteID` varchar(25) NOT NULL DEFAULT '',
   PRIMARY KEY (`ID`),
   KEY `CategoryID` (`CategoryID`),
   KEY `Name` (`Name`(255)),
@@ -1195,7 +1206,7 @@ CREATE TABLE `torrents_peerlists` (
   PRIMARY KEY (`TorrentID`),
   KEY `GroupID` (`GroupID`),
   KEY `Stats` (`TorrentID`,`Seeders`,`Leechers`,`Snatches`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `torrents_peerlists_compare` (
   `TorrentID` int(11) NOT NULL,
@@ -1206,7 +1217,7 @@ CREATE TABLE `torrents_peerlists_compare` (
   PRIMARY KEY (`TorrentID`),
   KEY `GroupID` (`GroupID`),
   KEY `Stats` (`TorrentID`,`Seeders`,`Leechers`,`Snatches`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `torrents_recommended` (
   `GroupID` int(10) NOT NULL,
@@ -1460,7 +1471,7 @@ CREATE TABLE `users_levels` (
 
 CREATE TABLE `users_main` (
   `ID` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `Username` varchar(20) NOT NULL,
+  `Username` varchar(25) NOT NULL,
   `Email` varchar(255) NOT NULL,
   `PassHash` varchar(60) NOT NULL,
   `TwoFactor` varchar(255) DEFAULT NULL,
@@ -1720,8 +1731,8 @@ CREATE TABLE `wiki_torrents` (
 
 CREATE TABLE `xbt_client_whitelist` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `peer_id` varchar(20) DEFAULT NULL,
-  `vstring` varchar(200) DEFAULT '',
+  `peer_id` varchar(25) DEFAULT NULL,
+  `vstring` varchar(255) DEFAULT '',
   PRIMARY KEY (`id`),
   UNIQUE KEY `peer_id` (`peer_id`)
 ) ENGINE=InnoDB CHARSET=utf8mb4;
@@ -1743,7 +1754,7 @@ CREATE TABLE `xbt_files_users` (
   `peer_id` binary(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
   `fid` int(11) NOT NULL,
   `mtime` int(11) NOT NULL,
-  `ip` varchar(15) NOT NULL DEFAULT '',
+  `ip` varchar(15) NOT NULL DEFAULT '', -- Max IPv4 address length
   `seeder` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`peer_id`,`fid`,`uid`),
   KEY `remaining_idx` (`remaining`),
@@ -1756,7 +1767,7 @@ CREATE TABLE `xbt_snatched` (
   `uid` int(11) NOT NULL DEFAULT '0',
   `tstamp` int(11) NOT NULL,
   `fid` int(11) NOT NULL,
-  `IP` varchar(15) NOT NULL,
+  `IP` varchar(15) NOT NULL, -- Max IPv4 address length
   `seedtime` int(11) NOT NULL DEFAULT '0',
   KEY `fid` (`fid`),
   KEY `tstamp` (`tstamp`),
@@ -1777,7 +1788,7 @@ INSERT INTO wiki_revisions (ID, Revision, Title, Body, Date, Author) VALUES (1,
 
 INSERT INTO forums (ID, CategoryID, Sort, Name, Description, MinClassRead, MinClassWrite, MinClassCreate, NumTopics, NumPosts, LastPostID, LastPostAuthorID, LastPostTopicID, LastPostTime) VALUES (1, 1, 20, 'Your Site', 'Totally rad forum', 100, 100, 100, 0, 0, 0, 0, 0, NULL), (2, 5, 30, 'Chat', 'Expect this to fill up with spam', 100, 100, 100, 0, 0, 0, 0, 0, NULL), (3, 10, 40, 'Help!', 'I fell down and I cant get up', 100, 100, 100, 0, 0, 0, 0, 0, NULL), (4, 20, 100, 'Trash', 'Every thread ends up here eventually', 100, 500, 500, 0, 0, 0, 0, 0, NULL);
 
-INSERT INTO tags (ID, Name, TagType, Uses, UserID) VALUES (1, 'foo', 'genre', 0, 1),(2, 'bar', 'genre', 0, 1),(3, 'baz', 'genre', 0, 1);
+INSERT INTO tags (ID, Name, TagType, Uses, UserID) VALUES (1, 'one', 'genre', 0, 1),(2, 'two', 'genre', 0, 1),(3, 'three', 'genre', 0, 1),(3, 'four', 'genre', 0, 1),(3, 'five', 'genre', 0, 1);
 
 INSERT INTO schedule (NextHour, NextDay, NextBiWeekly) VALUES (0,0,0);
 

sections/collages/new_handle.php

@@ -1,84 +1,85 @@
 <?php
-authorize();
 
+authorize();
 include(SERVER_ROOT.'/classes/validate.class.php');
+
 $Val = new Validate;
 
 $P = [];
 $P = db_array($_POST);
 
 if ($P['category'] > 0 || check_perms('site_collages_renamepersonal')) {
-  $Val->SetFields('name', '1', 'string', 'The name must be between 3 and 100 characters', array('maxlength' => 100, 'minlength' => 3));
+    $Val->SetFields('name', '1', 'string', 'The name must be between 5 and 255 characters.', array('maxlength' => 255, 'minlength' => 5));
 } else {
-  // Get a collage name and make sure it's unique
-  $name = $LoggedUser['Username']."'s personal collage";
-  $P['name'] = db_string($name);
-  $DB->query("
+    // Get a collage name and make sure it's unique
+    $name = $LoggedUser['Username']."'s personal collage";
+    $P['name'] = db_string($name);
+    $DB->query("
     SELECT ID
     FROM collages
     WHERE Name = '".$P['name']."'");
-  $i = 2;
-  while ($DB->has_results()) {
-    $P['name'] = db_string("$name no. $i");
-    $DB->query("
+    $i = 2;
+    while ($DB->has_results()) {
+        $P['name'] = db_string("$name no. $i");
+        $DB->query("
       SELECT ID
       FROM collages
       WHERE Name = '".$P['name']."'");
-    $i++;
-  }
+        $i++;
+    }
 }
-$Val->SetFields('description', '1', 'string', 'The description must be between 10 and 65535 characters', array('maxlength' => 65535, 'minlength' => 10));
+$Val->SetFields('description', '1', 'string', 'The description must be between 10 and 65535 characters.', array('maxlength' => 65535, 'minlength' => 10));
 
 $Err = $Val->ValidateForm($_POST);
 
 if (!$Err && $P['category'] === '0') {
-  $DB->query("
+    $DB->query("
     SELECT COUNT(ID)
     FROM collages
     WHERE UserID = '$LoggedUser[ID]'
       AND CategoryID = '0'
       AND Deleted = '0'");
-  list($CollageCount) = $DB->next_record();
-  if (($CollageCount >= $LoggedUser['Permissions']['MaxCollages']) || !check_perms('site_collages_personal')) {
-    $Err = 'You may not create a personal collage.';
-  } elseif (check_perms('site_collages_renamepersonal') && !stristr($P['name'], $LoggedUser['Username'])) {
-    $Err = 'Your personal collage\'s title must include your username.';
-  }
+    list($CollageCount) = $DB->next_record();
+    if (($CollageCount >= $LoggedUser['Permissions']['MaxCollages']) || !check_perms('site_collages_personal')) {
+        $Err = 'You may not create a personal collage.';
+    } elseif (check_perms('site_collages_renamepersonal') && !stristr($P['name'], $LoggedUser['Username'])) {
+        $Err = "Your personal collage's title must include your username.";
+    }
 }
 
 if (!$Err) {
-  $DB->query("
+    $DB->query("
     SELECT ID, Deleted
     FROM collages
     WHERE Name = '$P[name]'");
-  if ($DB->has_results()) {
-    list($ID, $Deleted) = $DB->next_record();
-    if ($Deleted) {
-      $Err = 'That collection already exists but needs to be recovered; please <a href="staffpm.php">contact</a> the staff team!';
-    } else {
-      $Err = "That collection already exists: <a href=\"/collages.php?id=$ID\">$ID</a>.";
+    if ($DB->has_results()) {
+        list($ID, $Deleted) = $DB->next_record();
+        if ($Deleted) {
+            $Err = 'That collection already exists but needs to be recovered. Please <a href="staffpm.php">contact</a> the staff team.';
+        } else {
+            $Err = "That collection already exists: <a href='/collages.php?id=$ID'>$ID</a>.";
+        }
     }
-  }
 }
 
 if (!$Err) {
-  if (empty($CollageCats[$P['category']])) {
-    $Err = 'Please select a category';
-  }
+    if (empty($CollageCats[$P['category']])) {
+        $Err = 'Please select a category';
+    }
 }
 
 if ($Err) {
-  $Name = $_POST['name'];
-  $Category = $_POST['category'];
-  $Tags = $_POST['tags'];
-  $Description = $_POST['description'];
-  include(SERVER_ROOT.'/sections/collages/new.php');
-  die();
+    $Name = $_POST['name'];
+    $Category = $_POST['category'];
+    $Tags = $_POST['tags'];
+    $Description = $_POST['description'];
+    include(SERVER_ROOT.'/sections/collages/new.php');
+    die();
 }
 
 $TagList = explode(',', $_POST['tags']);
 foreach ($TagList as $ID => $Tag) {
-  $TagList[$ID] = Misc::sanitize_tag($Tag);
+    $TagList[$ID] = Misc::sanitize_tag($Tag);
 }
 $TagList = implode(' ', $TagList);
 
@@ -92,4 +93,3 @@ $CollageID = $DB->inserted_id();
 $Cache->delete_value("collage_$CollageID");
 Misc::write_log("Collage $CollageID (".$_POST['name'].') was created by '.$LoggedUser['Username']);
 header("Location: collages.php?id=$CollageID");
-?>

sections/requests/new_edit.php

@@ -100,7 +100,8 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
 <!-- HTML title -->
 <div class="thin">
   <div class="header">
-    <h2><?= ($NewRequest ? 'Create Request' : 'Edit Request') ?></h2>
+    <h2><?= ($NewRequest ? 'Create Request' : 'Edit Request') ?>
+    </h2>
   </div>
 
   <!-- New request hidden fields -->
@@ -120,7 +121,8 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
       <!-- Main table -->
       <table class="layout">
         <tr>
-          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the request rules</a>!</td>
+          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the
+              request rules</a>!</td>
         </tr>
         <?php  if ($NewRequest || $CanEdit) { ?>
 
@@ -183,7 +185,7 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
               <?= $Disabled ?>/>
           </td>
         </tr>
-        <?php  } # Ends if NewRequest line 123 ?>
+        <?php  } # Ends if NewRequest line 123?>
 
         <!-- Multiple artists -->
         <tr id="artist_tr">
@@ -191,33 +193,31 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
           <td id="artistfields">
             <?php
               if (!empty($ArtistForm)) {
-                $First = true;
-                foreach ($ArtistForm as $Artist) {
-                  # Cycle autocomplete
-            ?>
+                  $First = true;
+                  foreach ($ArtistForm as $Artist) {
+                      # Cycle autocomplete?>
             <input type="text" id="artist_0" name="artists[]" <?php Users::has_autocomplete_enabled('other'); ?>
             size="45" value="<?= display_str($Artist['name']) ?>" <?= $Disabled ?>/>
             <?php
               if (empty($Disabled)) {
-                if ($First) { ?>
+                  if ($First) { ?>
             <a class="add_artist_button brackets">+</a>
             <a class="remove_artist_button brackets">&minus;</a>
             <?php
                 }
-                $First = false;
-              }
-            ?>
+                  $First = false;
+              } ?>
             <br />
             <?php
-                }
+                  }
               } else {
-            ?>
+                  ?>
             <input type="text" id="artist_0" name="artists[]" <?php Users::has_autocomplete_enabled('other'); ?>
             size="45" <?= $Disabled ?>/>
             <?php if (empty($Disabled)) { ?>
             <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
             <?php
-                } 
+                }
               }
             ?>
           </td>
@@ -242,30 +242,31 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
             <?php
               $GenreTags = $Cache->get_value('genre_tags');
                 if (!$GenreTags) {
-                  $DB->query('
+                    $DB->query('
                     SELECT Name
                     FROM tags
                     WHERE TagType = \'genre\'
                     ORDER BY Name');
-                  $GenreTags = $DB->collect('Name');
-                  $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
+                    $GenreTags = $DB->collect('Name');
+                    $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
                 }
 
                 if (!empty($Disabled)) {
-            ?>
+                    ?>
             <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" disabled="disabled">
-            <?php } else { ?>
-            <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
-              <?php } ?>
-              <option>---</option>
-              <?php foreach (Misc::display_array($GenreTags) as $Genre) { ?>
-              <option value="<?= $Genre ?>"><?= $Genre ?>
-              </option>
-              <?php  } ?>
-            </select>
-            <input type="text" id="tags" name="tags" size="45"
-              value="<?= (!empty($Tags) ? display_str($Tags) : '') ?>"
-              <?php Users::has_autocomplete_enabled('other'); ?>
+              <?php
+                } else { ?>
+              <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+                <?php } ?>
+                <option>---</option>
+                <?php foreach (Misc::display_array($GenreTags) as $Genre) { ?>
+                <option value="<?= $Genre ?>"><?= $Genre ?>
+                </option>
+                <?php  } ?>
+              </select>
+              <input type="text" id="tags" name="tags" size="45"
+                value="<?= (!empty($Tags) ? display_str($Tags) : '') ?>"
+                <?php Users::has_autocomplete_enabled('other'); ?>
               <?= $Disabled ?>/>
           </td>
         </tr>
@@ -283,7 +284,8 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
         <tr>
           <td class="label">Torrent Group</td>
           <td>
-            If this request matches a torrent group <strong>already existing</strong> on the site, please indicate that here.<br />
+            If this request matches a torrent group <strong>already existing</strong> on the site, please indicate that
+            here.<br />
             <?= site_url() ?>torrents.php?id=<input type="text"
               name="groupid"
               value="<?= isset($GroupID)?$GroupID:'' ?>"
@@ -295,17 +297,20 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
             #&& ($CategoryID !== 5) # ?
             #&& ($CategoryID !== 0) # ?
             ) {
-        ?>
+              ?>
 
         <!-- Torrent group admin -->
         <tr>
           <td class="label">Torrent Group</td>
           <td>
             <a href="torrents.php?id=<?= $GroupID ?>"><?= site_url() ?>torrents.php?id=<?= $GroupID ?></a><br />
-            This request <?= ($NewRequest ? 'will be' : 'is') ?> associated with the above torrent group.
+            This request <?= ($NewRequest ? 'will be' : 'is') ?>
+            associated with the above torrent group.
             <?php if (!$NewRequest) { ?>
             If this is incorrect, please
-            <a href="reports.php?action=report&amp;type=request&amp;id=<?= $RequestID ?>">report this request</a>
+            <a
+              href="reports.php?action=report&amp;type=request&amp;id=<?= $RequestID ?>">report
+              this request</a>
             so that staff can fix it.
             <?php } ?>
             <input type="hidden" name="groupid"
@@ -314,7 +319,8 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
         </tr>
 
         <!-- Bounty -->
-        <?php  } if ($NewRequest) { ?>
+        <?php
+          } if ($NewRequest) { ?>
         <tr id="voting">
           <td class="label">Bounty</td>
           <td>
@@ -328,7 +334,8 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
               </option>
             </select>
             <input type="button" value="Preview" onclick="Calculate();" />
-            <strong>The system deducts <?= ($RequestTax * 100) ?>% as tax</strong>
+            <strong>The system deducts <?= ($RequestTax * 100) ?>% as
+              tax</strong>
           </td>
         </tr>
 
@@ -345,8 +352,10 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
             <ul>
               <!-- @todo Return this feature
               <li><strong>Bounty:</strong> <span id="bounty_after_tax">90.00 MB</span></li> -->
-              <li><strong>Uploaded:</strong> <span id="new_uploaded"><?= Format::get_size($LoggedUser['BytesUploaded']) ?></span></li>
-              <li><strong>Ratio:</strong> <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span></li>
+              <li><strong>Uploaded:</strong> <span id="new_uploaded"><?= Format::get_size($LoggedUser['BytesUploaded']) ?></span>
+              </li>
+              <li><strong>Ratio:</strong> <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span>
+              </li>
             </ul>
           </td>
         </tr>

sections/torrents/details.php

@@ -33,7 +33,7 @@ if (!$GroupName) {
     }
 }
 
-$DisplayName = "<span dir=\"ltr\">$GroupName</span><br />";
+$DisplayName = "<span dir='ltr'>$GroupName</span><br />";
 $AltName = $GroupName; // Goes in the alt text of the image
 $Title = $GroupName; // Goes in <title>
 $WikiBody = Text::full_format($WikiBody);
@@ -41,11 +41,11 @@ $WikiBody = Text::full_format($WikiBody);
 $Artists = Artists::get_artist($GroupID);
 
 if ($GroupNameRJ && $GroupNameRJ != $GroupName) {
-    $DisplayName .= "<span dir=\"ltr\">$GroupNameRJ</span><br />";
+    $DisplayName .= "<span dir='ltr'>$GroupNameRJ</span><br />";
 }
 
 if ($GroupNameJP && $GroupNameJP != $GroupName) {
-    $DisplayName .= "<span dir=\"ltr\">$GroupNameJP</span><br />";
+    $DisplayName .= "<span dir='ltr'>$GroupNameJP</span><br />";
 }
 
 if ($Artists) {
@@ -446,7 +446,7 @@ foreach ($TorrentList as $Torrent) {
                 $ReporterID = $Report['ReporterID'];
                 $Reporter = Users::user_info($ReporterID);
                 $ReporterName = $Reporter['Username'];
-                $ReportLinks = "<a href=\"user.php?id=$ReporterID\">$ReporterName</a> <a href=\"reportsv2.php?view=report&amp;id=$Report[ID]\">reported it</a>";
+                $ReportLinks = "<a href='user.php?id=$ReporterID'>$ReporterName</a> <a href='reportsv2.php?view=report&amp;id=$Report[ID]'>reported it</a>";
             } else {
                 $ReportLinks = 'Someone reported it';
             }
@@ -456,7 +456,7 @@ foreach ($TorrentList as $Torrent) {
             } elseif (isset($Types['master'][$Report['Type']])) {
                 $ReportType = $Types['master'][$Report['Type']];
             } else {
-                //There was a type but it wasn't an option!
+                // There was a type but it wasn't an option!
                 $ReportType = $Types['master']['other'];
             }
             $ReportInfo .= "
@@ -492,13 +492,13 @@ foreach ($TorrentList as $Torrent) {
                 $Name = str_replace(' ', '&nbsp;', substr($Name, 0, $Spaces)) . substr($Name, $Spaces);
             }
             $FileSize = substr($File, $NameEnd + 3, -3);
-            $FileTable .= sprintf("\n<tr class=\"row\"><td>%s</td><td class=\"number_column nobr\">%s</td></tr>", $Name, Format::get_size($FileSize));
+            $FileTable .= sprintf("\n<tr class='row'><td>%s</td><td class='number_column nobr'>%s</td></tr>", $Name, Format::get_size($FileSize));
         }
     } else {
         $FileListSplit = explode("\n", $FileList);
         foreach ($FileListSplit as $File) {
             $FileInfo = Torrents::filelist_get_file($File);
-            $FileTable .= sprintf("\n<tr class=\"row\"><td>%s</td><td class=\"number_column nobr\">%s</td></tr>", $FileInfo['name'], Format::get_size($FileInfo['size']));
+            $FileTable .= sprintf("\n<tr class='row'><td>%s</td><td class='number_column nobr'>%s</td></tr>", $FileInfo['name'], Format::get_size($FileInfo['size']));
         }
     }
     $FileTable .= '
@@ -507,8 +507,8 @@ foreach ($TorrentList as $Torrent) {
     $ExtraInfo = ''; // String that contains information on the torrent (e.g. format and encoding)
   $AddExtra = ''; // Separator between torrent properties
 
-  // similar to Torrents::torrent_info()
-    if ($Media && $GroupCategoryID != 5) {
+  // Similar to Torrents::torrent_info()
+    if ($Media) {
         $ExtraInfo.=display_str($Media);
         $AddExtra=" / ";
     }
@@ -524,11 +524,16 @@ foreach ($TorrentList as $Torrent) {
         $ExtraInfo.=$AddExtra.display_str($Resolution);
         $AddExtra=' / ';
     }
-    #if ($AudioFormat) { $ExtraInfo.=$AddExtra.display_str($AudioFormat); $AddExtra=' / '; }
+    /*
+    if ($AudioFormat) {
+      $ExtraInfo.=$AddExtra.display_str($AudioFormat);
+      $AddExtra=' / '; }
+      */
     /*
     if ($Language) {
       if ($Subber && ($GroupCategoryID == 3 || $GroupCategoryID == 4)) {
-        $ExtraInfo.=$AddExtra.display_str($Language.' ('.$Subber.')'); $AddExtra=' / ';
+        $ExtraInfo.=$AddExtra.display_str($Language.' ('.$Subber.')');
+        $AddExtra=' / ';
       } else {
         $ExtraInfo.=$AddExtra.display_str($Language); $AddExtra=' / ';
       }
@@ -556,7 +561,7 @@ foreach ($TorrentList as $Torrent) {
         $ExtraInfo .= $AddExtra.display_str('Unaligned');
         $AddExtra=' / ';
     }
-    if (!$ExtraInfo || $GroupCategoryID == 5) {
+    if (!$ExtraInfo) {
         $ExtraInfo = $GroupName;
         $AddExtra=' / ';
     }
@@ -737,6 +742,7 @@ foreach ($TorrentList as $Torrent) {
     if (!empty($Description)) {
         echo "\n<blockquote>".Text::full_format($Description).'</blockquote>';
     }
+    
     /*
     if (!empty($MediaInfo) || $MediaInfo === 'nil') { # Kludge
         $parsed = MediaInfo::parse($MediaInfo);
@@ -745,6 +751,7 @@ foreach ($TorrentList as $Torrent) {
             echo $parsed;
         } else {
           */
+
     echo "\n<blockquote>"; ?>
             <div class="spoilerContainer hideContainer">
               <?php

sections/upload/upload_handle.php

@@ -13,8 +13,8 @@ ini_set('upload_max_filesize', 2097152); // 2 MiB
 
 # Allow many uncompressed files,
 # e.g., http://academictorrents.com/details/5a447ff50062194bd58dd11c0fedead59e6d873c/tech
-ini_set('max_file_uploads', 65535);
-define('MAX_FILENAME_LENGTH', 180);
+ini_set('max_file_uploads', 10000);
+define('MAX_FILENAME_LENGTH', 255);
 
 include(SERVER_ROOT.'/classes/validate.class.php');
 include(SERVER_ROOT.'/classes/feed.class.php');
@@ -30,9 +30,9 @@ $Feed = new Feed;
 //*****************************************************************************//
 //--------------- Set $Properties array ---------------------------------------//
 // This is used if the form doesn't validate, and when the time comes to enter //
-// it into the database.                                                       //
-// Haha wow god i'm trying to restrict the database to only have fields for    //
-// movies and not add anything for other categories but this is fucking dumb   //
+// it into the database.                 
+// @todo Do something about this mess
+//****************************************************************************//
 
 $Properties = [];
 $Type = $Categories[(int)$_POST['type']];
@@ -44,21 +44,18 @@ $Properties['Title'] = $_POST['title'];
 $Properties['TitleRJ'] = $_POST['title_rj'];
 $Properties['TitleJP'] = $_POST['title_jp'];
 $Properties['Year'] = $_POST['year'];
-
 $Properties['Studio'] = isset($_POST['studio']) ? $_POST['studio'] : '';
-
 $Properties['Series'] = isset($_POST['series']) ? $_POST['series'] : '';
-
 $Properties['CatalogueNumber'] = isset($_POST['catalogue']) ? $_POST['catalogue'] : '';
 $Properties['Pages'] = isset($_POST['pages']) ? $_POST['pages'] : 0;
 $Properties['Container'] = isset($_POST['container']) ? $_POST['container'] : '';
-
 $Properties['Media'] = $_POST['media'];
-
 $Properties['Codec'] = isset($_POST['codec']) ? $_POST['codec'] : '';
+
 if (!($_POST['resolution'] ?? false)) {
     $_POST['resolution'] = $_POST['ressel'] ?? '';
 }
+
 $Properties['Resolution'] = $_POST['resolution'] ?? '';
 $Properties['AudioFormat'] = 'nil';
 $Properties['Subbing'] = 'nil';
@@ -68,12 +65,15 @@ $Properties['DLsiteID'] = (isset($_POST['dlsiteid'])) ? $_POST['dlsiteid'] : '';
 $Properties['Censored'] = (isset($_POST['censored'])) ? '1' : '0';
 $Properties['Anonymous'] = (isset($_POST['anonymous'])) ? '1' : '0';
 $Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== '---') ? $_POST['archive'] : '';
+
 if (isset($_POST['library_image'])) {
     $Properties['LibraryImage'] = $_POST['library_image'];
 }
+
 if (isset($_POST['tags'])) {
     $Properties['TagList'] = implode(',', array_unique(explode(',', str_replace(' ', '', $_POST['tags']))));
 }
+
 if (isset($_POST['image'])) {
     $Properties['Image'] = $_POST['image'];
 }
@@ -122,6 +122,7 @@ if (!empty($_POST['requestid'])) {
 //******************************************************************************//
 //--------------- Validate data in upload form ---------------------------------//
 
+# torrents_group.CategoryID
 $Validate->SetFields(
     'type',
     '1',
@@ -130,24 +131,27 @@ $Validate->SetFields(
     array('inarray' => array_keys($Categories))
 );
 
+# @todo Remove the switch statement
 switch ($Type) {
     /*
   case 'Imaging':
     if (!isset($_POST['groupid']) || !$_POST['groupid']) {
-        $Validate->SetFields( # torrents.Media
+        # torrents.Media
+        $Validate->SetFields(
             'media',
             '1',
             'inarray',
             'Please select a valid platform.',
-            array('inarray'=>array_merge($Media, $MediaManga, $Platform))
+            array('inarray' => array_merge($Media, $MediaManga, $Platform))
         );
 
-        $Validate->SetFields( # torrents.Container
+        # torrents.Container
+        $Validate->SetFields(
             'container',
             '1',
             'inarray',
             'Please select a valid format.',
-            array('inarray'=>array_merge($Containers, $ContainersGames))
+            array('inarray' => array_merge($Containers, $ContainersGames))
         );
     }
 break;
@@ -155,63 +159,122 @@ break;
 
 default:
     if (!isset($_POST['groupid']) || !$_POST['groupid']) {
-        $Validate->SetFields( # torrents_group.Name
+        # torrents_group.CatalogueNumber
+        $Validate->SetFields(
+            'catalogue',
+            '0',
+            'string',
+            'Accession Number must be between 0 and 50 characters.',
+            array('maxlength' => 50, 'minlength' => 0)
+        );
+
+        # torrents_group.Name
+        $Validate->SetFields(
             'title',
             '1',
             'string',
-            'Torrent Title must be between 1 and 255 characters.',
-            array('maxlength'=>255, 'minlength'=>1)
+            'Torrent Title must be between 5 and 255 characters.',
+            array('maxlength' => 255, 'minlength' => 5)
         );
 
-        $Validate->SetFields( # torrents_group.NameRJ
+        # torrents_group.NameRJ
+        $Validate->SetFields(
             'title_rj',
             '0',
             'string',
             'Organism must be between 0 and 255 characters.',
-            array('maxlength'=>255, 'minlength'=>0)
+            array('maxlength' => 255, 'minlength' => 0)
         );
 
-        $Validate->SetFields( # torrents_group.NameJP
+        # torrents_group.NameJP
+        $Validate->SetFields(
             'title_jp',
             '0',
             'string',
             'Strain/Variety must be between 0 and 255 characters.',
-            array('maxlength'=>255, 'minlength'=>0)
+            array('maxlength' => 255, 'minlength' => 0)
+        );
+
+        # torrents_group.Studio
+        $Validate->SetFields(
+           'studio',
+            '0',
+            'string',
+            'Department/Lab must be between 0 and 100 characters.',
+            array('maxlength' => 100, 'minlength' => 0)
         );
 
-        $Validate->SetFields( # torrents_group.Year
+        # torrents_group.Series
+        $Validate->SetFields(
+            'series',
+            '0',
+            'string',
+            'Location must be between 0 and 100 characters.',
+            array('maxlength' => 100, 'minlength' => 0)
+        );
+
+        # torrents_group.Year
+        $Validate->SetFields(
             'year',
             '1',
             'number',
             'The year of the original release must be entered.',
-            array('maxlength'=>4, 'minlength'=>4)
+            array('maxlength' => 4, 'minlength' => 4)
+        );
+
+        # torrents.Media
+        $Validate->SetFields(
+            'media',
+            '1',
+            'inarray',
+            'Please select a valid platform.',
+            array('inarray' => array_merge($Media, $MediaManga, $Platform))
         );
 
-        $Validate->SetFields( # torrents_group.TagList
+        # torrents.Container
+        $Validate->SetFields(
+            'container',
+            '1',
+            'inarray',
+            'Please select a valid format.',
+            array('inarray' => array_merge($Containers, $ContainersGames))
+        );
+
+        # torrents_group.TagList
+        $Validate->SetFields(
             'tags',
             '1',
             'string',
             'You must enter at least five tags. Maximum length is 500 characters.',
-            array('maxlength'=>500, 'minlength'=>5)
+            array('maxlength' => 500, 'minlength' => 10)
         );
 
-        $Validate->SetFields( # torrents_group.WikiImage
+        # torrents_group.WikiImage
+        $Validate->SetFields(
             'image',
             '0',
             'link',
             'The image URL you entered was invalid.',
-            array('maxlength'=>255, 'minlength'=>10)
+            array('maxlength' => 255, 'minlength' => 10) # x.yz/a.bc
         );
     }
 
-    $Validate->SetFields( # torrents_group.WikiBody
+    # torrents_group.WikiBody
+    $Validate->SetFields(
         'album_desc',
         '1',
         'string',
-        'The description has a minimum length of 10 characters.',
-        array('maxlength'=>1000000, 'minlength'=>10)
+        'The description must be between 10 and 65535 characters.',
+        array('maxlength' => 65535, 'minlength' => 10)
+    );
+
+    # torrents_group.ID
+    $Validate->SetFields(
+        'groupid',
+        '0',
+        'number',
+        'Group ID was not numeric.'
     );
-    #$Validate->SetFields('groupid', '0', 'number', 'Group ID was not numeric.');
 }
 
 $Err = $Validate->ValidateForm($_POST); // Validate the form

static/functions/bbcode.js

@@ -61,6 +61,7 @@ function EmojiBox(box) {
 }
 
 function BBEditor(box) {
+  // @todo Integrate BioJS functions here
   if (box.previousSibling && box.previousSibling.className == 'bbcode_bar') return
   let buttons = [
     {short:'B', name:'Bold', wrap:['[b]','[/b]']},

static/functions/upload.js

@@ -43,7 +43,7 @@ function Categories() {
       'studio': {},
       'series': {},
       'media': {},
-      'container': {},
+      'container_prot': {},
       'resolution': {},
       'archive': {},
       'codec': {},