Give new users 2 freeleech tokens each

classes/charts.class.php

@@ -1,193 +1,218 @@
-<?
-class GOOGLE_CHARTS {
-  protected $URL = 'https://chart.googleapis.com/chart';
-  protected $Labels = [];
-  protected $Data = [];
-  protected $Options = [];
-
-  public function __construct($Type, $Width, $Height, $Options) {
-    if ($Width * $Height > 300000 || $Height > 1000 || $Width > 1000) {
-      trigger_error('Tried to make chart too large.');
+<?php
+class GOOGLE_CHARTS
+{
+    protected $URL = 'https://chart.googleapis.com/chart';
+    protected $Labels = [];
+    protected $Data = [];
+    protected $Options = [];
+
+    public function __construct($Type, $Width, $Height, $Options)
+    {
+        if ($Width * $Height > 300000 || $Height > 1000 || $Width > 1000) {
+            trigger_error('Tried to make chart too large.');
+        }
+        $this->URL .= "?cht=$Type&amp;chs={$Width}x$Height";
+        $this->Options = $Options;
     }
-    $this->URL .= "?cht=$Type&amp;chs={$Width}x$Height";
-    $this->Options = $Options;
-  }
 
-  protected function encode($Number) {
-    if ($Number == -1) {
-      return '__';
+    protected function encode($Number)
+    {
+        if ($Number === -1) {
+            return '__';
+        }
+        $CharKey = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
+        return $CharKey[floor($Number / 64)].$CharKey[floor($Number % 64)];
     }
-    $CharKey = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
-    return $CharKey[floor($Number / 64)].$CharKey[floor($Number % 64)];
-  }
-
-  public function color($Colors) {
-    $this->URL .= '&amp;chco='.$Colors;
-  }
 
-  public function lines($Thickness, $Solid = 1, $Blank = 0) {
-    $this->URL .= "&amp;chls=$Thickness,$Solid,$Blank";
-  }
+    public function color($Colors)
+    {
+        $this->URL .= '&amp;chco='.$Colors;
+    }
 
-  public function title($Title, $Color = '', $Size = '') {
-    $this->URL .= '&amp;chtt='.str_replace(array(' ', "\n"), array('+', '|'), $Title);
-    if (!empty($Color)) {
-      $this->URL .= '&amp;chts='.$Color;
+    public function lines($Thickness, $Solid = 1, $Blank = 0)
+    {
+        $this->URL .= "&amp;chls=$Thickness,$Solid,$Blank";
     }
-    if (!empty($Size)) {
-      $this->URL .= ','.$Size;
+
+    public function title($Title, $Color = '', $Size = '')
+    {
+        $this->URL .= '&amp;chtt='.str_replace(array(' ', "\n"), array('+', '|'), $Title);
+        if (!empty($Color)) {
+            $this->URL .= '&amp;chts='.$Color;
+        }
+        if (!empty($Size)) {
+            $this->URL .= ','.$Size;
+        }
     }
-  }
 
-  public function legend($Items, $Placement = '') {
-    $this->URL .= '&amp;chdl='.str_replace(' ', '+', implode('|', $Items));
-    if (!empty($Placement)) {
-      if (!in_array($Placement, array('b', 't', 'r', 'l', 'bv', 'tv'))) {
-        trigger_error('Invalid legend placement.');
-      }
-      $this->URL .= '&amp;chdlp='.$Placement;
+    public function legend($Items, $Placement = '')
+    {
+        $this->URL .= '&amp;chdl='.str_replace(' ', '+', implode('|', $Items));
+        if (!empty($Placement)) {
+            if (!in_array($Placement, array('b', 't', 'r', 'l', 'bv', 'tv'))) {
+                trigger_error('Invalid legend placement.');
+            }
+            $this->URL .= '&amp;chdlp='.$Placement;
+        }
     }
-  }
 
-  public function add($Label, $Data) {
-    if ($Label !== false) {
-      $this->Labels[] = $Label;
+    public function add($Label, $Data)
+    {
+        if ($Label !== false) {
+            $this->Labels[] = $Label;
+        }
+        $this->Data[] = $Data;
     }
-    $this->Data[] = $Data;
-  }
 
-  public function grid_lines($SpacingX = 0, $SpacingY = -1, $Solid = 1, $Blank = 1) {
-    //Can take 2 more parameters for offset, but we're not bothering with that right now
-    $this->URL .= "&amp;chg=$SpacingX,$SpacingY,$Solid,$Blank";
-  }
+    public function grid_lines($SpacingX = 0, $SpacingY = -1, $Solid = 1, $Blank = 1)
+    {
+        // Can take 2 more parameters for offset, but we're not bothering with that right now
+        $this->URL .= "&amp;chg=$SpacingX,$SpacingY,$Solid,$Blank";
+    }
 
-  public function transparent() {
-    $this->URL .= '&amp;chf=bg,s,FFFFFF00';
-  }
+    public function transparent()
+    {
+        $this->URL .= '&amp;chf=bg,s,FFFFFF00';
+    }
 
 
-  public function url() {
-    return $this->URL;
-  }
+    public function url()
+    {
+        return $this->URL;
+    }
 }
 
-class AREA_GRAPH extends GOOGLE_CHARTS {
-  public function __construct ($Width, $Height, $Options = []) {
-    parent::__construct('lc', $Width, $Height, $Options);
-  }
+class AREA_GRAPH extends GOOGLE_CHARTS
+{
+    public function __construct($Width, $Height, $Options = [])
+    {
+        parent::__construct('lc', $Width, $Height, $Options);
+    }
 
-  public function color ($Color) {
-    $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
-  }
+    public function color($Color)
+    {
+        $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
+    }
 
-  public function generate() {
-    $Max = max($this->Data);
-    $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-    $Data = [];
-    foreach ($this->Data as $Value) {
-      $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+    public function generate()
+    {
+        $Max = max($this->Data);
+        $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
+        $Data = [];
+        foreach ($this->Data as $Value) {
+            $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+        }
+        $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max - $Min).'&amp;chd=e:'.implode('', $Data);
     }
-    $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max - $Min).'&amp;chd=e:'.implode('', $Data);
-  }
 }
 
-class PIE_CHART extends GOOGLE_CHARTS {
-  public function __construct ($Width, $Height, $Options = []) {
-    $Type = ((isset($this->Options['3D'])) ? 'p3' : 'p');
-    parent::__construct($Type, $Width, $Height, $Options);
-  }
-
-  public function generate() {
-    $Sum = array_sum($this->Data);
-    $Other = isset($this->Options['Other']);
-    $Sort = isset($this->Options['Sort']);
-    $LabelPercent = isset($this->Options['Percentage']);
-
-    if ($Sort && !empty($this->Labels)) {
-      array_multisort($this->Data, SORT_DESC, $this->Labels);
-    } elseif ($Sort) {
-      sort($this->Data);
-      $this->Data = array_reverse($this->Data);
-    }
-
-    $Data = [];
-    $Labels = $this->Labels;
-    $OtherPercentage = 0.00;
-    $OtherData = 0;
-
-    foreach ($this->Data as $Key => $Value) {
-      $ThisPercentage = number_format(($Value / $Sum) * 100, 2);
-      $ThisData = ($Value / $Sum) * 4095;
-      if ($Other && $ThisPercentage < 1) {
-        $OtherPercentage += $ThisPercentage;
-        $OtherData += $ThisData;
-        unset($Data[$Key]);
-        unset($Labels[$Key]);
-        continue;
-      }
-      if ($LabelPercent) {
-        $Labels[$Key] .= ' ('.$ThisPercentage.'%)';
-      }
-      $Data[] = $this->encode($ThisData);
-    }
-    if ($OtherPercentage > 0) {
-      $OtherLabel = 'Other';
-      if ($LabelPercent) {
-        $OtherLabel .= ' ('.$OtherPercentage.'%)';
-      }
-      $Labels[] = $OtherLabel;
-      $Data[] = $this->encode($OtherData);
-    }
-    $this->URL .= "&amp;chl=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
-  }
-}
+class PIE_CHART extends GOOGLE_CHARTS
+{
+    public function __construct($Width, $Height, $Options = [])
+    {
+        $Type = ((isset($this->Options['3D'])) ? 'p3' : 'p');
+        parent::__construct($Type, $Width, $Height, $Options);
+    }
 
+    public function generate()
+    {
+        $Sum = array_sum($this->Data);
+        $Other = isset($this->Options['Other']);
+        $Sort = isset($this->Options['Sort']);
+        $LabelPercent = isset($this->Options['Percentage']);
+
+        if ($Sort && !empty($this->Labels)) {
+            array_multisort($this->Data, SORT_DESC, $this->Labels);
+        } elseif ($Sort) {
+            sort($this->Data);
+            $this->Data = array_reverse($this->Data);
+        }
+
+        $Data = [];
+        $Labels = $this->Labels;
+        $OtherPercentage = 0.00;
+        $OtherData = 0;
+
+        foreach ($this->Data as $Key => $Value) {
+            $ThisPercentage = number_format(($Value / $Sum) * 100, 2);
+            $ThisData = ($Value / $Sum) * 4095;
+            if ($Other && $ThisPercentage < 1) {
+                $OtherPercentage += $ThisPercentage;
+                $OtherData += $ThisData;
+                unset($Data[$Key]);
+                unset($Labels[$Key]);
+                continue;
+            }
+            if ($LabelPercent) {
+                $Labels[$Key] .= ' ('.$ThisPercentage.'%)';
+            }
+            $Data[] = $this->encode($ThisData);
+        }
+        if ($OtherPercentage > 0) {
+            $OtherLabel = 'Other';
+            if ($LabelPercent) {
+                $OtherLabel .= ' ('.$OtherPercentage.'%)';
+            }
+            $Labels[] = $OtherLabel;
+            $Data[] = $this->encode($OtherData);
+        }
+        $this->URL .= "&amp;chl=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
+    }
+}
 
-class LOG_BAR_GRAPH extends GOOGLE_CHARTS {
-  // todo: Finish
-  public function __construct ($Base, $Width, $Height, $Options = []) {
-    parent::__construct('lc', $Width, $Height, $Options);
-  }
+class LOG_BAR_GRAPH extends GOOGLE_CHARTS
+{
+    // todo: Finish
+    public function __construct($Base, $Width, $Height, $Options = [])
+    {
+        parent::__construct('lc', $Width, $Height, $Options);
+    }
 
-  public function color ($Color) {
-    $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
-  }
+    public function color($Color)
+    {
+        $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
+    }
 
-  public function generate() {
-    $Max = max($this->Data);
-    $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-    $Data = [];
-    foreach ($this->Data as $Value) {
-      $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+    public function generate()
+    {
+        $Max = max($this->Data);
+        $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
+        $Data = [];
+        foreach ($this->Data as $Value) {
+            $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+        }
+        $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max-$Min).'&amp;chd=e:'.implode('', $Data);
     }
-    $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max-$Min).'&amp;chd=e:'.implode('', $Data);
-  }
 }
 
-class POLL_GRAPH extends GOOGLE_CHARTS {
-  public function __construct () {
-    $this->URL .= '?cht=bhg';
-  }
-
-  public function add($Label, $Data) {
-    if ($Label !== false) {
-      $this->Labels[] = Format::cut_string($Label, 35);
-    }
-    $this->Data[] = $Data;
-  }
-
-  public function generate() {
-    $Count = count($this->Data);
-    $Height = (30 * $Count) + 20;
-    $Max = max($this->Data);
-    $Sum = array_sum($this->Data);
-    $Increment = ($Max / $Sum) * 25; // * 100% / 4divisions
-    $Data = [];
-    $Labels = [];
-    foreach ($this->Data as $Key => $Value) {
-      $Data[] = $this->encode(($Value / $Max) * 4095);
-      $Labels[] = '@t'.str_replace(array(' ', ','),array('+', '\,'), $this->Labels[$Key]).',000000,1,'.round((($Key + 1) / $Count) - (12 / $Height), 2).':0,12';
-    }
-    $this->URL .= "&amp;chbh=25,0,5&amp;chs=214x$Height&amp;chl=0%|".round($Increment, 1)."%|".round($Increment * 2, 1)."%|".round($Increment * 3, 1)."%|".round($Increment * 4, 1)."%&amp;chm=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
-  }
+class POLL_GRAPH extends GOOGLE_CHARTS
+{
+    public function __construct()
+    {
+        $this->URL .= '?cht=bhg';
+    }
+
+    public function add($Label, $Data)
+    {
+        if ($Label !== false) {
+            $this->Labels[] = Format::cut_string($Label, 35);
+        }
+        $this->Data[] = $Data;
+    }
+
+    public function generate()
+    {
+        $Count = count($this->Data);
+        $Height = (30 * $Count) + 20;
+        $Max = max($this->Data);
+        $Sum = array_sum($this->Data);
+        $Increment = ($Max / $Sum) * 25; // * 100% / 4divisions
+        $Data = [];
+        $Labels = [];
+        foreach ($this->Data as $Key => $Value) {
+            $Data[] = $this->encode(($Value / $Max) * 4095);
+            $Labels[] = '@t'.str_replace(array(' ', ','), array('+', '\,'), $this->Labels[$Key]).',000000,1,'.round((($Key + 1) / $Count) - (12 / $Height), 2).':0,12';
+        }
+        $this->URL .= "&amp;chbh=25,0,5&amp;chs=214x$Height&amp;chl=0%|".round($Increment, 1)."%|".round($Increment * 2, 1)."%|".round($Increment * 3, 1)."%|".round($Increment * 4, 1)."%&amp;chm=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
+    }
 }

classes/rules.class.php

@@ -1,51 +1,79 @@
 <?php
-class Rules {
+class Rules
+{
 
   /**
    * Displays the site's "Golden Rules".
    *
    */
-  public static function display_golden_rules() {
-    ?>
-    <ul>
-      <li>Staff can do anything to anyone for any reason (or no reason). If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site.</li>
-      <li>One account per person per lifetime.</li>
-      <li>Follow proper private BitTorrent practices. Torrent files you download from this site are unique to you and should not be shared with others. Torrent files from this site should not be modified by adding additional trackers or enabling DHT or PEX under any circumstances.</li>
-      <li>Buying <?=SITE_NAME?> invites is not allowed. If staff discover you have purchased an invite, you will be banned for life. You will be given amnesty if you approach us before you are caught and reveal who your seller was. Waiting until after you are caught will get you nothing.</li>
-      <li>Accessing the site from any IP address is permitted, but your account will be linked with other accounts that have accessed the site from the same IP as you. As such, it is <em>recommended</em> that you don't use public networks, proxies, or VPNs to access the site.</li>
-      <li>Attempting to find a bug in the site code is allowed and sometimes even rewarded. Follow proper disclosure procedures by contacting staff about the issue well before disclosing it publicly. Do not misuse any bugs you may discover. Do not attempt to portray abuse as a bug in the hopes of a reward.</li>
-      <li>Don't reveal the criteria for hidden badges or events.</li>
-    </ul>
-<?
-  }
+    public static function display_golden_rules()
+    {
+        ?>
+<ul>
+  <li>Staff can do anything to anyone for any reason (or no reason). If you take issue with a decision, you must do so
+    privately with the staff member who issued the decision or with an administrator of the site.</li>
 
-  /**
-   * Displays the site's rules for tags.
-   *
-   * @param boolean $OnUpload - whether it's being displayed on a torrent upload form
-   */
-  public static function display_site_tag_rules($OnUpload = false) {
-    ?>
-    <ul>
-      <li><strong>Please use the <strong class="important_text_alt">vanity.house</strong> tag for sequences that you or your lab produced.</strong> This helps us promote the DIYbio community's original contributions.</li>
+  <li>One account per person per lifetime.</li>
 
-      <li>Tags should be comma-separated, and you should use a period to separate words inside a tag, e.g., <strong class="important_text_alt">gram.negative</strong>.</li>
+  <li>Follow proper private BitTorrent practices. Torrent files you download from this site are unique to you and should
+    not be shared with others. Torrent files from this site should not be modified by adding additional trackers or
+    enabling DHT or PEX under any circumstances.</li>
 
-      <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>. Please use these tags instead of "unofficial" tags, e.g., use the official <strong class="important_text_alt">fungi</strong> tag instead of an unofficial <strong class="important_text">mushrooms</strong> tag.</li>
+  <li>Buying <?=SITE_NAME?> invites is not allowed. If staff discover
+    you have purchased an invite, you will be banned for life. You will be given amnesty if you approach us before you
+    are caught and reveal who your seller was. Waiting until after you are caught will get you nothing.</li>
 
-      <li>Avoid using multiple synonymous tags. Using both <strong class="important_text">cyanobacteria</strong> and <strong class="important_text_alt">bacteria</strong> is redundant and stupid &mdash; just use the official <strong class="important_text_alt">bacteria</strong>.</li>
+  <li>Accessing the site from any IP address is permitted, but your account will be linked with other accounts that have
+    accessed the site from the same IP as you. As such, it is <em>recommended</em> that you don't use public networks,
+    proxies, or VPNs to access the site.</li>
 
-      <li>Don't add useless tags that are already covered by other metadata. If a torrent is in the DNA category, please don't tag it <strong class="important_text">dna</strong>.</li>
+  <li>Attempting to find a bug in the site code is allowed and sometimes even rewarded. Follow proper disclosure
+    procedures by contacting staff about the issue well before disclosing it publicly. Do not misuse any bugs you may
+    discover. Do not attempt to portray abuse as a bug in the hopes of a reward.</li>
 
-      <li>Only tag information related to the group itself &mdash; <strong>not the individual release</strong>. Tags such as <strong class="important_text">apollo.100</strong>, <strong class="important_text">hiseq.2500</strong>, etc., are strictly forbidden. Remember that these tags will be used for other releases in the same group.</li>
+  <li>Don't reveal the criteria for hidden badges or events.</li>
+</ul>
+<?php
+    }
 
-      <li><strong>Certain tags are strongly encouraged for appropriate uploads:</strong> <strong class="important_text_alt">archaea</strong>, <strong class="important_text_alt">bacteria</strong>, <strong class="important_text_alt">fungi</strong>, <strong class="important_text_alt">animals</strong>, <strong class="important_text_alt">plants</strong>, <strong class="important_text_alt">plasmids</strong>. People search for these kinds of things specifically, so tagging them properly will get you more snatches.</li>
+    /**
+     * Displays the site's rules for tags.
+     *
+     * @param boolean $OnUpload - whether it's being displayed on a torrent upload form
+     */
+    public static function display_site_tag_rules($OnUpload = false)
+    {
+        ?>
+<ul>
+  <li><strong>Please use the <strong class="important_text_alt">vanity.house</strong> tag for sequences that you or your
+      lab produced.</strong> This helps us promote the DIYbio community's original contributions.</li>
 
-      <!--
-      <li><strong>Certain tags are <strong class="important_text">required</strong> for appropriate uploads:</strong>"<strong class="important_text_alt">lolicon</strong>", "<strong class="important_text_alt">shotacon</strong>", "<strong class="important_text_alt">toddlercon</strong>". Failure to use these tags may result in punishment.</li>
-      -->
+  <li>Tags should be comma-separated, and you should use a period to separate words inside a tag, e.g., <strong
+      class="important_text_alt">gram.negative</strong>.</li>
+
+  <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.
+    Please use these tags instead of "unofficial" tags, e.g., use the official <strong
+      class="important_text_alt">fungi</strong> tag instead of an unofficial <strong
+      class="important_text">mushrooms</strong> tag.</li>
+
+  <li>Avoid using multiple synonymous tags. Using both <strong class="important_text">cyanobacteria</strong> and <strong
+      class="important_text_alt">bacteria</strong> is redundant and stupid &mdash; just use the official <strong
+      class="important_text_alt">bacteria</strong>.</li>
+
+  <li>Don't add useless tags that are already covered by other metadata. If a torrent is in the DNA category, please
+    don't tag it <strong class="important_text">dna</strong>.</li>
+
+  <li>Only tag information related to the group itself &mdash; <strong>not the individual release</strong>. Tags such as
+    <strong class="important_text">apollo.100</strong>, <strong class="important_text">hiseq.2500</strong>, etc., are
+    strictly forbidden. Remember that these tags will be used for other releases in the same group.</li>
 
-      <!--
+  <li><strong>Certain tags are strongly encouraged for appropriate uploads:</strong> <strong
+      class="important_text_alt">archaea</strong>, <strong class="important_text_alt">bacteria</strong>, <strong
+      class="important_text_alt">fungi</strong>, <strong class="important_text_alt">animals</strong>, <strong
+      class="important_text_alt">plants</strong>, <strong class="important_text_alt">plasmids</strong>. People search
+    for these kinds of things specifically, so tagging them properly will get you more snatches.</li>
+
+  <!--
       <li><strong>Use tag namespaces when appropriate.</strong> BioTorrents.de allows for tag namespaces to aid with searching. For example, you may want to use the tags "<strong class="important_text_alt">masturbation:male</strong>" or "<strong class="important_text_alt">masturbation:female</strong>" instead of just "<strong class="important_text">masturbation</strong>". They can be used to make search queries more specific. Searching for "<strong class="important_texti_alt">masturbation</strong>" will show all torrents tagged with "<strong class="important_text_alt">masturbation</strong>", "<strong class="important_text_alt">masturbation:male</strong>", or "<strong class="important_text_alt">masturbation:female</strong>". However, searching for "<strong class="important_text_alt">masturbation:female</strong>" will ONLY show torrents with that tag. Tags with namespaces will appear differently depending on the namespace used, which include:
         <ul>
           <li><strong>:parody</strong> - Used to denote a parodied work: <strong class="tag_parody">touhou</strong>, <strong class="tag_parody">kantai.collection</strong></li>
@@ -56,46 +84,85 @@ class Rules {
       </li>
       -->
 
-      <li><strong>All uploads require a minimum of 5 tags.</strong> Please don't add unrelated tags just to meet the 5 tag requirement. If you can't think of 5 tags for your content, study it again until you can.</li>
+  <li><strong>All uploads require a minimum of 5 tags.</strong> Please don't add unrelated tags just to meet the 5 tag
+    requirement. If you can't think of 5 tags for your content, study it again until you can.</li>
 
-      <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong> If you doubt whether or not a tag is acceptable, please omit it for now and send a staff PM to request a new official tag or an approved alias.</li>
-    </ul>
-<?
-  }
+  <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong>
+    If you doubt whether or not a tag is acceptable, please omit it for now and send a staff PM to request a new
+    official tag or an approved alias.</li>
+</ul>
+<?php
+    }
 
-  /**
-   * Displays the site's rules for the forum
-   *
-   */
-  public static function display_forum_rules() {
-    ?>
-        <ul>
-      <li>Let's treat the biology boards like how the Shroomery used to be: each thread a set of resourceful diverse wisdom worth using permalinks to. It's okay if the boards are slow, that's why there are only a few of them.</li>
-      <li>Please discuss site news in the corresponding Announcements thread instead of making a new General thread. Discussing science-related news in General is highly encouraged, but discussing political news is much less so. Thank you.</li>
-      <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a financial instrument. You'll be banned on the spot. The exceptions: cryptocurrencies that derive their value from work performed on distributed science computation networks, e.g., Curecoin, FoldingCoin, and Gridcoin.</li>
-      <li>Feel free to post announcements for your own projects, even and especially if they're commercial ones, in the General board. Limit all discussion of trading biomaterials, including bulk giveaways, to the Marketplace forum available to Power Users.</li>
-      <li>Please be modest when talking about your uploads. It's unnecessary to announce your uploads because Gazelle logs everything (at least one this is encrypted). If someone asks for help on his project and your upload fits the bill, go write a post!</li>
-      <li>Use descriptive and specific subject lines. This helps others decide whether your particular words of "wisdom" relate to a topic they care about.</li>
-      <li>Don't post comments that don't add anything to the discussion, such as "I agree" or "haha." Bottle the trained dopamine response to social media because comment reactions are an unlikely feature.</li>
-      <li>Please refrain from quoting excessively. When quoting someone, use only the necessary parts of the quote. Avoid quoting more than 3 levels deep.</li>
-      <li>Don't post potentially malicious links without sufficient warning, or post pictures > 2 MiB. Please only speak English as stated in the Upload rules.</li>
-    </ul>
-<?
-  }
+    /**
+     * Displays the site's rules for the forum
+     *
+     */
+    public static function display_forum_rules()
+    {
+        ?>
+<ul>
+  <li>Let's treat the biology boards like how the Shroomery used to be: each thread a set of resourceful diverse wisdom
+    worth using permalinks to. It's okay if the boards are slow, that's why there are only a few of them.</li>
 
-  /**
-   * Displays the site's rules for conversing on its IRC network
-   *
-   */
-  public static function display_irc_chat_rules() {
-    ?>
-      <li>BioTorrents.de's Slack channels are just are another quiet hangout you can stack your app with so you look cool at conferences.</li>
-      <li>Please use <code>#general</code> for the usual chit-chat, <code>#development</code> for questions about the Gazelle software, and <code>#disabled</code> to get help recovering your account.</li>
-      <li>Don't send mass alerts with <code>@channel</code>, <code>@everyone</code>, or <code>@here</code>. It's obnoxious and you should handle anything genuinely important on the boards.</li>
-      <li>Flooding is irritating and you'll get kicked for it. This includes "now playing" scripts, large amounts of irrelevant text such as lorem ipsum, and unfunny non sequiturs.</li>
-      <li>Impersonating other members &mdash; particularly staff members &mdash; will not go unpunished. Please remember that the Slack channels are publicly accessible.</li>
-      <li>Please use the threaded conversations feature in Slack and avoid replying to threads with new messages or crossposting replies to the main channel.</li>
-      <li>Announce and bot channels are in development, as standard IRC instead of Slack for obvious reasons. Any IRC bots you have must authenticate with your own username and IRC key, and set the <code>+B</code> usermode on themselves.</li>
-<?
-  }
+  <li>Please discuss site news in the corresponding Announcements thread instead of making a new General thread.
+    Discussing science-related news in General is highly encouraged, but discussing political news is much less so.
+    Thank you.</li>
+
+  <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a
+    financial instrument. You'll be banned on the spot. The exceptions: cryptocurrencies that derive their value from
+    work performed on distributed science computation networks, i.e., Curecoin, FoldingCoin, and Gridcoin.</li>
+
+  <li>Feel free to post announcements for your own projects, even and especially if they're commercial ones, in the
+    General board. Limit all discussion of trading biomaterials, including bulk giveaways, to the Marketplace forum
+    available to Power Users.</li>
+
+  <li>Please be modest when talking about your uploads. It's unnecessary to announce your uploads because Gazelle logs
+    everything (at least this installation's database is encrypted). If someone asks for help on his project and your
+    upload fits the bill, go write a post!</li>
+
+  <li>Use descriptive and specific subject lines. This helps others decide whether your particular words of "wisdom"
+    relate to a topic they care about.</li>
+
+  <li>Don't post comments that don't add anything to the discussion, such as "I agree" or "haha." Bottle the trained
+    dopamine response to social media because comment reactions are an unlikely feature.</li>
+
+  <li>Please refrain from quoting excessively. When quoting someone, use only the necessary parts of the quote. Avoid
+    quoting more than 3 levels deep.</li>
+
+  <li>Don't post potentially malicious links without sufficient warning, or post pictures > 2 MiB. Please only speak
+    English as stated in the Upload rules.</li>
+</ul>
+<?php
+    }
+
+    /**
+     * Displays the site's rules for conversing on its IRC network
+     *
+     */
+    public static function display_irc_chat_rules()
+    {
+        ?>
+<li>BioTorrents.de's Slack channels are just are another quiet hangout you can stack your app with so you look cool at
+  conferences.</li>
+
+<li>Please use <code>#general</code> for the usual chit-chat, <code>#development</code> for questions about the Gazelle
+  software, and <code>#disabled</code> to get help recovering your account.</li>
+
+<li>Don't send mass alerts with <code>@channel</code>, <code>@everyone</code>, or <code>@here</code>. It's obnoxious and
+  you should handle anything genuinely important on the boards.</li>
+
+<li>Flooding is irritating and you'll get kicked for it. This includes "now playing" scripts, large amounts of
+  irrelevant text such as lorem ipsum, and unfunny non sequiturs.</li>
+
+<li>Impersonating other members &mdash; particularly staff members &mdash; will not go unpunished. Please remember that
+  the Slack channels are publicly accessible.</li>
+
+<li>Please use the threaded conversations feature in Slack and avoid replying to threads with new messages or
+  crossposting replies to the main channel.</li>
+
+<li>Announce and bot channels are in development, as standard IRC instead of Slack for obvious reasons. Any IRC bots you
+  have must authenticate with your own username and IRC key, and set the <code>+B</code> usermode on themselves.</li>
+<?php
+    }
 }

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(
+        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;
+        }
     }
-  }
 }

sections/register/index.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 /*
 if (isset($LoggedUser)) {
@@ -11,195 +11,189 @@ if (isset($LoggedUser)) {
 
 include(SERVER_ROOT.'/classes/validate.class.php');
 
-$Val = NEW Validate;
+$Val = new Validate;
 
 if (!empty($_REQUEST['confirm'])) {
-  // Confirm registration
-  $DB->query("
+    // Confirm registration
+    $DB->query("
     SELECT ID
     FROM users_main
     WHERE torrent_pass = '".db_string($_REQUEST['confirm'])."'
       AND Enabled = '0'");
-  list($UserID) = $DB->next_record();
+    list($UserID) = $DB->next_record();
 
-  if ($UserID) {
-    $DB->query("
+    if ($UserID) {
+        $DB->query("
       UPDATE users_main
       SET Enabled = '1'
       WHERE ID = '$UserID'");
-    $Cache->increment('stats_user_count');
-    include('step2.php');
-  }
-
+        $Cache->increment('stats_user_count');
+        include('step2.php');
+    }
 } elseif (OPEN_REGISTRATION || !empty($_REQUEST['invite'])) {
-  $Val->SetFields('username', true, 'regex', 'You did not enter a valid username.', array('regex' => USERNAME_REGEX));
-  $Val->SetFields('email', true, 'email', 'You did not enter a valid email address.');
-  $Val->SetFields('password', true, 'regex', 'Your password must be at least 6 characters long.', array('regex'=>'/(?=^.{6,}$).*$/'));
-  $Val->SetFields('confirm_password', true, 'compare', 'Your passwords do not match.', array('comparefield' => 'password'));
-  $Val->SetFields('readrules', true, 'checkbox', 'You did not select the box that says you will read the rules.');
-  $Val->SetFields('readwiki', true, 'checkbox', 'You did not select the box that says you will read the wiki.');
-  $Val->SetFields('agereq', true, 'checkbox', 'You did not select the box that says you are 18 years of age or older.');
-  //$Val->SetFields('captcha', true, 'string', 'You did not enter a captcha code.', array('minlength' => 6, 'maxlength' => 6));
-
-  if (!apcu_exists('DBKEY')) {
-    $Err = "Registration temporarily disabled due to degraded database access (security measure)";
-  }
-
-  if (!empty($_POST['submit'])) {
-    // User has submitted registration form
-    $Err = $Val->ValidateForm($_REQUEST);
-    /*
-    if (!$Err && strtolower($_SESSION['captcha']) != strtolower($_REQUEST['captcha'])) {
-      $Err = 'You did not enter the correct captcha code.';
+    $Val->SetFields('username', true, 'regex', 'You did not enter a valid username.', array('regex' => USERNAME_REGEX));
+    $Val->SetFields('email', true, 'email', 'You did not enter a valid email address.');
+    $Val->SetFields('password', true, 'regex', 'Your password must be at least 6 characters long.', array('regex'=>'/(?=^.{6,}$).*$/'));
+    $Val->SetFields('confirm_password', true, 'compare', 'Your passwords do not match.', array('comparefield' => 'password'));
+    $Val->SetFields('readrules', true, 'checkbox', 'You did not select the box that says you will read the rules.');
+    $Val->SetFields('readwiki', true, 'checkbox', 'You did not select the box that says you will read the wiki.');
+    $Val->SetFields('agereq', true, 'checkbox', 'You did not select the box that says you are 18 years of age or older.');
+    //$Val->SetFields('captcha', true, 'string', 'You did not enter a captcha code.', array('minlength' => 6, 'maxlength' => 6));
+
+    if (!apcu_exists('DBKEY')) {
+        $Err = "Registration temporarily disabled due to degraded database access (security measure).";
     }
-    */
-    if (!$Err) {
-      // Don't allow a username of "0" or "1" due to PHP's type juggling
-      if (trim($_POST['username']) == '0' || trim($_POST['username']) == '1') {
-        $Err = 'You cannot have a username of "0" or "1".';
-      }
-
-      $DB->query("
+
+    if (!empty($_POST['submit'])) {
+        // User has submitted registration form
+        $Err = $Val->ValidateForm($_REQUEST);
+        /*
+        if (!$Err && strtolower($_SESSION['captcha']) !== strtolower($_REQUEST['captcha'])) {
+          $Err = 'You did not enter the correct captcha code.';
+        }
+        */
+        if (!$Err) {
+            // Don't allow a username of "0" or "1" due to PHP's type juggling
+            if (trim($_POST['username']) === '0' || trim($_POST['username']) === '1') {
+                $Err = 'You cannot have a username of "0" or "1."';
+            }
+
+            $DB->query("
         SELECT COUNT(ID)
         FROM users_main
         WHERE Username LIKE '".db_string(trim($_POST['username']))."'");
-      list($UserCount) = $DB->next_record();
+            list($UserCount) = $DB->next_record();
 
-      if ($UserCount) {
-        $Err = 'There is already someone registered with that username.';
-        $_REQUEST['username'] = '';
-      }
+            if ($UserCount) {
+                $Err = 'There is already someone registered with that username.';
+                $_REQUEST['username'] = '';
+            }
 
-      if ($_REQUEST['invite']) {
-        $DB->query("
+            if ($_REQUEST['invite']) {
+                $DB->query("
           SELECT InviterID, Email, Reason
           FROM invites
           WHERE InviteKey = '".db_string($_REQUEST['invite'])."'");
-        if (!$DB->has_results()) {
-          $Err = 'Invite does not exist.';
-          $InviterID = 0;
-        } else {
-          list($InviterID, $InviteEmail, $InviteReason) = $DB->next_record(MYSQLI_NUM, false);
-          $InviteEmail = Crypto::decrypt($InviteEmail);
+                if (!$DB->has_results()) {
+                    $Err = 'Invite does not exist.';
+                    $InviterID = 0;
+                } else {
+                    list($InviterID, $InviteEmail, $InviteReason) = $DB->next_record(MYSQLI_NUM, false);
+                    $InviteEmail = Crypto::decrypt($InviteEmail);
+                }
+            } else {
+                $InviterID = 0;
+                $InviteEmail = $_REQUEST['email'];
+                $InviteReason = '';
+            }
         }
-      } else {
-        $InviterID = 0;
-        $InviteEmail = $_REQUEST['email'];
-        $InviteReason = '';
-      }
-    }
 
-    if (!$Err) {
-      $torrent_pass = Users::make_secret();
+        if (!$Err) {
+            $torrent_pass = Users::make_secret();
 
-      // Previously SELECT COUNT(ID) FROM users_main, which is a lot slower.
-      $DB->query("
+            // Previously SELECT COUNT(ID) FROM users_main, which is a lot slower
+            $DB->query("
         SELECT ID
         FROM users_main
         LIMIT 1");
-      $UserCount = $DB->record_count();
-      if ($UserCount == 0) {
-        $NewInstall = true;
-        $Class = SYSOP;
-        $Enabled = '1';
-      } else {
-        $NewInstall = false;
-        $Class = USER;
-        $Enabled = '0';
-      }
-
-      $IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
-
-      $DB->query("
+            $UserCount = $DB->record_count();
+            if ($UserCount =0= 0) {
+                $NewInstall = true;
+                $Class = SYSOP;
+                $Enabled = '1';
+            } else {
+                $NewInstall = false;
+                $Class = USER;
+                $Enabled = '0';
+            }
+
+            $IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
+
+            $DB->query("
         INSERT INTO users_main
-          (Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, Uploaded, ipcc)
+          (Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, FLTokens, Uploaded, ipcc)
         VALUES
-          ('".db_string(trim($_POST['username']))."', '".Crypto::encrypt($_POST['email'])."', '".db_string(Users::make_sec_hash($_POST['password']))."', '".db_string($torrent_pass)."', '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', '$Class', '$Enabled', '".STARTING_INVITES."', '".STARTING_UPLOAD."', '$IPcc')");
+          ('".db_string(trim($_POST['username']))."', '".Crypto::encrypt($_POST['email'])."', '".db_string(Users::make_sec_hash($_POST['password']))."', '".db_string($torrent_pass)."', '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', '$Class', '$Enabled', '".STARTING_INVITES."', '".STARTING_TOKENS."', '".STARTING_UPLOAD."', '$IPcc')");
 
-      $UserID = $DB->inserted_id();
+            $UserID = $DB->inserted_id();
 
-
-      // User created, delete invite. If things break after this point, then it's better to have a broken account to fix than a 'free' invite floating around that can be reused
-      $DB->query("
+            // User created, delete invite. If things break after this point, then it's better to have a broken account to fix than a 'free' invite floating around that can be reused
+            $DB->query("
         DELETE FROM invites
         WHERE InviteKey = '".db_string($_REQUEST['invite'])."'");
 
-      // Award invite badge to inviter if they don't have it
-      if (Badges::award_badge($InviterID, 136)) {
-        Misc::send_pm($InviterID, 0, 'You have received a badge!', "You have received a badge for inviting a user to the site.\n\nIt can be enabled from your user settings.");
-        $Cache->delete_value('user_badges_'.$InviterID);
-      }
+            // Award invite badge to inviter if they don't have it
+            if (Badges::award_badge($InviterID, 136)) {
+                Misc::send_pm($InviterID, 0, 'You have received a badge!', "You have received a badge for inviting a user to the site.\n\nIt can be enabled from your user settings.");
+                $Cache->delete_value('user_badges_'.$InviterID);
+            }
 
-      $DB->query("
+            $DB->query("
         SELECT ID
         FROM stylesheets
         WHERE `Default` = '1'");
-      list($StyleID) = $DB->next_record();
-      $AuthKey = Users::make_secret();
+            list($StyleID) = $DB->next_record();
+            $AuthKey = Users::make_secret();
 
-      if ($InviteReason !== '') {
-        $InviteReason = db_string(sqltime()." - $InviteReason");
-      }
-      $DB->query("
+            if ($InviteReason !== '') {
+                $InviteReason = db_string(sqltime()." - $InviteReason");
+            }
+            $DB->query("
         INSERT INTO users_info
           (UserID, StyleID, AuthKey, Inviter, JoinDate, AdminComment)
         VALUES
           ('$UserID', '$StyleID', '".db_string($AuthKey)."', '$InviterID', NOW(), '$InviteReason')");
 
-      $DB->query("
+            $DB->query("
         INSERT INTO users_history_ips
           (UserID, IP, StartTime)
         VALUES
           ('$UserID', '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', NOW())");
-      $DB->query("
+            $DB->query("
         INSERT INTO users_notifications_settings
           (UserID)
         VALUES
           ('$UserID')");
 
-
-      $DB->query("
+            $DB->query("
         INSERT INTO users_history_emails
           (UserID, Email, Time, IP)
         VALUES
           ('$UserID', '".Crypto::encrypt($_REQUEST['email'])."', NULL, '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."')");
 
-      if ($_REQUEST['email'] != $InviteEmail) {
-        $DB->query("
+            if ($_REQUEST['email'] != $InviteEmail) {
+                $DB->query("
           INSERT INTO users_history_emails
             (UserID, Email, Time, IP)
           VALUES
             ('$UserID', '".Crypto::encrypt($InviteEmail)."', NOW(), '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."')");
-      }
-
-
+            }
 
-      // Manage invite trees, delete invite
-
-      if ($InviterID !== null && $InviterID !== 0) {
-        $DB->query("
+            // Manage invite trees, delete invite
+            if ($InviterID !== null && $InviterID !== 0) {
+                $DB->query("
           SELECT TreePosition, TreeID, TreeLevel
           FROM invite_tree
           WHERE UserID = '$InviterID'");
-        list($InviterTreePosition, $TreeID, $TreeLevel) = $DB->next_record();
+                list($InviterTreePosition, $TreeID, $TreeLevel) = $DB->next_record();
 
-        // If the inviter doesn't have an invite tree
-        // Note: This should never happen unless you've transferred from another database, like What.CD did
-        if (!$DB->has_results()) {
-          $DB->query("
+                // If the inviter doesn't have an invite tree
+                // Note: This should never happen unless you've transferred from another database, like What.CD did
+                if (!$DB->has_results()) {
+                    $DB->query("
             SELECT MAX(TreeID) + 1
             FROM invite_tree");
-          list($TreeID) = $DB->next_record();
+                    list($TreeID) = $DB->next_record();
 
-          $DB->query("
+                    $DB->query("
             INSERT INTO invite_tree
               (UserID, InviterID, TreePosition, TreeID, TreeLevel)
             VALUES ('$InviterID', '0', '1', '$TreeID', '1')");
 
-          $TreePosition = 2;
-          $TreeLevel = 2;
-        } else {
-          $DB->query("
+                    $TreePosition = 2;
+                    $TreeLevel = 2;
+                } else {
+                    $DB->query("
             SELECT TreePosition
             FROM invite_tree
             WHERE TreePosition > '$InviterTreePosition'
@@ -207,76 +201,72 @@ if (!empty($_REQUEST['confirm'])) {
               AND TreeID = '$TreeID'
             ORDER BY TreePosition
             LIMIT 1");
-          list($TreePosition) = $DB->next_record();
+                    list($TreePosition) = $DB->next_record();
 
-          if ($TreePosition) {
-            $DB->query("
+                    if ($TreePosition) {
+                        $DB->query("
               UPDATE invite_tree
               SET TreePosition = TreePosition + 1
               WHERE TreeID = '$TreeID'
                 AND TreePosition >= '$TreePosition'");
-          } else {
-            $DB->query("
+                    } else {
+                        $DB->query("
               SELECT TreePosition + 1
               FROM invite_tree
               WHERE TreeID = '$TreeID'
               ORDER BY TreePosition DESC
               LIMIT 1");
-            list($TreePosition) = $DB->next_record();
-          }
-          $TreeLevel++;
+                        list($TreePosition) = $DB->next_record();
+                    }
+                    $TreeLevel++;
 
-          // Create invite tree record
-          $DB->query("
+                    // Create invite tree record
+                    $DB->query("
             INSERT INTO invite_tree
               (UserID, InviterID, TreePosition, TreeID, TreeLevel)
             VALUES
               ('$UserID', '$InviterID', '$TreePosition', '$TreeID', '$TreeLevel')");
-        }
-      } else { // No inviter (open registration)
-        $DB->query("
+                }
+            } else { // No inviter (open registration)
+                $DB->query("
           SELECT MAX(TreeID)
           FROM invite_tree");
-        list($TreeID) = $DB->next_record();
-        $TreeID++;
-        $InviterID = 0;
-        $TreePosition = 1;
-        $TreeLevel = 1;
-      }
-
-      include(SERVER_ROOT.'/classes/templates.class.php');
-      $TPL = NEW TEMPLATE;
-      $TPL->open(SERVER_ROOT.'/templates/new_registration.tpl');
-
-      $TPL->set('Username', $_REQUEST['username']);
-      $TPL->set('TorrentKey', $torrent_pass);
-      $TPL->set('SITE_NAME', SITE_NAME);
-      $TPL->set('SITE_DOMAIN', SITE_DOMAIN);
-
-      Misc::send_email($_REQUEST['email'], 'New account confirmation at '.SITE_NAME, $TPL->get(), 'noreply');
-      Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
-      $Sent = 1;
-
-
-    }
-  } elseif ($_GET['invite']) {
-    // If they haven't submitted the form, check to see if their invite is good
-    $DB->query("
+                list($TreeID) = $DB->next_record();
+                $TreeID++;
+                $InviterID = 0;
+                $TreePosition = 1;
+                $TreeLevel = 1;
+            }
+
+            include(SERVER_ROOT.'/classes/templates.class.php');
+            $TPL = new TEMPLATE;
+            $TPL->open(SERVER_ROOT.'/templates/new_registration.tpl');
+
+            $TPL->set('Username', $_REQUEST['username']);
+            $TPL->set('TorrentKey', $torrent_pass);
+            $TPL->set('SITE_NAME', SITE_NAME);
+            $TPL->set('SITE_DOMAIN', SITE_DOMAIN);
+
+            Misc::send_email($_REQUEST['email'], 'New account confirmation at '.SITE_NAME, $TPL->get(), 'noreply');
+            Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
+            $Sent = 1;
+        }
+    } elseif ($_GET['invite']) {
+        // If they haven't submitted the form, check to see if their invite is good
+        $DB->query("
       SELECT InviteKey
       FROM invites
       WHERE InviteKey = '".db_string($_GET['invite'])."'");
-    if (!$DB->has_results()) {
-      error('Invite not found!');
+        if (!$DB->has_results()) {
+            error('Invite not found!');
+        }
     }
-  }
-
-  include('step1.php');
 
+    include('step1.php');
 } elseif (!OPEN_REGISTRATION) {
-  if (isset($_GET['welcome'])) {
-    include('code.php');
-  } else {
-    include('closed.php');
-  }
+    if (isset($_GET['welcome'])) {
+        include('code.php');
+    } else {
+        include('closed.php');
+    }
 }
-?>

sections/rules/upload.php

@@ -417,7 +417,7 @@ View::show_header('Uploading Rules', 'rules');
           <strong>Torrent Description.</strong>
           Specific info about the protocols and equipment relevant to <em>this</em> data.
           This text is hidden by default.
-          It displays when you click the Torrent Title next to [ DL | PL ].
+          It displays when you click the Torrent Title next to [ DL | RP ].
           Please discuss materials and methods here.
           <br /><br />
         </li>