Partial implementation of extra resolution metadata

classes/config.template

  */
 
 # Pre-shared key for generating hmacs for the image proxy
-define('IMAGE_PSK', '00000000000000000000000000000000');
 ENV::setPriv('IMAGE_PSK', '00000000000000000000000000000000');
 
  # Production
  * Found in the `permissions` table.
  */
 
-#      Name of class     Class ID (not level)
-define('ADMIN', '1');
-define('USER', '2');
-define('MEMBER', '3');
-define('POWER', '4');
-define('ELITE', '5');
-define('LEGEND', '8');
-define('MOD', '11');
-define('SYSOP', '15');
-define('ARTIST', '19');
-define('DONOR', '20');
-define('VIP', '21');
+#       Name of class     Class ID (not level)
+define('ADMIN',          '1');
+define('USER',           '2');
+define('MEMBER',         '3');
+define('POWER',          '4');
+define('ELITE',          '5');
+define('LEGEND',         '8');
+define('MOD',            '11');
+define('SYSOP',          '15');
+define('ARTIST',         '19');
+define('DONOR',          '20');
+define('VIP',            '21');
 define('TORRENT_MASTER', '23');
-define('POWER_TM', '24');
-define('FLS_TEAM', '33');
-define('FORUM_MOD', '9001');
+define('POWER_TM',       '24');
+define('FLS_TEAM',       '33');
+define('FORUM_MOD',      '9001');
 
 
 /**
 
 # Ratio requirements, in descending order
 define('RATIO_REQUIREMENTS', [
- # Downloaded     Req (0% seeded) Req (100% seeded)
-  [200 * 1024**3, 0.60,           0.60],
-  [160 * 1024**3, 0.60,           0.50],
-  [120 * 1024**3, 0.50,           0.40],
-  [100 * 1024**3, 0.40,           0.30],
-  [80  * 1024**3, 0.30,           0.20],
-  [60  * 1024**3, 0.20,           0.10],
-  [40  * 1024**3, 0.15,           0.00],
-  [20  * 1024**3, 0.10,           0.00],
-  [10  * 1024**3, 0.05,           0.00],
+ # Downloaded     Req (0% seed) Req (100% seed)
+  [200 * 1024**3, 0.60,         0.60],
+  [160 * 1024**3, 0.60,         0.50],
+  [120 * 1024**3, 0.50,         0.40],
+  [100 * 1024**3, 0.40,         0.30],
+  [80  * 1024**3, 0.30,         0.20],
+  [60  * 1024**3, 0.20,         0.10],
+  [40  * 1024**3, 0.15,         0.00],
+  [20  * 1024**3, 0.10,         0.00],
+  [10  * 1024**3, 0.05,         0.00],
 ]);
 
 # God I wish I didn't have to do this but I just don't care anymore
     '256'  => 15,
     '512'  => 16,
     '1024' => 17,
-    '2048' => 18
+    '2048' => 18,
   ],
 
   'UL' => [
     '512'  => 25,
     '1024' => 26,
     '2048' => 27,
-    '4096' => 28
+    '4096' => 28,
   ],
 
   'Posts' => [
     '250'  => 65,
     '500'  => 66,
     '1000' => 67,
-    '2500' => 68
+    '2500' => 68,
   ]
 ];
 ENV::setPub(
   'Documents',
   'Machine Data',
 ];
-
 $GroupedCategories = $Categories;
-#$CategoryIcons = ['music.png', 'apps.png', 'ebook.png', 'audiobook.png', 'elearning.png', 'comedy.png', 'comics.png'];
 
 # Plain Formats
 $PlainFormats = [
 
 # Platforms
 $SeqPlatforms = [
-#$Media = [
   # DNA
   'Complete Genomics',
   'cPAS-BGI/MGI',
 # Sequence Formats
 # https://www.ncbi.nlm.nih.gov/sra/docs/submitformats/
 $SeqFormats = [
-#$Containers = [
   'BAM'        => ['bam'],
   'CRAM'       => ['cram'],
   'EMBL'       => ['embl'],
 # DON'T PARSE RAW FILES. TOO MANY COMPETING VENDORS
 # https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3518119/
 $ProtFormats = [
-#$ContainersProt = [
   'ABI/Sciex'      => ['t2d', 'wiff'],
   'APML'           => ['apml'],
   'ASF'            => ['asf'],
 
 # Image Platforms
 $ImgPlatforms = [
-#$MediaManga = [
   'CT/CAT',
   'ECG',
   'Elastography',
 # Image Formats
 # https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3948928/
 $ImgFormats = [
-#$ContainersGames = [
   'Analyze'   => ['hdr', 'img'],
   'Interfile' => ['h33'],
   'DICOM'     => ['dcm', 'dicom'],
   'gzip'     => ['gz', 'gzip', 'tgz', 'tpz'],
   'Pickle'   => ['pickle', 'pkl'],
   'RAR'      => ['rar', 'rev'],
+  'tar'      => ['tar'],
   'ZIP'      => ['zip', 'zipx'],
   'None'     => [''],
 ];
   'Other',
 ];
 
-# Scopes
+# Resolutions
 $Resolutions = [
+  'Nano',
+  'Micro',
+  'Milli',
+  'Centi',
+  'Kilo',
+  'Mega',
+  'Giga',
+  'Tera',
+];
+
+$SeqResolutions = [
   'Contig',
   'Scaffold',
   'Chromosome',
-  'Whole Genome',
-  'Other',
+  'Genome',
+  'Proteome',
+  'Transcriptome',
+];
+
+$LocResolutions = [
+  'Organization',
+  'Locality',
+  'State',
+  'Province',
+  'Country',
+  'Continent',
+  'World',
+];
+
+$XmlResolutions = [
+  'Value',
+  'Attribute',
+  'Group',
+  'Element',
+  'Schema',
+];
+
+$ScalarResolutions = [
+  'Area',
+  'Density',
+  'Distance',
+  'Energy',
+  'Mass',
+  'Speed',
+  'Temperature',
+  'Time',
+  'Volume',
+  'Work',
+];
+
+$VectorResolutions = [
+  'Acceleration',
+  'Displacement',
+  'Force',
+  'Polarization',
+  'Momentum',
+  'Position',
+  'Thrust',
+  'Velocity',
+  'Weight',
 ];
 
 # Collage categories

classes/imagetools.class.php

     public static function process($Url = '', $Thumb = false)
     {
         $ENV = ENV::go();
+        $Psk = $ENV->getPriv('IMAGE_PSK');
 
         if (!$Url) {
             return '';
         }
         
-        if (preg_match('/^https:\/\/('.SITE_DOMAIN.'|'.$ENV->IMAGE_DOMAIN.')\//', $Url) || $Url[0] === '/') {
+        if (preg_match('/^https:\/\/('.$ENV->SITE_DOMAIN.'|'.$ENV->IMAGE_DOMAIN.')\//', $Url) || $Url[0] === '/') {
             if (strpos($Url, '?') === false) {
                 $Url .= '?';
             }
             . $ENV->IMAGE_DOMAIN
             . ($Thumb?"/$Thumb/":'/')
             . '?h='
-            . rawurlencode(base64_encode(hash_hmac('sha256', $Url, IMAGE_PSK, true)))
+            . rawurlencode(base64_encode(hash_hmac('sha256', $Url, $Psk, true)))
             . '&i='
             . urlencode($Url);
         }

classes/torrent_form.class.php

         $this->ImgPlatforms = $ImgPlatforms;
         $this->DocPlatforms = $DocPlatforms;
         $this->RawPlatforms = $RawPlatforms;
-        #$this->Media = $Media;
-        #$this->MediaManga = $MediaManga;
        
         # Formats
         # See classes/config.php
         $this->BinDocFormats = $BinDocFormats;
         $this->CpuGenFormats = $CpuGenFormats;
         $this->PlainFormats = $PlainFormats;
-        #$this->Containers = $Containers;
-        #$this->ContainersGames = $ContainersGames;
-        #$this->ContainersProt = $ContainersProt;
-        #$this->ContainersExtra = $ContainersExtra;
         
         # Misc
         $this->Codecs = $Codecs;
         $this->Archives = $Archives;
         $this->Resolutions = $Resolutions;
 
-        # Deprecated
-        #$this->ArchivesManga = $ArchivesManga;
-        #$this->Formats = $Formats;
-        #$this->Bitrates = $Bitrates;
-        #$this->Platform = $Platform;
-
         # Quick constructor test
         if ($this->Torrent && $this->Torrent['GroupID']) {
             $this->Disabled = ' readonly="readonly"';
         <input type="hidden" name="submit" value="true" />
         <input type="hidden" name="auth" value="$AuthKey" />
 HTML;
-        
-        
+
         if (!$this->NewTorrent) {
             # Edit form hidden fields
             $TorrentID = display_str($this->TorrentID);
 HTML;
             }
         } # else
-    
 
         /**
          * Start printing the torrent form
         return $HTML;
     }
 
+
     /**
      * New torrent options: file
      */
         $Torrent = $this->Torrent;
         echo '<table class="torrent_form>';
 
