#69

classes/torrent_form.class.php

@@ -380,10 +380,10 @@ class TorrentForm
         if (!empty($Torrent['Artists'])) {
             foreach ($Torrent['Artists'] as $Num => $Artist) {
                 ?>
-      <input type="text" id="idols_<?= $Num ?>" name="idols[]"
+      <input type="text" id="idols_<?=$Num?>" name="idols[]"
         size="45"
-        value="<?= display_str($Artist['name']) ?>"
-        <?= $this->Disabled ?>/>
+        value="<?=display_str($Artist['name'])?>"
+        <?=$this->Disabled?><?php Users::has_autocomplete_enabled('other'); ?>/>
       <?php if ($Num === 0) { ?>
       <a class="add_artist_button brackets">+</a>
       <a class="remove_artist_button brackets">&minus;</a>
@@ -392,7 +392,7 @@ class TorrentForm
             }
         } else {
             ?>
-      <input type="text" id="idols_0" name="idols[]" size="45" value="" <?= $this->Disabled ?> />
+      <input type="text" id="idols_0" name="idols[]" size="45" value="" <?=$this->Disabled?><?php Users::has_autocomplete_enabled('other'); ?>/>
       <a class="add_artist_button brackets">+</a>
       <a class="remove_artist_button brackets">&minus;</a>
       <?php
@@ -564,8 +564,8 @@ class TorrentForm
     </td>
   </tr>
 
-    <!-- 4 -->
-    <tr id="container_extra_tr">
+  <!-- 4 -->
+  <tr id="container_extra_tr">
     <td class="label">
       Format
       <strong class="important_text">*</strong>
@@ -606,8 +606,8 @@ class TorrentForm
     </td>
   </tr>
 
-    <!-- Resolution -->
-    <tr id="resolution_tr">
+  <!-- Resolution -->
+  <tr id="resolution_tr">
     <td class="label">
       Assembly Level
       <strong class="important_text">*</strong>
@@ -695,11 +695,12 @@ class TorrentForm
     <td>
       <textarea rows="1" cols="60" name="mirrors"
         id="mirrors"><?= display_str($Torrent['Mirrors'])?></textarea>
-        <strong class="important_text">Experimental.</strong>
-      Up to two FTP/HTTP addresses that either point directly to a file, or for multi-file torrents, to the enclosing folder
+      <strong class="important_text">Experimental.</strong>
+      Up to two FTP/HTTP addresses that either point directly to a file, or for multi-file torrents, to the enclosing
+      folder
   </tr>
   <?php } ?>
-  
+
   <!-- Sample pictures/links -->
   <?php if (!$this->DisabledFlag && $this->NewTorrent) { ?>
   <tr id="screenshots_tr">

classes/validate.class.php

@@ -192,16 +192,14 @@ class Validate
     {
         # Make $Tor->file_list() output manageable
         $UnNested = array_values($FileList[1]);
-        /*
         $Sorted = usort($UnNested, function ($a, $b) {
-            return $b[0] <=> $a[0];
+            return $b[0] > $a[0];
         });
-        */
-        $TopTen = array_slice($UnNested, 0, 10); # Good
+        $TopTen = array_slice($Sorted, 0, 10); # Good
         $Result = [];
 
         print_r('<pre>');
-        var_dump($TopTen);
+        var_dump($Sorted);
         print_r('</pre>');
 
 

sections/torrents/browse.php

@@ -200,9 +200,10 @@ View::show_header('Browse Torrents', 'browse');
               <!--Artist name:-->
             </td>
             <td class="ft_artistname">
-              <input type="search" spellcheck="false" size="65" name="artistname" class="inputtext smaller fti_advanced"
-                placeholder="Author Name"
-                value="<?Format::form('artistname')?>" />
+              <input type="search" spellcheck="false" size="65" id="artist" name="artistname"
+                class="inputtext smaller fti_advanced" placeholder="Author Name"
+                value="<?Format::form('artistname')?>"
+                <?php Users::has_autocomplete_enabled('other'); ?>/>
             </td>
           </tr>
 

sections/torrents/editgroup.php

@@ -196,8 +196,9 @@ if ($CategoryID == 1) {
 ?>
           </td>
           <td id="idolfields">
-            <input type="text" id="idol_0" name="idols[]" size="45"
-              value="<?=$Artists[0]['name']?>" />
+            <input type="text" id="idols_0" name="idols[]" size="45"
+              value="<?=$Artists[0]['name']?>"
+              <?php Users::has_autocomplete_enabled('other'); ?>/>
             <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
             <?php
   for ($i = 1; $i < count($Artists); $i++) {

sections/upload/upload_handle.php

@@ -598,7 +598,7 @@ if (!isset($GroupID) || !$GroupID) {
         }
     }
 
-# Main if/else
+    # Main if/else
 } else {
     $DB->query("
     UPDATE torrents_group

static/functions/autocomplete.js

@@ -5,7 +5,7 @@ $(document).ready(initAutocomplete)
 
 function initAutocomplete() {
   if (!$.Autocomplete) {
-    window.setTimeout(function() {
+    window.setTimeout(function () {
       initAutocomplete();
     }, 500)
     return;
@@ -13,37 +13,45 @@ function initAutocomplete() {
 
   var url = {
     path: window.location.pathname.split('/').reverse()[0].split(".")[0],
-    query: window.location.search.slice(1).split('&').reduce((a,b)=>Object.assign(a,{[b.split('=')[0]]:b.split('=')[1]}),{})
+    query: window.location.search.slice(1).split('&').reduce((a, b) => Object.assign(a, { [b.split('=')[0]]: b.split('=')[1] }), {})
   }
 
   $('#artistsearch' + SELECTOR).autocomplete({
     deferRequestBy: 300,
-    onSelect : function(suggestion) {
+    onSelect: function (suggestion) {
       window.location = 'artist.php?id=' + suggestion['data'];
     },
-    serviceUrl : ARTIST_AUTOCOMPLETE_URL,
+    serviceUrl: ARTIST_AUTOCOMPLETE_URL,
   });
 
-  if (url.path == 'torrents' || url.path == 'upload' || url.path == 'artist' || (url.path == 'requests' && url.query['action'] == 'new') || url.path == 'collages') {
+  if (url.path == 'torrents' || url.path == 'upload' || url.path == 'artist' || (url.path == 'requests' && url.query['action'] == 'new')) {
     $("#artist" + SELECTOR).autocomplete({
       deferRequestBy: 300,
-      serviceUrl : ARTIST_AUTOCOMPLETE_URL
-    });
-    $("#artistsimilar" + SELECTOR).autocomplete({
-      deferRequestBy: 300,
-      serviceUrl : ARTIST_AUTOCOMPLETE_URL
+      serviceUrl: ARTIST_AUTOCOMPLETE_URL
     });
   }
   if (url.path == 'torrents' || url.path == 'upload' || url.path == 'collages' || url.path == 'requests' || url.path == 'top10' || (url.path == 'requests' && url.query['action'] == 'new')) {
     $("#tags" + SELECTOR).autocomplete({
       deferRequestBy: 300,
       delimiter: ',',
-      serviceUrl : TAGS_AUTOCOMPLETE_URL
+      serviceUrl: TAGS_AUTOCOMPLETE_URL
     });
     $("#tagname" + SELECTOR).autocomplete({
       deferRequestBy: 300,
       delimiter: ',',
-      serviceUrl : TAGS_AUTOCOMPLETE_URL
+      serviceUrl: TAGS_AUTOCOMPLETE_URL
+    });
+  }
+  if (url.path == 'upload' || (url.path == 'torrents' && url.query['action'] == 'editgroup')) {
+    $("#idols_0" + SELECTOR).autocomplete({
+      deferRequestBy: 300,
+      serviceUrl: ARTIST_AUTOCOMPLETE_URL
+    });
+  }
+  if (url.path == 'requests' && url.query['action'] == 'new') {
+    $("#artist_0" + SELECTOR).autocomplete({
+      deferRequestBy: 300,
+      serviceUrl: ARTIST_AUTOCOMPLETE_URL
     });
   }
 

static/functions/requests.js

@@ -95,10 +95,11 @@ function AddArtistField() {
   x.appendChild(document.createElement("br"));
   x.appendChild(ArtistField);
 
-  if ($("#artist").data("gazelle-autocomplete")) {
-    $(ArtistField).live('focus', function () {
+  if ($("#artist_0").data("gazelle-autocomplete")) {
+    $(ArtistField).on('focus', function () {
       $(ArtistField).autocomplete({
-        serviceUrl: 'artist.php?action=autocomplete'
+        deferRequestBy: 300,
+        serviceUrl: ARTIST_AUTOCOMPLETE_URL
       });
     });
   }
@@ -117,12 +118,11 @@ function RemoveArtistField() {
     x.removeChild(x.lastChild);
   }
   x.removeChild(x.lastChild);
-  x.removeChild(x.lastChild); // Remove trailing new line.
+  x.removeChild(x.lastChild); //Remove trailing new line.
   ArtistCount--;
 }
 
 function Categories() {
-  /*
   var cat = $('#categories').raw() ? $('#categories').raw().options[$('#categories').raw().selectedIndex].value : '';
   if (cat == "Movies") {
     $('#artist_tr').gshow();
@@ -149,7 +149,6 @@ function Categories() {
     $('#cataloguenumber_tr').ghide();
     $('#dlsiteid_tr').ghide();
   }
-  */
 }
 
 function add_tag() {

static/functions/upload.js

@@ -10,51 +10,51 @@ function DisplayTrans() {
 
 function Categories() {
   let def = [
-      'javdb', // Accession Number
-      'audio', // Version
-      'title', // Torrent Title
-      'title_rj', // Organism
-      'title_jp', // Strain/Variety
-      'idols', // Authors(s)
-      'studio', // Department/Lab
-      'series', // Location
-      'year', // Year
-      'codec', // License
-      // Platform changes below
-      'resolution', // Assembly Level
-      // Format changes below
-      'archive', // Archive
-      'tags', // Tags
-      'cover', // Picture
-      'mirrors', // Mirrors
-      'screenshots', // Publications
-      'group_desc', // Torrent Group Description
-      'release_desc', // Torrent Description
-      'censored', // Aligned/Annotated
-      'anon', // Upload Anonymously
+    'javdb', // Accession Number
+    'audio', // Version
+    'title', // Torrent Title
+    'title_rj', // Organism
+    'title_jp', // Strain/Variety
+    'idols', // Authors(s)
+    'studio', // Department/Lab
+    'series', // Location
+    'year', // Year
+    'codec', // License
+    // Platform changes below
+    'resolution', // Assembly Level
+    // Format changes below
+    'archive', // Archive
+    'tags', // Tags
+    'cover', // Picture
+    'mirrors', // Mirrors
+    'screenshots', // Publications
+    'group_desc', // Torrent Group Description
+    'release_desc', // Torrent Description
+    'censored', // Aligned/Annotated
+    'anon', // Upload Anonymously
   ]
 
   let cats = [
-      { // DNA
-          'media': {}, // Platform
-          'container': {}, // Format
-      },
-      { // RNA
-          'media': {}, // Platform
-          'container': {}, // Format
-      },
-      { // Proteins
-          'media': {}, // Platform
-          'container_prot': {}, // Format
-      },
-      { // Imaging
-          'media_manga': {}, // Platform
-          'container_games': {}, // Format
-      },
-      { // Extras
-          'media': {}, // Platform
-          'container_extra': {}, // Format
-      }
+    { // DNA
+      'media': {}, // Platform
+      'container': {}, // Format
+    },
+    { // RNA
+      'media': {}, // Platform
+      'container': {}, // Format
+    },
+    { // Proteins
+      'media': {}, // Platform
+      'container_prot': {}, // Format
+    },
+    { // Imaging
+      'media_manga': {}, // Platform
+      'container_games': {}, // Format
+    },
+    { // Extras
+      'media': {}, // Platform
+      'container_extra': {}, // Format
+    }
   ]
 
   let active = {}
@@ -65,28 +65,28 @@ function Categories() {
   active = Object.assign(active, cats[category])
 
   let hide = el => {
-      Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
-      $(el).ghide()
+    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = true)
+    $(el).ghide()
   }
 
   let show = el => {
-      Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
-      $(el).gshow()
+    Array.from($(`#${el.id} input, #${el.id} select, #${el.id} textarea`)).forEach(inp => inp.disabled = false)
+    $(el).gshow()
   }
 
   let trs = $('#dynamic_form tr')
   for (let tr of trs) {
-      let field = tr.id.slice(0, -3)
-      if (active[field]) {
-          if (active[field].name) {
-              tr.children[0].innerHTML = active[field].name
-          }
-          let notes = $(`#${tr.id} p.notes`).raw()
-          if (notes) notes.innerHTML = active[field].notes || ''
-          show(tr)
-      } else {
-          hide(tr)
+    let field = tr.id.slice(0, -3)
+    if (active[field]) {
+      if (active[field].name) {
+        tr.children[0].innerHTML = active[field].name
       }
+      let notes = $(`#${tr.id} p.notes`).raw()
+      if (notes) notes.innerHTML = active[field].notes || ''
+      show(tr)
+    } else {
+      hide(tr)
+    }
   }
 }
 
@@ -283,10 +283,11 @@ function AddArtistField() {
   x.appendChild(ArtistField);
   x.appendChild(document.createTextNode('\n'));
 
-  if ($("#idol").data("gazelle-autocomplete")) {
-    $(ArtistField).live('focus', function () {
+  if ($("#idols_0").data("gazelle-autocomplete")) {
+    $(ArtistField).on('focus', function () {
       $(ArtistField).autocomplete({
-        serviceUrl: 'artist.php?action=autocomplete'
+        deferRequestBy: 300,
+        serviceUrl: ARTIST_AUTOCOMPLETE_URL
       });
     });
   }