todo: Use extension parser in torrent edit handler

_packages/extension-parser/classes/torrent_form.class.php

@@ -28,7 +28,6 @@ class TorrentForm
   </td>
   <td>
     <select name="container">
-      <option value="">---</option>
       <option value="Autofill">Autofill</option>
       <?php
         foreach ($this->Containers as $Name => $Container) {
@@ -47,7 +46,6 @@ class TorrentForm
   </td>
   <td>
     <select id="container" name="container">
-      <option value="">---</option>
       <option value="Autofill">Autofill</option>
       <?php
         foreach ($this->ContainersGames as $Name => $Container) {
@@ -66,7 +64,6 @@ class TorrentForm
   </td>
   <td>
     <select id="container" name="container">
-      <option value="">---</option>
       <option value="Autofill">Autofill</option>
       <?php
         foreach ($this->ContainersProt as $Name => $Container) {
@@ -85,7 +82,6 @@ class TorrentForm
   </td>
   <td>
     <select id="container" name="container">
-      <option value="">---</option>
       <option value="Autofill">Autofill</option>
       <?php
         foreach ($this->ContainersExtra as $Name => $Container) {
@@ -104,7 +100,6 @@ class TorrentForm
   </td>
   <td>
     <select name='archive'>
-      <option value="">---</option>
       <option value="Autofill">Autofill</option>
       <?php
         foreach ($this->Archives as $Name => $Archive) {

_packages/extension-parser/classes/validate.class.php

@@ -15,51 +15,49 @@ class Validate
      * ];
      *
      * Then it finds all the extensions in a torrent file list,
-     * organizes them by file size, and returns the "heaviest" match.
+     * organizes them by file size, and returns the heaviest match.
      *
      * That way, you can have, e.g., 5 GiB FASTQ sequence data in one file,
      * and 100 other small files, and get the format of the actual data.
      *
-     * todo: Incorporate into the main function (remove if statements first)
+     * todo: Incorporate into $this->ValidateForm (remove if statements first)
      */
     public function ParseExtensions($FileList, $Category, $FileTypes)
     {
-        # Make $Tor->file_list() output manageable
+        # Sort $Tor->file_list() output by size
         $UnNested = array_values($FileList[1]);
         $Sorted = (usort($UnNested, function ($a, $b) {
-            return $b <=> $a; # Workaround because ↑ returns true
-        }) === true) ? array_values($UnNested) : null;
+            return $b <=> $a;
+        })) ? $UnNested : null;  # Ternary wrap because ↑ returns true
         
         # Harvest the wheat
-        $TopTen = array_slice($Sorted, 0, 10);
-        $Result = [];
+        # todo: Entries seem duplicated here
+        $Heaviest = array_slice($Sorted, 0, 20);
+        $Matches = [];
 
-        foreach ($TopTen as $TopTen) {
-            # How many extensions to keep
-            $Extensions = array_slice(explode('.', strtolower($TopTen[1])), -2, 2);
-    
-            print_r('<pre>');
-            var_dump($FileTypes);
-            print_r('</pre>');
+        foreach ($Heaviest as $Heaviest) {
+            # Collect the last 2 period-separated tokens
+            $Extensions = array_slice(explode('.', strtolower($Heaviest[1])), -2, 2);
+            $Matches = array_merge($Extensions);
 
-            $Result = array_filter($Extensions, function ($a) {
-                foreach ($FileTypes as $FileType) {
-                    in_array($a, $FileType);
-                }
-            });
+            # Distill the file format
+            $FileTypes = $FileTypes[$Category];
+            $FileTypeNames = array_keys($FileTypes);
 
-            /*
-            foreach ($FileTypes as $k => $FileType) {
-                var_dump(array_intersect($Extensions, $FileTypes));
+            # todo: Find the smallest possible number of iterations
+            # todo: Reduce nesting by one level
+            foreach ($Matches as $Match) {
+                $Match = strtolower($Match);
+        
+                foreach ($FileTypeNames as $FileTypeName) {
+                    $SearchMe = [ $FileTypeName, $FileTypes[$FileTypeName] ];
+        
+                    if (in_array($Match, $SearchMe[1])) {
+                        return $SearchMe[0];
+                        break;
+                    }
+                }
             }
-            */
         }
-
-        print_r('<pre>');
-        print_r('===== RESULTS =====');
-        print_r($Result);
-        print_r('</pre>');
-
-        # To be continued
     }
-    # Line 229
+    # Line 227

_packages/extension-parser/sections/upload/upload_handle.php

@@ -22,6 +22,7 @@ $Properties['Containers'] = [
 //--------------- Autofill format and archive ----------------------------------//
 
 if ($T['Container'] === 'Autofill') {
+
     # torrents.Container
     $Validate->ParseExtensions(
         # $FileList
@@ -36,7 +37,7 @@ if ($T['Container'] === 'Autofill') {
 }
 
 if ($T['Archive'] === 'Autofill') {
-    /*
+
     # torrents.Archive
     $Validate->ParseExtensions(
         # $FileList
@@ -48,6 +49,5 @@ if ($T['Archive'] === 'Autofill') {
         # $FileTypes
         $T['FileTypes'],
     );
-    */
 }
 # Line 452

classes/torrent_form.class.php

@@ -515,7 +515,6 @@ class TorrentForm
     </td>
     <td>
       <select name="container">
-        <option value="">---</option>
         <option value="Autofill">Autofill</option>
         <?php
           foreach ($this->Containers as $Name => $Container) {
@@ -534,7 +533,6 @@ class TorrentForm
     </td>
     <td>
       <select id="container" name="container">
-        <option value="">---</option>
         <option value="Autofill">Autofill</option>
         <?php
           foreach ($this->ContainersGames as $Name => $Container) {
@@ -553,7 +551,6 @@ class TorrentForm
     </td>
     <td>
       <select id="container" name="container">
-        <option value="">---</option>
         <option value="Autofill">Autofill</option>
         <?php
           foreach ($this->ContainersProt as $Name => $Container) {
@@ -572,7 +569,6 @@ class TorrentForm
     </td>
     <td>
       <select id="container" name="container">
-        <option value="">---</option>
         <option value="Autofill">Autofill</option>
         <?php
           foreach ($this->ContainersExtra as $Name => $Container) {
@@ -591,7 +587,6 @@ class TorrentForm
     </td>
     <td>
       <select name='archive'>
-        <option value="">---</option>
         <option value="Autofill">Autofill</option>
         <?php
           foreach ($this->Archives as $Name => $Archive) {

classes/validate.class.php

@@ -180,36 +180,50 @@ class Validate
      * ];
      *
      * Then it finds all the extensions in a torrent file list,
-     * organizes them by file size, and returns the "heaviest" match.
+     * organizes them by file size, and returns the heaviest match.
      *
      * That way, you can have, e.g., 5 GiB FASTQ sequence data in one file,
      * and 100 other small files, and get the format of the actual data.
      *
-     * todo: Incorporate into the main function (remove if statements first)
+     * todo: Incorporate into $this->ValidateForm (remove if statements first)
      */
     public function ParseExtensions($FileList, $Category, $FileTypes)
     {
-        # Make $Tor->file_list() output manageable
+        # Sort $Tor->file_list() output by size
         $UnNested = array_values($FileList[1]);
         $Sorted = (usort($UnNested, function ($a, $b) {
-            return $b <=> $a; # Workaround because ↑ returns true
-        }) === true) ? $UnNested : null;
+            return $b <=> $a;
+        })) ? $UnNested : null;  # Ternary wrap because ↑ returns true
         
         # Harvest the wheat
-        $TopTen = array_slice($Sorted, 0, 10);
-        $Match = null;
+        # todo: Entries seem duplicated here
+        $Heaviest = array_slice($Sorted, 0, 20);
+        $Matches = [];
 
-        do {
-            $Extensions = array_slice(explode('.', strtolower($TopTen[1])), -2, 2);
-            #array_shift(something)
-        } while ($i > 0);
+        foreach ($Heaviest as $Heaviest) {
+            # Collect the last 2 period-separated tokens
+            $Extensions = array_slice(explode('.', strtolower($Heaviest[1])), -2, 2);
+            $Matches = array_merge($Extensions);
 
-        print_r('<pre>');
-        print_r('===== RESULTS =====');
-        print_r($Matches);
-        print_r('</pre>');
+            # Distill the file format
+            $FileTypes = $FileTypes[$Category];
+            $FileTypeNames = array_keys($FileTypes);
 
-        # To be continued
+            # todo: Find the smallest possible number of iterations
+            # todo: Reduce nesting by one level
+            foreach ($Matches as $Match) {
+                $Match = strtolower($Match);
+        
+                foreach ($FileTypeNames as $FileTypeName) {
+                    $SearchMe = [ $FileTypeName, $FileTypes[$FileTypeName] ];
+        
+                    if (in_array($Match, $SearchMe[1])) {
+                        return $SearchMe[0];
+                        break;
+                    }
+                }
+            }
+        }
     }
 
     public function GenerateJS($FormID)

sections/torrents/takeedit.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 //******************************************************************************//
 //--------------- Take edit ----------------------------------------------------//
 // This pages handles the backend of the 'edit torrent' function. It checks     //
@@ -10,7 +11,6 @@ enforce_login();
 authorize();
 
 require_once(SERVER_ROOT.'/classes/validate.class.php');
-
 $Validate = new Validate;
 
 //******************************************************************************//
@@ -24,21 +24,45 @@ $_POST['type'] = $_POST['type'] + 1;
 $TypeID = (int)$_POST['type'];
 $Type = $Categories[$TypeID-1];
 $TorrentID = (int)$_POST['torrentid'];
+
+# todo: Associate containers with categories beforehand
+# It may have to happen structurally in config.php, e.g.,
+# $Categories = [
+#   'GazelleName' => [$Name, $Icon, $Description, $Containers],
+#    ...
+#  ];
+$Properties['FileTypes'] = [
+  'DNA'      => $Containers,
+  'RNA'      => $Containers,
+  'Proteins' => $ContainersProt,
+  'Imaging'  => $ContainersGames,
+  'Extras'   => $ContainersExtra
+];
+$Properties['ArchiveTypes'] = [
+  'DNA'      => $Archives,
+  'RNA'      => $Archives,
+  'Proteins' => $Archives,
+  'Imaging'  => $Archives,
+  'Extras'   => $Archives
+];
+
 $Properties['Remastered'] = (isset($_POST['remaster']))? 1 : 0;
 if ($Properties['Remastered']) {
-  $Properties['UnknownRelease'] = (isset($_POST['unknown'])) ? 1 : 0;
+    $Properties['UnknownRelease'] = (isset($_POST['unknown'])) ? 1 : 0;
 }
 if (!$Properties['Remastered']) {
-  $Properties['UnknownRelease'] = 0;
+    $Properties['UnknownRelease'] = 0;
 }
+
 $Properties['BadTags'] = (isset($_POST['bad_tags']))? 1 : 0;
 $Properties['BadFolders'] = (isset($_POST['bad_folders']))? 1 : 0;
 $Properties['BadFiles'] = (isset($_POST['bad_files'])) ? 1 : 0;
+$Properties['Trumpable'] = (isset($_POST['make_trumpable'])) ? 1 : 0;
+
 $Properties['Format'] = $_POST['format'];
 $Properties['Media'] = $_POST['media'];
 $Properties['Bitrate'] = $_POST['bitrate'];
 $Properties['Encoding'] = $_POST['bitrate'];
-$Properties['Trumpable'] = (isset($_POST['make_trumpable'])) ? 1 : 0;
 $Properties['TorrentDescription'] = $_POST['release_desc'];
 $Properties['MediaInfo'] = $_POST['mediainfo'];
 $Properties['Name'] = $_POST['title'];
@@ -49,29 +73,31 @@ $Properties['AudioFormat'] = $_POST['audioformat'];
 $Properties['Subbing'] = $_POST['sub'];
 $Properties['Language'] = $_POST['lang'];
 $Properties['Subber']= $_POST['subber'];
+
 $Properties['Censored'] = (isset($_POST['censored'])) ? '1' : '0';
 $Properties['Anonymous'] = (isset($_POST['anonymous'])) ? '1' : '0';
 $Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] != '---') ? $_POST['archive'] : '';
 
 if ($_POST['album_desc']) {
-  $Properties['GroupDescription'] = $_POST['album_desc'];
+    $Properties['GroupDescription'] = $_POST['album_desc'];
 }
+
 if (check_perms('torrents_freeleech')) {
-  $Free = (int)$_POST['freeleech'];
-  if (!in_array($Free, array(0, 1, 2))) {
-    error(404);
-  }
-  $Properties['FreeLeech'] = $Free;
-
-  if ($Free == 0) {
-    $FreeType = 0;
-  } else {
-    $FreeType = (int)$_POST['freeleechtype'];
-    if (!in_array($Free, array(0, 1, 2, 3))) {
-      error(404);
+    $Free = (int)$_POST['freeleech'];
+    if (!in_array($Free, array(0, 1, 2))) {
+        error(404);
     }
-  }
-  $Properties['FreeLeechType'] = $FreeType;
+    $Properties['FreeLeech'] = $Free;
+
+    if ($Free === 0) {
+        $FreeType = 0;
+    } else {
+        $FreeType = (int)$_POST['freeleechtype'];
+        if (!in_array($Free, array(0, 1, 2, 3))) {
+            error(404);
+        }
+    }
+    $Properties['FreeLeechType'] = $FreeType;
 }
 
 //******************************************************************************//
@@ -83,162 +109,204 @@ $DB->query("
   FROM torrents
   WHERE ID = $TorrentID");
 */
+
 $DB->query("
   SELECT UserID, FreeTorrent
   FROM torrents
   WHERE ID = $TorrentID");
+
 if (!$DB->has_results()) {
-  error(404);
+    error(404);
 }
+
 // list($UserID, $Remastered, $RemasterYear, $CurFreeLeech) = $DB->next_record(MYSQLI_BOTH, false);
 list($UserID, $CurFreeLeech) = $DB->next_record(MYSQLI_BOTH, false);
 
 if ($LoggedUser['ID'] != $UserID && !check_perms('torrents_edit')) {
-  error(403);
+    error(403);
 }
 
-/*
-if ($Remastered == '1' && !$RemasterYear && !check_perms('edit_unknowns')) {
+/* todo: Check strict equality and untangle features
+if ($Remastered === '1' && !$RemasterYear && !check_perms('edit_unknowns')) {
   error(403);
 }
 */
 
-if ($Properties['UnknownRelease'] && !($Remastered == '1' && !$RemasterYear) && !check_perms('edit_unknowns')) {
-  //It's Unknown now, and it wasn't before
-  if ($LoggedUser['ID'] != $UserID) {
-    //Hax
-    die();
-  }
+if ($Properties['UnknownRelease'] && !($Remastered === '1' && !$RemasterYear) && !check_perms('edit_unknowns')) {
+    // It's Unknown now, and it wasn't before
+    if ($LoggedUser['ID'] !== $UserID) {
+        // Hax
+        die();
+    }
 }
 
-$Validate->SetFields('type', '1', 'number', 'Not a valid type.', array('maxlength' => count($Categories), 'minlength' => 1));
+$Validate->SetFields(
+    'type',
+    '1',
+    'number',
+    'Not a valid type',
+    array('maxlength' => count($Categories), 'minlength' => 1)
+);
+
+/* Ugh
 switch ($Type) {
   case 'Music':
     if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease']) {
-      $Validate->SetFields('remaster_year', '1', 'number', 'Year of remaster/re-issue must be entered.');
+        $Validate->SetFields(
+            'remaster_year',
+            '1',
+            'number',
+            'Year of remaster/re-issue must be entered'
+        );
     } else {
-      $Validate->SetFields('remaster_year', '0','number', 'Invalid remaster year.');
+        $Validate->SetFields(
+            'remaster_year',
+            '0',
+            'number',
+            'Invalid remaster year'
+        );
     }
 
-    if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease'] && $Properties['RemasterYear'] < 1982 && $Properties['Media'] == 'CD') {
-      error('You have selected a year for an album that predates the medium you say it was created on.');
-      header("Location: torrents.php?action=edit&id=$TorrentID");
-      die();
-    }
-
-    $Validate->SetFields('remaster_title', '0', 'string', 'Remaster title must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
-
-    if ($Properties['RemasterTitle'] == 'Original Release') {
-      error('"Original Release" is not a valid remaster title.');
-      header("Location: torrents.php?action=edit&id=$TorrentID");
-      die();
+    if (!empty($Properties['Remastered']) && !$Properties['UnknownRelease'] && $Properties['RemasterYear'] < 1982 && $Properties['Media'] === 'CD') {
+        error('You have selected a year for an album that predates the medium you say it was created on');
+        header("Location: torrents.php?action=edit&id=$TorrentID");
+        die();
     }
 
-    $Validate->SetFields('remaster_record_label', '0', 'string', 'Remaster record label must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
-
-    $Validate->SetFields('remaster_catalogue_number', '0', 'string', 'Remaster catalogue number must be between 2 and 80 characters.', array('maxlength' => 80, 'minlength' => 2));
-
-
-    $Validate->SetFields('format', '1', 'inarray', 'Not a valid format.', array('inarray' => $Formats));
-
-    $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
-
-
-    // Handle 'other' bitrates
-    if ($Properties['Encoding'] == 'Other') {
-      $Validate->SetFields('other_bitrate', '1', 'text', 'You must enter the other bitrate (max length: 9 characters).', array('maxlength' => 9));
-      $enc = trim($_POST['other_bitrate']);
-      if (isset($_POST['vbr'])) {
-        $enc .= ' (VBR)';
-      }
-
-      $Properties['Encoding'] = $enc;
-      $Properties['Bitrate'] = $enc;
-    } else {
-      $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+    $Validate->SetFields(
+        'remaster_title',
+        '0',
+        'string',
+        'Remaster title must be between 2 and 80 characters',
+        array('maxlength' => 80, 'minlength' => 2)
+    );
+
+    if ($Properties['RemasterTitle'] === 'Original Release') {
+        error('"Original Release" is not a valid remaster title');
+        header("Location: torrents.php?action=edit&id=$TorrentID");
+        die();
     }
 
-    $Validate->SetFields('media', '1', 'inarray', 'Not a valid media.', array('inarray' => $Media));
-
-    $Validate->SetFields('release_desc', '0', 'string', 'Invalid release description.', array('maxlength' => 1000000, 'minlength' => 0));
-
-    break;
-
-  case 'Audiobooks':
-  case 'Comedy':
-    /*$Validate->SetFields('title', '1', 'string', 'Title must be between 2 and 300 characters.', array('maxlength' => 300, 'minlength' => 2));
-    ^ this is commented out because there is no title field on these pages*/
-    $Validate->SetFields('year', '1', 'number', 'The year of the release must be entered.');
-
-    $Validate->SetFields('format', '1', 'inarray', 'Not a valid format.', array('inarray' => $Formats));
-
-    $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+    $Validate->SetFields(
+        'remaster_record_label',
+        '0',
+        'string',
+        'Remaster record label must be between 2 and 80 characters',
+        array('maxlength' => 80, 'minlength' => 2)
+    );
+
+    $Validate->SetFields(
+        'remaster_catalogue_number',
+        '0',
+        'string',
+        'Remaster catalogue number must be between 2 and 80 characters',
+        array('maxlength' => 80, 'minlength' => 2)
+    );
+
+    $Validate->SetFields(
+        'format',
+        '1',
+        'inarray',
+        'Not a valid format',
+        array('inarray' => $Formats)
+    );
+
+    $Validate->SetFields(
+        'bitrate',
+        '1',
+        'inarray',
+        'You must choose a bitrate',
+        array('inarray' => $Bitrates)
+    );
 
 
     // Handle 'other' bitrates
-    if ($Properties['Encoding'] == 'Other') {
-      $Validate->SetFields('other_bitrate', '1', 'text', 'You must enter the other bitrate (max length: 9 characters).', array('maxlength' => 9));
-      $enc = trim($_POST['other_bitrate']);
-      if (isset($_POST['vbr'])) {
-        $enc .= ' (VBR)';
-      }
-
-      $Properties['Encoding'] = $enc;
-      $Properties['Bitrate'] = $enc;
+    if ($Properties['Encoding'] === 'Other') {
+        $Validate->SetFields(
+            'other_bitrate',
+            '1',
+            'text',
+            'You must enter the other bitrate (max length: 9 characters)',
+            array('maxlength' => 9)
+        );
+
+        $enc = trim($_POST['other_bitrate']);
+        if (isset($_POST['vbr'])) {
+            $enc .= ' (VBR)';
+        }
+
+        $Properties['Encoding'] = $enc;
+        $Properties['Bitrate'] = $enc;
     } else {
-      $Validate->SetFields('bitrate', '1', 'inarray', 'You must choose a bitrate.', array('inarray' => $Bitrates));
+        $Validate->SetFields(
+            'bitrate',
+            '1',
+            'inarray',
+            'You must choose a bitrate',
+            array('inarray' => $Bitrates)
+        );
     }
 
-    $Validate->SetFields('release_desc', '0', 'string', 'The release description has a minimum length of 10 characters.', array('maxlength' => 1000000, 'minlength' => 10));
-
+    $Validate->SetFields(
+        'media',
+        '1',
+        'inarray',
+        'Not a valid media',
+        array('inarray' => $Media)
+    );
+
+    $Validate->SetFields(
+        'release_desc',
+        '0',
+        'string',
+        'Invalid release description',
+        array('maxlength' => 1000000, 'minlength' => 0)
+    );
     break;
 
-  case 'Applications':
-  case 'Comics':
-  case 'E-Books':
-  case 'E-Learning Videos':
-    /*$Validate->SetFields('title', '1', 'string', 'Title must be between 2 and 300 characters.', array('maxlength' => 300, 'minlength' => 2));
-      ^ this is commented out because there is no title field on these pages*/
+  default:
     break;
 }
+*/
 
 $Err = $Validate->ValidateForm($_POST); // Validate the form
 
 if ($Properties['Remastered'] && !$Properties['RemasterYear']) {
-  //Unknown Edit!
-  if ($LoggedUser['ID'] == $UserID || check_perms('edit_unknowns')) {
-    //Fine!
-  } else {
-    $Err = "You may not edit someone else's upload to unknown release.";
-  }
+    // Unknown Edit!
+    if ($LoggedUser['ID'] === $UserID || check_perms('edit_unknowns')) {
+        // Fine!
+    } else {
+        $Err = "You may not edit someone else's upload to unknown release";
+    }
 }
 
 // Strip out Amazon's padding
+/*
 $AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
 $Matches = [];
 if (preg_match($RegX, $Properties['Image'], $Matches)) {
-  $Properties['Image'] = $Matches[1].'.jpg';
+    $Properties['Image'] = $Matches[1].'.jpg';
 }
 ImageTools::blacklisted($Properties['Image']);
+*/
 
 if ($Err) { // Show the upload form, with the data the user entered
-  if (check_perms('site_debug')) {
-    die($Err);
-  }
-  error($Err);
+    if (check_perms('site_debug')) {
+        die($Err);
+    }
+    error($Err);
 }
 
-
 //******************************************************************************//
 //--------------- Make variables ready for database input ----------------------//
 
 // Shorten and escape $Properties for database input
 $T = [];
 foreach ($Properties as $Key => $Value) {
-  $T[$Key] = "'".db_string(trim($Value))."'";
-  if (!$T[$Key]) {
-    $T[$Key] = null;
-  }
+    $T[$Key] = "'".db_string(trim($Value))."'";
+    if (!$T[$Key]) {
+        $T[$Key] = null;
+    }
 }
 
 $T['Censored'] = $Properties['Censored'];
@@ -257,20 +325,20 @@ $DBTorVals = $DB->to_array(false, MYSQLI_ASSOC);
 $DBTorVals = $DBTorVals[0];
 $LogDetails = '';
 foreach ($DBTorVals as $Key => $Value) {
-  $Value = "'$Value'";
-  if ($Value != $T[$Key]) {
-    if (!isset($T[$Key])) {
-      continue;
-    }
-    if ((empty($Value) && empty($T[$Key])) || ($Value == "'0'" && $T[$Key] == "''")) {
-      continue;
-    }
-    if ($LogDetails == '') {
-      $LogDetails = "$Key: $Value -> ".$T[$Key];
-    } else {
-      $LogDetails = "$LogDetails, $Key: $Value -> ".$T[$Key];
+    $Value = "'$Value'";
+    if ($Value != $T[$Key]) {
+        if (!isset($T[$Key])) {
+            continue;
+        }
+        if ((empty($Value) && empty($T[$Key])) || ($Value == "'0'" && $T[$Key] == "''")) {
+            continue;
+        }
+        if ($LogDetails == '') {
+            $LogDetails = "$Key: $Value -> ".$T[$Key];
+        } else {
+            $LogDetails = "$LogDetails, $Key: $Value -> ".$T[$Key];
+        }
     }
-  }
 }
 $T['Censored'] = $Properties['Censored'];
 $T['Anonymous'] = $Properties['Anonymous'];
@@ -308,92 +376,92 @@ $SQL = "
     Anonymous = $T[Anonymous],";
 
 if (check_perms('torrents_freeleech')) {
-  $SQL .= "FreeTorrent = $T[FreeLeech],";
-  $SQL .= "FreeLeechType = $T[FreeLeechType],";
+    $SQL .= "FreeTorrent = $T[FreeLeech],";
+    $SQL .= "FreeLeechType = $T[FreeLeechType],";
 }
 
 if (check_perms('users_mod')) {
-/*  if ($T[Format] != "'FLAC'") {
-    $SQL .= "
-      HasLog = '0',
-      HasCue = '0',";
-  } else {
-    $SQL .= "
-      HasLog = $T[HasLog],
-      HasCue = $T[HasCue],";
-  }
-*/
-  $DB->query("
+    /*  if ($T[Format] != "'FLAC'") {
+        $SQL .= "
+          HasLog = '0',
+          HasCue = '0',";
+      } else {
+        $SQL .= "
+          HasLog = $T[HasLog],
+          HasCue = $T[HasCue],";
+      }
+    */
+    $DB->query("
     SELECT TorrentID
     FROM torrents_bad_tags
     WHERE TorrentID = '$TorrentID'");
-  list($btID) = $DB->next_record();
+    list($btID) = $DB->next_record();
 
-  if (!$btID && $Properties['BadTags']) {
-    $DB->query("
+    if (!$btID && $Properties['BadTags']) {
+        $DB->query("
       INSERT INTO torrents_bad_tags
       VALUES ($TorrentID, $LoggedUser[ID], NOW())");
-  }
-  if ($btID && !$Properties['BadTags']) {
-    $DB->query("
+    }
+    if ($btID && !$Properties['BadTags']) {
+        $DB->query("
       DELETE FROM torrents_bad_tags
       WHERE TorrentID = '$TorrentID'");
-  }
+    }
 
-  $DB->query("
+    $DB->query("
     SELECT TorrentID
     FROM torrents_bad_folders
     WHERE TorrentID = '$TorrentID'");
-  list($bfID) = $DB->next_record();
+    list($bfID) = $DB->next_record();
 
-  if (!$bfID && $Properties['BadFolders']) {
-    $DB->query("
+    if (!$bfID && $Properties['BadFolders']) {
+        $DB->query("
       INSERT INTO torrents_bad_folders
       VALUES ($TorrentID, $LoggedUser[ID], NOW())");
-  }
-  if ($bfID && !$Properties['BadFolders']) {
-    $DB->query("
+    }
+    if ($bfID && !$Properties['BadFolders']) {
+        $DB->query("
       DELETE FROM torrents_bad_folders
       WHERE TorrentID = '$TorrentID'");
-  }
+    }
 
-  $DB->query("
+    $DB->query("
     SELECT TorrentID
     FROM torrents_bad_files
     WHERE TorrentID = '$TorrentID'");
-  list($bfiID) = $DB->next_record();
+    list($bfiID) = $DB->next_record();
 
-  if (!$bfiID && $Properties['BadFiles']) {
-    $DB->query("
+    if (!$bfiID && $Properties['BadFiles']) {
+        $DB->query("
       INSERT INTO torrents_bad_files
       VALUES ($TorrentID, $LoggedUser[ID], NOW())");
-  }
-  if ($bfiID && !$Properties['BadFiles']) {
-    $DB->query("
+    }
+    if ($bfiID && !$Properties['BadFiles']) {
+        $DB->query("
       DELETE FROM torrents_bad_files
       WHERE TorrentID = '$TorrentID'");
-  }
+    }
 
-  $DB->query("
+    $DB->query("
     SELECT TorrentID
     FROM library_contest
     WHERE TorrentID = '$TorrentID'");
-  list($lbID) = $DB->next_record();
-  if (!$lbID && $Properties['LibraryUpload'] && $Properties['LibraryPoints'] > 0) {
-    $DB->query("
+    list($lbID) = $DB->next_record();
+    if (!$lbID && $Properties['LibraryUpload'] && $Properties['LibraryPoints'] > 0) {
+        $DB->query("
       SELECT UserID
       FROM torrents
       WHERE ID = $TorrentID");
-    list($UploaderID) = $DB->next_record();
-    $DB->query("
+        list($UploaderID) = $DB->next_record();
+        $DB->query("
       INSERT INTO library_contest
       VALUES ($UploaderID, $TorrentID, $Properties[LibraryPoints])");
-  }
-  if ($lbID && !$Properties['LibraryUpload']) {
-    $DB->query("
+    }
+    if ($lbID && !$Properties['LibraryUpload']) {
+        $DB->query("
       DELETE FROM library_contest
       WHERE TorrentID = '$TorrentID'");
-  }
+    }
 }
 
 $SQL .= "
@@ -402,7 +470,7 @@ $SQL .= "
 $DB->query($SQL);
 
 if (check_perms('torrents_freeleech') && $Properties['FreeLeech'] != $CurFreeLeech) {
-  Torrents::freeleech_torrents($TorrentID, $Properties['FreeLeech'], $Properties['FreeLeechType']);
+    Torrents::freeleech_torrents($TorrentID, $Properties['FreeLeech'], $Properties['FreeLeechType']);
 }
 
 $DB->query("
@@ -413,11 +481,11 @@ list($GroupID, $Time) = $DB->next_record();
 
 // Competition
 if (strtotime($Time) > 1241352173) {
-  if ($_POST['log_score'] == '100') {
-    $DB->query("
+    if ($_POST['log_score'] == '100') {
+        $DB->query("
       INSERT IGNORE into users_points (GroupID, UserID, Points)
       VALUES ('$GroupID', '$UserID', '1')");
-  }
+    }
 }
 // End competiton
 
@@ -442,4 +510,3 @@ Torrents::update_hash($GroupID);
 // All done!
 
 header("Location: torrents.php?id=$GroupID");
-?>

sections/upload/upload_handle.php

@@ -47,7 +47,6 @@ $Properties['CategoryName'] = $Type;
 #   'GazelleName' => [$Name, $Icon, $Description, $Containers],
 #    ...
 #  ];
-$Properties['ArchiveTypes'] = $Archives;
 $Properties['FileTypes'] = [
     'DNA'      => $Containers,
     'RNA'      => $Containers,
@@ -55,6 +54,13 @@ $Properties['FileTypes'] = [
     'Imaging'  => $ContainersGames,
     'Extras'   => $ContainersExtra
 ];
+$Properties['ArchiveTypes'] = [
+    'DNA'      => $Archives,
+    'RNA'      => $Archives,
+    'Proteins' => $Archives,
+    'Imaging'  => $Archives,
+    'Extras'   => $Archives
+];
 
 $Properties['Title'] = $_POST['title'];
 $Properties['TitleRJ'] = $_POST['title_rj'];
@@ -423,7 +429,8 @@ if (!empty($Err)) { // Show the upload form, with the data the user entered
 
 if ($T['Container'] === 'Autofill') {
     # torrents.Container
-    $Validate->ParseExtensions(
+    $T['Container'] = $Validate->ParseExtensions(
+
         # $FileList
         $Tor->file_list(),
 
@@ -436,9 +443,9 @@ if ($T['Container'] === 'Autofill') {
 }
 
 if ($T['Archive'] === 'Autofill') {
-    /*
     # torrents.Archive
-    $Validate->ParseExtensions(
+    $T['Archive'] = $Validate->ParseExtensions(
+
         # $FileList
         $Tor->file_list(),
 
@@ -446,9 +453,8 @@ if ($T['Archive'] === 'Autofill') {
         $T['CategoryName'],
 
         # $FileTypes
-        $T['FileTypes'],
+        $T['ArchiveTypes'],
     );
-    */
 }
 
 //******************************************************************************//