Fix search and add SemVer support

classes/rules.class.php

@@ -10,6 +10,8 @@ class Rules
     {
         ?>
 <ul>
+<li><strong>No personally identifying patient data is allowed anywhere on the site.</strong></li>
+
   <li>Staff can do anything to anyone for any reason (or no reason). If you take issue with a decision, you must do so
     privately with the staff member who issued the decision or with an administrator of the site.</li>
 

classes/torrent_form.class.php

@@ -16,7 +16,7 @@ class TorrentForm
     public $ContainersProt = [];
     public $Codecs = [];
     public $Resolutions = [];
-    #var $AudioFormats = [];
+    var $AudioFormats = [];
     #var $Subbing = [];
     #var $Languages = [];
     #var $Platform = [];
@@ -47,7 +47,7 @@ class TorrentForm
         $this->ContainersProt = $ContainersProt;
         $this->Codecs = $Codecs;
         $this->Resolutions = $Resolutions;
-        #$this->AudioFormats = $AudioFormats;
+        $this->AudioFormats = $AudioFormats;
         #$this->Subbing = $Subbing;
         #$this->Languages = $Languages;
         $this->TorrentID = $TorrentID;
@@ -155,7 +155,10 @@ class TorrentForm
     <table cellpadding="3" cellspacing="1" border="0" class="layout" width="100%">
 
       <tr>
-        <td class="label">Torrent File</td>
+        <td class="label">
+        Torrent File
+        <strong class="important_text">*</strong>
+        </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>
@@ -163,7 +166,10 @@ class TorrentForm
       </tr>
 
       <tr>
-        <td class="label">Type</td>
+        <td class="label">
+        Category
+        <strong class="important_text">*</strong>
+        </td>
         <td>
           <select id="categories" name="type" onchange="Categories()" <?= ($this->DisabledFlag) ? ' disabled="disabled"' : '' ?>>
             <?php
@@ -311,6 +317,17 @@ class TorrentForm
     </td>
   </tr>
 
+  <!-- Semantic Versioning -->
+    <tr id="audio_tr">
+    <td class="label">Version</td>
+    <td>
+      <input type="text" id="audioformat" name="audioformat" size="10"
+        pattern="\d+\.\d+\.\d+" value="<?= display_str($Torrent['AudioFormat']) ?>"
+        <?= $this->Disabled ?>/><br />
+      Please see <a href="https://semver.org target="_blank">Semantic Versioning</a>; start with 0.1.0
+    </td>
+  </tr>
+
   <!-- Three title fields -->
   <tr id="title_tr">
     <td class="label">
@@ -458,7 +475,7 @@ class TorrentForm
               echo ">$Media</option>\n";
           } ?>
       </select><br />
-      Class of technology used
+      The class of technology used
     </td>
   </tr>
 
@@ -480,7 +497,7 @@ class TorrentForm
                 echo ">$Media</option>\n";
             } ?>
       </select><br />
-      Class of technology used
+      The class of technology used
     </td>
   </tr>
 
@@ -516,7 +533,7 @@ class TorrentForm
           $('#resolution').gshow()
         }
       </script><br />
-      How complete the data is
+      How complete the data is, specifically or conceptually
     </td>
   </tr>
 
@@ -627,8 +644,7 @@ class TorrentForm
         value="<?= display_str(implode(', ', explode(',', $Torrent['TagList']))) ?>"
         <?php Users::has_autocomplete_enabled('other'); ?>
       /><br />
-      Comma-seperated list of tags, n.b., use <strong class="important_text_alt">vanity.house</strong> for data you
-      produced
+      Comma-seperated list of at least 5 tags
     </td>
   </tr>
 
@@ -674,7 +690,7 @@ class TorrentForm
           array($this->Disabled)
       );
       ?><br />
-      General info about the object of study's function or significance
+      General info about the torrent subject's function or significance
     </td>
   </tr>
   <?php } # Ends if NewTorrent line 499?>
@@ -690,16 +706,16 @@ class TorrentForm
           display_str($Torrent['TorrentDescription'] ?? ''),
           60,
       ); ?><br />
-      Specific info about the protocols and equipment relevant to <em>this</em> data
+      Specific info about the protocols and equipment used to produce the data
     </td>
   </tr>
 
   <!-- Boolean options -->
   <tr id="censored_tr">
-    <td class="label">Aligned Sequence</td>
+    <td class="label">Aligned/Annotated</td>
     <td>
       <input type="checkbox" name="censored" value="1" <?= (($Torrent['Censored'] ?? 0) ? 'checked ' : '') ?>/>
-      Whether the torrent contains raw reads or alignment data
+      Whether the torrent contains alignments, annotations, or other structural metadata
     </td>
   </tr>
 

classes/torrentsearch.class.php

