Minor styling and torrent search edits

classes/util.php

-<?
+<?php
+
 // This is a file of miscellaneous functions that are called so damn often
 // that it'd just be annoying to stick them in namespaces.
 
  * @return bool
  */
 if (PHP_INT_SIZE === 4) {
-  function is_number($Str) {
-    if ($Str === null || $Str === '') {
-      return false;
-    }
-    if (is_int($Str)) {
-      return true;
-    }
-    if ($Str[0] == '-' || $Str[0] == '+') { // Leading plus/minus signs are ok
-      $Str[0] = 0;
+    function is_number($Str)
+    {
+        if ($Str === null || $Str === '') {
+            return false;
+        }
+        if (is_int($Str)) {
+            return true;
+        }
+        if ($Str[0] === '-' || $Str[0] === '+') { // Leading plus/minus signs are ok
+            $Str[0] = 0;
+        }
+        return ltrim($Str, "0..9") === '';
     }
-    return ltrim($Str, "0..9") === '';
-  }
 } else {
-  function is_number($Str) {
-    return $Str == strval(intval($Str));
-  }
+    function is_number($Str)
+    {
+        return $Str == strval(intval($Str));
+    }
 }
 
-function is_date($Date) {
-  list($Y, $M, $D) = explode('-', $Date);
-  if (checkdate($M, $D, $Y)) {
-    return true;
-  }
-  return false;
+function is_date($Date)
+{
+    list($Y, $M, $D) = explode('-', $Date);
+    if (checkdate($M, $D, $Y)) {
+        return true;
+    }
+    return false;
 }
 
 /**
  * @param array $Keys list of keys to check
  * @param mixed $Error error code or string to pass to the error() function if a key isn't numeric
  */
-function assert_numbers(&$Base, $Keys, $Error = 0) {
-  // make sure both arguments are arrays
-  if (!is_array($Base) || !is_array($Keys)) {
-    return;
-  }
-  foreach ($Keys as $Key) {
-    if (!isset($Base[$Key]) || !is_number($Base[$Key])) {
-      error($Error);
+function assert_numbers(&$Base, $Keys, $Error = 0)
+{
+    // Make sure both arguments are arrays
+    if (!is_array($Base) || !is_array($Keys)) {
+        return;
+    }
+    foreach ($Keys as $Key) {
+        if (!isset($Base[$Key]) || !is_number($Base[$Key])) {
+            error($Error);
+        }
     }
-  }
 }
 
 /**
  * @return true if $Value is "truthy", false if it is "non-truthy" or null if $Value was not
  *         a bool-like value
  */
-function is_bool_value($Value) {
-  if (is_bool($Value)) {
-    return $Value;
-  }
-  if (is_string($Value)) {
-    switch (strtolower($Value)) {
+function is_bool_value($Value)
+{
+    if (is_bool($Value)) {
+        return $Value;
+    }
+    if (is_string($Value)) {
+        switch (strtolower($Value)) {
       case 'true':
       case 'yes':
       case 'on':
       case '0':
         return false;
     }
-  }
-  if (is_numeric($Value)) {
-    if ($Value == 1) {
-      return true;
-    } elseif ($Value == 0) {
-      return false;
     }
-  }
-  return null;
+    if (is_numeric($Value)) {
+        if ($Value === 1) {
+            return true;
+        } elseif ($Value === 0) {
+            return false;
+        }
+    }
+    return null;
 }
 
 /**
  * @param string $Str
  * @return string escaped string.
  */
-function display_str($Str) {
-  if ($Str === null || $Str === false || is_array($Str)) {
-    return '';
-  }
-  if ($Str != '' && !is_number($Str)) {
-    $Str = Format::make_utf8($Str);
-    $Str = mb_convert_encoding($Str, 'HTML-ENTITIES', 'UTF-8');
-    $Str = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,6};)/m", '&amp;', $Str);
-
-    $Replace = array(
+function display_str($Str)
+{
+    if ($Str === null || $Str === false || is_array($Str)) {
+        return '';
+    }
+    if ($Str !== '' && !is_number($Str)) {
+        $Str = Format::make_utf8($Str);
+        $Str = mb_convert_encoding($Str, 'HTML-ENTITIES', 'UTF-8');
+        $Str = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,6};)/m", '&amp;', $Str);
+
+        $Replace = array(
       "'",'"',"<",">",
       '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
       '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
       '&#156;','&#158;','&#159;'
     );
 
-    $With = array(
+        $With = array(
       '&#39;','&quot;','&lt;','&gt;',
       '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
       '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
       '&#339;','&#382;','&#376;'
     );
 
-    $Str = str_replace($Replace, $With, $Str);
-  }
-  return $Str;
+        $Str = str_replace($Replace, $With, $Str);
+    }
+    return $Str;
 }
 
-
 /**
  * Send a message to an IRC bot listening on SOCKET_LISTEN_PORT
  *
  * @param string $Raw An IRC protocol snippet to send.
  */
-function send_irc($Raw) {
-  // check if IRC is enabled
-  if (!FEATURE_IRC) {
-    return;
-  }
-
-  $IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
-  $Raw = str_replace(array("\n", "\r"), '', $Raw);
-  fwrite($IRCSocket, $Raw);
-  fclose($IRCSocket);
-}
+function send_irc($Raw)
+{
+    // Check if IRC is enabled
+    if (!FEATURE_IRC) {
+        return;
+    }
 
+    $IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
+    $Raw = str_replace(array("\n", "\r"), '', $Raw);
+    fwrite($IRCSocket, $Raw);
+    fclose($IRCSocket);
+}
 
 /**
  * Display a critical error and kills the page.
  * @param boolean $NoHTML If true, the header/footer won't be shown, just the description.
  * @param string $Log If true, the user is given a link to search $Log in the site log.
  */
-function error($Error, $NoHTML = false, $Log = false) {
-  global $Debug;
-  require(SERVER_ROOT.'/sections/error/index.php');
-  $Debug->profile();
-  die();
+function error($Error, $NoHTML = false, $Log = false)
+{
+    global $Debug;
+    require(SERVER_ROOT.'/sections/error/index.php');
+    $Debug->profile();
+    die();
 }
 
-
 /**
  * Convenience function. See doc in permissions.class.php
  */
-function check_perms($PermissionName, $MinClass = 0) {
-  return Permissions::check_perms($PermissionName, $MinClass);
+function check_perms($PermissionName, $MinClass = 0)
+{
+    return Permissions::check_perms($PermissionName, $MinClass);
 }
 
-function get_permissions_for_user($UserID, $CustomPermissions = false) {
-  return Permissions::get_permissions_for_user($UserID, $CustomPermissions = false);
+function get_permissions_for_user($UserID, $CustomPermissions = false)
+{
+    return Permissions::get_permissions_for_user($UserID, $CustomPermissions = false);
 }
 
 /**
  * Print JSON status result with an optional message and die.
  * DO NOT USE THIS FUNCTION!
  */
-function json_die($Status, $Message) {
-  json_print($Status, $Message);
-  die();
+function json_die($Status, $Message)
+{
+    json_print($Status, $Message);
+    die();
 }
 
 /**
  * Print JSON status result with an optional message.
  */
-function json_print($Status, $Message) {
-  if ($Status == 'success' && $Message) {
-    print json_encode(array('status' => $Status, 'response' => $Message));
-  } elseif ($Message) {
-    print json_encode(array('status' => $Status, 'error' => $Message));
-  } else {
-    print json_encode(array('status' => $Status, 'response' => []));
-  }
+function json_print($Status, $Message)
+{
+    if ($Status === 'success' && $Message) {
+        print json_encode(array('status' => $Status, 'response' => $Message));
+    } elseif ($Message) {
+        print json_encode(array('status' => $Status, 'error' => $Message));
+    } else {
+        print json_encode(array('status' => $Status, 'response' => []));
+    }
 }
 
 /**
  * Print the site's URL including the appropriate URI scheme, including the trailing slash
  */
-function site_url() {
-  return 'https://' . SITE_DOMAIN . '/';
+function site_url()
+{
+    return 'https://' . SITE_DOMAIN . '/';
 }
-?>

design/publicheader.php

 <?php
+
 global $LoggedUser;
 define('FOOTER_FILE', SERVER_ROOT.'/design/publicfooter.php');
 ?>
+
 <!DOCTYPE html>
 <html>
 <head>
   <link rel="shortcut icon" href="static/common/icon.png?v=<?=md5_file('static/common/icon.png');?>">
   <link rel="manifest" href="/manifest.php">
   <link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css">
+
 <?php
   $Scripts = ['jquery', 'global', 'ajax.class', 'cookie.class', 'storage.class', 'public', 'u2f'];
   foreach ($Scripts as $Script) {
   $img = array_diff(scandir(SERVER_ROOT.'/misc/bg', 1), array('.', '..')); ?>
   <meta name="bg_data" content="<?=$img[rand(0, count($img)-1)]?>">
 </head>
+
 <body>
 <div id="head"><span>
 <a href="login.php">Log In</a>

sections/schedule/daily/disable_inactive_users.php

     SELECT um.Username, um.Email
     FROM users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
-      LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
+      LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".VIP."'
     WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
       AND um.LastAccess < (NOW() - INTERVAL 110 DAY)
       AND um.LastAccess > (NOW() - INTERVAL 111 DAY)
     SELECT um.ID
     FROM users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
-      LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
+      LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".VIP."'
     WHERE um.PermissionID IN ('".USER."', '".MEMBER ."')
       AND um.LastAccess < (NOW() - INTERVAL 120 DAY)
       AND um.LastAccess IS NOT NULL

sections/torrents/browse.php

     $HideAdvanced = ' hidden';
 }
 
+# Start the search form
 View::show_header('Browse Torrents', 'browse');
 
 ?>
           <tr id="catalogue_number"
             class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!--Catalogue number:-->
+              <!-- Catalogue Number -->
             </td>
             <td class="ft_cataloguenumber">
               <input type="search" size="19" name="cataloguenumber" class="inputtext smallest fti_advanced"
           <tr id="album_torrent_name"
             class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!--Torrent name:-->
+              <!-- Torrent Name -->
             </td>
             <td class="ft_groupname">
               <input type="search" spellcheck="false" size="65" name="advgroupname"
           <tr id="artist_name"
             class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!--Artist name:-->
+              <!-- Artist Name -->
             </td>
             <td class="ft_artistname">
               <input type="search" spellcheck="false" size="65" id="artist" name="artistname"
 
           <tr id="year" class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!--Year:-->
+              <!-- Year -->
             </td>
             <td class="ft_year">
               <input type="search" name="year" class="inputtext smallest fti_advanced" placeholder="Year"
           <tr id="torrent_description"
             class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!--<span title="Search torrent descriptions (not group information)" class="tooltip">Torrent description:</span>-->
+              <!-- Torrent Description -->
             </td>
             <td class="ft_description">
               <input type="search" spellcheck="false" size="65" name="description" class="inputtext fti_advanced"
 
           <tr id="file_list" class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">
-              <!--File list:-->
+              <!-- File List -->
             </td>
             <td class="ft_filelist">
               <input type="search" spellcheck="false" size="65" name="filelist" class="inputtext fti_advanced"
             </td>
           </tr>
 
+          <!-- Platforms -->
           <tr id="rip_specifics"
             class="ftr_advanced<?=$HideAdvanced?>">
-            <td class="label">Specifics</td>
+            <td class="label">Platforms</td>
             <td class="nobr ft_ripspecifics">
 
               <select name="media" class="ft_media fti_advanced">
-                <option value="">Seq Platform</option>
+                <option value="">DNA/RNA/Proteins</option>
                 <?php  foreach ($Media as $MediaName) { ?>
                 <option value="<?=display_str($MediaName); ?>"
                 <?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?>
                 <?php  } ?>
               </select>
 
+              <select name="media" class="ft_media fti_advanced">
+                <option value="">Imaging</option>
+                <?php  foreach ($MediaManga as $MediaName) { ?>
+                <option value="<?=display_str($MediaName); ?>"
+                <?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?>
+                </option>
+                <?php  } ?>
+              </select>
+            </td>
+          </tr>
+
+          <!-- Formats -->
+          <tr id="rip_specifics"
+            class="ftr_advanced<?=$HideAdvanced?>">
+            <td class="label">Formats</td>
+            <td class="nobr ft_ripspecifics">
+
               <select id=" container" name="container" class="ft_container fti_advanced">
-                <option value="">Seq Format</option>
+                <option value="">DNA/RNA</option>
                 <?php  foreach ($Containers as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
               </select>
 
               <select id=" container" name="container" class="ft_container fti_advanced">
-                <option value="">Prot Format</option>
+                <option value="">Proteins</option>
                 <?php  foreach ($ContainersProt as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
                 <?php  } ?>
               </select>
 
-              <select name="media" class="ft_media fti_advanced">
-                <option value="">Img Platform</option>
-                <?php  foreach ($MediaManga as $MediaName) { ?>
-                <option value="<?=display_str($MediaName); ?>"
-                <?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?>
+              <select id=" container" name="container" class="ft_container fti_advanced">
+                <option value="">Imaging</option>
+                <?php  foreach ($ContainersGames as $Key => $Container) { ?>
+                <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
                 <?php  } ?>
               </select>
 
               <select id=" container" name="container" class="ft_container fti_advanced">
-                <option value="">Img Format</option>
-                <?php  foreach ($ContainersGames as $Key => $Container) { ?>
+                <option value="">Extras</option>
+                <?php  foreach ($ContainersExtra as $Key => $Container) { ?>
                 <option value="<?=display_str($Key);?>" <?Format::selected('container', $Key)?>><?=display_str($Key);?>
                 </option>
                 <?php  } ?>
               </select>
             </td>
           </tr>
-          <tr id="size" class="ftr_advanced<?=$HideAdvanced?>">
-            <td class="label">Size</td>
-            <td class="ft_size">
-              <input type="size_min" spellcheck="false" size="6" name="size_min" class="inputtext smaller fti_advanced"
-                placeholder="Min"
-                value="<?Format::form('size_min')?>" />
-              &ndash;
-              <input type="size_max" spellcheck="false" size="6" name="size_max" class="inputtext smaller fti_advanced"
-                placeholder="Max"
-                value="<?Format::form('size_max')?>" />
-              <select name="size_unit" class="ft_size fti_advanced">
-                <option value="">Unit</option>
-                <option value="0" <?Format::selected('size_unit', 0)?>>B
-                </option>
-                <option value="1" <?Format::selected('size_unit', 1)?>>KiB
-                </option>
-                <option value="2" <?Format::selected('size_unit', 2)?>>MiB
-                </option>
-                <option value="3" <?Format::selected('size_unit', 3)?>>GiB
-                </option>
-                <option value="4" <?Format::selected('size_unit', 4)?>>TiB
-                </option>
-              </select>
-            </td>
-          </tr>
+
+          <!-- Misc -->
           <tr id="misc" class="ftr_advanced<?=$HideAdvanced?>">
             <td class="label">Misc</td>
             <td class="nobr ft_misc">
+
               <select name="resolution" class="ft_resolution fti_advanced">
                 <option value="">Assembly Level</option>
                 <?php  foreach ($Resolutions as $Resolution) { ?>
                 <option value="<?=display_str($Resolution); ?>"
-                <?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?>
+                <?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?>"
                 </option>
                 <?php  } ?>
               </select>
               </select>
             </td>
           </tr>
+
+          <!-- Size -->
+          <tr id="size" class="ftr_advanced<?=$HideAdvanced?>">
+            <td class="label">Size</td>
+            <td class="ft_size">
+              <input type="size_min" spellcheck="false" size="6" name="size_min" class="inputtext smaller fti_advanced"
+                placeholder="Min"
+                value="<?Format::form('size_min')?>" />
+              &ndash;
+              <input type="size_max" spellcheck="false" size="6" name="size_max" class="inputtext smaller fti_advanced"
+                placeholder="Max"
+                value="<?Format::form('size_max')?>" />
+              <select name="size_unit" class="ft_size fti_advanced">
+                <option value="">Unit</option>
+                <option value="0" <?Format::selected('size_unit', 0)?>>B
+                </option>
+                <option value="1" <?Format::selected('size_unit', 1)?>>KiB
+                </option>
+                <option value="2" <?Format::selected('size_unit', 2)?>>MiB
+                </option>
+                <option value="3" <?Format::selected('size_unit', 3)?>>GiB
+                </option>
+                <option value="4" <?Format::selected('size_unit', 4)?>>TiB
+                </option>
+              </select>
+            </td>
+          </tr>
+
+          <!-- Start basic search options -->
           <tr id="search_terms" class="ftr_basic<?=$HideBasic?>">
             <td class="label">
-              <!--Search terms:-->
+              <!-- Search Terms -->
             </td>
             <td class="ftb_searchstr">
               <input type="search" spellcheck="false" size="48" name="searchstr" class="inputtext fti_basic"
                 aria-label="Terms to search">
             </td>
           </tr>
+
           <tr id="tagfilter">
             <td class="label">
-              <!--<span title="Use !tag to exclude tag" class="tooltip">Tags (comma-separated):</span>-->
+              <!-- Tags (comma-separated) -->
             </td>
             <td class="ft_taglist">
               <input type="search" size="37" id="tags" name="taglist" class="inputtext smaller"
               Use !tag to exclude tags
             </td>
           </tr>
+
           <tr id="order">
             <td class="label">Order By</td>
             <td class="ft_order">
                 <option value="random" <?Format::selected('order_by', 'random')?>>Random
                 </option>
               </select>
+
               <select name="order_way" class="ft_order_way" aria-label="Direction to order">
                 <option value="desc" <?Format::selected('order_way', 'desc')?>>Descending
                 </option>
               </select>
             </td>
           </tr>
+
           <tr id="search_group_results">
             <td class="label">
               <label for="group_results">Group Torrents</label>
             </td>
           </tr>
         </table>
+
         <table class="layout cat_list ft_cat_list">
           <?php
   $x = 0;
     <p>Make sure all names are spelled correctly, or try making your search less specific.</p>
   </div>
 </div>
-<?php    View::show_footer();die();
+<?php
+View::show_footer();
+die();
   }
 
   if ($NumResults < ($Page - 1) * TORRENTS_PER_PAGE + 1) {
         $Data['CategoryID'] = $CategoryID;
         // All of the individual torrents in the group
 
-        // Get report info for each torrent, use the cache if available, if not, add to it.
+        // Get report info for each torrent, use the cache if available, if not, add to it
         $Reported = false;
         $Reports = Torrents::get_reports($TorrentID);
         if (count($Reports) > 0) {

static/styles/matcha/style.css

 
 body {
   font-family: Bitstream Vera Sans, Tahoma, sans-serif;
-  font-size: 11px;
+  font-size: 0.7em;
   color: black;
   background: url('/static/common/hiware.png') fixed;
 }
 
 h2 {
   text-align: center;
-  font-size: 12pt;
+  /* font-size: 12pt; */
 }
 
+/*
 h4 {
   font-size: 8pt;
 }
+*/
 
 p {
   margin: 10px 5px;
   width: 100%;
   text-align: center;
   background-color: #016670;
+  /* todo: Convert to em */
   font-size: 10pt;
 }
 
   padding: 0px;
 }
 
-
 #userinfo a {
   color: black;
   text-decoration: none;
   text-decoration: underline;
 }
 
-
 #userinfo b a {
   font-weight: normal;
   font-size: 0.9em;
   text-decoration: underline;
 }
 
-/* IE doesn't appear to like a simple display:none in our header. Random things start fucking up pretty badly. */
+/* IE doesn't appear to like a simple display:none in our header. Random things start fucking up pretty badly */
 .hidden {
   position: absolute;
   left: -10000px;
   margin: 0px auto;
 }
 
-.widethin { /* overriding the thin class on torrents.php */
+.widethin { /* Overriding the thin class on torrents.php */
   width: 95% !important;
   margin: 0px auto;
 }
 }
 
 .box {
-  font-size: 8pt;
+  /* font-size: 8pt; */
   background-color: white;
   /* border: 1px solid #666666; */
   border: none;
 
 .box2 {
   margin-bottom: 10px;
-  font-size: 8pt;
+  /* font-size: 8pt; */
   background-color: white;
   /* border: 1px solid #666666; */
   border: none;
 #userinfo {
   box-shadow: 0 2px 10px -2px gray;
 
+/*
 .last_edited {
   font-size: 10px;
   opacity: 0.7;
 }
+*/
 
 #comm_badge_tr .badge_icon, #user_badge_edit_tr .badge_icon {
   margin-right: 1em;

static/styles/public/style.css

 
 body {
   font-family: Bitstream Vera Sans, Tahoma, sans-serif;
-  font-size: 11px;
+  font-size: 0.75em;
   color: black;
   background: url('/static/common/hiware.png');
 }