-
         /**
          * Freeleech type
          */
                 <select name="freeleechtype">
 HTML;
 
-
                 /**
                  * Freeleech reasons
                  */
             }
         } # fi !NewTorrent
 
-
         /**
          * Rules notice
          */
         
         echo '</aside></td></tr>';
 
-
         /**
          * Submit button
          */
         $ENV = ENV::go();
 
         $QueryID = G::$DB->get_query_id();
-        #$this->head();
-        #echo $this->basicInfo();
         $Torrent = $this->Torrent;
-        
+
+        # Moved to their own functions
+        #echo $this->head();
+        #echo $this->basicInfo();
+
         # Start printing the form
         echo '<h2 class="header">Torrent Form</h2>';
         echo '<table class="torrent_form">';
 
-
+        
         /**
          * Accession Number
          *
          * Takes an ID, label, torrent, and media list.
          * Returns a media select option as on upload.php.
          */
-        function mediaSelect($trID = '', $Label = '', $Torrent = [], $Media = [])
+        function mediaSelect($trID = '', $Label = '', $Torrent = [], $Media = [], $Desc = '')
         {
             echo <<<HTML
                 <tr id="$trID">

sections/ajax/torrentgroupalbumart.php

 <?php
+declare(strict_types=1);
 
 require SERVER_ROOT.'/sections/torrents/functions.php';
 
 $TorrentDetails = $TorrentDetails[0];
 $Image = $TorrentDetails['WikiImage'];
 
-/*
 // Handle no artwork
 if (!$Image) {
-    $Image = STATIC_SERVER.'common/noartwork/'.$CategoryIcons[$TorrentDetails['CategoryID'] - 1];
+    $Image = STATIC_SERVER.'common/noartwork/music.png';
 }
-*/
 
 json_die('success', array(
   'picture' => $Image

sections/bookmarks/torrents.php

     <?php if (!$WikiImage) {
         $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
     } ?>
-    
+
     <img class="tooltip"
       src="<?=ImageTools::process($WikiImage, 'thumb')?>"
       alt="<?=$DisplayName?>"
 <!--content-->
 <?php
   View::show_footer();
-  error();
 } ?>
+
 <div class="sidebar">
   <div class="box box_info box_statistics_bookmarked_torrents">
     <div class="head"><strong>Stats</strong></div>

sections/index/private.php

 
 $ENV = ENV::go();
 Text::$TOC = true;
-$NewsCount = 3;
+$NewsCount = 1;
 
 if (!$News = $Cache->get_value('news')) {
     $DB->query("

sections/tools/managers/bans.php

 <?php
+#declare(strict_types=1);
+
+$ENV = ENV::go();
+
 if (!check_perms('admin_manage_ipbans')) {
-  error(403);
+    error(403);
 }
 
 if (isset($_POST['submit'])) {
-  authorize();
+    authorize();
 
-  $IPA = substr($_POST['start'], 0, strcspn($_POST['start'], '.'));
-  if ($_POST['submit'] == 'Delete') { //Delete
-    if (!is_number($_POST['id']) || $_POST['id'] == '') {
-      error(0);
-    }
-    $DB->query('DELETE FROM ip_bans WHERE ID='.$_POST['id']);
-    $Cache->delete_value('ip_bans_'.$IPA);
-  } else { //Edit & Create, Shared Validation
-    $Val->SetFields('start', '1','regex','You must include the starting IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
-    $Val->SetFields('end', '1','regex','You must include the ending IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
-    $Val->SetFields('notes', '1','string','You must include the reason for the ban.');
-    $Err=$Val->ValidateForm($_POST); // Validate the form
-    if ($Err) {
-      error($Err);
-    }
+    $IPA = substr($_POST['start'], 0, strcspn($_POST['start'], '.'));
+    if ($_POST['submit'] == 'Delete') { //Delete
+        if (!is_number($_POST['id']) || $_POST['id'] == '') {
+            error(0);
+        }
+        $DB->query('DELETE FROM ip_bans WHERE ID='.$_POST['id']);
+        $Cache->delete_value('ip_bans_'.$IPA);
+    } else { //Edit & Create, Shared Validation
+        $Val->SetFields('start', '1', 'regex', 'You must include the starting IP address.', array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
+        $Val->SetFields('end', '1', 'regex', 'You must include the ending IP address.', array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
+        $Val->SetFields('notes', '1', 'string', 'You must include the reason for the ban.');
+        $Err=$Val->ValidateForm($_POST); // Validate the form
+        if ($Err) {
+            error($Err);
+        }
 
-    $Notes = db_string($_POST['notes']);
-    $Start = Tools::ip_to_unsigned($_POST['start']); //Sanitized by Validation regex
+        $Notes = db_string($_POST['notes']);
+        $Start = Tools::ip_to_unsigned($_POST['start']); //Sanitized by Validation regex
     $End = Tools::ip_to_unsigned($_POST['end']); //See above
 
     if ($_POST['submit'] == 'Edit') { //Edit
-      if (empty($_POST['id']) || !is_number($_POST['id'])) {
-        error(404);
-      }
-      $DB->query("
+        if (empty($_POST['id']) || !is_number($_POST['id'])) {
+            error(404);
+        }
+        $DB->query("
         UPDATE ip_bans
         SET
           FromIP=$Start,
           Reason='$Notes'
         WHERE ID='".$_POST['id']."'");
     } else { //Create
-      $DB->query("
+        $DB->query("
         INSERT INTO ip_bans
           (FromIP, ToIP, Reason)
         VALUES
           ('$Start','$End', '$Notes')");
     }
-    $Cache->delete_value('ip_bans_'.$IPA);
-  }
+        $Cache->delete_value('ip_bans_'.$IPA);
+    }
 }
 
 define('BANS_PER_PAGE', '20');
   FROM ip_bans ";
 
 if (!empty($_REQUEST['notes'])) {
-  $sql .= "WHERE Reason LIKE '%".db_string($_REQUEST['notes'])."%' ";
+    $sql .= "WHERE Reason LIKE '%".db_string($_REQUEST['notes'])."%' ";
 }
 
-if (!empty($_REQUEST['ip']) && preg_match('/'.IP_REGEX.'/', $_REQUEST['ip'])) {
-  if (!empty($_REQUEST['notes'])) {
-    $sql .= "AND '".Tools::ip_to_unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
-  } else {
-    $sql .= "WHERE '".Tools::ip_to_unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
-  }
+if (!empty($_REQUEST['ip']) && preg_match('/'.$ENV->IP_REGEX.'/', $_REQUEST['ip'])) {
+    if (!empty($_REQUEST['notes'])) {
+        $sql .= "AND '".Tools::ip_to_unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
+    } else {
+        $sql .= "WHERE '".Tools::ip_to_unsigned($_REQUEST['ip'])."' BETWEEN FromIP AND ToIP ";
+    }
 }
 
 $sql .= "ORDER BY FromIP ASC";
         <td class="label"><label for="ip">IP address:</label></td>
         <td>
           <input type="hidden" name="action" value="ip_ban" />
-          <input type="search" id="ip" name="ip" size="20" value="<?=(!empty($_GET['ip']) ? display_str($_GET['ip']) : '')?>" />
+          <input type="search" id="ip" name="ip" size="20"
+            value="<?=(!empty($_GET['ip']) ? display_str($_GET['ip']) : '')?>" />
         </td>
         <td class="label"><label for="notes">Notes:</label></td>
         <td>
           <input type="hidden" name="action" value="ip_ban" />
-          <input type="search" id="notes" name="notes" size="60" value="<?=(!empty($_GET['notes']) ? display_str($_GET['notes']) : '')?>" />
+          <input type="search" id="notes" name="notes" size="60"
+            value="<?=(!empty($_GET['notes']) ? display_str($_GET['notes']) : '')?>" />
         </td>
         <td>
           <input type="submit" value="Search" />
 
 <h3>Manage</h3>
 <div class="linkbox">
-<?=$PageLinks?>
+  <?=$PageLinks?>
 </div>
 <table width="100%">
   <tr class="colhead">
     <td colspan="2">
-      <span class="tooltip" title="The IP addresses specified are &#42;inclusive&#42;. The left box is the beginning of the IP address range, and the right box is the end of the IP address range.">Range</span>
+      <span class="tooltip"
+        title="The IP addresses specified are &#42;inclusive&#42;. The left box is the beginning of the IP address range, and the right box is the end of the IP address range.">Range</span>
     </td>
     <td>Notes</td>
     <td>Submit</td>
   <tr class="row">
     <form class="create_form" name="ban" action="" method="post">
       <input type="hidden" name="action" value="ip_ban" />
-      <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+      <input type="hidden" name="auth"
+        value="<?=$LoggedUser['AuthKey']?>" />
       <td colspan="2">
         <input type="text" size="12" name="start" />
         <input type="text" size="12" name="end" />
       </td>
     </form>
   </tr>
-<?
+  <?php
 while (list($ID, $Start, $End, $Reason) = $DB->next_record()) {
-  $Start = long2ip($Start);
-  $End = long2ip($End);
-?>
+    $Start = long2ip($Start);
+    $End = long2ip($End); ?>
   <tr class="row">
     <form class="manage_form" name="ban" action="" method="post">
       <input type="hidden" name="id" value="<?=$ID?>" />
       <input type="hidden" name="action" value="ip_ban" />
-      <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+      <input type="hidden" name="auth"
+        value="<?=$LoggedUser['AuthKey']?>" />
       <td colspan="2">
-        <input type="text" size="12" name="start" value="<?=$Start?>" />
+        <input type="text" size="12" name="start"
+          value="<?=$Start?>" />
         <input type="text" size="12" name="end" value="<?=$End?>" />
       </td>
       <td>
-        <input type="text" size="72" name="notes" value="<?=$Reason?>" />
+        <input type="text" size="72" name="notes"
+          value="<?=$Reason?>" />
       </td>
       <td>
         <input type="submit" name="submit" value="Edit" />
       </td>
     </form>
   </tr>
-<?
+  <?php
 }
 ?>
 </table>
 <div class="linkbox">
-<?=$PageLinks?>
+  <?=$PageLinks?>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer();

sections/upload/upload_handle.php

 // the data to the database and the torrent to the disk.                      //
 //****************************************************************************//
 
-// https://php.net/upload-max-filesize
-ini_set('upload_max_filesize', 2097152); // 2 MiB
-ini_set('max_file_uploads', 10000);
-
 include SERVER_ROOT.'/classes/validate.class.php';
 include SERVER_ROOT.'/classes/feed.class.php';
 include SERVER_ROOT.'/sections/torrents/functions.php';

sections/user/advancedsearch.php

 <?php
 #declare(strict_types = 1);
 
+$ENV = ENV::go();
+
 if (!empty($_GET['search'])) {
-    if (preg_match('/^'.IP_REGEX.'$/', $_GET['search'])) {
+    if (preg_match('/^'.$ENV->IP_REGEX.'$/', $_GET['search'])) {
         $_GET['ip'] = $_GET['search'];
     } elseif (preg_match('/^'.EMAIL_REGEX.'$/i', $_GET['search'])) {
         $_GET['email'] = $_GET['search'];

static/functions/upload.js

     'series', // Location
     'year', // Year
     'codec', // License
-    // Platform changes below
-    'resolution', // Scope
-    // Format changes below
+    // Platform *changes below*
+    'resolution', // Scope *changes below*
+    // Format *changes below*
     'archive', // Archive
     'tags', // Tags
     'cover', // Picture
 }
 
 
-/**
- * Bitrate
- */
-function Bitrate() {
-  /*
-  $('#other_bitrate').raw().value = '';
-  if ($('#bitrate').raw().options[$('#bitrate').raw().selectedIndex].value == 'Other') {
-    $('#other_bitrate_span').gshow();
-  } else {
-    $('#other_bitrate_span').ghide();
-  }
-  */
-}
-
-
-/**
- * AltBitrate
- */
-function AltBitrate() {
-  /*
-  if ($('#other_bitrate').raw().value >= 320) {
-    $('#vbr').raw().disabled = true;
-    $('#vbr').raw().checked = false;
-  } else {
-    $('#vbr').raw().disabled = false;
-  }
-  */
-}
-
-
 /**
  * add_tag
  */
 }
 
 
-/**
- * CheckVA
- */
-function CheckVA() {
-  /*
-  if ($('#artist').raw().value.toLowerCase().trim().match(/^(va|various(\sa|a)rtis(t|ts)|various)$/)) {
-    $('#vawarning').gshow();
-  } else {
-    $('#vawarning').ghide();
-  }
-  */
-}
-
-
-/**
- * CheckYear
- */
-function CheckYear() {
-  /*
-  var media = $('#media').raw().options[$('#media').raw().selectedIndex].text;
-  if (media == "---" || media == "Vinyl" || media == "Soundboard" || media == "Cassette") {
-    media = "old";
-  }
-  var year = $('#year').val();
-  var unknown = $('#unknown').prop('checked');
-  if (year < 1982 && year != '' && media != "old" && !unknown) {
-    $('#yearwarning').gshow();
-    $('#remaster').raw().checked = true;
-    $('#remaster_true').gshow();
-  } else if (unknown) {
-    $('#remaster').raw().checked = true;
-    $('#yearwarning').ghide();
-    $('#remaster_true').gshow();
-  } else {
-    $('#yearwarning').ghide();
-  }
-  */
-}
-
-
-/**
- * ToggleUnknown
- */
-function ToggleUnknown() {
-  /*
-  if ($('#unknown').raw().checked) {
-    $('#remaster_year').raw().value = "";
-    $('#remaster_title').raw().value = "";
-    $('#remaster_record_label').raw().value = "";
-    $('#remaster_catalogue_number').raw().value = "";
-
-    if ($('#groupremasters').raw()) {
-      $('#groupremasters').raw().selectedIndex = 0;
-      $('#groupremasters').raw().disabled = true;
-    }
-
-    $('#remaster_year').raw().disabled = true;
-    $('#remaster_title').raw().disabled = true;
-    $('#remaster_record_label').raw().disabled = true;
-    $('#remaster_catalogue_number').raw().disabled = true;
-  } else {
-    $('#remaster_year').raw().disabled = false;
-    $('#remaster_title').raw().disabled = false;
-    $('#remaster_record_label').raw().disabled = false;
-    $('#remaster_catalogue_number').raw().disabled = false;
-
-    if ($('#groupremasters').raw()) {
-      $('#groupremasters').raw().disabled = false;
-    }
-  }
-  */
-}
-
-
 /**
  * AnimeAutofill
  */