@@ -51,7 +51,7 @@ class TorrentSearch
     // List of fields that can be used for fulltext searches
     private static $Fields = [
     'artistname' => 1,
-    #'audioformat' => 1,
+    'audioformat' => 1,
     'cataloguenumber' => 1,
     'codec' => 1,
     'container' => 1,

sections/torrents/user.php

@@ -54,7 +54,7 @@ if (!empty($_GET['format'])) {
 }
 
 # Get release specifics
-if (isset($_GET['container']) && in_array($_GET['container'], array_unique(array_merge($Containers, $ContainersGames)))) {
+if (isset($_GET['container']) && in_array($_GET['container'], array_unique(array_merge($Containers, $ContainersGames, $ContainersProt)))) {
     $SearchWhere[] = "t.Container = '".db_string($_GET['container'])."'";
 }
 

sections/upload/upload_handle.php

@@ -57,7 +57,7 @@ if (!($_POST['resolution'] ?? false)) {
 }
 
 $Properties['Resolution'] = $_POST['resolution'] ?? '';
-$Properties['AudioFormat'] = 'nil';
+$Properties['AudioFormat'] = $_POST['audioformat'] ?? '';
 $Properties['Subbing'] = 'nil';
 $Properties['Language'] = 'nil';
 $Properties['Subber'] = isset($_POST['subber']) ? $_POST['subber'] : '';
@@ -102,6 +102,7 @@ if (isset($Properties['GroupID'])) {
     $Properties['Artists'] = Artists::get_artist($Properties['GroupID']);
 }
 
+# todo: Make this more generalized
 if ($Type === 'Movies' || $Type === 'Manga' || $Type === 'Anime' || $Type === 'Games') {
     if (empty($_POST['idols'])) {
         $Err = "You didn't enter any artists/idols";
@@ -168,13 +169,22 @@ default:
             array('maxlength' => 50, 'minlength' => 0)
         );
 
+        # torrents.AudioFormat
+        $Validate->SetFields(
+            'audioformat',
+            '0',
+            'string',
+            'Version must be between 0 and 10 characters.',
+            array('maxlength' => 10, 'minlength' => 0)
+        );
+        
         # torrents_group.Name
         $Validate->SetFields(
             'title',
             '1',
             'string',
-            'Torrent Title must be between 5 and 255 characters.',
-            array('maxlength' => 255, 'minlength' => 5)
+            'Torrent Title must be between 10 and 255 characters.',
+            array('maxlength' => 255, 'minlength' => 10)
         );
 
         # torrents_group.NameRJ
@@ -268,8 +278,8 @@ default:
         'album_desc',
         '1',
         'string',
-        'The description must be between 10 and 65535 characters.',
-        array('maxlength' => 65535, 'minlength' => 10)
+        'The description must be between 100 and 65535 characters.',
+        array('maxlength' => 65535, 'minlength' => 100)
     );
 
     /* todo: Fix the Group ID validation
@@ -285,6 +295,7 @@ default:
 
 $Err = $Validate->ValidateForm($_POST); // Validate the form
 
+# todo: Move all this validation code to the Validate class
 if (count(explode(',', $Properties['TagList'])) < 5) {
     $Err = 'You must enter at least 5 tags.';
 }
@@ -393,18 +404,18 @@ if (!empty($Err)) { // Show the upload form, with the data the user entered
 //--------------- Autofill format and archive ----------------------------------//
 
 if ($T['Container'] === 'Autofill' || $T['Archive'] === 'Autofill') {
-# torrents.Container
-$Validate->ParseExtensions(
-    $Tor->file_list(),
-    array_merge($Containers, $ContainersGames, $ContainersProt)
-);
-/*
-# torrents.Archive
-$Validate->ParseExtensions(
+    # torrents.Container
+    $Validate->ParseExtensions(
     $Tor->file_list(),
     array_merge($Containers, $ContainersGames, $ContainersProt)
 );
-*/
+    /*
+    # torrents.Archive
+    $Validate->ParseExtensions(
+        $Tor->file_list(),
+        array_merge($Containers, $ContainersGames, $ContainersProt)
+    );
+    */
 }
 
 //******************************************************************************//

static/functions/upload.js

@@ -13,6 +13,7 @@ function Categories() {
   let cats = [
     { // DNA
       'javdb': {},
+      'audio': {},
       'idols': {},
       'studio': {},
       'series': {},
@@ -26,6 +27,7 @@ function Categories() {
       'release_desc': {}
     }, { // RNA
       'javdb': {},
+      'audio': {},
       'idols': {},
       'studio': {},
       'series': {},
@@ -39,6 +41,7 @@ function Categories() {
       'release_desc': {}
     }, { // Protein
       'javdb': {},
+      'audio': {},
       'idols': {},
       'studio': {},
       'series': {},
@@ -52,6 +55,7 @@ function Categories() {
       'release_desc': {}
     }, { // Imaging
       'javdb': {},
+      'audio': {},
       'idols': {},
       'studio': {},
       'series': {},
@@ -63,8 +67,9 @@ function Categories() {
       'screenshots': {},
       'group_desc': {},
       'release_desc': {}
-    }, { // Other
+    }, { // Extras
       'javdb': {},
+      'audio': {},
       'idols': {},
       'studio': {},
       'series': {},