Upload files to 'classes'

classes/userrank.class.php

@@ -1,101 +1,104 @@
-<?
-class UserRank {
-  const PREFIX = 'percentiles_'; // Prefix for memcache keys, to make life easier
-
-  // Returns a 101 row array (101 percentiles - 0 - 100), with the minimum value for that percentile as the value for each row
-  // BTW - ingenious
-  private static function build_table($MemKey, $Query) {
-    $QueryID = G::$DB->get_query_id();
-
-    G::$DB->query("
+<?php
+class UserRank
+{
+    const PREFIX = 'percentiles_'; // Prefix for memcache keys, to make life easier
+
+    // Returns a 101 row array (101 percentiles - 0 - 100), with the minimum value for that percentile as the value for each row
+    // BTW - ingenious
+    private static function build_table($MemKey, $Query)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
       DROP TEMPORARY TABLE IF EXISTS temp_stats");
 
-    G::$DB->query("
+        G::$DB->query("
       CREATE TEMPORARY TABLE temp_stats (
         ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
         Val bigint(20) NOT NULL
       );");
 
-    G::$DB->query("
+        G::$DB->query("
       INSERT INTO temp_stats (Val) ".
-      $Query);
+        $Query);
 
-    G::$DB->query("
+        G::$DB->query("
       SELECT COUNT(ID)
       FROM temp_stats");
-    list($UserCount) = G::$DB->next_record();
+        list($UserCount) = G::$DB->next_record();
 
-    G::$DB->query("
+        G::$DB->query("
       SELECT MIN(Val)
       FROM temp_stats
       GROUP BY CEIL(ID / (".(int)$UserCount." / 100));");
 
-    $Table = G::$DB->to_array();
+        $Table = G::$DB->to_array();
 
-    G::$DB->set_query_id($QueryID);
+        G::$DB->set_query_id($QueryID);
 
-    // Give a little variation to the cache length, so all the tables don't expire at the same time
-    G::$Cache->cache_value($MemKey, $Table, 3600 * 24 * rand(800, 1000) * 0.001);
+        // Give a little variation to the cache length, so all the tables don't expire at the same time
+        G::$Cache->cache_value($MemKey, $Table, 3600 * 24 * rand(800, 1000) * 0.001);
 
-    return $Table;
-  }
+        return $Table;
+    }
 
-  private static function table_query($TableName) {
-    switch ($TableName) {
-      case 'uploaded':
-        $Query =  "
+    private static function table_query($TableName)
+    {
+        switch ($TableName) {
+            case 'uploaded':
+                $Query =  "
           SELECT Uploaded
           FROM users_main
           WHERE Enabled = '1'
             AND Uploaded > 0
           ORDER BY Uploaded;";
-        break;
-      case 'downloaded':
-        $Query =  "
+                break;
+            case 'downloaded':
+                $Query =  "
           SELECT Downloaded
           FROM users_main
           WHERE Enabled = '1'
             AND Downloaded > 0
           ORDER BY Downloaded;";
-        break;
-      case 'uploads':
-        $Query = "
+                break;
+            case 'uploads':
+                $Query = "
           SELECT COUNT(t.ID) AS Uploads
           FROM users_main AS um
             JOIN torrents AS t ON t.UserID = um.ID
           WHERE um.Enabled = '1'
           GROUP BY um.ID
           ORDER BY Uploads;";
-        break;
-      case 'requests':
-        $Query = "
+                break;
+            case 'requests':
+                $Query = "
           SELECT COUNT(r.ID) AS Requests
           FROM users_main AS um
             JOIN requests AS r ON r.FillerID = um.ID
           WHERE um.Enabled = '1'
           GROUP BY um.ID
           ORDER BY Requests;";
-        break;
-      case 'posts':
-        $Query = "
+                break;
+            case 'posts':
+                $Query = "
           SELECT COUNT(p.ID) AS Posts
           FROM users_main AS um
             JOIN forums_posts AS p ON p.AuthorID = um.ID
           WHERE um.Enabled = '1'
           GROUP BY um.ID
           ORDER BY Posts;";
-        break;
-      case 'bounty':
-        $Query = "
+                break;
+            case 'bounty':
+                $Query = "
           SELECT SUM(rv.Bounty) AS Bounty
           FROM users_main AS um
             JOIN requests_votes AS rv ON rv.UserID = um.ID
           WHERE um.Enabled = '1' " .
-          "GROUP BY um.ID
+                "GROUP BY um.ID
           ORDER BY Bounty;";
-        break;
-      case 'artists':
-        $Query = "
+                break;
+            case 'artists':
+                $Query = "
           SELECT COUNT(ta.ArtistID) AS Artists
           FROM torrents_artists AS ta
             JOIN torrents_group AS tg ON tg.ID = ta.GroupID
@@ -103,61 +106,59 @@ class UserRank {
           WHERE t.UserID != ta.UserID
           GROUP BY tg.ID
           ORDER BY Artists ASC";
-        break;
-    }
-    return $Query;
-  }
-
-  public static function get_rank($TableName, $Value) {
-    if ($Value == 0) {
-      return 0;
+                break;
+        }
+        return $Query;
     }
 
-    $Table = G::$Cache->get_value(self::PREFIX.$TableName);
-    if (!$Table) {
-      //Cache lock!
-      $Lock = G::$Cache->get_value(self::PREFIX.$TableName.'_lock');
-      if ($Lock) {
-        return false;
-      } else {
-        G::$Cache->cache_value(self::PREFIX.$TableName.'_lock', '1', 300);
-        $Table = self::build_table(self::PREFIX.$TableName, self::table_query($TableName));
-        G::$Cache->delete_value(self::PREFIX.$TableName.'_lock');
-      }
+    public static function get_rank($TableName, $Value)
+    {
+        if ($Value == 0) {
+            return 0;
+        }
+
+        $Table = G::$Cache->get_value(self::PREFIX.$TableName);
+        if (!$Table) {
+            //Cache lock!
+            $Lock = G::$Cache->get_value(self::PREFIX.$TableName.'_lock');
+            if ($Lock) {
+                return false;
+            } else {
+                G::$Cache->cache_value(self::PREFIX.$TableName.'_lock', '1', 300);
+                $Table = self::build_table(self::PREFIX.$TableName, self::table_query($TableName));
+                G::$Cache->delete_value(self::PREFIX.$TableName.'_lock');
+            }
+        }
+        $LastPercentile = 0;
+        foreach ($Table as $Row) {
+            list($CurValue) = $Row;
+            if ($CurValue >= $Value) {
+                return $LastPercentile;
+            }
+            $LastPercentile++;
+        }
+        return 100; // 100th percentile
     }
-    $LastPercentile = 0;
-    foreach ($Table as $Row) {
-      list($CurValue) = $Row;
-      if ($CurValue >= $Value) {
-        return $LastPercentile;
-      }
-      $LastPercentile++;
-    }
-    return 100; // 100th percentile
-  }
 
-  public static function overall_score($Uploaded, $Downloaded, $Uploads, $Requests, $Posts, $Bounty, $Artists, $Ratio) {
-    // We can do this all in 1 line, but it's easier to read this way
-    if ($Ratio > 1) {
-      $Ratio = 1;
-    }
-    $TotalScore = 0;
-    if (in_array(false, func_get_args(), true)) {
-      return false;
+    public static function overall_score($Uploaded, $Downloaded, $Uploads, $Requests, $Posts, $Bounty, $Artists, $Ratio)
+    {
+        // We can do this all in 1 line, but it's easier to read this way
+        if ($Ratio > 1) {
+            $Ratio = 1;
+        }
+        $TotalScore = 0;
+        if (in_array(false, func_get_args(), true)) {
+            return false;
+        }
+        $TotalScore += $Uploaded * 15;
+        $TotalScore += $Downloaded * 8;
+        $TotalScore += $Uploads * 25;
+        $TotalScore += $Requests * 2;
+        $TotalScore += $Posts;
+        $TotalScore += $Bounty;
+        $TotalScore += $Artists;
+        $TotalScore /= (15 + 8 + 25 + 2 + 1 + 1 + 1);
+        $TotalScore *= $Ratio;
+        return $TotalScore;
     }
-    $TotalScore += $Uploaded * 15;
-    $TotalScore += $Downloaded * 8;
-    $TotalScore += $Uploads * 25;
-    $TotalScore += $Requests * 2;
-    $TotalScore += $Posts;
-    $TotalScore += $Bounty;
-    $TotalScore += $Artists;
-    $TotalScore /= (15 + 8 + 25 + 2 + 1 + 1 + 1);
-    $TotalScore *= $Ratio;
-    return $TotalScore;
-  }
-
 }
-
-
-?>

classes/util.php

@@ -1,4 +1,4 @@
-<?
+<?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.
 
@@ -9,30 +9,33 @@
  * @return bool
  */
 if (PHP_INT_SIZE === 4) {
-  function is_number($Str) {
-    if ($Str === null || $Str === '') {
-      return false;
+    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") === '';
     }
-    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") === '';
-  }
 } 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;
 }
 
 /**
@@ -42,16 +45,17 @@ function is_date($Date) {
  * @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);
+        }
     }
-  }
 }
 
 /**
@@ -61,32 +65,33 @@ function assert_numbers(&$Base, $Keys, $Error = 0) {
  * @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)) {
-      case 'true':
-      case 'yes':
-      case 'on':
-      case '1':
-        return true;
-      case 'false':
-      case 'no':
-      case 'off':
-      case '0':
-        return false;
+function is_bool_value($Value)
+{
+    if (is_bool($Value)) {
+        return $Value;
     }
-  }
-  if (is_numeric($Value)) {
-    if ($Value == 1) {
-      return true;
-    } elseif ($Value == 0) {
-      return false;
+    if (is_string($Value)) {
+        switch (strtolower($Value)) {
+            case 'true':
+            case 'yes':
+            case 'on':
+            case '1':
+                return true;
+            case 'false':
+            case 'no':
+            case 'off':
+            case '0':
+                return false;
+        }
     }
-  }
-  return null;
+    if (is_numeric($Value)) {
+        if ($Value == 1) {
+            return true;
+        } elseif ($Value == 0) {
+            return false;
+        }
+    }
+    return null;
 }
 
 /**
@@ -96,34 +101,35 @@ function is_bool_value($Value) {
  * @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(
-      "'",'"',"<",">",
-      '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
-      '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
-      '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
-      '&#156;','&#158;','&#159;'
-    );
-
-    $With = array(
-      '&#39;','&quot;','&lt;','&gt;',
-      '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
-      '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
-      '&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
-      '&#339;','&#382;','&#376;'
-    );
-
-    $Str = str_replace($Replace, $With, $Str);
-  }
-  return $Str;
+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;',
+        '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
+        '&#156;','&#158;','&#159;'
+        );
+
+        $With = array(
+        '&#39;','&quot;','&lt;','&gt;',
+        '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
+        '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
+        '&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
+        '&#339;','&#382;','&#376;'
+        );
+
+        $Str = str_replace($Replace, $With, $Str);
+    }
+    return $Str;
 }
 
 
@@ -132,16 +138,17 @@ function display_str($Str) {
  *
  * @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);
 }
 
 
@@ -154,51 +161,56 @@ function send_irc($Raw) {
  * @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 . '/';
 }
-?>

classes/validate.class.php

@@ -1,297 +1,284 @@
-<?
+<?php
 /*-- TODO ---------------------------//
 Writeup how to use the VALIDATE class, add in support for form id checks
 Complete the number and date validation
 Remove the GenerateJS stuff
 //-----------------------------------*/
 
-class VALIDATE {
-  var $Fields = [];
-
-  function SetFields($FieldName, $Required, $FieldType, $ErrorMessage, $Options = []) {
-    $this->Fields[$FieldName]['Type'] = strtolower($FieldType);
-    $this->Fields[$FieldName]['Required'] = $Required;
-    $this->Fields[$FieldName]['ErrorMessage'] = $ErrorMessage;
-    if (!empty($Options['maxlength'])) {
-      $this->Fields[$FieldName]['MaxLength'] = $Options['maxlength'];
-    }
-    if (!empty($Options['minlength'])) {
-      $this->Fields[$FieldName]['MinLength'] = $Options['minlength'];
-    }
-    if (!empty($Options['comparefield'])) {
-      $this->Fields[$FieldName]['CompareField'] = $Options['comparefield'];
-    }
-    if (!empty($Options['allowperiod'])) {
-      $this->Fields[$FieldName]['AllowPeriod'] = $Options['allowperiod'];
-    }
-    if (!empty($Options['allowcomma'])) {
-      $this->Fields[$FieldName]['AllowComma'] = $Options['allowcomma'];
-    }
-    if (!empty($Options['inarray'])) {
-      $this->Fields[$FieldName]['InArray'] = $Options['inarray'];
-    }
-    if (!empty($Options['regex'])) {
-      $this->Fields[$FieldName]['Regex'] = $Options['regex'];
-    }
-  }
-
-  function ValidateForm($ValidateArray) {
-    reset($this->Fields);
-    foreach ($this->Fields as $FieldKey => $Field) {
-      $ValidateVar = $ValidateArray[$FieldKey];
-
-      if ($ValidateVar != '' || !empty($Field['Required']) || $Field['Type'] == 'date') {
-        if ($Field['Type'] == 'string') {
-          if (isset($Field['MaxLength'])) {
-            $MaxLength = $Field['MaxLength'];
-          } else {
-            $MaxLength = 255;
-          }
-          if (isset($Field['MinLength'])) {
-            $MinLength = $Field['MinLength'];
-          } else {
-            $MinLength = 1;
-          }
-
-          if (strlen($ValidateVar) > $MaxLength) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) < $MinLength) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'number') {
-          if (isset($Field['MaxLength'])) {
-            $MaxLength = $Field['MaxLength'];
-          } else {
-            $MaxLength = '';
-          }
-          if (isset($Field['MinLength'])) {
-            $MinLength = $Field['MinLength'];
-          } else {
-            $MinLength = 0;
-          }
-
-          $Match = '0-9';
-          if (isset($Field['AllowPeriod'])) {
-            $Match .= '.';
-          }
-          if (isset($Field['AllowComma'])) {
-            $Match .= ',';
-          }
-
-          if (preg_match('/[^'.$Match.']/', $ValidateVar) || strlen($ValidateVar) < 1) {
-            return $Field['ErrorMessage'];
-          } elseif ($MaxLength != '' && $ValidateVar > $MaxLength) {
-            return $Field['ErrorMessage'].'!!';
-          } elseif ($ValidateVar < $MinLength) {
-            return $Field['ErrorMessage']."$MinLength";
-          }
-
-        } elseif ($Field['Type'] == 'email') {
-          if (isset($Field['MaxLength'])) {
-            $MaxLength = $Field['MaxLength'];
-          } else {
-            $MaxLength = 255;
-          }
-          if (isset($Field['MinLength'])) {
-            $MinLength = $Field['MinLength'];
-          } else {
-            $MinLength = 6;
-          }
-
-          if (!preg_match("/^".EMAIL_REGEX."$/i", $ValidateVar)) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) > $MaxLength) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) < $MinLength) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'link') {
-          if (isset($Field['MaxLength'])) {
-            $MaxLength = $Field['MaxLength'];
-          } else {
-            $MaxLength = 255;
-          }
-          if (isset($Field['MinLength'])) {
-            $MinLength = $Field['MinLength'];
-          } else {
-            $MinLength = 10;
-          }
-
-          if (!preg_match('/^'.URL_REGEX.'$/i', $ValidateVar)) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) > $MaxLength) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) < $MinLength) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'username') {
-          if (isset($Field['MaxLength'])) {
-            $MaxLength = $Field['MaxLength'];
-          } else {
-            $MaxLength = 20;
-          }
-          if (isset($Field['MinLength'])) {
-            $MinLength = $Field['MinLength'];
-          } else {
-            $MinLength = 1;
-          }
-
-          if (!preg_match(USERNAME_REGEX, $ValidateVar)) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) > $MaxLength) {
-            return $Field['ErrorMessage'];
-          } elseif (strlen($ValidateVar) < $MinLength) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'checkbox') {
-          if (!isset($ValidateArray[$FieldKey])) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'compare') {
-          if ($ValidateArray[$Field['CompareField']] != $ValidateVar) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'inarray') {
-          if (array_search($ValidateVar, $Field['InArray']) === false) {
-            return $Field['ErrorMessage'];
-          }
-
-        } elseif ($Field['Type'] == 'regex') {
-          if (!preg_match($Field['Regex'], $ValidateVar)) {
-            return $Field['ErrorMessage'];
-          }
-        }
-      }
-    } // while
-  } // function
-
-  function GenerateJS($FormID) {
-    $ReturnJS = "<script type=\"text/javascript\" language=\"javascript\">\r\n";
-    $ReturnJS .= "function formVal() {\r\n";
-    $ReturnJS .= "  clearErrors('$FormID');\r\n";
-
-    reset($this->Fields);
-    foreach ($this->Fields as $FieldKey => $Field) {
-      if ($Field['Type'] == 'string') {
-        $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value == ""';
-        if (!empty($Field['MaxLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
-        } else {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > 255';
-        }
-        if (!empty($Field['MinLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
-        }
-        $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'number') {
-        $Match = '0-9';
-        if (!empty($Field['AllowPeriod'])) {
-          $Match .= '.';
-        }
-        if (!empty($Field['AllowComma'])) {
-          $Match .= ',';
-        }
-
-        $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value.match(/[^'.$Match.']/) || $(\'#'.$FieldKey.'\').raw().value.length < 1';
-        if (!empty($Field['MaxLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value/1 > '.$Field['MaxLength'];
+class VALIDATE
+{
+    public $Fields = [];
+
+    public function SetFields($FieldName, $Required, $FieldType, $ErrorMessage, $Options = [])
+    {
+        $this->Fields[$FieldName]['Type'] = strtolower($FieldType);
+        $this->Fields[$FieldName]['Required'] = $Required;
+        $this->Fields[$FieldName]['ErrorMessage'] = $ErrorMessage;
+        if (!empty($Options['maxlength'])) {
+            $this->Fields[$FieldName]['MaxLength'] = $Options['maxlength'];
         }
-        if (!empty($Field['MinLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value/1 < '.$Field['MinLength'];
+        if (!empty($Options['minlength'])) {
+            $this->Fields[$FieldName]['MinLength'] = $Options['minlength'];
         }
-        $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'email') {
-        $ValItem = '  if (!validEmail($(\'#'.$FieldKey.'\').raw().value)';
-        if (!empty($Field['MaxLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
-        } else {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > 255';
-        }
-        if (!empty($Field['MinLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
-        } else {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < 6';
+        if (!empty($Options['comparefield'])) {
+            $this->Fields[$FieldName]['CompareField'] = $Options['comparefield'];
         }
-        $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'link') {
-        $ValItem = '  if (!validLink($(\'#'.$FieldKey.'\').raw().value)';
-        if (!empty($Field['MaxLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
-        } else {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > 255';
+        if (!empty($Options['allowperiod'])) {
+            $this->Fields[$FieldName]['AllowPeriod'] = $Options['allowperiod'];
         }
-        if (!empty($Field['MinLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
-        } else {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < 10';
+        if (!empty($Options['allowcomma'])) {
+            $this->Fields[$FieldName]['AllowComma'] = $Options['allowcomma'];
         }
-        $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'username') {
-        $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value.match(/[^a-zA-Z0-9_\-]/)';
-        if (!empty($Field['MaxLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
+        if (!empty($Options['inarray'])) {
+            $this->Fields[$FieldName]['InArray'] = $Options['inarray'];
         }
-        if (!empty($Field['MinLength'])) {
-          $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
+        if (!empty($Options['regex'])) {
+            $this->Fields[$FieldName]['Regex'] = $Options['regex'];
         }
-        $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'regex') {
-        $ValItem = '  if (!$(\'#'.$FieldKey.'\').raw().value.match('.$Field['Regex'].')) { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'date') {
-        $DisplayError = $FieldKey.'month';
-        if (isset($Field['MinLength']) && $Field['MinLength'] == 3) {
-          $Day = '$(\'#'.$FieldKey.'day\').raw().value';
-          $DisplayError .= ",{$FieldKey}day";
-        } else {
-          $Day = '1';
-        }
-        $DisplayError .= ",{$FieldKey}year";
-        $ValItemHold = '  if (!validDate($(\'#'.$FieldKey.'month\').raw().value+\'/\'+'.$Day.'+\'/\'+$(\'#'.$FieldKey.'year\').raw().value)) { return showError(\''.$DisplayError.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+    }
 
-        if (empty($Field['Required'])) {
-          $ValItem = '  if ($(\'#'.$FieldKey.'month\').raw().value != ""';
-          if (isset($Field['MinLength']) && $Field['MinLength'] == 3) {
-            $ValItem .= ' || $(\'#'.$FieldKey.'day\').raw().value != ""';
-          }
-          $ValItem .= ' || $(\'#'.$FieldKey.'year\').raw().value != "") {'."\r\n";
-          $ValItem .= $ValItemHold;
-          $ValItem .= " }\r\n";
-        } else {
-          $ValItem .= $ValItemHold;
+    public function ValidateForm($ValidateArray)
+    {
+        reset($this->Fields);
+        foreach ($this->Fields as $FieldKey => $Field) {
+            $ValidateVar = $ValidateArray[$FieldKey];
+
+            if ($ValidateVar != '' || !empty($Field['Required']) || $Field['Type'] == 'date') {
+                if ($Field['Type'] == 'string') {
+                    if (isset($Field['MaxLength'])) {
+                        $MaxLength = $Field['MaxLength'];
+                    } else {
+                        $MaxLength = 255;
+                    }
+                    if (isset($Field['MinLength'])) {
+                        $MinLength = $Field['MinLength'];
+                    } else {
+                        $MinLength = 1;
+                    }
+
+                    if (strlen($ValidateVar) > $MaxLength) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) < $MinLength) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'number') {
+                    if (isset($Field['MaxLength'])) {
+                        $MaxLength = $Field['MaxLength'];
+                    } else {
+                        $MaxLength = '';
+                    }
+                    if (isset($Field['MinLength'])) {
+                        $MinLength = $Field['MinLength'];
+                    } else {
+                        $MinLength = 0;
+                    }
+
+                    $Match = '0-9';
+                    if (isset($Field['AllowPeriod'])) {
+                        $Match .= '.';
+                    }
+                    if (isset($Field['AllowComma'])) {
+                        $Match .= ',';
+                    }
+
+                    if (preg_match('/[^'.$Match.']/', $ValidateVar) || strlen($ValidateVar) < 1) {
+                        return $Field['ErrorMessage'];
+                    } elseif ($MaxLength != '' && $ValidateVar > $MaxLength) {
+                        return $Field['ErrorMessage'].'!!';
+                    } elseif ($ValidateVar < $MinLength) {
+                        return $Field['ErrorMessage']."$MinLength";
+                    }
+                } elseif ($Field['Type'] == 'email') {
+                    if (isset($Field['MaxLength'])) {
+                        $MaxLength = $Field['MaxLength'];
+                    } else {
+                        $MaxLength = 255;
+                    }
+                    if (isset($Field['MinLength'])) {
+                        $MinLength = $Field['MinLength'];
+                    } else {
+                        $MinLength = 6;
+                    }
+
+                    if (!preg_match("/^".EMAIL_REGEX."$/i", $ValidateVar)) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) > $MaxLength) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) < $MinLength) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'link') {
+                    if (isset($Field['MaxLength'])) {
+                        $MaxLength = $Field['MaxLength'];
+                    } else {
+                        $MaxLength = 255;
+                    }
+                    if (isset($Field['MinLength'])) {
+                        $MinLength = $Field['MinLength'];
+                    } else {
+                        $MinLength = 10;
+                    }
+
+                    if (!preg_match('/^'.URL_REGEX.'$/i', $ValidateVar)) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) > $MaxLength) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) < $MinLength) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'username') {
+                    if (isset($Field['MaxLength'])) {
+                        $MaxLength = $Field['MaxLength'];
+                    } else {
+                        $MaxLength = 20;
+                    }
+                    if (isset($Field['MinLength'])) {
+                        $MinLength = $Field['MinLength'];
+                    } else {
+                        $MinLength = 1;
+                    }
+
+                    if (!preg_match(USERNAME_REGEX, $ValidateVar)) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) > $MaxLength) {
+                        return $Field['ErrorMessage'];
+                    } elseif (strlen($ValidateVar) < $MinLength) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'checkbox') {
+                    if (!isset($ValidateArray[$FieldKey])) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'compare') {
+                    if ($ValidateArray[$Field['CompareField']] != $ValidateVar) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'inarray') {
+                    if (array_search($ValidateVar, $Field['InArray']) === false) {
+                        return $Field['ErrorMessage'];
+                    }
+                } elseif ($Field['Type'] == 'regex') {
+                    if (!preg_match($Field['Regex'], $ValidateVar)) {
+                        return $Field['ErrorMessage'];
+                    }
+                }
+            }
+        } // while
+    } // function
+
+    public function GenerateJS($FormID)
+    {
+        $ReturnJS = "<script type=\"text/javascript\" language=\"javascript\">\r\n";
+        $ReturnJS .= "function formVal() {\r\n";
+        $ReturnJS .= "  clearErrors('$FormID');\r\n";
+
+        reset($this->Fields);
+        foreach ($this->Fields as $FieldKey => $Field) {
+            if ($Field['Type'] == 'string') {
+                $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value == ""';
+                if (!empty($Field['MaxLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
+                } else {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > 255';
+                }
+                if (!empty($Field['MinLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
+                }
+                $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'number') {
+                $Match = '0-9';
+                if (!empty($Field['AllowPeriod'])) {
+                    $Match .= '.';
+                }
+                if (!empty($Field['AllowComma'])) {
+                    $Match .= ',';
+                }
+
+                $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value.match(/[^'.$Match.']/) || $(\'#'.$FieldKey.'\').raw().value.length < 1';
+                if (!empty($Field['MaxLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value/1 > '.$Field['MaxLength'];
+                }
+                if (!empty($Field['MinLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value/1 < '.$Field['MinLength'];
+                }
+                $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'email') {
+                $ValItem = '  if (!validEmail($(\'#'.$FieldKey.'\').raw().value)';
+                if (!empty($Field['MaxLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
+                } else {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > 255';
+                }
+                if (!empty($Field['MinLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
+                } else {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < 6';
+                }
+                $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'link') {
+                $ValItem = '  if (!validLink($(\'#'.$FieldKey.'\').raw().value)';
+                if (!empty($Field['MaxLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
+                } else {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > 255';
+                }
+                if (!empty($Field['MinLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
+                } else {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < 10';
+                }
+                $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'username') {
+                $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value.match(/[^a-zA-Z0-9_\-]/)';
+                if (!empty($Field['MaxLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length > '.$Field['MaxLength'];
+                }
+                if (!empty($Field['MinLength'])) {
+                    $ValItem .= ' || $(\'#'.$FieldKey.'\').raw().value.length < '.$Field['MinLength'];
+                }
+                $ValItem .= ') { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'regex') {
+                $ValItem = '  if (!$(\'#'.$FieldKey.'\').raw().value.match('.$Field['Regex'].')) { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'date') {
+                $DisplayError = $FieldKey.'month';
+                if (isset($Field['MinLength']) && $Field['MinLength'] == 3) {
+                    $Day = '$(\'#'.$FieldKey.'day\').raw().value';
+                    $DisplayError .= ",{$FieldKey}day";
+                } else {
+                    $Day = '1';
+                }
+                $DisplayError .= ",{$FieldKey}year";
+                $ValItemHold = '  if (!validDate($(\'#'.$FieldKey.'month\').raw().value+\'/\'+'.$Day.'+\'/\'+$(\'#'.$FieldKey.'year\').raw().value)) { return showError(\''.$DisplayError.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+
+                if (empty($Field['Required'])) {
+                    $ValItem = '  if ($(\'#'.$FieldKey.'month\').raw().value != ""';
+                    if (isset($Field['MinLength']) && $Field['MinLength'] == 3) {
+                        $ValItem .= ' || $(\'#'.$FieldKey.'day\').raw().value != ""';
+                    }
+                    $ValItem .= ' || $(\'#'.$FieldKey.'year\').raw().value != "") {'."\r\n";
+                    $ValItem .= $ValItemHold;
+                    $ValItem .= " }\r\n";
+                } else {
+                    $ValItem .= $ValItemHold;
+                }
+            } elseif ($Field['Type'] == 'checkbox') {
+                $ValItem = '  if (!$(\'#'.$FieldKey.'\').checked) { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            } elseif ($Field['Type'] == 'compare') {
+                $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value!=$(\'#'.$Field['CompareField'].'\').raw().value) { return showError(\''.$FieldKey.','.$Field['CompareField'].'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
+            }
+
+            if (empty($Field['Required']) && $Field['Type'] != 'date') {
+                $ReturnJS .= '  if ($(\'#'.$FieldKey.'\').raw().value!="") {'."\r\n ";
+                $ReturnJS .= $ValItem;
+                $ReturnJS .= "  }\r\n";
+            } else {
+                $ReturnJS .= $ValItem;
+            }
+            $ValItem = '';
         }
 
-      } elseif ($Field['Type'] == 'checkbox') {
-        $ValItem = '  if (!$(\'#'.$FieldKey.'\').checked) { return showError(\''.$FieldKey.'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-
-      } elseif ($Field['Type'] == 'compare') {
-        $ValItem = '  if ($(\'#'.$FieldKey.'\').raw().value!=$(\'#'.$Field['CompareField'].'\').raw().value) { return showError(\''.$FieldKey.','.$Field['CompareField'].'\',\''.$Field['ErrorMessage'].'\'); }'."\r\n";
-      }
-
-      if (empty($Field['Required']) && $Field['Type'] != 'date') {
-        $ReturnJS .= '  if ($(\'#'.$FieldKey.'\').raw().value!="") {'."\r\n ";
-        $ReturnJS .= $ValItem;
-        $ReturnJS .= "  }\r\n";
-      } else {
-        $ReturnJS .= $ValItem;
-      }
-      $ValItem = '';
+        $ReturnJS .= "}\r\n";
+        $ReturnJS .= "</script>\r\n";
+        return $ReturnJS;
     }
-
-    $ReturnJS .= "}\r\n";
-    $ReturnJS .= "</script>\r\n";
-    return $ReturnJS;
-  }
 }
-?>

classes/view.class.php

@@ -1,142 +1,151 @@
-<?
-class View {
-  /**
-   * @var string Path relative to where (P)HTML templates reside
-   */
-  const IncludePath = './design/views/';
+<?php
+class View
+{
+    /**
+     * @var string Path relative to where (P)HTML templates reside
+     */
+    const IncludePath = './design/views/';
 
-  /**
-   * This function is to include the header file on a page.
-   *
-   * @param $PageTitle the title of the page
-   * @param $JSIncludes is a comma-separated list of JS files to be included on
-   *                    the page. ONLY PUT THE RELATIVE LOCATION WITHOUT '.js'
-   *                    example: 'somefile,somedir/somefile'
-   */
-  public static function show_header($PageTitle = '', $JSIncludes = '', $CSSIncludes = '') {
-    global $Document, $Mobile, $Classes;
+    /**
+     * This function is to include the header file on a page.
+     *
+     * @param $PageTitle the title of the page
+     * @param $JSIncludes is a comma-separated list of JS files to be included on
+     *                    the page. ONLY PUT THE RELATIVE LOCATION WITHOUT '.js'
+     *                    example: 'somefile,somedir/somefile'
+     */
+    public static function show_header($PageTitle = '', $JSIncludes = '', $CSSIncludes = '')
+    {
+        global $Document, $Mobile, $Classes;
 
-    if ($PageTitle != '') {
-      $PageTitle .= ' :: ';
-    }
-    $PageTitle .= SITE_NAME;
-    $PageID = array(
-      $Document, // Document
-      empty($_REQUEST['action']) ? false : $_REQUEST['action'], // Action
-      empty($_REQUEST['type']) ? false : $_REQUEST['type'] // Type
-    );
+        if ($PageTitle != '') {
+            $PageTitle .= ' :: ';
+        }
+        $PageTitle .= SITE_NAME;
+        $PageID = array(
+        $Document, // Document
+        empty($_REQUEST['action']) ? false : $_REQUEST['action'], // Action
+        empty($_REQUEST['type']) ? false : $_REQUEST['type'] // Type
+        );
 
-    if (!is_array(G::$LoggedUser) || empty(G::$LoggedUser['ID']) || $PageTitle == 'Recover Password :: ' . SITE_NAME) {
-      require(SERVER_ROOT.'/design/publicheader.php');
-    } else {
-      // HTTP/2 Server Push headers for cloudflare
-      $Scripts = array_merge(['jquery', 'global', 'ajax.class', 'jquery.autocomplete', 'autocomplete', 'tooltipster'], explode(',', $JSIncludes));
-      $Styles = array_merge(['tooltipster'], explode(',', $CSSIncludes));
-      foreach ($Scripts as $Script) {
-        if (trim($Script) == '') { continue; }
-        header('Link: <'.STATIC_SERVER.'functions/'.$Script.'.js?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'functions/'.$Script.'.js').'>; rel=preload; as=script;', false);
-      }
-      header('Link: <'.STATIC_SERVER.'styles/global.css?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'styles/global.css').'>; rel=preload; as=style', false);
-      foreach ($Styles as $Style) {
-        if (trim($Style) == '') { continue; }
-        header('Link: <'.STATIC_SERVER.'styles/'.$Style.'/style.css?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'styles/'.$Style.'/style.css').'>; rel=preload; as=style;', false);
-      }
-      require(SERVER_ROOT.'/design/privateheader.php');
+        if (!is_array(G::$LoggedUser) || empty(G::$LoggedUser['ID']) || $PageTitle == 'Recover Password :: ' . SITE_NAME) {
+            require(SERVER_ROOT.'/design/publicheader.php');
+        } else {
+            // HTTP/2 Server Push headers for cloudflare
+            $Scripts = array_merge(['jquery', 'global', 'ajax.class', 'jquery.autocomplete', 'autocomplete', 'tooltipster'], explode(',', $JSIncludes));
+            $Styles = array_merge(['tooltipster'], explode(',', $CSSIncludes));
+            foreach ($Scripts as $Script) {
+                if (trim($Script) == '') {
+                    continue;
+                }
+                header('Link: <'.STATIC_SERVER.'functions/'.$Script.'.js?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'functions/'.$Script.'.js').'>; rel=preload; as=script;', false);
+            }
+            header('Link: <'.STATIC_SERVER.'styles/global.css?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'styles/global.css').'>; rel=preload; as=style', false);
+            foreach ($Styles as $Style) {
+                if (trim($Style) == '') {
+                    continue;
+                }
+                header('Link: <'.STATIC_SERVER.'styles/'.$Style.'/style.css?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'styles/'.$Style.'/style.css').'>; rel=preload; as=style;', false);
+            }
+            require(SERVER_ROOT.'/design/privateheader.php');
+        }
     }
-  }
 
-  /**
-   * This function is to include the footer file on a page.
-   *
-   * @param $Options an optional array that you can pass information to the
-   *                 header through as well as setup certain limitations
-   *                 Here is a list of parameters that work in the $Options array:
-   *                 ['disclaimer'] = [boolean] (False) Displays the disclaimer in the footer
-   */
-  public static function show_footer($Options = []) {
-    global $ScriptStartTime, $SessionID, $UserSessions, $Debug, $Time, $Mobile;
-    if (!is_array(G::$LoggedUser) || (isset($Options['recover']) && $Options['recover'] === true)) {
-      require(SERVER_ROOT.'/design/publicfooter.php');
-    } else {
-      require(SERVER_ROOT.'/design/privatefooter.php');
+    /**
+     * This function is to include the footer file on a page.
+     *
+     * @param $Options an optional array that you can pass information to the
+     *                 header through as well as setup certain limitations
+     *                 Here is a list of parameters that work in the $Options array:
+     *                 ['disclaimer'] = [boolean] (False) Displays the disclaimer in the footer
+     */
+    public static function show_footer($Options = [])
+    {
+        global $ScriptStartTime, $SessionID, $UserSessions, $Debug, $Time, $Mobile;
+        if (!is_array(G::$LoggedUser) || (isset($Options['recover']) && $Options['recover'] === true)) {
+            require(SERVER_ROOT.'/design/publicfooter.php');
+        } else {
+            require(SERVER_ROOT.'/design/privatefooter.php');
+        }
     }
-  }
 
-  /**
-   * This is a generic function to load a template fromm /design and render it.
-   * The template should be in /design/my_template_name.php, and have a class
-   * in it called MyTemplateNameTemplate (my_template_name transformed to
-   * MixedCase, with the word 'Template' appended).
-   * This class should have a public static function render($Args), where
-   * $Args is an associative array of the template variables.
-   * You should note that by "Template", we mean "php file that outputs stuff".
-   *
-   * This function loads /design/$TemplateName.php, and then calls
-   * render($Args) on the class.
-   *
-   * @param string $TemplateName The name of the template, in underscore_format
-   * @param array $Args the arguments passed to the template.
-   */
-  public static function render_template($TemplateName, $Args) {
-    static $LoadedTemplates; // Keep track of templates we've already loaded.
-    $ClassName = '';
-    if (isset($LoadedTemplates[$TemplateName])) {
-      $ClassName = $LoadedTemplates[$TemplateName];
-    } else {
-      include(SERVER_ROOT.'/design/' . $TemplateName . '.php');
+    /**
+     * This is a generic function to load a template fromm /design and render it.
+     * The template should be in /design/my_template_name.php, and have a class
+     * in it called MyTemplateNameTemplate (my_template_name transformed to
+     * MixedCase, with the word 'Template' appended).
+     * This class should have a public static function render($Args), where
+     * $Args is an associative array of the template variables.
+     * You should note that by "Template", we mean "php file that outputs stuff".
+     *
+     * This function loads /design/$TemplateName.php, and then calls
+     * render($Args) on the class.
+     *
+     * @param string $TemplateName The name of the template, in underscore_format
+     * @param array $Args the arguments passed to the template.
+     */
+    public static function render_template($TemplateName, $Args)
+    {
+        static $LoadedTemplates; // Keep track of templates we've already loaded.
+        $ClassName = '';
+        if (isset($LoadedTemplates[$TemplateName])) {
+            $ClassName = $LoadedTemplates[$TemplateName];
+        } else {
+            include(SERVER_ROOT.'/design/' . $TemplateName . '.php');
 
-      // Turn template_name into TemplateName
-      $ClassNameParts = explode('_', $TemplateName);
-      foreach ($ClassNameParts as $Index => $Part) {
-        $ClassNameParts[$Index] = ucfirst($Part);
-      }
-      $ClassName = implode($ClassNameParts). 'Template';
-      $LoadedTemplates[$TemplateName] = $ClassName;
+            // Turn template_name into TemplateName
+            $ClassNameParts = explode('_', $TemplateName);
+            foreach ($ClassNameParts as $Index => $Part) {
+                $ClassNameParts[$Index] = ucfirst($Part);
+            }
+            $ClassName = implode($ClassNameParts). 'Template';
+            $LoadedTemplates[$TemplateName] = $ClassName;
+        }
+        $ClassName::render($Args);
     }
-    $ClassName::render($Args);
-  }
 
-  /**
-   * This method is similar to render_template, but does not require a
-   * template class.
-   *
-   * Instead, this method simply renders a PHP file (PHTML) with the supplied
-   * variables.
-   *
-   * All files must be placed within {self::IncludePath}. Create and organize
-   * new paths and files. (e.g.: /design/views/artist/, design/view/forums/, etc.)
-   *
-   * @static
-   * @param string  $TemplateFile A relative path to a PHTML file
-   * @param array   $Variables Assoc. array of variables to extract for the template
-   * @param boolean $Buffer enables Output Buffer
-   * @return boolean|string
-   *
-   * @example <pre><?php
-   *  // box.phtml
-   *  <p id="<?=$id?>">Data</p>
-   *
-   *  // The variable $id within box.phtml will be filled by $some_id
-   *  View::parse('section/box.phtml', array('id' => $some_id));
-   *
-   *  // Parse a template without outputing it
-   *  $SavedTemplate = View::parse('sec/tion/eg.php', $DataArray, true);
-   *  // later . . .
-   *  echo $SavedTemplate; // Output the buffer
-   * </pre>
-   */
-  public static function parse($TemplateFile, array $Variables = [], $Buffer = false) {
-    $Template = self::IncludePath . $TemplateFile;
-    if (file_exists($Template)) {
-      extract($Variables);
-      if ($Buffer) {
-        ob_start();
-        include $Template;
-        $Content = ob_get_contents();
-        ob_end_clean();
-        return $Content;
-      }
-      return include $Template;
+    /**
+     * This method is similar to render_template, but does not require a
+     * template class.
+     *
+     * Instead, this method simply renders a PHP file (PHTML) with the supplied
+     * variables.
+     *
+     * All files must be placed within {self::IncludePath}. Create and organize
+     * new paths and files. (e.g.: /design/views/artist/, design/view/forums/, etc.)
+     *
+     * @static
+     * @param string  $TemplateFile A relative path to a PHTML file
+     * @param array   $Variables Assoc. array of variables to extract for the template
+     * @param boolean $Buffer enables Output Buffer
+     * @return boolean|string
+     *
+     * @example <pre><?php
+     *  // box.phtml
+     *  <p id="<?=$id?>">Data</p>
+     *
+     *  // The variable $id within box.phtml will be filled by $some_id
+     *  View::parse('section/box.phtml', array('id' => $some_id));
+     *
+     *  // Parse a template without outputing it
+     *  $SavedTemplate = View::parse('sec/tion/eg.php', $DataArray, true);
+     *  // later . . .
+     *  echo $SavedTemplate; // Output the buffer
+     * </pre>
+     */
+    public static function parse($TemplateFile, array $Variables = [], $Buffer = false)
+    {
+        $Template = self::IncludePath . $TemplateFile;
+        if (file_exists($Template)) {
+            extract($Variables);
+            if ($Buffer) {
+                ob_start();
+                include $Template;
+                $Content = ob_get_contents();
+                ob_end_clean();
+                return $Content;
+            }
+            return include $Template;
+        }
     }
-  }
 }