Retab project

classes/NMA_API.php

@@ -119,9 +119,9 @@ class NMA_API
                       'description' => substr($description, 0, 10000),
                       'priority'    => $priority
         );
-		if (!empty($url)) {
-			$post['url'] = substr($url, 0, 2000);
-		}
+    if (!empty($url)) {
+      $post['url'] = substr($url, 0, 2000);
+    }
         if ($this->devKey) {
             $post['developerkey'] = $this->devKey;
         }

classes/artists.class.php

@@ -1,209 +1,209 @@
 <?
 class Artists {
-	/**
-	 * Given an array of GroupIDs, return their associated artists.
-	 *
-	 * @param array $GroupIDs
-	 * @return an array of the following form:
-	 * 	GroupID => {
-	 *		[ArtistType] => {
-	 *			id, name, aliasid
-	 *		}
-	 *	}
-	 * ArtistType is an int. It can be:
-	 * 1 => Main artist
-	 * 2 => Guest artist
-	 * 4 => Composer
-	 * 5 => Conductor
-	 * 6 => DJ
-	 */
-	public static function get_artists($GroupIDs) {
-		$Results = array();
-		$DBs = array();
-		foreach ($GroupIDs as $GroupID) {
-			if (!is_number($GroupID)) {
-				continue;
-			}
-			$Artists = G::$Cache->get_value('groups_artists_'.$GroupID);
-			if (is_array($Artists)) {
-				$Results[$GroupID] = $Artists;
-			} else {
-				$DBs[] = $GroupID;
-			}
-		}
-		if (count($DBs) > 0) {
-			$IDs = implode(',', $DBs);
-			if (empty($IDs)) {
-				$IDs = "null";
-			}
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT ta.GroupID,
-					ta.ArtistID,
-					ag.Name
-				FROM torrents_artists AS ta
-					JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
-				WHERE ta.GroupID IN ($IDs)
-				ORDER BY ta.GroupID ASC,
-					ag.Name ASC;");
-			while (list($GroupID, $ArtistID, $ArtistName) = G::$DB->next_record(MYSQLI_BOTH, false)) {
-				$Results[$GroupID][] = array('id' => $ArtistID, 'name' => $ArtistName);
-				$New[$GroupID][] = array('id' => $ArtistID, 'name' => $ArtistName);
-			}
-			G::$DB->set_query_id($QueryID);
-			foreach ($DBs as $GroupID) {
-				if (isset($New[$GroupID])) {
-					G::$Cache->cache_value('groups_artists_'.$GroupID, $New[$GroupID]);
-				}
-				else {
-					G::$Cache->cache_value('groups_artists_'.$GroupID, array());
-				}
-			}
-			$Missing = array_diff($GroupIDs, array_keys($Results));
-			if (!empty($Missing)) {
-				$Results += array_fill_keys($Missing, array());
-			}
-		}
-		return $Results;
-	}
-
-
-	/**
-	 * Convenience function for get_artists, when you just need one group.
-	 *
-	 * @param int $GroupID
-	 * @return array - see get_artists
-	 */
-	public static function get_artist($GroupID) {
-		$Results = Artists::get_artists(array($GroupID));
-		return $Results[$GroupID];
-	}
-
-
-	/**
-	 * Format an array of artists for display.
-	 * TODO: Revisit the logic of this, see if we can helper-function the copypasta.
-	 *
-	 * @param array Artists an array of the form output by get_artists
-	 * @param boolean $MakeLink if true, the artists will be links, if false, they will be text.
-	 * @param boolean $IncludeHyphen if true, appends " - " to the end.
-	 * @param $Escape if true, output will be escaped. Think carefully before setting it false.
-	 */
-	public static function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Escape = true) {
-		if (!empty($Artists)) {
-			$ampersand = ($Escape) ? ' &amp; ' : ' & ';
-			$link = '';
-			
-			switch(count($Artists)) {
-				case 0:
-					break;
-				case 3:
-					$link .= Artists::display_artist($Artists[2], $MakeLink, $Escape). ", ";
-				case 2:
-					$link .= Artists::display_artist($Artists[1], $MakeLink, $Escape). ", ";
-				case 1:
-					$link .= Artists::display_artist($Artists[0], $MakeLink, $Escape).($IncludeHyphen?' – ':'');
-					break;
-				default:
-					$link = "Various".($IncludeHyphen?' – ':'');		
+  /**
+   * Given an array of GroupIDs, return their associated artists.
+   *
+   * @param array $GroupIDs
+   * @return an array of the following form:
+   *   GroupID => {
+   *    [ArtistType] => {
+   *      id, name, aliasid
+   *    }
+   *  }
+   * ArtistType is an int. It can be:
+   * 1 => Main artist
+   * 2 => Guest artist
+   * 4 => Composer
+   * 5 => Conductor
+   * 6 => DJ
+   */
+  public static function get_artists($GroupIDs) {
+    $Results = array();
+    $DBs = array();
+    foreach ($GroupIDs as $GroupID) {
+      if (!is_number($GroupID)) {
+        continue;
+      }
+      $Artists = G::$Cache->get_value('groups_artists_'.$GroupID);
+      if (is_array($Artists)) {
+        $Results[$GroupID] = $Artists;
+      } else {
+        $DBs[] = $GroupID;
+      }
+    }
+    if (count($DBs) > 0) {
+      $IDs = implode(',', $DBs);
+      if (empty($IDs)) {
+        $IDs = "null";
+      }
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT ta.GroupID,
+          ta.ArtistID,
+          ag.Name
+        FROM torrents_artists AS ta
+          JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
+        WHERE ta.GroupID IN ($IDs)
+        ORDER BY ta.GroupID ASC,
+          ag.Name ASC;");
+      while (list($GroupID, $ArtistID, $ArtistName) = G::$DB->next_record(MYSQLI_BOTH, false)) {
+        $Results[$GroupID][] = array('id' => $ArtistID, 'name' => $ArtistName);
+        $New[$GroupID][] = array('id' => $ArtistID, 'name' => $ArtistName);
+      }
+      G::$DB->set_query_id($QueryID);
+      foreach ($DBs as $GroupID) {
+        if (isset($New[$GroupID])) {
+          G::$Cache->cache_value('groups_artists_'.$GroupID, $New[$GroupID]);
+        }
+        else {
+          G::$Cache->cache_value('groups_artists_'.$GroupID, array());
+        }
+      }
+      $Missing = array_diff($GroupIDs, array_keys($Results));
+      if (!empty($Missing)) {
+        $Results += array_fill_keys($Missing, array());
+      }
+    }
+    return $Results;
+  }
+
+
+  /**
+   * Convenience function for get_artists, when you just need one group.
+   *
+   * @param int $GroupID
+   * @return array - see get_artists
+   */
+  public static function get_artist($GroupID) {
+    $Results = Artists::get_artists(array($GroupID));
+    return $Results[$GroupID];
+  }
+
+
+  /**
+   * Format an array of artists for display.
+   * TODO: Revisit the logic of this, see if we can helper-function the copypasta.
+   *
+   * @param array Artists an array of the form output by get_artists
+   * @param boolean $MakeLink if true, the artists will be links, if false, they will be text.
+   * @param boolean $IncludeHyphen if true, appends " - " to the end.
+   * @param $Escape if true, output will be escaped. Think carefully before setting it false.
+   */
+  public static function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Escape = true) {
+    if (!empty($Artists)) {
+      $ampersand = ($Escape) ? ' &amp; ' : ' & ';
+      $link = '';
+
+      switch(count($Artists)) {
+        case 0:
+          break;
+        case 3:
+          $link .= Artists::display_artist($Artists[2], $MakeLink, $Escape). ", ";
+        case 2:
+          $link .= Artists::display_artist($Artists[1], $MakeLink, $Escape). ", ";
+        case 1:
+          $link .= Artists::display_artist($Artists[0], $MakeLink, $Escape).($IncludeHyphen?' – ':'');
+          break;
+        default:
+          $link = "Various".($IncludeHyphen?' – ':'');
       }
 
-			return $link;
-		} else {
-			return '';
-		}
-	}
-
-
-	/**
-	 * Formats a single artist name.
-	 *
-	 * @param array $Artist an array of the form ('id'=>ID, 'name'=>Name)
-	 * @param boolean $MakeLink If true, links to the artist page.
-	 * @param boolean $Escape If false and $MakeLink is false, returns the unescaped, unadorned artist name.
-	 * @return string Formatted artist name.
-	 */
-	public static function display_artist($Artist, $MakeLink = true, $Escape = true) {
-		if ($MakeLink && !$Escape) {
-			error('Invalid parameters to Artists::display_artist()');
-		} elseif ($MakeLink) {
-			return '<a href="artist.php?id='.$Artist['id'].'" dir="ltr">'.display_str($Artist['name']).'</a>';
-		} elseif ($Escape) {
-			return display_str($Artist['name']);
-		} else {
-			return $Artist['name'];
-		}
-	}
-
-	/**
-	 * Deletes an artist and their requests, wiki, and tags.
-	 * Does NOT delete their torrents.
-	 *
-	 * @param int $ArtistID
-	 */
-	public static function delete_artist($ArtistID) {
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT Name
-			FROM artists_group
-			WHERE ArtistID = ".$ArtistID);
-		list($Name) = G::$DB->next_record(MYSQLI_NUM, false);
-
-		// Delete requests
-		G::$DB->query("
-			SELECT RequestID
-			FROM requests_artists
-			WHERE ArtistID = $ArtistID
-				AND ArtistID != 0");
-		$Requests = G::$DB->to_array();
-		foreach ($Requests AS $Request) {
-			list($RequestID) = $Request;
-			G::$DB->query('DELETE FROM requests WHERE ID='.$RequestID);
-			G::$DB->query('DELETE FROM requests_votes WHERE RequestID='.$RequestID);
-			G::$DB->query('DELETE FROM requests_tags WHERE RequestID='.$RequestID);
-			G::$DB->query('DELETE FROM requests_artists WHERE RequestID='.$RequestID);
-		}
-
-		// Delete artist
-		G::$DB->query('DELETE FROM artists_group WHERE ArtistID='.$ArtistID);
-		G::$Cache->decrement('stats_artist_count');
-
-		// Delete wiki revisions
-		G::$DB->query('DELETE FROM wiki_artists WHERE PageID='.$ArtistID);
-
-		// Delete tags
-		G::$DB->query('DELETE FROM artists_tags WHERE ArtistID='.$ArtistID);
-
-		// Delete artist comments, subscriptions and quote notifications
-		Comments::delete_page('artist', $ArtistID);
-
-		G::$Cache->delete_value('artist_'.$ArtistID);
-		G::$Cache->delete_value('artist_groups_'.$ArtistID);
-		// Record in log
-
-		if (!empty(G::$LoggedUser['Username'])) {
-			$Username = G::$LoggedUser['Username'];
-		} else {
-			$Username = 'System';
-		}
-		Misc::write_log("Artist $ArtistID ($Name) was deleted by $Username");
-		G::$DB->set_query_id($QueryID);
-	}
-
-
-	/**
-	 * Remove LRM (left-right-marker) and trims, because people copypaste carelessly.
-	 * If we don't do this, we get seemingly duplicate artist names.
-	 * TODO: make stricter, e.g. on all whitespace characters or Unicode normalisation
-	 *
-	 * @param string $ArtistName
-	 */
-	public static function normalise_artist_name($ArtistName) {
-		// \u200e is &lrm;
-		$ArtistName = trim($ArtistName);
-		$ArtistName = preg_replace('/^(\xE2\x80\x8E)+/', '', $ArtistName);
-		$ArtistName = preg_replace('/(\xE2\x80\x8E)+$/', '', $ArtistName);
-		return trim(preg_replace('/ +/', ' ', $ArtistName));
-	}
+      return $link;
+    } else {
+      return '';
+    }
+  }
+
+
+  /**
+   * Formats a single artist name.
+   *
+   * @param array $Artist an array of the form ('id'=>ID, 'name'=>Name)
+   * @param boolean $MakeLink If true, links to the artist page.
+   * @param boolean $Escape If false and $MakeLink is false, returns the unescaped, unadorned artist name.
+   * @return string Formatted artist name.
+   */
+  public static function display_artist($Artist, $MakeLink = true, $Escape = true) {
+    if ($MakeLink && !$Escape) {
+      error('Invalid parameters to Artists::display_artist()');
+    } elseif ($MakeLink) {
+      return '<a href="artist.php?id='.$Artist['id'].'" dir="ltr">'.display_str($Artist['name']).'</a>';
+    } elseif ($Escape) {
+      return display_str($Artist['name']);
+    } else {
+      return $Artist['name'];
+    }
+  }
+
+  /**
+   * Deletes an artist and their requests, wiki, and tags.
+   * Does NOT delete their torrents.
+   *
+   * @param int $ArtistID
+   */
+  public static function delete_artist($ArtistID) {
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT Name
+      FROM artists_group
+      WHERE ArtistID = ".$ArtistID);
+    list($Name) = G::$DB->next_record(MYSQLI_NUM, false);
+
+    // Delete requests
+    G::$DB->query("
+      SELECT RequestID
+      FROM requests_artists
+      WHERE ArtistID = $ArtistID
+        AND ArtistID != 0");
+    $Requests = G::$DB->to_array();
+    foreach ($Requests AS $Request) {
+      list($RequestID) = $Request;
+      G::$DB->query('DELETE FROM requests WHERE ID='.$RequestID);
+      G::$DB->query('DELETE FROM requests_votes WHERE RequestID='.$RequestID);
+      G::$DB->query('DELETE FROM requests_tags WHERE RequestID='.$RequestID);
+      G::$DB->query('DELETE FROM requests_artists WHERE RequestID='.$RequestID);
+    }
+
+    // Delete artist
+    G::$DB->query('DELETE FROM artists_group WHERE ArtistID='.$ArtistID);
+    G::$Cache->decrement('stats_artist_count');
+
+    // Delete wiki revisions
+    G::$DB->query('DELETE FROM wiki_artists WHERE PageID='.$ArtistID);
+
+    // Delete tags
+    G::$DB->query('DELETE FROM artists_tags WHERE ArtistID='.$ArtistID);
+
+    // Delete artist comments, subscriptions and quote notifications
+    Comments::delete_page('artist', $ArtistID);
+
+    G::$Cache->delete_value('artist_'.$ArtistID);
+    G::$Cache->delete_value('artist_groups_'.$ArtistID);
+    // Record in log
+
+    if (!empty(G::$LoggedUser['Username'])) {
+      $Username = G::$LoggedUser['Username'];
+    } else {
+      $Username = 'System';
+    }
+    Misc::write_log("Artist $ArtistID ($Name) was deleted by $Username");
+    G::$DB->set_query_id($QueryID);
+  }
+
+
+  /**
+   * Remove LRM (left-right-marker) and trims, because people copypaste carelessly.
+   * If we don't do this, we get seemingly duplicate artist names.
+   * TODO: make stricter, e.g. on all whitespace characters or Unicode normalisation
+   *
+   * @param string $ArtistName
+   */
+  public static function normalise_artist_name($ArtistName) {
+    // \u200e is &lrm;
+    $ArtistName = trim($ArtistName);
+    $ArtistName = preg_replace('/^(\xE2\x80\x8E)+/', '', $ArtistName);
+    $ArtistName = preg_replace('/(\xE2\x80\x8E)+$/', '', $ArtistName);
+    return trim(preg_replace('/ +/', ' ', $ArtistName));
+  }
 }
 ?>

classes/artists_similar.class.php

@@ -1,385 +1,385 @@
 <?
 class ARTIST {
-	var $ID = 0;
-	var $Name = 0;
-	var $NameLength = 0;
-	var $SimilarID = 0;
-	var $Displayed = false;
-	var $x = 0;
-	var $y = 0;
-	var $Similar = array();
-
-	function ARTIST($ID = '', $Name = '') {
-		$this->ID = $ID;
-		$this->NameLength = mb_strlen($Name, 'utf8');
-		$this->Name = display_str($Name);
-	}
+  var $ID = 0;
+  var $Name = 0;
+  var $NameLength = 0;
+  var $SimilarID = 0;
+  var $Displayed = false;
+  var $x = 0;
+  var $y = 0;
+  var $Similar = array();
+
+  function ARTIST($ID = '', $Name = '') {
+    $this->ID = $ID;
+    $this->NameLength = mb_strlen($Name, 'utf8');
+    $this->Name = display_str($Name);
+  }
 }
 
 class ARTISTS_SIMILAR extends ARTIST{
-	var $Artists = array();
-	var $TotalScore = 0;
-
-	var $xValues = array(WIDTH=>1);
-	var $yValues = array(HEIGHT=>1);
-
-	var $LargestDecimal = 0;
-	var $LowestDecimal = 1;
-
-
-
-	function dump_data() {
-		return serialize(array(time(), $this->Name, $this->x, $this->y, serialize($this->Artists), serialize($this->Similar)));
-	}
-
-	function load_data($Data) {
-		list($LastUpdated, $this->Name, $this->x, $this->y, $this->Artists, $this->Similar) = unserialize($Data);
-		$this->Artists = unserialize($this->Artists);
-		$this->Similar = unserialize($this->Similar);
-	}
-
-	function set_up() {
-		$QueryID = G::$DB->get_query_id();
-
-		$this->x = ceil(WIDTH / 2);
-		$this->y = ceil(HEIGHT / 2);
-
-		$this->xValues[$this->x] = $this->ID;
-		$this->yValues[$this->y] = $this->ID;
-
-
-		// Get artists that are directly similar to the artist
-		$ArtistIDs = array();
-		G::$DB->query("
-			SELECT
-				s2.ArtistID,
-				ag.Name,
-				ass.Score
-			FROM artists_similar AS s1
-				JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID AND s1.ArtistID!=s2.ArtistID
-				JOIN artists_similar_scores AS ass ON ass.SimilarID=s1.SimilarID
-				JOIN artists_group AS ag ON ag.ArtistID=s2.ArtistID
-			WHERE s1.ArtistID=".$this->ID."
-			ORDER BY ass.Score DESC
-			LIMIT 14");
-
-		if (!G::$DB->has_results()) {
-			return;
-		}
-
-		// Build into array. Each artist is its own object in $this->Artists
-		while (list($ArtistID, $Name, $Score) = G::$DB->next_record(MYSQLI_NUM, false)) {
-			if ($Score < 0) {
-				continue;
-			}
-			$this->Artists[$ArtistID] = new ARTIST($ArtistID, $Name);
-			$this->Similar[$ArtistID] = array('ID' => $ArtistID, 'Score' => $Score);
-			$this->TotalScore += $Score;
-			$ArtistIDs[] = $ArtistID;
-		}
-
-		// Get similarities between artists on the map
-		G::$DB->query("
-			SELECT
-				s1.ArtistID,
-				s2.ArtistID
-			FROM artists_similar AS s1
-				JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID AND s1.ArtistID!=s2.ArtistID
-				JOIN artists_similar_scores AS ass ON ass.SimilarID=s1.SimilarID
-				JOIN artists_group AS a ON a.ArtistID=s2.ArtistID
-			WHERE s1.ArtistID IN(".implode(',', $ArtistIDs).')
-				AND s2.ArtistID IN('.implode(',', $ArtistIDs).')');
-
-		// Build into array
-		while (list($Artist1ID, $Artist2ID) = G::$DB->next_record()) {
-			$this->Artists[$Artist1ID]->Similar[$Artist2ID] = array('ID'=>$Artist2ID);
-		}
-
-		// Calculate decimal point scores between artists
-		foreach ($this->Similar as $SimilarArtist) {
-			list($ArtistID, $Similar) = array_values($SimilarArtist);
-			$this->Similar[$ArtistID]['Decimal'] =  $this->similarity($Similar['Score'], $this->TotalScore);
-
-			if ($this->Similar[$ArtistID]['Decimal'] < $this->LowestDecimal) {
-				$this->LowestDecimal = $this->Similar[$ArtistID]['Decimal'];
-			}
-			if ($this->Similar[$ArtistID]['Decimal'] > $this->LargestDecimal) {
-				$this->LargestDecimal = $this->Similar[$ArtistID]['Decimal'];
-			}
-		}
-		reset($this->Artists);
-
-		G::$DB->set_query_id($QueryID);
-	}
-
-	function set_positions() {
-		$xValues = array(); // Possible x values
-		$Root = ceil(WIDTH / 4); // Half-way into half of the image
-		$Offset = 4; // Distance from the root (a quarter of the way into the image) to the x value
-
-		// The number of artists placed in the top or the bottom
-		$NumTop = 0;
-		$NumBottom = 0;
-
-		// The number of artists placed in the left or the right
-		$NumLeft = 0;
-		$NumRight = 0;
-
-		$Multiplier = 0;
-
-		// Build up an impressive list of possible x values
-		// We later iterate through these, and pick out the ones we want
-
-		// These x values are all below WIDTH/2 (all on the left)
-		// The script later chooses which side to put them on
-
-		// We create more very low x values because they're more likely to be skipped
-		for ($i = 0; $i <= count($this->Artists) * 4; $i++) {
-			if ($Offset >= ((WIDTH / 4))) {
-				$Offset = $Offset % (WIDTH / 4);
-			}
-			$Plus = $Root + $Offset; // Point on the right of the root
-			$Minus = abs($Root - $Offset); // Point on the left of the root
-
-			$xValues[$Plus] = $Plus;
-
-			$xValues[$Minus] = $Minus;
-
-			// Throw in an extra x value closer to the edge, because they're more likely to be skipped
-
-			if ($Minus > 30) {
-			//	$xValues[$Minus - 30] = $Minus - 30;
-			}
-
-			$Offset = $Offset + rand(5, 20); // Increase offset, and go again
-		}
-
-		foreach ($this->Artists as $Artist) {
-			$ArtistID = $Artist->ID;
-			if ($Artist->Displayed == true) {
-				continue;
-			}
-			$this->Similar[$ArtistID]['Decimal'] = $this->Similar[$ArtistID]['Decimal'] * (1 / ($this->LargestDecimal)) - 0.1;
-			// Calculate the distance away from the center, based on similarity
-			$IdealDistance =  $this->calculate_distance($this->Similar[$ArtistID]['Decimal'], $this->x, $this->y);
-
-			$this->Similar[$ArtistID]['Distance'] = $IdealDistance;
-
-			// 1 = left, 2 = right
-			$Horizontal = 0;
-			$Vertical = 0;
-
-			// See if any similar artists have been placed yet. If so, place artist in that half
-			// (provided that there are enough in the other half to visually balance out)
-			reset($Artist->Similar);
-			foreach ($Artist->Similar as $SimilarArtist) {
-				list($Artist2ID) = array_values($SimilarArtist);
-				if ($this->Artists[$Artist2ID]) {
-					if ($this->Artists[$Artist2ID]->x > (WIDTH / 2) && ($NumRight-$NumLeft) < 1) {
-						$Horizontal = 2;
-					} elseif ($NumLeft - $NumRight < 1) {
-						$Horizontal = 1;
-					}
-					break;
-				}
-			}
-
-			shuffle($xValues);
-
-			while ($xValue = array_shift($xValues)) {
-				if (abs($this->x - $xValue) <= $IdealDistance) {
-					if (hypot(abs($this->x - $xValue), ($this->y - 50)) > $IdealDistance
-						|| ceil(sqrt(pow($IdealDistance, 2) - pow($this->x - $xValue, 2))) > (HEIGHT / 2)) {
-						$xValue = $this->x - ceil(sqrt(pow($IdealDistance, 2) - pow($IdealDistance * 0.1 * rand(5,9), 2)));
-						//echo "Had to change x value for ".$Artist->Name." to ".$xValue."\n";
-					}
-					// Found a match (Is close enough to the center to satisfy $IdealDistance),
-					// Now it's time to choose which half to put it on
-					if (!$Horizontal) {
-						// No similar artists displayed
-						$Horizontal = ($NumLeft < $NumRight) ? 1 : 2;
-					}
-					if ($Horizontal == 2) {
-						$xValue = WIDTH - $xValue;
-						$NumRight++;
-					} else {
-						$NumLeft++;
-					}
-
-					$Artist->x = $xValue;
-					$this->xValues[$xValue] = $ArtistID;
-					unset($xValues[$xValue]);
-
-					break;
-				}
-			}
-			if (!$xValue) { // Uh-oh, we were unable to choose an x value.
-				$xValue = ceil(sqrt(pow($IdealDistance, 2) / 2));
-				$xValue = (WIDTH / 2) - $xValue;
-				$Artist->x = $xValue;
-				$this->xValues[$xValue] = $ArtistID;
-				unset($xValues[$xValue]);
-			}
-
-
-			// Pythagoras. $yValue is the vertical distance from the center to the y value
-			$yValue = sqrt(pow($IdealDistance, 2) - pow(abs($this->x - $Artist->x), 2));
-
-
-			// Now we pick if it should go on the top or bottom
-
-			if ($NumTop > $NumBottom) { // Send it to the bottom half
-				$yValue = (HEIGHT / 2) + $yValue;
-				$NumBottom++;
-			} else {
-				$yValue=(HEIGHT / 2) - $yValue;
-				$NumTop++;
-			}
-
-			$yValue = ceil($yValue);
-
-			// $yValue is now a proper y coordinate
-			// Now time to do some spacing out
-
-			if ($yValue < 10) {
-				$yValue += (10 + abs($yValue)) + rand(10,20);
-			}
-
-			if ($yValue > (HEIGHT - 10)) {
-				$yValue -= ((HEIGHT / 2) - rand(10,20));
-			}
-
-			$i = 1;
-			while ($Conflict = $this->scan_array_range($this->yValues, abs($yValue - 13), $yValue + 13)) {
-				if ($i > 10) {
-					break;
-				}
-				if (!$this->scan_array_range($this->yValues, abs($yValue - 5), $yValue - 20)) {
-					$yValue -= 20;
-				}
-
-				$yValue = $Conflict + rand(10, 20);
-				if ($yValue > HEIGHT - 10) {
-					$yValue -= ceil(HEIGHT / 2.5);
-				} elseif ($yValue < 10) {
-					$yValue += ceil(HEIGHT / 2.5);
-				}
-				$i++;
-			}
-
-			$Artist->y = $yValue;
-			$this->yValues[$yValue] = $ArtistID;
-		}
-		reset($this->Artists);
-		reset($this->xValues);
-		reset($this->yValues);
-
-	}
-
-	// Calculate the ideal distance from the center point ($Rootx, $Rooty) to the artist's point on the board
-	// Pythagoras as fun!
-	function calculate_distance($SimilarityCoefficient, $Rootx, $Rooty) {
-		$MaxWidth = WIDTH - $Rootx;
-		$MaxHeight = HEIGHT - $Rooty;
-		$x = $MaxWidth - ($SimilarityCoefficient * $MaxWidth * 0.01); // Possible x value
-		$y = $MaxHeight - ($SimilarityCoefficient * $MaxHeight); // Possible y value
-		$Hypot = hypot($Rootx - $x, $Rooty - $y);
-		return $MaxWidth - $Hypot;
-
-	}
-
-	function similarity($Score, $TotalArtistScore) {
-		return (pow(($Score / ($TotalArtistScore + 1)), (1 / 1)));
-	}
-
-	function scan_array_range($Array, $Start, $Finish) {
-		if ($Start < 0) {
-			die($Start);
-		}
-		for ($i = $Start; $i <= $Finish; $i++) {
-			if (isset($Array[$i])) {
-				return $i;
-			}
-		}
-		return false;
-	}
-
-	function write_artists() {
+  var $Artists = array();
+  var $TotalScore = 0;
+
+  var $xValues = array(WIDTH=>1);
+  var $yValues = array(HEIGHT=>1);
+
+  var $LargestDecimal = 0;
+  var $LowestDecimal = 1;
+
+
+
+  function dump_data() {
+    return serialize(array(time(), $this->Name, $this->x, $this->y, serialize($this->Artists), serialize($this->Similar)));
+  }
+
+  function load_data($Data) {
+    list($LastUpdated, $this->Name, $this->x, $this->y, $this->Artists, $this->Similar) = unserialize($Data);
+    $this->Artists = unserialize($this->Artists);
+    $this->Similar = unserialize($this->Similar);
+  }
+
+  function set_up() {
+    $QueryID = G::$DB->get_query_id();
+
+    $this->x = ceil(WIDTH / 2);
+    $this->y = ceil(HEIGHT / 2);
+
+    $this->xValues[$this->x] = $this->ID;
+    $this->yValues[$this->y] = $this->ID;
+
+
+    // Get artists that are directly similar to the artist
+    $ArtistIDs = array();
+    G::$DB->query("
+      SELECT
+        s2.ArtistID,
+        ag.Name,
+        ass.Score
+      FROM artists_similar AS s1
+        JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID AND s1.ArtistID!=s2.ArtistID
+        JOIN artists_similar_scores AS ass ON ass.SimilarID=s1.SimilarID
+        JOIN artists_group AS ag ON ag.ArtistID=s2.ArtistID
+      WHERE s1.ArtistID=".$this->ID."
+      ORDER BY ass.Score DESC
+      LIMIT 14");
+
+    if (!G::$DB->has_results()) {
+      return;
+    }
+
+    // Build into array. Each artist is its own object in $this->Artists
+    while (list($ArtistID, $Name, $Score) = G::$DB->next_record(MYSQLI_NUM, false)) {
+      if ($Score < 0) {
+        continue;
+      }
+      $this->Artists[$ArtistID] = new ARTIST($ArtistID, $Name);
+      $this->Similar[$ArtistID] = array('ID' => $ArtistID, 'Score' => $Score);
+      $this->TotalScore += $Score;
+      $ArtistIDs[] = $ArtistID;
+    }
+
+    // Get similarities between artists on the map
+    G::$DB->query("
+      SELECT
+        s1.ArtistID,
+        s2.ArtistID
+      FROM artists_similar AS s1
+        JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID AND s1.ArtistID!=s2.ArtistID
+        JOIN artists_similar_scores AS ass ON ass.SimilarID=s1.SimilarID
+        JOIN artists_group AS a ON a.ArtistID=s2.ArtistID
+      WHERE s1.ArtistID IN(".implode(',', $ArtistIDs).')
+        AND s2.ArtistID IN('.implode(',', $ArtistIDs).')');
+
+    // Build into array
+    while (list($Artist1ID, $Artist2ID) = G::$DB->next_record()) {
+      $this->Artists[$Artist1ID]->Similar[$Artist2ID] = array('ID'=>$Artist2ID);
+    }
+
+    // Calculate decimal point scores between artists
+    foreach ($this->Similar as $SimilarArtist) {
+      list($ArtistID, $Similar) = array_values($SimilarArtist);
+      $this->Similar[$ArtistID]['Decimal'] =  $this->similarity($Similar['Score'], $this->TotalScore);
+
+      if ($this->Similar[$ArtistID]['Decimal'] < $this->LowestDecimal) {
+        $this->LowestDecimal = $this->Similar[$ArtistID]['Decimal'];
+      }
+      if ($this->Similar[$ArtistID]['Decimal'] > $this->LargestDecimal) {
+        $this->LargestDecimal = $this->Similar[$ArtistID]['Decimal'];
+      }
+    }
+    reset($this->Artists);
+
+    G::$DB->set_query_id($QueryID);
+  }
+
+  function set_positions() {
+    $xValues = array(); // Possible x values
+    $Root = ceil(WIDTH / 4); // Half-way into half of the image
+    $Offset = 4; // Distance from the root (a quarter of the way into the image) to the x value
+
+    // The number of artists placed in the top or the bottom
+    $NumTop = 0;
+    $NumBottom = 0;
+
+    // The number of artists placed in the left or the right
+    $NumLeft = 0;
+    $NumRight = 0;
+
+    $Multiplier = 0;
+
+    // Build up an impressive list of possible x values
+    // We later iterate through these, and pick out the ones we want
+
+    // These x values are all below WIDTH/2 (all on the left)
+    // The script later chooses which side to put them on
+
+    // We create more very low x values because they're more likely to be skipped
+    for ($i = 0; $i <= count($this->Artists) * 4; $i++) {
+      if ($Offset >= ((WIDTH / 4))) {
+        $Offset = $Offset % (WIDTH / 4);
+      }
+      $Plus = $Root + $Offset; // Point on the right of the root
+      $Minus = abs($Root - $Offset); // Point on the left of the root
+
+      $xValues[$Plus] = $Plus;
+
+      $xValues[$Minus] = $Minus;
+
+      // Throw in an extra x value closer to the edge, because they're more likely to be skipped
+
+      if ($Minus > 30) {
+      //  $xValues[$Minus - 30] = $Minus - 30;
+      }
+
+      $Offset = $Offset + rand(5, 20); // Increase offset, and go again
+    }
+
+    foreach ($this->Artists as $Artist) {
+      $ArtistID = $Artist->ID;
+      if ($Artist->Displayed == true) {
+        continue;
+      }
+      $this->Similar[$ArtistID]['Decimal'] = $this->Similar[$ArtistID]['Decimal'] * (1 / ($this->LargestDecimal)) - 0.1;
+      // Calculate the distance away from the center, based on similarity
+      $IdealDistance =  $this->calculate_distance($this->Similar[$ArtistID]['Decimal'], $this->x, $this->y);
+
+      $this->Similar[$ArtistID]['Distance'] = $IdealDistance;
+
+      // 1 = left, 2 = right
+      $Horizontal = 0;
+      $Vertical = 0;
+
+      // See if any similar artists have been placed yet. If so, place artist in that half
+      // (provided that there are enough in the other half to visually balance out)
+      reset($Artist->Similar);
+      foreach ($Artist->Similar as $SimilarArtist) {
+        list($Artist2ID) = array_values($SimilarArtist);
+        if ($this->Artists[$Artist2ID]) {
+          if ($this->Artists[$Artist2ID]->x > (WIDTH / 2) && ($NumRight-$NumLeft) < 1) {
+            $Horizontal = 2;
+          } elseif ($NumLeft - $NumRight < 1) {
+            $Horizontal = 1;
+          }
+          break;
+        }
+      }
+
+      shuffle($xValues);
+
+      while ($xValue = array_shift($xValues)) {
+        if (abs($this->x - $xValue) <= $IdealDistance) {
+          if (hypot(abs($this->x - $xValue), ($this->y - 50)) > $IdealDistance
+            || ceil(sqrt(pow($IdealDistance, 2) - pow($this->x - $xValue, 2))) > (HEIGHT / 2)) {
+            $xValue = $this->x - ceil(sqrt(pow($IdealDistance, 2) - pow($IdealDistance * 0.1 * rand(5,9), 2)));
+            //echo "Had to change x value for ".$Artist->Name." to ".$xValue."\n";
+          }
+          // Found a match (Is close enough to the center to satisfy $IdealDistance),
+          // Now it's time to choose which half to put it on
+          if (!$Horizontal) {
+            // No similar artists displayed
+            $Horizontal = ($NumLeft < $NumRight) ? 1 : 2;
+          }
+          if ($Horizontal == 2) {
+            $xValue = WIDTH - $xValue;
+            $NumRight++;
+          } else {
+            $NumLeft++;
+          }
+
+          $Artist->x = $xValue;
+          $this->xValues[$xValue] = $ArtistID;
+          unset($xValues[$xValue]);
+
+          break;
+        }
+      }
+      if (!$xValue) { // Uh-oh, we were unable to choose an x value.
+        $xValue = ceil(sqrt(pow($IdealDistance, 2) / 2));
+        $xValue = (WIDTH / 2) - $xValue;
+        $Artist->x = $xValue;
+        $this->xValues[$xValue] = $ArtistID;
+        unset($xValues[$xValue]);
+      }
+
+
+      // Pythagoras. $yValue is the vertical distance from the center to the y value
+      $yValue = sqrt(pow($IdealDistance, 2) - pow(abs($this->x - $Artist->x), 2));
+
+
+      // Now we pick if it should go on the top or bottom
+
+      if ($NumTop > $NumBottom) { // Send it to the bottom half
+        $yValue = (HEIGHT / 2) + $yValue;
+        $NumBottom++;
+      } else {
+        $yValue=(HEIGHT / 2) - $yValue;
+        $NumTop++;
+      }
+
+      $yValue = ceil($yValue);
+
+      // $yValue is now a proper y coordinate
+      // Now time to do some spacing out
+
+      if ($yValue < 10) {
+        $yValue += (10 + abs($yValue)) + rand(10,20);
+      }
+
+      if ($yValue > (HEIGHT - 10)) {
+        $yValue -= ((HEIGHT / 2) - rand(10,20));
+      }
+
+      $i = 1;
+      while ($Conflict = $this->scan_array_range($this->yValues, abs($yValue - 13), $yValue + 13)) {
+        if ($i > 10) {
+          break;
+        }
+        if (!$this->scan_array_range($this->yValues, abs($yValue - 5), $yValue - 20)) {
+          $yValue -= 20;
+        }
+
+        $yValue = $Conflict + rand(10, 20);
+        if ($yValue > HEIGHT - 10) {
+          $yValue -= ceil(HEIGHT / 2.5);
+        } elseif ($yValue < 10) {
+          $yValue += ceil(HEIGHT / 2.5);
+        }
+        $i++;
+      }
+
+      $Artist->y = $yValue;
+      $this->yValues[$yValue] = $ArtistID;
+    }
+    reset($this->Artists);
+    reset($this->xValues);
+    reset($this->yValues);
+
+  }
+
+  // Calculate the ideal distance from the center point ($Rootx, $Rooty) to the artist's point on the board
+  // Pythagoras as fun!
+  function calculate_distance($SimilarityCoefficient, $Rootx, $Rooty) {
+    $MaxWidth = WIDTH - $Rootx;
+    $MaxHeight = HEIGHT - $Rooty;
+    $x = $MaxWidth - ($SimilarityCoefficient * $MaxWidth * 0.01); // Possible x value
+    $y = $MaxHeight - ($SimilarityCoefficient * $MaxHeight); // Possible y value
+    $Hypot = hypot($Rootx - $x, $Rooty - $y);
+    return $MaxWidth - $Hypot;
+
+  }
+
+  function similarity($Score, $TotalArtistScore) {
+    return (pow(($Score / ($TotalArtistScore + 1)), (1 / 1)));
+  }
+
+  function scan_array_range($Array, $Start, $Finish) {
+    if ($Start < 0) {
+      die($Start);
+    }
+    for ($i = $Start; $i <= $Finish; $i++) {
+      if (isset($Array[$i])) {
+        return $i;
+      }
+    }
+    return false;
+  }
+
+  function write_artists() {
 ?>
-		<div style="position: absolute; bottom: <?=($this->y - 10)?>px; left: <?=($this->x - $this->NameLength * 4)?>px; font-size: 13pt; white-space: nowrap;" class="similar_artist_header">
-			<?=($this->Name)?>
-		</div>
+    <div style="position: absolute; bottom: <?=($this->y - 10)?>px; left: <?=($this->x - $this->NameLength * 4)?>px; font-size: 13pt; white-space: nowrap;" class="similar_artist_header">
+      <?=($this->Name)?>
+    </div>
 <?
-		foreach ($this->Artists as $Artist) {
-			if ($Artist->ID == $this->ID) {
-				continue;
-			}
-			$xPosition = $Artist->x - $Artist->NameLength * 4;
-			if ($xPosition < 0) {
-				$xPosition = 3;
-				$Artist->x = $xPosition;
-
-			}
-			$Decimal = $this->Similar[$Artist->ID]['Decimal'];
-
-			if ($Decimal < 0.2) {
-				$FontSize = 8;
-			} elseif ($Decimal < 0.3) {
-				$FontSize = 9;
-			} elseif ($Decimal < 0.4) {
-				$FontSize = 10;
-			} else {
-				$FontSize = 12;
-			}
+    foreach ($this->Artists as $Artist) {
+      if ($Artist->ID == $this->ID) {
+        continue;
+      }
+      $xPosition = $Artist->x - $Artist->NameLength * 4;
+      if ($xPosition < 0) {
+        $xPosition = 3;
+        $Artist->x = $xPosition;
+
+      }
+      $Decimal = $this->Similar[$Artist->ID]['Decimal'];
+
+      if ($Decimal < 0.2) {
+        $FontSize = 8;
+      } elseif ($Decimal < 0.3) {
+        $FontSize = 9;
+      } elseif ($Decimal < 0.4) {
+        $FontSize = 10;
+      } else {
+        $FontSize = 12;
+      }
 ?>
-		<div style="position: absolute; top: <?=($Artist->y - 5)?>px; left: <?=$xPosition?>px; font-size: <?=$FontSize?>pt; white-space: nowrap;">
-			<a href="artist.php?id=<?=($Artist->ID)?>" class="similar_artist"><?=($Artist->Name)?></a>
-		</div>
+    <div style="position: absolute; top: <?=($Artist->y - 5)?>px; left: <?=$xPosition?>px; font-size: <?=$FontSize?>pt; white-space: nowrap;">
+      <a href="artist.php?id=<?=($Artist->ID)?>" class="similar_artist"><?=($Artist->Name)?></a>
+    </div>
 <?
-		}
-		reset($this->Artists);
-	}
-
-	function background_image() {
-		global $Img;
-		reset($this->Similar);
-		foreach ($this->Similar as $SimilarArtist) {
-			list($ArtistID, $Val) = array_values($SimilarArtist);
-			$Artist = $this->Artists[$ArtistID];
-			$Decimal = $this->Similar[$ArtistID]['Decimal'];
-			$Width = ceil($Decimal * 4) + 1;
-
-			$Img->line($this->x, $this->y, $Artist->x, $Artist->y, $Img->color(199, 218, 255), $Width);
-
-			unset($Artist->Similar[$this->ID]);
-			reset($Artist->Similar);
-			foreach ($Artist->Similar as $SimilarArtist2) {
-				list($Artist2ID) = array_values($SimilarArtist2);
-				if ($this->Artists[$Artist2ID]) {
-					$Artist2 = $this->Artists[$Artist2ID];
-					$Img->line($Artist->x, $Artist->y, $Artist2->x, $Artist2->y, $Img->color(173, 201, 255));
-					unset($Artist2->Similar[$ArtistID]);
-				}
-			}
-			reset($this->xValues);
-		}
-		$Img->make_png(SERVER_ROOT.'/static/similar/'.$this->ID.'.png');
-	}
-
-	function dump() {
-		echo "Similarities:\n";
-		foreach ($this->Artists as $Artist) {
-			echo $Artist->ID;
-			echo ' - ';
-			echo $Artist->Name;
-			echo "\n";
-			echo 'x - ' . $Artist->x . "\n";
-			echo 'y - ' . $Artist->y . "\n";
-			print_r($this->Similar[$Artist->ID]);
-			//print_r($Artist->Similar);
-			echo "\n\n---\n\n";
-		}
-
-	}
+    }
+    reset($this->Artists);
+  }
+
+  function background_image() {
+    global $Img;
+    reset($this->Similar);
+    foreach ($this->Similar as $SimilarArtist) {
+      list($ArtistID, $Val) = array_values($SimilarArtist);
+      $Artist = $this->Artists[$ArtistID];
+      $Decimal = $this->Similar[$ArtistID]['Decimal'];
+      $Width = ceil($Decimal * 4) + 1;
+
+      $Img->line($this->x, $this->y, $Artist->x, $Artist->y, $Img->color(199, 218, 255), $Width);
+
+      unset($Artist->Similar[$this->ID]);
+      reset($Artist->Similar);
+      foreach ($Artist->Similar as $SimilarArtist2) {
+        list($Artist2ID) = array_values($SimilarArtist2);
+        if ($this->Artists[$Artist2ID]) {
+          $Artist2 = $this->Artists[$Artist2ID];
+          $Img->line($Artist->x, $Artist->y, $Artist2->x, $Artist2->y, $Img->color(173, 201, 255));
+          unset($Artist2->Similar[$ArtistID]);
+        }
+      }
+      reset($this->xValues);
+    }
+    $Img->make_png(SERVER_ROOT.'/static/similar/'.$this->ID.'.png');
+  }
+
+  function dump() {
+    echo "Similarities:\n";
+    foreach ($this->Artists as $Artist) {
+      echo $Artist->ID;
+      echo ' - ';
+      echo $Artist->Name;
+      echo "\n";
+      echo 'x - ' . $Artist->x . "\n";
+      echo 'y - ' . $Artist->y . "\n";
+      print_r($this->Similar[$Artist->ID]);
+      //print_r($Artist->Similar);
+      echo "\n\n---\n\n";
+    }
+
+  }
 }
 ?>

classes/badges.class.php

@@ -1,145 +1,145 @@
 <?
 class Badges {
-	/**
-	 * Given a UserID, returns that user's badges
-	 *
-	 * @param int $UserID
-	 * @return array of BadgeIDs
-	 */
-	public static function get_badges($UserID) {
-		$Result = array();
-		
-		if (G::$Cache->get_value('user_badges_'.$UserID) !== false) {
-			return G::$Cache->get_value('user_badges_'.$UserID);
-		}
-
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT BadgeID, Displayed
-			FROM users_badges
-			WHERE UserID = ".$UserID);
-
-		if (G::$DB->has_results()) {
-			while (list($BadgeID, $Displayed) = G::$DB->next_record()) {
-				$Result[] = array('BadgeID' => $BadgeID, 'Displayed' => $Displayed);
-			}
-		}
-
-		G::$DB->set_query_id($QueryID);
-
-		G::$Cache->cache_value('user_badges_'.$UserID, $Result);
-
-		return $Result;
-	}
-
-	/**
-	 * Awards UserID the given BadgeID
-	 *
-	 * @param int $UserID
-	 * @param int $BadgeID
-	 * @return bool success?
-	 */
-	public static function award_badge($UserID, $BadgeID) {
-		if (self::has_badge($UserID, array('BadgeID' => $BadgeID))) {
-			return false;
-		} else {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				INSERT INTO users_badges
-					(UserID, BadgeID)
-				VALUES
-					($UserID, $BadgeID)");
-			G::$DB->set_query_id($QueryID);
-
-			G::$Cache->delete_value('user_badges_'.$UserID);
-
-			return true;
-		}
-	}
-
-	/**
-	 * Given a UserID, return that user's displayed badges
-	 *
-	 * @param int $UserID
-	 * @return array of BadgeIDs
-	 */
-	public static function get_displayed_badges($UserID) {
-		$Result = array();
+  /**
+   * Given a UserID, returns that user's badges
+   *
+   * @param int $UserID
+   * @return array of BadgeIDs
+   */
+  public static function get_badges($UserID) {
+    $Result = array();
+
+    if (G::$Cache->get_value('user_badges_'.$UserID) !== false) {
+      return G::$Cache->get_value('user_badges_'.$UserID);
+    }
+
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT BadgeID, Displayed
+      FROM users_badges
+      WHERE UserID = ".$UserID);
+
+    if (G::$DB->has_results()) {
+      while (list($BadgeID, $Displayed) = G::$DB->next_record()) {
+        $Result[] = array('BadgeID' => $BadgeID, 'Displayed' => $Displayed);
+      }
+    }
+
+    G::$DB->set_query_id($QueryID);
+
+    G::$Cache->cache_value('user_badges_'.$UserID, $Result);
+
+    return $Result;
+  }
+
+  /**
+   * Awards UserID the given BadgeID
+   *
+   * @param int $UserID
+   * @param int $BadgeID
+   * @return bool success?
+   */
+  public static function award_badge($UserID, $BadgeID) {
+    if (self::has_badge($UserID, array('BadgeID' => $BadgeID))) {
+      return false;
+    } else {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        INSERT INTO users_badges
+          (UserID, BadgeID)
+        VALUES
+          ($UserID, $BadgeID)");
+      G::$DB->set_query_id($QueryID);
+
+      G::$Cache->delete_value('user_badges_'.$UserID);
+
+      return true;
+    }
+  }
+
+  /**
+   * Given a UserID, return that user's displayed badges
+   *
+   * @param int $UserID
+   * @return array of BadgeIDs
+   */
+  public static function get_displayed_badges($UserID) {
+    $Result = array();
 
     $Badges = self::get_badges($UserID);
 
-		foreach ($Badges as $Badge) {
-			if ($Badge['Displayed'])
-				$Result[] = $Badge;
-		}
-		return $Result;
-	}
-
-	/**
-	 * Returns true if the given user owns the given badge
-	 *
-	 * @param int $UserID
-	 * @param $Badge
-	 * @return bool
-	 */
-	public static function has_badge($UserID, $Badge) {
+    foreach ($Badges as $Badge) {
+      if ($Badge['Displayed'])
+        $Result[] = $Badge;
+    }
+    return $Result;
+  }
+
+  /**
+   * Returns true if the given user owns the given badge
+   *
+   * @param int $UserID
+   * @param $Badge
+   * @return bool
+   */
+  public static function has_badge($UserID, $Badge) {
     $Badges = self::get_badges($UserID);
 
-		foreach ($Badges as $B) {
-			if ($B['BadgeID'] == $Badge['BadgeID'])
-				return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates HTML for displaying a badge.
-	 *
-	 * @param $Badge
-	 * @param bool $Tooltip Should HTML contain a tooltip?
-	 * @return string HTML
-	 */
-	public static function display_badge($Badge, $Tooltip = false) {
-		$html = "";
-		
-		if (G::$Cache->get_value('badge_'.$Badge['BadgeID'])) {
-			extract(G::$Cache->get_value('badge_'.$Badge['BadgeID']));
-		}
-		if (!isset($Icon)) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-				Icon, Name, Description
-				FROM badges
-				WHERE ID = ".$Badge['BadgeID']);
-
-			if (G::$DB->has_results()) {
-				list($Icon, $Name, $Description) = G::$DB->next_record();
-				G::$Cache->cache_value('badge_'.$Badge['BadgeID'], array('Icon' => $Icon, 'Name' => $Name, 'Description' => $Description));
-			}
-
-			G::$DB->set_query_id($QueryID);
-
-		}
-
-		if (isset($Icon)) {
-			if ($Tooltip) {
-				$html .= "<a class='badge_icon'><img class='tooltip' title='$Name</br>$Description' src='$Icon' /></a>";
-			} else { 
-				$html .= "<a class='badge_icon'><img title='$Name' src='$Icon' /></a>";
-			}
-		}
-		
-		return $html;
-	}
-
-	public static function display_badges($Badges, $Tooltip = false) {
-		$html = "";
-		foreach ($Badges as $Badge) {
-			$html .= self::display_badge($Badge, $Tooltip);
-		}
-		return $html;
-	}
+    foreach ($Badges as $B) {
+      if ($B['BadgeID'] == $Badge['BadgeID'])
+        return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Creates HTML for displaying a badge.
+   *
+   * @param $Badge
+   * @param bool $Tooltip Should HTML contain a tooltip?
+   * @return string HTML
+   */
+  public static function display_badge($Badge, $Tooltip = false) {
+    $html = "";
+
+    if (G::$Cache->get_value('badge_'.$Badge['BadgeID'])) {
+      extract(G::$Cache->get_value('badge_'.$Badge['BadgeID']));
+    }
+    if (!isset($Icon)) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+        Icon, Name, Description
+        FROM badges
+        WHERE ID = ".$Badge['BadgeID']);
+
+      if (G::$DB->has_results()) {
+        list($Icon, $Name, $Description) = G::$DB->next_record();
+        G::$Cache->cache_value('badge_'.$Badge['BadgeID'], array('Icon' => $Icon, 'Name' => $Name, 'Description' => $Description));
+      }
+
+      G::$DB->set_query_id($QueryID);
+
+    }
+
+    if (isset($Icon)) {
+      if ($Tooltip) {
+        $html .= "<a class='badge_icon'><img class='tooltip' title='$Name</br>$Description' src='$Icon' /></a>";
+      } else {
+        $html .= "<a class='badge_icon'><img title='$Name' src='$Icon' /></a>";
+      }
+    }
+
+    return $html;
+  }
+
+  public static function display_badges($Badges, $Tooltip = false) {
+    $html = "";
+    foreach ($Badges as $Badge) {
+      $html .= self::display_badge($Badge, $Tooltip);
+    }
+    return $html;
+  }
 }
 ?>

classes/bencode.class.php

@@ -4,23 +4,23 @@
  * Overhead from the function calls is small enough to not worry about
  */
 class Int64 {
-	private $Num;
+  private $Num;
 
-	public function __construct($Val) {
-		$this->Num = $Val;
-	}
+  public function __construct($Val) {
+    $this->Num = $Val;
+  }
 
-	public static function make($Val) {
-		return PHP_INT_SIZE === 4 ? new Int64($Val) : (int)$Val;
-	}
+  public static function make($Val) {
+    return PHP_INT_SIZE === 4 ? new Int64($Val) : (int)$Val;
+  }
 
-	public static function get($Val) {
-		return PHP_INT_SIZE === 4 ? $Val->Num : $Val;
-	}
+  public static function get($Val) {
+    return PHP_INT_SIZE === 4 ? $Val->Num : $Val;
+  }
 
-	public static function is_int($Val) {
-		return is_int($Val) || (is_object($Val) && get_class($Val) === 'Int64');
-	}
+  public static function is_int($Val) {
+    return is_int($Val) || (is_object($Val) && get_class($Val) === 'Int64');
+  }
 }
 
 /**
@@ -28,69 +28,69 @@ class Int64 {
  * note is that empty dictionaries are represented by boolean trues
  */
 class Bencode {
-	private $DefaultKeys = array( // Get rid of everything except these keys to save some space
-			'created by', 'creation date', 'encoding', 'info');
-	private $Data;
-	public $Enc;
+  private $DefaultKeys = array( // Get rid of everything except these keys to save some space
+      'created by', 'creation date', 'encoding', 'info');
+  private $Data;
+  public $Enc;
 
-	/**
-	 * Encode an arbitrary array (usually one that's just been decoded)
-	 *
-	 * @param array $Arg the thing to encode
-	 * @param mixed $Keys string or array with keys in the input array to encode or true to encode everything
-	 * @return bencoded string representing the content of the input array
-	 */
-	public function encode($Arg = false, $Keys = false) {
-		if ($Arg === false) {
-			$Data =& $this->Dec;
-		} else {
-			$Data =& $Arg;
-		}
-		if ($Keys === true) {
-			$this->Data = $Data;
-		} elseif ($Keys === false) {
-			$this->Data = array_intersect_key($Data, array_flip($this->DefaultKeys));
-		} elseif (is_array($Keys)) {
-			$this->Data = array_intersect_key($Data, array_flip($Keys));
-		} else {
-			$this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false;
-		}
-		if (!$this->Data) {
-			return false;
-		}
-		$this->Enc = $this->_benc();
-		return $this->Enc;
-	}
+  /**
+   * Encode an arbitrary array (usually one that's just been decoded)
+   *
+   * @param array $Arg the thing to encode
+   * @param mixed $Keys string or array with keys in the input array to encode or true to encode everything
+   * @return bencoded string representing the content of the input array
+   */
+  public function encode($Arg = false, $Keys = false) {
+    if ($Arg === false) {
+      $Data =& $this->Dec;
+    } else {
+      $Data =& $Arg;
+    }
+    if ($Keys === true) {
+      $this->Data = $Data;
+    } elseif ($Keys === false) {
+      $this->Data = array_intersect_key($Data, array_flip($this->DefaultKeys));
+    } elseif (is_array($Keys)) {
+      $this->Data = array_intersect_key($Data, array_flip($Keys));
+    } else {
+      $this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false;
+    }
+    if (!$this->Data) {
+      return false;
+    }
+    $this->Enc = $this->_benc();
+    return $this->Enc;
+  }
 
-	/**
-	 * Internal encoding function that does the actual job
-	 *
-	 * @return bencoded string
-	 */
-	private function _benc() {
-		if (!is_array($this->Data)) {
-			if (Int64::is_int($this->Data)) { // Integer
-				return 'i'.Int64::get($this->Data).'e';
-			}
-			if ($this->Data === true) { // Empty dictionary
-				return 'de';
-			}
-			return strlen($this->Data).':'.$this->Data; // String
-		}
-		if (empty($this->Data) || Int64::is_int(key($this->Data))) {
-			$IsDict = false;
-		} else {
-			$IsDict = true;
-			ksort($this->Data); // Dictionaries must be sorted
-		}
-		$Ret = $IsDict ? 'd' : 'l';
-		foreach ($this->Data as $Key => $Value) {
-			if ($IsDict) {
-				$Ret .= strlen($Key).':'.$Key;
-			}
-			$this->Data = $Value;
-			$Ret .= $this->_benc();
-		}
-		return $Ret.'e';
-	}
+  /**
+   * Internal encoding function that does the actual job
+   *
+   * @return bencoded string
+   */
+  private function _benc() {
+    if (!is_array($this->Data)) {
+      if (Int64::is_int($this->Data)) { // Integer
+        return 'i'.Int64::get($this->Data).'e';
+      }
+      if ($this->Data === true) { // Empty dictionary
+        return 'de';
+      }
+      return strlen($this->Data).':'.$this->Data; // String
+    }
+    if (empty($this->Data) || Int64::is_int(key($this->Data))) {
+      $IsDict = false;
+    } else {
+      $IsDict = true;
+      ksort($this->Data); // Dictionaries must be sorted
+    }
+    $Ret = $IsDict ? 'd' : 'l';
+    foreach ($this->Data as $Key => $Value) {
+      if ($IsDict) {
+        $Ret .= strlen($Key).':'.$Key;
+      }
+      $this->Data = $Value;
+      $Ret .= $this->_benc();
+    }
+    return $Ret.'e';
+  }
 }

classes/bencodedecode.class.php

@@ -4,181 +4,181 @@
  * note is that empty dictionaries are represented by boolean trues
  */
 class BencodeDecode extends Bencode {
-	private $Data;
-	private $Length;
-	private $Pos = 0;
-	public $Dec = array();
-	public $ExitOnError = true;
-	const SnipLength = 40;
+  private $Data;
+  private $Length;
+  private $Pos = 0;
+  public $Dec = array();
+  public $ExitOnError = true;
+  const SnipLength = 40;
 
-	/**
-	 * Decode prepararations
-	 *
-	 * @param string $Arg bencoded string or path to bencoded file to decode
-	 * @param bool $IsPath needs to be true if $Arg is a path
-	 * @return decoded data with a suitable structure
-	 */
-	function __construct($Arg = false, $IsPath = false) {
-		if ($Arg === false) {
-			if (empty($this->Enc)) {
-				return false;
-			}
-		} else {
-			if ($IsPath === true) {
-				return $this->bdec_file($Arg);
-			}
-			$this->Data = $Arg;
-		}
-		return $this->decode();
-	}
+  /**
+   * Decode prepararations
+   *
+   * @param string $Arg bencoded string or path to bencoded file to decode
+   * @param bool $IsPath needs to be true if $Arg is a path
+   * @return decoded data with a suitable structure
+   */
+  function __construct($Arg = false, $IsPath = false) {
+    if ($Arg === false) {
+      if (empty($this->Enc)) {
+        return false;
+      }
+    } else {
+      if ($IsPath === true) {
+        return $this->bdec_file($Arg);
+      }
+      $this->Data = $Arg;
+    }
+    return $this->decode();
+  }
 
-	/**
-	 * Decodes a bencoded file
-	 *
-	 * @param $Path path to bencoded file to decode
-	 * @return decoded data with a suitable structure
-	 */
-	public function bdec_file($Path = false) {
-		if (empty($Path)) {
-			return false;
-		}
-		if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) {
-			return $this->error("Error: file '$Path' could not be opened.\n");
-		}
-		return $this->decode();
-	}
+  /**
+   * Decodes a bencoded file
+   *
+   * @param $Path path to bencoded file to decode
+   * @return decoded data with a suitable structure
+   */
+  public function bdec_file($Path = false) {
+    if (empty($Path)) {
+      return false;
+    }
+    if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) {
+      return $this->error("Error: file '$Path' could not be opened.\n");
+    }
+    return $this->decode();
+  }
 
-	/**
-	 * Decodes a string with bencoded data
-	 *
-	 * @param mixed $Arg bencoded data or false to decode the content of $this->Data
-	 * @return decoded data with a suitable structure
-	 */
-	public function decode($Arg = false) {
-		if ($Arg !== false) {
-			$this->Data = $Arg;
-		} elseif (!$this->Data) {
-			$this->Data = $this->Enc;
-		}
-		if (!$this->Data) {
-			return false;
-		}
-		$this->Length = strlen($this->Data);
-		$this->Pos = 0;
-		$this->Dec = $this->_bdec();
-		if ($this->Pos < $this->Length) {
-			// Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it
-			return $this->error();
-		}
-		return $this->Dec;
-	}
+  /**
+   * Decodes a string with bencoded data
+   *
+   * @param mixed $Arg bencoded data or false to decode the content of $this->Data
+   * @return decoded data with a suitable structure
+   */
+  public function decode($Arg = false) {
+    if ($Arg !== false) {
+      $this->Data = $Arg;
+    } elseif (!$this->Data) {
+      $this->Data = $this->Enc;
+    }
+    if (!$this->Data) {
+      return false;
+    }
+    $this->Length = strlen($this->Data);
+    $this->Pos = 0;
+    $this->Dec = $this->_bdec();
+    if ($this->Pos < $this->Length) {
+      // Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it
+      return $this->error();
+    }
+    return $this->Dec;
+  }
 
-	/**
-	 * Internal decoding function that does the actual job
-	 *
-	 * @return decoded data with a suitable structure
-	 */
-	private function _bdec() {
-		switch ($this->Data[$this->Pos]) {
+  /**
+   * Internal decoding function that does the actual job
+   *
+   * @return decoded data with a suitable structure
+   */
+  private function _bdec() {
+    switch ($this->Data[$this->Pos]) {
 
-			case 'i':
-				$this->Pos++;
-				$Value = substr($this->Data, $this->Pos, strpos($this->Data, 'e', $this->Pos) - $this->Pos);
-				if (!ctype_digit($Value) && !($Value[0] == '-' && ctype_digit(substr($Value, 1)))) {
-					return $this->error();
-				}
-				$this->Pos += strlen($Value) + 1;
-				return Int64::make($Value);
+      case 'i':
+        $this->Pos++;
+        $Value = substr($this->Data, $this->Pos, strpos($this->Data, 'e', $this->Pos) - $this->Pos);
+        if (!ctype_digit($Value) && !($Value[0] == '-' && ctype_digit(substr($Value, 1)))) {
+          return $this->error();
+        }
+        $this->Pos += strlen($Value) + 1;
+        return Int64::make($Value);
 
-			case 'l':
-				$Value = array();
-				$this->Pos++;
-				while ($this->Data[$this->Pos] != 'e') {
-					if ($this->Pos >= $this->Length) {
-						return $this->error();
-					}
-					$Value[] = $this->_bdec();
-				}
-				$this->Pos++;
-				return $Value;
+      case 'l':
+        $Value = array();
+        $this->Pos++;
+        while ($this->Data[$this->Pos] != 'e') {
+          if ($this->Pos >= $this->Length) {
+            return $this->error();
+          }
+          $Value[] = $this->_bdec();
+        }
+        $this->Pos++;
+        return $Value;
 
-			case 'd':
-				$Value = array();
-				$this->Pos++;
-				while ($this->Data[$this->Pos] != 'e') {
-					$Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
-					if (!ctype_digit($Length)) {
-						return $this->error();
-					}
-					$this->Pos += strlen($Length) + $Length + 1;
-					$Key = substr($this->Data, $this->Pos - $Length, $Length);
-					if ($this->Pos >= $this->Length) {
-						return $this->error();
-					}
-					$Value[$Key] = $this->_bdec();
-				}
-				$this->Pos++;
-				// Use boolean true to keep track of empty dictionaries
-				return empty($Value) ? true : $Value;
+      case 'd':
+        $Value = array();
+        $this->Pos++;
+        while ($this->Data[$this->Pos] != 'e') {
+          $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
+          if (!ctype_digit($Length)) {
+            return $this->error();
+          }
+          $this->Pos += strlen($Length) + $Length + 1;
+          $Key = substr($this->Data, $this->Pos - $Length, $Length);
+          if ($this->Pos >= $this->Length) {
+            return $this->error();
+          }
+          $Value[$Key] = $this->_bdec();
+        }
+        $this->Pos++;
+        // Use boolean true to keep track of empty dictionaries
+        return empty($Value) ? true : $Value;
 
-			default:
-				$Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
-				if (!ctype_digit($Length)) {
-					return $this->error(); // Even if the string is likely to be decoded correctly without this check, it's malformed
-				}
-				$this->Pos += strlen($Length) + $Length + 1;
-				return substr($this->Data, $this->Pos - $Length, $Length);
-		}
-	}
+      default:
+        $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
+        if (!ctype_digit($Length)) {
+          return $this->error(); // Even if the string is likely to be decoded correctly without this check, it's malformed
+        }
+        $this->Pos += strlen($Length) + $Length + 1;
+        return substr($this->Data, $this->Pos - $Length, $Length);
+    }
+  }
 
-	/**
-	 * Convert everything to the correct data types and optionally escape strings
-	 *
-	 * @param bool $Escape whether to escape the textual data
-	 * @param mixed $Data decoded data or false to use the $Dec property
-	 * @return decoded data with more useful data types
-	 */
-	public function dump($Escape = true, $Data = false) {
-		if ($Data === false) {
-			$Data = $this->Dec;
-		}
-		if (Int64::is_int($Data)) {
-			return Int64::get($Data);
-		}
-		if (is_bool($Data)) {
-			return array();
-		}
-		if (is_array($Data)) {
-			$Output = array();
-			foreach ($Data as $Key => $Val) {
-				$Output[$Key] = $this->dump($Escape, $Val);
-			}
-			return $Output;
-		}
-		return $Escape ? htmlentities($Data) : $Data;
-	}
+  /**
+   * Convert everything to the correct data types and optionally escape strings
+   *
+   * @param bool $Escape whether to escape the textual data
+   * @param mixed $Data decoded data or false to use the $Dec property
+   * @return decoded data with more useful data types
+   */
+  public function dump($Escape = true, $Data = false) {
+    if ($Data === false) {
+      $Data = $this->Dec;
+    }
+    if (Int64::is_int($Data)) {
+      return Int64::get($Data);
+    }
+    if (is_bool($Data)) {
+      return array();
+    }
+    if (is_array($Data)) {
+      $Output = array();
+      foreach ($Data as $Key => $Val) {
+        $Output[$Key] = $this->dump($Escape, $Val);
+      }
+      return $Output;
+    }
+    return $Escape ? htmlentities($Data) : $Data;
+  }
 
-	/**
-	 * Display an error and halt the operation unless the $ExitOnError property is false
-	 *
-	 * @param string $ErrMsg the error message to display
-	 */
-	private function error($ErrMsg = false) {
-		static $ErrorPos;
-		if ($this->Pos === $ErrorPos) {
-			// The recursive nature of the class requires this to avoid duplicate error messages
-			return false;
-		}
-		if ($ErrMsg === false) {
-			printf("Malformed string. Invalid character at pos 0x%X: %s\n",
-					$this->Pos, str_replace(array("\r","\n"), array('',' '), htmlentities(substr($this->Data, $this->Pos, self::SnipLength))));
-		} else {
-			echo $ErrMsg;
-		}
-		if ($this->ExitOnError) {
-			exit();
-		}
-		$ErrorPos = $this->Pos;
-		return false;
-	}
+  /**
+   * Display an error and halt the operation unless the $ExitOnError property is false
+   *
+   * @param string $ErrMsg the error message to display
+   */
+  private function error($ErrMsg = false) {
+    static $ErrorPos;
+    if ($this->Pos === $ErrorPos) {
+      // The recursive nature of the class requires this to avoid duplicate error messages
+      return false;
+    }
+    if ($ErrMsg === false) {
+      printf("Malformed string. Invalid character at pos 0x%X: %s\n",
+          $this->Pos, str_replace(array("\r","\n"), array('',' '), htmlentities(substr($this->Data, $this->Pos, self::SnipLength))));
+    } else {
+      echo $ErrMsg;
+    }
+    if ($this->ExitOnError) {
+      exit();
+    }
+    $ErrorPos = $this->Pos;
+    return false;
+  }
 }

classes/bencodetorrent.class.php

@@ -3,141 +3,141 @@
  * Torrent class that contains some convenient functions related to torrent meta data
  */
 class BencodeTorrent extends BencodeDecode {
-	private $PathKey = 'path';
-	public $Files = array();
-	public $Size = 0;
+  private $PathKey = 'path';
+  public $Files = array();
+  public $Size = 0;
 
-	/**
-	 * Create a list of the files in the torrent and their sizes as well as the total torrent size
-	 *
-	 * @return array with a list of files and file sizes
-	 */
-	public function file_list() {
-		if (empty($this->Dec)) {
-			return false;
-		}
-		$InfoDict =& $this->Dec['info'];
-		if (!isset($InfoDict['files'])) {
-			// Single-file torrent
-			$this->Size = (Int64::is_int($InfoDict['length'])
-				? Int64::get($InfoDict['length'])
-				: $InfoDict['length']);
-			$Name = (isset($InfoDict['name.utf-8'])
-				? $InfoDict['name.utf-8']
-				: $InfoDict['name']);
-			$this->Files[] = array($this->Size, $Name);
-		} else {
-			if (isset($InfoDict['path.utf-8']['files'][0])) {
-				$this->PathKey = 'path.utf-8';
-			}
-			foreach ($InfoDict['files'] as $File) {
-				$TmpPath = array();
-				foreach ($File[$this->PathKey] as $SubPath) {
-					$TmpPath[] = $SubPath;
-				}
-				$CurSize = (Int64::is_int($File['length'])
-					? Int64::get($File['length'])
-					: $File['length']);
-				$this->Files[] = array($CurSize, implode('/', $TmpPath));
-				$this->Size += $CurSize;
-			}
-			uasort($this->Files, function($a, $b) {
-					return strnatcasecmp($a[1], $b[1]);
-				});
-		}
-		return array($this->Size, $this->Files);
-	}
+  /**
+   * Create a list of the files in the torrent and their sizes as well as the total torrent size
+   *
+   * @return array with a list of files and file sizes
+   */
+  public function file_list() {
+    if (empty($this->Dec)) {
+      return false;
+    }
+    $InfoDict =& $this->Dec['info'];
+    if (!isset($InfoDict['files'])) {
+      // Single-file torrent
+      $this->Size = (Int64::is_int($InfoDict['length'])
+        ? Int64::get($InfoDict['length'])
+        : $InfoDict['length']);
+      $Name = (isset($InfoDict['name.utf-8'])
+        ? $InfoDict['name.utf-8']
+        : $InfoDict['name']);
+      $this->Files[] = array($this->Size, $Name);
+    } else {
+      if (isset($InfoDict['path.utf-8']['files'][0])) {
+        $this->PathKey = 'path.utf-8';
+      }
+      foreach ($InfoDict['files'] as $File) {
+        $TmpPath = array();
+        foreach ($File[$this->PathKey] as $SubPath) {
+          $TmpPath[] = $SubPath;
+        }
+        $CurSize = (Int64::is_int($File['length'])
+          ? Int64::get($File['length'])
+          : $File['length']);
+        $this->Files[] = array($CurSize, implode('/', $TmpPath));
+        $this->Size += $CurSize;
+      }
+      uasort($this->Files, function($a, $b) {
+          return strnatcasecmp($a[1], $b[1]);
+        });
+    }
+    return array($this->Size, $this->Files);
+  }
 
-	/**
-	 * Find out the name of the torrent
-	 *
-	 * @return string torrent name
-	 */
-	public function get_name() {
-		if (empty($this->Dec)) {
-			return false;
-		}
-		if (isset($this->Dec['info']['name.utf-8'])) {
-			return $this->Dec['info']['name.utf-8'];
-		}
-		return $this->Dec['info']['name'];
-	}
+  /**
+   * Find out the name of the torrent
+   *
+   * @return string torrent name
+   */
+  public function get_name() {
+    if (empty($this->Dec)) {
+      return false;
+    }
+    if (isset($this->Dec['info']['name.utf-8'])) {
+      return $this->Dec['info']['name.utf-8'];
+    }
+    return $this->Dec['info']['name'];
+  }
 
-	/**
-	 * Find out the total size of the torrent
-	 *
-	 * @return string torrent size
-	 */
-	public function get_size() {
-		if (empty($this->Files)) {
-			if (empty($this->Dec)) {
-				return false;
-			}
-			$FileList = $this->file_list();
-		}
-		return $FileList[0];
-	}
+  /**
+   * Find out the total size of the torrent
+   *
+   * @return string torrent size
+   */
+  public function get_size() {
+    if (empty($this->Files)) {
+      if (empty($this->Dec)) {
+        return false;
+      }
+      $FileList = $this->file_list();
+    }
+    return $FileList[0];
+  }
 
-	/**
-	 * Checks if the "private" flag is present in the torrent
-	 *
-	 * @return true if the "private" flag is set
-	 */
-	public function is_private() {
-		if (empty($this->Dec)) {
-			return false;
-		}
-		return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1;
-	}
-	/**
-	 * Add the "private" flag to the torrent
-	 *
-	 * @return true if a change was required
-	 */
-	public function make_private() {
-		if (empty($this->Dec)) {
-			return false;
-		}
-		if ($this->is_private()) {
-			return false;
-		}
-		$this->Dec['info']['private'] = Int64::make(1);
-		ksort($this->Dec['info']);
-		return true;
-	}
+  /**
+   * Checks if the "private" flag is present in the torrent
+   *
+   * @return true if the "private" flag is set
+   */
+  public function is_private() {
+    if (empty($this->Dec)) {
+      return false;
+    }
+    return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1;
+  }
+  /**
+   * Add the "private" flag to the torrent
+   *
+   * @return true if a change was required
+   */
+  public function make_private() {
+    if (empty($this->Dec)) {
+      return false;
+    }
+    if ($this->is_private()) {
+      return false;
+    }
+    $this->Dec['info']['private'] = Int64::make(1);
+    ksort($this->Dec['info']);
+    return true;
+  }
 
-	/**
-	 * Calculate the torrent's info hash
-	 *
-	 * @return info hash in hexadecimal form
-	 */
-	public function info_hash() {
-		if (empty($this->Dec) || !isset($this->Dec['info'])) {
-			return false;
-		}
-		return sha1($this->encode(false, 'info'));
-	}
+  /**
+   * Calculate the torrent's info hash
+   *
+   * @return info hash in hexadecimal form
+   */
+  public function info_hash() {
+    if (empty($this->Dec) || !isset($this->Dec['info'])) {
+      return false;
+    }
+    return sha1($this->encode(false, 'info'));
+  }
 
-	/**
-	 * Add the announce URL to a torrent
-	 */
-	public static function add_announce_url($Data, $Url) {
-		return 'd8:announce'.strlen($Url).':'.$Url . substr($Data, 1);
-	}
+  /**
+   * Add the announce URL to a torrent
+   */
+  public static function add_announce_url($Data, $Url) {
+    return 'd8:announce'.strlen($Url).':'.$Url . substr($Data, 1);
+  }
 
-	/**
-	 * Let's support announce lists
-	 */
-	public static function add_announce_list($Data, $Urls) {
-		$r = 'd13:announce-listl';
-		for ($i = 0; $i < count($Urls); $i++) {
-			$r .= 'l';
-			for ($j = 0; $j < count($Urls[$i]); $j++) {
-				$r .= strlen($Urls[$i][$j]).':'.$Urls[$i][$j];
-			}
-			$r .= 'e';
-		}
-		$r .= 'e' .substr($Data, 1);
-		return $r;
-	}
+  /**
+   * Let's support announce lists
+   */
+  public static function add_announce_list($Data, $Urls) {
+    $r = 'd13:announce-listl';
+    for ($i = 0; $i < count($Urls); $i++) {
+      $r .= 'l';
+      for ($j = 0; $j < count($Urls[$i]); $j++) {
+        $r .= strlen($Urls[$i][$j]).':'.$Urls[$i][$j];
+      }
+      $r .= 'e';
+    }
+    $r .= 'e' .substr($Data, 1);
+    return $r;
+  }
 }

classes/bitcoinrpc.class.php

@@ -1,32 +1,32 @@
 <?php
 class BitcoinRpc {
 
-	public static function __callStatic($Method, $Args) {
-		if (!defined('BITCOIN_RPC_URL')) {
-			return false;
-		}
-		$MessageID = mt_rand();
-		$Params = json_encode(array(
-			'method' => $Method,
-			'params' => $Args,
-			'id' => $MessageID)
-		);
+  public static function __callStatic($Method, $Args) {
+    if (!defined('BITCOIN_RPC_URL')) {
+      return false;
+    }
+    $MessageID = mt_rand();
+    $Params = json_encode(array(
+      'method' => $Method,
+      'params' => $Args,
+      'id' => $MessageID)
+    );
 
-		$Request = array(
-			'http' => array(
-				'method' => 'POST',
-				'header' => 'Content-type: application/json',
-				'content' => $Params
-				)
-			);
+    $Request = array(
+      'http' => array(
+        'method' => 'POST',
+        'header' => 'Content-type: application/json',
+        'content' => $Params
+        )
+      );
 
-		if (!$Response = file_get_contents(BITCOIN_RPC_URL, false, stream_context_create($Request))) {
-			return false;
-		}
-		$Response = json_decode($Response);
-		if ($Response->id != $MessageID || !empty($Response->error) || empty($Response->result)) {
-			return false;
-		}
-		return $Response->result;
-	}
+    if (!$Response = file_get_contents(BITCOIN_RPC_URL, false, stream_context_create($Request))) {
+      return false;
+    }
+    $Response = json_decode($Response);
+    if ($Response->id != $MessageID || !empty($Response->error) || empty($Response->result)) {
+      return false;
+    }
+    return $Response->result;
+  }
 }

classes/bookmarks.class.php

@@ -1,99 +1,99 @@
 <?
 class Bookmarks {
 
-	/**
-	 * Check if can bookmark
-	 *
-	 * @param string $Type
-	 * @return boolean
-	 */
-	public static function can_bookmark($Type) {
-		return in_array($Type, array(
-				'torrent',
-				'artist',
-				'collage',
-				'request'
-		));
-	}
+  /**
+   * Check if can bookmark
+   *
+   * @param string $Type
+   * @return boolean
+   */
+  public static function can_bookmark($Type) {
+    return in_array($Type, array(
+        'torrent',
+        'artist',
+        'collage',
+        'request'
+    ));
+  }
 
-	/**
-	 * Get the bookmark schema.
-	 * Recommended usage:
-	 * list($Table, $Col) = bookmark_schema('torrent');
-	 *
-	 * @param string $Type the type to get the schema for
-	 */
-	public static function bookmark_schema($Type) {
-		switch ($Type) {
-			case 'torrent':
-				return array(
-						'bookmarks_torrents',
-						'GroupID'
-				);
-				break;
-			case 'artist':
-				return array(
-						'bookmarks_artists',
-						'ArtistID'
-				);
-				break;
-			case 'collage':
-				return array(
-						'bookmarks_collages',
-						'CollageID'
-				);
-				break;
-			case 'request':
-				return array(
-						'bookmarks_requests',
-						'RequestID'
-				);
-				break;
-			default:
-				die('HAX');
-		}
-	}
+  /**
+   * Get the bookmark schema.
+   * Recommended usage:
+   * list($Table, $Col) = bookmark_schema('torrent');
+   *
+   * @param string $Type the type to get the schema for
+   */
+  public static function bookmark_schema($Type) {
+    switch ($Type) {
+      case 'torrent':
+        return array(
+            'bookmarks_torrents',
+            'GroupID'
+        );
+        break;
+      case 'artist':
+        return array(
+            'bookmarks_artists',
+            'ArtistID'
+        );
+        break;
+      case 'collage':
+        return array(
+            'bookmarks_collages',
+            'CollageID'
+        );
+        break;
+      case 'request':
+        return array(
+            'bookmarks_requests',
+            'RequestID'
+        );
+        break;
+      default:
+        die('HAX');
+    }
+  }
 
-	/**
-	 * Check if something is bookmarked
-	 *
-	 * @param string $Type
-	 *        	type of bookmarks to check
-	 * @param int $ID
-	 *        	bookmark's id
-	 * @return boolean
-	 */
-	public static function has_bookmarked($Type, $ID) {
-		return in_array($ID, self::all_bookmarks($Type));
-	}
+  /**
+   * Check if something is bookmarked
+   *
+   * @param string $Type
+   *          type of bookmarks to check
+   * @param int $ID
+   *          bookmark's id
+   * @return boolean
+   */
+  public static function has_bookmarked($Type, $ID) {
+    return in_array($ID, self::all_bookmarks($Type));
+  }
 
-	/**
-	 * Fetch all bookmarks of a certain type for a user.
-	 * If UserID is false than defaults to G::$LoggedUser['ID']
-	 *
-	 * @param string $Type
-	 *        	type of bookmarks to fetch
-	 * @param int $UserID
-	 *        	userid whose bookmarks to get
-	 * @return array the bookmarks
-	 */
-	public static function all_bookmarks($Type, $UserID = false) {
-		if ($UserID === false) {
-			$UserID = G::$LoggedUser['ID'];
-		}
-		$CacheKey = 'bookmarks_' . $Type . '_' . $UserID;
-		if (($Bookmarks = G::$Cache->get_value($CacheKey)) === false) {
-			list ($Table, $Col) = self::bookmark_schema($Type);
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT $Col
-				FROM $Table
-				WHERE UserID = '$UserID'");
-			$Bookmarks = G::$DB->collect($Col);
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value($CacheKey, $Bookmarks, 0);
-		}
-		return $Bookmarks;
-	}
+  /**
+   * Fetch all bookmarks of a certain type for a user.
+   * If UserID is false than defaults to G::$LoggedUser['ID']
+   *
+   * @param string $Type
+   *          type of bookmarks to fetch
+   * @param int $UserID
+   *          userid whose bookmarks to get
+   * @return array the bookmarks
+   */
+  public static function all_bookmarks($Type, $UserID = false) {
+    if ($UserID === false) {
+      $UserID = G::$LoggedUser['ID'];
+    }
+    $CacheKey = 'bookmarks_' . $Type . '_' . $UserID;
+    if (($Bookmarks = G::$Cache->get_value($CacheKey)) === false) {
+      list ($Table, $Col) = self::bookmark_schema($Type);
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT $Col
+        FROM $Table
+        WHERE UserID = '$UserID'");
+      $Bookmarks = G::$DB->collect($Col);
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value($CacheKey, $Bookmarks, 0);
+    }
+    return $Bookmarks;
+  }
 }
 ?>

classes/cache.class.php

@@ -25,370 +25,370 @@ memcached -d -m 8192 -l 10.10.0.1 -t8 -C
 |*************************************************************************/
 
 if (!extension_loaded('memcache')) {
-	die('Memcache Extension not loaded.');
+  die('Memcache Extension not loaded.');
 }
 
 class CACHE extends Memcache {
-	/**
-	 * Torrent Group cache version
-	 */
-	const GROUP_VERSION = 5;
-
-	public $CacheHits = array();
-	public $MemcacheDBArray = array();
-	public $MemcacheDBKey = '';
-	protected $InTransaction = false;
-	public $Time = 0;
-	private $Servers = array();
-	private $PersistentKeys = array(
-		'ajax_requests_*',
-		'query_lock_*',
-		'stats_*',
-		'top10tor_*',
-		'top10votes_*',
-		'users_snatched_*',
-
-		// Cache-based features
-		'global_notification',
-		'notifications_one_reads_*',
-	);
-	private $ClearedKeys = array();
-
-	public $CanClear = false;
-	public $InternalCache = true;
-
-	function __construct($Servers) {
-		$this->Servers = $Servers;
-		foreach ($Servers as $Server) {
-			$this->addServer($Server['host'], $Server['port'], true, $Server['buckets']);
-		}
-	}
-
-	//---------- Caching functions ----------//
-
-	// Allows us to set an expiration on otherwise perminantly cache'd values
-	// Useful for disabled users, locked threads, basically reducing ram usage
-	public function expire_value($Key, $Duration = 2592000) {
-		$StartTime = microtime(true);
-		$this->set($Key, $this->get($Key), $Duration);
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-	}
-
-	// Wrapper for Memcache::set, with the zlib option removed and default duration of 30 days
-	public function cache_value($Key, $Value, $Duration = 2592000) {
-		$StartTime = microtime(true);
-		if (empty($Key)) {
-			trigger_error("Cache insert failed for empty key");
-		}
-		if (!$this->set($Key, $Value, 0, $Duration)) {
-			trigger_error("Cache insert failed for key $Key");
-		}
-		if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) {
-			$this->CacheHits[$Key] = $Value;
-		}
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-	}
-
-	// Wrapper for Memcache::add, with the zlib option removed and default duration of 30 days
-	public function add_value($Key, $Value, $Duration = 2592000) {
-		$StartTime = microtime(true);
-		$Added = $this->add($Key, $Value, 0, $Duration);
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-		return $Added;
-	}
-
-	public function replace_value($Key, $Value, $Duration = 2592000) {
-		$StartTime = microtime(true);
-		$this->replace($Key, $Value, false, $Duration);
-		if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) {
-			$this->CacheHits[$Key] = $Value;
-		}
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-	}
-
-	public function get_value($Key, $NoCache = false) {
-		if (!$this->InternalCache) {
-			$NoCache = true;
-		}
-		$StartTime = microtime(true);
-		if (empty($Key)) {
-			trigger_error('Cache retrieval failed for empty key');
-		}
-
-		if (!empty($_GET['clearcache']) && $this->CanClear && !isset($this->ClearedKeys[$Key]) && !Misc::in_array_partial($Key, $this->PersistentKeys)) {
-			if ($_GET['clearcache'] === '1') {
-				// Because check_perms() isn't true until LoggedUser is pulled from the cache, we have to remove the entries loaded before the LoggedUser data
-				// Because of this, not user cache data will require a secondary pageload following the clearcache to update
-				if (count($this->CacheHits) > 0) {
-					foreach (array_keys($this->CacheHits) as $HitKey) {
-						if (!isset($this->ClearedKeys[$HitKey]) && !Misc::in_array_partial($HitKey, $this->PersistentKeys)) {
-							$this->delete($HitKey);
-							unset($this->CacheHits[$HitKey]);
-							$this->ClearedKeys[$HitKey] = true;
-						}
-					}
-				}
-				$this->delete($Key);
-				$this->Time += (microtime(true) - $StartTime) * 1000;
-				return false;
-			} elseif ($_GET['clearcache'] == $Key) {
-				$this->delete($Key);
-				$this->Time += (microtime(true) - $StartTime) * 1000;
-				return false;
-			} elseif (substr($_GET['clearcache'], -1) === '*') {
-				$Prefix = substr($_GET['clearcache'], 0, -1);
-				if ($Prefix === '' || $Prefix === substr($Key, 0, strlen($Prefix))) {
-					$this->delete($Key);
-					$this->Time += (microtime(true) - $StartTime) * 1000;
-					return false;
-				}
-			}
-			$this->ClearedKeys[$Key] = true;
-		}
-
-		// For cases like the forums, if a key is already loaded, grab the existing pointer
-		if (isset($this->CacheHits[$Key]) && !$NoCache) {
-			$this->Time += (microtime(true) - $StartTime) * 1000;
-			return $this->CacheHits[$Key];
-		}
-
-		$Return = $this->get($Key);
-		if ($Return !== false) {
-			$this->CacheHits[$Key] = $NoCache ? null : $Return;
-		}
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-		return $Return;
-	}
-
-	// Wrapper for Memcache::delete. For a reason, see above.
-	public function delete_value($Key) {
-		$StartTime = microtime(true);
-		if (empty($Key)) {
-			trigger_error('Cache deletion failed for empty key');
-		}
-		if (!$this->delete($Key)) {
-			//trigger_error("Cache delete failed for key $Key");
-		}
-		unset($this->CacheHits[$Key]);
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-	}
-
-	public function increment_value($Key, $Value = 1) {
-		$StartTime = microtime(true);
-		$NewVal = $this->increment($Key, $Value);
-		if (isset($this->CacheHits[$Key])) {
-			$this->CacheHits[$Key] = $NewVal;
-		}
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-	}
-
-	public function decrement_value($Key, $Value = 1) {
-		$StartTime = microtime(true);
-		$NewVal = $this->decrement($Key, $Value);
-		if (isset($this->CacheHits[$Key])) {
-			$this->CacheHits[$Key] = $NewVal;
-		}
-		$this->Time += (microtime(true) - $StartTime) * 1000;
-	}
-
-	//---------- memcachedb functions ----------//
-
-	public function begin_transaction($Key) {
-		$Value = $this->get($Key);
-		if (!is_array($Value)) {
-			$this->InTransaction = false;
-			$this->MemcacheDBKey = array();
-			$this->MemcacheDBKey = '';
-			return false;
-		}
-		$this->MemcacheDBArray = $Value;
-		$this->MemcacheDBKey = $Key;
-		$this->InTransaction = true;
-		return true;
-	}
-
-	public function cancel_transaction() {
-		$this->InTransaction = false;
-		$this->MemcacheDBKey = array();
-		$this->MemcacheDBKey = '';
-	}
-
-	public function commit_transaction($Time = 2592000) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		$this->cache_value($this->MemcacheDBKey, $this->MemcacheDBArray, $Time);
-		$this->InTransaction = false;
-	}
-
-	// Updates multiple rows in an array
-	public function update_transaction($Rows, $Values) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		$Array = $this->MemcacheDBArray;
-		if (is_array($Rows)) {
-			$i = 0;
-			$Keys = $Rows[0];
-			$Property = $Rows[1];
-			foreach ($Keys as $Row) {
-				$Array[$Row][$Property] = $Values[$i];
-				$i++;
-			}
-		} else {
-			$Array[$Rows] = $Values;
-		}
-		$this->MemcacheDBArray = $Array;
-	}
-
-	// Updates multiple values in a single row in an array
-	// $Values must be an associative array with key:value pairs like in the array we're updating
-	public function update_row($Row, $Values) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		if ($Row === false) {
-			$UpdateArray = $this->MemcacheDBArray;
-		} else {
-			$UpdateArray = $this->MemcacheDBArray[$Row];
-		}
-		foreach ($Values as $Key => $Value) {
-			if (!array_key_exists($Key, $UpdateArray)) {
-				trigger_error('Bad transaction key ('.$Key.') for cache '.$this->MemcacheDBKey);
-			}
-			if ($Value === '+1') {
-				if (!is_number($UpdateArray[$Key])) {
-					trigger_error('Tried to increment non-number ('.$Key.') for cache '.$this->MemcacheDBKey);
-				}
-				++$UpdateArray[$Key]; // Increment value
-			} elseif ($Value === '-1') {
-				if (!is_number($UpdateArray[$Key])) {
-					trigger_error('Tried to decrement non-number ('.$Key.') for cache '.$this->MemcacheDBKey);
-				}
-				--$UpdateArray[$Key]; // Decrement value
-			} else {
-				$UpdateArray[$Key] = $Value; // Otherwise, just alter value
-			}
-		}
-		if ($Row === false) {
-			$this->MemcacheDBArray = $UpdateArray;
-		} else {
-			$this->MemcacheDBArray[$Row] = $UpdateArray;
-		}
-	}
-
-	// Increments multiple values in a single row in an array
-	// $Values must be an associative array with key:value pairs like in the array we're updating
-	public function increment_row($Row, $Values) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		if ($Row === false) {
-			$UpdateArray = $this->MemcacheDBArray;
-		} else {
-			$UpdateArray = $this->MemcacheDBArray[$Row];
-		}
-		foreach ($Values as $Key => $Value) {
-			if (!array_key_exists($Key, $UpdateArray)) {
-				trigger_error("Bad transaction key ($Key) for cache ".$this->MemcacheDBKey);
-			}
-			if (!is_number($Value)) {
-				trigger_error("Tried to increment with non-number ($Key) for cache ".$this->MemcacheDBKey);
-			}
-			$UpdateArray[$Key] += $Value; // Increment value
-		}
-		if ($Row === false) {
-			$this->MemcacheDBArray = $UpdateArray;
-		} else {
-			$this->MemcacheDBArray[$Row] = $UpdateArray;
-		}
-	}
-
-	// Insert a value at the beginning of the array
-	public function insert_front($Key, $Value) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		if ($Key === '') {
-			array_unshift($this->MemcacheDBArray, $Value);
-		} else {
-			$this->MemcacheDBArray = array($Key=>$Value) + $this->MemcacheDBArray;
-		}
-	}
-
-	// Insert a value at the end of the array
-	public function insert_back($Key, $Value) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		if ($Key === '') {
-			array_push($this->MemcacheDBArray, $Value);
-		} else {
-			$this->MemcacheDBArray = $this->MemcacheDBArray + array($Key=>$Value);
-		}
-
-	}
-
-	public function insert($Key, $Value) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		if ($Key === '') {
-			$this->MemcacheDBArray[] = $Value;
-		} else {
-			$this->MemcacheDBArray[$Key] = $Value;
-		}
-	}
-
-	public function delete_row($Row) {
-		if (!$this->InTransaction) {
-			return false;
-		}
-		if (!isset($this->MemcacheDBArray[$Row])) {
-			trigger_error("Tried to delete non-existent row ($Row) for cache ".$this->MemcacheDBKey);
-		}
-		unset($this->MemcacheDBArray[$Row]);
-	}
-
-	public function update($Key, $Rows, $Values, $Time = 2592000) {
-		if (!$this->InTransaction) {
-			$this->begin_transaction($Key);
-			$this->update_transaction($Rows, $Values);
-			$this->commit_transaction($Time);
-		} else {
-			$this->update_transaction($Rows, $Values);
-		}
-	}
-
-	/**
-	 * Tries to set a lock. Expiry time is one hour to avoid indefinite locks
-	 *
-	 * @param string $LockName name on the lock
-	 * @return true if lock was acquired
-	 */
-	public function get_query_lock($LockName) {
-		return $this->add_value('query_lock_'.$LockName, 1, 3600);
-	}
-
-	/**
-	 * Remove lock
-	 *
-	 * @param string $LockName name on the lock
-	 */
-	public function clear_query_lock($LockName) {
-		$this->delete_value('query_lock_'.$LockName);
-	}
-
-	/**
-	 * Get cache server status
-	 *
-	 * @return array (host => bool status, ...)
-	 */
-	public function server_status() {
-		$Status = array();
-		foreach ($this->Servers as $Server) {
-			$Status["$Server[host]:$Server[port]"] = $this->getServerStatus($Server['host'], $Server['port']);
-		}
-		return $Status;
-	}
+  /**
+   * Torrent Group cache version
+   */
+  const GROUP_VERSION = 5;
+
+  public $CacheHits = array();
+  public $MemcacheDBArray = array();
+  public $MemcacheDBKey = '';
+  protected $InTransaction = false;
+  public $Time = 0;
+  private $Servers = array();
+  private $PersistentKeys = array(
+    'ajax_requests_*',
+    'query_lock_*',
+    'stats_*',
+    'top10tor_*',
+    'top10votes_*',
+    'users_snatched_*',
+
+    // Cache-based features
+    'global_notification',
+    'notifications_one_reads_*',
+  );
+  private $ClearedKeys = array();
+
+  public $CanClear = false;
+  public $InternalCache = true;
+
+  function __construct($Servers) {
+    $this->Servers = $Servers;
+    foreach ($Servers as $Server) {
+      $this->addServer($Server['host'], $Server['port'], true, $Server['buckets']);
+    }
+  }
+
+  //---------- Caching functions ----------//
+
+  // Allows us to set an expiration on otherwise perminantly cache'd values
+  // Useful for disabled users, locked threads, basically reducing ram usage
+  public function expire_value($Key, $Duration = 2592000) {
+    $StartTime = microtime(true);
+    $this->set($Key, $this->get($Key), $Duration);
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+  }
+
+  // Wrapper for Memcache::set, with the zlib option removed and default duration of 30 days
+  public function cache_value($Key, $Value, $Duration = 2592000) {
+    $StartTime = microtime(true);
+    if (empty($Key)) {
+      trigger_error("Cache insert failed for empty key");
+    }
+    if (!$this->set($Key, $Value, 0, $Duration)) {
+      trigger_error("Cache insert failed for key $Key");
+    }
+    if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) {
+      $this->CacheHits[$Key] = $Value;
+    }
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+  }
+
+  // Wrapper for Memcache::add, with the zlib option removed and default duration of 30 days
+  public function add_value($Key, $Value, $Duration = 2592000) {
+    $StartTime = microtime(true);
+    $Added = $this->add($Key, $Value, 0, $Duration);
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+    return $Added;
+  }
+
+  public function replace_value($Key, $Value, $Duration = 2592000) {
+    $StartTime = microtime(true);
+    $this->replace($Key, $Value, false, $Duration);
+    if ($this->InternalCache && array_key_exists($Key, $this->CacheHits)) {
+      $this->CacheHits[$Key] = $Value;
+    }
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+  }
+
+  public function get_value($Key, $NoCache = false) {
+    if (!$this->InternalCache) {
+      $NoCache = true;
+    }
+    $StartTime = microtime(true);
+    if (empty($Key)) {
+      trigger_error('Cache retrieval failed for empty key');
+    }
+
+    if (!empty($_GET['clearcache']) && $this->CanClear && !isset($this->ClearedKeys[$Key]) && !Misc::in_array_partial($Key, $this->PersistentKeys)) {
+      if ($_GET['clearcache'] === '1') {
+        // Because check_perms() isn't true until LoggedUser is pulled from the cache, we have to remove the entries loaded before the LoggedUser data
+        // Because of this, not user cache data will require a secondary pageload following the clearcache to update
+        if (count($this->CacheHits) > 0) {
+          foreach (array_keys($this->CacheHits) as $HitKey) {
+            if (!isset($this->ClearedKeys[$HitKey]) && !Misc::in_array_partial($HitKey, $this->PersistentKeys)) {
+              $this->delete($HitKey);
+              unset($this->CacheHits[$HitKey]);
+              $this->ClearedKeys[$HitKey] = true;
+            }
+          }
+        }
+        $this->delete($Key);
+        $this->Time += (microtime(true) - $StartTime) * 1000;
+        return false;
+      } elseif ($_GET['clearcache'] == $Key) {
+        $this->delete($Key);
+        $this->Time += (microtime(true) - $StartTime) * 1000;
+        return false;
+      } elseif (substr($_GET['clearcache'], -1) === '*') {
+        $Prefix = substr($_GET['clearcache'], 0, -1);
+        if ($Prefix === '' || $Prefix === substr($Key, 0, strlen($Prefix))) {
+          $this->delete($Key);
+          $this->Time += (microtime(true) - $StartTime) * 1000;
+          return false;
+        }
+      }
+      $this->ClearedKeys[$Key] = true;
+    }
+
+    // For cases like the forums, if a key is already loaded, grab the existing pointer
+    if (isset($this->CacheHits[$Key]) && !$NoCache) {
+      $this->Time += (microtime(true) - $StartTime) * 1000;
+      return $this->CacheHits[$Key];
+    }
+
+    $Return = $this->get($Key);
+    if ($Return !== false) {
+      $this->CacheHits[$Key] = $NoCache ? null : $Return;
+    }
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+    return $Return;
+  }
+
+  // Wrapper for Memcache::delete. For a reason, see above.
+  public function delete_value($Key) {
+    $StartTime = microtime(true);
+    if (empty($Key)) {
+      trigger_error('Cache deletion failed for empty key');
+    }
+    if (!$this->delete($Key)) {
+      //trigger_error("Cache delete failed for key $Key");
+    }
+    unset($this->CacheHits[$Key]);
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+  }
+
+  public function increment_value($Key, $Value = 1) {
+    $StartTime = microtime(true);
+    $NewVal = $this->increment($Key, $Value);
+    if (isset($this->CacheHits[$Key])) {
+      $this->CacheHits[$Key] = $NewVal;
+    }
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+  }
+
+  public function decrement_value($Key, $Value = 1) {
+    $StartTime = microtime(true);
+    $NewVal = $this->decrement($Key, $Value);
+    if (isset($this->CacheHits[$Key])) {
+      $this->CacheHits[$Key] = $NewVal;
+    }
+    $this->Time += (microtime(true) - $StartTime) * 1000;
+  }
+
+  //---------- memcachedb functions ----------//
+
+  public function begin_transaction($Key) {
+    $Value = $this->get($Key);
+    if (!is_array($Value)) {
+      $this->InTransaction = false;
+      $this->MemcacheDBKey = array();
+      $this->MemcacheDBKey = '';
+      return false;
+    }
+    $this->MemcacheDBArray = $Value;
+    $this->MemcacheDBKey = $Key;
+    $this->InTransaction = true;
+    return true;
+  }
+
+  public function cancel_transaction() {
+    $this->InTransaction = false;
+    $this->MemcacheDBKey = array();
+    $this->MemcacheDBKey = '';
+  }
+
+  public function commit_transaction($Time = 2592000) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    $this->cache_value($this->MemcacheDBKey, $this->MemcacheDBArray, $Time);
+    $this->InTransaction = false;
+  }
+
+  // Updates multiple rows in an array
+  public function update_transaction($Rows, $Values) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    $Array = $this->MemcacheDBArray;
+    if (is_array($Rows)) {
+      $i = 0;
+      $Keys = $Rows[0];
+      $Property = $Rows[1];
+      foreach ($Keys as $Row) {
+        $Array[$Row][$Property] = $Values[$i];
+        $i++;
+      }
+    } else {
+      $Array[$Rows] = $Values;
+    }
+    $this->MemcacheDBArray = $Array;
+  }
+
+  // Updates multiple values in a single row in an array
+  // $Values must be an associative array with key:value pairs like in the array we're updating
+  public function update_row($Row, $Values) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    if ($Row === false) {
+      $UpdateArray = $this->MemcacheDBArray;
+    } else {
+      $UpdateArray = $this->MemcacheDBArray[$Row];
+    }
+    foreach ($Values as $Key => $Value) {
+      if (!array_key_exists($Key, $UpdateArray)) {
+        trigger_error('Bad transaction key ('.$Key.') for cache '.$this->MemcacheDBKey);
+      }
+      if ($Value === '+1') {
+        if (!is_number($UpdateArray[$Key])) {
+          trigger_error('Tried to increment non-number ('.$Key.') for cache '.$this->MemcacheDBKey);
+        }
+        ++$UpdateArray[$Key]; // Increment value
+      } elseif ($Value === '-1') {
+        if (!is_number($UpdateArray[$Key])) {
+          trigger_error('Tried to decrement non-number ('.$Key.') for cache '.$this->MemcacheDBKey);
+        }
+        --$UpdateArray[$Key]; // Decrement value
+      } else {
+        $UpdateArray[$Key] = $Value; // Otherwise, just alter value
+      }
+    }
+    if ($Row === false) {
+      $this->MemcacheDBArray = $UpdateArray;
+    } else {
+      $this->MemcacheDBArray[$Row] = $UpdateArray;
+    }
+  }
+
+  // Increments multiple values in a single row in an array
+  // $Values must be an associative array with key:value pairs like in the array we're updating
+  public function increment_row($Row, $Values) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    if ($Row === false) {
+      $UpdateArray = $this->MemcacheDBArray;
+    } else {
+      $UpdateArray = $this->MemcacheDBArray[$Row];
+    }
+    foreach ($Values as $Key => $Value) {
+      if (!array_key_exists($Key, $UpdateArray)) {
+        trigger_error("Bad transaction key ($Key) for cache ".$this->MemcacheDBKey);
+      }
+      if (!is_number($Value)) {
+        trigger_error("Tried to increment with non-number ($Key) for cache ".$this->MemcacheDBKey);
+      }
+      $UpdateArray[$Key] += $Value; // Increment value
+    }
+    if ($Row === false) {
+      $this->MemcacheDBArray = $UpdateArray;
+    } else {
+      $this->MemcacheDBArray[$Row] = $UpdateArray;
+    }
+  }
+
+  // Insert a value at the beginning of the array
+  public function insert_front($Key, $Value) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    if ($Key === '') {
+      array_unshift($this->MemcacheDBArray, $Value);
+    } else {
+      $this->MemcacheDBArray = array($Key=>$Value) + $this->MemcacheDBArray;
+    }
+  }
+
+  // Insert a value at the end of the array
+  public function insert_back($Key, $Value) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    if ($Key === '') {
+      array_push($this->MemcacheDBArray, $Value);
+    } else {
+      $this->MemcacheDBArray = $this->MemcacheDBArray + array($Key=>$Value);
+    }
+
+  }
+
+  public function insert($Key, $Value) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    if ($Key === '') {
+      $this->MemcacheDBArray[] = $Value;
+    } else {
+      $this->MemcacheDBArray[$Key] = $Value;
+    }
+  }
+
+  public function delete_row($Row) {
+    if (!$this->InTransaction) {
+      return false;
+    }
+    if (!isset($this->MemcacheDBArray[$Row])) {
+      trigger_error("Tried to delete non-existent row ($Row) for cache ".$this->MemcacheDBKey);
+    }
+    unset($this->MemcacheDBArray[$Row]);
+  }
+
+  public function update($Key, $Rows, $Values, $Time = 2592000) {
+    if (!$this->InTransaction) {
+      $this->begin_transaction($Key);
+      $this->update_transaction($Rows, $Values);
+      $this->commit_transaction($Time);
+    } else {
+      $this->update_transaction($Rows, $Values);
+    }
+  }
+
+  /**
+   * Tries to set a lock. Expiry time is one hour to avoid indefinite locks
+   *
+   * @param string $LockName name on the lock
+   * @return true if lock was acquired
+   */
+  public function get_query_lock($LockName) {
+    return $this->add_value('query_lock_'.$LockName, 1, 3600);
+  }
+
+  /**
+   * Remove lock
+   *
+   * @param string $LockName name on the lock
+   */
+  public function clear_query_lock($LockName) {
+    $this->delete_value('query_lock_'.$LockName);
+  }
+
+  /**
+   * Get cache server status
+   *
+   * @return array (host => bool status, ...)
+   */
+  public function server_status() {
+    $Status = array();
+    foreach ($this->Servers as $Server) {
+      $Status["$Server[host]:$Server[port]"] = $this->getServerStatus($Server['host'], $Server['port']);
+    }
+    return $Status;
+  }
 }

classes/calendar.class.php

@@ -1,140 +1,140 @@
 <?
 class Calendar {
-	public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task");
-	public static $Importances = array(1 => "Critical", "Important", "Average", "Meh");
-	public static $Colors = array(
-									"Critical" => "red",
-									"Important" => "yellow",
-									"Average" => "green",
-									"Meh" => "blue");
+  public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task");
+  public static $Importances = array(1 => "Critical", "Important", "Average", "Meh");
+  public static $Colors = array(
+                  "Critical" => "red",
+                  "Important" => "yellow",
+                  "Average" => "green",
+                  "Meh" => "blue");
 
-	public static $Teams = array(
-									0 => "Everyone",
-									1 => "Staff"
-									
-									);
+  public static $Teams = array(
+                  0 => "Everyone",
+                  1 => "Staff"
 
-	public static function can_view() {
-		return check_perms('users_mod')
-			
-			;
-	}
+                  );
 
-	private static function get_teams_query() {
-		$Teams = array(0);
-		$IsMod = check_perms("users_mod");
-		if ($IsMod) {
-			$Teams[] = 1;
-		}
-		
-		return "Team IN (" . implode(",", $Teams) . ") ";
-	}
+  public static function can_view() {
+    return check_perms('users_mod')
 
-	public static function get_events($Month, $Year) {
-		if (empty($Month) || empty($Year)) {
-			$Date = getdate();
-			$Month = $Date['mon'];
-			$Year = $Date['year'];
-		}
-		$Month = (int)$Month;
-		$Year = (int)$Year;
+      ;
+  }
 
-		$TeamsSQL = self::get_teams_query();
+  private static function get_teams_query() {
+    $Teams = array(0);
+    $IsMod = check_perms("users_mod");
+    if ($IsMod) {
+      $Teams[] = 1;
+    }
 
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-						SELECT
-							ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay
-						FROM calendar
-						WHERE
-							MONTH(StartDate) = '$Month'
-						AND
-							YEAR(StartDate) = '$Year'
-						AND
-							$TeamsSQL");
-		$Events = G::$DB->to_array();
-		G::$DB->set_query_id($QueryID);
-		return $Events;
-	}
+    return "Team IN (" . implode(",", $Teams) . ") ";
+  }
 
-	public static function get_event($ID) {
-		$ID = (int)$ID;
-		if (empty($ID)) {
-			error("Invalid ID");
-		}
-		$TeamsSQL = self::get_teams_query();
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-						SELECT
-							ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate
-						FROM calendar
-						WHERE
-							ID = '$ID'
-						AND
-							$TeamsSQL");
-		$Event = G::$DB->next_record(MYSQLI_ASSOC);
-		G::$DB->set_query_id($QueryID);
-		return $Event;
-	}
+  public static function get_events($Month, $Year) {
+    if (empty($Month) || empty($Year)) {
+      $Date = getdate();
+      $Month = $Date['mon'];
+      $Year = $Date['year'];
+    }
+    $Month = (int)$Month;
+    $Year = (int)$Year;
 
-	public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null) {
-		if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance)  || !is_number($Team) || empty($StartDate)) {
-			error("Error adding event");
-		}
-		$Title = db_string($Title);
-		$Body = db_string($Body);
-		$Category = (int)$Category;
-		$Importance = (int)$Importance;
-		$UserID = (int)$UserID;
-		$Team = (int)$Team;
-		$StartDate = db_string($StartDate);
-		$EndDate = db_string($EndDate);
+    $TeamsSQL = self::get_teams_query();
 
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-						INSERT INTO calendar
-							(Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy)
-						VALUES
-							('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')");
-		G::$DB->set_query_id($QueryID);
-		send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate.");
-	}
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+            SELECT
+              ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay
+            FROM calendar
+            WHERE
+              MONTH(StartDate) = '$Month'
+            AND
+              YEAR(StartDate) = '$Year'
+            AND
+              $TeamsSQL");
+    $Events = G::$DB->to_array();
+    G::$DB->set_query_id($QueryID);
+    return $Events;
+  }
 
-	public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null) {
-		if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) {
-			error("Error updating event");
-		}
-		$ID = (int)$ID;
-		$Title = db_string($Title);
-		$Body = db_string($Body);
-		$Category = (int)$Category;
-		$Importance = (int)$Importance;
-		$Team = (int)$Team;
-		$StartDate = db_string($StartDate);
-		$EndDate = db_string($EndDate);
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-						UPDATE calendar
-						SET
-							Title = '$Title',
-							Body = '$Body',
-							Category = '$Category',
-							Importance = '$Importance',
-							Team = '$Team',
-							StartDate = '$StartDate',
-							EndDate = '$EndDate'
-						WHERE
-							ID = '$ID'");
-		G::$DB->set_query_id($QueryID);
-	}
+  public static function get_event($ID) {
+    $ID = (int)$ID;
+    if (empty($ID)) {
+      error("Invalid ID");
+    }
+    $TeamsSQL = self::get_teams_query();
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+            SELECT
+              ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate
+            FROM calendar
+            WHERE
+              ID = '$ID'
+            AND
+              $TeamsSQL");
+    $Event = G::$DB->next_record(MYSQLI_ASSOC);
+    G::$DB->set_query_id($QueryID);
+    return $Event;
+  }
 
-	public static function remove_event($ID) {
-		$ID = (int)$ID;
-		if (!empty($ID)) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'");
-			G::$DB->set_query_id($QueryID);
-		}
-	}
+  public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null) {
+    if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance)  || !is_number($Team) || empty($StartDate)) {
+      error("Error adding event");
+    }
+    $Title = db_string($Title);
+    $Body = db_string($Body);
+    $Category = (int)$Category;
+    $Importance = (int)$Importance;
+    $UserID = (int)$UserID;
+    $Team = (int)$Team;
+    $StartDate = db_string($StartDate);
+    $EndDate = db_string($EndDate);
+
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+            INSERT INTO calendar
+              (Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy)
+            VALUES
+              ('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')");
+    G::$DB->set_query_id($QueryID);
+    send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate.");
+  }
+
+  public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null) {
+    if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) {
+      error("Error updating event");
+    }
+    $ID = (int)$ID;
+    $Title = db_string($Title);
+    $Body = db_string($Body);
+    $Category = (int)$Category;
+    $Importance = (int)$Importance;
+    $Team = (int)$Team;
+    $StartDate = db_string($StartDate);
+    $EndDate = db_string($EndDate);
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+            UPDATE calendar
+            SET
+              Title = '$Title',
+              Body = '$Body',
+              Category = '$Category',
+              Importance = '$Importance',
+              Team = '$Team',
+              StartDate = '$StartDate',
+              EndDate = '$EndDate'
+            WHERE
+              ID = '$ID'");
+    G::$DB->set_query_id($QueryID);
+  }
+
+  public static function remove_event($ID) {
+    $ID = (int)$ID;
+    if (!empty($ID)) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'");
+      G::$DB->set_query_id($QueryID);
+    }
+  }
 
 }

classes/calendarview.class.php

@@ -1,119 +1,119 @@
 <?
 
 class CalendarView {
-	private static $Days = array('S', 'M', 'T', 'W', 'T', 'F', 'S');
-	private static $Headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
-	private static $Events;
+  private static $Days = array('S', 'M', 'T', 'W', 'T', 'F', 'S');
+  private static $Headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+  private static $Events;
 
-	public static function render_title($Month, $Year) {
+  public static function render_title($Month, $Year) {
     if (!is_numeric($Month) || !is_numeric($Year)) {
       error(404);
     }
-		$NextMonth = $Month % 12 == 0 ? 1 : $Month + 1;
-		$PreviousMonth = $Month == 1 ? 12 : $Month - 1;
-		$NextYear = $Year;
-		if ($NextMonth == 1) {
-			$NextYear++;
-		}
-		$PreviousYear = $Year;
-		if ($PreviousMonth == 12) {
-			$PreviousYear--;
-		}
+    $NextMonth = $Month % 12 == 0 ? 1 : $Month + 1;
+    $PreviousMonth = $Month == 1 ? 12 : $Month - 1;
+    $NextYear = $Year;
+    if ($NextMonth == 1) {
+      $NextYear++;
+    }
+    $PreviousYear = $Year;
+    if ($PreviousMonth == 12) {
+      $PreviousYear--;
+    }
 ?>
-		<h1 class="center">
-			<a href="tools.php?action=calendar&amp;month=<?=$PreviousMonth?>&amp;year=<?=$PreviousYear?>">&lt;</a>
-			<?=date("F", mktime(0, 0, 0, $Month, 10)) . " $Year"?>
-			<a href="tools.php?action=calendar&amp;month=<?=$NextMonth?>&amp;year=<?=$NextYear?>">&gt;</a>
-		</h1>
-		<input type="hidden" id="month" value="<?=$Month?>" />
-		<input type="hidden" id="year" value="<?=$Year?>" />
+    <h1 class="center">
+      <a href="tools.php?action=calendar&amp;month=<?=$PreviousMonth?>&amp;year=<?=$PreviousYear?>">&lt;</a>
+      <?=date("F", mktime(0, 0, 0, $Month, 10)) . " $Year"?>
+      <a href="tools.php?action=calendar&amp;month=<?=$NextMonth?>&amp;year=<?=$NextYear?>">&gt;</a>
+    </h1>
+    <input type="hidden" id="month" value="<?=$Month?>" />
+    <input type="hidden" id="year" value="<?=$Year?>" />
 <?
-	}
+  }
 
-	private static function get_events_on($Day, $Events) {
-		// Linear search, Lol.
-		$Results = array();
-		foreach ($Events as $Event) {
-			if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) {
-				$Results[] = $Event;
-			}
-		}
-		return $Results;
-	}
+  private static function get_events_on($Day, $Events) {
+    // Linear search, Lol.
+    $Results = array();
+    foreach ($Events as $Event) {
+      if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) {
+        $Results[] = $Event;
+      }
+    }
+    return $Results;
+  }
 
 
-	private static function render_events_day($Day, $Events) {
-		$Events = self::get_events_on($Day, $Events);
-		foreach ($Events as $Event) {
-			$Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]];
-			$Category = Calendar::$Categories[$Event['Category']];
-			$Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']];
+  private static function render_events_day($Day, $Events) {
+    $Events = self::get_events_on($Day, $Events);
+    foreach ($Events as $Event) {
+      $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]];
+      $Category = Calendar::$Categories[$Event['Category']];
+      $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']];
 ?>
-			<p><a href="#" class="event_day tooltip" title="<?=$Tooltip?>" data-gazelle-id="<?=$Event['ID']?>" style="color: <?=$Color?>;"><?=Format::cut_string($Event['Title'], 8, true)?></a></p>
+      <p><a href="#" class="event_day tooltip" title="<?=$Tooltip?>" data-gazelle-id="<?=$Event['ID']?>" style="color: <?=$Color?>;"><?=Format::cut_string($Event['Title'], 8, true)?></a></p>
 <?
-		}
-	}
+    }
+  }
 
-	public static function render_calendar($Month, $Year, $Events) {
-		$RunningDay = date('w', mktime(0, 0, 0, $Month, 1, $Year));
-		$DaysInMonth = date('t', mktime(0 ,0 ,0, $Month, 1, $Year));
-		$DaysThisWeek = 1;
-		$DayCounter = 0;
-		$DatesArray = array();
+  public static function render_calendar($Month, $Year, $Events) {
+    $RunningDay = date('w', mktime(0, 0, 0, $Month, 1, $Year));
+    $DaysInMonth = date('t', mktime(0 ,0 ,0, $Month, 1, $Year));
+    $DaysThisWeek = 1;
+    $DayCounter = 0;
+    $DatesArray = array();
 ?>
 
-		<table class="calendar">
-			<tr>
-<?		foreach (self::$Headings as $Heading) { ?>
-				<td class="calendar-row calendar-heading">
-					<strong><?=$Heading?></strong>
-				</td>
-<?		} ?>
-			</tr>
-			<tr class="calendar-row">
+    <table class="calendar">
+      <tr>
+<?    foreach (self::$Headings as $Heading) { ?>
+        <td class="calendar-row calendar-heading">
+          <strong><?=$Heading?></strong>
+        </td>
+<?    } ?>
+      </tr>
+      <tr class="calendar-row">
 
-<?		for ($x = 0; $x < $RunningDay; $x++) { ?>
-				<td class="calendar-day-np"></td>
+<?    for ($x = 0; $x < $RunningDay; $x++) { ?>
+        <td class="calendar-day-np"></td>
 <?
-			$DaysThisWeek++;
-		}
+      $DaysThisWeek++;
+    }
 
-		for ($i = 1; $i <= $DaysInMonth; $i++) {
+    for ($i = 1; $i <= $DaysInMonth; $i++) {
 ?>
-				<td class="calendar-day">
-					<div class="day-events">
-<?						self::render_events_day($i, $Events); ?>
-					</div>
-					<div class="day-number">
-						<?=$i?>
-					</div>
-				</td>
-<?			if ($RunningDay == 6) { ?>
-			</tr>
-<?				if (($DayCounter + 1) != $DaysInMonth) { ?>
-			<tr class="calendar-row">
+        <td class="calendar-day">
+          <div class="day-events">
+<?            self::render_events_day($i, $Events); ?>
+          </div>
+          <div class="day-number">
+            <?=$i?>
+          </div>
+        </td>
+<?      if ($RunningDay == 6) { ?>
+      </tr>
+<?        if (($DayCounter + 1) != $DaysInMonth) { ?>
+      <tr class="calendar-row">
 <?
-				}
-				$RunningDay = -1;
-				$DaysThisWeek = 0;
-			}
-			$DaysThisWeek++;
-			$RunningDay++;
-			$DayCounter++;
-		}
+        }
+        $RunningDay = -1;
+        $DaysThisWeek = 0;
+      }
+      $DaysThisWeek++;
+      $RunningDay++;
+      $DayCounter++;
+    }
 
-		if ($DaysThisWeek < 8) {
-			for ($x = 1; $x <= (8 - $DaysThisWeek); $x++) {
+    if ($DaysThisWeek < 8) {
+      for ($x = 1; $x <= (8 - $DaysThisWeek); $x++) {
 ?>
-				<td class="calendar-day-np"></td>
+        <td class="calendar-day-np"></td>
 <?
-			}
-		}
+      }
+    }
 ?>
-			</tr>
+      </tr>
 
-		</table>
+    </table>
 <?
-		echo $Calendar;
-	}
+    echo $Calendar;
+  }
 }

classes/charts.class.php

@@ -1,193 +1,193 @@
 <?
 class GOOGLE_CHARTS {
-	protected $URL = 'https://chart.googleapis.com/chart';
-	protected $Labels = array();
-	protected $Data = array();
-	protected $Options = array();
-
-	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;
-	}
-
-	protected function encode($Number) {
-		if ($Number == -1) {
-			return '__';
-		}
-		$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 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 add($Label, $Data) {
-		if ($Label !== false) {
-			$this->Labels[] = $Label;
-		}
-		$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 transparent() {
-		$this->URL .= '&amp;chf=bg,s,FFFFFF00';
-	}
-
-
-	public function url() {
-		return $this->URL;
-	}
+  protected $URL = 'https://chart.googleapis.com/chart';
+  protected $Labels = array();
+  protected $Data = array();
+  protected $Options = array();
+
+  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;
+  }
+
+  protected function encode($Number) {
+    if ($Number == -1) {
+      return '__';
+    }
+    $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 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 add($Label, $Data) {
+    if ($Label !== false) {
+      $this->Labels[] = $Label;
+    }
+    $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 transparent() {
+    $this->URL .= '&amp;chf=bg,s,FFFFFF00';
+  }
+
+
+  public function url() {
+    return $this->URL;
+  }
 }
 
 class AREA_GRAPH extends GOOGLE_CHARTS {
-	public function __construct ($Width, $Height, $Options = array()) {
-		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 generate() {
-		$Max = max($this->Data);
-		$Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-		$Data = array();
-		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);
-	}
+  public function __construct ($Width, $Height, $Options = array()) {
+    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 generate() {
+    $Max = max($this->Data);
+    $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
+    $Data = array();
+    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);
+  }
 }
 
 class PIE_CHART extends GOOGLE_CHARTS {
-	public function __construct ($Width, $Height, $Options = array()) {
-		$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 = array();
-		$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);
-	}
+  public function __construct ($Width, $Height, $Options = array()) {
+    $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 = array();
+    $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 = array()) {
-		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 generate() {
-		$Max = max($this->Data);
-		$Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-		$Data = array();
-		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);
-	}
+  //TODO: Finish.
+  public function __construct ($Base, $Width, $Height, $Options = array()) {
+    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 generate() {
+    $Max = max($this->Data);
+    $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
+    $Data = array();
+    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);
+  }
 }
 
 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 = array();
-		$Labels = array();
-		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);
-	}
+  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 = array();
+    $Labels = array();
+    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/classloader.php

@@ -5,31 +5,31 @@
  * @param string $ClassName class name
  */
 spl_autoload_register(function ($ClassName) {
-	$FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
-	if (!file_exists($FilePath)) {
-		// TODO: Rename the following classes to conform with the code guidelines
-		switch ($ClassName) {
-			case 'MASS_USER_BOOKMARKS_EDITOR':
-				$FileName = 'mass_user_bookmarks_editor.class';
-				break;
-			case 'MASS_USER_TORRENTS_EDITOR':
-				$FileName = 'mass_user_torrents_editor.class';
-				break;
-			case 'MASS_USER_TORRENTS_TABLE_VIEW':
-				$FileName = 'mass_user_torrents_table_view.class';
-			    break;
-			case 'TEXTAREA_PREVIEW':
-				$FileName = 'textarea_preview.class';
-				break;
-			case 'TORRENT':
-			case 'BENCODE_DICT':
-			case 'BENCODE_LIST':
-				$FileName = 'torrent.class';
-				break;
-			default:
-				die("Couldn't import class $ClassName");
-		}
-		$FilePath = SERVER_ROOT . "/classes/$FileName.php";
-	}
-	require_once($FilePath);
+  $FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
+  if (!file_exists($FilePath)) {
+    // TODO: Rename the following classes to conform with the code guidelines
+    switch ($ClassName) {
+      case 'MASS_USER_BOOKMARKS_EDITOR':
+        $FileName = 'mass_user_bookmarks_editor.class';
+        break;
+      case 'MASS_USER_TORRENTS_EDITOR':
+        $FileName = 'mass_user_torrents_editor.class';
+        break;
+      case 'MASS_USER_TORRENTS_TABLE_VIEW':
+        $FileName = 'mass_user_torrents_table_view.class';
+          break;
+      case 'TEXTAREA_PREVIEW':
+        $FileName = 'textarea_preview.class';
+        break;
+      case 'TORRENT':
+      case 'BENCODE_DICT':
+      case 'BENCODE_LIST':
+        $FileName = 'torrent.class';
+        break;
+      default:
+        die("Couldn't import class $ClassName");
+    }
+    $FilePath = SERVER_ROOT . "/classes/$FileName.php";
+  }
+  require_once($FilePath);
 });

classes/collages.class.php

@@ -1,48 +1,48 @@
 <?
 class Collages {
-	public static function increase_subscriptions($CollageID) {
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			UPDATE collages
-			SET Subscribers = Subscribers + 1
-			WHERE ID = '$CollageID'");
-		G::$DB->set_query_id($QueryID);
-	}
+  public static function increase_subscriptions($CollageID) {
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      UPDATE collages
+      SET Subscribers = Subscribers + 1
+      WHERE ID = '$CollageID'");
+    G::$DB->set_query_id($QueryID);
+  }
 
-	public static function decrease_subscriptions($CollageID) {
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			UPDATE collages
-			SET Subscribers = IF(Subscribers < 1, 0, Subscribers - 1)
-			WHERE ID = '$CollageID'");
-		G::$DB->set_query_id($QueryID);
-	}
+  public static function decrease_subscriptions($CollageID) {
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      UPDATE collages
+      SET Subscribers = IF(Subscribers < 1, 0, Subscribers - 1)
+      WHERE ID = '$CollageID'");
+    G::$DB->set_query_id($QueryID);
+  }
 
-	public static function create_personal_collage() {
-		G::$DB->query("
-			SELECT
-				COUNT(ID)
-			FROM collages
-			WHERE UserID = '" . G::$LoggedUser['ID'] . "'
-				AND CategoryID = '0'
-				AND Deleted = '0'");
-		list($CollageCount) = G::$DB->next_record();
+  public static function create_personal_collage() {
+    G::$DB->query("
+      SELECT
+        COUNT(ID)
+      FROM collages
+      WHERE UserID = '" . G::$LoggedUser['ID'] . "'
+        AND CategoryID = '0'
+        AND Deleted = '0'");
+    list($CollageCount) = G::$DB->next_record();
 
-		if ($CollageCount >= G::$LoggedUser['Permissions']['MaxCollages']) {
-			// TODO: fix this, the query was for COUNT(ID), so I highly doubt that this works... - Y
-			list($CollageID) = G::$DB->next_record();
-			header('Location: collage.php?id='.$CollageID);
-			die();
-		}
-		$NameStr = db_string(G::$LoggedUser['Username'] . "'s personal collage" . ($CollageCount > 0 ? ' no. ' . ($CollageCount + 1) : ''));
-		$Description = db_string('Personal collage for ' . G::$LoggedUser['Username'] . '. The first 5 albums will appear on his or her [url=' . site_url() . 'user.php?id= ' . G::$LoggedUser['ID'] . ']profile[/url].');
-		G::$DB->query("
-			INSERT INTO collages
-				(Name, Description, CategoryID, UserID)
-			VALUES
-				('$NameStr', '$Description', '0', " . G::$LoggedUser['ID'] . ")");
-		$CollageID = G::$DB->inserted_id();
-		header('Location: collage.php?id='.$CollageID);
-		die();
-	}
+    if ($CollageCount >= G::$LoggedUser['Permissions']['MaxCollages']) {
+      // TODO: fix this, the query was for COUNT(ID), so I highly doubt that this works... - Y
+      list($CollageID) = G::$DB->next_record();
+      header('Location: collage.php?id='.$CollageID);
+      die();
+    }
+    $NameStr = db_string(G::$LoggedUser['Username'] . "'s personal collage" . ($CollageCount > 0 ? ' no. ' . ($CollageCount + 1) : ''));
+    $Description = db_string('Personal collage for ' . G::$LoggedUser['Username'] . '. The first 5 albums will appear on his or her [url=' . site_url() . 'user.php?id= ' . G::$LoggedUser['ID'] . ']profile[/url].');
+    G::$DB->query("
+      INSERT INTO collages
+        (Name, Description, CategoryID, UserID)
+      VALUES
+        ('$NameStr', '$Description', '0', " . G::$LoggedUser['ID'] . ")");
+    $CollageID = G::$DB->inserted_id();
+    header('Location: collage.php?id='.$CollageID);
+    die();
+  }
 }

classes/comments.class.php

@@ -1,441 +1,441 @@
 <?
 class Comments {
-	/*
-	 * For all functions:
-	 * $Page = 'artist', 'collages', 'requests' or 'torrents'
-	 * $PageID = ArtistID, CollageID, RequestID or GroupID, respectively
-	 */
-
-	/**
-	 * Post a comment on an artist, request or torrent page.
-	 * @param string $Page
-	 * @param int $PageID
-	 * @param string $Body
-	 * @return int ID of the new comment
-	 */
-	public static function post($Page, $PageID, $Body) {
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT
-				CEIL(
-					(
-						SELECT COUNT(ID) + 1
-						FROM comments
-						WHERE Page = '$Page'
-							AND PageID = $PageID
-					) / " . TORRENT_COMMENTS_PER_PAGE . "
-				) AS Pages");
-		list($Pages) = G::$DB->next_record();
-
-		G::$DB->query("
-			INSERT INTO comments (Page, PageID, AuthorID, AddedTime, Body)
-			VALUES ('$Page', $PageID, " . G::$LoggedUser['ID'] . ", '" . sqltime() . "', '" . db_string($Body) . "')");
-		$PostID = G::$DB->inserted_id();
-
-		$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $Pages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-		G::$Cache->delete_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
-		G::$Cache->delete_value($Page.'_comments_'.$PageID);
-
-		Subscriptions::flush_subscriptions($Page, $PageID);
-		Subscriptions::quote_notify($Body, $PostID, $Page, $PageID);
-
-		G::$DB->set_query_id($QueryID);
-
-		return $PostID;
-	}
-
-	/**
-	 * Edit a comment
-	 * @param int $PostID
-	 * @param string $NewBody
-	 * @param bool $SendPM If true, send a PM to the author of the comment informing him about the edit
-	 * @todo move permission check out of here/remove hardcoded error(404)
-	 */
-	public static function edit($PostID, $NewBody, $SendPM = false) {
-		$QueryID = G::$DB->get_query_id();
-
-		G::$DB->query("
-			SELECT
-				Body,
-				AuthorID,
-				Page,
-				PageID,
-				AddedTime
-			FROM comments
-			WHERE ID = $PostID");
-		if (!G::$DB->has_results()) {
-			return false;
-		}
-		list($OldBody, $AuthorID, $Page, $PageID, $AddedTime) = G::$DB->next_record();
-
-		if (G::$LoggedUser['ID'] != $AuthorID && !check_perms('site_moderate_forums')) {
-			return false;
-		}
-
-		G::$DB->query("
-			SELECT CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
-			FROM comments
-			WHERE Page = '$Page'
-				AND PageID = $PageID
-				AND ID <= $PostID");
-		list($CommPage) = G::$DB->next_record();
-
-		// Perform the update
-		G::$DB->query("
-			UPDATE comments
-			SET
-				Body = '" . db_string($NewBody) . "',
-				EditedUserID = " . G::$LoggedUser['ID'] . ",
-				EditedTime = '" . sqltime() . "'
-			WHERE ID = $PostID");
-
-		// Update the cache
-		$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-		G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $CatalogueID);
-
-		if ($Page == 'collages') {
-			// On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
-			G::$Cache->delete_value('collage_' . $PageID);
-		}
-
-		G::$DB->query("
-			INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
-			VALUES ('$Page', $PostID, " . G::$LoggedUser['ID'] . ", '" . sqltime() . "', '" . db_string($OldBody) . "')");
-
-		G::$DB->set_query_id($QueryID);
-
-		if ($SendPM && G::$LoggedUser['ID'] != $AuthorID) {
-			// Send a PM to the user to notify them of the edit
-			$PMSubject = "Your comment #$PostID has been edited";
-			$PMurl = site_url()."comments.php?action=jump&postid=$PostID";
-			$ProfLink = '[url='.site_url().'user.php?id='.G::$LoggedUser['ID'].']'.G::$LoggedUser['Username'].'[/url]';
-			$PMBody = "One of your comments has been edited by $ProfLink: [url]{$PMurl}[/url]";
-			Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
-		}
-
-		return true; // TODO: this should reflect whether or not the update was actually successful, e.g. by checking G::$DB->affected_rows after the UPDATE query
-	}
-
-	/**
-	 * Delete a comment
-	 * @param int $PostID
-	 */
-	public static function delete($PostID) {
-		$QueryID = G::$DB->get_query_id();
-		// Get page, pageid
-		G::$DB->query("SELECT Page, PageID FROM comments WHERE ID = $PostID");
-		if (!G::$DB->has_results()) {
-			// no such comment?
-			G::$DB->set_query_id($QueryID);
-			return false;
-		}
-		list ($Page, $PageID) = G::$DB->next_record();
-		// get number of pages
-		G::$DB->query("
-			SELECT
-				CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages,
-				CEIL(SUM(IF(ID <= $PostID, 1, 0)) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
-			FROM comments
-			WHERE Page = '$Page'
-				AND PageID = $PageID
-			GROUP BY PageID");
-		if (!G::$DB->has_results()) {
-			// the comment $PostID was probably not posted on $Page
-			G::$DB->set_query_id($QueryID);
-			return false;
-		}
-		list($CommPages, $CommPage) = G::$DB->next_record();
-
-		// $CommPages = number of pages in the thread
-		// $CommPage = which page the post is on
-		// These are set for cache clearing.
-
-		G::$DB->query("
-			DELETE FROM comments
-			WHERE ID = $PostID");
-		G::$DB->query("
-			DELETE FROM comments_edits
-			WHERE Page = '$Page'
-				AND PostID = $PostID");
-
-		G::$DB->query("
-			DELETE FROM users_notify_quoted
-			WHERE Page = '$Page'
-				AND PostID = $PostID");
-
-		Subscriptions::flush_subscriptions($Page, $PageID);
-		Subscriptions::flush_quote_notifications($Page, $PageID);
-
-		//We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
-		$ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-		$LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-		for ($i = $ThisCatalogue; $i <= $LastCatalogue; ++$i) {
-			G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
-		}
-
-		G::$Cache->delete_value($Page . '_comments_' . $PageID);
-
-		if ($Page == 'collages') {
-			// On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
-			G::$Cache->delete_value("collage_$PageID");
-		}
-
-		G::$DB->set_query_id($QueryID);
-
-		return true;
-	}
-
-	/**
-	 * Get the URL to a comment, already knowing the Page and PostID
-	 * @param string $Page
-	 * @param int $PageID
-	 * @param int $PostID
-	 * @return string|bool The URL to the comment or false on error
-	 */
-	public static function get_url($Page, $PageID, $PostID = null) {
-		$Post = (!empty($PostID) ? "&postid=$PostID#post$PostID" : '');
-		switch ($Page) {
-			case 'artist':
-				return "artist.php?id=$PageID$Post";
-			case 'collages':
-				return "collages.php?action=comments&collageid=$PageID$Post";
-			case 'requests':
-				return "requests.php?action=view&id=$PageID$Post";
-			case 'torrents':
-				return "torrents.php?id=$PageID$Post";
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Get the URL to a comment
-	 * @param int $PostID
-	 * @return string|bool The URL to the comment or false on error
-	 */
-	public static function get_url_query($PostID) {
-		$QueryID = G::$DB->get_query_id();
-
-		G::$DB->query("
-			SELECT Page, PageID
-			FROM comments
-			WHERE ID = $PostID");
-		if (!G::$DB->has_results()) {
-			error(404);
-		}
-		list($Page, $PageID) = G::$DB->next_record();
-
-		G::$DB->set_query_id($QueryID);
-
-		return self::get_url($Page, $PageID, $PostID);
-	}
-
-	/**
-	 * Load a page's comments. This takes care of `postid` and (indirectly) `page` parameters passed in $_GET.
-	 * Quote notifications and last read are also handled here, unless $HandleSubscriptions = false is passed.
-	 * @param string $Page
-	 * @param int $PageID
-	 * @param bool $HandleSubscriptions Whether or not to handle subscriptions (last read & quote notifications)
-	 * @return array ($NumComments, $Page, $Thread, $LastRead)
-	 *     $NumComments: the total number of comments on this artist/request/torrent group
-	 *     $Page: the page we're currently on
-	 *     $Thread: an array of all posts on this page
-	 *     $LastRead: ID of the last comment read by the current user in this thread;
-	 *                will be false if $HandleSubscriptions == false or if there are no comments on this page
-	 */
-	public static function load($Page, $PageID, $HandleSubscriptions = true) {
-		$QueryID = G::$DB->get_query_id();
-
-		// Get the total number of comments
-		$NumComments = G::$Cache->get_value($Page."_comments_$PageID");
-		if ($NumComments === false) {
-			G::$DB->query("
-				SELECT COUNT(ID)
-				FROM comments
-				WHERE Page = '$Page'
-					AND PageID = $PageID");
-			list($NumComments) = G::$DB->next_record();
-			G::$Cache->cache_value($Page."_comments_$PageID", $NumComments, 0);
-		}
-
-		// If a postid was passed, we need to determine which page that comment is on.
-		// Format::page_limit handles a potential $_GET['page']
-		if (isset($_GET['postid']) && is_number($_GET['postid']) && $NumComments > TORRENT_COMMENTS_PER_PAGE) {
-			G::$DB->query("
-				SELECT COUNT(ID)
-				FROM comments
-				WHERE Page = '$Page'
-					AND PageID = $PageID
-					AND ID <= $_GET[postid]");
-			list($PostNum) = G::$DB->next_record();
-			list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $PostNum);
-		} else {
-			list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $NumComments);
-		}
-
-		// Get the cache catalogue
-		$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-
-		// Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
-		$Catalogue = G::$Cache->get_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
-		if ($Catalogue === false) {
-			$CatalogueLimit = $CatalogueID * THREAD_CATALOGUE . ', ' . THREAD_CATALOGUE;
-			G::$DB->query("
-				SELECT
-					c.ID,
-					c.AuthorID,
-					c.AddedTime,
-					c.Body,
-					c.EditedUserID,
-					c.EditedTime,
-					u.Username
-				FROM comments AS c
-					LEFT JOIN users_main AS u ON u.ID = c.EditedUserID
-				WHERE c.Page = '$Page'
-					AND c.PageID = $PageID
-				ORDER BY c.ID
-				LIMIT $CatalogueLimit");
-			$Catalogue = G::$DB->to_array(false, MYSQLI_ASSOC);
-			G::$Cache->cache_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
-		}
-
-		//This is a hybrid to reduce the catalogue down to the page elements: We use the page limit % catalogue
-		$Thread = array_slice($Catalogue, ((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) % THREAD_CATALOGUE), TORRENT_COMMENTS_PER_PAGE, true);
-
-		if ($HandleSubscriptions && count($Thread) > 0) {
-			// quote notifications
-			$LastPost = end($Thread);
-			$LastPost = $LastPost['ID'];
-			$FirstPost = reset($Thread);
-			$FirstPost = $FirstPost['ID'];
-			G::$DB->query("
-				UPDATE users_notify_quoted
-				SET UnRead = false
-				WHERE UserID = " . G::$LoggedUser['ID'] . "
-					AND Page = '$Page'
-					AND PageID = $PageID
-					AND PostID >= $FirstPost
-					AND PostID <= $LastPost");
-			if (G::$DB->affected_rows()) {
-				G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']);
-			}
-
-			// last read
-			G::$DB->query("
-				SELECT PostID
-				FROM users_comments_last_read
-				WHERE UserID = " . G::$LoggedUser['ID'] . "
-					AND Page = '$Page'
-					AND PageID = $PageID");
-			list($LastRead) = G::$DB->next_record();
-			if ($LastRead < $LastPost) {
-				G::$DB->query("
-					INSERT INTO users_comments_last_read
-						(UserID, Page, PageID, PostID)
-					VALUES
-						(" . G::$LoggedUser['ID'] . ", '$Page', $PageID, $LastPost)
-					ON DUPLICATE KEY UPDATE
-						PostID = $LastPost");
-				G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
-			}
-		} else {
-			$LastRead = false;
-		}
-
-		G::$DB->set_query_id($QueryID);
-
-		return array($NumComments, $CommPage, $Thread, $LastRead);
-	}
-
-	/**
-	 * Merges all comments from $Page/$PageID into $Page/$TargetPageID. This also takes care of quote notifications, subscriptions and cache.
-	 * @param type $Page
-	 * @param type $PageID
-	 * @param type $TargetPageID
-	 */
-	public static function merge($Page, $PageID, $TargetPageID) {
-		$QueryID = G::$DB->get_query_id();
-
-		G::$DB->query("
-			UPDATE comments
-			SET PageID = $TargetPageID
-			WHERE Page = '$Page'
-				AND PageID = $PageID");
-
-		// quote notifications
-		G::$DB->query("
-			UPDATE users_notify_quoted
-			SET PageID = $TargetPageID
-			WHERE Page = '$Page'
-				AND PageID = $PageID");
-
-		// comment subscriptions
-		Subscriptions::move_subscriptions($Page, $PageID, $TargetPageID);
-
-		// cache (we need to clear all comment catalogues)
-		G::$DB->query("
-			SELECT
-				CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
-			FROM comments
-			WHERE Page = '$Page'
-				AND PageID = $TargetPageID
-			GROUP BY PageID");
-		list($CommPages) = G::$DB->next_record();
-		$LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-		for ($i = 0; $i <= $LastCatalogue; ++$i) {
-			G::$Cache->delete_value($Page . "_comments_$TargetPageID" . "_catalogue_$i");
-		}
-		G::$Cache->delete_value($Page."_comments_$TargetPageID");
-		G::$DB->set_query_id($QueryID);
-	}
-
-	/**
-	 * Delete all comments on $Page/$PageID (deals with quote notifications and subscriptions as well)
-	 * @param string $Page
-	 * @param int $PageID
-	 * @return boolean
-	 */
-	public static function delete_page($Page, $PageID) {
-		$QueryID = G::$DB->get_query_id();
-
-		// get number of pages
-		G::$DB->query("
-			SELECT
-				CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
-			FROM comments
-			WHERE Page = '$Page'
-				AND PageID = $PageID
-			GROUP BY PageID");
-		if (!G::$DB->has_results()) {
-			return false;
-		}
-		list($CommPages) = G::$DB->next_record();
-
-		// Delete comments
-		G::$DB->query("
-			DELETE FROM comments
-			WHERE Page = '$Page'
-				AND PageID = $PageID");
-
-		// Delete quote notifications
-		Subscriptions::flush_quote_notifications($Page, $PageID);
-		G::$DB->query("
-			DELETE FROM users_notify_quoted
-			WHERE Page = '$Page'
-				AND PageID = $PageID");
-
-		// Deal with subscriptions
-		Subscriptions::move_subscriptions($Page, $PageID, null);
-
-		// Clear cache
-		$LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
-		for ($i = 0; $i <= $LastCatalogue; ++$i) {
-			G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
-		}
-		G::$Cache->delete_value($Page.'_comments_'.$PageID);
-
-		G::$DB->set_query_id($QueryID);
-
-		return true;
-	}
+  /*
+   * For all functions:
+   * $Page = 'artist', 'collages', 'requests' or 'torrents'
+   * $PageID = ArtistID, CollageID, RequestID or GroupID, respectively
+   */
+
+  /**
+   * Post a comment on an artist, request or torrent page.
+   * @param string $Page
+   * @param int $PageID
+   * @param string $Body
+   * @return int ID of the new comment
+   */
+  public static function post($Page, $PageID, $Body) {
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT
+        CEIL(
+          (
+            SELECT COUNT(ID) + 1
+            FROM comments
+            WHERE Page = '$Page'
+              AND PageID = $PageID
+          ) / " . TORRENT_COMMENTS_PER_PAGE . "
+        ) AS Pages");
+    list($Pages) = G::$DB->next_record();
+
+    G::$DB->query("
+      INSERT INTO comments (Page, PageID, AuthorID, AddedTime, Body)
+      VALUES ('$Page', $PageID, " . G::$LoggedUser['ID'] . ", '" . sqltime() . "', '" . db_string($Body) . "')");
+    $PostID = G::$DB->inserted_id();
+
+    $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $Pages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+    G::$Cache->delete_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
+    G::$Cache->delete_value($Page.'_comments_'.$PageID);
+
+    Subscriptions::flush_subscriptions($Page, $PageID);
+    Subscriptions::quote_notify($Body, $PostID, $Page, $PageID);
+
+    G::$DB->set_query_id($QueryID);
+
+    return $PostID;
+  }
+
+  /**
+   * Edit a comment
+   * @param int $PostID
+   * @param string $NewBody
+   * @param bool $SendPM If true, send a PM to the author of the comment informing him about the edit
+   * @todo move permission check out of here/remove hardcoded error(404)
+   */
+  public static function edit($PostID, $NewBody, $SendPM = false) {
+    $QueryID = G::$DB->get_query_id();
+
+    G::$DB->query("
+      SELECT
+        Body,
+        AuthorID,
+        Page,
+        PageID,
+        AddedTime
+      FROM comments
+      WHERE ID = $PostID");
+    if (!G::$DB->has_results()) {
+      return false;
+    }
+    list($OldBody, $AuthorID, $Page, $PageID, $AddedTime) = G::$DB->next_record();
+
+    if (G::$LoggedUser['ID'] != $AuthorID && !check_perms('site_moderate_forums')) {
+      return false;
+    }
+
+    G::$DB->query("
+      SELECT CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
+      FROM comments
+      WHERE Page = '$Page'
+        AND PageID = $PageID
+        AND ID <= $PostID");
+    list($CommPage) = G::$DB->next_record();
+
+    // Perform the update
+    G::$DB->query("
+      UPDATE comments
+      SET
+        Body = '" . db_string($NewBody) . "',
+        EditedUserID = " . G::$LoggedUser['ID'] . ",
+        EditedTime = '" . sqltime() . "'
+      WHERE ID = $PostID");
+
+    // Update the cache
+    $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+    G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $CatalogueID);
+
+    if ($Page == 'collages') {
+      // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
+      G::$Cache->delete_value('collage_' . $PageID);
+    }
+
+    G::$DB->query("
+      INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
+      VALUES ('$Page', $PostID, " . G::$LoggedUser['ID'] . ", '" . sqltime() . "', '" . db_string($OldBody) . "')");
+
+    G::$DB->set_query_id($QueryID);
+
+    if ($SendPM && G::$LoggedUser['ID'] != $AuthorID) {
+      // Send a PM to the user to notify them of the edit
+      $PMSubject = "Your comment #$PostID has been edited";
+      $PMurl = site_url()."comments.php?action=jump&postid=$PostID";
+      $ProfLink = '[url='.site_url().'user.php?id='.G::$LoggedUser['ID'].']'.G::$LoggedUser['Username'].'[/url]';
+      $PMBody = "One of your comments has been edited by $ProfLink: [url]{$PMurl}[/url]";
+      Misc::send_pm($AuthorID, 0, $PMSubject, $PMBody);
+    }
+
+    return true; // TODO: this should reflect whether or not the update was actually successful, e.g. by checking G::$DB->affected_rows after the UPDATE query
+  }
+
+  /**
+   * Delete a comment
+   * @param int $PostID
+   */
+  public static function delete($PostID) {
+    $QueryID = G::$DB->get_query_id();
+    // Get page, pageid
+    G::$DB->query("SELECT Page, PageID FROM comments WHERE ID = $PostID");
+    if (!G::$DB->has_results()) {
+      // no such comment?
+      G::$DB->set_query_id($QueryID);
+      return false;
+    }
+    list ($Page, $PageID) = G::$DB->next_record();
+    // get number of pages
+    G::$DB->query("
+      SELECT
+        CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages,
+        CEIL(SUM(IF(ID <= $PostID, 1, 0)) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Page
+      FROM comments
+      WHERE Page = '$Page'
+        AND PageID = $PageID
+      GROUP BY PageID");
+    if (!G::$DB->has_results()) {
+      // the comment $PostID was probably not posted on $Page
+      G::$DB->set_query_id($QueryID);
+      return false;
+    }
+    list($CommPages, $CommPage) = G::$DB->next_record();
+
+    // $CommPages = number of pages in the thread
+    // $CommPage = which page the post is on
+    // These are set for cache clearing.
+
+    G::$DB->query("
+      DELETE FROM comments
+      WHERE ID = $PostID");
+    G::$DB->query("
+      DELETE FROM comments_edits
+      WHERE Page = '$Page'
+        AND PostID = $PostID");
+
+    G::$DB->query("
+      DELETE FROM users_notify_quoted
+      WHERE Page = '$Page'
+        AND PostID = $PostID");
+
+    Subscriptions::flush_subscriptions($Page, $PageID);
+    Subscriptions::flush_quote_notifications($Page, $PageID);
+
+    //We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
+    $ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+    $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+    for ($i = $ThisCatalogue; $i <= $LastCatalogue; ++$i) {
+      G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
+    }
+
+    G::$Cache->delete_value($Page . '_comments_' . $PageID);
+
+    if ($Page == 'collages') {
+      // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
+      G::$Cache->delete_value("collage_$PageID");
+    }
+
+    G::$DB->set_query_id($QueryID);
+
+    return true;
+  }
+
+  /**
+   * Get the URL to a comment, already knowing the Page and PostID
+   * @param string $Page
+   * @param int $PageID
+   * @param int $PostID
+   * @return string|bool The URL to the comment or false on error
+   */
+  public static function get_url($Page, $PageID, $PostID = null) {
+    $Post = (!empty($PostID) ? "&postid=$PostID#post$PostID" : '');
+    switch ($Page) {
+      case 'artist':
+        return "artist.php?id=$PageID$Post";
+      case 'collages':
+        return "collages.php?action=comments&collageid=$PageID$Post";
+      case 'requests':
+        return "requests.php?action=view&id=$PageID$Post";
+      case 'torrents':
+        return "torrents.php?id=$PageID$Post";
+      default:
+        return false;
+    }
+  }
+
+  /**
+   * Get the URL to a comment
+   * @param int $PostID
+   * @return string|bool The URL to the comment or false on error
+   */
+  public static function get_url_query($PostID) {
+    $QueryID = G::$DB->get_query_id();
+
+    G::$DB->query("
+      SELECT Page, PageID
+      FROM comments
+      WHERE ID = $PostID");
+    if (!G::$DB->has_results()) {
+      error(404);
+    }
+    list($Page, $PageID) = G::$DB->next_record();
+
+    G::$DB->set_query_id($QueryID);
+
+    return self::get_url($Page, $PageID, $PostID);
+  }
+
+  /**
+   * Load a page's comments. This takes care of `postid` and (indirectly) `page` parameters passed in $_GET.
+   * Quote notifications and last read are also handled here, unless $HandleSubscriptions = false is passed.
+   * @param string $Page
+   * @param int $PageID
+   * @param bool $HandleSubscriptions Whether or not to handle subscriptions (last read & quote notifications)
+   * @return array ($NumComments, $Page, $Thread, $LastRead)
+   *     $NumComments: the total number of comments on this artist/request/torrent group
+   *     $Page: the page we're currently on
+   *     $Thread: an array of all posts on this page
+   *     $LastRead: ID of the last comment read by the current user in this thread;
+   *                will be false if $HandleSubscriptions == false or if there are no comments on this page
+   */
+  public static function load($Page, $PageID, $HandleSubscriptions = true) {
+    $QueryID = G::$DB->get_query_id();
+
+    // Get the total number of comments
+    $NumComments = G::$Cache->get_value($Page."_comments_$PageID");
+    if ($NumComments === false) {
+      G::$DB->query("
+        SELECT COUNT(ID)
+        FROM comments
+        WHERE Page = '$Page'
+          AND PageID = $PageID");
+      list($NumComments) = G::$DB->next_record();
+      G::$Cache->cache_value($Page."_comments_$PageID", $NumComments, 0);
+    }
+
+    // If a postid was passed, we need to determine which page that comment is on.
+    // Format::page_limit handles a potential $_GET['page']
+    if (isset($_GET['postid']) && is_number($_GET['postid']) && $NumComments > TORRENT_COMMENTS_PER_PAGE) {
+      G::$DB->query("
+        SELECT COUNT(ID)
+        FROM comments
+        WHERE Page = '$Page'
+          AND PageID = $PageID
+          AND ID <= $_GET[postid]");
+      list($PostNum) = G::$DB->next_record();
+      list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $PostNum);
+    } else {
+      list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $NumComments);
+    }
+
+    // Get the cache catalogue
+    $CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+
+    // Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
+    $Catalogue = G::$Cache->get_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID);
+    if ($Catalogue === false) {
+      $CatalogueLimit = $CatalogueID * THREAD_CATALOGUE . ', ' . THREAD_CATALOGUE;
+      G::$DB->query("
+        SELECT
+          c.ID,
+          c.AuthorID,
+          c.AddedTime,
+          c.Body,
+          c.EditedUserID,
+          c.EditedTime,
+          u.Username
+        FROM comments AS c
+          LEFT JOIN users_main AS u ON u.ID = c.EditedUserID
+        WHERE c.Page = '$Page'
+          AND c.PageID = $PageID
+        ORDER BY c.ID
+        LIMIT $CatalogueLimit");
+      $Catalogue = G::$DB->to_array(false, MYSQLI_ASSOC);
+      G::$Cache->cache_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
+    }
+
+    //This is a hybrid to reduce the catalogue down to the page elements: We use the page limit % catalogue
+    $Thread = array_slice($Catalogue, ((TORRENT_COMMENTS_PER_PAGE * $CommPage - TORRENT_COMMENTS_PER_PAGE) % THREAD_CATALOGUE), TORRENT_COMMENTS_PER_PAGE, true);
+
+    if ($HandleSubscriptions && count($Thread) > 0) {
+      // quote notifications
+      $LastPost = end($Thread);
+      $LastPost = $LastPost['ID'];
+      $FirstPost = reset($Thread);
+      $FirstPost = $FirstPost['ID'];
+      G::$DB->query("
+        UPDATE users_notify_quoted
+        SET UnRead = false
+        WHERE UserID = " . G::$LoggedUser['ID'] . "
+          AND Page = '$Page'
+          AND PageID = $PageID
+          AND PostID >= $FirstPost
+          AND PostID <= $LastPost");
+      if (G::$DB->affected_rows()) {
+        G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']);
+      }
+
+      // last read
+      G::$DB->query("
+        SELECT PostID
+        FROM users_comments_last_read
+        WHERE UserID = " . G::$LoggedUser['ID'] . "
+          AND Page = '$Page'
+          AND PageID = $PageID");
+      list($LastRead) = G::$DB->next_record();
+      if ($LastRead < $LastPost) {
+        G::$DB->query("
+          INSERT INTO users_comments_last_read
+            (UserID, Page, PageID, PostID)
+          VALUES
+            (" . G::$LoggedUser['ID'] . ", '$Page', $PageID, $LastPost)
+          ON DUPLICATE KEY UPDATE
+            PostID = $LastPost");
+        G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
+      }
+    } else {
+      $LastRead = false;
+    }
+
+    G::$DB->set_query_id($QueryID);
+
+    return array($NumComments, $CommPage, $Thread, $LastRead);
+  }
+
+  /**
+   * Merges all comments from $Page/$PageID into $Page/$TargetPageID. This also takes care of quote notifications, subscriptions and cache.
+   * @param type $Page
+   * @param type $PageID
+   * @param type $TargetPageID
+   */
+  public static function merge($Page, $PageID, $TargetPageID) {
+    $QueryID = G::$DB->get_query_id();
+
+    G::$DB->query("
+      UPDATE comments
+      SET PageID = $TargetPageID
+      WHERE Page = '$Page'
+        AND PageID = $PageID");
+
+    // quote notifications
+    G::$DB->query("
+      UPDATE users_notify_quoted
+      SET PageID = $TargetPageID
+      WHERE Page = '$Page'
+        AND PageID = $PageID");
+
+    // comment subscriptions
+    Subscriptions::move_subscriptions($Page, $PageID, $TargetPageID);
+
+    // cache (we need to clear all comment catalogues)
+    G::$DB->query("
+      SELECT
+        CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
+      FROM comments
+      WHERE Page = '$Page'
+        AND PageID = $TargetPageID
+      GROUP BY PageID");
+    list($CommPages) = G::$DB->next_record();
+    $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+    for ($i = 0; $i <= $LastCatalogue; ++$i) {
+      G::$Cache->delete_value($Page . "_comments_$TargetPageID" . "_catalogue_$i");
+    }
+    G::$Cache->delete_value($Page."_comments_$TargetPageID");
+    G::$DB->set_query_id($QueryID);
+  }
+
+  /**
+   * Delete all comments on $Page/$PageID (deals with quote notifications and subscriptions as well)
+   * @param string $Page
+   * @param int $PageID
+   * @return boolean
+   */
+  public static function delete_page($Page, $PageID) {
+    $QueryID = G::$DB->get_query_id();
+
+    // get number of pages
+    G::$DB->query("
+      SELECT
+        CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages
+      FROM comments
+      WHERE Page = '$Page'
+        AND PageID = $PageID
+      GROUP BY PageID");
+    if (!G::$DB->has_results()) {
+      return false;
+    }
+    list($CommPages) = G::$DB->next_record();
+
+    // Delete comments
+    G::$DB->query("
+      DELETE FROM comments
+      WHERE Page = '$Page'
+        AND PageID = $PageID");
+
+    // Delete quote notifications
+    Subscriptions::flush_quote_notifications($Page, $PageID);
+    G::$DB->query("
+      DELETE FROM users_notify_quoted
+      WHERE Page = '$Page'
+        AND PageID = $PageID");
+
+    // Deal with subscriptions
+    Subscriptions::move_subscriptions($Page, $PageID, null);
+
+    // Clear cache
+    $LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE * $CommPages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
+    for ($i = 0; $i <= $LastCatalogue; ++$i) {
+      G::$Cache->delete_value($Page . '_comments_' . $PageID . '_catalogue_' . $i);
+    }
+    G::$Cache->delete_value($Page.'_comments_'.$PageID);
+
+    G::$DB->set_query_id($QueryID);
+
+    return true;
+  }
 }

classes/commentsview.class.php

@@ -1,95 +1,95 @@
 <?
 class CommentsView {
-	/**
-	 * Render a thread of comments
-	 * @param array $Thread An array as returned by Comments::load
-	 * @param int $LastRead PostID of the last read post
-	 * @param string $Baselink Link to the site these comments are on
-	 */
-	public static function render_comments($Thread, $LastRead, $Baselink) {
-		foreach ($Thread as $Post) {
-			list($PostID, $AuthorID, $AddedTime, $CommentBody, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-			self::render_comment($AuthorID, $PostID, $CommentBody, $AddedTime, $EditedUserID, $EditedTime, $Baselink . "&amp;postid=$PostID#post$PostID", ($PostID > $LastRead));
-		}
-	}
+  /**
+   * Render a thread of comments
+   * @param array $Thread An array as returned by Comments::load
+   * @param int $LastRead PostID of the last read post
+   * @param string $Baselink Link to the site these comments are on
+   */
+  public static function render_comments($Thread, $LastRead, $Baselink) {
+    foreach ($Thread as $Post) {
+      list($PostID, $AuthorID, $AddedTime, $CommentBody, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
+      self::render_comment($AuthorID, $PostID, $CommentBody, $AddedTime, $EditedUserID, $EditedTime, $Baselink . "&amp;postid=$PostID#post$PostID", ($PostID > $LastRead));
+    }
+  }
 
-	/**
-	 * Render one comment
-	 * @param int $AuthorID
-	 * @param int $PostID
-	 * @param string $Body
-	 * @param string $AddedTime
-	 * @param int $EditedUserID
-	 * @param string $EditedTime
-	 * @param string $Link The link to the post elsewhere on the site
-	 * @param string $Header The header used in the post
-	 * @param bool $Tools Whether or not to show [Edit], [Report] etc.
-	 * @todo Find a better way to pass the page (artist, collages, requests, torrents) to this function than extracting it from $Link
-	 */
-	static function render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, $Unread = false, $Header = '', $Tools = true) {
-		$UserInfo = Users::user_info($AuthorID);
-		$Header = Users::format_username($AuthorID, true, true, true, true, true) . time_diff($AddedTime) . $Header;
+  /**
+   * Render one comment
+   * @param int $AuthorID
+   * @param int $PostID
+   * @param string $Body
+   * @param string $AddedTime
+   * @param int $EditedUserID
+   * @param string $EditedTime
+   * @param string $Link The link to the post elsewhere on the site
+   * @param string $Header The header used in the post
+   * @param bool $Tools Whether or not to show [Edit], [Report] etc.
+   * @todo Find a better way to pass the page (artist, collages, requests, torrents) to this function than extracting it from $Link
+   */
+  static function render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, $Unread = false, $Header = '', $Tools = true) {
+    $UserInfo = Users::user_info($AuthorID);
+    $Header = Users::format_username($AuthorID, true, true, true, true, true) . time_diff($AddedTime) . $Header;
 ?>
-		<table class="forum_post box vertical_margin<?=(!Users::has_avatars_enabled() ? ' noavatar' : '') . ($Unread ? ' forum_unread' : '')?>" id="post<?=$PostID?>">
-			<colgroup>
-<?		if (Users::has_avatars_enabled()) { ?>
-				<col class="col_avatar" />
-<?		} ?>
-				<col class="col_post_body" />
-			</colgroup>
-			<tr class="colhead_dark">
-				<td colspan="<?=(Users::has_avatars_enabled() ? 2 : 1)?>">
-					<div style="float: left;"><a class="post_id" href="<?=$Link?>">#<?=$PostID?></a>
-						<?=$Header?>
-<?		if ($Tools) { ?>
-						- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$UserInfo['Username']?>', true);" class="brackets">Quote</a>
-<?			if ($AuthorID == G::$LoggedUser['ID'] || check_perms('site_moderate_forums')) { ?>
-						- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','');" class="brackets">Edit</a>
-<?			}
-			if (check_perms('site_moderate_forums')) { ?>
-						- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');" class="brackets">Delete</a>
-<?			} ?>
-					</div>
-					<div id="bar<?=$PostID?>" style="float: right;">
-						<a href="reports.php?action=report&amp;type=comment&amp;id=<?=$PostID?>" class="brackets">Report</a>
+    <table class="forum_post box vertical_margin<?=(!Users::has_avatars_enabled() ? ' noavatar' : '') . ($Unread ? ' forum_unread' : '')?>" id="post<?=$PostID?>">
+      <colgroup>
+<?    if (Users::has_avatars_enabled()) { ?>
+        <col class="col_avatar" />
+<?    } ?>
+        <col class="col_post_body" />
+      </colgroup>
+      <tr class="colhead_dark">
+        <td colspan="<?=(Users::has_avatars_enabled() ? 2 : 1)?>">
+          <div style="float: left;"><a class="post_id" href="<?=$Link?>">#<?=$PostID?></a>
+            <?=$Header?>
+<?    if ($Tools) { ?>
+            - <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$UserInfo['Username']?>', true);" class="brackets">Quote</a>
+<?      if ($AuthorID == G::$LoggedUser['ID'] || check_perms('site_moderate_forums')) { ?>
+            - <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','');" class="brackets">Edit</a>
+<?      }
+      if (check_perms('site_moderate_forums')) { ?>
+            - <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');" class="brackets">Delete</a>
+<?      } ?>
+          </div>
+          <div id="bar<?=$PostID?>" style="float: right;">
+            <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$PostID?>" class="brackets">Report</a>
 <?
-			if (check_perms('users_warn') && $AuthorID != G::$LoggedUser['ID'] && G::$LoggedUser['Class'] >= $UserInfo['Class']) {
+      if (check_perms('users_warn') && $AuthorID != G::$LoggedUser['ID'] && G::$LoggedUser['Class'] >= $UserInfo['Class']) {
 ?>
-						<form class="manage_form hidden" name="user" id="warn<?=$PostID?>" action="comments.php" method="post">
-							<input type="hidden" name="action" value="warn" />
-							<input type="hidden" name="postid" value="<?=$PostID?>" />
-						</form>
-						- <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;" class="brackets">Warn</a>
-<?			} ?>
-						&nbsp;
-						<a href="#">&uarr;</a>
-<?		} ?>
-					</div>
-				</td>
-			</tr>
-			<tr>
-<?		if (Users::has_avatars_enabled()) { ?>
-				<td class="avatar" valign="top">
-				<?=Users::show_avatar($UserInfo['Avatar'], $AuthorID, $UserInfo['Username'], G::$LoggedUser['DisableAvatars'])?>
-				</td>
-<?		} ?>
-				<td class="body" valign="top">
-					<div id="content<?=$PostID?>">
-						<?=Text::full_format($Body)?>
-<?		if ($EditedUserID) { ?>
-						<br />
-						<br />
+            <form class="manage_form hidden" name="user" id="warn<?=$PostID?>" action="comments.php" method="post">
+              <input type="hidden" name="action" value="warn" />
+              <input type="hidden" name="postid" value="<?=$PostID?>" />
+            </form>
+            - <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;" class="brackets">Warn</a>
+<?      } ?>
+            &nbsp;
+            <a href="#">&uarr;</a>
+<?    } ?>
+          </div>
+        </td>
+      </tr>
+      <tr>
+<?    if (Users::has_avatars_enabled()) { ?>
+        <td class="avatar" valign="top">
+        <?=Users::show_avatar($UserInfo['Avatar'], $AuthorID, $UserInfo['Username'], G::$LoggedUser['DisableAvatars'])?>
+        </td>
+<?    } ?>
+        <td class="body" valign="top">
+          <div id="content<?=$PostID?>">
+            <?=Text::full_format($Body)?>
+<?    if ($EditedUserID) { ?>
+            <br />
+            <br />
             <div class="last_edited">
-<?			if (check_perms('site_admin_forums')) { ?>
+<?      if (check_perms('site_admin_forums')) { ?>
               <a href="#content<?=$PostID?>" onclick="LoadEdit('<?=substr($Link, 0, strcspn($Link, '.'))?>', <?=$PostID?>, 1); return false;">&laquo;</a>
-<?			} ?>
+<?      } ?>
               Last edited by
               <?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime, 2, true, true)?>
-<?		} ?>
+<?    } ?>
             </div>
-					</div>
-				</td>
-			</tr>
-		</table>
-<?	}
+          </div>
+        </td>
+      </tr>
+    </table>
+<?  }
 }

classes/cookie.class.php

@@ -11,38 +11,38 @@ $Cookie->get(); is user provided and untrustworthy
 
 /*
 interface COOKIE_INTERFACE {
-	public function get($Key);
-	public function set($Key, $Value, $Seconds, $LimitAccess);
-	public function del($Key);
+  public function get($Key);
+  public function set($Key, $Value, $Seconds, $LimitAccess);
+  public function del($Key);
 
-	public function flush();
+  public function flush();
 }
 */
 
 class COOKIE /*implements COOKIE_INTERFACE*/ {
-	const LIMIT_ACCESS = true; //If true, blocks JS cookie API access by default (can be overridden case by case)
-	const PREFIX = ''; //In some cases you may desire to prefix your cookies
-
-	public function get($Key) {
-		if (!isset($_COOKIE[SELF::PREFIX.$Key])) {
-			return false;
-		}
-		return $_COOKIE[SELF::PREFIX.$Key];
-	}
-
-	//Pass the 4th optional param as false to allow JS access to the cookie
-	public function set($Key, $Value, $Seconds = 86400, $LimitAccess = SELF::LIMIT_ACCESS) {
-		setcookie(SELF::PREFIX.$Key, $Value, time() + $Seconds, '/', SITE_DOMAIN, $_SERVER['SERVER_PORT'] === '443', $LimitAccess, false);
-	}
-
-	public function del($Key) {
-		setcookie(SELF::PREFIX.$Key, '', time() - 24 * 3600); //3600 vs 1 second to account for potential clock desyncs
-	}
-
-	public function flush() {
-		$Cookies = array_keys($_COOKIE);
-		foreach ($Cookies as $Cookie) {
-			$this->del($Cookie);
-		}
-	}
+  const LIMIT_ACCESS = true; //If true, blocks JS cookie API access by default (can be overridden case by case)
+  const PREFIX = ''; //In some cases you may desire to prefix your cookies
+
+  public function get($Key) {
+    if (!isset($_COOKIE[SELF::PREFIX.$Key])) {
+      return false;
+    }
+    return $_COOKIE[SELF::PREFIX.$Key];
+  }
+
+  //Pass the 4th optional param as false to allow JS access to the cookie
+  public function set($Key, $Value, $Seconds = 86400, $LimitAccess = SELF::LIMIT_ACCESS) {
+    setcookie(SELF::PREFIX.$Key, $Value, time() + $Seconds, '/', SITE_DOMAIN, $_SERVER['SERVER_PORT'] === '443', $LimitAccess, false);
+  }
+
+  public function del($Key) {
+    setcookie(SELF::PREFIX.$Key, '', time() - 24 * 3600); //3600 vs 1 second to account for potential clock desyncs
+  }
+
+  public function flush() {
+    $Cookies = array_keys($_COOKIE);
+    foreach ($Cookies as $Cookie) {
+      $this->del($Cookie);
+    }
+  }
 }

classes/dbcrypt.class.php

@@ -6,16 +6,16 @@ class DBCrypt {
    * @param string $plaintext
    * @return encrypted string or false if DB key not accessible
    */
-	public static function encrypt($plaintext) {
-		if (apc_exists('DBKEY')) {
-			$iv_size = openssl_cipher_iv_length('AES-128-CBC');
-			$iv = openssl_random_pseudo_bytes($iv_size);
-			$ret =  base64_encode($iv.openssl_encrypt($plaintext, 'AES-128-CBC', apc_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv));
-			return $ret;
-		} else {
-			return false;
-		}
-	}
+  public static function encrypt($plaintext) {
+    if (apc_exists('DBKEY')) {
+      $iv_size = openssl_cipher_iv_length('AES-128-CBC');
+      $iv = openssl_random_pseudo_bytes($iv_size);
+      $ret =  base64_encode($iv.openssl_encrypt($plaintext, 'AES-128-CBC', apc_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv));
+      return $ret;
+    } else {
+      return false;
+    }
+  }
 
   /**
    * Decrypts input text from database
@@ -23,15 +23,15 @@ class DBCrypt {
    * @param string $ciphertext
    * @return decrypted string string or false if DB key not accessible
    */
-	public static function decrypt($ciphertext) {
-		if (apc_exists('DBKEY')) {
-			$iv_size = openssl_cipher_iv_length('AES-128-CBC');
-			$iv = substr(base64_decode($ciphertext), 0, $iv_size);
-			$ciphertext = substr(base64_decode($ciphertext), $iv_size);
-			return openssl_decrypt($ciphertext, 'AES-128-CBC', apc_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv);
-		} else {
-			return false;
-		}	
-	}
+  public static function decrypt($ciphertext) {
+    if (apc_exists('DBKEY')) {
+      $iv_size = openssl_cipher_iv_length('AES-128-CBC');
+      $iv = substr(base64_decode($ciphertext), 0, $iv_size);
+      $ciphertext = substr(base64_decode($ciphertext), $iv_size);
+      return openssl_decrypt($ciphertext, 'AES-128-CBC', apc_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv);
+    } else {
+      return false;
+    }
+  }
 }
 ?>

classes/donationsbitcoin.class.php

@@ -1,186 +1,186 @@
 <?
 class DonationsBitcoin {
-	/**
-	 * Ask bitcoind for a list of all addresses that have received bitcoins
-	 *
-	 * @return array (BitcoinAddress => Amount, ...)
-	 */
-	public static function get_received() {
-		if (defined('BITCOIN_RPC_URL')) {
-			$Donations = BitcoinRpc::listreceivedbyaddress();
-		}
-		if (empty($Donations)) {
-			return array();
-		}
-		$BTCUsers = array();
-		foreach ($Donations as $Account) {
-			$BTCUsers[$Account->address] = $Account->amount;
-		}
-		return $BTCUsers;
-	}
+  /**
+   * Ask bitcoind for a list of all addresses that have received bitcoins
+   *
+   * @return array (BitcoinAddress => Amount, ...)
+   */
+  public static function get_received() {
+    if (defined('BITCOIN_RPC_URL')) {
+      $Donations = BitcoinRpc::listreceivedbyaddress();
+    }
+    if (empty($Donations)) {
+      return array();
+    }
+    $BTCUsers = array();
+    foreach ($Donations as $Account) {
+      $BTCUsers[$Account->address] = $Account->amount;
+    }
+    return $BTCUsers;
+  }
 
-	/**
-	 * Ask bitcoind for the current account balance
-	 *
-	 * @return float balance
-	 */
-	public static function get_balance() {
-		if (defined('BITCOIN_RPC_URL')) {
-			return BitcoinRpc::getbalance();
-		}
-	}
+  /**
+   * Ask bitcoind for the current account balance
+   *
+   * @return float balance
+   */
+  public static function get_balance() {
+    if (defined('BITCOIN_RPC_URL')) {
+      return BitcoinRpc::getbalance();
+    }
+  }
 
-	/**
-	 * Get a user's existing bitcoin address or generate a new one
-	 *
-	 * @param int $UserID
-	 * @param bool $GenAddress whether to create a new address if it doesn't exist
-	 * @return false if no address exists and $GenAddress is false
-	 *         string bitcoin address otherwise
-	 */
-	public static function get_address($UserID, $GenAddress = false) {
-		$UserID = (int)$UserID;
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT BitcoinAddress
-			FROM users_info
-			WHERE UserID = '$UserID'");
-		list($Addr) = G::$DB->next_record();
-		G::$DB->set_query_id($QueryID);
+  /**
+   * Get a user's existing bitcoin address or generate a new one
+   *
+   * @param int $UserID
+   * @param bool $GenAddress whether to create a new address if it doesn't exist
+   * @return false if no address exists and $GenAddress is false
+   *         string bitcoin address otherwise
+   */
+  public static function get_address($UserID, $GenAddress = false) {
+    $UserID = (int)$UserID;
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT BitcoinAddress
+      FROM users_info
+      WHERE UserID = '$UserID'");
+    list($Addr) = G::$DB->next_record();
+    G::$DB->set_query_id($QueryID);
 
-		if (!empty($Addr)) {
-			return $Addr;
-		} elseif ($GenAddress) {
-			if (defined('BITCOIN_RPC_URL')) {
-				$NewAddr = BitcoinRpc::getnewaddress();
-			}
-			if (empty($NewAddr)) {
-				error(0);
-			}
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				UPDATE users_info
-				SET BitcoinAddress = '".db_string($NewAddr)."'
-				WHERE UserID = '$UserID'
-					AND BitcoinAddress IS NULL");
-			G::$DB->set_query_id($QueryID);
-			return $NewAddr;
-		} else {
-			return false;
-		}
-	}
+    if (!empty($Addr)) {
+      return $Addr;
+    } elseif ($GenAddress) {
+      if (defined('BITCOIN_RPC_URL')) {
+        $NewAddr = BitcoinRpc::getnewaddress();
+      }
+      if (empty($NewAddr)) {
+        error(0);
+      }
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        UPDATE users_info
+        SET BitcoinAddress = '".db_string($NewAddr)."'
+        WHERE UserID = '$UserID'
+          AND BitcoinAddress IS NULL");
+      G::$DB->set_query_id($QueryID);
+      return $NewAddr;
+    } else {
+      return false;
+    }
+  }
 
-	/**
-	 * Ask bitcoind for the total amount of bitcoins received
-	 *
-	 * @return float amount
-	 */
-	public static function get_total_received() {
-		if (defined('BITCOIN_RPC_URL')) {
-			$Accounts = BitcoinRpc::listreceivedbyaccount();
-		}
-		if (empty($Accounts)) {
-			return 0.0;
-		}
-		foreach ($Accounts as $Account) {
-			if ($Account->account == '') {
-				return $Account->amount;
-			}
-		}
-		return 0.0;
-	}
+  /**
+   * Ask bitcoind for the total amount of bitcoins received
+   *
+   * @return float amount
+   */
+  public static function get_total_received() {
+    if (defined('BITCOIN_RPC_URL')) {
+      $Accounts = BitcoinRpc::listreceivedbyaccount();
+    }
+    if (empty($Accounts)) {
+      return 0.0;
+    }
+    foreach ($Accounts as $Account) {
+      if ($Account->account == '') {
+        return $Account->amount;
+      }
+    }
+    return 0.0;
+  }
 
-	/**
-	 * Translate bitcoin addresses to user IDs
-	 *
-	 * @param array $Addresses list of bitcoin addresses
-	 * @return array (BitcoinAddress => UserID, ...)
-	 */
-	public static function get_userids($Addresses) {
-		if (!is_array($Addresses) || empty($Addresses)) {
-			return false;
-		}
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT BitcoinAddress, UserID
-			FROM users_info
-			WHERE BitcoinAddress IN ('" . implode("', '", $Addresses) . "')");
-		if (G::$DB->has_results()) {
-			$UserIDs = G::$DB->to_pair(0, 1);
-		} else {
-			$UserIDs = array();
-		}
-		G::$DB->set_query_id($QueryID);
-		return $UserIDs;
-	}
+  /**
+   * Translate bitcoin addresses to user IDs
+   *
+   * @param array $Addresses list of bitcoin addresses
+   * @return array (BitcoinAddress => UserID, ...)
+   */
+  public static function get_userids($Addresses) {
+    if (!is_array($Addresses) || empty($Addresses)) {
+      return false;
+    }
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT BitcoinAddress, UserID
+      FROM users_info
+      WHERE BitcoinAddress IN ('" . implode("', '", $Addresses) . "')");
+    if (G::$DB->has_results()) {
+      $UserIDs = G::$DB->to_pair(0, 1);
+    } else {
+      $UserIDs = array();
+    }
+    G::$DB->set_query_id($QueryID);
+    return $UserIDs;
+  }
 
-	/**
-	 * Find and process new donations since the last time this function was called.
-	 */
-	public static function find_new_donations() {
-		global $Debug;
-		if (($OldAmount = G::$Cache->get_value('btc_total_received')) === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT IFNULL(SUM(Amount), 0)
-				FROM donations_bitcoin");
-			list($OldAmount) = G::$DB->next_record(MYSQLI_NUM, false);
-			G::$DB->set_query_id($QueryID);
-		}
-		$NewAmount = self::get_total_received();
-		if ($NewAmount < $OldAmount) {
-			// This shouldn't happen. Perhaps bitcoind was restarted recently
-			// or the block index was removed. Either way, try again later
-			send_irc('PRIVMSG ' . LAB_CHAN . " :Bad bitcoin donation data (is $NewAmount, was $OldAmount). If this persists, something is probably wrong");
-			return false;
-		}
-		if ($NewAmount > $OldAmount) {
-			// I really wish we didn't have to do it like this
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT BitcoinAddress, SUM(Amount)
-				FROM donations_bitcoin
-				GROUP BY BitcoinAddress");
-			$OldDonations = G::$DB->to_pair(0, 1, false);
-			G::$DB->set_query_id($QueryID);
-			$NewDonations = self::get_received();
-			foreach ($NewDonations as $Address => &$Amount) {
-				if (isset($OldDonations[$Address])) {
-					if ($Amount == $OldDonations[$Address]) { // Direct comparison should be fine as everything comes from bitcoind
-						unset($NewDonations[$Address]);
-						continue;
-					}
-					$Debug->log_var(array('old' => $OldDonations[$Address], 'new' => $Amount), "New donations from $Address");
-					// PHP doesn't do fixed-point math, and json_decode has already botched the precision
-					// so let's just round this off to satoshis and pray that we're on a 64 bit system
-					$Amount = round($Amount - $OldDonations[$Address], 8);
-				}
-				$NewDonations[$Address] = $Amount;
-			}
-			$Debug->log_var($NewDonations, '$NewDonations');
-			foreach (self::get_userids(array_keys($NewDonations)) as $Address => $UserID) {
-				Donations::regular_donate($UserID, $NewDonations[$Address], 'Bitcoin Parser', '', 'BTC');
-				self::store_donation($Address, $NewDonations[$Address]);
-			}
-			G::$Cache->cache_value('btc_total_received', $NewAmount, 0);
-		}
-	}
+  /**
+   * Find and process new donations since the last time this function was called.
+   */
+  public static function find_new_donations() {
+    global $Debug;
+    if (($OldAmount = G::$Cache->get_value('btc_total_received')) === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT IFNULL(SUM(Amount), 0)
+        FROM donations_bitcoin");
+      list($OldAmount) = G::$DB->next_record(MYSQLI_NUM, false);
+      G::$DB->set_query_id($QueryID);
+    }
+    $NewAmount = self::get_total_received();
+    if ($NewAmount < $OldAmount) {
+      // This shouldn't happen. Perhaps bitcoind was restarted recently
+      // or the block index was removed. Either way, try again later
+      send_irc('PRIVMSG ' . LAB_CHAN . " :Bad bitcoin donation data (is $NewAmount, was $OldAmount). If this persists, something is probably wrong");
+      return false;
+    }
+    if ($NewAmount > $OldAmount) {
+      // I really wish we didn't have to do it like this
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT BitcoinAddress, SUM(Amount)
+        FROM donations_bitcoin
+        GROUP BY BitcoinAddress");
+      $OldDonations = G::$DB->to_pair(0, 1, false);
+      G::$DB->set_query_id($QueryID);
+      $NewDonations = self::get_received();
+      foreach ($NewDonations as $Address => &$Amount) {
+        if (isset($OldDonations[$Address])) {
+          if ($Amount == $OldDonations[$Address]) { // Direct comparison should be fine as everything comes from bitcoind
+            unset($NewDonations[$Address]);
+            continue;
+          }
+          $Debug->log_var(array('old' => $OldDonations[$Address], 'new' => $Amount), "New donations from $Address");
+          // PHP doesn't do fixed-point math, and json_decode has already botched the precision
+          // so let's just round this off to satoshis and pray that we're on a 64 bit system
+          $Amount = round($Amount - $OldDonations[$Address], 8);
+        }
+        $NewDonations[$Address] = $Amount;
+      }
+      $Debug->log_var($NewDonations, '$NewDonations');
+      foreach (self::get_userids(array_keys($NewDonations)) as $Address => $UserID) {
+        Donations::regular_donate($UserID, $NewDonations[$Address], 'Bitcoin Parser', '', 'BTC');
+        self::store_donation($Address, $NewDonations[$Address]);
+      }
+      G::$Cache->cache_value('btc_total_received', $NewAmount, 0);
+    }
+  }
 
-	/**
-	 * Record a donation in the database
-	 *
-	 * @param string $Address bitcoin address
-	 * @param double $Amount amount of bitcoins transferred
-	 */
-	public static function store_donation($Address, $Amount) {
-		if (!is_numeric($Amount) || $Amount <= 0) {
-			// Panic!
-			return false;
-		}
-		G::$DB->query("
-			INSERT INTO donations_bitcoin
-				(BitcoinAddress, Amount)
-			VALUES
-				('$Address', $Amount)");
-	}
+  /**
+   * Record a donation in the database
+   *
+   * @param string $Address bitcoin address
+   * @param double $Amount amount of bitcoins transferred
+   */
+  public static function store_donation($Address, $Amount) {
+    if (!is_numeric($Amount) || $Amount <= 0) {
+      // Panic!
+      return false;
+    }
+    G::$DB->query("
+      INSERT INTO donations_bitcoin
+        (BitcoinAddress, Amount)
+      VALUES
+        ('$Address', $Amount)");
+  }
 }

classes/donationsview.class.php

@@ -1,214 +1,214 @@
 <?
 
 class DonationsView {
-	public static function render_mod_donations($UserID) {
+  public static function render_mod_donations($UserID) {
 ?>
-		<table class="layout box" id="donation_box">
-			<tr class="colhead">
-				<td colspan="2">
-					Donor System (add points)
-				</td>
-			</tr>
-			<tr>
-				<td class="label">Value:</td>
-				<td>
-					<input type="text" name="donation_value" onkeypress="return isNumberKey(event);" />
-					<select name="donation_currency">
-						<option value="EUR">EUR</option>
-						<option value="USD">USD</option>
-						<option value="BTC">BTC</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td class="label">Reason:</td>
-				<td><input type="text" class="wide_input_text" name="donation_reason" /></td>
-			</tr>
-			<tr>
-				<td align="right" colspan="2">
-					<input type="submit" name="donor_points_submit" value="Add donor points" />
-				</td>
-			</tr>
-		</table>
+    <table class="layout box" id="donation_box">
+      <tr class="colhead">
+        <td colspan="2">
+          Donor System (add points)
+        </td>
+      </tr>
+      <tr>
+        <td class="label">Value:</td>
+        <td>
+          <input type="text" name="donation_value" onkeypress="return isNumberKey(event);" />
+          <select name="donation_currency">
+            <option value="EUR">EUR</option>
+            <option value="USD">USD</option>
+            <option value="BTC">BTC</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td class="label">Reason:</td>
+        <td><input type="text" class="wide_input_text" name="donation_reason" /></td>
+      </tr>
+      <tr>
+        <td align="right" colspan="2">
+          <input type="submit" name="donor_points_submit" value="Add donor points" />
+        </td>
+      </tr>
+    </table>
 
-		<table class="layout box" id="donor_points_box">
-			<tr class="colhead">
-				<td colspan="3" class="tooltip" title='Use this tool only when manually correcting values. If crediting donations normally, use the "Donor System (add points)" tool'>
-					Donor System (modify values)
-				</td>
-			</tr>
-			<tr>
-				<td class="label tooltip" title="Active points determine a user's Donor Rank and do expire.">Active points:</td>
-				<td><input type="text" name="donor_rank" onkeypress="return isNumberKey(event);" value="<?=Donations::get_rank($UserID)?>" /></td>
-			</tr>
-			<tr>
-				<td class="label tooltip" title="Total points represent a user's overall total and never expire. Total points determines a user's Special Rank and Donor Leaderboard placement.">Total points:</td>
-				<td><input type="text" name="total_donor_rank" onkeypress="return isNumberKey(event);" value="<?=Donations::get_total_rank($UserID)?>" /></td>
-			</tr>
-			<tr>
-				<td class="label">Reason:</td>
-				<td><input type="text" class="wide_input_text" name="reason" /></td>
-			</tr>
-			<tr>
-				<td align="right" colspan="2">
-					<input type="submit" name="donor_values_submit" value="Change point values" />
-				</td>
-			</tr>
-		</table>
+    <table class="layout box" id="donor_points_box">
+      <tr class="colhead">
+        <td colspan="3" class="tooltip" title='Use this tool only when manually correcting values. If crediting donations normally, use the "Donor System (add points)" tool'>
+          Donor System (modify values)
+        </td>
+      </tr>
+      <tr>
+        <td class="label tooltip" title="Active points determine a user's Donor Rank and do expire.">Active points:</td>
+        <td><input type="text" name="donor_rank" onkeypress="return isNumberKey(event);" value="<?=Donations::get_rank($UserID)?>" /></td>
+      </tr>
+      <tr>
+        <td class="label tooltip" title="Total points represent a user's overall total and never expire. Total points determines a user's Special Rank and Donor Leaderboard placement.">Total points:</td>
+        <td><input type="text" name="total_donor_rank" onkeypress="return isNumberKey(event);" value="<?=Donations::get_total_rank($UserID)?>" /></td>
+      </tr>
+      <tr>
+        <td class="label">Reason:</td>
+        <td><input type="text" class="wide_input_text" name="reason" /></td>
+      </tr>
+      <tr>
+        <td align="right" colspan="2">
+          <input type="submit" name="donor_values_submit" value="Change point values" />
+        </td>
+      </tr>
+    </table>
 <?
-	}
+  }
 
-	public static function render_donor_stats($UserID) {
-		$OwnProfile = G::$LoggedUser['ID'] == $UserID;
-		if (check_perms("users_mod") || $OwnProfile || Donations::is_visible($UserID)) {
+  public static function render_donor_stats($UserID) {
+    $OwnProfile = G::$LoggedUser['ID'] == $UserID;
+    if (check_perms("users_mod") || $OwnProfile || Donations::is_visible($UserID)) {
 ?>
-			<div class="box box_info box_userinfo_donor_stats">
-				<div class="head colhead_dark">Donor Statistics</div>
-				<ul class="stats nobullet">
+      <div class="box box_info box_userinfo_donor_stats">
+        <div class="head colhead_dark">Donor Statistics</div>
+        <ul class="stats nobullet">
 <?
-			if (Donations::is_donor($UserID)) {
-				if (check_perms('users_mod') || $OwnProfile) {
+      if (Donations::is_donor($UserID)) {
+        if (check_perms('users_mod') || $OwnProfile) {
 ?>
-					<li>
-						Total donor points: <?=Donations::get_total_rank($UserID)?>
-					</li>
-<?				} ?>
-					<li>
-						Current donor rank: <?=self::render_rank(Donations::get_rank($UserID), Donations::get_special_rank($UserID), true)?>
-					</li>
-					<li>
-						Leaderboard position: <?=Donations::get_leaderboard_position($UserID)?>
-					</li>
-					<li>
-						Last donated: <?=time_diff(Donations::get_donation_time($UserID))?>
-					</li>
-					<li>
-						Rank expires: <?=(Donations::get_rank_expiration($UserID))?>
-					</li>
-<?			} else { ?>
-					<li>
-						This user hasn't donated.
-					</li>
-<?			} ?>
-				</ul>
-			</div>
+          <li>
+            Total donor points: <?=Donations::get_total_rank($UserID)?>
+          </li>
+<?        } ?>
+          <li>
+            Current donor rank: <?=self::render_rank(Donations::get_rank($UserID), Donations::get_special_rank($UserID), true)?>
+          </li>
+          <li>
+            Leaderboard position: <?=Donations::get_leaderboard_position($UserID)?>
+          </li>
+          <li>
+            Last donated: <?=time_diff(Donations::get_donation_time($UserID))?>
+          </li>
+          <li>
+            Rank expires: <?=(Donations::get_rank_expiration($UserID))?>
+          </li>
+<?      } else { ?>
+          <li>
+            This user hasn't donated.
+          </li>
+<?      } ?>
+        </ul>
+      </div>
 <?
-		}
-	}
+    }
+  }
 
-	public static function render_profile_rewards($EnabledRewards, $ProfileRewards) {
-		for ($i = 1; $i <= 4; $i++) {
-			if ($EnabledRewards['HasProfileInfo' . $i] && $ProfileRewards['ProfileInfo' . $i]) {
+  public static function render_profile_rewards($EnabledRewards, $ProfileRewards) {
+    for ($i = 1; $i <= 4; $i++) {
+      if ($EnabledRewards['HasProfileInfo' . $i] && $ProfileRewards['ProfileInfo' . $i]) {
 ?>
-			<div class="box">
-				<div class="head">
-					<span><?=!empty($ProfileRewards['ProfileInfoTitle' . $i]) ? display_str($ProfileRewards['ProfileInfoTitle' . $i]) : "Extra Profile " . ($i + 1)?></span>
-					<span style="float: right;"><a href="#" onclick="$('#profilediv_<?=$i?>').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>
-				</div>
-				<div class="pad profileinfo" id="profilediv_<?=$i?>">
-<?					echo Text::full_format($ProfileRewards['ProfileInfo' . $i]); ?>
-				</div>
-			</div>
+      <div class="box">
+        <div class="head">
+          <span><?=!empty($ProfileRewards['ProfileInfoTitle' . $i]) ? display_str($ProfileRewards['ProfileInfoTitle' . $i]) : "Extra Profile " . ($i + 1)?></span>
+          <span style="float: right;"><a href="#" onclick="$('#profilediv_<?=$i?>').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>
+        </div>
+        <div class="pad profileinfo" id="profilediv_<?=$i?>">
+<?          echo Text::full_format($ProfileRewards['ProfileInfo' . $i]); ?>
+        </div>
+      </div>
 <?
-			}
-		}
-	}
+      }
+    }
+  }
 
-	public static function render_donation_history($DonationHistory) {
-		if (empty($DonationHistory)) {
-			return;
-		}
+  public static function render_donation_history($DonationHistory) {
+    if (empty($DonationHistory)) {
+      return;
+    }
 ?>
-		<div class="box box2" id="donation_history_box">
-			<div class="head">
-				Donation History <a href="#" onclick="$('#donation_history').gtoggle(); return false;" class="brackets" style="float: right;">Toggle</a>
-			</div>
-			<div class="hidden" id="donation_history">
-				<table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
-					<tbody>
-					<tr class="colhead_dark">
-						<td>
-							<strong>Source</strong>
-						</td>
-						<td>
-							<strong>Date</strong>
-						</td>
-						<td>
-							<strong>Amount (EUR)</strong>
-						</td>
-						<td>
-							<strong>Added Points</strong>
-						</td>
-						<td>
-							<strong>Total Points</strong>
-						</td>
-						<td>
-							<strong>Email</strong>
-						</td>
-						<td style="width: 30%;">
-							<strong>Reason</strong>
-						</td>
-					</tr>
-<?		foreach ($DonationHistory as $Donation) { ?>
-					<tr class="row">
-						<td>
-							<?=display_str($Donation['Source'])?> (<?=Users::format_username($Donation['AddedBy'])?>)
-						</td>
-						<td>
-							<?=$Donation['Time']?>
-						</td>
-						<td>
-							<?=$Donation['Amount']?>
-						</td>
-						<td>
-							<?=$Donation['Rank']?>
-						</td>
-						<td>
-							<?=$Donation['TotalRank']?>
-						</td>
-						<td>
-							<?=display_str($Donation['Email'])?>
-						</td>
-						<td>
-							<?=display_str($Donation['Reason'])?>
-						</td>
-					</tr>
+    <div class="box box2" id="donation_history_box">
+      <div class="head">
+        Donation History <a href="#" onclick="$('#donation_history').gtoggle(); return false;" class="brackets" style="float: right;">Toggle</a>
+      </div>
+      <div class="hidden" id="donation_history">
+        <table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
+          <tbody>
+          <tr class="colhead_dark">
+            <td>
+              <strong>Source</strong>
+            </td>
+            <td>
+              <strong>Date</strong>
+            </td>
+            <td>
+              <strong>Amount (EUR)</strong>
+            </td>
+            <td>
+              <strong>Added Points</strong>
+            </td>
+            <td>
+              <strong>Total Points</strong>
+            </td>
+            <td>
+              <strong>Email</strong>
+            </td>
+            <td style="width: 30%;">
+              <strong>Reason</strong>
+            </td>
+          </tr>
+<?    foreach ($DonationHistory as $Donation) { ?>
+          <tr class="row">
+            <td>
+              <?=display_str($Donation['Source'])?> (<?=Users::format_username($Donation['AddedBy'])?>)
+            </td>
+            <td>
+              <?=$Donation['Time']?>
+            </td>
+            <td>
+              <?=$Donation['Amount']?>
+            </td>
+            <td>
+              <?=$Donation['Rank']?>
+            </td>
+            <td>
+              <?=$Donation['TotalRank']?>
+            </td>
+            <td>
+              <?=display_str($Donation['Email'])?>
+            </td>
+            <td>
+              <?=display_str($Donation['Reason'])?>
+            </td>
+          </tr>
 <?
-		}
+    }
 ?>
-					</tbody>
-				</table>
-			</div>
-		</div>
+          </tbody>
+        </table>
+      </div>
+    </div>
 <?
-	}
+  }
 
-	public static function render_rank($Rank, $SpecialRank, $ShowOverflow = false) {
-		if ($SpecialRank == 3) {
-			$Display = '∞ [Diamond]';
-		} else {
-			$CurrentRank = $Rank >= MAX_RANK ? MAX_RANK : $Rank;
-			$Overflow = $Rank - $CurrentRank;
-			$Display = $CurrentRank;
-			if ($Display == 5 || $Display == 6) {
-				$Display--;
-			}
-			if ($ShowOverflow && $Overflow) {
-				$Display .= " (+$Overflow)";
-			}
-			if ($Rank >= 6) {
-				$Display .= ' [Gold]';
-			} elseif ($Rank >= 4) {
-				$Display .= ' [Silver]';
-			} elseif ($Rank >= 3) {
-				$Display .= ' [Bronze]';
-			} elseif ($Rank >= 2) {
-				$Display .= ' [Copper]';
-			} elseif ($Rank >= 1) {
-				$Display .= ' [Red]';
-			}
-		}
-		echo $Display;
-	}
+  public static function render_rank($Rank, $SpecialRank, $ShowOverflow = false) {
+    if ($SpecialRank == 3) {
+      $Display = '∞ [Diamond]';
+    } else {
+      $CurrentRank = $Rank >= MAX_RANK ? MAX_RANK : $Rank;
+      $Overflow = $Rank - $CurrentRank;
+      $Display = $CurrentRank;
+      if ($Display == 5 || $Display == 6) {
+        $Display--;
+      }
+      if ($ShowOverflow && $Overflow) {
+        $Display .= " (+$Overflow)";
+      }
+      if ($Rank >= 6) {
+        $Display .= ' [Gold]';
+      } elseif ($Rank >= 4) {
+        $Display .= ' [Silver]';
+      } elseif ($Rank >= 3) {
+        $Display .= ' [Bronze]';
+      } elseif ($Rank >= 2) {
+        $Display .= ' [Copper]';
+      } elseif ($Rank >= 1) {
+        $Display .= ' [Red]';
+      }
+    }
+    echo $Display;
+  }
 
 }

classes/encrypt.class.php

@@ -8,27 +8,27 @@ This class handles encryption and decryption, that's all folks.
 |*************************************************************************/
 
 if (!extension_loaded('mcrypt')) {
-	die('Mcrypt Extension not loaded.');
+  die('Mcrypt Extension not loaded.');
 }
 
 class CRYPT {
-	public function encrypt($Str, $Key = ENCKEY) {
-		srand();
-		$Str = str_pad($Str, 32 - strlen($Str));
-		$IVSize = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
-		$IV = mcrypt_create_iv($IVSize, MCRYPT_RAND);
-		$CryptStr = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $Key, $Str, MCRYPT_MODE_CBC, $IV);
-		return base64_encode($IV.$CryptStr);
-	}
+  public function encrypt($Str, $Key = ENCKEY) {
+    srand();
+    $Str = str_pad($Str, 32 - strlen($Str));
+    $IVSize = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
+    $IV = mcrypt_create_iv($IVSize, MCRYPT_RAND);
+    $CryptStr = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $Key, $Str, MCRYPT_MODE_CBC, $IV);
+    return base64_encode($IV.$CryptStr);
+  }
 
-	public function decrypt($CryptStr, $Key = ENCKEY) {
-		if ($CryptStr != '') {
-			$IV = substr(base64_decode($CryptStr), 0, 16);
-			$CryptStr = substr(base64_decode($CryptStr), 16);
-			return trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $Key, $CryptStr, MCRYPT_MODE_CBC, $IV));
-		} else {
-			return '';
-		}
-	}
+  public function decrypt($CryptStr, $Key = ENCKEY) {
+    if ($CryptStr != '') {
+      $IV = substr(base64_decode($CryptStr), 0, 16);
+      $CryptStr = substr(base64_decode($CryptStr), 16);
+      return trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $Key, $CryptStr, MCRYPT_MODE_CBC, $IV));
+    } else {
+      return '';
+    }
+  }
 } // class ENCRYPT()
 ?>

classes/feed.class.php

@@ -1,71 +1,71 @@
 <?
 class FEED {
-	function open_feed() {
-		header("Content-type: application/xml; charset=UTF-8");
-		echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n","<rss xmlns:dc=\"http://purl.org/dc/elements/1.1/\" version=\"2.0\">\n\t<channel>\n";
-	}
+  function open_feed() {
+    header("Content-type: application/xml; charset=UTF-8");
+    echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n","<rss xmlns:dc=\"http://purl.org/dc/elements/1.1/\" version=\"2.0\">\n\t<channel>\n";
+  }
 
-	function close_feed() {
-		echo "\t</channel>\n</rss>";
-	}
+  function close_feed() {
+    echo "\t</channel>\n</rss>";
+  }
 
-	function channel($Title, $Description, $Section = '') {
-		$Site = site_url();
-		echo "\t\t<title>$Title :: ". SITE_NAME. "</title>\n";
-		echo "\t\t<link>$Site$Section</link>\n";
-		echo "\t\t<description>$Description</description>\n";
-		echo "\t\t<language>en-us</language>\n";
-		echo "\t\t<lastBuildDate>". date('r'). "</lastBuildDate>\n";
-		echo "\t\t<docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
-		echo "\t\t<generator>Gazelle Feed Class</generator>\n\n";
-	}
+  function channel($Title, $Description, $Section = '') {
+    $Site = site_url();
+    echo "\t\t<title>$Title :: ". SITE_NAME. "</title>\n";
+    echo "\t\t<link>$Site$Section</link>\n";
+    echo "\t\t<description>$Description</description>\n";
+    echo "\t\t<language>en-us</language>\n";
+    echo "\t\t<lastBuildDate>". date('r'). "</lastBuildDate>\n";
+    echo "\t\t<docs>http://blogs.law.harvard.edu/tech/rss</docs>\n";
+    echo "\t\t<generator>Gazelle Feed Class</generator>\n\n";
+  }
 
-	function item($Title, $Description, $Page, $Creator, $Comments = '', $Category = '', $Date = '') { //Escape with CDATA, otherwise the feed breaks.
-		if ($Date == '') {
-			$Date = date('r');
-		} else {
-			$Date = date('r', strtotime($Date));
-		}
-		$Site = site_url();
-		$Item = "\t\t<item>\n";
-		$Item .= "\t\t\t<title><![CDATA[$Title]]></title>\n";
-		$Item .= "\t\t\t<description><![CDATA[$Description]]></description>\n";
-		$Item .= "\t\t\t<pubDate>$Date</pubDate>\n";
-		$Item .= "\t\t\t<link>$Site$Page</link>\n";
-		$Item .= "\t\t\t<guid>$Site$Page</guid>\n";
-		if ($Comments != '') {
-			$Item .= "\t\t\t<comments>$Site$Comments</comments>\n";
-		}
-		if ($Category != '') {
-			$Item .= "\t\t\t<category><![CDATA[$Category]]></category>\n";
-		}
-		$Item .= "\t\t\t<dc:creator>$Creator</dc:creator>\n\t\t</item>\n";
-		return $Item;
-	}
+  function item($Title, $Description, $Page, $Creator, $Comments = '', $Category = '', $Date = '') { //Escape with CDATA, otherwise the feed breaks.
+    if ($Date == '') {
+      $Date = date('r');
+    } else {
+      $Date = date('r', strtotime($Date));
+    }
+    $Site = site_url();
+    $Item = "\t\t<item>\n";
+    $Item .= "\t\t\t<title><![CDATA[$Title]]></title>\n";
+    $Item .= "\t\t\t<description><![CDATA[$Description]]></description>\n";
+    $Item .= "\t\t\t<pubDate>$Date</pubDate>\n";
+    $Item .= "\t\t\t<link>$Site$Page</link>\n";
+    $Item .= "\t\t\t<guid>$Site$Page</guid>\n";
+    if ($Comments != '') {
+      $Item .= "\t\t\t<comments>$Site$Comments</comments>\n";
+    }
+    if ($Category != '') {
+      $Item .= "\t\t\t<category><![CDATA[$Category]]></category>\n";
+    }
+    $Item .= "\t\t\t<dc:creator>$Creator</dc:creator>\n\t\t</item>\n";
+    return $Item;
+  }
 
-	function retrieve($CacheKey, $AuthKey, $PassKey) {
-		global $Cache;
-		$Entries = $Cache->get_value($CacheKey);
-		if (!$Entries) {
-			$Entries = array();
-		} else {
-			foreach ($Entries as $Item) {
-				echo str_replace(array('[[PASSKEY]]', '[[AUTHKEY]]'), array(display_str($PassKey), display_str($AuthKey)), $Item);
-			}
-		}
-	}
+  function retrieve($CacheKey, $AuthKey, $PassKey) {
+    global $Cache;
+    $Entries = $Cache->get_value($CacheKey);
+    if (!$Entries) {
+      $Entries = array();
+    } else {
+      foreach ($Entries as $Item) {
+        echo str_replace(array('[[PASSKEY]]', '[[AUTHKEY]]'), array(display_str($PassKey), display_str($AuthKey)), $Item);
+      }
+    }
+  }
 
-	function populate($CacheKey, $Item) {
-		global $Cache;
-		$Entries = $Cache->get_value($CacheKey, true);
-		if (!$Entries) {
-			$Entries = array();
-		} else {
-			if (count($Entries) >= 50) {
-				array_pop($Entries);
-			}
-		}
-		array_unshift($Entries, $Item);
-		$Cache->cache_value($CacheKey, $Entries, 0); //inf cache
-	}
+  function populate($CacheKey, $Item) {
+    global $Cache;
+    $Entries = $Cache->get_value($CacheKey, true);
+    if (!$Entries) {
+      $Entries = array();
+    } else {
+      if (count($Entries) >= 50) {
+        array_pop($Entries);
+      }
+    }
+    array_unshift($Entries, $Item);
+    $Cache->cache_value($CacheKey, $Entries, 0); //inf cache
+  }
 }

classes/file_checker.class.php

@@ -1,78 +1,78 @@
 <?php
 $ComicsExtensions = array_fill_keys(array('cbr', 'cbz', 'gif', 'jpeg', 'jpg', 'pdf', 'png'), true);
 $MusicExtensions = array_fill_keys(
-	array(
-		'ac3', 'accurip', 'azw3', 'chm', 'cue', 'djv', 'djvu', 'doc', 'dts', 'epub', 'ffp',
-		'flac', 'gif', 'htm', 'html', 'jpeg', 'jpg', 'lit', 'log', 'm3u', 'm3u8', 'm4a', 'm4b',
-		'md5', 'mobi', 'mp3', 'mp4', 'nfo', 'pdf', 'pls', 'png', 'rtf', 'sfv', 'txt'),
-	true);
+  array(
+    'ac3', 'accurip', 'azw3', 'chm', 'cue', 'djv', 'djvu', 'doc', 'dts', 'epub', 'ffp',
+    'flac', 'gif', 'htm', 'html', 'jpeg', 'jpg', 'lit', 'log', 'm3u', 'm3u8', 'm4a', 'm4b',
+    'md5', 'mobi', 'mp3', 'mp4', 'nfo', 'pdf', 'pls', 'png', 'rtf', 'sfv', 'txt'),
+  true);
 $Keywords = array(
-	'ahashare.com', 'demonoid.com', 'demonoid.me', 'djtunes.com', 'h33t', 'housexclusive.net',
-	'limetorrents.com', 'mixesdb.com', 'mixfiend.blogstop', 'mixtapetorrent.blogspot',
-	'plixid.com', 'reggaeme.com' , 'scc.nfo', 'thepiratebay.org', 'torrentday');
+  'ahashare.com', 'demonoid.com', 'demonoid.me', 'djtunes.com', 'h33t', 'housexclusive.net',
+  'limetorrents.com', 'mixesdb.com', 'mixfiend.blogstop', 'mixtapetorrent.blogspot',
+  'plixid.com', 'reggaeme.com' , 'scc.nfo', 'thepiratebay.org', 'torrentday');
 
 function check_file($Type, $Name) {
-	check_name($Name);
-	check_extensions($Type, $Name);
+  check_name($Name);
+  check_extensions($Type, $Name);
 }
 
 function check_name($Name) {
-	global $Keywords;
-	$NameLC = strtolower($Name);
-	foreach ($Keywords as &$Value) {
-		if (strpos($NameLC, $Value) !== false) {
-			forbidden_error($Name);
-		}
-	}
-	if (preg_match('/INCOMPLETE~\*/i', $Name)) {
-		forbidden_error($Name);
-	}
+  global $Keywords;
+  $NameLC = strtolower($Name);
+  foreach ($Keywords as &$Value) {
+    if (strpos($NameLC, $Value) !== false) {
+      forbidden_error($Name);
+    }
+  }
+  if (preg_match('/INCOMPLETE~\*/i', $Name)) {
+    forbidden_error($Name);
+  }
 
-	/*
-	 * These characters are invalid in NTFS on Windows systems:
-	 *		: ? / < > \ * | "
-	 *
-	 * TODO: Add "/" to the blacklist. Adding "/" to the blacklist causes problems with nested dirs, apparently.
-	 *
-	 * Only the following characters need to be escaped (see the link below):
-	 *		\ - ^ ]
-	 *
-	 * http://www.php.net/manual/en/regexp.reference.character-classes.php
-	 */
-	$AllBlockedChars = ' : ? < > \ * | " ';
-	if (preg_match('/[\\:?<>*|"]/', $Name, $Matches)) {
-		character_error($Matches[0], $AllBlockedChars);
-	}
+  /*
+   * These characters are invalid in NTFS on Windows systems:
+   *    : ? / < > \ * | "
+   *
+   * TODO: Add "/" to the blacklist. Adding "/" to the blacklist causes problems with nested dirs, apparently.
+   *
+   * Only the following characters need to be escaped (see the link below):
+   *    \ - ^ ]
+   *
+   * http://www.php.net/manual/en/regexp.reference.character-classes.php
+   */
+  $AllBlockedChars = ' : ? < > \ * | " ';
+  if (preg_match('/[\\:?<>*|"]/', $Name, $Matches)) {
+    character_error($Matches[0], $AllBlockedChars);
+  }
 }
 
 function check_extensions($Type, $Name) {
-	global $MusicExtensions, $ComicsExtensions;
-	if ($Type == 'Music' || $Type == 'Audiobooks' || $Type == 'Comedy' || $Type == 'E-Books') {
-		if (!isset($MusicExtensions[get_file_extension($Name)])) {
-			invalid_error($Name);
-		}
-	} elseif ($Type == 'Comics') {
-		if (!isset($ComicsExtensions[get_file_extension($Name)])) {
-			invalid_error($Name);
-		}
-	}
+  global $MusicExtensions, $ComicsExtensions;
+  if ($Type == 'Music' || $Type == 'Audiobooks' || $Type == 'Comedy' || $Type == 'E-Books') {
+    if (!isset($MusicExtensions[get_file_extension($Name)])) {
+      invalid_error($Name);
+    }
+  } elseif ($Type == 'Comics') {
+    if (!isset($ComicsExtensions[get_file_extension($Name)])) {
+      invalid_error($Name);
+    }
+  }
 }
 
 function get_file_extension($FileName) {
-	return strtolower(substr(strrchr($FileName, '.'), 1));
+  return strtolower(substr(strrchr($FileName, '.'), 1));
 }
 
 function invalid_error($Name) {
-	global $Err;
-	$Err = 'The torrent contained one or more invalid files (' . display_str($Name) . ')';
+  global $Err;
+  $Err = 'The torrent contained one or more invalid files (' . display_str($Name) . ')';
 }
 
 function forbidden_error($Name) {
-	global $Err;
-	$Err = 'The torrent contained one or more forbidden files (' . display_str($Name) . ')';
+  global $Err;
+  $Err = 'The torrent contained one or more forbidden files (' . display_str($Name) . ')';
 }
 
 function character_error($Character, $AllBlockedChars) {
-	global $Err;
-	$Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.<br /><br />\nNote: The complete list of characters that are disallowed are shown below:<br />\n\t\t$AllBlockedChars";
+  global $Err;
+  $Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.<br /><br />\nNote: The complete list of characters that are disallowed are shown below:<br />\n\t\t$AllBlockedChars";
 }

classes/forums.class.php

@@ -1,325 +1,325 @@
 <?
 class Forums {
-	/**
-	 * Get information on a thread.
-	 *
-	 * @param int $ThreadID
-	 *        	the thread ID.
-	 * @param boolean $Return
-	 *        	indicates whether thread info should be returned.
-	 * @param Boolean $SelectiveCache
-	 *        	cache thread info/
-	 * @return array holding thread information.
-	 */
-	public static function get_thread_info($ThreadID, $Return = true, $SelectiveCache = false) {
-		if ((!$ThreadInfo = G::$Cache->get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					t.Title,
-					t.ForumID,
-					t.IsLocked,
-					t.IsSticky,
-					COUNT(fp.id) AS Posts,
-					t.LastPostAuthorID,
-					ISNULL(p.TopicID) AS NoPoll,
-					t.StickyPostID,
-					t.AuthorID as OP,
-					t.Ranking
-				FROM forums_topics AS t
-					JOIN forums_posts AS fp ON fp.TopicID = t.ID
-					LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
-				WHERE t.ID = '$ThreadID'
-				GROUP BY fp.TopicID");
-			if (!G::$DB->has_results()) {
-				G::$DB->set_query_id($QueryID);
-				return null;
-			}
-			$ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false);
-			if ($ThreadInfo['StickyPostID']) {
-				$ThreadInfo['Posts']--;
-				G::$DB->query(
-					"SELECT
-						p.ID,
-						p.AuthorID,
-						p.AddedTime,
-						p.Body,
-						p.EditedUserID,
-						p.EditedTime,
-						ed.Username
-						FROM forums_posts AS p
-							LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
-						WHERE p.TopicID = '$ThreadID'
-							AND p.ID = '" . $ThreadInfo['StickyPostID'] . "'");
-				list ($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC);
-			}
-			G::$DB->set_query_id($QueryID);
-			if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
-				G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0);
-			}
-		}
-		if ($Return) {
-			return $ThreadInfo;
-		}
-	}
+  /**
+   * Get information on a thread.
+   *
+   * @param int $ThreadID
+   *          the thread ID.
+   * @param boolean $Return
+   *          indicates whether thread info should be returned.
+   * @param Boolean $SelectiveCache
+   *          cache thread info/
+   * @return array holding thread information.
+   */
+  public static function get_thread_info($ThreadID, $Return = true, $SelectiveCache = false) {
+    if ((!$ThreadInfo = G::$Cache->get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          t.Title,
+          t.ForumID,
+          t.IsLocked,
+          t.IsSticky,
+          COUNT(fp.id) AS Posts,
+          t.LastPostAuthorID,
+          ISNULL(p.TopicID) AS NoPoll,
+          t.StickyPostID,
+          t.AuthorID as OP,
+          t.Ranking
+        FROM forums_topics AS t
+          JOIN forums_posts AS fp ON fp.TopicID = t.ID
+          LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
+        WHERE t.ID = '$ThreadID'
+        GROUP BY fp.TopicID");
+      if (!G::$DB->has_results()) {
+        G::$DB->set_query_id($QueryID);
+        return null;
+      }
+      $ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false);
+      if ($ThreadInfo['StickyPostID']) {
+        $ThreadInfo['Posts']--;
+        G::$DB->query(
+          "SELECT
+            p.ID,
+            p.AuthorID,
+            p.AddedTime,
+            p.Body,
+            p.EditedUserID,
+            p.EditedTime,
+            ed.Username
+            FROM forums_posts AS p
+              LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+            WHERE p.TopicID = '$ThreadID'
+              AND p.ID = '" . $ThreadInfo['StickyPostID'] . "'");
+        list ($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC);
+      }
+      G::$DB->set_query_id($QueryID);
+      if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
+        G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0);
+      }
+    }
+    if ($Return) {
+      return $ThreadInfo;
+    }
+  }
 
-	/**
-	 * Checks whether user has permissions on a forum.
-	 *
-	 * @param int $ForumID
-	 *        	the forum ID.
-	 * @param string $Perm
-	 *        	the permissision to check, defaults to 'Read'
-	 * @return boolean true if user has permission
-	 */
-	public static function check_forumperm($ForumID, $Perm = 'Read') {
-		$Forums = self::get_forums();
-		if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) {
-			return true;
-		}
-		if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) {
-			return true;
-		}
-		if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) {
-			return false;
-		}
-		if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) {
-			return false;
-		}
-		return true;
-	}
+  /**
+   * Checks whether user has permissions on a forum.
+   *
+   * @param int $ForumID
+   *          the forum ID.
+   * @param string $Perm
+   *          the permissision to check, defaults to 'Read'
+   * @return boolean true if user has permission
+   */
+  public static function check_forumperm($ForumID, $Perm = 'Read') {
+    $Forums = self::get_forums();
+    if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) {
+      return true;
+    }
+    if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) {
+      return true;
+    }
+    if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) {
+      return false;
+    }
+    if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) {
+      return false;
+    }
+    return true;
+  }
 
-	/**
-	 * Gets basic info on a forum.
-	 *
-	 * @param int $ForumID
-	 *        	the forum ID.
-	 */
-	public static function get_forum_info($ForumID) {
-		$Forum = G::$Cache->get_value("ForumInfo_$ForumID");
-		if (!$Forum) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					Name,
-					MinClassRead,
-					MinClassWrite,
-					MinClassCreate,
-					COUNT(forums_topics.ID) AS Topics
-				FROM forums
-					LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID
-				WHERE forums.ID = '$ForumID'
-				GROUP BY ForumID");
-			if (!G::$DB->has_results()) {
-				return false;
-			}
-			// Makes an array, with $Forum['Name'], etc.
-			$Forum = G::$DB->next_record(MYSQLI_ASSOC);
+  /**
+   * Gets basic info on a forum.
+   *
+   * @param int $ForumID
+   *          the forum ID.
+   */
+  public static function get_forum_info($ForumID) {
+    $Forum = G::$Cache->get_value("ForumInfo_$ForumID");
+    if (!$Forum) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          Name,
+          MinClassRead,
+          MinClassWrite,
+          MinClassCreate,
+          COUNT(forums_topics.ID) AS Topics
+        FROM forums
+          LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID
+        WHERE forums.ID = '$ForumID'
+        GROUP BY ForumID");
+      if (!G::$DB->has_results()) {
+        return false;
+      }
+      // Makes an array, with $Forum['Name'], etc.
+      $Forum = G::$DB->next_record(MYSQLI_ASSOC);
 
-			G::$DB->set_query_id($QueryID);
+      G::$DB->set_query_id($QueryID);
 
-			G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400);
-		}
-		return $Forum;
-	}
+      G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400);
+    }
+    return $Forum;
+  }
 
-	/**
-	 * Get the forum categories
-	 * @return array ForumCategoryID => Name
-	 */
-	public static function get_forum_categories() {
-		$ForumCats = G::$Cache->get_value('forums_categories');
-		if ($ForumCats === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT ID, Name
-				FROM forums_categories");
-			$ForumCats = array();
-			while (list ($ID, $Name) = G::$DB->next_record()) {
-				$ForumCats[$ID] = $Name;
-			}
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value('forums_categories', $ForumCats, 0);
-		}
-		return $ForumCats;
-	}
+  /**
+   * Get the forum categories
+   * @return array ForumCategoryID => Name
+   */
+  public static function get_forum_categories() {
+    $ForumCats = G::$Cache->get_value('forums_categories');
+    if ($ForumCats === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT ID, Name
+        FROM forums_categories");
+      $ForumCats = array();
+      while (list ($ID, $Name) = G::$DB->next_record()) {
+        $ForumCats[$ID] = $Name;
+      }
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value('forums_categories', $ForumCats, 0);
+    }
+    return $ForumCats;
+  }
 
-	/**
-	 * Get the forums
-	 * @return array ForumID => (various information about the forum)
-	 */
-	public static function get_forums() {
-		if (!$Forums = G::$Cache->get_value('forums_list')) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					f.ID,
-					f.CategoryID,
-					f.Name,
-					f.Description,
-					f.MinClassRead AS MinClassRead,
-					f.MinClassWrite AS MinClassWrite,
-					f.MinClassCreate AS MinClassCreate,
-					f.NumTopics,
-					f.NumPosts,
-					f.LastPostID,
-					f.LastPostAuthorID,
-					f.LastPostTopicID,
-					f.LastPostTime,
-					0 AS SpecificRules,
-					t.Title,
-					t.IsLocked AS Locked,
-					t.IsSticky AS Sticky
-				FROM forums AS f
-					JOIN forums_categories AS fc ON fc.ID = f.CategoryID
-					LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID
-				GROUP BY f.ID
-				ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort");
-			$Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false);
+  /**
+   * Get the forums
+   * @return array ForumID => (various information about the forum)
+   */
+  public static function get_forums() {
+    if (!$Forums = G::$Cache->get_value('forums_list')) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          f.ID,
+          f.CategoryID,
+          f.Name,
+          f.Description,
+          f.MinClassRead AS MinClassRead,
+          f.MinClassWrite AS MinClassWrite,
+          f.MinClassCreate AS MinClassCreate,
+          f.NumTopics,
+          f.NumPosts,
+          f.LastPostID,
+          f.LastPostAuthorID,
+          f.LastPostTopicID,
+          f.LastPostTime,
+          0 AS SpecificRules,
+          t.Title,
+          t.IsLocked AS Locked,
+          t.IsSticky AS Sticky
+        FROM forums AS f
+          JOIN forums_categories AS fc ON fc.ID = f.CategoryID
+          LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID
+        GROUP BY f.ID
+        ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort");
+      $Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false);
 
-			G::$DB->query("
-				SELECT ForumID, ThreadID
-				FROM forums_specific_rules");
-			$SpecificRules = array();
-			while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) {
-				$SpecificRules[$ForumID][] = $ThreadID;
-			}
-			G::$DB->set_query_id($QueryID);
-			foreach ($Forums as $ForumID => &$Forum) {
-				if (isset($SpecificRules[$ForumID])) {
-					$Forum['SpecificRules'] = $SpecificRules[$ForumID];
-				} else {
-					$Forum['SpecificRules'] = array();
-				}
-			}
-			G::$Cache->cache_value('forums_list', $Forums, 0);
-		}
-		return $Forums;
-	}
+      G::$DB->query("
+        SELECT ForumID, ThreadID
+        FROM forums_specific_rules");
+      $SpecificRules = array();
+      while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) {
+        $SpecificRules[$ForumID][] = $ThreadID;
+      }
+      G::$DB->set_query_id($QueryID);
+      foreach ($Forums as $ForumID => &$Forum) {
+        if (isset($SpecificRules[$ForumID])) {
+          $Forum['SpecificRules'] = $SpecificRules[$ForumID];
+        } else {
+          $Forum['SpecificRules'] = array();
+        }
+      }
+      G::$Cache->cache_value('forums_list', $Forums, 0);
+    }
+    return $Forums;
+  }
 
-	/**
-	 * Get all forums that the current user has special access to ("Extra forums" in the profile)
-	 * @return array Array of ForumIDs
-	 */
-	public static function get_permitted_forums() {
-		if (isset(G::$LoggedUser['CustomForums'])) {
-			return (array)array_keys(G::$LoggedUser['CustomForums'], 1);
-		} else {
-			return array();
-		}
-	}
+  /**
+   * Get all forums that the current user has special access to ("Extra forums" in the profile)
+   * @return array Array of ForumIDs
+   */
+  public static function get_permitted_forums() {
+    if (isset(G::$LoggedUser['CustomForums'])) {
+      return (array)array_keys(G::$LoggedUser['CustomForums'], 1);
+    } else {
+      return array();
+    }
+  }
 
-	/**
-	 * Get all forums that the current user does not have access to ("Restricted forums" in the profile)
-	 * @return array Array of ForumIDs
-	 */
-	public static function get_restricted_forums() {
-	  if (isset(G::$LoggedUser['CustomForums'])) {
-			return (array)array_keys(G::$LoggedUser['CustomForums'], 0);
-		} else {
-			return array();
-		}
-	}
+  /**
+   * Get all forums that the current user does not have access to ("Restricted forums" in the profile)
+   * @return array Array of ForumIDs
+   */
+  public static function get_restricted_forums() {
+    if (isset(G::$LoggedUser['CustomForums'])) {
+      return (array)array_keys(G::$LoggedUser['CustomForums'], 0);
+    } else {
+      return array();
+    }
+  }
 
-	/**
-	 * Get the last read posts for the current user
-	 * @param array $Forums Array of forums as returned by self::get_forums()
-	 * @return array TopicID => array(TopicID, PostID, Page) where PostID is the ID of the last read post and Page is the page on which that post is
-	 */
-	public static function get_last_read($Forums) {
-		if (isset(G::$LoggedUser['PostsPerPage'])) {
-			$PerPage = G::$LoggedUser['PostsPerPage'];
-		} else {
-			$PerPage = POSTS_PER_PAGE;
-		}
-		$TopicIDs = array();
-		foreach ($Forums as $Forum) {
-			if (!empty($Forum['LastPostTopicID'])) {
-				$TopicIDs[] = $Forum['LastPostTopicID'];
-			}
-		}
-		if (!empty($TopicIDs)) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					l.TopicID,
-					l.PostID,
-					CEIL(
-						(
-							SELECT
-								COUNT(p.ID)
-							FROM forums_posts AS p
-							WHERE p.TopicID = l.TopicID
-								AND p.ID <= l.PostID
-						) / $PerPage
-					) AS Page
-				FROM forums_last_read_topics AS l
-				WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND
-					l.UserID = '" . G::$LoggedUser['ID'] . "'");
-			$LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC);
-			G::$DB->set_query_id($QueryID);
-		} else {
-			$LastRead = array();
-		}
-		return $LastRead;
-	}
+  /**
+   * Get the last read posts for the current user
+   * @param array $Forums Array of forums as returned by self::get_forums()
+   * @return array TopicID => array(TopicID, PostID, Page) where PostID is the ID of the last read post and Page is the page on which that post is
+   */
+  public static function get_last_read($Forums) {
+    if (isset(G::$LoggedUser['PostsPerPage'])) {
+      $PerPage = G::$LoggedUser['PostsPerPage'];
+    } else {
+      $PerPage = POSTS_PER_PAGE;
+    }
+    $TopicIDs = array();
+    foreach ($Forums as $Forum) {
+      if (!empty($Forum['LastPostTopicID'])) {
+        $TopicIDs[] = $Forum['LastPostTopicID'];
+      }
+    }
+    if (!empty($TopicIDs)) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          l.TopicID,
+          l.PostID,
+          CEIL(
+            (
+              SELECT
+                COUNT(p.ID)
+              FROM forums_posts AS p
+              WHERE p.TopicID = l.TopicID
+                AND p.ID <= l.PostID
+            ) / $PerPage
+          ) AS Page
+        FROM forums_last_read_topics AS l
+        WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND
+          l.UserID = '" . G::$LoggedUser['ID'] . "'");
+      $LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC);
+      G::$DB->set_query_id($QueryID);
+    } else {
+      $LastRead = array();
+    }
+    return $LastRead;
+  }
 
-	/**
-	 * Add a note to a topic.
-	 * @param int $TopicID
-	 * @param string $Note
-	 * @param int|null $UserID
-	 * @return boolean
-	 */
-	public static function add_topic_note($TopicID, $Note, $UserID = null) {
-		if ($UserID === null) {
-			$UserID = G::$LoggedUser['ID'];
-		}
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			INSERT INTO forums_topic_notes
-				(TopicID, AuthorID, AddedTime, Body)
-			VALUES
-				($TopicID, $UserID, '" . sqltime() . "', '" . db_string($Note) . "')");
-		G::$DB->set_query_id($QueryID);
-		return (bool)G::$DB->affected_rows();
-	}
+  /**
+   * Add a note to a topic.
+   * @param int $TopicID
+   * @param string $Note
+   * @param int|null $UserID
+   * @return boolean
+   */
+  public static function add_topic_note($TopicID, $Note, $UserID = null) {
+    if ($UserID === null) {
+      $UserID = G::$LoggedUser['ID'];
+    }
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      INSERT INTO forums_topic_notes
+        (TopicID, AuthorID, AddedTime, Body)
+      VALUES
+        ($TopicID, $UserID, '" . sqltime() . "', '" . db_string($Note) . "')");
+    G::$DB->set_query_id($QueryID);
+    return (bool)G::$DB->affected_rows();
+  }
 
-	/**
-	 * Determine if a thread is unread
-	 * @param bool $Locked
-	 * @param bool $Sticky
-	 * @param int $LastPostID
-	 * @param array $LastRead An array as returned by self::get_last_read
-	 * @param int $LastTopicID TopicID of the thread where the most recent post was made
-	 * @param string $LastTime Datetime of the last post
-	 * @return bool
-	 */
-	public static function is_unread($Locked, $Sticky, $LastPostID, $LastRead, $LastTopicID, $LastTime) {
-		return (!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime) > G::$LoggedUser['CatchupTime']);
-	}
+  /**
+   * Determine if a thread is unread
+   * @param bool $Locked
+   * @param bool $Sticky
+   * @param int $LastPostID
+   * @param array $LastRead An array as returned by self::get_last_read
+   * @param int $LastTopicID TopicID of the thread where the most recent post was made
+   * @param string $LastTime Datetime of the last post
+   * @return bool
+   */
+  public static function is_unread($Locked, $Sticky, $LastPostID, $LastRead, $LastTopicID, $LastTime) {
+    return (!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime) > G::$LoggedUser['CatchupTime']);
+  }
 
-	/**
-	 * Create the part of WHERE in the sql queries used to filter forums for a
-	 * specific user (MinClassRead, restricted and permitted forums).
-	 * @return string
-	 */
-	public static function user_forums_sql() {
-		// I couldn't come up with a good name, please rename this if you can. -- Y
-		$RestrictedForums = self::get_restricted_forums();
-		$PermittedForums = self::get_permitted_forums();
-		if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) {
-			$PermittedForums[] = DONOR_FORUM;
-		}
-		$SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'";
-		if (count($RestrictedForums)) {
-			$SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')";
-		}
-		$SQL .= ')';
-		if (count($PermittedForums)) {
-			$SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')";
-		}
-		$SQL .= ')';
-		return $SQL;
-	}
+  /**
+   * Create the part of WHERE in the sql queries used to filter forums for a
+   * specific user (MinClassRead, restricted and permitted forums).
+   * @return string
+   */
+  public static function user_forums_sql() {
+    // I couldn't come up with a good name, please rename this if you can. -- Y
+    $RestrictedForums = self::get_restricted_forums();
+    $PermittedForums = self::get_permitted_forums();
+    if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) {
+      $PermittedForums[] = DONOR_FORUM;
+    }
+    $SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'";
+    if (count($RestrictedForums)) {
+      $SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')";
+    }
+    $SQL .= ')';
+    if (count($PermittedForums)) {
+      $SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')";
+    }
+    $SQL .= ')';
+    return $SQL;
+  }
 }

classes/g.class.php

@@ -1,13 +1,13 @@
 <?
 class G {
-	public static $DB;
-	public static $Cache;
-	public static $LoggedUser;
+  public static $DB;
+  public static $Cache;
+  public static $LoggedUser;
 
-	public static function initialize() {
-		global $DB, $Cache, $LoggedUser;
-		self::$DB = $DB;
-		self::$Cache = $Cache;
-		self::$LoggedUser =& $LoggedUser;
-	}
+  public static function initialize() {
+    global $DB, $Cache, $LoggedUser;
+    self::$DB = $DB;
+    self::$Cache = $Cache;
+    self::$LoggedUser =& $LoggedUser;
+  }
 }

classes/image.class.php

@@ -1,57 +1,57 @@
 <?
 if (!extension_loaded('gd')) {
-	error('GD Extension not loaded.');
+  error('GD Extension not loaded.');
 }
 
 class IMAGE {
-	var $Image = false;
-	var $FontSize = 10;
-	var $Font = '';
-	var $TextAngle = 0;
-
-	function create($Width, $Height) {
-		$this->Image = imagecreate($Width, $Height);
-		$this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF';
-		if (function_exists('imageantialias')) {
-			imageantialias($this->Image, true);
-		}
-	}
-
-	function color($Red, $Green, $Blue, $Alpha = 0) {
-		return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha);
-	}
-
-	function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1) {
-		if ($Thickness == 1) {
-			return imageline($this->Image, $x1, $y1, $x2, $y2, $Color);
-		}
-		$t = $Thickness / 2 - 0.5;
-		if ($x1 == $x2 || $y1 == $y2) {
-			return imagefilledrectangle($this->Image, round(min($x1, $x2) - $t), round(min($y1, $y2) - $t), round(max($x1, $x2) + $t), round(max($y1, $y2) + $t), $color);
-		}
-		$k = ($y2 - $y1) / ($x2 - $x1); //y = kx + q
-		$a = $t / sqrt(1 + pow($k, 2));
-		$Points = array(
-			round($x1 - (1 + $k) * $a), round($y1 + (1 - $k) * $a),
-			round($x1 - (1 - $k) * $a), round($y1 - (1 + $k) * $a),
-			round($x2 + (1 + $k) * $a), round($y2 - (1 - $k) * $a),
-			round($x2 + (1 - $k) * $a), round($y2 + (1 + $k) * $a),
-		);
-		imagefilledpolygon($this->Image, $Points, 4, $Color);
-		return imagepolygon($this->Image, $Points, 4, $Color);
-	}
-
-	function ellipse($x, $y, $Width, $Height, $Color) {
-		return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color);
-	}
-
-	function text($x, $y, $Color, $Text) {
-		return imagettftext ($this->Image, $this->FontSize, $this->TextAngle, $x, $y, $Color, $this->Font, $Text);
-	}
-
-	function make_png($FileName = null) {
-		return imagepng($this->Image, $FileName);
-	}
+  var $Image = false;
+  var $FontSize = 10;
+  var $Font = '';
+  var $TextAngle = 0;
+
+  function create($Width, $Height) {
+    $this->Image = imagecreate($Width, $Height);
+    $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF';
+    if (function_exists('imageantialias')) {
+      imageantialias($this->Image, true);
+    }
+  }
+
+  function color($Red, $Green, $Blue, $Alpha = 0) {
+    return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha);
+  }
+
+  function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1) {
+    if ($Thickness == 1) {
+      return imageline($this->Image, $x1, $y1, $x2, $y2, $Color);
+    }
+    $t = $Thickness / 2 - 0.5;
+    if ($x1 == $x2 || $y1 == $y2) {
+      return imagefilledrectangle($this->Image, round(min($x1, $x2) - $t), round(min($y1, $y2) - $t), round(max($x1, $x2) + $t), round(max($y1, $y2) + $t), $color);
+    }
+    $k = ($y2 - $y1) / ($x2 - $x1); //y = kx + q
+    $a = $t / sqrt(1 + pow($k, 2));
+    $Points = array(
+      round($x1 - (1 + $k) * $a), round($y1 + (1 - $k) * $a),
+      round($x1 - (1 - $k) * $a), round($y1 - (1 + $k) * $a),
+      round($x2 + (1 + $k) * $a), round($y2 - (1 - $k) * $a),
+      round($x2 + (1 - $k) * $a), round($y2 + (1 + $k) * $a),
+    );
+    imagefilledpolygon($this->Image, $Points, 4, $Color);
+    return imagepolygon($this->Image, $Points, 4, $Color);
+  }
+
+  function ellipse($x, $y, $Width, $Height, $Color) {
+    return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color);
+  }
+
+  function text($x, $y, $Color, $Text) {
+    return imagettftext ($this->Image, $this->FontSize, $this->TextAngle, $x, $y, $Color, $this->Font, $Text);
+  }
+
+  function make_png($FileName = null) {
+    return imagepng($this->Image, $FileName);
+  }
 
 
 }

classes/imagetools.class.php

@@ -5,245 +5,245 @@
  * Thumbnail aide, mostly
  */
 class ImageTools {
-	/**
-	 * Store processed links to avoid repetition
-	 * @var array 'URL' => 'Parsed URL'
-	 */
-	private static $Storage = array();
-
-	/**
-	 * We use true as an extra property to make the domain an array key
-	 * @var array $Hosts Array of image hosts
-	 */
-	private static $Hosts = array(
-//		'imgur.com' => true,
-		'whatimg.com' => true
-	);
-
-	/**
-	 * Blacklisted sites
-	 * @var array $Blacklist Array of blacklisted hosts
-	 */
-	private static $Blacklist = array(
-		'tinypic.com'
-	);
-
-	/**
-	 * Array of image hosts that provide thumbnailing
-	 * @var array $Thumbs
-	 */
-	private static $Thumbs = array(
-//		'i.imgur.com' => true,
-		'whatimg.com' => true
-	);
-
-	/**
-	 * Array of extensions
-	 * @var array $Extensions
-	 */
-	private static $Extensions = array(
-		'jpg' => true,
-		'jpeg' => true,
-		'png' => true,
-		'gif' => true,
-	);
-
-	/**
-	 * Array of user IDs whose avatars have been checked for size
-	 * @var array $CheckedAvatars
-	 */
-	private static $CheckedAvatars = array();
-	private static $CheckedAvatars2 = array();
-
-	/**
-	 * Array of user IDs whose donor icons have been checked for size
-	 * @var array $CheckedDonorIcons
-	 */
-	private static $CheckedDonorIcons = array();
-
-	/**
-	 * Checks from our list of valid hosts
-	 * @param string $Host Domain/host to check
-	 * @return boolean
-	 */
-	public static function valid_host($Host) {
-		return !empty(self::$Hosts[$Host]) && self::$Hosts[$Host] === true;
-	}
-
-	/**
-	 * Checks if a link's host is (not) good, otherwise displays an error.
-	 * @param string $Url Link to an image
-	 * @return boolean
-	 */
-	public static function blacklisted($Url, $ShowError = true) {
-		foreach (self::$Blacklist as &$Value) {
-			$Blacklisted = stripos($Url, $Value);
-			if ($Blacklisted !== false) {
-				$ParsedUrl = parse_url($Url);
-				if ($ShowError) {
-					error($ParsedUrl['host'] . ' is not an allowed image host. Please use a different host.');
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks to see if a link has a thumbnail
-	 * @param string $Url Link to an image
-	 * @return string|false Matched host or false
-	 */
-	private static function thumbnailable($Url) {
-		$ParsedUrl = parse_url($Url);
-		return !empty(self::$Thumbs[$ParsedUrl['host']]);
-	}
-
-	/**
-	 * Checks an extension
-	 * @param string $Ext Extension to check
-	 * @return boolean
-	 */
-	private static function valid_extension($Ext) {
-//		return @self::$Extensions[$Ext] === true;
-		return !empty(self::$Extensions[$Ext]) && (self::$Extensions[$Ext] === true);
-	}
-
-	/**
-	 * Stores a link with a (thumbnail) link
-	 * @param type $Link
-	 * @param type $Processed
-	 */
-	private static function store($Link, $Processed) {
-		self::$Storage[$Link] = $Processed;
-	}
-
-	/**
-	 * Retrieves an entry from our storage
-	 * @param type $Link
-	 * @return boolean|string Returns false if no match
-	 */
-	private static function get_stored($Link) {
-		if (isset(self::$Storage[$Link])) {
-			return self::$Storage[$Link];
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if URL points to a whatimg thumbnail.
-	 */
-	private static function has_whatimg_thumb($Url) {
-		return (strpos($Url, '_thumb') !== false);
-	}
-
-	/**
-	 * Cleans up imgur URL if it already has a modifier attached to the end of it.
-	 */
-	private static function clean_imgur_url($Url) {
-		$Extension = pathinfo($Url, PATHINFO_EXTENSION);
-		$Full = preg_replace('/\.[^.]*$/', '', $Url);
-		$Base = substr($Full, 0, strrpos($Full, '/'));
-		$Path = substr($Full, strrpos($Full, '/') + 1);
-		if (strlen($Path) == 6) {
-			$Last = $Path[strlen($Path) - 1];
-			if ($Last == 'm' || $Last == 'l' || $Last == 's' || $Last == 'h' || $Last == 'b') {
-				$Path = substr($Path, 0, -1);
-			}
-		}
-		return "$Base/$Path.$Extension";
-	}
-
-	/**
-	 * Replaces the extension.
-	 */
-	private static function replace_extension($String, $Extension) {
-		return preg_replace('/\.[^.]*$/', $Extension, $String);
-	}
-
-	/**
-	 * Create image proxy URL
-	 * @param string $Url image URL
-	 * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon"
-	 * @param bool/string/number $UserID - user ID for avatars and donor icons
-	 * @return image proxy URL
-	 */
-	public static function proxy_url($Url, $CheckSize, $UserID, &$ExtraInfo) {
-		if ($UserID) {
-			$ExtraInfo = "&userid=$UserID";
-			if ($CheckSize === 'avatar' && !isset(self::$CheckedAvatars[$UserID])) {
-				$ExtraInfo .= "&type=$CheckSize";
-				self::$CheckedAvatars[$UserID] = true;
-			} elseif ($CheckSize === 'avatar2' && !isset(self::$CheckedAvatars2[$UserID])) {
-				$ExtraInfo .= "&type=$CheckSize";
-				self::$CheckedAvatars2[$UserID] = true;
-			} elseif ($CheckSize === 'donoricon' && !isset(self::$CheckedDonorIcons[$UserID])) {
-				$ExtraInfo .= "&type=$CheckSize";
-				self::$CheckedDonorIcons[$UserID] = true;
-			}
-		}
+  /**
+   * Store processed links to avoid repetition
+   * @var array 'URL' => 'Parsed URL'
+   */
+  private static $Storage = array();
+
+  /**
+   * We use true as an extra property to make the domain an array key
+   * @var array $Hosts Array of image hosts
+   */
+  private static $Hosts = array(
+//    'imgur.com' => true,
+    'whatimg.com' => true
+  );
+
+  /**
+   * Blacklisted sites
+   * @var array $Blacklist Array of blacklisted hosts
+   */
+  private static $Blacklist = array(
+    'tinypic.com'
+  );
+
+  /**
+   * Array of image hosts that provide thumbnailing
+   * @var array $Thumbs
+   */
+  private static $Thumbs = array(
+//    'i.imgur.com' => true,
+    'whatimg.com' => true
+  );
+
+  /**
+   * Array of extensions
+   * @var array $Extensions
+   */
+  private static $Extensions = array(
+    'jpg' => true,
+    'jpeg' => true,
+    'png' => true,
+    'gif' => true,
+  );
+
+  /**
+   * Array of user IDs whose avatars have been checked for size
+   * @var array $CheckedAvatars
+   */
+  private static $CheckedAvatars = array();
+  private static $CheckedAvatars2 = array();
+
+  /**
+   * Array of user IDs whose donor icons have been checked for size
+   * @var array $CheckedDonorIcons
+   */
+  private static $CheckedDonorIcons = array();
+
+  /**
+   * Checks from our list of valid hosts
+   * @param string $Host Domain/host to check
+   * @return boolean
+   */
+  public static function valid_host($Host) {
+    return !empty(self::$Hosts[$Host]) && self::$Hosts[$Host] === true;
+  }
+
+  /**
+   * Checks if a link's host is (not) good, otherwise displays an error.
+   * @param string $Url Link to an image
+   * @return boolean
+   */
+  public static function blacklisted($Url, $ShowError = true) {
+    foreach (self::$Blacklist as &$Value) {
+      $Blacklisted = stripos($Url, $Value);
+      if ($Blacklisted !== false) {
+        $ParsedUrl = parse_url($Url);
+        if ($ShowError) {
+          error($ParsedUrl['host'] . ' is not an allowed image host. Please use a different host.');
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Checks to see if a link has a thumbnail
+   * @param string $Url Link to an image
+   * @return string|false Matched host or false
+   */
+  private static function thumbnailable($Url) {
+    $ParsedUrl = parse_url($Url);
+    return !empty(self::$Thumbs[$ParsedUrl['host']]);
+  }
+
+  /**
+   * Checks an extension
+   * @param string $Ext Extension to check
+   * @return boolean
+   */
+  private static function valid_extension($Ext) {
+//    return @self::$Extensions[$Ext] === true;
+    return !empty(self::$Extensions[$Ext]) && (self::$Extensions[$Ext] === true);
+  }
+
+  /**
+   * Stores a link with a (thumbnail) link
+   * @param type $Link
+   * @param type $Processed
+   */
+  private static function store($Link, $Processed) {
+    self::$Storage[$Link] = $Processed;
+  }
+
+  /**
+   * Retrieves an entry from our storage
+   * @param type $Link
+   * @return boolean|string Returns false if no match
+   */
+  private static function get_stored($Link) {
+    if (isset(self::$Storage[$Link])) {
+      return self::$Storage[$Link];
+    }
+    return false;
+  }
+
+  /**
+   * Checks if URL points to a whatimg thumbnail.
+   */
+  private static function has_whatimg_thumb($Url) {
+    return (strpos($Url, '_thumb') !== false);
+  }
+
+  /**
+   * Cleans up imgur URL if it already has a modifier attached to the end of it.
+   */
+  private static function clean_imgur_url($Url) {
+    $Extension = pathinfo($Url, PATHINFO_EXTENSION);
+    $Full = preg_replace('/\.[^.]*$/', '', $Url);
+    $Base = substr($Full, 0, strrpos($Full, '/'));
+    $Path = substr($Full, strrpos($Full, '/') + 1);
+    if (strlen($Path) == 6) {
+      $Last = $Path[strlen($Path) - 1];
+      if ($Last == 'm' || $Last == 'l' || $Last == 's' || $Last == 'h' || $Last == 'b') {
+        $Path = substr($Path, 0, -1);
+      }
+    }
+    return "$Base/$Path.$Extension";
+  }
+
+  /**
+   * Replaces the extension.
+   */
+  private static function replace_extension($String, $Extension) {
+    return preg_replace('/\.[^.]*$/', $Extension, $String);
+  }
+
+  /**
+   * Create image proxy URL
+   * @param string $Url image URL
+   * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon"
+   * @param bool/string/number $UserID - user ID for avatars and donor icons
+   * @return image proxy URL
+   */
+  public static function proxy_url($Url, $CheckSize, $UserID, &$ExtraInfo) {
+    if ($UserID) {
+      $ExtraInfo = "&userid=$UserID";
+      if ($CheckSize === 'avatar' && !isset(self::$CheckedAvatars[$UserID])) {
+        $ExtraInfo .= "&type=$CheckSize";
+        self::$CheckedAvatars[$UserID] = true;
+      } elseif ($CheckSize === 'avatar2' && !isset(self::$CheckedAvatars2[$UserID])) {
+        $ExtraInfo .= "&type=$CheckSize";
+        self::$CheckedAvatars2[$UserID] = true;
+      } elseif ($CheckSize === 'donoricon' && !isset(self::$CheckedDonorIcons[$UserID])) {
+        $ExtraInfo .= "&type=$CheckSize";
+        self::$CheckedDonorIcons[$UserID] = true;
+      }
+    }
 
     if (preg_match('/^https:\/\/'.SITE_DOMAIN.'\//', $Url)) {
       return $Url;
     } else {
       return 'https://' . SITE_DOMAIN . "/image.php?c=1&i=" . urlencode($Url);
     }
-	}
-
-	/**
-	 * Determine the image URL. This takes care of the image proxy and thumbnailing.
-	 * @param string $Url
-	 * @param bool $Thumb
-	 * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon"
-	 * @param bool/string/number $UserID - user ID for avatars and donor icons
-	 * @return string
-	 */
-	public static function process($Url, $Thumb = false, $CheckSize = false, $UserID = false) {
-		if (empty($Url)) {
-			return '';
-		}
-
-		if ($Found = self::get_stored($Url . ($Thumb ? '_thumb' : ''))) {
-			return $Found;
-		}
-
-		$ProcessedUrl = $Url;
-		if ($Thumb) {
-			$Extension = pathinfo($Url, PATHINFO_EXTENSION);
-			if (self::thumbnailable($Url) && self::valid_extension($Extension)) {
-				if (strpos($Url, 'whatimg') !== false && !self::has_whatimg_thumb($Url)) {
-					$ProcessedUrl = self::replace_extension($Url, '_thumb.' . $Extension);
-				} elseif (strpos($Url, 'imgur') !== false) {
-					$ProcessedUrl = self::replace_extension(self::clean_imgur_url($Url), 'm.' . $Extension);
-				}
-			}
-		}
-
-		$ExtraInfo = '';
-		if (check_perms('site_proxy_images')) {
-			$ProcessedUrl = self::proxy_url($ProcessedUrl, $CheckSize, $UserID, $ExtraInfo);
-		}
-		self::store($Url . ($Thumb ? '_thumb' : ''), $ProcessedUrl);
-		return $ProcessedUrl . $ExtraInfo;
-	}
-
-	/**
-	 * Cover art thumbnail in browse, on artist pages etc.
-	 * @global array $CategoryIcons
-	 * @param string $Url
-	 * @param int $CategoryID
-	 */
-	public static function cover_thumb($Url, $CategoryID) {
-		global $CategoryIcons;
-		if ($Url) {
-			$Src = self::process($Url, true);
-			$Lightbox = self::process($Url);
-		} else {
-			$Src = STATIC_SERVER . 'common/noartwork/' . $CategoryIcons[$CategoryID - 1];
-			$Lightbox = $Src;
-		}
+  }
+
+  /**
+   * Determine the image URL. This takes care of the image proxy and thumbnailing.
+   * @param string $Url
+   * @param bool $Thumb
+   * @param bool/string $CheckSize - accepts one of false, "avatar", "avatar2", or "donoricon"
+   * @param bool/string/number $UserID - user ID for avatars and donor icons
+   * @return string
+   */
+  public static function process($Url, $Thumb = false, $CheckSize = false, $UserID = false) {
+    if (empty($Url)) {
+      return '';
+    }
+
+    if ($Found = self::get_stored($Url . ($Thumb ? '_thumb' : ''))) {
+      return $Found;
+    }
+
+    $ProcessedUrl = $Url;
+    if ($Thumb) {
+      $Extension = pathinfo($Url, PATHINFO_EXTENSION);
+      if (self::thumbnailable($Url) && self::valid_extension($Extension)) {
+        if (strpos($Url, 'whatimg') !== false && !self::has_whatimg_thumb($Url)) {
+          $ProcessedUrl = self::replace_extension($Url, '_thumb.' . $Extension);
+        } elseif (strpos($Url, 'imgur') !== false) {
+          $ProcessedUrl = self::replace_extension(self::clean_imgur_url($Url), 'm.' . $Extension);
+        }
+      }
+    }
+
+    $ExtraInfo = '';
+    if (check_perms('site_proxy_images')) {
+      $ProcessedUrl = self::proxy_url($ProcessedUrl, $CheckSize, $UserID, $ExtraInfo);
+    }
+    self::store($Url . ($Thumb ? '_thumb' : ''), $ProcessedUrl);
+    return $ProcessedUrl . $ExtraInfo;
+  }
+
+  /**
+   * Cover art thumbnail in browse, on artist pages etc.
+   * @global array $CategoryIcons
+   * @param string $Url
+   * @param int $CategoryID
+   */
+  public static function cover_thumb($Url, $CategoryID) {
+    global $CategoryIcons;
+    if ($Url) {
+      $Src = self::process($Url, true);
+      $Lightbox = self::process($Url);
+    } else {
+      $Src = STATIC_SERVER . 'common/noartwork/' . $CategoryIcons[$CategoryID - 1];
+      $Lightbox = $Src;
+    }
 ?>
-		<img src="<?=$Src?>" width="90" height="90" alt="Cover" onclick="lightbox.init('<?=$Lightbox?>', 90)" />
+    <img src="<?=$Src?>" width="90" height="90" alt="Cover" onclick="lightbox.init('<?=$Lightbox?>', 90)" />
 <?
-	}
+  }
 }

classes/inbox.class.php

@@ -1,31 +1,31 @@
 <?php
 
 class Inbox {
-	/*
-	 * Get the link to a user's inbox.
-	 * This is what handles the ListUnreadPMsFirst setting
-	 *
-	 * @param string - whether the inbox or sentbox should be loaded
-	 * @return string - the URL to a user's inbox
-	 */
-	public static function get_inbox_link($WhichBox = 'inbox') {
+  /*
+   * Get the link to a user's inbox.
+   * This is what handles the ListUnreadPMsFirst setting
+   *
+   * @param string - whether the inbox or sentbox should be loaded
+   * @return string - the URL to a user's inbox
+   */
+  public static function get_inbox_link($WhichBox = 'inbox') {
 
-		$ListFirst = isset(G::$LoggedUser['ListUnreadPMsFirst']) ? G::$LoggedUser['ListUnreadPMsFirst'] : false;
+    $ListFirst = isset(G::$LoggedUser['ListUnreadPMsFirst']) ? G::$LoggedUser['ListUnreadPMsFirst'] : false;
 
-		if ($WhichBox == 'inbox') {
-			if ($ListFirst) {
-				$InboxURL = 'inbox.php?sort=unread';
-			} else {
-				$InboxURL = 'inbox.php';
-			}
-		} else {
-			if ($ListFirst) {
-				$InboxURL = 'inbox.php?action=sentbox&amp;sort=unread';
-			} else {
-				$InboxURL = 'inbox.php?action=sentbox';
-			}
-		}
-		return $InboxURL;
-	}
+    if ($WhichBox == 'inbox') {
+      if ($ListFirst) {
+        $InboxURL = 'inbox.php?sort=unread';
+      } else {
+        $InboxURL = 'inbox.php';
+      }
+    } else {
+      if ($ListFirst) {
+        $InboxURL = 'inbox.php?action=sentbox&amp;sort=unread';
+      } else {
+        $InboxURL = 'inbox.php?action=sentbox';
+      }
+    }
+    return $InboxURL;
+  }
 }
 ?>

classes/invite_tree.class.php

@@ -7,239 +7,239 @@
 ***************************************************************************/
 
 class INVITE_TREE {
-	var $UserID = 0;
-	var $Visible = true;
+  var $UserID = 0;
+  var $Visible = true;
 
-	// Set things up
-	function INVITE_TREE($UserID, $Options = array()) {
-		$this->UserID = $UserID;
-		if ($Options['visible'] === false) {
-			$this->Visible = false;
-		}
-	}
+  // Set things up
+  function INVITE_TREE($UserID, $Options = array()) {
+    $this->UserID = $UserID;
+    if ($Options['visible'] === false) {
+      $this->Visible = false;
+    }
+  }
 
-	function make_tree() {
-		$QueryID = G::$DB->get_query_id();
+  function make_tree() {
+    $QueryID = G::$DB->get_query_id();
 
-		$UserID = $this->UserID;
+    $UserID = $this->UserID;
 ?>
-		<div class="invitetree pad">
+    <div class="invitetree pad">
 <?
-		G::$DB->query("
-			SELECT TreePosition, TreeID, TreeLevel
-			FROM invite_tree
-			WHERE UserID = $UserID");
-		list($TreePosition, $TreeID, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false);
-
-		if (!$TreeID) {
-			return;
-		}
-		G::$DB->query("
-			SELECT TreePosition
-			FROM invite_tree
-			WHERE TreeID = $TreeID
-				AND TreeLevel = $TreeLevel
-				AND TreePosition > $TreePosition
-			ORDER BY TreePosition ASC
-			LIMIT 1");
-		if (G::$DB->has_results()) {
-			list($MaxPosition) = G::$DB->next_record(MYSQLI_NUM, false);
-		} else {
-			$MaxPosition = false;
-		}
-		$TreeQuery = G::$DB->query("
-			SELECT
-				it.UserID,
-				Enabled,
-				PermissionID,
-				Donor,
-				Uploaded,
-				Downloaded,
-				Paranoia,
-				TreePosition,
-				TreeLevel
-			FROM invite_tree AS it
-				JOIN users_main AS um ON um.ID = it.UserID
-				JOIN users_info AS ui ON ui.UserID = it.UserID
-			WHERE TreeID = $TreeID
-				AND TreePosition > $TreePosition".
-				($MaxPosition ? " AND TreePosition < $MaxPosition" : '')."
-				AND TreeLevel > $TreeLevel
-			ORDER BY TreePosition");
-
-		$PreviousTreeLevel = $TreeLevel;
-
-		// Stats for the summary
-		$MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
-		$OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
-		$BaseTreeLevel = $TreeLevel + 1; // The level of users invited by our user
-		$Count = 0;
-		$Branches = 0;
-		$DisabledCount = 0;
-		$DonorCount = 0;
-		$ParanoidCount = 0;
-		$TotalUpload = 0;
-		$TotalDownload = 0;
-		$TopLevelUpload = 0;
-		$TopLevelDownload = 0;
-
-		$ClassSummary = array();
-		global $Classes;
-		foreach ($Classes as $ClassID => $Val) {
-			$ClassSummary[$ClassID] = 0;
-		}
-
-		// We store this in an output buffer, so we can show the summary at the top without having to loop through twice
-		ob_start();
-		while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) {
-
-			// Do stats
-			$Count++;
-
-			if ($TreeLevel > $MaxTreeLevel) {
-				$MaxTreeLevel = $TreeLevel;
-			}
-
-			if ($TreeLevel == $BaseTreeLevel) {
-				$Branches++;
-				$TopLevelUpload += $Uploaded;
-				$TopLevelDownload += $Downloaded;
-			}
-
-			$ClassSummary[$Class]++;
-			if ($Enabled == 2) {
-				$DisabledCount++;
-			}
-			if ($Donor) {
-				$DonorCount++;
-			}
-
-			// Manage tree depth
-			if ($TreeLevel > $PreviousTreeLevel) {
-				for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
-					echo "\n\n<ul class=\"invitetree\">\n\t<li>\n";
-				}
-			} elseif ($TreeLevel < $PreviousTreeLevel) {
-				for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) {
-					echo "\t</li>\n</ul>\n";
-				}
-				echo "\t</li>\n\t<li>\n";
-			} else {
-				echo "\t</li>\n\t<li>\n";
-			}
-			$UserClass = $Classes[$Class]['Level'];
+    G::$DB->query("
+      SELECT TreePosition, TreeID, TreeLevel
+      FROM invite_tree
+      WHERE UserID = $UserID");
+    list($TreePosition, $TreeID, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false);
+
+    if (!$TreeID) {
+      return;
+    }
+    G::$DB->query("
+      SELECT TreePosition
+      FROM invite_tree
+      WHERE TreeID = $TreeID
+        AND TreeLevel = $TreeLevel
+        AND TreePosition > $TreePosition
+      ORDER BY TreePosition ASC
+      LIMIT 1");
+    if (G::$DB->has_results()) {
+      list($MaxPosition) = G::$DB->next_record(MYSQLI_NUM, false);
+    } else {
+      $MaxPosition = false;
+    }
+    $TreeQuery = G::$DB->query("
+      SELECT
+        it.UserID,
+        Enabled,
+        PermissionID,
+        Donor,
+        Uploaded,
+        Downloaded,
+        Paranoia,
+        TreePosition,
+        TreeLevel
+      FROM invite_tree AS it
+        JOIN users_main AS um ON um.ID = it.UserID
+        JOIN users_info AS ui ON ui.UserID = it.UserID
+      WHERE TreeID = $TreeID
+        AND TreePosition > $TreePosition".
+        ($MaxPosition ? " AND TreePosition < $MaxPosition" : '')."
+        AND TreeLevel > $TreeLevel
+      ORDER BY TreePosition");
+
+    $PreviousTreeLevel = $TreeLevel;
+
+    // Stats for the summary
+    $MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
+    $OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
+    $BaseTreeLevel = $TreeLevel + 1; // The level of users invited by our user
+    $Count = 0;
+    $Branches = 0;
+    $DisabledCount = 0;
+    $DonorCount = 0;
+    $ParanoidCount = 0;
+    $TotalUpload = 0;
+    $TotalDownload = 0;
+    $TopLevelUpload = 0;
+    $TopLevelDownload = 0;
+
+    $ClassSummary = array();
+    global $Classes;
+    foreach ($Classes as $ClassID => $Val) {
+      $ClassSummary[$ClassID] = 0;
+    }
+
+    // We store this in an output buffer, so we can show the summary at the top without having to loop through twice
+    ob_start();
+    while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) {
+
+      // Do stats
+      $Count++;
+
+      if ($TreeLevel > $MaxTreeLevel) {
+        $MaxTreeLevel = $TreeLevel;
+      }
+
+      if ($TreeLevel == $BaseTreeLevel) {
+        $Branches++;
+        $TopLevelUpload += $Uploaded;
+        $TopLevelDownload += $Downloaded;
+      }
+
+      $ClassSummary[$Class]++;
+      if ($Enabled == 2) {
+        $DisabledCount++;
+      }
+      if ($Donor) {
+        $DonorCount++;
+      }
+
+      // Manage tree depth
+      if ($TreeLevel > $PreviousTreeLevel) {
+        for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
+          echo "\n\n<ul class=\"invitetree\">\n\t<li>\n";
+        }
+      } elseif ($TreeLevel < $PreviousTreeLevel) {
+        for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) {
+          echo "\t</li>\n</ul>\n";
+        }
+        echo "\t</li>\n\t<li>\n";
+      } else {
+        echo "\t</li>\n\t<li>\n";
+      }
+      $UserClass = $Classes[$Class]['Level'];
 ?>
-		<strong><?=Users::format_username($ID, true, true, ($Enabled != 2 ? false : true), true)?></strong>
+    <strong><?=Users::format_username($ID, true, true, ($Enabled != 2 ? false : true), true)?></strong>
 <?
-			if (check_paranoia(array('uploaded', 'downloaded'), $Paranoia, $UserClass)) {
-				$TotalUpload += $Uploaded;
-				$TotalDownload += $Downloaded;
+      if (check_paranoia(array('uploaded', 'downloaded'), $Paranoia, $UserClass)) {
+        $TotalUpload += $Uploaded;
+        $TotalDownload += $Downloaded;
 ?>
-		&nbsp;Uploaded: <strong><?=Format::get_size($Uploaded)?></strong>
-		&nbsp;Downloaded: <strong><?=Format::get_size($Downloaded)?></strong>
-		&nbsp;Ratio: <strong><?=Format::get_ratio_html($Uploaded, $Downloaded)?></strong>
+    &nbsp;Uploaded: <strong><?=Format::get_size($Uploaded)?></strong>
+    &nbsp;Downloaded: <strong><?=Format::get_size($Downloaded)?></strong>
+    &nbsp;Ratio: <strong><?=Format::get_ratio_html($Uploaded, $Downloaded)?></strong>
 <?
-			} else {
-				$ParanoidCount++;
+      } else {
+        $ParanoidCount++;
 ?>
-		&nbsp;Hidden
+    &nbsp;Hidden
 <?
-			}
+      }
 ?>
 
 <?
-			$PreviousTreeLevel = $TreeLevel;
-			G::$DB->set_query_id($TreeQuery);
-		}
+      $PreviousTreeLevel = $TreeLevel;
+      G::$DB->set_query_id($TreeQuery);
+    }
 
-		$Tree = ob_get_clean();
-		for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
-			$Tree .= "\t</li>\n</ul>\n";
-		}
+    $Tree = ob_get_clean();
+    for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
+      $Tree .= "\t</li>\n</ul>\n";
+    }
 
-		if ($Count) {
+    if ($Count) {
 
 ?>
-		<p style="font-weight: bold;">
-			This tree has <?=number_format($Count)?> entries, <?=number_format($Branches)?> branches, and a depth of <?=number_format($MaxTreeLevel - $OriginalTreeLevel)?>.
-			It has
+    <p style="font-weight: bold;">
+      This tree has <?=number_format($Count)?> entries, <?=number_format($Branches)?> branches, and a depth of <?=number_format($MaxTreeLevel - $OriginalTreeLevel)?>.
+      It has
 <?
-			$ClassStrings = array();
-			foreach ($ClassSummary as $ClassID => $ClassCount) {
-				if ($ClassCount == 0) {
-					continue;
-				}
-				$LastClass = Users::make_class_string($ClassID);
-				if ($ClassCount > 1) {
-					if ($LastClass == 'Torrent Celebrity') {
-						 $LastClass = 'Torrent Celebrities';
-					} else {
-						$LastClass.='s';
-					}
-				}
-				$LastClass = "$ClassCount $LastClass (" . number_format(($ClassCount / $Count) * 100) . '%)';
-
-				$ClassStrings[] = $LastClass;
-			}
-			if (count($ClassStrings) > 1) {
-				array_pop($ClassStrings);
-				echo implode(', ', $ClassStrings);
-				echo ' and '.$LastClass;
-			} else {
-				echo $LastClass;
-			}
-			echo '. ';
-			echo $DisabledCount;
-			echo ($DisabledCount == 1) ? ' user is' : ' users are';
-			echo ' disabled (';
-			if ($DisabledCount == 0) {
-				echo '0%)';
-			} else {
-				echo number_format(($DisabledCount / $Count) * 100) . '%)';
-			}
-			echo ', and ';
-			echo $DonorCount;
-			echo ($DonorCount == 1) ? ' user has' : ' users have';
-			echo ' donated (';
-			if ($DonorCount == 0) {
-				echo '0%)';
-			} else {
-				echo number_format(($DonorCount / $Count) * 100) . '%)';
-			}
-			echo '. </p>';
-
-			echo '<p style="font-weight: bold;">';
-			echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload);
-			echo '; the total amount downloaded was '.Format::get_size($TotalDownload);
-			echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. ';
-			echo '</p>';
-
-			echo '<p style="font-weight: bold;">';
-			echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
-			echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
-			echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
-
-			echo "These numbers include the stats of paranoid users and will be factored into the invitation giving script.\n\t\t</p>\n";
-
-			if ($ParanoidCount) {
-				echo '<p style="font-weight: bold;">';
-				echo $ParanoidCount;
-				echo ($ParanoidCount == 1) ? ' user (' : ' users (';
-				echo number_format(($ParanoidCount / $Count) * 100);
-				echo '%) ';
-				echo ($ParanoidCount == 1) ? ' is' : ' are';
-				echo ' too paranoid to have their stats shown here, and ';
-				echo ($ParanoidCount == 1) ? ' was' : ' were';
-				echo ' not factored into the stats for the total tree.';
-				echo '</p>';
-			}
-		}
+      $ClassStrings = array();
+      foreach ($ClassSummary as $ClassID => $ClassCount) {
+        if ($ClassCount == 0) {
+          continue;
+        }
+        $LastClass = Users::make_class_string($ClassID);
+        if ($ClassCount > 1) {
+          if ($LastClass == 'Torrent Celebrity') {
+             $LastClass = 'Torrent Celebrities';
+          } else {
+            $LastClass.='s';
+          }
+        }
+        $LastClass = "$ClassCount $LastClass (" . number_format(($ClassCount / $Count) * 100) . '%)';
+
+        $ClassStrings[] = $LastClass;
+      }
+      if (count($ClassStrings) > 1) {
+        array_pop($ClassStrings);
+        echo implode(', ', $ClassStrings);
+        echo ' and '.$LastClass;
+      } else {
+        echo $LastClass;
+      }
+      echo '. ';
+      echo $DisabledCount;
+      echo ($DisabledCount == 1) ? ' user is' : ' users are';
+      echo ' disabled (';
+      if ($DisabledCount == 0) {
+        echo '0%)';
+      } else {
+        echo number_format(($DisabledCount / $Count) * 100) . '%)';
+      }
+      echo ', and ';
+      echo $DonorCount;
+      echo ($DonorCount == 1) ? ' user has' : ' users have';
+      echo ' donated (';
+      if ($DonorCount == 0) {
+        echo '0%)';
+      } else {
+        echo number_format(($DonorCount / $Count) * 100) . '%)';
+      }
+      echo '. </p>';
+
+      echo '<p style="font-weight: bold;">';
+      echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload);
+      echo '; the total amount downloaded was '.Format::get_size($TotalDownload);
+      echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. ';
+      echo '</p>';
+
+      echo '<p style="font-weight: bold;">';
+      echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
+      echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
+      echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
+
+      echo "These numbers include the stats of paranoid users and will be factored into the invitation giving script.\n\t\t</p>\n";
+
+      if ($ParanoidCount) {
+        echo '<p style="font-weight: bold;">';
+        echo $ParanoidCount;
+        echo ($ParanoidCount == 1) ? ' user (' : ' users (';
+        echo number_format(($ParanoidCount / $Count) * 100);
+        echo '%) ';
+        echo ($ParanoidCount == 1) ? ' is' : ' are';
+        echo ' too paranoid to have their stats shown here, and ';
+        echo ($ParanoidCount == 1) ? ' was' : ' were';
+        echo ' not factored into the stats for the total tree.';
+        echo '</p>';
+      }
+    }
 ?>
-			<br />
-<?=			$Tree?>
-		</div>
+      <br />
+<?=      $Tree?>
+    </div>
 <?
-		G::$DB->set_query_id($QueryID);
-	}
+    G::$DB->set_query_id($QueryID);
+  }
 }
 ?>

classes/irc.class.php

@@ -1,183 +1,183 @@
 <?
 class IRC_DB extends DB_MYSQL {
-	function halt($Msg) {
-		global $Bot;
-		$Bot->send_to($Bot->get_channel(), 'The database is currently unavailable; try again later.');
-	}
+  function halt($Msg) {
+    global $Bot;
+    $Bot->send_to($Bot->get_channel(), 'The database is currently unavailable; try again later.');
+  }
 }
 
 abstract class IRC_BOT {
-	abstract protected function connect_events();
-	abstract protected function channel_events();
-	abstract protected function query_events();
-	abstract protected function irc_events();
-	abstract protected function listener_events();
-
-	protected $Debug = false;
-	protected $Socket = false;
-	protected $Data = false;
-	protected $Whois = false;
-	protected $Identified = array();
-	protected $Channels = array();
-	protected $Messages = array();
-	protected $LastChan = false;
-	protected $ListenSocket = false;
-	protected $Listened = false;
-	protected $Connecting = false;
-	protected $State = 1; // Drone is live
-	public $Restart = 0; // Die by default
-
-	public function __construct() {
-		if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
-			chdir($_SERVER['HOME']);
-		}
-		ob_end_clean();
-		restore_error_handler(); //Avoid PHP error logging
-		set_time_limit(0);
-	}
-
-	public function connect() {
-		$this->connect_irc();
-		$this->connect_listener();
-		$this->post_connect();
-	}
-
-	private function connect_irc($Reconnect = false) {
-		$this->Connecting = true;
-		//Open a socket to the IRC server
-		if (defined('BOT_PORT_SSL')) {
-			$IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
-		} else {
-			$IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
-		}
-		while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
-			sleep(15);
-		}
-		stream_set_blocking($this->Socket, 0);
-		$this->Connecting = false;
-		if ($Reconnect) {
-			$this->post_connect();
-		}
-	}
-
-	private function connect_listener() {
-		//create a socket to listen on
-		$ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
-		if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
-			die("Cannot create listen socket: $ErrStr");
-		}
-		stream_set_blocking($this->ListenSocket, false);
-	}
-
-	private function post_connect() {
-		fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
-		fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
-		$this->listen();
-	}
-
-	public function disconnect() {
-		fclose($this->ListenSocket);
-		$this->State = 0; //Drones dead
-	}
-
-	public function get_channel() {
-		preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
-		if (preg_match('/#.+/', $Channel[1])) {
-			return $Channel[1];
-		} else {
-			return false;
-		}
-	}
-
-	public function get_nick() {
-		preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
-		return $Nick[1];
-	}
-
-	protected function get_message() {
-		preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
-		return trim($Msg[1]);
-	}
-
-	protected function get_irc_host() {
-		preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
-		return trim($Host[1]);
-	}
-
-	protected function get_word($Select = 1) {
-		preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
-		$Word = split(' ', $Word[1]);
-		return trim($Word[$Select]);
-	}
-
-	protected function get_action() {
-		preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
-		return strtoupper($Action[1]);
-	}
-
-	protected function send_raw($Text) {
-		if (!feof($this->Socket)) {
-			fwrite($this->Socket, "$Text\n");
-		} elseif (!$this->Connecting) {
-			$this->Connecting = true;
-			sleep(120);
-			$this->connect_irc(true);
-		}
-	}
-
-	public function send_to($Channel, $Text) {
-		// split the message up into <= 460 character strings and send each individually
-		// this is used to prevent messages from getting truncated
-		$Text = wordwrap($Text, 460, "\n", true);
-		$TextArray = explode("\n", $Text);
-		foreach ($TextArray as $Text) {
-			$this->send_raw("PRIVMSG $Channel :$Text");
-		}
-	}
-
-	protected function whois($Nick) {
-		$this->Whois = $Nick;
-		$this->send_raw("WHOIS $Nick");
-	}
-
-	/*
-	This function uses blacklisted_ip, which is no longer in RC2.
-	You can probably find it in old RC1 code kicking aronud if you need it.
-	protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
-		if (blacklisted_ip($IP)) {
-			$this->send_to($Channel, 'TOR IP Detected: '.$IP);
-			if ($Gline) {
-				$this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
-			}
-		}
-		if (Tools::site_ban_ip($IP)) {
-			$this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
-			if ($Gline) {
-				$this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
-			}
-		}
-	}*/
-
-	protected function listen() {
-		G::$Cache->InternalCache = false;
-		stream_set_timeout($this->Socket, 10000000000);
-		while ($this->State == 1) {
-			$NullSock = null;
-			$Sockets = array($this->Socket, $this->ListenSocket);
-			if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
-				die();
-			}
-			foreach ($Sockets as $Socket) {
-				if ($Socket === $this->Socket) {
-					$this->irc_events();
-				} else {
-					$this->Listened = stream_socket_accept($Socket);
-					$this->listener_events();
-				}
-			}
-			G::$DB->LinkID = false;
-			G::$DB->Queries = array();
-		}
-	}
+  abstract protected function connect_events();
+  abstract protected function channel_events();
+  abstract protected function query_events();
+  abstract protected function irc_events();
+  abstract protected function listener_events();
+
+  protected $Debug = false;
+  protected $Socket = false;
+  protected $Data = false;
+  protected $Whois = false;
+  protected $Identified = array();
+  protected $Channels = array();
+  protected $Messages = array();
+  protected $LastChan = false;
+  protected $ListenSocket = false;
+  protected $Listened = false;
+  protected $Connecting = false;
+  protected $State = 1; // Drone is live
+  public $Restart = 0; // Die by default
+
+  public function __construct() {
+    if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
+      chdir($_SERVER['HOME']);
+    }
+    ob_end_clean();
+    restore_error_handler(); //Avoid PHP error logging
+    set_time_limit(0);
+  }
+
+  public function connect() {
+    $this->connect_irc();
+    $this->connect_listener();
+    $this->post_connect();
+  }
+
+  private function connect_irc($Reconnect = false) {
+    $this->Connecting = true;
+    //Open a socket to the IRC server
+    if (defined('BOT_PORT_SSL')) {
+      $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
+    } else {
+      $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
+    }
+    while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
+      sleep(15);
+    }
+    stream_set_blocking($this->Socket, 0);
+    $this->Connecting = false;
+    if ($Reconnect) {
+      $this->post_connect();
+    }
+  }
+
+  private function connect_listener() {
+    //create a socket to listen on
+    $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
+    if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
+      die("Cannot create listen socket: $ErrStr");
+    }
+    stream_set_blocking($this->ListenSocket, false);
+  }
+
+  private function post_connect() {
+    fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
+    fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
+    $this->listen();
+  }
+
+  public function disconnect() {
+    fclose($this->ListenSocket);
+    $this->State = 0; //Drones dead
+  }
+
+  public function get_channel() {
+    preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
+    if (preg_match('/#.+/', $Channel[1])) {
+      return $Channel[1];
+    } else {
+      return false;
+    }
+  }
+
+  public function get_nick() {
+    preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
+    return $Nick[1];
+  }
+
+  protected function get_message() {
+    preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
+    return trim($Msg[1]);
+  }
+
+  protected function get_irc_host() {
+    preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
+    return trim($Host[1]);
+  }
+
+  protected function get_word($Select = 1) {
+    preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
+    $Word = split(' ', $Word[1]);
+    return trim($Word[$Select]);
+  }
+
+  protected function get_action() {
+    preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
+    return strtoupper($Action[1]);
+  }
+
+  protected function send_raw($Text) {
+    if (!feof($this->Socket)) {
+      fwrite($this->Socket, "$Text\n");
+    } elseif (!$this->Connecting) {
+      $this->Connecting = true;
+      sleep(120);
+      $this->connect_irc(true);
+    }
+  }
+
+  public function send_to($Channel, $Text) {
+    // split the message up into <= 460 character strings and send each individually
+    // this is used to prevent messages from getting truncated
+    $Text = wordwrap($Text, 460, "\n", true);
+    $TextArray = explode("\n", $Text);
+    foreach ($TextArray as $Text) {
+      $this->send_raw("PRIVMSG $Channel :$Text");
+    }
+  }
+
+  protected function whois($Nick) {
+    $this->Whois = $Nick;
+    $this->send_raw("WHOIS $Nick");
+  }
+
+  /*
+  This function uses blacklisted_ip, which is no longer in RC2.
+  You can probably find it in old RC1 code kicking aronud if you need it.
+  protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
+    if (blacklisted_ip($IP)) {
+      $this->send_to($Channel, 'TOR IP Detected: '.$IP);
+      if ($Gline) {
+        $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
+      }
+    }
+    if (Tools::site_ban_ip($IP)) {
+      $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
+      if ($Gline) {
+        $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
+      }
+    }
+  }*/
+
+  protected function listen() {
+    G::$Cache->InternalCache = false;
+    stream_set_timeout($this->Socket, 10000000000);
+    while ($this->State == 1) {
+      $NullSock = null;
+      $Sockets = array($this->Socket, $this->ListenSocket);
+      if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
+        die();
+      }
+      foreach ($Sockets as $Socket) {
+        if ($Socket === $this->Socket) {
+          $this->irc_events();
+        } else {
+          $this->Listened = stream_socket_accept($Socket);
+          $this->listener_events();
+        }
+      }
+      G::$DB->LinkID = false;
+      G::$DB->Queries = array();
+    }
+  }
 }
 ?>

classes/lockedaccounts.class.php

@@ -17,7 +17,7 @@ class LockedAccounts
      */
     public static function lock_account($UserID, $Type, $Message, $Reason, $LockedByUserID)
     {
-        
+
         if ($LockedByUserID == 0) {
             $Username = "System";
         } else {

classes/mass_user_bookmarks_editor.class.php

@@ -9,73 +9,73 @@
  *
  */
 class MASS_USER_BOOKMARKS_EDITOR extends MASS_USER_TORRENTS_EDITOR {
-	public function __construct($Table = 'bookmarks_torrents') {
-		$this->set_table($Table);
-	}
+  public function __construct($Table = 'bookmarks_torrents') {
+    $this->set_table($Table);
+  }
 
-	/**
-	 * Runs a SQL query and clears the Cache key
-	 *
-	 * G::$Cache->delete_value didn't always work, but setting the key to null, did. (?)
-	 *
-	 * @param string $sql
-	 */
-	protected function query_and_clear_cache($sql) {
-		$QueryID = G::$DB->get_query_id();
-		if (is_string($sql) && G::$DB->query($sql)) {
-			G::$Cache->delete_value('bookmarks_group_ids_' . G::$LoggedUser['ID']);
-		}
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * Runs a SQL query and clears the Cache key
+   *
+   * G::$Cache->delete_value didn't always work, but setting the key to null, did. (?)
+   *
+   * @param string $sql
+   */
+  protected function query_and_clear_cache($sql) {
+    $QueryID = G::$DB->get_query_id();
+    if (is_string($sql) && G::$DB->query($sql)) {
+      G::$Cache->delete_value('bookmarks_group_ids_' . G::$LoggedUser['ID']);
+    }
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * Uses (checkboxes) $_POST['remove'] to delete entries.
-	 *
-	 * Uses an IN() to match multiple items in one query.
-	 */
-	public function mass_remove() {
-		$SQL = array();
-		foreach ($_POST['remove'] as $GroupID => $K) {
-			if (is_number($GroupID)) {
-				$SQL[] = sprintf('%d', $GroupID);
-			}
-		}
+  /**
+   * Uses (checkboxes) $_POST['remove'] to delete entries.
+   *
+   * Uses an IN() to match multiple items in one query.
+   */
+  public function mass_remove() {
+    $SQL = array();
+    foreach ($_POST['remove'] as $GroupID => $K) {
+      if (is_number($GroupID)) {
+        $SQL[] = sprintf('%d', $GroupID);
+      }
+    }
 
-		if (!empty($SQL)) {
-			$SQL = sprintf('
-					DELETE FROM %s
-					WHERE UserID = %d
-						AND GroupID IN (%s)',
-				$this->Table,
-				G::$LoggedUser['ID'],
-				implode(', ', $SQL)
-			);
-			$this->query_and_clear_cache($SQL);
-		}
-	}
+    if (!empty($SQL)) {
+      $SQL = sprintf('
+          DELETE FROM %s
+          WHERE UserID = %d
+            AND GroupID IN (%s)',
+        $this->Table,
+        G::$LoggedUser['ID'],
+        implode(', ', $SQL)
+      );
+      $this->query_and_clear_cache($SQL);
+    }
+  }
 
-	/**
-	 * Uses $_POST['sort'] values to update the DB.
-	 */
-	public function mass_update() {
-		$SQL = array();
-		foreach ($_POST['sort'] as $GroupID => $Sort) {
-			if (is_number($Sort) && is_number($GroupID)) {
-				$SQL[] = sprintf('(%d, %d, %d)', $GroupID, $Sort, G::$LoggedUser['ID']);
-			}
-		}
+  /**
+   * Uses $_POST['sort'] values to update the DB.
+   */
+  public function mass_update() {
+    $SQL = array();
+    foreach ($_POST['sort'] as $GroupID => $Sort) {
+      if (is_number($Sort) && is_number($GroupID)) {
+        $SQL[] = sprintf('(%d, %d, %d)', $GroupID, $Sort, G::$LoggedUser['ID']);
+      }
+    }
 
-		if (!empty($SQL)) {
-			$SQL = sprintf('
-					INSERT INTO %s
-						(GroupID, Sort, UserID)
-					VALUES
-						%s
-					ON DUPLICATE KEY UPDATE
-						Sort = VALUES (Sort)',
-				$this->Table,
-				implode(', ', $SQL));
-			$this->query_and_clear_cache($SQL);
-		}
-	}
+    if (!empty($SQL)) {
+      $SQL = sprintf('
+          INSERT INTO %s
+            (GroupID, Sort, UserID)
+          VALUES
+            %s
+          ON DUPLICATE KEY UPDATE
+            Sort = VALUES (Sort)',
+        $this->Table,
+        implode(', ', $SQL));
+      $this->query_and_clear_cache($SQL);
+    }
+  }
 }

classes/mass_user_torrents_editor.class.php

@@ -14,48 +14,48 @@
  * It could also be used for other types like collages.
  */
 abstract class MASS_USER_TORRENTS_EDITOR {
-	/**
-	 * The affected DB table
-	 * @var string $Table
-	 */
-	protected $Table;
+  /**
+   * The affected DB table
+   * @var string $Table
+   */
+  protected $Table;
 
-	/**
-	 * Set the Table
-	 * @param string $Table
-	 */
-	final public function set_table($Table) {
-		$this->Table = db_string($Table);
-	}
+  /**
+   * Set the Table
+   * @param string $Table
+   */
+  final public function set_table($Table) {
+    $this->Table = db_string($Table);
+  }
 
-	/**
-	 * Get the Table
-	 * @return string $Table
-	 */
-	final public function get_table() {
-		return $this->Table;
-	}
+  /**
+   * Get the Table
+   * @return string $Table
+   */
+  final public function get_table() {
+    return $this->Table;
+  }
 
-	/**
-	 * The extending class must provide a method to send a query and clear the cache
-	 */
-	abstract protected function query_and_clear_cache($sql);
+  /**
+   * The extending class must provide a method to send a query and clear the cache
+   */
+  abstract protected function query_and_clear_cache($sql);
 
-	/**
-	 * A method to insert many rows into a single table
-	 * Not required in subsequent classes
-	 */
-	public function mass_add() {}
+  /**
+   * A method to insert many rows into a single table
+   * Not required in subsequent classes
+   */
+  public function mass_add() {}
 
-	/**
-	 * A method to remove many rows from a table
-	 * The extending class must have a mass_remove method
-	 */
-	abstract public function mass_remove();
+  /**
+   * A method to remove many rows from a table
+   * The extending class must have a mass_remove method
+   */
+  abstract public function mass_remove();
 
-	/**
-	 * A method to update many rows in a table
-	 * The extending class must have a mass_update method
-	 */
-	abstract public function mass_update();
+  /**
+   * A method to update many rows in a table
+   * The extending class must have a mass_update method
+   */
+  abstract public function mass_update();
 }

classes/mass_user_torrents_table_view.class.php

@@ -11,256 +11,256 @@
  * It can be used for Bookmarks, Collages, or anywhere where torrents are managed.
  */
 class MASS_USER_TORRENTS_TABLE_VIEW {
-	/**
-	 * Used to set text the page heading (h2 tag)
-	 * @var string $Heading
-	 */
-	private $Heading = 'Manage Torrents';
-
-	/**
-	 * Sets the value of the input name="type"
-	 * Later to be used as $_POST['type'] in a form processor
-	 * @var string $EditType
-	 */
-	private $EditType;
-
-	/**
-	 * Flag for empty $TorrentList
-	 * @var bool $HasTorrentList
-	 */
-	private $HasTorrents;
-
-	/**
-	 * Internal reference to the TorrentList
-	 * @var array $TorrentList
-	 */
-	private $TorrentList;
-
-	/**
-	 * Ref. to $CollageDataList
-	 * @var array $CollageDataList
-	 */
-	private $CollageDataList;
-
-	/**
-	 * Counter for number of groups
-	 * @var in $NumGroups
-	 */
-	private $NumGroups = 0;
-
-	/**
-	 * When creating a new instance of this class, TorrentList and
-	 * CollageDataList must be passed. Additionally, a heading can be added.
-	 *
-	 * @param array $TorrentList
-	 * @param array $CollageDataList
-	 * @param string $EditType
-	 * @param string $Heading
-	 */
-	public function __construct (array &$TorrentList, array &$CollageDataList, $EditType, $Heading = null) {
-		$this->set_heading($Heading);
-		$this->set_edit_type($EditType);
-
-		$this->TorrentList = $TorrentList;
-		$this->CollageDataList = $CollageDataList;
-
-		$this->HasTorrents = !empty($TorrentList);
-		if (!$this->HasTorrents) {
-			$this->no_torrents();
-		}
-	}
-
-	private function no_torrents () {
+  /**
+   * Used to set text the page heading (h2 tag)
+   * @var string $Heading
+   */
+  private $Heading = 'Manage Torrents';
+
+  /**
+   * Sets the value of the input name="type"
+   * Later to be used as $_POST['type'] in a form processor
+   * @var string $EditType
+   */
+  private $EditType;
+
+  /**
+   * Flag for empty $TorrentList
+   * @var bool $HasTorrentList
+   */
+  private $HasTorrents;
+
+  /**
+   * Internal reference to the TorrentList
+   * @var array $TorrentList
+   */
+  private $TorrentList;
+
+  /**
+   * Ref. to $CollageDataList
+   * @var array $CollageDataList
+   */
+  private $CollageDataList;
+
+  /**
+   * Counter for number of groups
+   * @var in $NumGroups
+   */
+  private $NumGroups = 0;
+
+  /**
+   * When creating a new instance of this class, TorrentList and
+   * CollageDataList must be passed. Additionally, a heading can be added.
+   *
+   * @param array $TorrentList
+   * @param array $CollageDataList
+   * @param string $EditType
+   * @param string $Heading
+   */
+  public function __construct (array &$TorrentList, array &$CollageDataList, $EditType, $Heading = null) {
+    $this->set_heading($Heading);
+    $this->set_edit_type($EditType);
+
+    $this->TorrentList = $TorrentList;
+    $this->CollageDataList = $CollageDataList;
+
+    $this->HasTorrents = !empty($TorrentList);
+    if (!$this->HasTorrents) {
+      $this->no_torrents();
+    }
+  }
+
+  private function no_torrents () {
 ?>
-		<div class="thin">
-			<div class="header">
-				<h2>No torrents found.</h2>
-			</div>
-			<div class="box pad" align="center">
-				<p>Add some torrents and come back later.</p>
-			</div>
-		</div>
+    <div class="thin">
+      <div class="header">
+        <h2>No torrents found.</h2>
+      </div>
+      <div class="box pad" align="center">
+        <p>Add some torrents and come back later.</p>
+      </div>
+    </div>
 <?
-	}
-
-	/**
-	 * Renders a complete page and table
-	 */
-	public function render_all () {
-		$this->header();
-		$this->body();
-		$this->footer();
-	}
-
-	/**
-	 * Renders a comptele page/table header: div#thin, h2, scripts, notes,
-	 * form, table, etc.
-	 */
-	public function header () {
-		if ($this->HasTorrents) {
+  }
+
+  /**
+   * Renders a complete page and table
+   */
+  public function render_all () {
+    $this->header();
+    $this->body();
+    $this->footer();
+  }
+
+  /**
+   * Renders a comptele page/table header: div#thin, h2, scripts, notes,
+   * form, table, etc.
+   */
+  public function header () {
+    if ($this->HasTorrents) {
 ?>
 
 <div class="thin">
-	<div class="header">
-		<h2><?=display_str($this->Heading)?></h2>
-	</div>
-
-	<table width="100%" class="layout box">
-		<tr class="colhead"><td id="sorting_head">Sorting</td></tr>
-		<tr>
-			<td id="drag_drop_textnote">
-			<ul>
-				<li>Click on the headings to organize columns automatically.</li>
-				<li>Sort multiple columns simultaneously by holding down the shift key and clicking other column headers.</li>
-				<li>Click and drag any row to change its order.</li>
-				<li>Double-click on a row to check it.</li>
-			</ul>
-			</td>
-		</tr>
-	</table>
-
-	<form action="bookmarks.php" method="post" id="drag_drop_collage_form">
-
-<?			$this->buttons(); ?>
-
-		<table id="manage_collage_table" class="box">
-			<thead>
-				<tr class="colhead">
-					<th style="width: 7%;" data-sorter="false">Order</th>
-					<th style="width: 1%;"><span><abbr class="tooltip" title="Current order">#</abbr></span></th>
-					<th style="width: 1%;"><span>Year</span></th>
-					<th style="width: 15%;" data-sorter="ignoreArticles"><span>Artist</span></th>
-					<th data-sorter="ignoreArticles"><span>Torrent</span></th>
-					<th style="width: 5%;" data-sorter="relativeTime"><span>Bookmarked</span></th>
-					<th style="width: 1%;" id="check_all" data-sorter="false"><span>Remove</span></th>
-				</tr>
-			</thead>
-			<tbody>
+  <div class="header">
+    <h2><?=display_str($this->Heading)?></h2>
+  </div>
+
+  <table width="100%" class="layout box">
+    <tr class="colhead"><td id="sorting_head">Sorting</td></tr>
+    <tr>
+      <td id="drag_drop_textnote">
+      <ul>
+        <li>Click on the headings to organize columns automatically.</li>
+        <li>Sort multiple columns simultaneously by holding down the shift key and clicking other column headers.</li>
+        <li>Click and drag any row to change its order.</li>
+        <li>Double-click on a row to check it.</li>
+      </ul>
+      </td>
+    </tr>
+  </table>
+
+  <form action="bookmarks.php" method="post" id="drag_drop_collage_form">
+
+<?      $this->buttons(); ?>
+
+    <table id="manage_collage_table" class="box">
+      <thead>
+        <tr class="colhead">
+          <th style="width: 7%;" data-sorter="false">Order</th>
+          <th style="width: 1%;"><span><abbr class="tooltip" title="Current order">#</abbr></span></th>
+          <th style="width: 1%;"><span>Year</span></th>
+          <th style="width: 15%;" data-sorter="ignoreArticles"><span>Artist</span></th>
+          <th data-sorter="ignoreArticles"><span>Torrent</span></th>
+          <th style="width: 5%;" data-sorter="relativeTime"><span>Bookmarked</span></th>
+          <th style="width: 1%;" id="check_all" data-sorter="false"><span>Remove</span></th>
+        </tr>
+      </thead>
+      <tbody>
 <?
-		}
-	}
-
-	/**
-	 * Closes header code
-	 */
-	public function footer () {
-		if ($this->HasTorrents) {
+    }
+  }
+
+  /**
+   * Closes header code
+   */
+  public function footer () {
+    if ($this->HasTorrents) {
 ?>
 
-			</tbody>
-		</table>
+      </tbody>
+    </table>
 
-<?			$this->buttons(); ?>
+<?      $this->buttons(); ?>
 
-		<div>
-			<input type="hidden" name="action" value="mass_edit" />
-			<input type="hidden" name="type" value="<?=display_str($this->EditType)?>" />
-			<input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
-		</div>
-	</form>
+    <div>
+      <input type="hidden" name="action" value="mass_edit" />
+      <input type="hidden" name="type" value="<?=display_str($this->EditType)?>" />
+      <input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
+    </div>
+  </form>
 </div>
 
 <?
-		}
-	}
-
-	/**
-	 * Formats data for use in row
-	 *
-	 */
-	public function body () {
-		if ($this->HasTorrents)
-			foreach ($this->TorrentList as $GroupID => $Group) {
-				$Artists = array();
-
-				extract($Group);
-				extract($this->CollageDataList[$GroupID]);
-
-				$this->NumGroups++;
-
-				$DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse);
-				$TorrentLink = '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent">'.$Name.'</a>';
-				$Year = $Year > 0 ? $Year : '';
-				$DateAdded = date($Time);
-
-				$this->row($Sort, $GroupID, $Year, $DisplayName, $TorrentLink, $DateAdded);
-			}
-	}
-
-	/**
-	 * Outputs a single row
-	 *
-	 * @param string|int $Sort
-	 * @param string|int $GroupID
-	 * @param string|int $GroupYear
-	 * @param string $DisplayName
-	 * @param string $TorrentLink
-	 */
-	public function row ($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $DateAdded) {
+    }
+  }
+
+  /**
+   * Formats data for use in row
+   *
+   */
+  public function body () {
+    if ($this->HasTorrents)
+      foreach ($this->TorrentList as $GroupID => $Group) {
+        $Artists = array();
+
+        extract($Group);
+        extract($this->CollageDataList[$GroupID]);
+
+        $this->NumGroups++;
+
+        $DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse);
+        $TorrentLink = '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent">'.$Name.'</a>';
+        $Year = $Year > 0 ? $Year : '';
+        $DateAdded = date($Time);
+
+        $this->row($Sort, $GroupID, $Year, $DisplayName, $TorrentLink, $DateAdded);
+      }
+  }
+
+  /**
+   * Outputs a single row
+   *
+   * @param string|int $Sort
+   * @param string|int $GroupID
+   * @param string|int $GroupYear
+   * @param string $DisplayName
+   * @param string $TorrentLink
+   */
+  public function row ($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $DateAdded) {
 ?>
 
-					<tr class="drag row" id="li_<?=$GroupID?>">
-						<td>
-							<input class="sort_numbers" type="text" name="sort[<?=$GroupID?>]" value="<?=$Sort?>" id="sort_<?=$GroupID?>" size="4" />
-						</td>
-						<td><?=$this->NumGroups?></td>
-						<td><?=$GroupYear ? trim($GroupYear) : ' '?></td>
-						<td><?=$DisplayName ? trim($DisplayName) : ' '?></td>
-						<td><?=$TorrentLink ? trim($TorrentLink) : ' '?></td>
-						<td class="nobr tooltip" title="<?=$DateAdded?>"><?=$DateAdded ? time_diff($DateAdded) : ' '?></td>
-						<td class="center"><input type="checkbox" name="remove[<?=$GroupID?>]" value="" /></td>
-					</tr>
+          <tr class="drag row" id="li_<?=$GroupID?>">
+            <td>
+              <input class="sort_numbers" type="text" name="sort[<?=$GroupID?>]" value="<?=$Sort?>" id="sort_<?=$GroupID?>" size="4" />
+            </td>
+            <td><?=$this->NumGroups?></td>
+            <td><?=$GroupYear ? trim($GroupYear) : ' '?></td>
+            <td><?=$DisplayName ? trim($DisplayName) : ' '?></td>
+            <td><?=$TorrentLink ? trim($TorrentLink) : ' '?></td>
+            <td class="nobr tooltip" title="<?=$DateAdded?>"><?=$DateAdded ? time_diff($DateAdded) : ' '?></td>
+            <td class="center"><input type="checkbox" name="remove[<?=$GroupID?>]" value="" /></td>
+          </tr>
 <?
-	}
-
-	/**
-	 * Parses a simple display name
-	 *
-	 * @param array $ExtendedArtists
-	 * @param array $Artists
-	 * @param string $VanityHouse
-	 * @return string $DisplayName
-	 */
-	public static function display_name (array &$ExtendedArtists, array &$Artists, $VanityHouse) {
-		$DisplayName = '';
-		if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4])
-				|| !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
-			unset($ExtendedArtists[2], $ExtendedArtists[3]);
-			$DisplayName = Artists::display_artists($ExtendedArtists, true, false);
-		} elseif (count($Artists) > 0) {
-			$DisplayName = Artists::display_artists(array('1'=>$Artists), true, false);
-		}
-		if ($VanityHouse) {
-			$DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
-		}
-		return $DisplayName;
-	}
-
-	/**
-	 * Renders buttons used at the top and bottom of the table
-	 */
-	public function buttons () {
+  }
+
+  /**
+   * Parses a simple display name
+   *
+   * @param array $ExtendedArtists
+   * @param array $Artists
+   * @param string $VanityHouse
+   * @return string $DisplayName
+   */
+  public static function display_name (array &$ExtendedArtists, array &$Artists, $VanityHouse) {
+    $DisplayName = '';
+    if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4])
+        || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
+      unset($ExtendedArtists[2], $ExtendedArtists[3]);
+      $DisplayName = Artists::display_artists($ExtendedArtists, true, false);
+    } elseif (count($Artists) > 0) {
+      $DisplayName = Artists::display_artists(array('1'=>$Artists), true, false);
+    }
+    if ($VanityHouse) {
+      $DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
+    }
+    return $DisplayName;
+  }
+
+  /**
+   * Renders buttons used at the top and bottom of the table
+   */
+  public function buttons () {
 ?>
-		<div class="drag_drop_save">
-			<input type="submit" name="update" value="Update ranking" title="Save your rank" class="tooltip save_sortable_collage" />
-			<input type="submit" name="delete" value="Delete checked" title="Remove items" class="tooltip save_sortable_collage" />
-		</div>
+    <div class="drag_drop_save">
+      <input type="submit" name="update" value="Update ranking" title="Save your rank" class="tooltip save_sortable_collage" />
+      <input type="submit" name="delete" value="Delete checked" title="Remove items" class="tooltip save_sortable_collage" />
+    </div>
 <?
-	}
-
-
-	/**
-	 * @param string $EditType
-	 */
-	public function set_edit_type ($EditType) {
-		$this->EditType = $EditType;
-	}
-
-	/**
-	 * Set's the current page's heading
-	 * @param string $Heading
-	 */
-	public function set_heading ($Heading) {
-		$this->Heading = $Heading;
-	}
+  }
+
+
+  /**
+   * @param string $EditType
+   */
+  public function set_edit_type ($EditType) {
+    $this->EditType = $EditType;
+  }
+
+  /**
+   * Set's the current page's heading
+   * @param string $Heading
+   */
+  public function set_heading ($Heading) {
+    $this->Heading = $Heading;
+  }
 }

classes/mediainfo.class.php

@@ -664,7 +664,7 @@ class VideoSectionParser extends SectionParser {
         }
     }
     protected function compute_form_resolution() {
-				global $Resolutions;
+        global $Resolutions;
         $closest = null;
         if (isset($this->height)) {
             $resolutions = $Resolutions;

classes/mysql.class.php

@@ -21,30 +21,30 @@ $DB = NEW DB_MYSQL;
 * Making a query
 
 $DB->query("
-	SELECT *
-	FROM table...");
+  SELECT *
+  FROM table...");
 
-	Is functionally equivalent to using mysqli_query("SELECT * FROM table...")
-	Stores the result set in $this->QueryID
-	Returns the result set, so you can save it for later (see set_query_id())
+  Is functionally equivalent to using mysqli_query("SELECT * FROM table...")
+  Stores the result set in $this->QueryID
+  Returns the result set, so you can save it for later (see set_query_id())
 -----
 
 * Getting data from a query
 
 $array = $DB->next_record();
-	Is functionally equivalent to using mysqli_fetch_array($ResultSet)
-	You do not need to specify a result set - it uses $this-QueryID
+  Is functionally equivalent to using mysqli_fetch_array($ResultSet)
+  You do not need to specify a result set - it uses $this-QueryID
 -----
 
 * Escaping a string
 
 db_string($str);
-	Is a wrapper for $DB->escape_str(), which is a wrapper for
-	mysqli_real_escape_string(). The db_string() function exists so that you
-	don't have to keep calling $DB->escape_str().
+  Is a wrapper for $DB->escape_str(), which is a wrapper for
+  mysqli_real_escape_string(). The db_string() function exists so that you
+  don't have to keep calling $DB->escape_str().
 
-	USE THIS FUNCTION EVERY TIME YOU USE AN UNVALIDATED USER-SUPPLIED VALUE IN
-	A DATABASE QUERY!
+  USE THIS FUNCTION EVERY TIME YOU USE AN UNVALIDATED USER-SUPPLIED VALUE IN
+  A DATABASE QUERY!
 
 
 //--------- Advanced usage ---------------------------------------------------------
@@ -57,358 +57,358 @@ list($All, $Columns, $That, $You, $Select) = $DB->next_record();
 * This is how you loop over the result set:
 
 while (list($All, $Columns, $That, $You, $Select) = $DB->next_record()) {
-	echo "Do stuff with $All of the ".$Columns.$That.$You.$Select;
+  echo "Do stuff with $All of the ".$Columns.$That.$You.$Select;
 }
 -----
 
 * There are also a couple more mysqli functions that have been wrapped. They are:
 
 record_count()
-	Wrapper to mysqli_num_rows()
+  Wrapper to mysqli_num_rows()
 
 affected_rows()
-	Wrapper to mysqli_affected_rows()
+  Wrapper to mysqli_affected_rows()
 
 inserted_id()
-	Wrapper to mysqli_insert_id()
+  Wrapper to mysqli_insert_id()
 
 close
-	Wrapper to mysqli_close()
+  Wrapper to mysqli_close()
 -----
 
 * And, of course, a few handy custom functions.
 
 to_array($Key = false)
-	Transforms an entire result set into an array (useful in situations where you
-	can't order the rows properly in the query).
+  Transforms an entire result set into an array (useful in situations where you
+  can't order the rows properly in the query).
 
-	If $Key is set, the function uses $Key as the index (good for looking up a
-	field). Otherwise, it uses an iterator.
+  If $Key is set, the function uses $Key as the index (good for looking up a
+  field). Otherwise, it uses an iterator.
 
-	For an example of this function in action, check out forum.php.
+  For an example of this function in action, check out forum.php.
 
 collect($Key)
-	Loops over the result set, creating an array from one of the fields ($Key).
-	For an example, see forum.php.
+  Loops over the result set, creating an array from one of the fields ($Key).
+  For an example, see forum.php.
 
 set_query_id($ResultSet)
-	This class can only hold one result set at a time. Using set_query_id allows
-	you to set the result set that the class is using to the result set in
-	$ResultSet. This result set should have been obtained earlier by using
-	$DB->query().
+  This class can only hold one result set at a time. Using set_query_id allows
+  you to set the result set that the class is using to the result set in
+  $ResultSet. This result set should have been obtained earlier by using
+  $DB->query().
 
-	Example:
+  Example:
 
-	$FoodRS = $DB->query("
-			SELECT *
-			FROM food");
-	$DB->query("
-		SELECT *
-		FROM drink");
-	$Drinks = $DB->next_record();
-	$DB->set_query_id($FoodRS);
-	$Food = $DB->next_record();
+  $FoodRS = $DB->query("
+      SELECT *
+      FROM food");
+  $DB->query("
+    SELECT *
+    FROM drink");
+  $Drinks = $DB->next_record();
+  $DB->set_query_id($FoodRS);
+  $Food = $DB->next_record();
 
-	Of course, this example is contrived, but you get the point.
+  Of course, this example is contrived, but you get the point.
 
 
 -------------------------------------------------------------------------------------
 *///---------------------------------------------------------------------------------
 
 if (!extension_loaded('mysqli')) {
-	die('Mysqli Extension not loaded.');
+  die('Mysqli Extension not loaded.');
 }
 
 //Handles escaping
 function db_string($String, $DisableWildcards = false) {
-	global $DB;
-	//Escape
-	$String = $DB->escape_str($String);
-	//Remove user input wildcards
-	if ($DisableWildcards) {
-		$String = str_replace(array('%','_'), array('\%','\_'), $String);
-	}
-	return $String;
+  global $DB;
+  //Escape
+  $String = $DB->escape_str($String);
+  //Remove user input wildcards
+  if ($DisableWildcards) {
+    $String = str_replace(array('%','_'), array('\%','\_'), $String);
+  }
+  return $String;
 }
 
 function db_array($Array, $DontEscape = array(), $Quote = false) {
-	foreach ($Array as $Key => $Val) {
-		if (!in_array($Key, $DontEscape)) {
-			if ($Quote) {
-				$Array[$Key] = '\''.db_string(trim($Val)).'\'';
-			} else {
-				$Array[$Key] = db_string(trim($Val));
-			}
-		}
-	}
-	return $Array;
+  foreach ($Array as $Key => $Val) {
+    if (!in_array($Key, $DontEscape)) {
+      if ($Quote) {
+        $Array[$Key] = '\''.db_string(trim($Val)).'\'';
+      } else {
+        $Array[$Key] = db_string(trim($Val));
+      }
+    }
+  }
+  return $Array;
 }
 
 //TODO: revisit access levels once Drone is replaced by ZeRobot
 class DB_MYSQL {
-	public $LinkID = false;
-	protected $QueryID = false;
-	protected $Record = array();
-	protected $Row;
-	protected $Errno = 0;
-	protected $Error = '';
-
-	public $Queries = array();
-	public $Time = 0.0;
-
-	protected $Database = '';
-	protected $Server = '';
-	protected $User = '';
-	protected $Pass = '';
-	protected $Port = 0;
-	protected $Socket = '';
-
-	function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK) {
-		$this->Database = $Database;
-		$this->Server = $Server;
-		$this->User = $User;
-		$this->Pass = $Pass;
-		$this->Port = $Port;
-		$this->Socket = $Socket;
-	}
-
-	function halt($Msg) {
-		global $Debug, $argv;
-		$DBError = 'MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')';
-		if ($this->Errno == 1194) {
-			send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error);
-		}
-		/*if ($this->Errno == 1194) {
-			preg_match("Table '(\S+)' is marked as crashed and should be repaired", $this->Error, $Matches);
-		} */
-		$Debug->analysis('!dev DB Error', $DBError, 3600 * 24);
-		if (DEBUG_MODE || check_perms('site_debug') || isset($argv[1])) {
-			echo '<pre>'.display_str($DBError).'</pre>';
-			if (DEBUG_MODE || check_perms('site_debug')) {
-				print_r($this->Queries);
-			}
-			die();
-		} else {
-			error('-1');
-		}
-	}
-
-	function connect() {
-		if (!$this->LinkID) {
-			$this->LinkID = mysqli_connect($this->Server, $this->User, $this->Pass, $this->Database, $this->Port, $this->Socket); // defined in config.php
-			if (!$this->LinkID) {
-				$this->Errno = mysqli_connect_errno();
-				$this->Error = mysqli_connect_error();
-				$this->halt('Connection failed (host:'.$this->Server.':'.$this->Port.')');
-			}
-		}
-	}
-
-	function query($Query, $AutoHandle = 1) {
-		global $Debug;
-		/*
-		 * If there was a previous query, we store the warnings. We cannot do
-		 * this immediately after mysqli_query because mysqli_insert_id will
-		 * break otherwise due to mysqli_get_warnings sending a SHOW WARNINGS;
-		 * query. When sending a query, however, we're sure that we won't call
-		 * mysqli_insert_id (or any similar function, for that matter) later on,
-		 * so we can safely get the warnings without breaking things.
-		 * Note that this means that we have to call $this->warnings manually
-		 * for the last query!
-		 */
-		if ($this->QueryID) {
-			$this->warnings();
-		}
-		$QueryStartTime = microtime(true);
-		$this->connect();
-		// In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries
-		for ($i = 1; $i < 6; $i++) {
-			$this->QueryID = mysqli_query($this->LinkID, $Query);
-			if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) {
-				break;
-			}
-			$Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
-			trigger_error("Database deadlock, attempt $i");
-
-			sleep($i * rand(2, 5)); // Wait longer as attempts increase
-		}
-		$QueryEndTime = microtime(true);
-		$this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null);
-		$this->Time += ($QueryEndTime - $QueryStartTime) * 1000;
-
-		if (!$this->QueryID) {
-			$this->Errno = mysqli_errno($this->LinkID);
-			$this->Error = mysqli_error($this->LinkID);
-
-			if ($AutoHandle) {
-				$this->halt("Invalid Query: $Query");
-			} else {
-				return $this->Errno;
-			}
-		}
-
-		/*
-		$QueryType = substr($Query, 0, 6);
-		if ($QueryType === 'DELETE' || $QueryType === 'UPDATE') {
-			if ($this->affected_rows() > 50) {
-				$Debug->analysis($this->affected_rows().' rows altered:', $Query, 3600 * 24);
-			}
-		}
-		*/
-		$this->Row = 0;
-		if ($AutoHandle) {
-			return $this->QueryID;
-		}
-	}
-
-	function query_unb($Query) {
-		$this->connect();
-		mysqli_real_query($this->LinkID, $Query);
-	}
-
-	function inserted_id() {
-		if ($this->LinkID) {
-			return mysqli_insert_id($this->LinkID);
-		}
-	}
-
-	function next_record($Type = MYSQLI_BOTH, $Escape = true) { // $Escape can be true, false, or an array of keys to not escape
-		if ($this->LinkID) {
-			$this->Record = mysqli_fetch_array($this->QueryID, $Type);
-			$this->Row++;
-			if (!is_array($this->Record)) {
-				$this->QueryID = false;
-			} elseif ($Escape !== false) {
-				$this->Record = Misc::display_array($this->Record, $Escape);
-			}
-			return $this->Record;
-		}
-	}
-
-	function close() {
-		if ($this->LinkID) {
-			if (!mysqli_close($this->LinkID)) {
-				$this->halt('Cannot close connection or connection did not open.');
-			}
-			$this->LinkID = false;
-		}
-	}
-
-	/*
-	 * returns an integer with the number of rows found
-	 * returns a string if the number of rows found exceeds MAXINT
-	 */
-	function record_count() {
-		if ($this->QueryID) {
-			return mysqli_num_rows($this->QueryID);
-		}
-	}
-
-	/*
-	 * returns true if the query exists and there were records found
-	 * returns false if the query does not exist or if there were 0 records returned
-	 */
-	function has_results() {
-		return ($this->QueryID && $this->record_count() !== 0);
-	}
-
-	function affected_rows() {
-		if ($this->LinkID) {
-			return mysqli_affected_rows($this->LinkID);
-		}
-	}
-
-	function info() {
-		return mysqli_get_host_info($this->LinkID);
-	}
-
-	// You should use db_string() instead.
-	function escape_str($Str) {
-		$this->connect(0);
-		if (is_array($Str)) {
-			trigger_error('Attempted to escape array.');
-			return '';
-		}
-		return mysqli_real_escape_string($this->LinkID, $Str);
-	}
-
-	// Creates an array from a result set
-	// If $Key is set, use the $Key column in the result set as the array key
-	// Otherwise, use an integer
-	function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) {
-		$Return = array();
-		while ($Row = mysqli_fetch_array($this->QueryID, $Type)) {
-			if ($Escape !== false) {
-				$Row = Misc::display_array($Row, $Escape);
-			}
-			if ($Key !== false) {
-				$Return[$Row[$Key]] = $Row;
-			} else {
-				$Return[] = $Row;
-			}
-		}
-		mysqli_data_seek($this->QueryID, 0);
-		return $Return;
-	}
-
-	//  Loops through the result set, collecting the $ValField column into an array with $KeyField as keys
-	function to_pair($KeyField, $ValField, $Escape = true) {
-		$Return = array();
-		while ($Row = mysqli_fetch_array($this->QueryID)) {
-			if ($Escape) {
-				$Key = display_str($Row[$KeyField]);
-				$Val = display_str($Row[$ValField]);
-			} else {
-				$Key = $Row[$KeyField];
-				$Val = $Row[$ValField];
-			}
-			$Return[$Key] = $Val;
-		}
-		mysqli_data_seek($this->QueryID, 0);
-		return $Return;
-	}
-
-	//  Loops through the result set, collecting the $Key column into an array
-	function collect($Key, $Escape = true) {
-		$Return = array();
-		while ($Row = mysqli_fetch_array($this->QueryID)) {
-			$Return[] = $Escape ? display_str($Row[$Key]) : $Row[$Key];
-		}
-		mysqli_data_seek($this->QueryID, 0);
-		return $Return;
-	}
-
-	function set_query_id(&$ResultSet) {
-		$this->QueryID = $ResultSet;
-		$this->Row = 0;
-	}
-
-	function get_query_id() {
-		return $this->QueryID;
-	}
-
-	function beginning() {
-		mysqli_data_seek($this->QueryID, 0);
-		$this->Row = 0;
-	}
-
-	/**
-	 * This function determines whether the last query caused warning messages
-	 * and stores them in $this->Queries.
-	 */
-	function warnings() {
-		$Warnings = array();
-		if (!is_bool($this->LinkID) && mysqli_warning_count($this->LinkID)) {
-			$e = mysqli_get_warnings($this->LinkID);
-			do {
-				if ($e->errno == 1592) {
-					// 1592: Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.
-					continue;
-				}
-				$Warnings[] = 'Code ' . $e->errno . ': ' . display_str($e->message);
-			} while ($e->next());
-		}
-		$this->Queries[count($this->Queries) - 1][2] = $Warnings;
-	}
+  public $LinkID = false;
+  protected $QueryID = false;
+  protected $Record = array();
+  protected $Row;
+  protected $Errno = 0;
+  protected $Error = '';
+
+  public $Queries = array();
+  public $Time = 0.0;
+
+  protected $Database = '';
+  protected $Server = '';
+  protected $User = '';
+  protected $Pass = '';
+  protected $Port = 0;
+  protected $Socket = '';
+
+  function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK) {
+    $this->Database = $Database;
+    $this->Server = $Server;
+    $this->User = $User;
+    $this->Pass = $Pass;
+    $this->Port = $Port;
+    $this->Socket = $Socket;
+  }
+
+  function halt($Msg) {
+    global $Debug, $argv;
+    $DBError = 'MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')';
+    if ($this->Errno == 1194) {
+      send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error);
+    }
+    /*if ($this->Errno == 1194) {
+      preg_match("Table '(\S+)' is marked as crashed and should be repaired", $this->Error, $Matches);
+    } */
+    $Debug->analysis('!dev DB Error', $DBError, 3600 * 24);
+    if (DEBUG_MODE || check_perms('site_debug') || isset($argv[1])) {
+      echo '<pre>'.display_str($DBError).'</pre>';
+      if (DEBUG_MODE || check_perms('site_debug')) {
+        print_r($this->Queries);
+      }
+      die();
+    } else {
+      error('-1');
+    }
+  }
+
+  function connect() {
+    if (!$this->LinkID) {
+      $this->LinkID = mysqli_connect($this->Server, $this->User, $this->Pass, $this->Database, $this->Port, $this->Socket); // defined in config.php
+      if (!$this->LinkID) {
+        $this->Errno = mysqli_connect_errno();
+        $this->Error = mysqli_connect_error();
+        $this->halt('Connection failed (host:'.$this->Server.':'.$this->Port.')');
+      }
+    }
+  }
+
+  function query($Query, $AutoHandle = 1) {
+    global $Debug;
+    /*
+     * If there was a previous query, we store the warnings. We cannot do
+     * this immediately after mysqli_query because mysqli_insert_id will
+     * break otherwise due to mysqli_get_warnings sending a SHOW WARNINGS;
+     * query. When sending a query, however, we're sure that we won't call
+     * mysqli_insert_id (or any similar function, for that matter) later on,
+     * so we can safely get the warnings without breaking things.
+     * Note that this means that we have to call $this->warnings manually
+     * for the last query!
+     */
+    if ($this->QueryID) {
+      $this->warnings();
+    }
+    $QueryStartTime = microtime(true);
+    $this->connect();
+    // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries
+    for ($i = 1; $i < 6; $i++) {
+      $this->QueryID = mysqli_query($this->LinkID, $Query);
+      if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) {
+        break;
+      }
+      $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
+      trigger_error("Database deadlock, attempt $i");
+
+      sleep($i * rand(2, 5)); // Wait longer as attempts increase
+    }
+    $QueryEndTime = microtime(true);
+    $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null);
+    $this->Time += ($QueryEndTime - $QueryStartTime) * 1000;
+
+    if (!$this->QueryID) {
+      $this->Errno = mysqli_errno($this->LinkID);
+      $this->Error = mysqli_error($this->LinkID);
+
+      if ($AutoHandle) {
+        $this->halt("Invalid Query: $Query");
+      } else {
+        return $this->Errno;
+      }
+    }
+
+    /*
+    $QueryType = substr($Query, 0, 6);
+    if ($QueryType === 'DELETE' || $QueryType === 'UPDATE') {
+      if ($this->affected_rows() > 50) {
+        $Debug->analysis($this->affected_rows().' rows altered:', $Query, 3600 * 24);
+      }
+    }
+    */
+    $this->Row = 0;
+    if ($AutoHandle) {
+      return $this->QueryID;
+    }
+  }
+
+  function query_unb($Query) {
+    $this->connect();
+    mysqli_real_query($this->LinkID, $Query);
+  }
+
+  function inserted_id() {
+    if ($this->LinkID) {
+      return mysqli_insert_id($this->LinkID);
+    }
+  }
+
+  function next_record($Type = MYSQLI_BOTH, $Escape = true) { // $Escape can be true, false, or an array of keys to not escape
+    if ($this->LinkID) {
+      $this->Record = mysqli_fetch_array($this->QueryID, $Type);
+      $this->Row++;
+      if (!is_array($this->Record)) {
+        $this->QueryID = false;
+      } elseif ($Escape !== false) {
+        $this->Record = Misc::display_array($this->Record, $Escape);
+      }
+      return $this->Record;
+    }
+  }
+
+  function close() {
+    if ($this->LinkID) {
+      if (!mysqli_close($this->LinkID)) {
+        $this->halt('Cannot close connection or connection did not open.');
+      }
+      $this->LinkID = false;
+    }
+  }
+
+  /*
+   * returns an integer with the number of rows found
+   * returns a string if the number of rows found exceeds MAXINT
+   */
+  function record_count() {
+    if ($this->QueryID) {
+      return mysqli_num_rows($this->QueryID);
+    }
+  }
+
+  /*
+   * returns true if the query exists and there were records found
+   * returns false if the query does not exist or if there were 0 records returned
+   */
+  function has_results() {
+    return ($this->QueryID && $this->record_count() !== 0);
+  }
+
+  function affected_rows() {
+    if ($this->LinkID) {
+      return mysqli_affected_rows($this->LinkID);
+    }
+  }
+
+  function info() {
+    return mysqli_get_host_info($this->LinkID);
+  }
+
+  // You should use db_string() instead.
+  function escape_str($Str) {
+    $this->connect(0);
+    if (is_array($Str)) {
+      trigger_error('Attempted to escape array.');
+      return '';
+    }
+    return mysqli_real_escape_string($this->LinkID, $Str);
+  }
+
+  // Creates an array from a result set
+  // If $Key is set, use the $Key column in the result set as the array key
+  // Otherwise, use an integer
+  function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) {
+    $Return = array();
+    while ($Row = mysqli_fetch_array($this->QueryID, $Type)) {
+      if ($Escape !== false) {
+        $Row = Misc::display_array($Row, $Escape);
+      }
+      if ($Key !== false) {
+        $Return[$Row[$Key]] = $Row;
+      } else {
+        $Return[] = $Row;
+      }
+    }
+    mysqli_data_seek($this->QueryID, 0);
+    return $Return;
+  }
+
+  //  Loops through the result set, collecting the $ValField column into an array with $KeyField as keys
+  function to_pair($KeyField, $ValField, $Escape = true) {
+    $Return = array();
+    while ($Row = mysqli_fetch_array($this->QueryID)) {
+      if ($Escape) {
+        $Key = display_str($Row[$KeyField]);
+        $Val = display_str($Row[$ValField]);
+      } else {
+        $Key = $Row[$KeyField];
+        $Val = $Row[$ValField];
+      }
+      $Return[$Key] = $Val;
+    }
+    mysqli_data_seek($this->QueryID, 0);
+    return $Return;
+  }
+
+  //  Loops through the result set, collecting the $Key column into an array
+  function collect($Key, $Escape = true) {
+    $Return = array();
+    while ($Row = mysqli_fetch_array($this->QueryID)) {
+      $Return[] = $Escape ? display_str($Row[$Key]) : $Row[$Key];
+    }
+    mysqli_data_seek($this->QueryID, 0);
+    return $Return;
+  }
+
+  function set_query_id(&$ResultSet) {
+    $this->QueryID = $ResultSet;
+    $this->Row = 0;
+  }
+
+  function get_query_id() {
+    return $this->QueryID;
+  }
+
+  function beginning() {
+    mysqli_data_seek($this->QueryID, 0);
+    $this->Row = 0;
+  }
+
+  /**
+   * This function determines whether the last query caused warning messages
+   * and stores them in $this->Queries.
+   */
+  function warnings() {
+    $Warnings = array();
+    if (!is_bool($this->LinkID) && mysqli_warning_count($this->LinkID)) {
+      $e = mysqli_get_warnings($this->LinkID);
+      do {
+        if ($e->errno == 1592) {
+          // 1592: Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.
+          continue;
+        }
+        $Warnings[] = 'Code ' . $e->errno . ': ' . display_str($e->message);
+      } while ($e->next());
+    }
+    $this->Queries[count($this->Queries) - 1][2] = $Warnings;
+  }
 }
 ?>

classes/notificationsmanagerview.class.php

@@ -1,156 +1,156 @@
 <?
 
 class NotificationsManagerView {
-	private static $Settings;
+  private static $Settings;
 
-	public static function load_js() {
-		$JSIncludes = array(
-			'noty/noty.js',
-			'noty/layouts/bottomRight.js',
-			'noty/themes/default.js',
-			'user_notifications.js');
-		foreach ($JSIncludes as $JSInclude) {
-			$Path = STATIC_SERVER."functions/$JSInclude";
+  public static function load_js() {
+    $JSIncludes = array(
+      'noty/noty.js',
+      'noty/layouts/bottomRight.js',
+      'noty/themes/default.js',
+      'user_notifications.js');
+    foreach ($JSIncludes as $JSInclude) {
+      $Path = STATIC_SERVER."functions/$JSInclude";
 ?>
-	<script src="<?=$Path?>?v=<?=filemtime(SERVER_ROOT."/$Path")?>" type="text/javascript"></script>
+  <script src="<?=$Path?>?v=<?=filemtime(SERVER_ROOT."/$Path")?>" type="text/javascript"></script>
 <?
-		}
-	}
+    }
+  }
 
-	private static function render_push_settings() {
-		$PushService = self::$Settings['PushService'];
-		$PushOptions = unserialize(self::$Settings['PushOptions']);
-		if (empty($PushOptions['PushDevice'])) {
-			$PushOptions['PushDevice'] = '';
-		}
-		?>
-		<tr>
-			<td class="label"><strong>Push notifications</strong></td>
-			<td>
-				<select name="pushservice" id="pushservice">
-					<option value="0"<? if (empty($PushService)) { ?> selected="selected"<? } ?>>Disable push notifications</option>
-					<option value="1"<? if ($PushService == 1) { ?> selected="selected"<? } ?>>Notify My Android</option>
-					<option value="2"<? if ($PushService == 2) { ?> selected="selected"<? } ?>>Prowl</option>
-<!--						No option 3, notifo died. -->
-					<option value="4"<? if ($PushService == 4) { ?> selected="selected"<? } ?>>Super Toasty</option>
-					<option value="5"<? if ($PushService == 5) { ?> selected="selected"<? } ?>>Pushover</option>
-					<option value="6"<? if ($PushService == 6) { ?> selected="selected"<? } ?>>PushBullet</option>
-				</select>
-				<div id="pushsettings" style="display: none;">
-					<label id="pushservice_title" for="pushkey">API key</label>
-					<input type="text" size="50" name="pushkey" id="pushkey" value="<?=display_str($PushOptions['PushKey'])?>" />
-					<label class="pushdeviceid" id="pushservice_device" for="pushdevice">Device ID</label>
-					<select class="pushdeviceid" name="pushdevice" id="pushdevice">
-						<option value="<?= display_str($PushOptions['PushDevice'])?>" selected="selected"><?= display_str($PushOptions['PushDevice'])?></option>
-					</select>
-					<br />
-					<a href="user.php?action=take_push&amp;push=1&amp;userid=<?=G::$LoggedUser['ID']?>&amp;auth=<?=G::$LoggedUser['AuthKey']?>" class="brackets">Test push</a>
-					<a href="wiki.php?action=article&amp;id=1017" class="brackets">View wiki guide</a>
-				</div>
-			</td>
-		</tr>
-<?	}
+  private static function render_push_settings() {
+    $PushService = self::$Settings['PushService'];
+    $PushOptions = unserialize(self::$Settings['PushOptions']);
+    if (empty($PushOptions['PushDevice'])) {
+      $PushOptions['PushDevice'] = '';
+    }
+    ?>
+    <tr>
+      <td class="label"><strong>Push notifications</strong></td>
+      <td>
+        <select name="pushservice" id="pushservice">
+          <option value="0"<? if (empty($PushService)) { ?> selected="selected"<? } ?>>Disable push notifications</option>
+          <option value="1"<? if ($PushService == 1) { ?> selected="selected"<? } ?>>Notify My Android</option>
+          <option value="2"<? if ($PushService == 2) { ?> selected="selected"<? } ?>>Prowl</option>
+<!--            No option 3, notifo died. -->
+          <option value="4"<? if ($PushService == 4) { ?> selected="selected"<? } ?>>Super Toasty</option>
+          <option value="5"<? if ($PushService == 5) { ?> selected="selected"<? } ?>>Pushover</option>
+          <option value="6"<? if ($PushService == 6) { ?> selected="selected"<? } ?>>PushBullet</option>
+        </select>
+        <div id="pushsettings" style="display: none;">
+          <label id="pushservice_title" for="pushkey">API key</label>
+          <input type="text" size="50" name="pushkey" id="pushkey" value="<?=display_str($PushOptions['PushKey'])?>" />
+          <label class="pushdeviceid" id="pushservice_device" for="pushdevice">Device ID</label>
+          <select class="pushdeviceid" name="pushdevice" id="pushdevice">
+            <option value="<?= display_str($PushOptions['PushDevice'])?>" selected="selected"><?= display_str($PushOptions['PushDevice'])?></option>
+          </select>
+          <br />
+          <a href="user.php?action=take_push&amp;push=1&amp;userid=<?=G::$LoggedUser['ID']?>&amp;auth=<?=G::$LoggedUser['AuthKey']?>" class="brackets">Test push</a>
+          <a href="wiki.php?action=article&amp;id=1017" class="brackets">View wiki guide</a>
+        </div>
+      </td>
+    </tr>
+<?  }
 
-	public static function render_settings($Settings) {
-		self::$Settings = $Settings;
-		self::render_push_settings();
+  public static function render_settings($Settings) {
+    self::$Settings = $Settings;
+    self::render_push_settings();
 ?>
-		<tr>
-			<td class="label">
-				<strong>News announcements</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::NEWS); ?>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<strong>Blog announcements</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::BLOG); ?>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<strong>Inbox messages</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::INBOX, true); ?>
-			</td>
-		</tr>
-		<tr>
-			<td class="label tooltip" title="Enabling this will give you a notification when you receive a new private message from a member of the <?=SITE_NAME?> staff.">
-				<strong>Staff messages</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::STAFFPM, false, false); ?>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<strong>Thread subscriptions</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::SUBSCRIPTIONS, false, false); ?>
-			</td>
-		</tr>
-		<tr>
-			<td class="label tooltip" title="Enabling this will give you a notification whenever someone quotes you in the forums.">
-				<strong>Quote notifications</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::QUOTES); ?>
-			</td>
-		</tr>
-<? 		if (check_perms('site_torrents_notify')) { ?>
-			<tr>
-				<td class="label tooltip" title="Enabling this will give you a notification when the torrent notification filters you have established are triggered.">
-					<strong>Torrent notifications</strong>
-				</td>
-				<td>
-<?					self::render_checkbox(NotificationsManager::TORRENTS, true, false); ?>
-				</td>
-			</tr>
-<?		} ?>
+    <tr>
+      <td class="label">
+        <strong>News announcements</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::NEWS); ?>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <strong>Blog announcements</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::BLOG); ?>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <strong>Inbox messages</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::INBOX, true); ?>
+      </td>
+    </tr>
+    <tr>
+      <td class="label tooltip" title="Enabling this will give you a notification when you receive a new private message from a member of the <?=SITE_NAME?> staff.">
+        <strong>Staff messages</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::STAFFPM, false, false); ?>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <strong>Thread subscriptions</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::SUBSCRIPTIONS, false, false); ?>
+      </td>
+    </tr>
+    <tr>
+      <td class="label tooltip" title="Enabling this will give you a notification whenever someone quotes you in the forums.">
+        <strong>Quote notifications</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::QUOTES); ?>
+      </td>
+    </tr>
+<?     if (check_perms('site_torrents_notify')) { ?>
+      <tr>
+        <td class="label tooltip" title="Enabling this will give you a notification when the torrent notification filters you have established are triggered.">
+          <strong>Torrent notifications</strong>
+        </td>
+        <td>
+<?          self::render_checkbox(NotificationsManager::TORRENTS, true, false); ?>
+        </td>
+      </tr>
+<?    } ?>
 
-		<tr>
-			<td class="label tooltip" title="Enabling this will give you a notification when a torrent is added to a collage you are subscribed to.">
-				<strong>Collage subscriptions</strong>
-			</td>
-			<td>
-<?				self::render_checkbox(NotificationsManager::COLLAGES. false, false); ?>
-			</td>
-		</tr>
-<?	}
+    <tr>
+      <td class="label tooltip" title="Enabling this will give you a notification when a torrent is added to a collage you are subscribed to.">
+        <strong>Collage subscriptions</strong>
+      </td>
+      <td>
+<?        self::render_checkbox(NotificationsManager::COLLAGES. false, false); ?>
+      </td>
+    </tr>
+<?  }
 
-	private static function render_checkbox($Name, $Traditional = false, $Push = true) {
-		$Checked = self::$Settings[$Name];
-		$PopupChecked = $Checked == NotificationsManager::OPT_POPUP || $Checked == NotificationsManager::OPT_POPUP_PUSH || !isset($Checked) ? ' checked="checked"' : '';
-		$TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL || $Checked == NotificationsManager::OPT_TRADITIONAL_PUSH ? ' checked="checked"' : '';
-		$PushChecked = $Checked == NotificationsManager::OPT_TRADITIONAL_PUSH || $Checked == NotificationsManager::OPT_POPUP_PUSH || $Checked == NotificationsManager::OPT_PUSH ? ' checked="checked"' : '';
+  private static function render_checkbox($Name, $Traditional = false, $Push = true) {
+    $Checked = self::$Settings[$Name];
+    $PopupChecked = $Checked == NotificationsManager::OPT_POPUP || $Checked == NotificationsManager::OPT_POPUP_PUSH || !isset($Checked) ? ' checked="checked"' : '';
+    $TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL || $Checked == NotificationsManager::OPT_TRADITIONAL_PUSH ? ' checked="checked"' : '';
+    $PushChecked = $Checked == NotificationsManager::OPT_TRADITIONAL_PUSH || $Checked == NotificationsManager::OPT_POPUP_PUSH || $Checked == NotificationsManager::OPT_PUSH ? ' checked="checked"' : '';
 
 ?>
-		<label>
-			<input type="checkbox" name="notifications_<?=$Name?>_popup" id="notifications_<?=$Name?>_popup"<?=$PopupChecked?> />
-			Pop-up
-		</label>
-<?		if ($Traditional) { ?>
-		<label>
-			<input type="checkbox" name="notifications_<?=$Name?>_traditional" id="notifications_<?=$Name?>_traditional"<?=$TraditionalChecked?> />
-			Traditional
-		</label>
-<?		}
-		if ($Push) { ?>
-		<label>
-			<input type="checkbox" name="notifications_<?=$Name?>_push" id="notifications_<?=$Name?>_push"<?=$PushChecked?> />
-			Push
-		</label>
-<?		}
-	}
+    <label>
+      <input type="checkbox" name="notifications_<?=$Name?>_popup" id="notifications_<?=$Name?>_popup"<?=$PopupChecked?> />
+      Pop-up
+    </label>
+<?    if ($Traditional) { ?>
+    <label>
+      <input type="checkbox" name="notifications_<?=$Name?>_traditional" id="notifications_<?=$Name?>_traditional"<?=$TraditionalChecked?> />
+      Traditional
+    </label>
+<?    }
+    if ($Push) { ?>
+    <label>
+      <input type="checkbox" name="notifications_<?=$Name?>_push" id="notifications_<?=$Name?>_push"<?=$PushChecked?> />
+      Push
+    </label>
+<?    }
+  }
 
-	public static function format_traditional($Contents) {
-		return "<a href=\"$Contents[url]\">$Contents[message]</a>";
-	}
+  public static function format_traditional($Contents) {
+    return "<a href=\"$Contents[url]\">$Contents[message]</a>";
+  }
 
 }

classes/paranoia.class.php

@@ -38,66 +38,66 @@
  * @param $UserClass The user class to check against (Staff can see through paranoia of lower classed staff)
  * @param $UserID Optional. The user ID of the person being viewed
  * @return mixed   1 representing the user has normal access
-				   2 representing that the paranoia was overridden,
-				   false representing access denied.
+           2 representing that the paranoia was overridden,
+           false representing access denied.
  */
 
 define("PARANOIA_ALLOWED", 1);
 define("PARANOIA_OVERRIDDEN", 2);
 
 function check_paranoia($Property, $Paranoia, $UserClass, $UserID = false) {
-	global $Classes;
-	if ($Property == false) {
-		return false;
-	}
-	if (!is_array($Paranoia)) {
-		$Paranoia = unserialize($Paranoia);
-	}
-	if (!is_array($Paranoia)) {
-		$Paranoia = array();
-	}
-	if (is_array($Property)) {
-		$all = true;
-		foreach ($Property as $P) {
-			$all = $all && check_paranoia($P, $Paranoia, $UserClass, $UserID);
-		}
-		return $all;
-	} else {
-		if (($UserID !== false) && (G::$LoggedUser['ID'] == $UserID)) {
-			return PARANOIA_ALLOWED;
-		}
+  global $Classes;
+  if ($Property == false) {
+    return false;
+  }
+  if (!is_array($Paranoia)) {
+    $Paranoia = unserialize($Paranoia);
+  }
+  if (!is_array($Paranoia)) {
+    $Paranoia = array();
+  }
+  if (is_array($Property)) {
+    $all = true;
+    foreach ($Property as $P) {
+      $all = $all && check_paranoia($P, $Paranoia, $UserClass, $UserID);
+    }
+    return $all;
+  } else {
+    if (($UserID !== false) && (G::$LoggedUser['ID'] == $UserID)) {
+      return PARANOIA_ALLOWED;
+    }
 
-		$May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
-		if ($May)
-			return PARANOIA_ALLOWED;
+    $May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
+    if ($May)
+      return PARANOIA_ALLOWED;
 
-		if (check_perms('users_override_paranoia', $UserClass)) {
-			return PARANOIA_OVERRIDDEN;
-		}
-		$Override=false;
-		switch ($Property) {
-			case 'downloaded':
-			case 'ratio':
-			case 'uploaded':
-			case 'lastseen':
-				if (check_perms('users_mod', $UserClass))
-					return PARANOIA_OVERRIDDEN;
-				break;
-			case 'snatched': case 'snatched+':
-				if (check_perms('users_view_torrents_snatchlist', $UserClass))
-					return PARANOIA_OVERRIDDEN;
-				break;
-			case 'uploads': case 'uploads+':
-			case 'seeding': case 'seeding+':
-			case 'leeching': case 'leeching+':
-				if (check_perms('users_view_seedleech', $UserClass))
-					return PARANOIA_OVERRIDDEN;
-				break;
-			case 'invitedcount':
-				if (check_perms('users_view_invites', $UserClass))
-					return PARANOIA_OVERRIDDEN;
-				break;
-		}
-		return false;
-	}
+    if (check_perms('users_override_paranoia', $UserClass)) {
+      return PARANOIA_OVERRIDDEN;
+    }
+    $Override=false;
+    switch ($Property) {
+      case 'downloaded':
+      case 'ratio':
+      case 'uploaded':
+      case 'lastseen':
+        if (check_perms('users_mod', $UserClass))
+          return PARANOIA_OVERRIDDEN;
+        break;
+      case 'snatched': case 'snatched+':
+        if (check_perms('users_view_torrents_snatchlist', $UserClass))
+          return PARANOIA_OVERRIDDEN;
+        break;
+      case 'uploads': case 'uploads+':
+      case 'seeding': case 'seeding+':
+      case 'leeching': case 'leeching+':
+        if (check_perms('users_view_seedleech', $UserClass))
+          return PARANOIA_OVERRIDDEN;
+        break;
+      case 'invitedcount':
+        if (check_perms('users_view_invites', $UserClass))
+          return PARANOIA_OVERRIDDEN;
+        break;
+    }
+    return false;
+  }
 }

classes/permissions.class.php

@@ -1,11 +1,11 @@
 <?
 class Permissions {
-	/* Check to see if a user has the permission to perform an action
-	 * This is called by check_perms in util.php, for convenience.
-	 *
-	 * @param string PermissionName
-	 * @param string $MinClass Return false if the user's class level is below this.
-	 */
+  /* Check to see if a user has the permission to perform an action
+   * This is called by check_perms in util.php, for convenience.
+   *
+   * @param string PermissionName
+   * @param string $MinClass Return false if the user's class level is below this.
+   */
   public static function check_perms($PermissionName, $MinClass = 0) {
 
     $OverrideClass = 1000;
@@ -22,87 +22,87 @@ class Permissions {
     );
   }
 
-	/**
-	 * Gets the permissions associated with a certain permissionid
-	 *
-	 * @param int $PermissionID the kind of permissions to fetch
-	 * @return array permissions
-	 */
-	public static function get_permissions($PermissionID) {
-		$Permission = G::$Cache->get_value("perm_$PermissionID");
-		if (empty($Permission)) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT Level AS Class, `Values` AS Permissions, Secondary, PermittedForums
-				FROM permissions
-				WHERE ID = '$PermissionID'");
-			$Permission = G::$DB->next_record(MYSQLI_ASSOC, array('Permissions'));
-			G::$DB->set_query_id($QueryID);
-			$Permission['Permissions'] = unserialize($Permission['Permissions']);
-			G::$Cache->cache_value("perm_$PermissionID", $Permission, 2592000);
-		}
-		return $Permission;
-	}
+  /**
+   * Gets the permissions associated with a certain permissionid
+   *
+   * @param int $PermissionID the kind of permissions to fetch
+   * @return array permissions
+   */
+  public static function get_permissions($PermissionID) {
+    $Permission = G::$Cache->get_value("perm_$PermissionID");
+    if (empty($Permission)) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT Level AS Class, `Values` AS Permissions, Secondary, PermittedForums
+        FROM permissions
+        WHERE ID = '$PermissionID'");
+      $Permission = G::$DB->next_record(MYSQLI_ASSOC, array('Permissions'));
+      G::$DB->set_query_id($QueryID);
+      $Permission['Permissions'] = unserialize($Permission['Permissions']);
+      G::$Cache->cache_value("perm_$PermissionID", $Permission, 2592000);
+    }
+    return $Permission;
+  }
 
-	/**
-	 * Get a user's permissions.
-	 *
-	 * @param $UserID
-	 * @param array|false $CustomPermissions
-	 *	Pass in the user's custom permissions if you already have them.
-	 *	Leave false if you don't have their permissions. The function will fetch them.
-	 * @return array Mapping of PermissionName=>bool/int
-	 */
-	public static function get_permissions_for_user($UserID, $CustomPermissions = false) {
-		$UserInfo = Users::user_info($UserID);
+  /**
+   * Get a user's permissions.
+   *
+   * @param $UserID
+   * @param array|false $CustomPermissions
+   *  Pass in the user's custom permissions if you already have them.
+   *  Leave false if you don't have their permissions. The function will fetch them.
+   * @return array Mapping of PermissionName=>bool/int
+   */
+  public static function get_permissions_for_user($UserID, $CustomPermissions = false) {
+    $UserInfo = Users::user_info($UserID);
 
-		// Fetch custom permissions if they weren't passed in.
-		if ($CustomPermissions === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query('
-				SELECT CustomPermissions
-				FROM users_main
-				WHERE ID = ' . (int)$UserID);
-			list($CustomPermissions) = G::$DB->next_record(MYSQLI_NUM, false);
-			G::$DB->set_query_id($QueryID);
-		}
+    // Fetch custom permissions if they weren't passed in.
+    if ($CustomPermissions === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query('
+        SELECT CustomPermissions
+        FROM users_main
+        WHERE ID = ' . (int)$UserID);
+      list($CustomPermissions) = G::$DB->next_record(MYSQLI_NUM, false);
+      G::$DB->set_query_id($QueryID);
+    }
 
-		if (!empty($CustomPermissions) && !is_array($CustomPermissions)) {
-			$CustomPermissions = unserialize($CustomPermissions);
-		}
+    if (!empty($CustomPermissions) && !is_array($CustomPermissions)) {
+      $CustomPermissions = unserialize($CustomPermissions);
+    }
 
-		$Permissions = self::get_permissions($UserInfo['PermissionID']);
+    $Permissions = self::get_permissions($UserInfo['PermissionID']);
 
-		// Manage 'special' inherited permissions
-		$BonusPerms = array();
-		$BonusCollages = 0;
-		foreach ($UserInfo['ExtraClasses'] as $PermID => $Value) {
-			$ClassPerms = self::get_permissions($PermID);
-			$BonusCollages += $ClassPerms['Permissions']['MaxCollages'];
-			unset($ClassPerms['Permissions']['MaxCollages']);
-			$BonusPerms = array_merge($BonusPerms, $ClassPerms['Permissions']);
-		}
+    // Manage 'special' inherited permissions
+    $BonusPerms = array();
+    $BonusCollages = 0;
+    foreach ($UserInfo['ExtraClasses'] as $PermID => $Value) {
+      $ClassPerms = self::get_permissions($PermID);
+      $BonusCollages += $ClassPerms['Permissions']['MaxCollages'];
+      unset($ClassPerms['Permissions']['MaxCollages']);
+      $BonusPerms = array_merge($BonusPerms, $ClassPerms['Permissions']);
+    }
 
-		if (empty($CustomPermissions)) {
-			$CustomPermissions = array();
-		}
+    if (empty($CustomPermissions)) {
+      $CustomPermissions = array();
+    }
 
-		$MaxCollages = $Permissions['Permissions']['MaxCollages'] + $BonusCollages;
-		if (isset($CustomPermissions['MaxCollages'])) {
-			$MaxCollages += $CustomPermissions['MaxCollages'];
-			unset($CustomPermissions['MaxCollages']);
-		}
-		$Permissions['Permissions']['MaxCollages'] = $MaxCollages;
-		// Combine the permissions
-		return array_merge(
-				$Permissions['Permissions'],
-				$BonusPerms,
-				$CustomPermissions);
-	}
+    $MaxCollages = $Permissions['Permissions']['MaxCollages'] + $BonusCollages;
+    if (isset($CustomPermissions['MaxCollages'])) {
+      $MaxCollages += $CustomPermissions['MaxCollages'];
+      unset($CustomPermissions['MaxCollages']);
+    }
+    $Permissions['Permissions']['MaxCollages'] = $MaxCollages;
+    // Combine the permissions
+    return array_merge(
+        $Permissions['Permissions'],
+        $BonusPerms,
+        $CustomPermissions);
+  }
 
-	public static function is_mod($UserID) {
-		$Permissions = self::get_permissions_for_user($UserID);
-		return isset($Permissions['users_mod']) && $Permissions['users_mod'];
-	}
+  public static function is_mod($UserID) {
+    $Permissions = self::get_permissions_for_user($UserID);
+    return isset($Permissions['users_mod']) && $Permissions['users_mod'];
+  }
 }
 ?>

classes/permissions_form.php

@@ -4,276 +4,276 @@
  ************ Permissions form ********************** user.php and tools.php ****
  ********************************************************************************
  ** This function is used to create both the class permissions form, and the   **
- ** user custom permissions form.											  **
+ ** user custom permissions form.                        **
  ********************************************************************************/
 
 $PermissionsArray = array(
-	'site_leech' => 'Can leech (Does this work?).',
-	'site_upload' => 'Upload torrent access.',
-	'site_vote' => 'Request vote access.',
-	'site_submit_requests' => 'Request create access.',
-	'site_advanced_search' => 'Advanced search access.',
-	'site_top10' => 'Top 10 access.',
-	'site_advanced_top10' => 'Advanced Top 10 access.',
-	'site_album_votes' => 'Voting for favorite torrents.',
-	'site_torrents_notify' => 'Notifications access.',
-	'site_collages_create' => 'Collage create access.',
-	'site_collages_manage' => 'Collage manage access.',
-	'site_collages_delete' => 'Collage delete access.',
-	'site_collages_subscribe' => 'Collage subscription access.',
-	'site_collages_personal' => 'Can have a personal collage.',
-	'site_collages_renamepersonal' => 'Can rename own personal collages.',
-	'site_make_bookmarks' => 'Bookmarks access.',
-	'site_edit_wiki' => 'Wiki edit access.',
-	'site_can_invite_always' => 'Can invite past user limit.',
-	'site_send_unlimited_invites' => 'Unlimited invites.',
-	'site_moderate_requests' => 'Request moderation access.',
-	'site_delete_artist' => 'Can delete artists (must be able to delete torrents+requests).',
-	'site_moderate_forums' => 'Forum moderation access.',
-	'site_admin_forums' => 'Forum administrator access.',
-	'site_forums_double_post' => 'Can double post in the forums.',
-	'site_view_flow' => 'Can view stats and data pools.',
-	'site_view_full_log' => 'Can view old log entries.',
-	'site_view_torrent_snatchlist' => 'Can view torrent snatch lists.',
-	'site_recommend_own' => 'Can recommend own torrents.',
-	'site_manage_recommendations' => 'Recommendations management access.',
-	'site_delete_tag' => 'Can delete tags.',
-	'site_disable_ip_history' => 'Disable IP history.',
-	'zip_downloader' => 'Download multiple torrents at once.',
-	'site_debug' => 'Developer access.',
-	'site_proxy_images' => 'Image proxy & anti-canary.',
-	'site_search_many' => 'Can go past low limit of search results.',
-	'site_ratio_watch_immunity' => 'Immune from being put on ratio watch.',
-	'users_edit_usernames' => 'Can edit usernames.',
-	'users_edit_ratio' => 'Can edit anyone\'s upload/download amounts.',
-	'users_edit_own_ratio' => 'Can edit own upload/download amounts.',
-	'users_edit_titles' => 'Can edit titles.',
-	'users_edit_avatars' => 'Can edit avatars.',
-	'users_edit_invites' => 'Can edit invite numbers and cancel sent invites.',
-	'users_edit_watch_hours' => 'Can edit contrib watch hours.',
-	'users_edit_reset_keys' => 'Can reset passkey/authkey.',
-	'users_edit_profiles' => 'Can edit anyone\'s profile.',
-	'users_view_friends' => 'Can view anyone\'s friends.',
-	'users_reset_own_keys' => 'Can reset own passkey/authkey.',
-	'users_edit_password' => 'Can change passwords.',
-	'users_promote_below' => 'Can promote users to below current level.',
-	'users_promote_to' => 'Can promote users up to current level.',
-	'users_give_donor' => 'Can give donor access.',
-	'users_warn' => 'Can warn users.',
-	'users_disable_users' => 'Can disable users.',
-	'users_disable_posts' => 'Can disable users\' posting privileges.',
-	'users_disable_any' => 'Can disable any users\' rights.',
-	'users_delete_users' => 'Can delete users.',
-	'users_view_invites' => 'Can view who user has invited.',
-	'users_view_seedleech' => 'Can view what a user is seeding or leeching.',
-	'users_view_uploaded' => 'Can view a user\'s uploads, regardless of privacy level.',
-	'users_view_keys' => 'Can view passkeys.',
-	'users_view_ips' => 'Can view IP addresses.',
-	'users_view_email' => 'Can view email addresses.',
-	'users_invite_notes' => 'Can add a staff note when inviting someone.',
-	'users_override_paranoia' => 'Can override paranoia.',
-	'users_logout' => 'Can log users out (old?).',
-	'users_make_invisible' => 'Can make users invisible.',
-	'users_mod' => 'Basic moderator tools.',
-	'torrents_edit' => 'Can edit any torrent.',
-	'torrents_delete' => 'Can delete torrents.',
-	'torrents_delete_fast' => 'Can delete more than 3 torrents at a time.',
-	'torrents_freeleech' => 'Can make torrents freeleech.',
-	'torrents_search_fast' => 'Rapid search (for scripts).',
-	'torrents_hide_dnu' => 'Hide the Do Not Upload list by default.',
-	'torrents_fix_ghosts' => 'Can fix "ghost" groups on artist pages.',
-	'screenshots_add' => 'Can add screenshots to any torrent and delete their own screenshots.',
-	'screenshots_delete' => 'Can delete any screenshot from any torrent.',
-	'admin_manage_news' => 'Can manage site news.',
-	'admin_manage_blog' => 'Can manage the site blog.',
-	'admin_manage_polls' => 'Can manage polls.',
-	'admin_manage_forums' => 'Can manage forums (add/edit/delete).',
-	'admin_manage_fls' => 'Can manage FLS.',
-	'admin_reports' => 'Can access reports system.',
-	'admin_advanced_user_search' => 'Can access advanced user search.',
-	'admin_create_users' => 'Can create users through an administrative form.',
-	'admin_donor_log' => 'Can view the donor log.',
-	'admin_manage_ipbans' => 'Can manage IP bans.',
-	'admin_dnu' => 'Can manage do not upload list.',
-	'admin_clear_cache' => 'Can clear cached.',
-	'admin_whitelist' => 'Can manage the list of allowed clients.',
-	'admin_manage_permissions' => 'Can edit permission classes/user permissions.',
-	'admin_schedule' => 'Can run the site schedule.',
-	'admin_login_watch' => 'Can manage login watch.',
-	'admin_manage_wiki' => 'Can manage wiki access.',
-	'admin_update_geoip' => 'Can update geoIP data.',
-	'site_collages_recover' => 'Can recover \'deleted\' collages.',
-	'torrents_add_artist' => 'Can add artists to any group.',
-	'edit_unknowns' => 'Can edit unknown release information.',
-	'forums_polls_create' => 'Can create polls in the forums.',
-	'forums_polls_moderate' => 'Can feature and close polls.',
-	'project_team' => 'Is part of the project team.',
-	'torrents_edit_vanityhouse' => 'Can mark groups as part of Vanity House.',
-	'artist_edit_vanityhouse' => 'Can mark artists as part of Vanity House.',
-	'site_tag_aliases_read' => 'Can view the list of tag aliases.'
+  'site_leech' => 'Can leech (Does this work?).',
+  'site_upload' => 'Upload torrent access.',
+  'site_vote' => 'Request vote access.',
+  'site_submit_requests' => 'Request create access.',
+  'site_advanced_search' => 'Advanced search access.',
+  'site_top10' => 'Top 10 access.',
+  'site_advanced_top10' => 'Advanced Top 10 access.',
+  'site_album_votes' => 'Voting for favorite torrents.',
+  'site_torrents_notify' => 'Notifications access.',
+  'site_collages_create' => 'Collage create access.',
+  'site_collages_manage' => 'Collage manage access.',
+  'site_collages_delete' => 'Collage delete access.',
+  'site_collages_subscribe' => 'Collage subscription access.',
+  'site_collages_personal' => 'Can have a personal collage.',
+  'site_collages_renamepersonal' => 'Can rename own personal collages.',
+  'site_make_bookmarks' => 'Bookmarks access.',
+  'site_edit_wiki' => 'Wiki edit access.',
+  'site_can_invite_always' => 'Can invite past user limit.',
+  'site_send_unlimited_invites' => 'Unlimited invites.',
+  'site_moderate_requests' => 'Request moderation access.',
+  'site_delete_artist' => 'Can delete artists (must be able to delete torrents+requests).',
+  'site_moderate_forums' => 'Forum moderation access.',
+  'site_admin_forums' => 'Forum administrator access.',
+  'site_forums_double_post' => 'Can double post in the forums.',
+  'site_view_flow' => 'Can view stats and data pools.',
+  'site_view_full_log' => 'Can view old log entries.',
+  'site_view_torrent_snatchlist' => 'Can view torrent snatch lists.',
+  'site_recommend_own' => 'Can recommend own torrents.',
+  'site_manage_recommendations' => 'Recommendations management access.',
+  'site_delete_tag' => 'Can delete tags.',
+  'site_disable_ip_history' => 'Disable IP history.',
+  'zip_downloader' => 'Download multiple torrents at once.',
+  'site_debug' => 'Developer access.',
+  'site_proxy_images' => 'Image proxy & anti-canary.',
+  'site_search_many' => 'Can go past low limit of search results.',
+  'site_ratio_watch_immunity' => 'Immune from being put on ratio watch.',
+  'users_edit_usernames' => 'Can edit usernames.',
+  'users_edit_ratio' => 'Can edit anyone\'s upload/download amounts.',
+  'users_edit_own_ratio' => 'Can edit own upload/download amounts.',
+  'users_edit_titles' => 'Can edit titles.',
+  'users_edit_avatars' => 'Can edit avatars.',
+  'users_edit_invites' => 'Can edit invite numbers and cancel sent invites.',
+  'users_edit_watch_hours' => 'Can edit contrib watch hours.',
+  'users_edit_reset_keys' => 'Can reset passkey/authkey.',
+  'users_edit_profiles' => 'Can edit anyone\'s profile.',
+  'users_view_friends' => 'Can view anyone\'s friends.',
+  'users_reset_own_keys' => 'Can reset own passkey/authkey.',
+  'users_edit_password' => 'Can change passwords.',
+  'users_promote_below' => 'Can promote users to below current level.',
+  'users_promote_to' => 'Can promote users up to current level.',
+  'users_give_donor' => 'Can give donor access.',
+  'users_warn' => 'Can warn users.',
+  'users_disable_users' => 'Can disable users.',
+  'users_disable_posts' => 'Can disable users\' posting privileges.',
+  'users_disable_any' => 'Can disable any users\' rights.',
+  'users_delete_users' => 'Can delete users.',
+  'users_view_invites' => 'Can view who user has invited.',
+  'users_view_seedleech' => 'Can view what a user is seeding or leeching.',
+  'users_view_uploaded' => 'Can view a user\'s uploads, regardless of privacy level.',
+  'users_view_keys' => 'Can view passkeys.',
+  'users_view_ips' => 'Can view IP addresses.',
+  'users_view_email' => 'Can view email addresses.',
+  'users_invite_notes' => 'Can add a staff note when inviting someone.',
+  'users_override_paranoia' => 'Can override paranoia.',
+  'users_logout' => 'Can log users out (old?).',
+  'users_make_invisible' => 'Can make users invisible.',
+  'users_mod' => 'Basic moderator tools.',
+  'torrents_edit' => 'Can edit any torrent.',
+  'torrents_delete' => 'Can delete torrents.',
+  'torrents_delete_fast' => 'Can delete more than 3 torrents at a time.',
+  'torrents_freeleech' => 'Can make torrents freeleech.',
+  'torrents_search_fast' => 'Rapid search (for scripts).',
+  'torrents_hide_dnu' => 'Hide the Do Not Upload list by default.',
+  'torrents_fix_ghosts' => 'Can fix "ghost" groups on artist pages.',
+  'screenshots_add' => 'Can add screenshots to any torrent and delete their own screenshots.',
+  'screenshots_delete' => 'Can delete any screenshot from any torrent.',
+  'admin_manage_news' => 'Can manage site news.',
+  'admin_manage_blog' => 'Can manage the site blog.',
+  'admin_manage_polls' => 'Can manage polls.',
+  'admin_manage_forums' => 'Can manage forums (add/edit/delete).',
+  'admin_manage_fls' => 'Can manage FLS.',
+  'admin_reports' => 'Can access reports system.',
+  'admin_advanced_user_search' => 'Can access advanced user search.',
+  'admin_create_users' => 'Can create users through an administrative form.',
+  'admin_donor_log' => 'Can view the donor log.',
+  'admin_manage_ipbans' => 'Can manage IP bans.',
+  'admin_dnu' => 'Can manage do not upload list.',
+  'admin_clear_cache' => 'Can clear cached.',
+  'admin_whitelist' => 'Can manage the list of allowed clients.',
+  'admin_manage_permissions' => 'Can edit permission classes/user permissions.',
+  'admin_schedule' => 'Can run the site schedule.',
+  'admin_login_watch' => 'Can manage login watch.',
+  'admin_manage_wiki' => 'Can manage wiki access.',
+  'admin_update_geoip' => 'Can update geoIP data.',
+  'site_collages_recover' => 'Can recover \'deleted\' collages.',
+  'torrents_add_artist' => 'Can add artists to any group.',
+  'edit_unknowns' => 'Can edit unknown release information.',
+  'forums_polls_create' => 'Can create polls in the forums.',
+  'forums_polls_moderate' => 'Can feature and close polls.',
+  'project_team' => 'Is part of the project team.',
+  'torrents_edit_vanityhouse' => 'Can mark groups as part of Vanity House.',
+  'artist_edit_vanityhouse' => 'Can mark artists as part of Vanity House.',
+  'site_tag_aliases_read' => 'Can view the list of tag aliases.'
 );
 
 function permissions_form() {
 ?>
 <div class="permissions">
-	<div class="permission_container">
-		<table>
-			<tr class="colhead">
-				<td>Site</td>
-			</tr>
-			<tr>
-				<td>
+  <div class="permission_container">
+    <table>
+      <tr class="colhead">
+        <td>Site</td>
+      </tr>
+      <tr>
+        <td>
 <?
-					display_perm('site_leech','Can leech.');
-					display_perm('site_upload','Can upload.');
-					display_perm('site_vote','Can vote on requests.');
-					display_perm('site_submit_requests','Can submit requests.');
-					display_perm('site_advanced_search','Can use advanced search.');
-					display_perm('site_top10','Can access top 10.');
-					display_perm('site_torrents_notify','Can access torrents notifications system.');
-					display_perm('site_collages_create','Can create collages.');
-					display_perm('site_collages_manage','Can manage collages (add torrents, sorting).');
-					display_perm('site_collages_delete','Can delete collages.');
-					display_perm('site_collages_subscribe','Can access collage subscriptions.');
-					display_perm('site_collages_personal','Can have a personal collage.');
-					display_perm('site_collages_renamepersonal','Can rename own personal collages.');
-					display_perm('site_advanced_top10','Can access advanced top 10.');
-					display_perm('site_album_votes', 'Can vote for favorite torrents.');
-					display_perm('site_make_bookmarks','Can make bookmarks.');
-					display_perm('site_edit_wiki','Can edit wiki pages.');
-					display_perm('site_can_invite_always', 'Can invite users even when invites are closed.');
-					display_perm('site_send_unlimited_invites', 'Can send unlimited invites.');
-					display_perm('site_moderate_requests', 'Can moderate any request.');
-					display_perm('site_delete_artist', 'Can delete artists (must be able to delete torrents+requests).');
-					display_perm('forums_polls_create','Can create polls in the forums.');
-					display_perm('forums_polls_moderate','Can feature and close polls.');
-					display_perm('site_moderate_forums', 'Can moderate the forums.');
-					display_perm('site_admin_forums', 'Can administrate the forums.');
-					display_perm('site_view_flow', 'Can view site stats and data pools.');
-					display_perm('site_view_full_log', 'Can view the full site log.');
-					display_perm('site_view_torrent_snatchlist', 'Can view torrent snatch lists.');
-					display_perm('site_recommend_own', 'Can add own torrents to recommendations list.');
-					display_perm('site_manage_recommendations', 'Can edit recommendations list.');
-					display_perm('site_delete_tag', 'Can delete tags.');
-					display_perm('site_disable_ip_history', 'Disable IP history.');
-					display_perm('zip_downloader', 'Download multiple torrents at once.');
-					display_perm('site_debug', 'View site debug tables.');
-					display_perm('site_proxy_images', 'Proxy images through the server.');
-					display_perm('site_search_many', 'Can go past low limit of search results.');
-					display_perm('site_collages_recover', 'Can recover \'deleted\' collages.');
-					display_perm('site_forums_double_post', 'Can double post in the forums.');
-					display_perm('project_team', 'Part of the project team.');
-					display_perm('site_tag_aliases_read', 'Can view the list of tag aliases.');
-					display_perm('site_ratio_watch_immunity', 'Immune from being put on ratio watch.');
+          display_perm('site_leech','Can leech.');
+          display_perm('site_upload','Can upload.');
+          display_perm('site_vote','Can vote on requests.');
+          display_perm('site_submit_requests','Can submit requests.');
+          display_perm('site_advanced_search','Can use advanced search.');
+          display_perm('site_top10','Can access top 10.');
+          display_perm('site_torrents_notify','Can access torrents notifications system.');
+          display_perm('site_collages_create','Can create collages.');
+          display_perm('site_collages_manage','Can manage collages (add torrents, sorting).');
+          display_perm('site_collages_delete','Can delete collages.');
+          display_perm('site_collages_subscribe','Can access collage subscriptions.');
+          display_perm('site_collages_personal','Can have a personal collage.');
+          display_perm('site_collages_renamepersonal','Can rename own personal collages.');
+          display_perm('site_advanced_top10','Can access advanced top 10.');
+          display_perm('site_album_votes', 'Can vote for favorite torrents.');
+          display_perm('site_make_bookmarks','Can make bookmarks.');
+          display_perm('site_edit_wiki','Can edit wiki pages.');
+          display_perm('site_can_invite_always', 'Can invite users even when invites are closed.');
+          display_perm('site_send_unlimited_invites', 'Can send unlimited invites.');
+          display_perm('site_moderate_requests', 'Can moderate any request.');
+          display_perm('site_delete_artist', 'Can delete artists (must be able to delete torrents+requests).');
+          display_perm('forums_polls_create','Can create polls in the forums.');
+          display_perm('forums_polls_moderate','Can feature and close polls.');
+          display_perm('site_moderate_forums', 'Can moderate the forums.');
+          display_perm('site_admin_forums', 'Can administrate the forums.');
+          display_perm('site_view_flow', 'Can view site stats and data pools.');
+          display_perm('site_view_full_log', 'Can view the full site log.');
+          display_perm('site_view_torrent_snatchlist', 'Can view torrent snatch lists.');
+          display_perm('site_recommend_own', 'Can add own torrents to recommendations list.');
+          display_perm('site_manage_recommendations', 'Can edit recommendations list.');
+          display_perm('site_delete_tag', 'Can delete tags.');
+          display_perm('site_disable_ip_history', 'Disable IP history.');
+          display_perm('zip_downloader', 'Download multiple torrents at once.');
+          display_perm('site_debug', 'View site debug tables.');
+          display_perm('site_proxy_images', 'Proxy images through the server.');
+          display_perm('site_search_many', 'Can go past low limit of search results.');
+          display_perm('site_collages_recover', 'Can recover \'deleted\' collages.');
+          display_perm('site_forums_double_post', 'Can double post in the forums.');
+          display_perm('project_team', 'Part of the project team.');
+          display_perm('site_tag_aliases_read', 'Can view the list of tag aliases.');
+          display_perm('site_ratio_watch_immunity', 'Immune from being put on ratio watch.');
 ?>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="permission_container">
-		<table>
-			<tr class="colhead">
-				<td>Users</td>
-			</tr>
-			<tr>
-				<td>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <div class="permission_container">
+    <table>
+      <tr class="colhead">
+        <td>Users</td>
+      </tr>
+      <tr>
+        <td>
 <?
-					display_perm('users_edit_usernames', 'Can edit usernames.');
-					display_perm('users_edit_ratio', 'Can edit anyone\'s upload/download amounts.');
-					display_perm('users_edit_own_ratio', 'Can edit own upload/download amounts.');
-					display_perm('users_edit_titles', 'Can edit titles.');
-					display_perm('users_edit_avatars', 'Can edit avatars.');
-					display_perm('users_edit_invites', 'Can edit invite numbers and cancel sent invites.');
-					display_perm('users_edit_watch_hours', 'Can edit contrib watch hours.');
-					display_perm('users_edit_reset_keys', 'Can reset any passkey/authkey.');
-					display_perm('users_edit_profiles', 'Can edit anyone\'s profile.');
-					display_perm('users_edit_badges', 'Can edit anyone\'s badges.');
-					display_perm('users_view_friends', 'Can view anyone\'s friends.');
-					display_perm('users_reset_own_keys', 'Can reset own passkey/authkey.');
-					display_perm('users_edit_password', 'Can change password.');
-					display_perm('users_promote_below', 'Can promote users to below current level.');
-					display_perm('users_promote_to', 'Can promote users up to current level.');
-					display_perm('users_give_donor', 'Can give donor access.');
-					display_perm('users_warn', 'Can warn users.');
-					display_perm('users_disable_users', 'Can disable users.');
-					display_perm('users_disable_posts', 'Can disable users\' posting privileges.');
-					display_perm('users_disable_any', 'Can disable any users\' rights.');
-					display_perm('users_delete_users', 'Can delete anyone\'s account');
-					display_perm('users_view_invites', 'Can view who user has invited');
-					display_perm('users_view_seedleech', 'Can view what a user is seeding or leeching');
-					display_perm('users_view_uploaded', 'Can view a user\'s uploads, regardless of privacy level');
-					display_perm('users_view_keys', 'Can view passkeys');
-					display_perm('users_view_ips', 'Can view IP addresses');
-					display_perm('users_view_email', 'Can view email addresses');
-					display_perm('users_invite_notes', 'Can add a staff note when inviting someone.');
-					display_perm('users_override_paranoia', 'Can override paranoia');
-					display_perm('users_make_invisible', 'Can make users invisible');
-					display_perm('users_logout', 'Can log users out');
-					display_perm('users_mod', 'Can access basic moderator tools (Admin comment)');
+          display_perm('users_edit_usernames', 'Can edit usernames.');
+          display_perm('users_edit_ratio', 'Can edit anyone\'s upload/download amounts.');
+          display_perm('users_edit_own_ratio', 'Can edit own upload/download amounts.');
+          display_perm('users_edit_titles', 'Can edit titles.');
+          display_perm('users_edit_avatars', 'Can edit avatars.');
+          display_perm('users_edit_invites', 'Can edit invite numbers and cancel sent invites.');
+          display_perm('users_edit_watch_hours', 'Can edit contrib watch hours.');
+          display_perm('users_edit_reset_keys', 'Can reset any passkey/authkey.');
+          display_perm('users_edit_profiles', 'Can edit anyone\'s profile.');
+          display_perm('users_edit_badges', 'Can edit anyone\'s badges.');
+          display_perm('users_view_friends', 'Can view anyone\'s friends.');
+          display_perm('users_reset_own_keys', 'Can reset own passkey/authkey.');
+          display_perm('users_edit_password', 'Can change password.');
+          display_perm('users_promote_below', 'Can promote users to below current level.');
+          display_perm('users_promote_to', 'Can promote users up to current level.');
+          display_perm('users_give_donor', 'Can give donor access.');
+          display_perm('users_warn', 'Can warn users.');
+          display_perm('users_disable_users', 'Can disable users.');
+          display_perm('users_disable_posts', 'Can disable users\' posting privileges.');
+          display_perm('users_disable_any', 'Can disable any users\' rights.');
+          display_perm('users_delete_users', 'Can delete anyone\'s account');
+          display_perm('users_view_invites', 'Can view who user has invited');
+          display_perm('users_view_seedleech', 'Can view what a user is seeding or leeching');
+          display_perm('users_view_uploaded', 'Can view a user\'s uploads, regardless of privacy level');
+          display_perm('users_view_keys', 'Can view passkeys');
+          display_perm('users_view_ips', 'Can view IP addresses');
+          display_perm('users_view_email', 'Can view email addresses');
+          display_perm('users_invite_notes', 'Can add a staff note when inviting someone.');
+          display_perm('users_override_paranoia', 'Can override paranoia');
+          display_perm('users_make_invisible', 'Can make users invisible');
+          display_perm('users_logout', 'Can log users out');
+          display_perm('users_mod', 'Can access basic moderator tools (Admin comment)');
 ?>
-					*Everything is only applicable to users with the same or lower class level
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="permission_container">
-		<table>
-			<tr class="colhead">
-				<td>Torrents</td>
-			</tr>
-			<tr>
-				<td>
+          *Everything is only applicable to users with the same or lower class level
+        </td>
+      </tr>
+    </table>
+  </div>
+  <div class="permission_container">
+    <table>
+      <tr class="colhead">
+        <td>Torrents</td>
+      </tr>
+      <tr>
+        <td>
 <?
-					display_perm('torrents_edit', 'Can edit any torrent');
-					display_perm('torrents_delete', 'Can delete torrents');
-					display_perm('torrents_delete_fast', 'Can delete more than 3 torrents at a time.');
-					display_perm('torrents_freeleech', 'Can make torrents freeleech');
-					display_perm('torrents_search_fast', 'Unlimit search frequency (for scripts).');
-					display_perm('torrents_add_artist', 'Can add artists to any group.');
-					display_perm('edit_unknowns', 'Can edit unknown release information.');
-					display_perm('torrents_edit_vanityhouse', 'Can mark groups as part of Vanity House.');
-					display_perm('artist_edit_vanityhouse', 'Can mark artists as part of Vanity House.');
-					display_perm('torrents_hide_dnu', 'Hide the Do Not Upload list by default.');
-					display_perm('torrents_fix_ghosts', 'Can fix ghost groups on artist pages.');
-					display_perm('screenshots_add', 'Can add screenshots to any torrent and delete their own screenshots.');
-					display_perm('screenshots_delete', 'Can delete any screenshot from any torrent.');
+          display_perm('torrents_edit', 'Can edit any torrent');
+          display_perm('torrents_delete', 'Can delete torrents');
+          display_perm('torrents_delete_fast', 'Can delete more than 3 torrents at a time.');
+          display_perm('torrents_freeleech', 'Can make torrents freeleech');
+          display_perm('torrents_search_fast', 'Unlimit search frequency (for scripts).');
+          display_perm('torrents_add_artist', 'Can add artists to any group.');
+          display_perm('edit_unknowns', 'Can edit unknown release information.');
+          display_perm('torrents_edit_vanityhouse', 'Can mark groups as part of Vanity House.');
+          display_perm('artist_edit_vanityhouse', 'Can mark artists as part of Vanity House.');
+          display_perm('torrents_hide_dnu', 'Hide the Do Not Upload list by default.');
+          display_perm('torrents_fix_ghosts', 'Can fix ghost groups on artist pages.');
+          display_perm('screenshots_add', 'Can add screenshots to any torrent and delete their own screenshots.');
+          display_perm('screenshots_delete', 'Can delete any screenshot from any torrent.');
 ?>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="permission_container">
-		<table>
-			<tr class="colhead">
-				<td>Administrative</td>
-			</tr>
-			<tr>
-				<td>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <div class="permission_container">
+    <table>
+      <tr class="colhead">
+        <td>Administrative</td>
+      </tr>
+      <tr>
+        <td>
 <?
-					display_perm('admin_manage_news', 'Can manage site news');
-					display_perm('admin_manage_blog', 'Can manage the site blog');
-					display_perm('admin_manage_polls', 'Can manage polls');
-					display_perm('admin_manage_forums', 'Can manage forums (add/edit/delete)');
-					display_perm('admin_manage_fls', 'Can manage FLS');
-					display_perm('admin_reports', 'Can access reports system');
-					display_perm('admin_advanced_user_search', 'Can access advanced user search');
-					display_perm('admin_create_users', 'Can create users through an administrative form');
-					display_perm('admin_donor_log', 'Can view the donor log');
-					display_perm('admin_manage_ipbans', 'Can manage IP bans');
-					display_perm('admin_dnu', 'Can manage do not upload list');
-					display_perm('admin_clear_cache', 'Can clear cached pages');
-					display_perm('admin_whitelist', 'Can manage the list of allowed clients.');
-					display_perm('admin_manage_permissions', 'Can edit permission classes/user permissions.');
-					display_perm('admin_schedule', 'Can run the site schedule.');
-					display_perm('admin_login_watch', 'Can manage login watch.');
-					display_perm('admin_manage_wiki', 'Can manage wiki access.');
-					display_perm('admin_update_geoip', 'Can update geoIP data.');
+          display_perm('admin_manage_news', 'Can manage site news');
+          display_perm('admin_manage_blog', 'Can manage the site blog');
+          display_perm('admin_manage_polls', 'Can manage polls');
+          display_perm('admin_manage_forums', 'Can manage forums (add/edit/delete)');
+          display_perm('admin_manage_fls', 'Can manage FLS');
+          display_perm('admin_reports', 'Can access reports system');
+          display_perm('admin_advanced_user_search', 'Can access advanced user search');
+          display_perm('admin_create_users', 'Can create users through an administrative form');
+          display_perm('admin_donor_log', 'Can view the donor log');
+          display_perm('admin_manage_ipbans', 'Can manage IP bans');
+          display_perm('admin_dnu', 'Can manage do not upload list');
+          display_perm('admin_clear_cache', 'Can clear cached pages');
+          display_perm('admin_whitelist', 'Can manage the list of allowed clients.');
+          display_perm('admin_manage_permissions', 'Can edit permission classes/user permissions.');
+          display_perm('admin_schedule', 'Can run the site schedule.');
+          display_perm('admin_login_watch', 'Can manage login watch.');
+          display_perm('admin_manage_wiki', 'Can manage wiki access.');
+          display_perm('admin_update_geoip', 'Can update geoIP data.');
 ?>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="submit_container"><input type="submit" name="submit" value="Save Permission Class" /></div>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <div class="submit_container"><input type="submit" name="submit" value="Save Permission Class" /></div>
 </div>
 <?
 }

classes/proxies.class.php

@@ -1,43 +1,43 @@
 <?
 //Useful: http://www.robtex.com/cnet/
 $AllowedProxies = array(
-	//Opera Turbo (may include Opera-owned IP addresses that aren't used for Turbo, but shouldn't run much risk of exploitation)
-	'64.255.180.*', //Norway
-	'64.255.164.*', //Norway
-	'80.239.242.*', //Poland
-	'80.239.243.*', //Poland
-	'91.203.96.*', //Norway
-	'94.246.126.*', //Norway
-	'94.246.127.*', //Norway
-	'195.189.142.*', //Norway
-	'195.189.143.*', //Norway
+  //Opera Turbo (may include Opera-owned IP addresses that aren't used for Turbo, but shouldn't run much risk of exploitation)
+  '64.255.180.*', //Norway
+  '64.255.164.*', //Norway
+  '80.239.242.*', //Poland
+  '80.239.243.*', //Poland
+  '91.203.96.*', //Norway
+  '94.246.126.*', //Norway
+  '94.246.127.*', //Norway
+  '195.189.142.*', //Norway
+  '195.189.143.*', //Norway
 );
 
 function proxyCheck($IP) {
-	global $AllowedProxies;
-	for ($i = 0, $il = count($AllowedProxies); $i < $il; ++$i) {
-		//based on the wildcard principle it should never be shorter
-		if (strlen($IP) < strlen($AllowedProxies[$i])) {
-			continue;
-		}
+  global $AllowedProxies;
+  for ($i = 0, $il = count($AllowedProxies); $i < $il; ++$i) {
+    //based on the wildcard principle it should never be shorter
+    if (strlen($IP) < strlen($AllowedProxies[$i])) {
+      continue;
+    }
 
-		//since we're matching bit for bit iterating from the start
-		for ($j = 0, $jl = strlen($IP); $j < $jl; ++$j) {
-			//completed iteration and no inequality
-			if ($j == $jl - 1 && $IP[$j] === $AllowedProxies[$i][$j]) {
-				return true;
-			}
+    //since we're matching bit for bit iterating from the start
+    for ($j = 0, $jl = strlen($IP); $j < $jl; ++$j) {
+      //completed iteration and no inequality
+      if ($j == $jl - 1 && $IP[$j] === $AllowedProxies[$i][$j]) {
+        return true;
+      }
 
-			//wildcard
-			if ($AllowedProxies[$i][$j] === '*') {
-				return true;
-			}
+      //wildcard
+      if ($AllowedProxies[$i][$j] === '*') {
+        return true;
+      }
 
-			//inequality found
-			if ($IP[$j] !== $AllowedProxies[$i][$j]) {
-				break;
-			}
-		}
-	}
-	return false;
+      //inequality found
+      if ($IP[$j] !== $AllowedProxies[$i][$j]) {
+        break;
+      }
+    }
+  }
+  return false;
 }

classes/pushserver.class.php

@@ -5,179 +5,179 @@ define("PUSH_SOCKET_LISTEN_PORT", 6789);
 require 'NMA_API.php';
 require 'config.php';
 class PushServer {
-	private $ListenSocket = false;
-	private $State = 1;
-	private $Listened = false;
-
-	public function __construct() {
-		// restore_error_handler(); //Avoid PHP error logging
-		set_time_limit(0);
-		$this->init();
-		$this->listen();
-	}
-
-	private function init() {
-		$this->ListenSocket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-		socket_set_option($this->ListenSocket, SOL_SOCKET, SO_REUSEADDR, 1);
-		socket_bind($this->ListenSocket, PUSH_SOCKET_LISTEN_ADDRESS, PUSH_SOCKET_LISTEN_PORT);
-		socket_listen($this->ListenSocket);
-		socket_set_nonblock($this->ListenSocket);
-		echo "\nInitialized\n";
-	}
-
-	private function listen() {
-		echo "\nListening...\n";
-		while ( ($this->State) == 1 ) {
-			if ($this->Listened = @socket_accept($this->ListenSocket)) {
-				$Data = socket_read($this->Listened, 512);
-				$this->parse_data($Data);
-			}
-			usleep(5000);
-		}
-	}
-
-	private function parse_data($Data) {
-		$JSON = json_decode($Data, true);
-		$Service = strtolower($JSON['service']);
-		switch ($Service) {
-			case 'nma':
-				$this->push_nma($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-				break;
-			case 'prowl':
-				$this->push_prowl($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-				break;
-			case 'toasty':
-				$this->push_toasty($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-				break;
-			case 'pushover':
-				$this->push_pushover($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-				break;
-			case 'pushbullet':
-				$this->push_pushbullet(
-					$JSON['user']['key'],
-					$JSON['user']['device'],
-					$JSON['message']['title'],
-					$JSON['message']['body'],
-					$JSON['message']['url']
-				);
-			default:
-				break;
-		}
-	}
-
-	private function push_prowl($Key, $Title, $Message, $URL) {
-		$API = "https://api.prowlapp.com/publicapi/add";
-		$Fields = array(
-				'apikey' => urlencode($Key),
-				'application' => urlencode(SITE_NAME),
-				'event' => urlencode($Title),
-				'description' => urlencode($Message)
-		);
-		if (!empty($URL)) {
-			$Fields['url'] = $URL;
-		}
-		$FieldsString = "";
-		foreach ($Fields as $key => $value) {
-			$FieldsString .= $key . '=' . $value . '&';
-		}
-		rtrim($FieldsString, '&');
-
-		$Curl = curl_init();
-		curl_setopt($Curl, CURLOPT_URL, $API);
-		curl_setopt($Curl, CURLOPT_POST, count($Fields));
-		curl_setopt($Curl, CURLOPT_POSTFIELDS, $FieldsString);
-		curl_exec($Curl);
-		curl_close($Curl);
-		echo "Push sent to Prowl";
-	}
-
-	private function push_toasty($Key, $Title, $Message, $URL) {
-		$API = "http://api.supertoasty.com/notify/" . urlencode($Key) . "?";
-		if (!empty($URL)) {
-			$Message = $Message . " " . $URL;
-		}
-		$Fields = array(
-				'title' => urlencode($Title),
-				'text' => urlencode($Message),
-				'sender' => urlencode(SITE_NAME)
-		);
-		$FieldsString = "";
-		foreach ($Fields as $key => $value) {
-			$FieldsString .= $key . '=' . $value . '&';
-		}
-		rtrim($FieldsString, '&');
-
-		$Curl = curl_init();
-		curl_setopt($Curl, CURLOPT_URL, $API);
-		curl_setopt($Curl, CURLOPT_POST, count($Fields));
-		curl_setopt($Curl, CURLOPT_POSTFIELDS, $FieldsString);
-		curl_exec($Curl);
-		curl_close($Curl);
-		echo "Push sent to Toasty";
-	}
-
-	private function push_nma($Key, $Title, $Message, $URL) {
-		$NMA = new NMA_API(array(
-				'apikey' => $Key
-		));
-		if ($NMA->verify()) {
-			if ($NMA->notify(SITE_NAME, $Title, $Message, $URL)) {
-				echo "Push sent to NMA";
-			}
-		}
-	}
-
-	private function push_pushover($UserKey, $Title, $Message, $URL) {
-		curl_setopt_array($ch = curl_init(), array(
-				CURLOPT_URL => "https://api.pushover.net/1/messages.json",
-				CURLOPT_POSTFIELDS => array(
-						"token" => PUSHOVER_KEY,
-						"user" => $UserKey,
-						"title" => $Title,
-						"message" => $Message,
-						"url" => $URL
-				)
-		));
-		curl_exec($ch);
-		curl_close($ch);
-		echo "Push sent to Pushover";
-	}
-
-	/**
-	 * Notify via pushbullet
-	 *
-	 * @param $UserKey User API key
-	 * @param $DeviceID device to push to
-	 * @param $Title Notification title
-	 * @param $Message Notification message
-	 * @param $URL For compatibility with other command. Just gets appended.
-	 */
-	private function push_pushbullet($UserKey, $DeviceID,
-		$Title, $Message, $URL) {
-		if (!empty($URL)) {
-			$Message .= ' ' . $URL;
-		}
-
-		curl_setopt_array($Curl = curl_init(), array(
-			CURLOPT_URL => 'https://api.pushbullet.com/api/pushes',
-			CURLOPT_POSTFIELDS => array(
-				'type' => 'note',
-				'title' => $Title,
-				'body' => $Message,
-				'device_iden' => $DeviceID
-			),
-			CURLOPT_USERPWD => $UserKey . ':',
-			CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-			CURLOPT_RETURNTRANSFER => True
-		));
-
-		$Result = curl_exec($Curl);
-		echo "Push sent to Pushbullet";
-		curl_close($Curl);
-
-
-
-	}
+  private $ListenSocket = false;
+  private $State = 1;
+  private $Listened = false;
+
+  public function __construct() {
+    // restore_error_handler(); //Avoid PHP error logging
+    set_time_limit(0);
+    $this->init();
+    $this->listen();
+  }
+
+  private function init() {
+    $this->ListenSocket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+    socket_set_option($this->ListenSocket, SOL_SOCKET, SO_REUSEADDR, 1);
+    socket_bind($this->ListenSocket, PUSH_SOCKET_LISTEN_ADDRESS, PUSH_SOCKET_LISTEN_PORT);
+    socket_listen($this->ListenSocket);
+    socket_set_nonblock($this->ListenSocket);
+    echo "\nInitialized\n";
+  }
+
+  private function listen() {
+    echo "\nListening...\n";
+    while ( ($this->State) == 1 ) {
+      if ($this->Listened = @socket_accept($this->ListenSocket)) {
+        $Data = socket_read($this->Listened, 512);
+        $this->parse_data($Data);
+      }
+      usleep(5000);
+    }
+  }
+
+  private function parse_data($Data) {
+    $JSON = json_decode($Data, true);
+    $Service = strtolower($JSON['service']);
+    switch ($Service) {
+      case 'nma':
+        $this->push_nma($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
+        break;
+      case 'prowl':
+        $this->push_prowl($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
+        break;
+      case 'toasty':
+        $this->push_toasty($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
+        break;
+      case 'pushover':
+        $this->push_pushover($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
+        break;
+      case 'pushbullet':
+        $this->push_pushbullet(
+          $JSON['user']['key'],
+          $JSON['user']['device'],
+          $JSON['message']['title'],
+          $JSON['message']['body'],
+          $JSON['message']['url']
+        );
+      default:
+        break;
+    }
+  }
+
+  private function push_prowl($Key, $Title, $Message, $URL) {
+    $API = "https://api.prowlapp.com/publicapi/add";
+    $Fields = array(
+        'apikey' => urlencode($Key),
+        'application' => urlencode(SITE_NAME),
+        'event' => urlencode($Title),
+        'description' => urlencode($Message)
+    );
+    if (!empty($URL)) {
+      $Fields['url'] = $URL;
+    }
+    $FieldsString = "";
+    foreach ($Fields as $key => $value) {
+      $FieldsString .= $key . '=' . $value . '&';
+    }
+    rtrim($FieldsString, '&');
+
+    $Curl = curl_init();
+    curl_setopt($Curl, CURLOPT_URL, $API);
+    curl_setopt($Curl, CURLOPT_POST, count($Fields));
+    curl_setopt($Curl, CURLOPT_POSTFIELDS, $FieldsString);
+    curl_exec($Curl);
+    curl_close($Curl);
+    echo "Push sent to Prowl";
+  }
+
+  private function push_toasty($Key, $Title, $Message, $URL) {
+    $API = "http://api.supertoasty.com/notify/" . urlencode($Key) . "?";
+    if (!empty($URL)) {
+      $Message = $Message . " " . $URL;
+    }
+    $Fields = array(
+        'title' => urlencode($Title),
+        'text' => urlencode($Message),
+        'sender' => urlencode(SITE_NAME)
+    );
+    $FieldsString = "";
+    foreach ($Fields as $key => $value) {
+      $FieldsString .= $key . '=' . $value . '&';
+    }
+    rtrim($FieldsString, '&');
+
+    $Curl = curl_init();
+    curl_setopt($Curl, CURLOPT_URL, $API);
+    curl_setopt($Curl, CURLOPT_POST, count($Fields));
+    curl_setopt($Curl, CURLOPT_POSTFIELDS, $FieldsString);
+    curl_exec($Curl);
+    curl_close($Curl);
+    echo "Push sent to Toasty";
+  }
+
+  private function push_nma($Key, $Title, $Message, $URL) {
+    $NMA = new NMA_API(array(
+        'apikey' => $Key
+    ));
+    if ($NMA->verify()) {
+      if ($NMA->notify(SITE_NAME, $Title, $Message, $URL)) {
+        echo "Push sent to NMA";
+      }
+    }
+  }
+
+  private function push_pushover($UserKey, $Title, $Message, $URL) {
+    curl_setopt_array($ch = curl_init(), array(
+        CURLOPT_URL => "https://api.pushover.net/1/messages.json",
+        CURLOPT_POSTFIELDS => array(
+            "token" => PUSHOVER_KEY,
+            "user" => $UserKey,
+            "title" => $Title,
+            "message" => $Message,
+            "url" => $URL
+        )
+    ));
+    curl_exec($ch);
+    curl_close($ch);
+    echo "Push sent to Pushover";
+  }
+
+  /**
+   * Notify via pushbullet
+   *
+   * @param $UserKey User API key
+   * @param $DeviceID device to push to
+   * @param $Title Notification title
+   * @param $Message Notification message
+   * @param $URL For compatibility with other command. Just gets appended.
+   */
+  private function push_pushbullet($UserKey, $DeviceID,
+    $Title, $Message, $URL) {
+    if (!empty($URL)) {
+      $Message .= ' ' . $URL;
+    }
+
+    curl_setopt_array($Curl = curl_init(), array(
+      CURLOPT_URL => 'https://api.pushbullet.com/api/pushes',
+      CURLOPT_POSTFIELDS => array(
+        'type' => 'note',
+        'title' => $Title,
+        'body' => $Message,
+        'device_iden' => $DeviceID
+      ),
+      CURLOPT_USERPWD => $UserKey . ':',
+      CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
+      CURLOPT_RETURNTRANSFER => True
+    ));
+
+    $Result = curl_exec($Curl);
+    echo "Push sent to Pushbullet";
+    curl_close($Curl);
+
+
+
+  }
 }
 
 $PushServer = new PushServer();

classes/reports.class.php

@@ -1,27 +1,27 @@
 <?php
 class Reports {
-	/**
-	 * This function formats a string containing a torrent's remaster information
-	 * to be used in Reports v2.
-	 *
-	 * @param boolean  $Remastered - whether the torrent contains remaster information
-	 * @param string   $RemasterTitle - the title of the remaster information
-	 * @param string   $RemasterYear - the year of the remaster information
-	 */
-	public static function format_reports_remaster_info($Remastered, $RemasterTitle, $RemasterYear) {
-		if ($Remastered) {
-			$RemasterDisplayString = ' &lt;';
-			if ($RemasterTitle != '' && $RemasterYear != '') {
-				$RemasterDisplayString .= "$RemasterTitle - $RemasterYear";
-			} elseif ($RemasterTitle != '' && $RemasterYear == '') {
-				$RemasterDisplayString .= $RemasterTitle;
-			} elseif ($RemasterTitle == '' && $RemasterYear != '') {
-				$RemasterDisplayString .= $RemasterYear;
-			}
-			$RemasterDisplayString .= '&gt;';
-		} else {
-			$RemasterDisplayString = '';
-		}
-		return $RemasterDisplayString;
-	}
+  /**
+   * This function formats a string containing a torrent's remaster information
+   * to be used in Reports v2.
+   *
+   * @param boolean  $Remastered - whether the torrent contains remaster information
+   * @param string   $RemasterTitle - the title of the remaster information
+   * @param string   $RemasterYear - the year of the remaster information
+   */
+  public static function format_reports_remaster_info($Remastered, $RemasterTitle, $RemasterYear) {
+    if ($Remastered) {
+      $RemasterDisplayString = ' &lt;';
+      if ($RemasterTitle != '' && $RemasterYear != '') {
+        $RemasterDisplayString .= "$RemasterTitle - $RemasterYear";
+      } elseif ($RemasterTitle != '' && $RemasterYear == '') {
+        $RemasterDisplayString .= $RemasterTitle;
+      } elseif ($RemasterTitle == '' && $RemasterYear != '') {
+        $RemasterDisplayString .= $RemasterYear;
+      }
+      $RemasterDisplayString .= '&gt;';
+    } else {
+      $RemasterDisplayString = '';
+    }
+    return $RemasterDisplayString;
+  }
 }

classes/requests.class.php

@@ -1,235 +1,235 @@
 <?
 class Requests {
-	/**
-	 * Update the sphinx requests delta table for a request.
-	 *
-	 * @param $RequestID
-	 */
-	public static function update_sphinx_requests($RequestID) {
-		$QueryID = G::$DB->get_query_id();
-
-		G::$DB->query("
-			SELECT REPLACE(t.Name, '.', '_')
-			FROM tags AS t
-				JOIN requests_tags AS rt ON t.ID = rt.TagID
-			WHERE rt.RequestID = $RequestID");
-		$TagList = G::$DB->collect(0, false);
-		$TagList = db_string(implode(' ', $TagList));
-
-		G::$DB->query("
-			REPLACE INTO sphinx_requests_delta (
-				ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList,
-				CatalogueNumber, DLSiteID, FillerID, TorrentID,
-				TimeFilled, Visible, Votes, Bounty)
-			SELECT
-				ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
-				UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID, Title, '$TagList',
-				CatalogueNumber, DLSiteID, FillerID, TorrentID,
-				UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
-				COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
-			FROM requests AS r
-				LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
-			WHERE ID = $RequestID
-			GROUP BY r.ID");
-		G::$DB->query("
-			UPDATE sphinx_requests_delta
-			SET ArtistList = (
-					SELECT GROUP_CONCAT(ag.Name SEPARATOR ' ')
-					FROM requests_artists AS ra
-						JOIN artists_group AS ag ON ag.ArtistID = ra.ArtistID
-					WHERE ra.RequestID = $RequestID
-					GROUP BY NULL
-					)
-			WHERE ID = $RequestID");
-		G::$DB->set_query_id($QueryID);
-
-		G::$Cache->delete_value("request_$RequestID");
-	}
-
-
-
-	/**
-	 * Function to get data from an array of $RequestIDs. Order of keys doesn't matter (let's keep it that way).
-	 *
-	 * @param array $RequestIDs
-	 * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
-	 * @return The array of requests.
-	 * Format: array(RequestID => Associative array)
-	 * To see what's exactly inside each associate array, peek inside the function. It won't bite.
-	 */
-	//
-	//In places where the output from this is merged with sphinx filters, it will be in a different order.
-	public static function get_requests($RequestIDs, $Return = true) {
-		$Found = $NotFound = array_fill_keys($RequestIDs, false);
-		// Try to fetch the requests from the cache first.
-		foreach ($RequestIDs as $i => $RequestID) {
-			if (!is_number($RequestID)) {
-				unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
-				continue;
-			}
-			$Data = G::$Cache->get_value("request_$RequestID");
-			if (!empty($Data)) {
-				unset($NotFound[$RequestID]);
-				$Found[$RequestID] = $Data;
-			}
-		}
-		// Make sure there's something in $RequestIDs, otherwise the SQL will break
-		if (count($RequestIDs) === 0) {
-			return array();
-		}
-		$IDs = implode(',', array_keys($NotFound));
-
-		/*
-			Don't change without ensuring you change everything else that uses get_requests()
-		*/
-
-		if (count($NotFound) > 0) {
-			$QueryID = G::$DB->get_query_id();
-
-			G::$DB->query("
-				SELECT
-					ID,
-					UserID,
-					TimeAdded,
-					LastVote,
-					CategoryID,
-					Title,
-					TitleJP,
-					Image,
-					Description,
-					CatalogueNumber,
-					DLsiteID,
-					FillerID,
-					TorrentID,
-					TimeFilled,
-					GroupID
-				FROM requests
-				WHERE ID IN ($IDs)
-				ORDER BY ID");
-			$Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
-			$Tags = self::get_tags(G::$DB->collect('ID', false));
-			foreach ($Requests as $Request) {
-				unset($NotFound[$Request['ID']]);
-				$Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : array();
-				$Found[$Request['ID']] = $Request;
-				G::$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
-			}
-			G::$DB->set_query_id($QueryID);
-
-			// Orphan requests. There shouldn't ever be any
-			if (count($NotFound) > 0) {
-				foreach (array_keys($NotFound) as $GroupID) {
-					unset($Found[$GroupID]);
-				}
-			}
-		}
-
-		if ($Return) { // If we're interested in the data, and not just caching it
-			return $Found;
-		}
-	}
-
-	/**
-	 * Return a single request. Wrapper for get_requests
-	 *
-	 * @param int $RequestID
-	 * @return request array or false if request doesn't exist. See get_requests for a description of the format
-	 */
-	public static function get_request($RequestID) {
-		$Request = self::get_requests(array($RequestID));
-		if (isset($Request[$RequestID])) {
-			return $Request[$RequestID];
-		}
-		return false;
-	}
-
-	public static function get_artists($RequestID) {
-		$Artists = G::$Cache->get_value("request_artists_$RequestID");
-		if (is_array($Artists)) {
-			$Results = $Artists;
-		} else {
-			$Results = array();
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					ra.ArtistID,
-					ag.Name
-				FROM requests_artists AS ra
-					JOIN artists_group AS ag ON ra.ArtistID = ag.ArtistID
-				WHERE ra.RequestID = $RequestID
-				ORDER BY ag.Name ASC;");
-			$ArtistRaw = G::$DB->to_array();
-			G::$DB->set_query_id($QueryID);
-			foreach ($ArtistRaw as $ArtistRow) {
-				list($ArtistID, $ArtistName) = $ArtistRow;
-				$Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
-			}
-			G::$Cache->cache_value("request_artists_$RequestID", $Results);
-		}
-		return $Results;
-	}
-
-	public static function get_tags($RequestIDs) {
-		if (empty($RequestIDs)) {
-			return array();
-		}
-		if (is_array($RequestIDs)) {
-			$RequestIDs = implode(',', $RequestIDs);
-		}
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT
-				rt.RequestID,
-				rt.TagID,
-				t.Name
-			FROM requests_tags AS rt
-				JOIN tags AS t ON rt.TagID = t.ID
-			WHERE rt.RequestID IN ($RequestIDs)
-			ORDER BY rt.TagID ASC");
-		$Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
-		G::$DB->set_query_id($QueryID);
-		$Results = array();
-		foreach ($Tags as $TagsRow) {
-			list($RequestID, $TagID, $TagName) = $TagsRow;
-			$Results[$RequestID][$TagID] = $TagName;
-		}
-		return $Results;
-	}
-
-	public static function get_votes_array($RequestID) {
-		$RequestVotes = G::$Cache->get_value("request_votes_$RequestID");
-		if (!is_array($RequestVotes)) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					rv.UserID,
-					rv.Bounty,
-					u.Username
-				FROM requests_votes AS rv
-					LEFT JOIN users_main AS u ON u.ID = rv.UserID
-				WHERE rv.RequestID = $RequestID
-				ORDER BY rv.Bounty DESC");
-			if (!G::$DB->has_results()) {
-				return array(
-					'TotalBounty' => 0,
-					'Voters' => array());
-			}
-			$Votes = G::$DB->to_array();
-
-			$RequestVotes = array();
-			$RequestVotes['TotalBounty'] = array_sum(G::$DB->collect('Bounty'));
-
-			foreach ($Votes as $Vote) {
-				list($UserID, $Bounty, $Username) = $Vote;
-				$VoteArray = array();
-				$VotesArray[] = array('UserID' => $UserID, 'Username' => $Username, 'Bounty' => $Bounty);
-			}
-
-			$RequestVotes['Voters'] = $VotesArray;
-			G::$Cache->cache_value("request_votes_$RequestID", $RequestVotes);
-			G::$DB->set_query_id($QueryID);
-		}
-		return $RequestVotes;
-	}
+  /**
+   * Update the sphinx requests delta table for a request.
+   *
+   * @param $RequestID
+   */
+  public static function update_sphinx_requests($RequestID) {
+    $QueryID = G::$DB->get_query_id();
+
+    G::$DB->query("
+      SELECT REPLACE(t.Name, '.', '_')
+      FROM tags AS t
+        JOIN requests_tags AS rt ON t.ID = rt.TagID
+      WHERE rt.RequestID = $RequestID");
+    $TagList = G::$DB->collect(0, false);
+    $TagList = db_string(implode(' ', $TagList));
+
+    G::$DB->query("
+      REPLACE INTO sphinx_requests_delta (
+        ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList,
+        CatalogueNumber, DLSiteID, FillerID, TorrentID,
+        TimeFilled, Visible, Votes, Bounty)
+      SELECT
+        ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
+        UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID, Title, '$TagList',
+        CatalogueNumber, DLSiteID, FillerID, TorrentID,
+        UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
+        COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
+      FROM requests AS r
+        LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
+      WHERE ID = $RequestID
+      GROUP BY r.ID");
+    G::$DB->query("
+      UPDATE sphinx_requests_delta
+      SET ArtistList = (
+          SELECT GROUP_CONCAT(ag.Name SEPARATOR ' ')
+          FROM requests_artists AS ra
+            JOIN artists_group AS ag ON ag.ArtistID = ra.ArtistID
+          WHERE ra.RequestID = $RequestID
+          GROUP BY NULL
+          )
+      WHERE ID = $RequestID");
+    G::$DB->set_query_id($QueryID);
+
+    G::$Cache->delete_value("request_$RequestID");
+  }
+
+
+
+  /**
+   * Function to get data from an array of $RequestIDs. Order of keys doesn't matter (let's keep it that way).
+   *
+   * @param array $RequestIDs
+   * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
+   * @return The array of requests.
+   * Format: array(RequestID => Associative array)
+   * To see what's exactly inside each associate array, peek inside the function. It won't bite.
+   */
+  //
+  //In places where the output from this is merged with sphinx filters, it will be in a different order.
+  public static function get_requests($RequestIDs, $Return = true) {
+    $Found = $NotFound = array_fill_keys($RequestIDs, false);
+    // Try to fetch the requests from the cache first.
+    foreach ($RequestIDs as $i => $RequestID) {
+      if (!is_number($RequestID)) {
+        unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
+        continue;
+      }
+      $Data = G::$Cache->get_value("request_$RequestID");
+      if (!empty($Data)) {
+        unset($NotFound[$RequestID]);
+        $Found[$RequestID] = $Data;
+      }
+    }
+    // Make sure there's something in $RequestIDs, otherwise the SQL will break
+    if (count($RequestIDs) === 0) {
+      return array();
+    }
+    $IDs = implode(',', array_keys($NotFound));
+
+    /*
+      Don't change without ensuring you change everything else that uses get_requests()
+    */
+
+    if (count($NotFound) > 0) {
+      $QueryID = G::$DB->get_query_id();
+
+      G::$DB->query("
+        SELECT
+          ID,
+          UserID,
+          TimeAdded,
+          LastVote,
+          CategoryID,
+          Title,
+          TitleJP,
+          Image,
+          Description,
+          CatalogueNumber,
+          DLsiteID,
+          FillerID,
+          TorrentID,
+          TimeFilled,
+          GroupID
+        FROM requests
+        WHERE ID IN ($IDs)
+        ORDER BY ID");
+      $Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
+      $Tags = self::get_tags(G::$DB->collect('ID', false));
+      foreach ($Requests as $Request) {
+        unset($NotFound[$Request['ID']]);
+        $Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : array();
+        $Found[$Request['ID']] = $Request;
+        G::$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
+      }
+      G::$DB->set_query_id($QueryID);
+
+      // Orphan requests. There shouldn't ever be any
+      if (count($NotFound) > 0) {
+        foreach (array_keys($NotFound) as $GroupID) {
+          unset($Found[$GroupID]);
+        }
+      }
+    }
+
+    if ($Return) { // If we're interested in the data, and not just caching it
+      return $Found;
+    }
+  }
+
+  /**
+   * Return a single request. Wrapper for get_requests
+   *
+   * @param int $RequestID
+   * @return request array or false if request doesn't exist. See get_requests for a description of the format
+   */
+  public static function get_request($RequestID) {
+    $Request = self::get_requests(array($RequestID));
+    if (isset($Request[$RequestID])) {
+      return $Request[$RequestID];
+    }
+    return false;
+  }
+
+  public static function get_artists($RequestID) {
+    $Artists = G::$Cache->get_value("request_artists_$RequestID");
+    if (is_array($Artists)) {
+      $Results = $Artists;
+    } else {
+      $Results = array();
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          ra.ArtistID,
+          ag.Name
+        FROM requests_artists AS ra
+          JOIN artists_group AS ag ON ra.ArtistID = ag.ArtistID
+        WHERE ra.RequestID = $RequestID
+        ORDER BY ag.Name ASC;");
+      $ArtistRaw = G::$DB->to_array();
+      G::$DB->set_query_id($QueryID);
+      foreach ($ArtistRaw as $ArtistRow) {
+        list($ArtistID, $ArtistName) = $ArtistRow;
+        $Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
+      }
+      G::$Cache->cache_value("request_artists_$RequestID", $Results);
+    }
+    return $Results;
+  }
+
+  public static function get_tags($RequestIDs) {
+    if (empty($RequestIDs)) {
+      return array();
+    }
+    if (is_array($RequestIDs)) {
+      $RequestIDs = implode(',', $RequestIDs);
+    }
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT
+        rt.RequestID,
+        rt.TagID,
+        t.Name
+      FROM requests_tags AS rt
+        JOIN tags AS t ON rt.TagID = t.ID
+      WHERE rt.RequestID IN ($RequestIDs)
+      ORDER BY rt.TagID ASC");
+    $Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
+    G::$DB->set_query_id($QueryID);
+    $Results = array();
+    foreach ($Tags as $TagsRow) {
+      list($RequestID, $TagID, $TagName) = $TagsRow;
+      $Results[$RequestID][$TagID] = $TagName;
+    }
+    return $Results;
+  }
+
+  public static function get_votes_array($RequestID) {
+    $RequestVotes = G::$Cache->get_value("request_votes_$RequestID");
+    if (!is_array($RequestVotes)) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          rv.UserID,
+          rv.Bounty,
+          u.Username
+        FROM requests_votes AS rv
+          LEFT JOIN users_main AS u ON u.ID = rv.UserID
+        WHERE rv.RequestID = $RequestID
+        ORDER BY rv.Bounty DESC");
+      if (!G::$DB->has_results()) {
+        return array(
+          'TotalBounty' => 0,
+          'Voters' => array());
+      }
+      $Votes = G::$DB->to_array();
+
+      $RequestVotes = array();
+      $RequestVotes['TotalBounty'] = array_sum(G::$DB->collect('Bounty'));
+
+      foreach ($Votes as $Vote) {
+        list($UserID, $Bounty, $Username) = $Vote;
+        $VoteArray = array();
+        $VotesArray[] = array('UserID' => $UserID, 'Username' => $Username, 'Bounty' => $Bounty);
+      }
+
+      $RequestVotes['Voters'] = $VotesArray;
+      G::$Cache->cache_value("request_votes_$RequestID", $RequestVotes);
+      G::$DB->set_query_id($QueryID);
+    }
+    return $RequestVotes;
+  }
 
 }

classes/revisionhistory.class.php

@@ -1,29 +1,29 @@
 <?
 class RevisionHistory {
-	/**
-	 * Read the revision history of an artist or torrent page
-	 * @param string $Page artists or torrents
-	 * @param in $PageID
-	 * @return array
-	 */
-	public static function get_revision_history($Page, $PageID) {
-		if ($Page == 'artists') {
-			$Table = 'wiki_artists';
-		} else {
-			$Table = 'wiki_torrents';
-		}
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT
-				RevisionID,
-				Summary,
-				Time,
-				UserID
-			FROM $Table
-			WHERE PageID = $PageID
-			ORDER BY RevisionID DESC");
-		$Ret = G::$DB->to_array();
-		G::$DB->set_query_id($QueryID);
-		return $Ret;
-	}
+  /**
+   * Read the revision history of an artist or torrent page
+   * @param string $Page artists or torrents
+   * @param in $PageID
+   * @return array
+   */
+  public static function get_revision_history($Page, $PageID) {
+    if ($Page == 'artists') {
+      $Table = 'wiki_artists';
+    } else {
+      $Table = 'wiki_torrents';
+    }
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT
+        RevisionID,
+        Summary,
+        Time,
+        UserID
+      FROM $Table
+      WHERE PageID = $PageID
+      ORDER BY RevisionID DESC");
+    $Ret = G::$DB->to_array();
+    G::$DB->set_query_id($QueryID);
+    return $Ret;
+  }
 }

classes/revisionhistoryview.class.php

@@ -1,39 +1,39 @@
 <?
 class RevisionHistoryView {
-	/**
-	 * Render the revision history
-	 * @param array $RevisionHistory see RevisionHistory::get_revision_history
-	 * @param string $BaseURL
-	 */
-	public static function render_revision_history($RevisionHistory, $BaseURL) {
+  /**
+   * Render the revision history
+   * @param array $RevisionHistory see RevisionHistory::get_revision_history
+   * @param string $BaseURL
+   */
+  public static function render_revision_history($RevisionHistory, $BaseURL) {
 ?>
-	<table cellpadding="6" cellspacing="1" border="0" width="100%" class="box">
-		<tr class="colhead">
-			<td>Revision</td>
-			<td>Date</td>
-			<td>User</td>
-			<td>Summary</td>
-		</tr>
+  <table cellpadding="6" cellspacing="1" border="0" width="100%" class="box">
+    <tr class="colhead">
+      <td>Revision</td>
+      <td>Date</td>
+      <td>User</td>
+      <td>Summary</td>
+    </tr>
 <?
-		foreach ($RevisionHistory as $Entry) {
-			list($RevisionID, $Summary, $Time, $UserID) = $Entry;
+    foreach ($RevisionHistory as $Entry) {
+      list($RevisionID, $Summary, $Time, $UserID) = $Entry;
 ?>
-		<tr class="row">
-			<td>
-				<?= "<a href=\"$BaseURL&amp;revisionid=$RevisionID\">#$RevisionID</a>" ?>
-			</td>
-			<td>
-				<?=$Time?>
-			</td>
-			<td>
-				<?=Users::format_username($UserID, false, false, false)?>
-			</td>
-			<td>
-				<?=($Summary ? $Summary : '(empty)')?>
-			</td>
-		</tr>
-<?		} ?>
-	</table>
+    <tr class="row">
+      <td>
+        <?= "<a href=\"$BaseURL&amp;revisionid=$RevisionID\">#$RevisionID</a>" ?>
+      </td>
+      <td>
+        <?=$Time?>
+      </td>
+      <td>
+        <?=Users::format_username($UserID, false, false, false)?>
+      </td>
+      <td>
+        <?=($Summary ? $Summary : '(empty)')?>
+      </td>
+    </tr>
+<?    } ?>
+  </table>
 <?
-	}
+  }
 }

classes/rules.class.php

@@ -1,171 +1,171 @@
 <?php
 class Rules {
 
-	/**
-	 * Displays the site's "Golden Rules".
-	 *
-	 */
-	public static function display_golden_rules() {
-		?>
-		<ol>
-			<li>All staff decisions must be respected. 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. Complaining about staff decisions in public or otherwise disrespecting staff members WILL result in the offender being called a faggot.</li>
-			<li>Access to this website is a gift and a privilege, and it can be taken away from you for any reason (or no reason).</li>
-			<li>One account per person per lifetime. Anyone creating additional accounts will probably be banned. Additionally, unless your account is immune to <a href="wiki.php?action=article&name=inactivitypruning">inactivity pruning</a>, accounts are automatically disabled if one page load is not made at least once every four months.</li>
-			<li>Avatars must not exceed <span class="tooltip" title="524,288 bytes">512 kiB</span> or be vertically longer than 600 pixels. Avatars may contain nudity and offensive imagery, but must not be pictures of Spiderman</li>
-			<li>Do not post our torrent files on other sites. Your personal passkey is embedded in every torrent file. The tracker will automatically disable your account if you share your torrent files with others (maybe). You will not get your account back (maybe). This does not prohibit you from sharing the content of the torrents on other sites, but this does prohibit you from sharing the torrent file itself (i.e. the file with a ".torrent" file extension).</li>
-			<li>Any torrent you are seeding to this tracker must have <em>only</em> <?=SITE_NAME?>'s tracker URL in it. Adding another BitTorrent tracker's URL will cause incorrect data to be sent to our tracker, and you will be disabled for cheating. Similarly, your client must have DHT and PEX (peer exchange) disabled for all <?=SITE_NAME?> torrents.</li>
-			<li>This is a BitTorrent site which promotes sharing amongst the community. If you are not willing to give back to the community what you take from it, this site is not for you. In other words, we expect you to have an acceptable share ratio. If you download a torrent, please seed the copy you have until there are sufficient people seeding the torrent before you stop.</li>
-			<li>Feel free to browse the site using proxies or Tor. We reserve the right to scrutinize your activity more than normal in these cases, but no harm, no foul. This includes VPNs with dynamic IP addresses.</li>
-			<li>Invites should be offered in the Invites forum and nowhere else.</li>
-			<li>Selling <?=SITE_NAME?> invites is strictly prohibited and will result in a permanent ban. Responding to public requests for invites may also jeopardize your account and the accounts of those you invite from a public request if the person you invite turns out to be a total shitfuck.</li>
-			<li>Buying <?=SITE_NAME?> invites is discouraged, but if you did buy an invite, tell us who the seller is and we'll let you keep your account. If you don't tell us and we find out, you're banned, kiddo.</li>
-			<li>Trading or selling your account is strictly prohibited. If you no longer want your account, send a <a href="staffpm.php">Staff PM</a> requesting that it be disabled. Do not give your account to some asshole.</li>
-			<li>You are completely responsible for the people you invite. If your invitees are caught cheating or selling invites, not only will they be banned, so will you (or we'll take away your invite privs). Be careful who you invite. Invites are a precious commodity.</li>
-			<li>Be careful when sharing an IP address or a computer with a friend if they have (or have had) an account. We don't really care where you log in from, but from then on, your accounts will be permanently linked because we're using Gazelle, and if one of you violates the rules, both accounts might be disabled along with any other accounts linked by IP address if we get confused. This rule applies to logging into the site.</li>
-			<li>Attempting to find a bug in the site code is absolutely fine. Misusing that knowledge is not, but we actively encourage users to try to find bugs and report them so they can be fixed. The discovery of significant bugs may result in a reward at the discretion of the staff. Do not be an asshole and try to flood the tracker or something and then come to us saying "lol I found bug gib reward"</li>
-			<li>We're a community. Working together is what makes this place what it is. There are well over a thousand new torrents uploaded every day (pfffff) and, sadly, the staff are only a little psychic. If you come across something that violates a rule, report it, and help us better organize the site for you.</li>
-			<li>We respect the wishes of other BitTorrent trackers that we agree with here, as we wish for them to do the same. Please refrain from posting full names or links to sites that do not want to be mentioned.</li>
-		</ol>
+  /**
+   * Displays the site's "Golden Rules".
+   *
+   */
+  public static function display_golden_rules() {
+    ?>
+    <ol>
+      <li>All staff decisions must be respected. 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. Complaining about staff decisions in public or otherwise disrespecting staff members WILL result in the offender being called a faggot.</li>
+      <li>Access to this website is a gift and a privilege, and it can be taken away from you for any reason (or no reason).</li>
+      <li>One account per person per lifetime. Anyone creating additional accounts will probably be banned. Additionally, unless your account is immune to <a href="wiki.php?action=article&name=inactivitypruning">inactivity pruning</a>, accounts are automatically disabled if one page load is not made at least once every four months.</li>
+      <li>Avatars must not exceed <span class="tooltip" title="524,288 bytes">512 kiB</span> or be vertically longer than 600 pixels. Avatars may contain nudity and offensive imagery, but must not be pictures of Spiderman</li>
+      <li>Do not post our torrent files on other sites. Your personal passkey is embedded in every torrent file. The tracker will automatically disable your account if you share your torrent files with others (maybe). You will not get your account back (maybe). This does not prohibit you from sharing the content of the torrents on other sites, but this does prohibit you from sharing the torrent file itself (i.e. the file with a ".torrent" file extension).</li>
+      <li>Any torrent you are seeding to this tracker must have <em>only</em> <?=SITE_NAME?>'s tracker URL in it. Adding another BitTorrent tracker's URL will cause incorrect data to be sent to our tracker, and you will be disabled for cheating. Similarly, your client must have DHT and PEX (peer exchange) disabled for all <?=SITE_NAME?> torrents.</li>
+      <li>This is a BitTorrent site which promotes sharing amongst the community. If you are not willing to give back to the community what you take from it, this site is not for you. In other words, we expect you to have an acceptable share ratio. If you download a torrent, please seed the copy you have until there are sufficient people seeding the torrent before you stop.</li>
+      <li>Feel free to browse the site using proxies or Tor. We reserve the right to scrutinize your activity more than normal in these cases, but no harm, no foul. This includes VPNs with dynamic IP addresses.</li>
+      <li>Invites should be offered in the Invites forum and nowhere else.</li>
+      <li>Selling <?=SITE_NAME?> invites is strictly prohibited and will result in a permanent ban. Responding to public requests for invites may also jeopardize your account and the accounts of those you invite from a public request if the person you invite turns out to be a total shitfuck.</li>
+      <li>Buying <?=SITE_NAME?> invites is discouraged, but if you did buy an invite, tell us who the seller is and we'll let you keep your account. If you don't tell us and we find out, you're banned, kiddo.</li>
+      <li>Trading or selling your account is strictly prohibited. If you no longer want your account, send a <a href="staffpm.php">Staff PM</a> requesting that it be disabled. Do not give your account to some asshole.</li>
+      <li>You are completely responsible for the people you invite. If your invitees are caught cheating or selling invites, not only will they be banned, so will you (or we'll take away your invite privs). Be careful who you invite. Invites are a precious commodity.</li>
+      <li>Be careful when sharing an IP address or a computer with a friend if they have (or have had) an account. We don't really care where you log in from, but from then on, your accounts will be permanently linked because we're using Gazelle, and if one of you violates the rules, both accounts might be disabled along with any other accounts linked by IP address if we get confused. This rule applies to logging into the site.</li>
+      <li>Attempting to find a bug in the site code is absolutely fine. Misusing that knowledge is not, but we actively encourage users to try to find bugs and report them so they can be fixed. The discovery of significant bugs may result in a reward at the discretion of the staff. Do not be an asshole and try to flood the tracker or something and then come to us saying "lol I found bug gib reward"</li>
+      <li>We're a community. Working together is what makes this place what it is. There are well over a thousand new torrents uploaded every day (pfffff) and, sadly, the staff are only a little psychic. If you come across something that violates a rule, report it, and help us better organize the site for you.</li>
+      <li>We respect the wishes of other BitTorrent trackers that we agree with here, as we wish for them to do the same. Please refrain from posting full names or links to sites that do not want to be mentioned.</li>
+    </ol>
 <?
-	}
+  }
 
-	/**
-	 * 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>Tags should be comma-separated, and you should use a period (".") to separate words inside a tag&#8202;&mdash;&#8202;e.g. "<strong class="important_text_alt">big.breasts</strong>".</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>Tags should be comma-separated, and you should use a period (".") to separate words inside a tag&#8202;&mdash;&#8202;e.g. "<strong class="important_text_alt">big.breasts</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">paizuri</strong>" tag, instead of an unofficial "<strong class="important_text">titfuck</strong>" tag).</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">paizuri</strong>" tag, instead of an unofficial "<strong class="important_text">titfuck</strong>" tag).</strong></li>
 
-			<li>Avoid using multiple synonymous tags. Using both "<strong class="important_text">pissing</strong>" and "<strong class="important_text_alt">urination</strong>" is redundant and stupid&#8202;&mdash;&#8202;just use the official "<strong class="important_text_alt">urination</strong>" tag.</li>
+      <li>Avoid using multiple synonymous tags. Using both "<strong class="important_text">pissing</strong>" and "<strong class="important_text_alt">urination</strong>" is redundant and stupid&#8202;&mdash;&#8202;just use the official "<strong class="important_text_alt">urination</strong>" tag.</li>
 
-			<li>Do not add useless tags.</li>
+      <li>Do not add useless tags.</li>
 
-			<li><strong>If one more person tags something "<strong class="important_text">hentai</strong>" I swear to god I'm gonna go nuclear on your worthless ass.</strong></li>
+      <li><strong>If one more person tags something "<strong class="important_text">hentai</strong>" I swear to god I'm gonna go nuclear on your worthless ass.</strong></li>
 
-			<li>Only tag information on the title itself&#8202;&mdash;&#8202;<strong>not the individual release</strong>. Tags such as "<strong class="important_text">mkv</strong>", "<strong class="important_text">windows</strong>", "<strong class="important_text">scan</strong>", "<strong class="important_text">from.dlsite</strong>", etc. are strictly forbidden. Remember that these tags will be used for other versions of the same title.</li>
+      <li>Only tag information on the title itself&#8202;&mdash;&#8202;<strong>not the individual release</strong>. Tags such as "<strong class="important_text">mkv</strong>", "<strong class="important_text">windows</strong>", "<strong class="important_text">scan</strong>", "<strong class="important_text">from.dlsite</strong>", etc. are strictly forbidden. Remember that these tags will be used for other versions of the same title.</li>
 
-			<li>Derivative works may be tagged with the name of the parent series or characters within the work. For example, tags such as "<strong class="important_text_alt">touhou</strong>" or "<strong class="important_text_alt">iori.minase</strong>" may be acceptable if they are being used on derivative (parody) works. These kinds of tags should NOT be used if the series is primarily erotic in nature. Characters should be tagged with the form "<strong class="important_text_alt">surname.firstname</strong>" if applicable.</li>
+      <li>Derivative works may be tagged with the name of the parent series or characters within the work. For example, tags such as "<strong class="important_text_alt">touhou</strong>" or "<strong class="important_text_alt">iori.minase</strong>" may be acceptable if they are being used on derivative (parody) works. These kinds of tags should NOT be used if the series is primarily erotic in nature. Characters should be tagged with the form "<strong class="important_text_alt">surname.firstname</strong>" if applicable.</li>
 
-			<li><strong>Tags should reflect significant aspects of a torrent.</strong> Don't tag something with "<strong class="important_text">blowjob</strong>" if there's only 30 seconds of dick-sucking. However, certain tags may be acceptable, such as "<strong class="important_text_alt">stockings</strong>", even if the torrent in question isn't centered around that fetish. Be smart.</li>
+      <li><strong>Tags should reflect significant aspects of a torrent.</strong> Don't tag something with "<strong class="important_text">blowjob</strong>" if there's only 30 seconds of dick-sucking. However, certain tags may be acceptable, such as "<strong class="important_text_alt">stockings</strong>", even if the torrent in question isn't centered around that fetish. Be smart.</li>
 
-			<li><strong>Certain tags are strongly encouraged for appropriate uploads:</strong> "<strong class="important_text_alt">3d</strong>", "<strong class="important_text_alt">anthology</strong>", "<strong class="important_text_alt">yuri</strong>", "<strong class="important_text_alt">yaoi</strong>". People search for these kinds of things specifically, so tagging them properly will get you more snatches.</li>
+      <li><strong>Certain tags are strongly encouraged for appropriate uploads:</strong> "<strong class="important_text_alt">3d</strong>", "<strong class="important_text_alt">anthology</strong>", "<strong class="important_text_alt">yuri</strong>", "<strong class="important_text_alt">yaoi</strong>". People search for these kinds of things specifically, so tagging them properly will get you more snatches.</li>
 
-			<li>Tags for game genres such as "<strong class="important_text_alt">rpg</strong>", "<strong class="important_text_alt">visual.novel></strong>", or "<strong class="important_text_alt">nukige</strong>" are encouraged.</li>
+      <li>Tags for game genres such as "<strong class="important_text_alt">rpg</strong>", "<strong class="important_text_alt">visual.novel></strong>", or "<strong class="important_text_alt">nukige</strong>" are encouraged.</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><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><strong>All uploads require a minimum of 5 tags.</strong></li>
+      <li><strong>All uploads require a minimum of 5 tags.</strong></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>')?>. If you are in any doubt about whether or not a tag is acceptable, do not add it.</strong></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>')?>. If you are in any doubt about whether or not a tag is acceptable, do not add it.</strong></li>
+    </ul>
 <?
-	}
-
-	/**
-	 * Displays the site's rules for the forum
-	 *
-	 */
-	public static function display_forum_rules() {
-		?>
-		<ol>
-			<li>
-				Many forums have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums.
-			</li>
-			<li>
-				Don't use all capital letters, excessive !!! (exclamation marks) or ??? (question marks) unless it's funny. Basically just don't type like a disgusting fucking normie.
-			</li>
-			<li>
-				No lame referral schemes. This includes freeipods.com, freepsps.com, or any other similar scheme in which the poster gets personal gain from users clicking a link. This shit is the WORST and you WILL be permanently banned on the spot, no questions asked you douche.
-			</li>
-			<li>
-				No asking for money for any reason whatsoever. We don't know or care about your friend who lost everything, or dying relative who wants to enjoy their last few moments alive by being given lots of money. The only ones allowed to shill around these parts are staff.
-			</li>
-			<li>
-				Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread, but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the title itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or being called a faggot.
-			</li>
-			<li>
-				No posting requests in forums. There's a request link at the top of the page for a god damn reason.
-			</li>
-			<li>
-				No flaming unless they <i>really</i> deserve it. Feel free to use offensive language, but don't be confrontational for the sake of confrontation.
-			</li>
-			<li>
-				Don't point out or attack other members' share ratios. A higher ratio totally makes you better than other people, though.
-			</li>
-			<li>
-				Asking stupid questions will probably result in you being made fun of. A stupid question is one that you could have found the answer to yourself with a little research, or one that you're asking in the wrong place. If you do the basic research suggested (i.e., read the rules/wiki) or search the forums and don't find the answer to your question, then go ahead and ask. Staff and First Line Support (FLS) are not here to hand-feed you the answers you could have found on your own with a little bit of effort. Apply yourself. Put <i>some</i> effort in.
-			</li>
-			<li>
-				Be sure you read all the sticky threads in a forum before you post. Let's be honest, we both know you're not going to do this.
-			</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. If you don't have anything valuable to say, don't say anything. When you're just cruising through a thread in a leisurely manner, it's not too annoying to read through a lot of "hear, hear"'s and "I agree"'s. But if you're actually trying to find information, it's a pain in the ass. So save those one-word responses for threads that have degenerated to the point where none but true aficionados are following them any more.
-				<p>
-					Or short: NO spamming, unless it's funny.
-				</p>
-			</li>
-			<li>
-				Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary. This includes quoting pictures! Don't quote the entire first post, either. I swear to god if I see you doing this it's over.
-			</li>
-			<li>
-				Feel free to request and discuss cracks for games and software. Links are fine, but if they're found to be malicious, the fire's gonna be under <i>your</i> ass.
-			</li>
-			<li>
-				Political or religious discussions are okay. These types of discussions lead to arguments and flaming users, which can be pretty funny to watch and gives staff a good excuse to ban people.
-			</li>
-			<li>
-				Don't waste other people's bandwidth by posting images with a large file size.
-			</li>
-			<li>
-				Be (a little) patient with newcomers. Once you have become an expert, it is easy to forget that you started out as a dumbass too.
-			</li>
-			<li>
-				Requesting invites to other sites is probably fine unless you're being obnoxious about it. Invites may be formally <strong>offered</strong> in the invite forum, and nowhere else.
-			</li>
-			<li>
-				No language other than English (and Japanese, when relevant) is permitted in the forums. If we can't understand it, we will assume you're calling our mothers whores.
-			</li>
-			<li>
-				Mature and graphic content on the forums and IRC is acceptable. In fact, it's expected. This is a porn site. Pictures of spiderman are prohibited.
-			</li>
-		</ol>
+  }
+
+  /**
+   * Displays the site's rules for the forum
+   *
+   */
+  public static function display_forum_rules() {
+    ?>
+    <ol>
+      <li>
+        Many forums have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums.
+      </li>
+      <li>
+        Don't use all capital letters, excessive !!! (exclamation marks) or ??? (question marks) unless it's funny. Basically just don't type like a disgusting fucking normie.
+      </li>
+      <li>
+        No lame referral schemes. This includes freeipods.com, freepsps.com, or any other similar scheme in which the poster gets personal gain from users clicking a link. This shit is the WORST and you WILL be permanently banned on the spot, no questions asked you douche.
+      </li>
+      <li>
+        No asking for money for any reason whatsoever. We don't know or care about your friend who lost everything, or dying relative who wants to enjoy their last few moments alive by being given lots of money. The only ones allowed to shill around these parts are staff.
+      </li>
+      <li>
+        Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread, but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the title itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or being called a faggot.
+      </li>
+      <li>
+        No posting requests in forums. There's a request link at the top of the page for a god damn reason.
+      </li>
+      <li>
+        No flaming unless they <i>really</i> deserve it. Feel free to use offensive language, but don't be confrontational for the sake of confrontation.
+      </li>
+      <li>
+        Don't point out or attack other members' share ratios. A higher ratio totally makes you better than other people, though.
+      </li>
+      <li>
+        Asking stupid questions will probably result in you being made fun of. A stupid question is one that you could have found the answer to yourself with a little research, or one that you're asking in the wrong place. If you do the basic research suggested (i.e., read the rules/wiki) or search the forums and don't find the answer to your question, then go ahead and ask. Staff and First Line Support (FLS) are not here to hand-feed you the answers you could have found on your own with a little bit of effort. Apply yourself. Put <i>some</i> effort in.
+      </li>
+      <li>
+        Be sure you read all the sticky threads in a forum before you post. Let's be honest, we both know you're not going to do this.
+      </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. If you don't have anything valuable to say, don't say anything. When you're just cruising through a thread in a leisurely manner, it's not too annoying to read through a lot of "hear, hear"'s and "I agree"'s. But if you're actually trying to find information, it's a pain in the ass. So save those one-word responses for threads that have degenerated to the point where none but true aficionados are following them any more.
+        <p>
+          Or short: NO spamming, unless it's funny.
+        </p>
+      </li>
+      <li>
+        Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary. This includes quoting pictures! Don't quote the entire first post, either. I swear to god if I see you doing this it's over.
+      </li>
+      <li>
+        Feel free to request and discuss cracks for games and software. Links are fine, but if they're found to be malicious, the fire's gonna be under <i>your</i> ass.
+      </li>
+      <li>
+        Political or religious discussions are okay. These types of discussions lead to arguments and flaming users, which can be pretty funny to watch and gives staff a good excuse to ban people.
+      </li>
+      <li>
+        Don't waste other people's bandwidth by posting images with a large file size.
+      </li>
+      <li>
+        Be (a little) patient with newcomers. Once you have become an expert, it is easy to forget that you started out as a dumbass too.
+      </li>
+      <li>
+        Requesting invites to other sites is probably fine unless you're being obnoxious about it. Invites may be formally <strong>offered</strong> in the invite forum, and nowhere else.
+      </li>
+      <li>
+        No language other than English (and Japanese, when relevant) is permitted in the forums. If we can't understand it, we will assume you're calling our mothers whores.
+      </li>
+      <li>
+        Mature and graphic content on the forums and IRC is acceptable. In fact, it's expected. This is a porn site. Pictures of spiderman are prohibited.
+      </li>
+    </ol>
 <?
-	}
-
-	/**
-	 * Displays the site's rules for conversing on its IRC network
-	 *
-	 */
-	public static function display_irc_chat_rules() {
-		?>
-		<ol>
-			<li>Staff have the final decision. If a staff member says stop and you continue, expect to be called a faggot.</li>
-			<li>Be respectful to IRC Operators and Administrators. These people are site staff who do it for FREE. They are here for the benefit of all and to aid in conflict resolution. They enjoy Hot Pockets.</li>
-			<li>Do not link shock sites without a warning (unless it's funny). If in doubt, ask a staff member in <?=(BOT_HELP_CHAN)?> about it.</li>
-			<li>Excessive swearing will not get you kicked; practice being a sailor.</li>
-			<li>Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked.</li>
-			<li>No arguing. You can't win an argument <s>over the Internet</s> because you're probably a dumbass, so you're just wasting your time trying.</li>
-			<li>No opinions, especially related to race, religion, politics, etc are allowed. Failure to comply with a request to cease having an opinion WILL be considered a thoughtcrime and you WILL be reeducated.</li>
-			<li>Flooding is irritating and will warrant you a kick if it isn't funny enough or if an admin is cranky. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand.</li>
-			<li>Impersonation of other members&#8202;&mdash;&#8202;particularly staff members&#8202;&mdash;&#8202;will not go unpunished. If you are uncertain of a user's identity, check their vhost, and then continue to be uncertain of their identity.</li>
-			<li>Spamming is <b>strictly</b> forbidden unless it's funny. This includes, but is not limited to, personal sites, online auctions, and cans of blended meat.</li>
-			<li>Obsessive annoyance&#8202;&mdash;&#8202;both to other users and staff&#8202;&mdash;&#8202;will not be tolerated.</li>
-			<li>Do not PM, DCC, or Query anyone you don't know or have never talked to without asking first; this applies specifically to staff.</li>
-			<li>No language other than English is permitted in the official IRC channels. If you can't use a real language, just stay in your shithole country.</li>
-			<li>The offering, selling, trading, and giving away of invites to this or any other site on our IRC network is <strong>strictly whatever</strong>.</li>
-			<li>Bots are not permitted in official channels with the exception of <strong>#oppaitime-announce</strong> and <strong>#oppaitime-requests</strong>.</li>
-			<li>Any bots you have on IRC should authenticate with Udon using your own username and IRC key</li>
-			<li>Bots must identify themselves by setting the +B usermode on themselves.</li>
-			<li><strong>Read the channel topic before asking questions.</strong></li>
-		</ol>
+  }
+
+  /**
+   * Displays the site's rules for conversing on its IRC network
+   *
+   */
+  public static function display_irc_chat_rules() {
+    ?>
+    <ol>
+      <li>Staff have the final decision. If a staff member says stop and you continue, expect to be called a faggot.</li>
+      <li>Be respectful to IRC Operators and Administrators. These people are site staff who do it for FREE. They are here for the benefit of all and to aid in conflict resolution. They enjoy Hot Pockets.</li>
+      <li>Do not link shock sites without a warning (unless it's funny). If in doubt, ask a staff member in <?=(BOT_HELP_CHAN)?> about it.</li>
+      <li>Excessive swearing will not get you kicked; practice being a sailor.</li>
+      <li>Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked.</li>
+      <li>No arguing. You can't win an argument <s>over the Internet</s> because you're probably a dumbass, so you're just wasting your time trying.</li>
+      <li>No opinions, especially related to race, religion, politics, etc are allowed. Failure to comply with a request to cease having an opinion WILL be considered a thoughtcrime and you WILL be reeducated.</li>
+      <li>Flooding is irritating and will warrant you a kick if it isn't funny enough or if an admin is cranky. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand.</li>
+      <li>Impersonation of other members&#8202;&mdash;&#8202;particularly staff members&#8202;&mdash;&#8202;will not go unpunished. If you are uncertain of a user's identity, check their vhost, and then continue to be uncertain of their identity.</li>
+      <li>Spamming is <b>strictly</b> forbidden unless it's funny. This includes, but is not limited to, personal sites, online auctions, and cans of blended meat.</li>
+      <li>Obsessive annoyance&#8202;&mdash;&#8202;both to other users and staff&#8202;&mdash;&#8202;will not be tolerated.</li>
+      <li>Do not PM, DCC, or Query anyone you don't know or have never talked to without asking first; this applies specifically to staff.</li>
+      <li>No language other than English is permitted in the official IRC channels. If you can't use a real language, just stay in your shithole country.</li>
+      <li>The offering, selling, trading, and giving away of invites to this or any other site on our IRC network is <strong>strictly whatever</strong>.</li>
+      <li>Bots are not permitted in official channels with the exception of <strong>#oppaitime-announce</strong> and <strong>#oppaitime-requests</strong>.</li>
+      <li>Any bots you have on IRC should authenticate with Udon using your own username and IRC key</li>
+      <li>Bots must identify themselves by setting the +B usermode on themselves.</li>
+      <li><strong>Read the channel topic before asking questions.</strong></li>
+    </ol>
 <?
-	}
+  }
 }

classes/script_start.php

@@ -5,14 +5,14 @@
 /* classes and functions used all over the site to the  */
 /* page currently being displayed.                      */
 /*------------------------------------------------------*/
-/* The code that includes the main php files and		*/
-/* generates the page are at the bottom.				*/
+/* The code that includes the main php files and    */
+/* generates the page are at the bottom.        */
 /*------------------------------------------------------*/
 /********************************************************/
 require 'config.php'; //The config contains all site wide configuration information
 //Deal with dumbasses
 if (isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) {
-	die('d14:failure reason40:Invalid .torrent, try downloading again.e');
+  die('d14:failure reason40:Invalid .torrent, try downloading again.e');
 }
 
 require(SERVER_ROOT.'/classes/proxies.class.php');
@@ -20,30 +20,30 @@ require(SERVER_ROOT.'/classes/proxies.class.php');
 // Get the user's actual IP address if they're proxied.
 // Or if cloudflare is used
 if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
-	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
+  $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
 }
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])
-		&& proxyCheck($_SERVER['REMOTE_ADDR'])
-		&& filter_var($_SERVER['HTTP_X_FORWARDED_FOR'],
-				FILTER_VALIDATE_IP,
-				FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
-	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    && proxyCheck($_SERVER['REMOTE_ADDR'])
+    && filter_var($_SERVER['HTTP_X_FORWARDED_FOR'],
+        FILTER_VALIDATE_IP,
+        FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+  $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
 }
 
 if (!isset($argv) && !empty($_SERVER['HTTP_HOST'])) {
   // Skip this block if running from cli or if the browser is old and shitty
   // This should really be done in nginx config TODO: Remove
-	if ($_SERVER['HTTP_HOST'] == 'www.'.SITE_DOMAIN) {
-		header('Location: https://'.SITE_DOMAIN.$_SERVER['REQUEST_URI']); die();
-	}
+  if ($_SERVER['HTTP_HOST'] == 'www.'.SITE_DOMAIN) {
+    header('Location: https://'.SITE_DOMAIN.$_SERVER['REQUEST_URI']); die();
+  }
 }
 
 
 
 $ScriptStartTime = microtime(true); //To track how long a page takes to create
 if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
-	$RUsage = getrusage();
-	$CPUTimeStart = $RUsage['ru_utime.tv_sec'] * 1000000 + $RUsage['ru_utime.tv_usec'];
+  $RUsage = getrusage();
+  $CPUTimeStart = $RUsage['ru_utime.tv_sec'] * 1000000 + $RUsage['ru_utime.tv_usec'];
 }
 ob_start(); //Start a buffer, mainly in case there is a mysql error
 
@@ -94,100 +94,100 @@ list($Classes, $ClassLevels) = Users::get_classes();
 // Permissions
 
 if (isset($_COOKIE['session'])) {
-	$LoginCookie = $Enc->decrypt($_COOKIE['session']);
+  $LoginCookie = $Enc->decrypt($_COOKIE['session']);
 }
 if (isset($LoginCookie)) {
-	list($SessionID, $LoggedUser['ID']) = explode('|~|', $Enc->decrypt($LoginCookie));
-	$LoggedUser['ID'] = (int)$LoggedUser['ID'];
+  list($SessionID, $LoggedUser['ID']) = explode('|~|', $Enc->decrypt($LoginCookie));
+  $LoggedUser['ID'] = (int)$LoggedUser['ID'];
 
-	$UserID = $LoggedUser['ID']; //TODO: UserID should not be LoggedUser
+  $UserID = $LoggedUser['ID']; //TODO: UserID should not be LoggedUser
 
-	if (!$LoggedUser['ID'] || !$SessionID) {
-		logout();
-	}
+  if (!$LoggedUser['ID'] || !$SessionID) {
+    logout();
+  }
 
-	$UserSessions = $Cache->get_value("users_sessions_$UserID");
-	if (!is_array($UserSessions)) {
+  $UserSessions = $Cache->get_value("users_sessions_$UserID");
+  if (!is_array($UserSessions)) {
     $DB->query(
-		 "SELECT
-				SessionID,
-				Browser,
+     "SELECT
+        SessionID,
+        Browser,
         OperatingSystem,
-        IP, 
-			  LastUpdate
-			FROM users_sessions
-			WHERE UserID = '$UserID'
-				AND Active = 1
-			ORDER BY LastUpdate DESC");
-		$UserSessions = $DB->to_array('SessionID',MYSQLI_ASSOC);
-		$Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
-	}
-
-	if (!array_key_exists($SessionID, $UserSessions)) {
-		logout();
-	}
-
-	// Check if user is enabled
-	$Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
-	if ($Enabled === false) {
-		$DB->query("
-			SELECT Enabled
-			FROM users_main
-			WHERE ID = '$LoggedUser[ID]'");
-		list($Enabled) = $DB->next_record();
-		$Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
-	}
-	if ($Enabled == 2) {
-
-		logout();
-	}
-
-	// Up/Down stats
-	$UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
-	if (!is_array($UserStats)) {
-		$DB->query("
-			SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio
-			FROM users_main
-			WHERE ID = '$LoggedUser[ID]'");
-		$UserStats = $DB->next_record(MYSQLI_ASSOC);
-		$Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
-	}
-
-	// Get info such as username
-	$LightInfo = Users::user_info($LoggedUser['ID']);
-	$HeavyInfo = Users::user_heavy_info($LoggedUser['ID']);
-
-	// Create LoggedUser array
-	$LoggedUser = array_merge($HeavyInfo, $LightInfo, $UserStats);
-
-	$LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . RSS_HASH . $LoggedUser['torrent_pass']);
-
-	// $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
-	$LoggedUser['RatioWatch'] = (
-		$LoggedUser['RatioWatchEnds'] != '0000-00-00 00:00:00'
-		&& time() < strtotime($LoggedUser['RatioWatchEnds'])
-		&& ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
-	);
-
-	// Load in the permissions
-	$LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
-	$LoggedUser['Permissions']['MaxCollages'] += Donations::get_personal_collages($LoggedUser['ID']);
-
-	// Change necessary triggers in external components
-	$Cache->CanClear = check_perms('admin_clear_cache');
-
-	// Because we <3 our staff
-	if (check_perms('site_disable_ip_history')) {
-		$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-	}
-
-	// Update LastUpdate every 10 minutes
-	if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
-		$DB->query("
-			UPDATE users_main
-			SET LastAccess = '".sqltime()."'
-			WHERE ID = '$LoggedUser[ID]'");
-		$SessionQuery = 
+        IP,
+        LastUpdate
+      FROM users_sessions
+      WHERE UserID = '$UserID'
+        AND Active = 1
+      ORDER BY LastUpdate DESC");
+    $UserSessions = $DB->to_array('SessionID',MYSQLI_ASSOC);
+    $Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
+  }
+
+  if (!array_key_exists($SessionID, $UserSessions)) {
+    logout();
+  }
+
+  // Check if user is enabled
+  $Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
+  if ($Enabled === false) {
+    $DB->query("
+      SELECT Enabled
+      FROM users_main
+      WHERE ID = '$LoggedUser[ID]'");
+    list($Enabled) = $DB->next_record();
+    $Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
+  }
+  if ($Enabled == 2) {
+
+    logout();
+  }
+
+  // Up/Down stats
+  $UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
+  if (!is_array($UserStats)) {
+    $DB->query("
+      SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio
+      FROM users_main
+      WHERE ID = '$LoggedUser[ID]'");
+    $UserStats = $DB->next_record(MYSQLI_ASSOC);
+    $Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
+  }
+
+  // Get info such as username
+  $LightInfo = Users::user_info($LoggedUser['ID']);
+  $HeavyInfo = Users::user_heavy_info($LoggedUser['ID']);
+
+  // Create LoggedUser array
+  $LoggedUser = array_merge($HeavyInfo, $LightInfo, $UserStats);
+
+  $LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . RSS_HASH . $LoggedUser['torrent_pass']);
+
+  // $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
+  $LoggedUser['RatioWatch'] = (
+    $LoggedUser['RatioWatchEnds'] != '0000-00-00 00:00:00'
+    && time() < strtotime($LoggedUser['RatioWatchEnds'])
+    && ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
+  );
+
+  // Load in the permissions
+  $LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
+  $LoggedUser['Permissions']['MaxCollages'] += Donations::get_personal_collages($LoggedUser['ID']);
+
+  // Change necessary triggers in external components
+  $Cache->CanClear = check_perms('admin_clear_cache');
+
+  // Because we <3 our staff
+  if (check_perms('site_disable_ip_history')) {
+    $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+  }
+
+  // Update LastUpdate every 10 minutes
+  if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
+    $DB->query("
+      UPDATE users_main
+      SET LastAccess = '".sqltime()."'
+      WHERE ID = '$LoggedUser[ID]'");
+    $SessionQuery =
      "UPDATE users_sessions
       SET ";
     // Only update IP if we have an encryption key in memory
@@ -196,51 +196,51 @@ if (isset($LoginCookie)) {
     }
     $SessionQuery .=
        "Browser = '$Browser',
-				OperatingSystem = '$OperatingSystem',
-				LastUpdate = '".sqltime()."'
-			WHERE UserID = '$LoggedUser[ID]'
-				AND SessionID = '".db_string($SessionID)."'";
+        OperatingSystem = '$OperatingSystem',
+        LastUpdate = '".sqltime()."'
+      WHERE UserID = '$LoggedUser[ID]'
+        AND SessionID = '".db_string($SessionID)."'";
     $DB->query($SessionQuery);
-		$Cache->begin_transaction("users_sessions_$UserID");
-		$Cache->delete_row($SessionID);
+    $Cache->begin_transaction("users_sessions_$UserID");
+    $Cache->delete_row($SessionID);
     $UsersSessionCache = array(
-				'SessionID' => $SessionID,
-				'Browser' => $Browser,
-				'OperatingSystem' => $OperatingSystem,
+        'SessionID' => $SessionID,
+        'Browser' => $Browser,
+        'OperatingSystem' => $OperatingSystem,
         'IP' => ((apc_exists('DBKEY')) ? DBCrypt::encrypt($_SERVER['REMOTE_ADDR']) : $UserSessions[$SessionID]['IP']),
         'LastUpdate' => sqltime() );
-		$Cache->insert_front($SessionID, $UsersSessionCache);
-		$Cache->commit_transaction(0);
-	}
-
-	// Notifications
-	if (isset($LoggedUser['Permissions']['site_torrents_notify'])) {
-		$LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']);
-		if (!is_array($LoggedUser['Notify'])) {
-			$DB->query("
-				SELECT ID, Label
-				FROM users_notify_filters
-				WHERE UserID = '$LoggedUser[ID]'");
-			$LoggedUser['Notify'] = $DB->to_array('ID');
-			$Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000);
-		}
-	}
-
-	// We've never had to disable the wiki privs of anyone.
-	if ($LoggedUser['DisableWiki']) {
-		unset($LoggedUser['Permissions']['site_edit_wiki']);
-	}
-
-	// IP changed
-
-	if (apc_exists('DBKEY') && DBCrypt::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
-
-		if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
-			error('Your IP address has been banned.');
-		}
-
-		$CurIP = db_string($LoggedUser['IP']);
-		$NewIP = db_string($_SERVER['REMOTE_ADDR']);
+    $Cache->insert_front($SessionID, $UsersSessionCache);
+    $Cache->commit_transaction(0);
+  }
+
+  // Notifications
+  if (isset($LoggedUser['Permissions']['site_torrents_notify'])) {
+    $LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']);
+    if (!is_array($LoggedUser['Notify'])) {
+      $DB->query("
+        SELECT ID, Label
+        FROM users_notify_filters
+        WHERE UserID = '$LoggedUser[ID]'");
+      $LoggedUser['Notify'] = $DB->to_array('ID');
+      $Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000);
+    }
+  }
+
+  // We've never had to disable the wiki privs of anyone.
+  if ($LoggedUser['DisableWiki']) {
+    unset($LoggedUser['Permissions']['site_edit_wiki']);
+  }
+
+  // IP changed
+
+  if (apc_exists('DBKEY') && DBCrypt::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
+
+    if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
+      error('Your IP address has been banned.');
+    }
+
+    $CurIP = db_string($LoggedUser['IP']);
+    $NewIP = db_string($_SERVER['REMOTE_ADDR']);
     $DB->query("
       SELECT IP
       FROM users_history_ips
@@ -253,50 +253,50 @@ if (isset($LoginCookie)) {
         break;
       }
     }
-		$DB->query("
-			UPDATE users_history_ips
-			SET EndTime = '".sqltime()."'
-			WHERE EndTime IS NULL
-				AND UserID = '$LoggedUser[ID]'
-				AND IP = '$CurIP'");
-		$DB->query("
-			INSERT IGNORE INTO users_history_ips
-				(UserID, IP, StartTime)
-			VALUES
-				('$LoggedUser[ID]', '".DBCrypt::encrypt($NewIP)."', '".sqltime()."')");
-
-		$ipcc = Tools::geoip($NewIP);
-		$DB->query("
-			UPDATE users_main
-			SET IP = '".DBCrypt::encrypt($NewIP)."', ipcc = '$ipcc'
-			WHERE ID = '$LoggedUser[ID]'");
-		$Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
-		$Cache->update_row(false, array('IP' => DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])));
-		$Cache->commit_transaction(0);
-
-
-	}
-
-
-	// Get stylesheets
-	$Stylesheets = $Cache->get_value('stylesheets');
-	if (!is_array($Stylesheets)) {
-		$DB->query('
-			SELECT
-				ID,
-				LOWER(REPLACE(Name, " ", "_")) AS Name,
-				Name AS ProperName
-			FROM stylesheets');
-		$Stylesheets = $DB->to_array('ID', MYSQLI_BOTH);
-		$Cache->cache_value('stylesheets', $Stylesheets, 0);
-	}
-
-	//A9 TODO: Clean up this messy solution
-	$LoggedUser['StyleName'] = $Stylesheets[$LoggedUser['StyleID']]['Name'];
-
-	if (empty($LoggedUser['Username'])) {
-		logout(); // Ghost
-	}
+    $DB->query("
+      UPDATE users_history_ips
+      SET EndTime = '".sqltime()."'
+      WHERE EndTime IS NULL
+        AND UserID = '$LoggedUser[ID]'
+        AND IP = '$CurIP'");
+    $DB->query("
+      INSERT IGNORE INTO users_history_ips
+        (UserID, IP, StartTime)
+      VALUES
+        ('$LoggedUser[ID]', '".DBCrypt::encrypt($NewIP)."', '".sqltime()."')");
+
+    $ipcc = Tools::geoip($NewIP);
+    $DB->query("
+      UPDATE users_main
+      SET IP = '".DBCrypt::encrypt($NewIP)."', ipcc = '$ipcc'
+      WHERE ID = '$LoggedUser[ID]'");
+    $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
+    $Cache->update_row(false, array('IP' => DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])));
+    $Cache->commit_transaction(0);
+
+
+  }
+
+
+  // Get stylesheets
+  $Stylesheets = $Cache->get_value('stylesheets');
+  if (!is_array($Stylesheets)) {
+    $DB->query('
+      SELECT
+        ID,
+        LOWER(REPLACE(Name, " ", "_")) AS Name,
+        Name AS ProperName
+      FROM stylesheets');
+    $Stylesheets = $DB->to_array('ID', MYSQLI_BOTH);
+    $Cache->cache_value('stylesheets', $Stylesheets, 0);
+  }
+
+  //A9 TODO: Clean up this messy solution
+  $LoggedUser['StyleName'] = $Stylesheets[$LoggedUser['StyleID']]['Name'];
+
+  if (empty($LoggedUser['Username'])) {
+    logout(); // Ghost
+  }
 }
 G::initialize();
 $Debug->set_flag('end user handling');
@@ -307,47 +307,47 @@ $Debug->set_flag('start function definitions');
  * Log out the current session
  */
 function logout() {
-	global $SessionID;
-	setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
-	setcookie('keeplogged', '', time() - 60 * 60 * 24 * 365, '/', '', false);
-	setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
-	if ($SessionID) {
-
-		G::$DB->query("
-			DELETE FROM users_sessions
-			WHERE UserID = '" . G::$LoggedUser['ID'] . "'
-				AND SessionID = '".db_string($SessionID)."'");
-
-		G::$Cache->begin_transaction('users_sessions_' . G::$LoggedUser['ID']);
-		G::$Cache->delete_row($SessionID);
-		G::$Cache->commit_transaction(0);
-	}
-	G::$Cache->delete_value('user_info_' . G::$LoggedUser['ID']);
-	G::$Cache->delete_value('user_stats_' . G::$LoggedUser['ID']);
-	G::$Cache->delete_value('user_info_heavy_' . G::$LoggedUser['ID']);
-
-	header('Location: login.php');
-
-	die();
+  global $SessionID;
+  setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+  setcookie('keeplogged', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+  setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+  if ($SessionID) {
+
+    G::$DB->query("
+      DELETE FROM users_sessions
+      WHERE UserID = '" . G::$LoggedUser['ID'] . "'
+        AND SessionID = '".db_string($SessionID)."'");
+
+    G::$Cache->begin_transaction('users_sessions_' . G::$LoggedUser['ID']);
+    G::$Cache->delete_row($SessionID);
+    G::$Cache->commit_transaction(0);
+  }
+  G::$Cache->delete_value('user_info_' . G::$LoggedUser['ID']);
+  G::$Cache->delete_value('user_stats_' . G::$LoggedUser['ID']);
+  G::$Cache->delete_value('user_info_heavy_' . G::$LoggedUser['ID']);
+
+  header('Location: login.php');
+
+  die();
 }
 
 function logout_all_sessions() {
-	$UserID = G::$LoggedUser['ID'];
-
-	G::$DB->query("
-		DELETE FROM users_sessions
-		WHERE UserID = '$UserID'");
-	
-	G::$Cache->delete_value('users_sessions_' . $UserID);
-	logout();
+  $UserID = G::$LoggedUser['ID'];
+
+  G::$DB->query("
+    DELETE FROM users_sessions
+    WHERE UserID = '$UserID'");
+
+  G::$Cache->delete_value('users_sessions_' . $UserID);
+  logout();
 }
 
 function enforce_login() {
-	global $SessionID;
-	if (!$SessionID || !G::$LoggedUser) {
-		setcookie('redirect', $_SERVER['REQUEST_URI'], time() + 60 * 30, '/', '', false);
-		logout();
-	}
+  global $SessionID;
+  if (!$SessionID || !G::$LoggedUser) {
+    setcookie('redirect', $_SERVER['REQUEST_URI'], time() + 60 * 30, '/', '', false);
+    logout();
+  }
 }
 
 /**
@@ -358,28 +358,28 @@ function enforce_login() {
  * @return authorisation status. Prints an error message to LAB_CHAN on IRC on failure.
  */
 function authorize($Ajax = false) {
-	if (empty($_REQUEST['auth']) || $_REQUEST['auth'] != G::$LoggedUser['AuthKey']) {
-		send_irc("PRIVMSG ".LAB_CHAN." :".G::$LoggedUser['Username']." just failed authorize on ".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER']) ? " coming from ".$_SERVER['HTTP_REFERER'] : ""));
-		error('Invalid authorization key. Go back, refresh, and try again.', $Ajax);
-		return false;
-	}
-	return true;
+  if (empty($_REQUEST['auth']) || $_REQUEST['auth'] != G::$LoggedUser['AuthKey']) {
+    send_irc("PRIVMSG ".LAB_CHAN." :".G::$LoggedUser['Username']." just failed authorize on ".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER']) ? " coming from ".$_SERVER['HTTP_REFERER'] : ""));
+    error('Invalid authorization key. Go back, refresh, and try again.', $Ajax);
+    return false;
+  }
+  return true;
 }
 
 $Debug->set_flag('ending function definitions');
 //Include /sections/*/index.php
 $Document = basename(parse_url($_SERVER['SCRIPT_FILENAME'], PHP_URL_PATH), '.php');
 if (!preg_match('/^[a-z0-9]+$/i', $Document)) {
-	error(404);
+  error(404);
 }
 
 $StripPostKeys = array_fill_keys(array('password', 'cur_pass', 'new_pass_1', 'new_pass_2', 'verifypassword', 'confirm_password', 'ChangePassword', 'Password'), true);
 $Cache->cache_value('php_' . getmypid(), array(
-	'start' => sqltime(),
-	'document' => $Document,
-	'query' => $_SERVER['QUERY_STRING'],
-	'get' => $_GET,
-	'post' => array_diff_key($_POST, $StripPostKeys)), 600);
+  'start' => sqltime(),
+  'document' => $Document,
+  'query' => $_SERVER['QUERY_STRING'],
+  'get' => $_GET,
+  'post' => array_diff_key($_POST, $StripPostKeys)), 600);
 
 // Locked account constant
 define('STAFF_LOCKED', 1);
@@ -400,8 +400,8 @@ upon hit rather than being browser cached for changing content.
 Old versions of Internet Explorer choke when downloading binary files over HTTPS with disabled cache.
 Define the following constant in files that handle file downloads */
 if (!defined('SKIP_NO_CACHE_HEADERS')) {
-	header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
-	header('Pragma: no-cache');
+  header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
+  header('Pragma: no-cache');
 }
 
 //Flush to user

classes/sitehistory.class.php

@@ -1,269 +1,269 @@
 <?
 
 class SiteHistory {
-	private static $Categories = array(1 => "Code", "Event", "Milestone", "Policy", "Release", "Staff Change");
-	private static $SubCategories = array(1 => "Announcement", "Blog Post", "Change Log", "Forum Post", "Wiki", "Other", "External Source");
-	private static $Tags = array(
-								"api",
-								"celebration",
-								"class.primary",
-								"class.secondary",
-								"collage",
-								"community",
-								"conclusion",
-								"contest",
-								"design",
-								"donate",
-								"editing",
-								"editorial",
-								"feature",
-								"featured.article",
-								"featured.album",
-								"featured.product",
-								"finances",
-								"format",
-								"forum",
-								"freeleech",
-								"freeleech.tokens",
-								"gazelle",
-								"hierarchy",
-								"inbox",
-								"infrastructure",
-								"interview",
-								"irc",
-								"log",
-								"neutral.leech",
-								"notifications",
-								"ocelot",
-								"paranoia",
-								"picks.guest",
-								"picks.staff",
-								"promotion",
-								"ratio",
-								"record",
-								"report",
-								"request",
-								"requirement",
-								"retirement",
-								"rippy",
-								"search",
-								"settings",
-								"start",
-								"stats",
-								"store",
-								"stylesheet",
-								"tagging",
-								"transcode",
-								"toolbox",
-								"top.10",
-								"torrent",
-								"torrent.group",
-								"upload",
-								"vanity.house",
-								"voting",
-								"whitelist",
-								"wiki");
+  private static $Categories = array(1 => "Code", "Event", "Milestone", "Policy", "Release", "Staff Change");
+  private static $SubCategories = array(1 => "Announcement", "Blog Post", "Change Log", "Forum Post", "Wiki", "Other", "External Source");
+  private static $Tags = array(
+                "api",
+                "celebration",
+                "class.primary",
+                "class.secondary",
+                "collage",
+                "community",
+                "conclusion",
+                "contest",
+                "design",
+                "donate",
+                "editing",
+                "editorial",
+                "feature",
+                "featured.article",
+                "featured.album",
+                "featured.product",
+                "finances",
+                "format",
+                "forum",
+                "freeleech",
+                "freeleech.tokens",
+                "gazelle",
+                "hierarchy",
+                "inbox",
+                "infrastructure",
+                "interview",
+                "irc",
+                "log",
+                "neutral.leech",
+                "notifications",
+                "ocelot",
+                "paranoia",
+                "picks.guest",
+                "picks.staff",
+                "promotion",
+                "ratio",
+                "record",
+                "report",
+                "request",
+                "requirement",
+                "retirement",
+                "rippy",
+                "search",
+                "settings",
+                "start",
+                "stats",
+                "store",
+                "stylesheet",
+                "tagging",
+                "transcode",
+                "toolbox",
+                "top.10",
+                "torrent",
+                "torrent.group",
+                "upload",
+                "vanity.house",
+                "voting",
+                "whitelist",
+                "wiki");
 
-	public static function get_months() {
-		$Results = G::$Cache->get_value("site_history_months");
-		if (!$Results) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-					SELECT DISTINCT
-						YEAR(DATE) AS Year, MONTH(Date) AS Month, MONTHNAME(Date) AS MonthName
-					FROM site_history
-					ORDER BY Date DESC");
-			$Results = G::$DB->to_array();
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value("site_history_months", $Results, 0);
-		}
-		return $Results;
-	}
+  public static function get_months() {
+    $Results = G::$Cache->get_value("site_history_months");
+    if (!$Results) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+          SELECT DISTINCT
+            YEAR(DATE) AS Year, MONTH(Date) AS Month, MONTHNAME(Date) AS MonthName
+          FROM site_history
+          ORDER BY Date DESC");
+      $Results = G::$DB->to_array();
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value("site_history_months", $Results, 0);
+    }
+    return $Results;
+  }
 
-	public static function get_event($ID) {
-		if (!empty($ID)) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-					SELECT
-						ID, Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date
-					FROM site_history
-					WHERE ID = '$ID'
-					ORDER BY Date DESC");
-			$Event = G::$DB->next_record();
-			G::$DB->set_query_id($QueryID);
-			return $Event;
-		}
-	}
+  public static function get_event($ID) {
+    if (!empty($ID)) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+          SELECT
+            ID, Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date
+          FROM site_history
+          WHERE ID = '$ID'
+          ORDER BY Date DESC");
+      $Event = G::$DB->next_record();
+      G::$DB->set_query_id($QueryID);
+      return $Event;
+    }
+  }
 
-	public static function get_latest_events($Limit) {
-		self::get_events(null, null, null, null, null, null, $Limit);
-	}
+  public static function get_latest_events($Limit) {
+    self::get_events(null, null, null, null, null, null, $Limit);
+  }
 
-	public static function get_events($Month, $Year, $Title, $Category, $SubCategory, $Tags, $Limit) {
-		$Month = (int)$Month;
-		$Year = (int)$Year;
-		$Title = db_string($Title);
-		$Category = (int)$Category;
-		$SubCategory = (int)$SubCategory;
-		$Tags = db_string($Tags);
-		$Limit = (int)$Limit;
-		$Where = array();
-		if (!empty($Month)) {
-			$Where[] = " MONTH(Date) = '$Month' ";
-		}
-		if (!empty($Year)) {
-			$Where[] = " YEAR(Date) = '$Year' ";
-		}
-		if (!empty($Title)) {
-			$Where[] = " Title LIKE '%$Title%' ";
-		}
-		if (!empty($Category)) {
-			$Where[] = " Category = '$Category '";
-		}
-		if (!empty($SubCategory)) {
-			$Where[] = " SubCategory = '$SubCategory '";
-		}
-		if (!empty($Tags)) {
-			$Tags = explode(',', $Tags);
-			$Or = '(';
-			foreach ($Tags as $Tag) {
-				$Tag = trim($Tag);
-				$Or .= " Tags LIKE '%$Tag%' OR ";
-			}
-			if (strlen($Or) > 1) {
-				$Or = rtrim($Or, 'OR ');
-				$Or .= ')';
-				$Where[] = $Or;
-			}
-		}
-		if (!empty($Limit)) {
-			$Limit = " LIMIT $Limit";
-		} else {
-			$Limit = '';
-		}
-		if (count($Where) > 0) {
-			$Query = ' WHERE ' . implode('AND', $Where);
-		} else {
-			$Query = '';
-		}
+  public static function get_events($Month, $Year, $Title, $Category, $SubCategory, $Tags, $Limit) {
+    $Month = (int)$Month;
+    $Year = (int)$Year;
+    $Title = db_string($Title);
+    $Category = (int)$Category;
+    $SubCategory = (int)$SubCategory;
+    $Tags = db_string($Tags);
+    $Limit = (int)$Limit;
+    $Where = array();
+    if (!empty($Month)) {
+      $Where[] = " MONTH(Date) = '$Month' ";
+    }
+    if (!empty($Year)) {
+      $Where[] = " YEAR(Date) = '$Year' ";
+    }
+    if (!empty($Title)) {
+      $Where[] = " Title LIKE '%$Title%' ";
+    }
+    if (!empty($Category)) {
+      $Where[] = " Category = '$Category '";
+    }
+    if (!empty($SubCategory)) {
+      $Where[] = " SubCategory = '$SubCategory '";
+    }
+    if (!empty($Tags)) {
+      $Tags = explode(',', $Tags);
+      $Or = '(';
+      foreach ($Tags as $Tag) {
+        $Tag = trim($Tag);
+        $Or .= " Tags LIKE '%$Tag%' OR ";
+      }
+      if (strlen($Or) > 1) {
+        $Or = rtrim($Or, 'OR ');
+        $Or .= ')';
+        $Where[] = $Or;
+      }
+    }
+    if (!empty($Limit)) {
+      $Limit = " LIMIT $Limit";
+    } else {
+      $Limit = '';
+    }
+    if (count($Where) > 0) {
+      $Query = ' WHERE ' . implode('AND', $Where);
+    } else {
+      $Query = '';
+    }
 
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-				SELECT
-					ID, Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date
-				FROM site_history
-				$Query
-				ORDER BY Date DESC
-				$Limit");
-		$Events = G::$DB->to_array();
-		G::$DB->set_query_id($QueryID);
-		return $Events;
-	}
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+        SELECT
+          ID, Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date
+        FROM site_history
+        $Query
+        ORDER BY Date DESC
+        $Limit");
+    $Events = G::$DB->to_array();
+    G::$DB->set_query_id($QueryID);
+    return $Events;
+  }
 
-	public static function add_event($Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID) {
-		if (empty($Date)) {
-			$Date = sqltime();
-		} else {
-			list($Y, $M, $D) = explode('-', $Date);
-			if (!checkdate($M, $D, $Y)) {
-				error("Error");
-			}
-		}
-		$Title = db_string($Title);
-		$Link = db_string($Link);
-		$Category = (int)$Category;
-		$SubCategory = (int)$SubCategory;
-		$Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
-		$ExplodedTags = explode(',', $Tags);
-		foreach ($ExplodedTags as $Tag) {
-			if (!in_array($Tag, self::get_tags())) {
-				error("Invalid tag");
-			}
-		}
-		$Body = db_string($Body);
-		$UserID = (int)$UserID;
+  public static function add_event($Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID) {
+    if (empty($Date)) {
+      $Date = sqltime();
+    } else {
+      list($Y, $M, $D) = explode('-', $Date);
+      if (!checkdate($M, $D, $Y)) {
+        error("Error");
+      }
+    }
+    $Title = db_string($Title);
+    $Link = db_string($Link);
+    $Category = (int)$Category;
+    $SubCategory = (int)$SubCategory;
+    $Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
+    $ExplodedTags = explode(',', $Tags);
+    foreach ($ExplodedTags as $Tag) {
+      if (!in_array($Tag, self::get_tags())) {
+        error("Invalid tag");
+      }
+    }
+    $Body = db_string($Body);
+    $UserID = (int)$UserID;
 
-		if (empty($Title) || empty($Category) || empty($SubCategory)) {
-			error("Error");
-		}
+    if (empty($Title) || empty($Category) || empty($SubCategory)) {
+      error("Error");
+    }
 
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-				INSERT INTO site_history
-					(Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date)
-				VALUES
-					('$Title', '$Link', '$Category', '$SubCategory', '$Tags', '$Body', '$UserID', '$Date')");
-		G::$DB->set_query_id($QueryID);
-		G::$Cache->delete_value("site_history_months");
-	}
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+        INSERT INTO site_history
+          (Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date)
+        VALUES
+          ('$Title', '$Link', '$Category', '$SubCategory', '$Tags', '$Body', '$UserID', '$Date')");
+    G::$DB->set_query_id($QueryID);
+    G::$Cache->delete_value("site_history_months");
+  }
 
-	public static function update_event($ID, $Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID) {
-		if (empty($Date)) {
-			$Date = sqltime();
-		} else {
-			$Date = db_string($Date);
-			list($Y, $M, $D) = explode('-', $Date);
-			if (!checkdate($M, $D, $Y)) {
-				error("Error");
-			}
-		}
-		$ID = (int)$ID;
-		$Title = db_string($Title);
-		$Link = db_string($Link);
-		$Category = (int)$Category;
-		$SubCategory = (int)$SubCategory;
-		$Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
-		$ExplodedTags = explode(",", $Tags);
-		foreach ($ExplodedTags as $Tag) {
-			if (!in_array($Tag, self::get_tags())) {
-				error("Invalid tag");
-			}
-		}
-		$Body = db_string($Body);
-		$UserID = (int)$UserID;
+  public static function update_event($ID, $Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID) {
+    if (empty($Date)) {
+      $Date = sqltime();
+    } else {
+      $Date = db_string($Date);
+      list($Y, $M, $D) = explode('-', $Date);
+      if (!checkdate($M, $D, $Y)) {
+        error("Error");
+      }
+    }
+    $ID = (int)$ID;
+    $Title = db_string($Title);
+    $Link = db_string($Link);
+    $Category = (int)$Category;
+    $SubCategory = (int)$SubCategory;
+    $Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
+    $ExplodedTags = explode(",", $Tags);
+    foreach ($ExplodedTags as $Tag) {
+      if (!in_array($Tag, self::get_tags())) {
+        error("Invalid tag");
+      }
+    }
+    $Body = db_string($Body);
+    $UserID = (int)$UserID;
 
-		if (empty($ID) || empty($Title) || empty($Category) || empty($SubCategory)) {
-			error("Error");
-		}
+    if (empty($ID) || empty($Title) || empty($Category) || empty($SubCategory)) {
+      error("Error");
+    }
 
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-				UPDATE site_history
-				SET
-					Title = '$Title',
-					Url = '$Link',
-					Category = '$Category',
-					SubCategory = '$SubCategory',
-					Tags = '$Tags',
-					Body = '$Body',
-					AddedBy = '$UserID',
-					Date = '$Date'
-				WHERE ID = '$ID'");
-		G::$DB->set_query_id($QueryID);
-		G::$Cache->delete_value("site_history_months");
-	}
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+        UPDATE site_history
+        SET
+          Title = '$Title',
+          Url = '$Link',
+          Category = '$Category',
+          SubCategory = '$SubCategory',
+          Tags = '$Tags',
+          Body = '$Body',
+          AddedBy = '$UserID',
+          Date = '$Date'
+        WHERE ID = '$ID'");
+    G::$DB->set_query_id($QueryID);
+    G::$Cache->delete_value("site_history_months");
+  }
 
-	public static function delete_event($ID) {
-		if (!is_numeric($ID)) {
-			error(404);
-		}
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-				DELETE FROM site_history
-				WHERE ID = '$ID'");
-		G::$DB->set_query_id($QueryID);
-		G::$Cache->delete_value("site_history_months");
-	}
+  public static function delete_event($ID) {
+    if (!is_numeric($ID)) {
+      error(404);
+    }
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+        DELETE FROM site_history
+        WHERE ID = '$ID'");
+    G::$DB->set_query_id($QueryID);
+    G::$Cache->delete_value("site_history_months");
+  }
 
-	public static function get_categories() {
-		return self::$Categories;
-	}
+  public static function get_categories() {
+    return self::$Categories;
+  }
 
-	public static function get_sub_categories() {
-		return self::$SubCategories;
-	}
+  public static function get_sub_categories() {
+    return self::$SubCategories;
+  }
 
-	public static function get_tags() {
-		return self::$Tags;
-	}
+  public static function get_tags() {
+    return self::$Tags;
+  }
 }

classes/sitehistoryview.class.php

@@ -2,225 +2,225 @@
 
 class SiteHistoryView {
 
-	public static function render_linkbox() {
-		if (check_perms('users_mod')
-			) {
+  public static function render_linkbox() {
+    if (check_perms('users_mod')
+      ) {
 ?>
-	<div class="linkbox">
-		<a href="sitehistory.php?action=edit" class="brackets">Create new event</a>
-	</div>
+  <div class="linkbox">
+    <a href="sitehistory.php?action=edit" class="brackets">Create new event</a>
+  </div>
 <?
-		}
-	}
+    }
+  }
 
-	public static function render_events($Events) {
-		$Categories = SiteHistory::get_categories();
-		$SubCategories = SiteHistory::get_sub_categories();
-		$CanEdit = check_perms('users_mod') ;
-		foreach ($Events as $Event) {
+  public static function render_events($Events) {
+    $Categories = SiteHistory::get_categories();
+    $SubCategories = SiteHistory::get_sub_categories();
+    $CanEdit = check_perms('users_mod') ;
+    foreach ($Events as $Event) {
 ?>
-			<div class="box">
-				<div class="head colhead_dark">
-					<div class="title">
-<?			if ($CanEdit) { ?>
-						<a class="brackets" href="sitehistory.php?action=edit&amp;id=<?=$Event['ID']?>">Edit</a>
-<?			} ?>
+      <div class="box">
+        <div class="head colhead_dark">
+          <div class="title">
+<?      if ($CanEdit) { ?>
+            <a class="brackets" href="sitehistory.php?action=edit&amp;id=<?=$Event['ID']?>">Edit</a>
+<?      } ?>
 
-						<?=date('F d, Y', strtotime($Event['Date']));?>
-							-
-						<a href="sitehistory.php?action=search&amp;category=<?=$Event['Category']?>" class="brackets"><?=$Categories[$Event['Category']]?></a>
-						<a href="sitehistory.php?action=search&amp;subcategory=<?=$Event['SubCategory']?>" class="brackets"><?=$SubCategories[$Event['SubCategory']]?></a>
+            <?=date('F d, Y', strtotime($Event['Date']));?>
+              -
+            <a href="sitehistory.php?action=search&amp;category=<?=$Event['Category']?>" class="brackets"><?=$Categories[$Event['Category']]?></a>
+            <a href="sitehistory.php?action=search&amp;subcategory=<?=$Event['SubCategory']?>" class="brackets"><?=$SubCategories[$Event['SubCategory']]?></a>
 
-<?			if (!empty($Event['Url'])) { ?>
-						<a href="<?=$Event['Url']?>"><?=$Event['Title']?></a>
-<?			} else { ?>
-						<?=$Event['Title']?>
-<?			} ?>
-					</div>
-					<div class="tags">
-						<? self::render_tags($Event['Tags'])?>
-					</div>
-					</div>
-<?			if (!empty($Event['Body'])) { ?>
-					<div class="body">
-						<?=Text::full_format($Event['Body'])?>
-					</div>
-<?			} ?>
-			</div>
+<?      if (!empty($Event['Url'])) { ?>
+            <a href="<?=$Event['Url']?>"><?=$Event['Title']?></a>
+<?      } else { ?>
+            <?=$Event['Title']?>
+<?      } ?>
+          </div>
+          <div class="tags">
+            <? self::render_tags($Event['Tags'])?>
+          </div>
+          </div>
+<?      if (!empty($Event['Body'])) { ?>
+          <div class="body">
+            <?=Text::full_format($Event['Body'])?>
+          </div>
+<?      } ?>
+      </div>
 <?
-		}
-	}
+    }
+  }
 
-	private static function render_tags($Tags) {
-		$Tags = explode(',', $Tags);
-		natcasesort($Tags);
-		$FormattedTags = '';
-		foreach ($Tags as $Tag) {
-			$FormattedTags .= "<a href=\"sitehistory.php?action=search&amp;tags=$Tag\">$Tag" . "</a>, ";
-		}
-		echo rtrim($FormattedTags, ', ');
-	}
+  private static function render_tags($Tags) {
+    $Tags = explode(',', $Tags);
+    natcasesort($Tags);
+    $FormattedTags = '';
+    foreach ($Tags as $Tag) {
+      $FormattedTags .= "<a href=\"sitehistory.php?action=search&amp;tags=$Tag\">$Tag" . "</a>, ";
+    }
+    echo rtrim($FormattedTags, ', ');
+  }
 
-	public static function render_months($Months) { ?>
-		<div class="box">
-			<div class="head">Calendar</div>
-			<div class="pad">
+  public static function render_months($Months) { ?>
+    <div class="box">
+      <div class="head">Calendar</div>
+      <div class="pad">
 <?
-		$Year = "";
-		foreach ($Months as $Month) {
-			if ($Month['Year'] != $Year) {
-				$Year = $Month['Year'];
-				echo "<h2>$Year</h2>";
-			}
+    $Year = "";
+    foreach ($Months as $Month) {
+      if ($Month['Year'] != $Year) {
+        $Year = $Month['Year'];
+        echo "<h2>$Year</h2>";
+      }
 ?>
-				<a style="margin-left: 5px;" href="sitehistory.php?month=<?=$Month['Month']?>&amp;year=<?=$Month['Year']?>"><?=$Month['MonthName']?></a>
-<?		} ?>
-			</div>
-		</div>
+        <a style="margin-left: 5px;" href="sitehistory.php?month=<?=$Month['Month']?>&amp;year=<?=$Month['Year']?>"><?=$Month['MonthName']?></a>
+<?    } ?>
+      </div>
+    </div>
 <?
-	}
+  }
 
-	public static function render_search() { ?>
-			<div class="box">
-				<div class="head">Search</div>
-				<div class="pad">
-					<form class="search_form" action="sitehistory.php" method="get">
-						<input type="hidden" name="action" value="search" />
-						<input type="text" id="title" name="title" size="20" placeholder="Title" />
-						<br /><br/>
-						<input type="text" id="tags" name="tags" size="20" placeholder="Comma-separated tags" />
-						<br /><br/>
-						<select name="category" id="category">
-							<option value="0">Choose a category</option>
+  public static function render_search() { ?>
+      <div class="box">
+        <div class="head">Search</div>
+        <div class="pad">
+          <form class="search_form" action="sitehistory.php" method="get">
+            <input type="hidden" name="action" value="search" />
+            <input type="text" id="title" name="title" size="20" placeholder="Title" />
+            <br /><br/>
+            <input type="text" id="tags" name="tags" size="20" placeholder="Comma-separated tags" />
+            <br /><br/>
+            <select name="category" id="category">
+              <option value="0">Choose a category</option>
 <?
-			$Categories = SiteHistory::get_categories();
-			foreach ($Categories as $Key => $Value) {
+      $Categories = SiteHistory::get_categories();
+      foreach ($Categories as $Key => $Value) {
 ?>
-							<option<?=$Key == $Event['Category'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
-<?			} ?>
-						</select>
-						<br /><br/>
-						<select name="subcategory">
-							<option value="0">Choose a subcategory</option>
+              <option<?=$Key == $Event['Category'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
+<?      } ?>
+            </select>
+            <br /><br/>
+            <select name="subcategory">
+              <option value="0">Choose a subcategory</option>
 <?
-			$SubCategories = SiteHistory::get_sub_categories();
-			foreach ($SubCategories as $Key => $Value) {
+      $SubCategories = SiteHistory::get_sub_categories();
+      foreach ($SubCategories as $Key => $Value) {
 ?>
-							<option<?=$Key == $Event['SubCategory'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
-<?			} ?>
-						</select>
-						<br /><br/>
-						<input value="Search" type="submit" />
-					</form>
-				</div>
-			</div>
-<?	}
+              <option<?=$Key == $Event['SubCategory'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
+<?      } ?>
+            </select>
+            <br /><br/>
+            <input value="Search" type="submit" />
+          </form>
+        </div>
+      </div>
+<?  }
 
-	public static function render_edit_form($Event) { ?>
-		<form id="event_form" method="post" action="">
-<?		if ($Event) { ?>
-			<input type="hidden" name="action" value="take_edit" />
-			<input type="hidden" name="id" value="<?=$Event['ID']?>" />
-<?		} else { ?>
-			<input type="hidden" name="action" value="take_create" />
-<?		} ?>
-			<input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
-			<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
-				<tr>
-					<td class="label">Title:</td>
-					<td>
-						<input type="text" id="title" name="title" size="50" class="required" value="<?=$Event['Title']?>" />
-					</td>
-				</tr>
-				<tr>
-					<td class="label">Link:</td>
-					<td>
-						<input type="text" id="url" name="url" size="50" value="<?=$Event['Url']?>" />
-					</td>
-				</tr>
-				<tr>
-					<td class="label">Date:</td>
-					<td>
-						<input type="date" id="date" name="date" class="required"<?=$Event ? ' value="' . date('Y-m-d', strtotime($Event['Date'])) . '"' : ''?> />
-					</td>
-				</tr>
-				<tr>
-					<td class="label">Category:</td>
-					<td>
-						<select id="category" name="category" class="required">
-							<option value="0">Choose a category</option>
+  public static function render_edit_form($Event) { ?>
+    <form id="event_form" method="post" action="">
+<?    if ($Event) { ?>
+      <input type="hidden" name="action" value="take_edit" />
+      <input type="hidden" name="id" value="<?=$Event['ID']?>" />
+<?    } else { ?>
+      <input type="hidden" name="action" value="take_create" />
+<?    } ?>
+      <input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
+      <table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
+        <tr>
+          <td class="label">Title:</td>
+          <td>
+            <input type="text" id="title" name="title" size="50" class="required" value="<?=$Event['Title']?>" />
+          </td>
+        </tr>
+        <tr>
+          <td class="label">Link:</td>
+          <td>
+            <input type="text" id="url" name="url" size="50" value="<?=$Event['Url']?>" />
+          </td>
+        </tr>
+        <tr>
+          <td class="label">Date:</td>
+          <td>
+            <input type="date" id="date" name="date" class="required"<?=$Event ? ' value="' . date('Y-m-d', strtotime($Event['Date'])) . '"' : ''?> />
+          </td>
+        </tr>
+        <tr>
+          <td class="label">Category:</td>
+          <td>
+            <select id="category" name="category" class="required">
+              <option value="0">Choose a category</option>
 <?
-		$Categories = SiteHistory::get_categories();
-		foreach ($Categories as $Key => $Value) {
+    $Categories = SiteHistory::get_categories();
+    foreach ($Categories as $Key => $Value) {
 ?>
-							<option<?=$Key == $Event['Category'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
-<?		} ?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">Subcategory:</td>
-					<td>
-						<select id="category" name="sub_category" class="required">
-							<option value="0">Choose a subcategory</option>
-<?		$SubCategories = SiteHistory::get_sub_categories();
-		foreach ($SubCategories as $Key => $Value) { ?>
-							<option<?=$Key == $Event['SubCategory'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
-<?		} ?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">Tags:</td>
-					<td>
-						<input type="text" id="tags" name="tags" placeholder="Comma-separated tags; use periods/dots for spaces" size="50" value="<?=$Event['Tags']?>" />
-						<select id="tag_list">
-							<option>Choose tags</option>
+              <option<?=$Key == $Event['Category'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
+<?    } ?>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">Subcategory:</td>
+          <td>
+            <select id="category" name="sub_category" class="required">
+              <option value="0">Choose a subcategory</option>
+<?    $SubCategories = SiteHistory::get_sub_categories();
+    foreach ($SubCategories as $Key => $Value) { ?>
+              <option<?=$Key == $Event['SubCategory'] ? ' selected="selected"' : ''?> value="<?=$Key?>"><?=$Value?></option>
+<?    } ?>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">Tags:</td>
+          <td>
+            <input type="text" id="tags" name="tags" placeholder="Comma-separated tags; use periods/dots for spaces" size="50" value="<?=$Event['Tags']?>" />
+            <select id="tag_list">
+              <option>Choose tags</option>
 <?
-		$Tags = SiteHistory::get_tags();
-		foreach ($Tags as $Tag) {
+    $Tags = SiteHistory::get_tags();
+    foreach ($Tags as $Tag) {
 ?>
-							<option><?=$Tag?></option>
-<?		} ?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">Body:</td>
-					<td>
-						<textarea id="body" name="body" cols="90" rows="8" tabindex="1" onkeyup="resize('body');"><?=$Event['Body']?></textarea>
-					</td>
-				</tr>
-			</table>
-			<input type="submit" name="submit" value="Submit" />
-<?		if ($Event) { ?>
-			<input type="submit" name="delete" value="Delete" />
-<?		} ?>
-		</form>
+              <option><?=$Tag?></option>
+<?    } ?>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">Body:</td>
+          <td>
+            <textarea id="body" name="body" cols="90" rows="8" tabindex="1" onkeyup="resize('body');"><?=$Event['Body']?></textarea>
+          </td>
+        </tr>
+      </table>
+      <input type="submit" name="submit" value="Submit" />
+<?    if ($Event) { ?>
+      <input type="submit" name="delete" value="Delete" />
+<?    } ?>
+    </form>
 <?
-	}
+  }
 
-	public static function render_recent_sidebar($Events) { ?>
-		<div class="box">
-			<div class="head colhead_dark">
-				<strong><a href="sitehistory.php">Latest site history</a></strong>
-			</div>
-			<ul class="stats nobullet">
+  public static function render_recent_sidebar($Events) { ?>
+    <div class="box">
+      <div class="head colhead_dark">
+        <strong><a href="sitehistory.php">Latest site history</a></strong>
+      </div>
+      <ul class="stats nobullet">
 <?
-		$Categories = SiteHistory::get_categories();
-		foreach ($Events as $Event) {
+    $Categories = SiteHistory::get_categories();
+    foreach ($Events as $Event) {
 ?>
-				<li>
-					<a href="sitehistory.php?action=search&amp;category=<?=$Event['Category']?>" class="brackets"><?=$Categories[$Event['Category']]?></a>
-<?			if (!empty($Event['Url'])) { ?>
-					<a href="<?=$Event['Url']?>"><?=Format::cut_string($Event['Title'], 20)?></a>
-<?			} else { ?>
-					<?=Format::cut_string($Event['Title'], 20)?>
-<?			} ?>
-				</li>
-<?		} ?>
-			</ul>
-		</div>
+        <li>
+          <a href="sitehistory.php?action=search&amp;category=<?=$Event['Category']?>" class="brackets"><?=$Categories[$Event['Category']]?></a>
+<?      if (!empty($Event['Url'])) { ?>
+          <a href="<?=$Event['Url']?>"><?=Format::cut_string($Event['Title'], 20)?></a>
+<?      } else { ?>
+          <?=Format::cut_string($Event['Title'], 20)?>
+<?      } ?>
+        </li>
+<?    } ?>
+      </ul>
+    </div>
 <?
-	}
+  }
 }

classes/sphinxql.class.php

@@ -1,148 +1,148 @@
 <?
 if (!extension_loaded('mysqli')) {
-	error('Mysqli Extension not loaded.');
+  error('Mysqli Extension not loaded.');
 }
 
 class Sphinxql extends mysqli {
-	private static $Connections = array();
-	private $Server;
-	private $Port;
-	private $Socket;
-	private $Ident;
-	private $Connected = false;
+  private static $Connections = array();
+  private $Server;
+  private $Port;
+  private $Socket;
+  private $Ident;
+  private $Connected = false;
 
-	public static $Queries = array();
-	public static $Time = 0.0;
+  public static $Queries = array();
+  public static $Time = 0.0;
 
 
-	/**
-	 * Initialize Sphinxql object
-	 *
-	 * @param string $Server server address or hostname
-	 * @param int $Port listening port
-	 * @param string $Socket Unix socket address, overrides $Server:$Port
-	 */
-	public function __construct($Server, $Port, $Socket) {
-		$this->Server = $Server;
-		$this->Port = $Port;
-		$this->Socket = $Socket;
-		$this->Ident = self::get_ident($Server, $Port, $Socket);
-	}
+  /**
+   * Initialize Sphinxql object
+   *
+   * @param string $Server server address or hostname
+   * @param int $Port listening port
+   * @param string $Socket Unix socket address, overrides $Server:$Port
+   */
+  public function __construct($Server, $Port, $Socket) {
+    $this->Server = $Server;
+    $this->Port = $Port;
+    $this->Socket = $Socket;
+    $this->Ident = self::get_ident($Server, $Port, $Socket);
+  }
 
-	/**
-	 * Create server ident based on connection information
-	 *
-	 * @param string $Server server address or hostname
-	 * @param int $Port listening port
-	 * @param string $Socket Unix socket address, overrides $Server:$Port
-	 * @return identification string
-	 */
-	private static function get_ident($Server, $Port, $Socket) {
-		if ($Socket) {
-			return $Socket;
-		} else {
-			return "$Server:$Port";
-		}
-	}
+  /**
+   * Create server ident based on connection information
+   *
+   * @param string $Server server address or hostname
+   * @param int $Port listening port
+   * @param string $Socket Unix socket address, overrides $Server:$Port
+   * @return identification string
+   */
+  private static function get_ident($Server, $Port, $Socket) {
+    if ($Socket) {
+      return $Socket;
+    } else {
+      return "$Server:$Port";
+    }
+  }
 
-	/**
-	 * Create Sphinxql object or return existing one
-	 *
-	 * @param string $Server server address or hostname
-	 * @param int $Port listening port
-	 * @param string $Socket Unix socket address, overrides $Server:$Port
-	 * @return Sphinxql object
-	 */
-	public static function init_connection($Server, $Port, $Socket) {
-		$Ident = self::get_ident($Server, $Port, $Socket);
-		if (!isset(self::$Connections[$Ident])) {
-			self::$Connections[$Ident] = new Sphinxql($Server, $Port, $Socket);
-		}
-		return self::$Connections[$Ident];
-	}
+  /**
+   * Create Sphinxql object or return existing one
+   *
+   * @param string $Server server address or hostname
+   * @param int $Port listening port
+   * @param string $Socket Unix socket address, overrides $Server:$Port
+   * @return Sphinxql object
+   */
+  public static function init_connection($Server, $Port, $Socket) {
+    $Ident = self::get_ident($Server, $Port, $Socket);
+    if (!isset(self::$Connections[$Ident])) {
+      self::$Connections[$Ident] = new Sphinxql($Server, $Port, $Socket);
+    }
+    return self::$Connections[$Ident];
+  }
 
-	/**
-	 * Connect the Sphinxql object to the Sphinx server
-	 */
-	public function sph_connect() {
-		if ($this->Connected || $this->connect_errno) {
-			return;
-		}
-		global $Debug;
-		$Debug->set_flag("Connecting to Sphinx server $this->Ident");
-		for ($Attempt = 0; $Attempt < 3; $Attempt++) {
-			parent::__construct($this->Server, '', '', '', $this->Port, $this->Socket);
-			if (!$this->connect_errno) {
-				$this->Connected = true;
-				break;
-			}
-			sleep(1);
-		}
-		if ($this->connect_errno) {
-			$Errno = $this->connect_errno;
-			$Error = $this->connect_error;
-			$this->error("Connection failed. (".strval($Errno).": ".strval($Error).")");
-			$Debug->set_flag("Could not connect to Sphinx server $this->Ident. (".strval($Errno).": ".strval($Error).")");
-		} else {
-			$Debug->set_flag("Connected to Sphinx server $this->Ident");
-		}
-	}
+  /**
+   * Connect the Sphinxql object to the Sphinx server
+   */
+  public function sph_connect() {
+    if ($this->Connected || $this->connect_errno) {
+      return;
+    }
+    global $Debug;
+    $Debug->set_flag("Connecting to Sphinx server $this->Ident");
+    for ($Attempt = 0; $Attempt < 3; $Attempt++) {
+      parent::__construct($this->Server, '', '', '', $this->Port, $this->Socket);
+      if (!$this->connect_errno) {
+        $this->Connected = true;
+        break;
+      }
+      sleep(1);
+    }
+    if ($this->connect_errno) {
+      $Errno = $this->connect_errno;
+      $Error = $this->connect_error;
+      $this->error("Connection failed. (".strval($Errno).": ".strval($Error).")");
+      $Debug->set_flag("Could not connect to Sphinx server $this->Ident. (".strval($Errno).": ".strval($Error).")");
+    } else {
+      $Debug->set_flag("Connected to Sphinx server $this->Ident");
+    }
+  }
 
-	/**
-	 * Print a message to privileged users and optionally halt page processing
-	 *
-	 * @param string $Msg message to display
-	 * @param bool $Halt halt page processing. Default is to continue processing the page
-	 * @return Sphinxql object
-	 */
-	public function error($Msg, $Halt = false) {
-		global $Debug;
-		$ErrorMsg = 'SphinxQL ('.$this->Ident.'): '.strval($Msg);
-		$Debug->analysis('SphinxQL Error', $ErrorMsg, 3600*24);
-		if ($Halt === true && (DEBUG_MODE || check_perms('site_debug'))) {
-			echo '<pre>'.display_str($ErrorMsg).'</pre>';
-			die();
-		} elseif ($Halt === true) {
-			error('-1');
-		}
-	}
+  /**
+   * Print a message to privileged users and optionally halt page processing
+   *
+   * @param string $Msg message to display
+   * @param bool $Halt halt page processing. Default is to continue processing the page
+   * @return Sphinxql object
+   */
+  public function error($Msg, $Halt = false) {
+    global $Debug;
+    $ErrorMsg = 'SphinxQL ('.$this->Ident.'): '.strval($Msg);
+    $Debug->analysis('SphinxQL Error', $ErrorMsg, 3600*24);
+    if ($Halt === true && (DEBUG_MODE || check_perms('site_debug'))) {
+      echo '<pre>'.display_str($ErrorMsg).'</pre>';
+      die();
+    } elseif ($Halt === true) {
+      error('-1');
+    }
+  }
 
-	/**
-	 * Escape special characters before sending them to the Sphinx server.
-	 * Two escapes needed because the first one is eaten up by the mysql driver.
-	 *
-	 * @param string $String string to escape
-	 * @return escaped string
-	 */
-	public static function sph_escape_string($String) {
-		return strtr(strtolower($String), array(
-			'('=>'\\\\(',
-			')'=>'\\\\)',
-			'|'=>'\\\\|',
-			'-'=>'\\\\-',
-			'@'=>'\\\\@',
-			'~'=>'\\\\~',
-			'&'=>'\\\\&',
-			'\''=>'\\\'',
-			'<'=>'\\\\<',
-			'!'=>'\\\\!',
-			'"'=>'\\\\"',
-			'/'=>'\\\\/',
-			'*'=>'\\\\*',
-			'$'=>'\\\\$',
-			'^'=>'\\\\^',
-			'\\'=>'\\\\\\\\')
-		);
-	}
+  /**
+   * Escape special characters before sending them to the Sphinx server.
+   * Two escapes needed because the first one is eaten up by the mysql driver.
+   *
+   * @param string $String string to escape
+   * @return escaped string
+   */
+  public static function sph_escape_string($String) {
+    return strtr(strtolower($String), array(
+      '('=>'\\\\(',
+      ')'=>'\\\\)',
+      '|'=>'\\\\|',
+      '-'=>'\\\\-',
+      '@'=>'\\\\@',
+      '~'=>'\\\\~',
+      '&'=>'\\\\&',
+      '\''=>'\\\'',
+      '<'=>'\\\\<',
+      '!'=>'\\\\!',
+      '"'=>'\\\\"',
+      '/'=>'\\\\/',
+      '*'=>'\\\\*',
+      '$'=>'\\\\$',
+      '^'=>'\\\\^',
+      '\\'=>'\\\\\\\\')
+    );
+  }
 
-	/**
-	 * Register sent queries globally for later retrieval by debug functions
-	 *
-	 * @param string $QueryString query text
-	 * @param param $QueryProcessTime time building and processing the query
-	 */
-	public static function register_query($QueryString, $QueryProcessTime) {
-		self::$Queries[] = array($QueryString, $QueryProcessTime);
-		self::$Time += $QueryProcessTime;
-	}
+  /**
+   * Register sent queries globally for later retrieval by debug functions
+   *
+   * @param string $QueryString query text
+   * @param param $QueryProcessTime time building and processing the query
+   */
+  public static function register_query($QueryString, $QueryProcessTime) {
+    self::$Queries[] = array($QueryString, $QueryProcessTime);
+    self::$Time += $QueryProcessTime;
+  }
 }

classes/sphinxqlquery.class.php

@@ -1,372 +1,372 @@
 <?
 class SphinxqlQuery {
-	private $Sphinxql;
+  private $Sphinxql;
 
-	private $Errors;
-	private $Expressions;
-	private $Filters;
-	private $GroupBy;
-	private $Indexes;
-	private $Limits;
-	private $Options;
-	private $QueryString;
-	private $Select;
-	private $SortBy;
-	private $SortGroupBy;
+  private $Errors;
+  private $Expressions;
+  private $Filters;
+  private $GroupBy;
+  private $Indexes;
+  private $Limits;
+  private $Options;
+  private $QueryString;
+  private $Select;
+  private $SortBy;
+  private $SortGroupBy;
 
-	/**
-	 * Initialize Sphinxql object
-	 *
-	 * @param string $Server server address or hostname
-	 * @param int $Port listening port
-	 * @param string $Socket Unix socket address, overrides $Server:$Port
-	 */
-	public function __construct($Server = SPHINXQL_HOST, $Port = SPHINXQL_PORT, $Socket = SPHINXQL_SOCK) {
-		$this->Sphinxql = Sphinxql::init_connection($Server, $Port, $Socket);
-		$this->reset();
-	}
+  /**
+   * Initialize Sphinxql object
+   *
+   * @param string $Server server address or hostname
+   * @param int $Port listening port
+   * @param string $Socket Unix socket address, overrides $Server:$Port
+   */
+  public function __construct($Server = SPHINXQL_HOST, $Port = SPHINXQL_PORT, $Socket = SPHINXQL_SOCK) {
+    $this->Sphinxql = Sphinxql::init_connection($Server, $Port, $Socket);
+    $this->reset();
+  }
 
-	/**
-	 * Specify what data the Sphinx query is supposed to return
-	 *
-	 * @param string $Fields Attributes and expressions
-	 * @return current Sphinxql query object
-	 */
-	public function select($Fields) {
-		$this->Select = $Fields;
-		return $this;
-	}
+  /**
+   * Specify what data the Sphinx query is supposed to return
+   *
+   * @param string $Fields Attributes and expressions
+   * @return current Sphinxql query object
+   */
+  public function select($Fields) {
+    $this->Select = $Fields;
+    return $this;
+  }
 
-	/**
-	 * Specify the indexes to use in the search
-	 *
-	 * @param string $Indexes comma separated list of indexes
-	 * @return current Sphinxql query object
-	 */
-	public function from($Indexes) {
-		$this->Indexes = $Indexes;
-		return $this;
-	}
+  /**
+   * Specify the indexes to use in the search
+   *
+   * @param string $Indexes comma separated list of indexes
+   * @return current Sphinxql query object
+   */
+  public function from($Indexes) {
+    $this->Indexes = $Indexes;
+    return $this;
+  }
 
-	/**
-	 * Add attribute filter. Calling multiple filter functions results in boolean AND between each condition.
-	 *
-	 * @param string $Attribute attribute which the filter will apply to
-	 * @param mixed $Values scalar or array of numerical values. Array uses boolean OR in query condition
-	 * @param bool $Exclude whether to exclude or include matching documents. Default mode is to include matches
-	 * @return current Sphinxql query object
-	 */
-	public function where($Attribute, $Values, $Exclude = false) {
-		if (empty($Attribute) || !isset($Values)) {
-			$this->error("Attribute name and filter value are required.");
-			return $this;
-		}
-		$Filters = array();
-		if (is_array($Values)) {
-			foreach ($Values as $Value) {
-				if (!is_number($Value)) {
-					$this->error("Filters only support numeric values.");
-					return $this;
-				}
-			}
-			if ($Exclude) {
-				$Filters[] = "$Attribute NOT IN (".implode(",", $Values).")";
-			} else {
-				$Filters[] = "$Attribute IN (".implode(",", $Values).")";
-			}
-		} else {
-			if (!is_number($Values)) {
-				$this->error("Filters only support numeric values.");
-				return $this;
-			}
-			if ($Exclude) {
-				$Filters[] = "$Attribute != $Values";
-			} else {
-				$Filters[] = "$Attribute = $Values";
-			}
-		}
-		$this->Filters[] = implode(" AND ", $Filters);
-		return $this;
-	}
+  /**
+   * Add attribute filter. Calling multiple filter functions results in boolean AND between each condition.
+   *
+   * @param string $Attribute attribute which the filter will apply to
+   * @param mixed $Values scalar or array of numerical values. Array uses boolean OR in query condition
+   * @param bool $Exclude whether to exclude or include matching documents. Default mode is to include matches
+   * @return current Sphinxql query object
+   */
+  public function where($Attribute, $Values, $Exclude = false) {
+    if (empty($Attribute) || !isset($Values)) {
+      $this->error("Attribute name and filter value are required.");
+      return $this;
+    }
+    $Filters = array();
+    if (is_array($Values)) {
+      foreach ($Values as $Value) {
+        if (!is_number($Value)) {
+          $this->error("Filters only support numeric values.");
+          return $this;
+        }
+      }
+      if ($Exclude) {
+        $Filters[] = "$Attribute NOT IN (".implode(",", $Values).")";
+      } else {
+        $Filters[] = "$Attribute IN (".implode(",", $Values).")";
+      }
+    } else {
+      if (!is_number($Values)) {
+        $this->error("Filters only support numeric values.");
+        return $this;
+      }
+      if ($Exclude) {
+        $Filters[] = "$Attribute != $Values";
+      } else {
+        $Filters[] = "$Attribute = $Values";
+      }
+    }
+    $this->Filters[] = implode(" AND ", $Filters);
+    return $this;
+  }
 
-	/**
-	 * Add attribute less-than filter. Calling multiple filter functions results in boolean AND between each condition.
-	 *
-	 * @param string $Attribute attribute which the filter will apply to
-	 * @param array $Value upper limit for matches
-	 * @param bool $Inclusive whether to use <= or <
-	 * @return current Sphinxql query object
-	 */
-	public function where_lt($Attribute, $Value, $Inclusive = false) {
-		if (empty($Attribute) || !isset($Value) || !is_number($Value)) {
-			$this->error("Attribute name is required and only numeric filters are supported.");
-			return $this;
-		}
-		$this->Filters[] = $Inclusive ? "$Attribute <= $Value" : "$Attribute < $Value";
-		return $this;
-	}
+  /**
+   * Add attribute less-than filter. Calling multiple filter functions results in boolean AND between each condition.
+   *
+   * @param string $Attribute attribute which the filter will apply to
+   * @param array $Value upper limit for matches
+   * @param bool $Inclusive whether to use <= or <
+   * @return current Sphinxql query object
+   */
+  public function where_lt($Attribute, $Value, $Inclusive = false) {
+    if (empty($Attribute) || !isset($Value) || !is_number($Value)) {
+      $this->error("Attribute name is required and only numeric filters are supported.");
+      return $this;
+    }
+    $this->Filters[] = $Inclusive ? "$Attribute <= $Value" : "$Attribute < $Value";
+    return $this;
+  }
 
-	/**
-	 * Add attribute greater-than filter. Calling multiple filter functions results in boolean AND between each condition.
-	 *
-	 * @param string $Attribute attribute which the filter will apply to
-	 * @param array $Value lower limit for matches
-	 * @param bool $Inclusive whether to use >= or >
-	 * @return current Sphinxql query object
-	 */
-	public function where_gt($Attribute, $Value, $Inclusive = false) {
-		if (empty($Attribute) || !isset($Value) || !is_number($Value)) {
-			$this->error("Attribute name is required and only numeric filters are supported.");
-			return $this;
-		}
-		$this->Filters[] = $Inclusive ? "$Attribute >= $Value" : "$Attribute > $Value";
-		return $this;
-	}
+  /**
+   * Add attribute greater-than filter. Calling multiple filter functions results in boolean AND between each condition.
+   *
+   * @param string $Attribute attribute which the filter will apply to
+   * @param array $Value lower limit for matches
+   * @param bool $Inclusive whether to use >= or >
+   * @return current Sphinxql query object
+   */
+  public function where_gt($Attribute, $Value, $Inclusive = false) {
+    if (empty($Attribute) || !isset($Value) || !is_number($Value)) {
+      $this->error("Attribute name is required and only numeric filters are supported.");
+      return $this;
+    }
+    $this->Filters[] = $Inclusive ? "$Attribute >= $Value" : "$Attribute > $Value";
+    return $this;
+  }
 
-	/**
-	 * Add attribute range filter. Calling multiple filter functions results in boolean AND between each condition.
-	 *
-	 * @param string $Attribute attribute which the filter will apply to
-	 * @param array $Values pair of numerical values that defines the filter range
-	 * @return current Sphinxql query object
-	 */
-	public function where_between($Attribute, $Values) {
-		if (empty($Attribute) || empty($Values) || count($Values) != 2 || !is_number($Values[0]) || !is_number($Values[1])) {
-			$this->error("Filter range requires array of two numerical boundaries as values.");
-			return $this;
-		}
-		$this->Filters[] = "$Attribute BETWEEN $Values[0] AND $Values[1]";
-		return $this;
-	}
+  /**
+   * Add attribute range filter. Calling multiple filter functions results in boolean AND between each condition.
+   *
+   * @param string $Attribute attribute which the filter will apply to
+   * @param array $Values pair of numerical values that defines the filter range
+   * @return current Sphinxql query object
+   */
+  public function where_between($Attribute, $Values) {
+    if (empty($Attribute) || empty($Values) || count($Values) != 2 || !is_number($Values[0]) || !is_number($Values[1])) {
+      $this->error("Filter range requires array of two numerical boundaries as values.");
+      return $this;
+    }
+    $this->Filters[] = "$Attribute BETWEEN $Values[0] AND $Values[1]";
+    return $this;
+  }
 
-	/**
-	 * Add fulltext query expression. Calling multiple filter functions results in boolean AND between each condition.
-	 * Query expression is escaped automatically
-	 *
-	 * @param string $Expr query expression
-	 * @param string $Field field to match $Expr against. Default is *, which means all available fields
-	 * @return current Sphinxql query object
-	 */
-	public function where_match($Expr, $Field = '*', $Escape = true) {
-		if (empty($Expr)) {
-			return $this;
-		}
-		if ($Field !== false) {
-			$Field = "@$Field ";
-		}
-		if ($Escape === true) {
-			$this->Expressions[] = "$Field".Sphinxql::sph_escape_string($Expr);
-		} else {
-			$this->Expressions[] = $Field.$Expr;
-		}
-		return $this;
-	}
+  /**
+   * Add fulltext query expression. Calling multiple filter functions results in boolean AND between each condition.
+   * Query expression is escaped automatically
+   *
+   * @param string $Expr query expression
+   * @param string $Field field to match $Expr against. Default is *, which means all available fields
+   * @return current Sphinxql query object
+   */
+  public function where_match($Expr, $Field = '*', $Escape = true) {
+    if (empty($Expr)) {
+      return $this;
+    }
+    if ($Field !== false) {
+      $Field = "@$Field ";
+    }
+    if ($Escape === true) {
+      $this->Expressions[] = "$Field".Sphinxql::sph_escape_string($Expr);
+    } else {
+      $this->Expressions[] = $Field.$Expr;
+    }
+    return $this;
+  }
 
-	/**
-	 * Specify the order of the matches. Calling this function multiple times sets secondary priorities
-	 *
-	 * @param string $Attribute attribute to use for sorting.
-	 *     Passing an empty attribute value will clear the current sort settings
-	 * @param string $Mode sort method to apply to the selected attribute
-	 * @return current Sphinxql query object
-	 */
-	public function order_by($Attribute = false, $Mode = false) {
-		if (empty($Attribute)) {
-			$this->SortBy = array();
-		} else {
-			$this->SortBy[] = "$Attribute $Mode";
-		}
-		return $this;
-	}
+  /**
+   * Specify the order of the matches. Calling this function multiple times sets secondary priorities
+   *
+   * @param string $Attribute attribute to use for sorting.
+   *     Passing an empty attribute value will clear the current sort settings
+   * @param string $Mode sort method to apply to the selected attribute
+   * @return current Sphinxql query object
+   */
+  public function order_by($Attribute = false, $Mode = false) {
+    if (empty($Attribute)) {
+      $this->SortBy = array();
+    } else {
+      $this->SortBy[] = "$Attribute $Mode";
+    }
+    return $this;
+  }
 
-	/**
-	 * Specify how the results are grouped
-	 *
-	 * @param string $Attribute group matches with the same $Attribute value.
-	 *     Passing an empty attribute value will clear the current group settings
-	 * @return current Sphinxql query object
-	 */
-	public function group_by($Attribute = false) {
-		if (empty($Attribute)) {
-			$this->GroupBy = '';
-		} else {
-			$this->GroupBy = $Attribute;
-		}
-		return $this;
-	}
+  /**
+   * Specify how the results are grouped
+   *
+   * @param string $Attribute group matches with the same $Attribute value.
+   *     Passing an empty attribute value will clear the current group settings
+   * @return current Sphinxql query object
+   */
+  public function group_by($Attribute = false) {
+    if (empty($Attribute)) {
+      $this->GroupBy = '';
+    } else {
+      $this->GroupBy = $Attribute;
+    }
+    return $this;
+  }
 
-	/**
-	 * Specify the order of the results within groups
-	 *
-	 * @param string $Attribute attribute to use for sorting.
-	 *     Passing an empty attribute will clear the current group sort settings
-	 * @param string $Mode sort method to apply to the selected attribute
-	 * @return current Sphinxql query object
-	 */
-	public function order_group_by($Attribute = false, $Mode = false) {
-		if (empty($Attribute)) {
-			$this->SortGroupBy = '';
-		} else {
-			$this->SortGroupBy = "$Attribute $Mode";
-		}
-		return $this;
-	}
+  /**
+   * Specify the order of the results within groups
+   *
+   * @param string $Attribute attribute to use for sorting.
+   *     Passing an empty attribute will clear the current group sort settings
+   * @param string $Mode sort method to apply to the selected attribute
+   * @return current Sphinxql query object
+   */
+  public function order_group_by($Attribute = false, $Mode = false) {
+    if (empty($Attribute)) {
+      $this->SortGroupBy = '';
+    } else {
+      $this->SortGroupBy = "$Attribute $Mode";
+    }
+    return $this;
+  }
 
-	/**
-	 * Specify the offset and amount of matches to return
-	 *
-	 * @param int $Offset number of matches to discard
-	 * @param int $Limit number of matches to return
-	 * @param int $MaxMatches number of results to store in the Sphinx server's memory. Must be >= ($Offset+$Limit)
-	 * @return current Sphinxql query object
-	 */
-	public function limit($Offset, $Limit, $MaxMatches = SPHINX_MAX_MATCHES) {
-		$this->Limits = "$Offset, $Limit";
-		$this->set('max_matches', $MaxMatches);
-		return $this;
-	}
+  /**
+   * Specify the offset and amount of matches to return
+   *
+   * @param int $Offset number of matches to discard
+   * @param int $Limit number of matches to return
+   * @param int $MaxMatches number of results to store in the Sphinx server's memory. Must be >= ($Offset+$Limit)
+   * @return current Sphinxql query object
+   */
+  public function limit($Offset, $Limit, $MaxMatches = SPHINX_MAX_MATCHES) {
+    $this->Limits = "$Offset, $Limit";
+    $this->set('max_matches', $MaxMatches);
+    return $this;
+  }
 
-	/**
-	 * Tweak the settings to use for the query. Sanity checking shouldn't be needed as Sphinx already does it
-	 *
-	 * @param string $Name setting name
-	 * @param mixed $Value value
-	 * @return current Sphinxql query object
-	 */
-	public function set($Name, $Value) {
-		$this->Options[$Name] = $Value;
-		return $this;
-	}
+  /**
+   * Tweak the settings to use for the query. Sanity checking shouldn't be needed as Sphinx already does it
+   *
+   * @param string $Name setting name
+   * @param mixed $Value value
+   * @return current Sphinxql query object
+   */
+  public function set($Name, $Value) {
+    $this->Options[$Name] = $Value;
+    return $this;
+  }
 
-	/**
-	 * Combine the query options into a valid Sphinx query segment
-	 *
-	 * @return string of options
-	 */
-	private function build_options() {
-		$Options = array();
-		foreach ($this->Options as $Option => $Value) {
-			$Options[] = "$Option = $Value";
-		}
-		return implode(', ', $Options);
-	}
+  /**
+   * Combine the query options into a valid Sphinx query segment
+   *
+   * @return string of options
+   */
+  private function build_options() {
+    $Options = array();
+    foreach ($this->Options as $Option => $Value) {
+      $Options[] = "$Option = $Value";
+    }
+    return implode(', ', $Options);
+  }
 
-	/**
-	 * Combine the query conditions into a valid Sphinx query segment
-	 */
-	private function build_query() {
-		if (!$this->Indexes) {
-			$this->error('Index name is required.');
-			return false;
-		}
-		$this->QueryString = "SELECT $this->Select\nFROM $this->Indexes";
-		if (!empty($this->Expressions)) {
-			$this->Filters['expr'] = "MATCH('".implode(' ', $this->Expressions)."')";
-		}
-		if (!empty($this->Filters)) {
-			$this->QueryString .= "\nWHERE ".implode("\n\tAND ", $this->Filters);
-		}
-		if (!empty($this->GroupBy)) {
-			$this->QueryString .= "\nGROUP BY $this->GroupBy";
-		}
-		if (!empty($this->SortGroupBy)) {
-			$this->QueryString .= "\nWITHIN GROUP ORDER BY $this->SortGroupBy";
-		}
-		if (!empty($this->SortBy)) {
-			$this->QueryString .= "\nORDER BY ".implode(", ", $this->SortBy);
-		}
-		if (!empty($this->Limits)) {
-			$this->QueryString .= "\nLIMIT $this->Limits";
-		}
-		if (!empty($this->Options)) {
-			$Options = $this->build_options();
-			$this->QueryString .= "\nOPTION $Options";
-		}
-	}
+  /**
+   * Combine the query conditions into a valid Sphinx query segment
+   */
+  private function build_query() {
+    if (!$this->Indexes) {
+      $this->error('Index name is required.');
+      return false;
+    }
+    $this->QueryString = "SELECT $this->Select\nFROM $this->Indexes";
+    if (!empty($this->Expressions)) {
+      $this->Filters['expr'] = "MATCH('".implode(' ', $this->Expressions)."')";
+    }
+    if (!empty($this->Filters)) {
+      $this->QueryString .= "\nWHERE ".implode("\n\tAND ", $this->Filters);
+    }
+    if (!empty($this->GroupBy)) {
+      $this->QueryString .= "\nGROUP BY $this->GroupBy";
+    }
+    if (!empty($this->SortGroupBy)) {
+      $this->QueryString .= "\nWITHIN GROUP ORDER BY $this->SortGroupBy";
+    }
+    if (!empty($this->SortBy)) {
+      $this->QueryString .= "\nORDER BY ".implode(", ", $this->SortBy);
+    }
+    if (!empty($this->Limits)) {
+      $this->QueryString .= "\nLIMIT $this->Limits";
+    }
+    if (!empty($this->Options)) {
+      $Options = $this->build_options();
+      $this->QueryString .= "\nOPTION $Options";
+    }
+  }
 
-	/**
-	 * Construct and send the query. Register the query in the global Sphinxql object
-	 *
-	 * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes
-	 * @return Sphinxql result object
-	 */
-	public function query($GetMeta = true) {
-		$QueryStartTime = microtime(true);
-		$this->build_query();
-		if (count($this->Errors) > 0) {
-			$ErrorMsg = implode("\n", $this->Errors);
-			$this->Sphinxql->error("Query builder found errors:\n$ErrorMsg");
-			return new SphinxqlResult(null, null, 1, $ErrorMsg);
-		}
-		$QueryString = $this->QueryString;
-		$Result = $this->send_query($GetMeta);
-		$QueryProcessTime = (microtime(true) - $QueryStartTime)*1000;
-		Sphinxql::register_query($QueryString, $QueryProcessTime);
-		return $Result;
-	}
+  /**
+   * Construct and send the query. Register the query in the global Sphinxql object
+   *
+   * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes
+   * @return Sphinxql result object
+   */
+  public function query($GetMeta = true) {
+    $QueryStartTime = microtime(true);
+    $this->build_query();
+    if (count($this->Errors) > 0) {
+      $ErrorMsg = implode("\n", $this->Errors);
+      $this->Sphinxql->error("Query builder found errors:\n$ErrorMsg");
+      return new SphinxqlResult(null, null, 1, $ErrorMsg);
+    }
+    $QueryString = $this->QueryString;
+    $Result = $this->send_query($GetMeta);
+    $QueryProcessTime = (microtime(true) - $QueryStartTime)*1000;
+    Sphinxql::register_query($QueryString, $QueryProcessTime);
+    return $Result;
+  }
 
-	/**
-	 * Run a manually constructed query
-	 *
-	 * @param string Query query expression
-	 * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes
-	 * @return Sphinxql result object
-	 */
-	public function raw_query($Query, $GetMeta = true) {
-		$this->QueryString = $Query;
-		return $this->send_query($GetMeta);
-	}
+  /**
+   * Run a manually constructed query
+   *
+   * @param string Query query expression
+   * @param bool GetMeta whether to fetch meta data for the executed query. Default is yes
+   * @return Sphinxql result object
+   */
+  public function raw_query($Query, $GetMeta = true) {
+    $this->QueryString = $Query;
+    return $this->send_query($GetMeta);
+  }
 
-	/**
-	 * Run a pre-processed query. Only used internally
-	 *
-	 * @param bool GetMeta whether to fetch meta data for the executed query
-	 * @return Sphinxql result object
-	 */
-	private function send_query($GetMeta) {
-		if (!$this->QueryString) {
-			return false;
-		}
-		$this->Sphinxql->sph_connect();
-		$Result = $this->Sphinxql->query($this->QueryString);
-		if ($Result === false) {
-			$Errno = $this->Sphinxql->errno;
-			$Error = $this->Sphinxql->error;
-			$this->Sphinxql->error("Query returned error $Errno ($Error).\n$this->QueryString");
-			$Meta = null;
-		} else {
-			$Errno = 0;
-			$Error = '';
-			$Meta = $GetMeta ? $this->get_meta() : null;
-		}
-		return new SphinxqlResult($Result, $Meta, $Errno, $Error);
-	}
+  /**
+   * Run a pre-processed query. Only used internally
+   *
+   * @param bool GetMeta whether to fetch meta data for the executed query
+   * @return Sphinxql result object
+   */
+  private function send_query($GetMeta) {
+    if (!$this->QueryString) {
+      return false;
+    }
+    $this->Sphinxql->sph_connect();
+    $Result = $this->Sphinxql->query($this->QueryString);
+    if ($Result === false) {
+      $Errno = $this->Sphinxql->errno;
+      $Error = $this->Sphinxql->error;
+      $this->Sphinxql->error("Query returned error $Errno ($Error).\n$this->QueryString");
+      $Meta = null;
+    } else {
+      $Errno = 0;
+      $Error = '';
+      $Meta = $GetMeta ? $this->get_meta() : null;
+    }
+    return new SphinxqlResult($Result, $Meta, $Errno, $Error);
+  }
 
-	/**
-	 * Reset all query options and conditions
-	 */
-	public function reset() {
-		$this->Errors = array();
-		$this->Expressions = array();
-		$this->Filters = array();
-		$this->GroupBy = '';
-		$this->Indexes = '';
-		$this->Limits = array();
-		$this->Options = array('ranker' => 'none');
-		$this->QueryString = '';
-		$this->Select = '*';
-		$this->SortBy = array();
-		$this->SortGroupBy = '';
-	}
+  /**
+   * Reset all query options and conditions
+   */
+  public function reset() {
+    $this->Errors = array();
+    $this->Expressions = array();
+    $this->Filters = array();
+    $this->GroupBy = '';
+    $this->Indexes = '';
+    $this->Limits = array();
+    $this->Options = array('ranker' => 'none');
+    $this->QueryString = '';
+    $this->Select = '*';
+    $this->SortBy = array();
+    $this->SortGroupBy = '';
+  }
 
-	/**
-	 * Fetch and store meta data for the last executed query
-	 *
-	 * @return meta data
-	 */
-	private function get_meta() {
-		return $this->raw_query("SHOW META", false)->to_pair(0, 1);
-	}
+  /**
+   * Fetch and store meta data for the last executed query
+   *
+   * @return meta data
+   */
+  private function get_meta() {
+    return $this->raw_query("SHOW META", false)->to_pair(0, 1);
+  }
 
   /**
    * Copy attribute filters from another SphinxqlQuery object
@@ -378,10 +378,10 @@ class SphinxqlQuery {
     $this->Filters = $SphQLSource->Filters;
   }
 
-	/**
-	 * Store error messages
-	 */
-	private function error($Msg) {
-		$this->Errors[] = $Msg;
-	}
+  /**
+   * Store error messages
+   */
+  private function error($Msg) {
+    $this->Errors[] = $Msg;
+  }
 }

classes/sphinxqlresult.class.php

@@ -1,143 +1,143 @@
 <?
 class SphinxqlResult {
-	private $Result;
-	private $Meta;
-	public $Errno;
-	public $Error;
+  private $Result;
+  private $Meta;
+  public $Errno;
+  public $Error;
 
-	/**
-	 * Create Sphinxql result object
-	 *
-	 * @param mysqli_result $Result query results
-	 * @param array $Meta meta data for the query
-	 * @param int $Errno error code returned by the query upon failure
-	 * @param string $Error error message returned by the query upon failure
-	 */
-	public function __construct($Result, $Meta, $Errno, $Error) {
-		$this->Result = $Result;
-		$this->Meta = $Meta;
-		$this->Errno = $Errno;
-		$this->Error = $Error;
-	}
+  /**
+   * Create Sphinxql result object
+   *
+   * @param mysqli_result $Result query results
+   * @param array $Meta meta data for the query
+   * @param int $Errno error code returned by the query upon failure
+   * @param string $Error error message returned by the query upon failure
+   */
+  public function __construct($Result, $Meta, $Errno, $Error) {
+    $this->Result = $Result;
+    $this->Meta = $Meta;
+    $this->Errno = $Errno;
+    $this->Error = $Error;
+  }
 
-	/**
-	 * Redirect to the Mysqli result object if a nonexistent method is called
-	 *
-	 * @param string $Name method name
-	 * @param array $Arguments arguments used in the function call
-	 * @return whatever the parent function returns
-	 */
-	public function __call($Name, $Arguments) {
-		return call_user_func_array(array($this->Result, $Name), $Arguments);
-	}
+  /**
+   * Redirect to the Mysqli result object if a nonexistent method is called
+   *
+   * @param string $Name method name
+   * @param array $Arguments arguments used in the function call
+   * @return whatever the parent function returns
+   */
+  public function __call($Name, $Arguments) {
+    return call_user_func_array(array($this->Result, $Name), $Arguments);
+  }
 
-	/**
-	 * Did the query find anything?
-	 *
-	 * @return bool results were found
-	 */
-	public function has_results() {
-		return $this->get_meta('total') > 0;
-	}
+  /**
+   * Did the query find anything?
+   *
+   * @return bool results were found
+   */
+  public function has_results() {
+    return $this->get_meta('total') > 0;
+  }
 
-	/**
-	 * Collect and return the specified key of all results as a list
-	 *
-	 * @param string $Key key containing the desired data
-	 * @return array with the $Key value of all results
-	 */
-	public function collect($Key) {
-		$Return = array();
-		while ($Row = $this->fetch_array()) {
-			$Return[] = $Row[$Key];
-		}
-		$this->data_seek(0);
-		return $Return;
-	}
+  /**
+   * Collect and return the specified key of all results as a list
+   *
+   * @param string $Key key containing the desired data
+   * @return array with the $Key value of all results
+   */
+  public function collect($Key) {
+    $Return = array();
+    while ($Row = $this->fetch_array()) {
+      $Return[] = $Row[$Key];
+    }
+    $this->data_seek(0);
+    return $Return;
+  }
 
-	/**
-	 * Collect and return all available data for the matches optionally indexed by a specified key
-	 *
-	 * @param string $Key key to use as indexing value
-	 * @param string $ResultType method to use when fetching data from the mysqli_result object. Default is MYSQLI_ASSOC
-	 * @return array with all available data for the matches
-	 */
-	public function to_array($Key, $ResultType = MYSQLI_ASSOC) {
-		$Return = array();
-		while ($Row = $this->fetch_array($ResultType)) {
-			if ($Key !== false) {
-				$Return[$Row[$Key]] = $Row;
-			} else {
-				$Return[] = $Row;
-			}
-		}
-		$this->data_seek(0);
-		return $Return;
-	}
+  /**
+   * Collect and return all available data for the matches optionally indexed by a specified key
+   *
+   * @param string $Key key to use as indexing value
+   * @param string $ResultType method to use when fetching data from the mysqli_result object. Default is MYSQLI_ASSOC
+   * @return array with all available data for the matches
+   */
+  public function to_array($Key, $ResultType = MYSQLI_ASSOC) {
+    $Return = array();
+    while ($Row = $this->fetch_array($ResultType)) {
+      if ($Key !== false) {
+        $Return[$Row[$Key]] = $Row;
+      } else {
+        $Return[] = $Row;
+      }
+    }
+    $this->data_seek(0);
+    return $Return;
+  }
 
-	/**
-	 * Collect pairs of keys for all matches
-	 *
-	 * @param string $Key1 key to use as indexing value
-	 * @param string $Key2 key to use as value
-	 * @return array with $Key1 => $Key2 pairs for matches
-	 */
-	public function to_pair($Key1, $Key2) {
-		$Return = array();
-		while ($Row = $this->fetch_array()) {
-			$Return[$Row[$Key1]] = $Row[$Key2];
-		}
-		$this->data_seek(0);
-		return $Return;
-	}
+  /**
+   * Collect pairs of keys for all matches
+   *
+   * @param string $Key1 key to use as indexing value
+   * @param string $Key2 key to use as value
+   * @return array with $Key1 => $Key2 pairs for matches
+   */
+  public function to_pair($Key1, $Key2) {
+    $Return = array();
+    while ($Row = $this->fetch_array()) {
+      $Return[$Row[$Key1]] = $Row[$Key2];
+    }
+    $this->data_seek(0);
+    return $Return;
+  }
 
-	/**
-	 * Return specified portions of the current Sphinxql result object's meta data
-	 *
-	 * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all meta data
-	 * @return array with meta data
-	 */
-	public function get_meta($Keys = false) {
-		if ($Keys !== false) {
-			if (is_array($Keys)) {
-				$Return = array();
-				foreach ($Keys as $Key) {
-					if (!isset($this->Meta[$Key])) {
-						continue;
-					}
-					$Return[$Key] = $this->Meta[$Key];
-				}
-				return $Return;
-			} else {
-				return isset($this->Meta[$Keys]) ? $this->Meta[$Keys] : false;
-			}
-		} else {
-			return $this->Meta;
-		}
-	}
+  /**
+   * Return specified portions of the current Sphinxql result object's meta data
+   *
+   * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all meta data
+   * @return array with meta data
+   */
+  public function get_meta($Keys = false) {
+    if ($Keys !== false) {
+      if (is_array($Keys)) {
+        $Return = array();
+        foreach ($Keys as $Key) {
+          if (!isset($this->Meta[$Key])) {
+            continue;
+          }
+          $Return[$Key] = $this->Meta[$Key];
+        }
+        return $Return;
+      } else {
+        return isset($this->Meta[$Keys]) ? $this->Meta[$Keys] : false;
+      }
+    } else {
+      return $this->Meta;
+    }
+  }
 
-	/**
-	 * Return specified portions of the current Mysqli result object's information
-	 *
-	 * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all available information
-	 * @return array with result information
-	 */
-	public function get_result_info($Keys = false) {
-		if ($Keys !== false) {
-			if (is_array($Keys)) {
-				$Return = array();
-				foreach ($Keys as $Key) {
-					if (!isset($this->Result->$Key)) {
-						continue;
-					}
-					$Return[$Key] = $this->Result->$Key;
-				}
-				return $Return;
-			} else {
-				return isset($this->Result->$Keys) ? $this->Result->$Keys : false;
-			}
-		} else {
-			return $this->Result;
-		}
-	}
+  /**
+   * Return specified portions of the current Mysqli result object's information
+   *
+   * @param mixed $Keys scalar or array with keys to return. Default is false, which returns all available information
+   * @return array with result information
+   */
+  public function get_result_info($Keys = false) {
+    if ($Keys !== false) {
+      if (is_array($Keys)) {
+        $Return = array();
+        foreach ($Keys as $Key) {
+          if (!isset($this->Result->$Key)) {
+            continue;
+          }
+          $Return[$Key] = $this->Result->$Key;
+        }
+        return $Return;
+      } else {
+        return isset($this->Result->$Keys) ? $this->Result->$Keys : false;
+      }
+    } else {
+      return $this->Result;
+    }
+  }
 }

classes/subscriptions.class.php

@@ -1,402 +1,402 @@
 <?
 class Subscriptions {
-	/**
-	 * Parse a post/comment body for quotes and notify all quoted users that have quote notifications enabled.
-	 * @param string $Body
-	 * @param int $PostID
-	 * @param string $Page
-	 * @param int $PageID
-	 */
-	public static function quote_notify($Body, $PostID, $Page, $PageID) {
-		$QueryID = G::$DB->get_query_id();
-		/*
-		 * Explanation of the parameters PageID and Page: Page contains where
-		 * this quote comes from and can be forums, artist, collages, requests
-		 * or torrents. The PageID contains the additional value that is
-		 * necessary for the users_notify_quoted table. The PageIDs for the
-		 * different Page are: forums: TopicID artist: ArtistID collages:
-		 * CollageID requests: RequestID torrents: GroupID
-		 */
-		$Matches = array();
-		preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER);
+  /**
+   * Parse a post/comment body for quotes and notify all quoted users that have quote notifications enabled.
+   * @param string $Body
+   * @param int $PostID
+   * @param string $Page
+   * @param int $PageID
+   */
+  public static function quote_notify($Body, $PostID, $Page, $PageID) {
+    $QueryID = G::$DB->get_query_id();
+    /*
+     * Explanation of the parameters PageID and Page: Page contains where
+     * this quote comes from and can be forums, artist, collages, requests
+     * or torrents. The PageID contains the additional value that is
+     * necessary for the users_notify_quoted table. The PageIDs for the
+     * different Page are: forums: TopicID artist: ArtistID collages:
+     * CollageID requests: RequestID torrents: GroupID
+     */
+    $Matches = array();
+    preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER);
 
-		if (count($Matches)) {
-			$Usernames = array();
-			$Level = 0;
-			foreach ($Matches as $M) {
-				if ($M[0] != '[/quote]') {
-					if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) {
-						$Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut?
-					}
-					++$Level;
-				} else {
-					--$Level;
-				}
-			}
-		}
-		// remove any dupes in the array (the fast way)
-		$Usernames = array_flip(array_flip($Usernames));
+    if (count($Matches)) {
+      $Usernames = array();
+      $Level = 0;
+      foreach ($Matches as $M) {
+        if ($M[0] != '[/quote]') {
+          if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) {
+            $Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut?
+          }
+          ++$Level;
+        } else {
+          --$Level;
+        }
+      }
+    }
+    // remove any dupes in the array (the fast way)
+    $Usernames = array_flip(array_flip($Usernames));
 
-		G::$DB->query("
-			SELECT m.ID
-			FROM users_main AS m
-				LEFT JOIN users_info AS i ON i.UserID = m.ID
-			WHERE m.Username IN ('" . implode("', '", $Usernames) . "')
-				AND i.NotifyOnQuote = '1'
-				AND i.UserID != " . G::$LoggedUser['ID']);
+    G::$DB->query("
+      SELECT m.ID
+      FROM users_main AS m
+        LEFT JOIN users_info AS i ON i.UserID = m.ID
+      WHERE m.Username IN ('" . implode("', '", $Usernames) . "')
+        AND i.NotifyOnQuote = '1'
+        AND i.UserID != " . G::$LoggedUser['ID']);
 
-		$Results = G::$DB->to_array();
-		foreach ($Results as $Result) {
-			$UserID = db_string($Result['ID']);
-			$QuoterID = db_string(G::$LoggedUser['ID']);
-			$Page = db_string($Page);
-			$PageID = db_string($PageID);
-			$PostID = db_string($PostID);
+    $Results = G::$DB->to_array();
+    foreach ($Results as $Result) {
+      $UserID = db_string($Result['ID']);
+      $QuoterID = db_string(G::$LoggedUser['ID']);
+      $Page = db_string($Page);
+      $PageID = db_string($PageID);
+      $PostID = db_string($PostID);
 
-			G::$DB->query("
-				INSERT IGNORE INTO users_notify_quoted
-					(UserID, QuoterID, Page, PageID, PostID, Date)
-				VALUES
-					('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')");
-			G::$Cache->delete_value("notify_quoted_$UserID");
-			if ($Page == 'forums') {
-				$URL = site_url() . "forums.php?action=viewthread&postid=$PostID";
-			} else {
-				$URL = site_url() . "comments.php?action=jump&postid=$PostID";
-			}
-			NotificationsManager::send_push($UserID, 'New Quote!', 'Quoted by ' . G::$LoggedUser['Username'] . " $URL", $URL, NotificationsManager::QUOTES);
-		}
-		G::$DB->set_query_id($QueryID);
-	}
+      G::$DB->query("
+        INSERT IGNORE INTO users_notify_quoted
+          (UserID, QuoterID, Page, PageID, PostID, Date)
+        VALUES
+          ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')");
+      G::$Cache->delete_value("notify_quoted_$UserID");
+      if ($Page == 'forums') {
+        $URL = site_url() . "forums.php?action=viewthread&postid=$PostID";
+      } else {
+        $URL = site_url() . "comments.php?action=jump&postid=$PostID";
+      }
+      NotificationsManager::send_push($UserID, 'New Quote!', 'Quoted by ' . G::$LoggedUser['Username'] . " $URL", $URL, NotificationsManager::QUOTES);
+    }
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * (Un)subscribe from a forum thread.
-	 * If UserID == 0, G::$LoggedUser[ID] is used
-	 * @param int $TopicID
-	 * @param int $UserID
-	 */
-	public static function subscribe($TopicID, $UserID = 0) {
-		if ($UserID == 0) {
-			$UserID = G::$LoggedUser['ID'];
-		}
-		$QueryID = G::$DB->get_query_id();
-		$UserSubscriptions = self::get_subscriptions();
-		$Key = self::has_subscribed($TopicID);
-		if ($Key !== false) {
-			G::$DB->query('
-				DELETE FROM users_subscriptions
-				WHERE UserID = ' . db_string($UserID) . '
-					AND TopicID = ' . db_string($TopicID));
-			unset($UserSubscriptions[$Key]);
-		} else {
-			G::$DB->query("
-				INSERT IGNORE INTO users_subscriptions (UserID, TopicID)
-				VALUES ($UserID, " . db_string($TopicID) . ")");
-			array_push($UserSubscriptions, $TopicID);
-		}
-		G::$Cache->replace_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
-		G::$Cache->delete_value("subscriptions_user_new_$UserID");
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * (Un)subscribe from a forum thread.
+   * If UserID == 0, G::$LoggedUser[ID] is used
+   * @param int $TopicID
+   * @param int $UserID
+   */
+  public static function subscribe($TopicID, $UserID = 0) {
+    if ($UserID == 0) {
+      $UserID = G::$LoggedUser['ID'];
+    }
+    $QueryID = G::$DB->get_query_id();
+    $UserSubscriptions = self::get_subscriptions();
+    $Key = self::has_subscribed($TopicID);
+    if ($Key !== false) {
+      G::$DB->query('
+        DELETE FROM users_subscriptions
+        WHERE UserID = ' . db_string($UserID) . '
+          AND TopicID = ' . db_string($TopicID));
+      unset($UserSubscriptions[$Key]);
+    } else {
+      G::$DB->query("
+        INSERT IGNORE INTO users_subscriptions (UserID, TopicID)
+        VALUES ($UserID, " . db_string($TopicID) . ")");
+      array_push($UserSubscriptions, $TopicID);
+    }
+    G::$Cache->replace_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
+    G::$Cache->delete_value("subscriptions_user_new_$UserID");
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * (Un)subscribe from comments.
-	 * If UserID == 0, G::$LoggedUser[ID] is used
-	 * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
-	 * @param int $PageID ArtistID, CollageID, RequestID or GroupID
-	 * @param int $UserID
-	 */
-	public static function subscribe_comments($Page, $PageID, $UserID = 0) {
-		if ($UserID == 0) {
-			$UserID = G::$LoggedUser['ID'];
-		}
-		$QueryID = G::$DB->get_query_id();
-		$UserCommentSubscriptions = self::get_comment_subscriptions();
-		$Key = self::has_subscribed_comments($Page, $PageID);
-		if ($Key !== false) {
-			G::$DB->query("
-				DELETE FROM users_subscriptions_comments
-				WHERE UserID = " . db_string($UserID) . "
-					AND Page = '" . db_string($Page) . "'
-					AND PageID = " . db_string($PageID));
-			unset($UserCommentSubscriptions[$Key]);
-		} else {
-			G::$DB->query("
-				INSERT IGNORE INTO users_subscriptions_comments
-					(UserID, Page, PageID)
-				VALUES
-					($UserID, '" . db_string($Page) . "', " . db_string($PageID) . ")");
-			array_push($UserCommentSubscriptions, array($Page, $PageID));
-		}
-		G::$Cache->replace_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
-		G::$Cache->delete_value("subscriptions_comments_user_new_$UserID");
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * (Un)subscribe from comments.
+   * If UserID == 0, G::$LoggedUser[ID] is used
+   * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
+   * @param int $PageID ArtistID, CollageID, RequestID or GroupID
+   * @param int $UserID
+   */
+  public static function subscribe_comments($Page, $PageID, $UserID = 0) {
+    if ($UserID == 0) {
+      $UserID = G::$LoggedUser['ID'];
+    }
+    $QueryID = G::$DB->get_query_id();
+    $UserCommentSubscriptions = self::get_comment_subscriptions();
+    $Key = self::has_subscribed_comments($Page, $PageID);
+    if ($Key !== false) {
+      G::$DB->query("
+        DELETE FROM users_subscriptions_comments
+        WHERE UserID = " . db_string($UserID) . "
+          AND Page = '" . db_string($Page) . "'
+          AND PageID = " . db_string($PageID));
+      unset($UserCommentSubscriptions[$Key]);
+    } else {
+      G::$DB->query("
+        INSERT IGNORE INTO users_subscriptions_comments
+          (UserID, Page, PageID)
+        VALUES
+          ($UserID, '" . db_string($Page) . "', " . db_string($PageID) . ")");
+      array_push($UserCommentSubscriptions, array($Page, $PageID));
+    }
+    G::$Cache->replace_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
+    G::$Cache->delete_value("subscriptions_comments_user_new_$UserID");
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * Read $UserID's subscriptions. If the cache key isn't set, it gets filled.
-	 * If UserID == 0, G::$LoggedUser[ID] is used
-	 * @param int $UserID
-	 * @return array Array of TopicIDs
-	 */
-	public static function get_subscriptions($UserID = 0) {
-		if ($UserID == 0) {
-			$UserID = G::$LoggedUser['ID'];
-		}
-		$QueryID = G::$DB->get_query_id();
-		$UserSubscriptions = G::$Cache->get_value("subscriptions_user_$UserID");
-		if ($UserSubscriptions === false) {
-			G::$DB->query('
-				SELECT TopicID
-				FROM users_subscriptions
-				WHERE UserID = ' . db_string($UserID));
-			$UserSubscriptions = G::$DB->collect(0);
-			G::$Cache->cache_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
-		}
-		G::$DB->set_query_id($QueryID);
-		return $UserSubscriptions;
-	}
+  /**
+   * Read $UserID's subscriptions. If the cache key isn't set, it gets filled.
+   * If UserID == 0, G::$LoggedUser[ID] is used
+   * @param int $UserID
+   * @return array Array of TopicIDs
+   */
+  public static function get_subscriptions($UserID = 0) {
+    if ($UserID == 0) {
+      $UserID = G::$LoggedUser['ID'];
+    }
+    $QueryID = G::$DB->get_query_id();
+    $UserSubscriptions = G::$Cache->get_value("subscriptions_user_$UserID");
+    if ($UserSubscriptions === false) {
+      G::$DB->query('
+        SELECT TopicID
+        FROM users_subscriptions
+        WHERE UserID = ' . db_string($UserID));
+      $UserSubscriptions = G::$DB->collect(0);
+      G::$Cache->cache_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
+    }
+    G::$DB->set_query_id($QueryID);
+    return $UserSubscriptions;
+  }
 
-	/**
-	 * Same as self::get_subscriptions, but for comment subscriptions
-	 * @param int $UserID
-	 * @return array Array of ($Page, $PageID)
-	 */
-	public static function get_comment_subscriptions($UserID = 0) {
-		if ($UserID == 0) {
-			$UserID = G::$LoggedUser['ID'];
-		}
-		$QueryID = G::$DB->get_query_id();
-		$UserCommentSubscriptions = G::$Cache->get_value("subscriptions_comments_user_$UserID");
-		if ($UserCommentSubscriptions === false) {
-			G::$DB->query('
-				SELECT Page, PageID
-				FROM users_subscriptions_comments
-				WHERE UserID = ' . db_string($UserID));
-			$UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM);
-			G::$Cache->cache_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
-		}
-		G::$DB->set_query_id($QueryID);
-		return $UserCommentSubscriptions;
-	}
+  /**
+   * Same as self::get_subscriptions, but for comment subscriptions
+   * @param int $UserID
+   * @return array Array of ($Page, $PageID)
+   */
+  public static function get_comment_subscriptions($UserID = 0) {
+    if ($UserID == 0) {
+      $UserID = G::$LoggedUser['ID'];
+    }
+    $QueryID = G::$DB->get_query_id();
+    $UserCommentSubscriptions = G::$Cache->get_value("subscriptions_comments_user_$UserID");
+    if ($UserCommentSubscriptions === false) {
+      G::$DB->query('
+        SELECT Page, PageID
+        FROM users_subscriptions_comments
+        WHERE UserID = ' . db_string($UserID));
+      $UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM);
+      G::$Cache->cache_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
+    }
+    G::$DB->set_query_id($QueryID);
+    return $UserCommentSubscriptions;
+  }
 
-	/**
-	 * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions.
-	 * @return int Number of unread subscribed threads/comments
-	 */
-	public static function has_new_subscriptions() {
-		$QueryID = G::$DB->get_query_id();
+  /**
+   * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions.
+   * @return int Number of unread subscribed threads/comments
+   */
+  public static function has_new_subscriptions() {
+    $QueryID = G::$DB->get_query_id();
 
-		$NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
-		if ($NewSubscriptions === false) {
-			// forum subscriptions
-			G::$DB->query("
-					SELECT COUNT(1)
-					FROM users_subscriptions AS s
-						LEFT JOIN forums_last_read_topics AS l ON l.UserID = s.UserID AND l.TopicID = s.TopicID
-						JOIN forums_topics AS t ON t.ID = s.TopicID
-						JOIN forums AS f ON f.ID = t.ForumID
-					WHERE " . Forums::user_forums_sql() . "
-						AND IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", t.LastPostID, IF(l.PostID IS NULL, 0, l.PostID)) < t.LastPostID
-						AND s.UserID = " . G::$LoggedUser['ID']);
-			list($NewForumSubscriptions) = G::$DB->next_record();
+    $NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
+    if ($NewSubscriptions === false) {
+      // forum subscriptions
+      G::$DB->query("
+          SELECT COUNT(1)
+          FROM users_subscriptions AS s
+            LEFT JOIN forums_last_read_topics AS l ON l.UserID = s.UserID AND l.TopicID = s.TopicID
+            JOIN forums_topics AS t ON t.ID = s.TopicID
+            JOIN forums AS f ON f.ID = t.ForumID
+          WHERE " . Forums::user_forums_sql() . "
+            AND IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", t.LastPostID, IF(l.PostID IS NULL, 0, l.PostID)) < t.LastPostID
+            AND s.UserID = " . G::$LoggedUser['ID']);
+      list($NewForumSubscriptions) = G::$DB->next_record();
 
-			// comment subscriptions
-			G::$DB->query("
-					SELECT COUNT(1)
-					FROM users_subscriptions_comments AS s
-						LEFT JOIN users_comments_last_read AS lr ON lr.UserID = s.UserID AND lr.Page = s.Page AND lr.PageID = s.PageID
-						LEFT JOIN comments AS c ON c.ID = (SELECT MAX(ID) FROM comments WHERE Page = s.Page AND PageID = s.PageID)
-						LEFT JOIN collages AS co ON s.Page = 'collages' AND co.ID = s.PageID
-					WHERE s.UserID = " . G::$LoggedUser['ID'] . "
-						AND (s.Page != 'collages' OR co.Deleted = '0')
-						AND IF(lr.PostID IS NULL, 0, lr.PostID) < c.ID");
-			list($NewCommentSubscriptions) = G::$DB->next_record();
+      // comment subscriptions
+      G::$DB->query("
+          SELECT COUNT(1)
+          FROM users_subscriptions_comments AS s
+            LEFT JOIN users_comments_last_read AS lr ON lr.UserID = s.UserID AND lr.Page = s.Page AND lr.PageID = s.PageID
+            LEFT JOIN comments AS c ON c.ID = (SELECT MAX(ID) FROM comments WHERE Page = s.Page AND PageID = s.PageID)
+            LEFT JOIN collages AS co ON s.Page = 'collages' AND co.ID = s.PageID
+          WHERE s.UserID = " . G::$LoggedUser['ID'] . "
+            AND (s.Page != 'collages' OR co.Deleted = '0')
+            AND IF(lr.PostID IS NULL, 0, lr.PostID) < c.ID");
+      list($NewCommentSubscriptions) = G::$DB->next_record();
 
-			$NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions;
-			G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0);
-		}
-		G::$DB->set_query_id($QueryID);
-		return (int)$NewSubscriptions;
-	}
+      $NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions;
+      G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0);
+    }
+    G::$DB->set_query_id($QueryID);
+    return (int)$NewSubscriptions;
+  }
 
-	/**
-	 * Returns whether or not the current user has new quote notifications.
-	 * @return int Number of unread quote notifications
-	 */
-	public static function has_new_quote_notifications() {
-		$QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']);
-		if ($QuoteNotificationsCount === false) {
-			$sql = "
-				SELECT COUNT(1)
-				FROM users_notify_quoted AS q
-					LEFT JOIN forums_topics AS t ON t.ID = q.PageID
-					LEFT JOIN forums AS f ON f.ID = t.ForumID
-					LEFT JOIN collages AS c ON q.Page = 'collages' AND c.ID = q.PageID
-				WHERE q.UserID = " . G::$LoggedUser['ID'] . "
-					AND q.UnRead
-					AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ")
-					AND (q.Page != 'collages' OR c.Deleted = '0')";
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query($sql);
-			list($QuoteNotificationsCount) = G::$DB->next_record();
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0);
-		}
-		return (int)$QuoteNotificationsCount;
-	}
+  /**
+   * Returns whether or not the current user has new quote notifications.
+   * @return int Number of unread quote notifications
+   */
+  public static function has_new_quote_notifications() {
+    $QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']);
+    if ($QuoteNotificationsCount === false) {
+      $sql = "
+        SELECT COUNT(1)
+        FROM users_notify_quoted AS q
+          LEFT JOIN forums_topics AS t ON t.ID = q.PageID
+          LEFT JOIN forums AS f ON f.ID = t.ForumID
+          LEFT JOIN collages AS c ON q.Page = 'collages' AND c.ID = q.PageID
+        WHERE q.UserID = " . G::$LoggedUser['ID'] . "
+          AND q.UnRead
+          AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ")
+          AND (q.Page != 'collages' OR c.Deleted = '0')";
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query($sql);
+      list($QuoteNotificationsCount) = G::$DB->next_record();
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0);
+    }
+    return (int)$QuoteNotificationsCount;
+  }
 
-	/**
-	 * Returns the key which holds this $TopicID in the subscription array.
-	 * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... })
-	 * @param int $TopicID
-	 * @return bool|int
-	 */
-	public static function has_subscribed($TopicID) {
-		$UserSubscriptions = self::get_subscriptions();
-		return array_search($TopicID, $UserSubscriptions);
-	}
+  /**
+   * Returns the key which holds this $TopicID in the subscription array.
+   * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... })
+   * @param int $TopicID
+   * @return bool|int
+   */
+  public static function has_subscribed($TopicID) {
+    $UserSubscriptions = self::get_subscriptions();
+    return array_search($TopicID, $UserSubscriptions);
+  }
 
-	/**
-	 * Same as has_subscribed, but for comment subscriptions.
-	 * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
-	 * @param int $PageID
-	 * @return bool|int
-	 */
-	public static function has_subscribed_comments($Page, $PageID) {
-		$UserCommentSubscriptions = self::get_comment_subscriptions();
-		return array_search(array($Page, $PageID), $UserCommentSubscriptions);
-	}
+  /**
+   * Same as has_subscribed, but for comment subscriptions.
+   * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
+   * @param int $PageID
+   * @return bool|int
+   */
+  public static function has_subscribed_comments($Page, $PageID) {
+    $UserCommentSubscriptions = self::get_comment_subscriptions();
+    return array_search(array($Page, $PageID), $UserCommentSubscriptions);
+  }
 
-	/**
-	 * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
-	 * @param type $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
-	 * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
-	 */
-	public static function flush_subscriptions($Page, $PageID) {
-		$QueryID = G::$DB->get_query_id();
-		if ($Page == 'forums') {
-			G::$DB->query("
-				SELECT UserID
-				FROM users_subscriptions
-				WHERE TopicID = '$PageID'");
-		} else {
-			G::$DB->query("
-				SELECT UserID
-				FROM users_subscriptions_comments
-				WHERE Page = '$Page'
-					AND PageID = '$PageID'");
-		}
-		$Subscribers = G::$DB->collect('UserID');
-		foreach ($Subscribers as $Subscriber) {
-			G::$Cache->delete_value("subscriptions_user_new_$Subscriber");
-		}
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
+   * @param type $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+   * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+   */
+  public static function flush_subscriptions($Page, $PageID) {
+    $QueryID = G::$DB->get_query_id();
+    if ($Page == 'forums') {
+      G::$DB->query("
+        SELECT UserID
+        FROM users_subscriptions
+        WHERE TopicID = '$PageID'");
+    } else {
+      G::$DB->query("
+        SELECT UserID
+        FROM users_subscriptions_comments
+        WHERE Page = '$Page'
+          AND PageID = '$PageID'");
+    }
+    $Subscribers = G::$DB->collect('UserID');
+    foreach ($Subscribers as $Subscriber) {
+      G::$Cache->delete_value("subscriptions_user_new_$Subscriber");
+    }
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups).
-	 * Passing $NewPageID = null will delete the subscriptions.
-	 * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
-	 * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
-	 * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions
-	 */
-	public static function move_subscriptions($Page, $OldPageID, $NewPageID) {
-		self::flush_subscriptions($Page, $OldPageID);
-		$QueryID = G::$DB->get_query_id();
-		if ($Page == 'forums') {
-			if ($NewPageID !== null) {
-				G::$DB->query("
-					UPDATE IGNORE users_subscriptions
-					SET TopicID = '$NewPageID'
-					WHERE TopicID = '$OldPageID'");
-				// explanation see below
-				G::$DB->query("
-					UPDATE IGNORE forums_last_read_topics
-					SET TopicID = $NewPageID
-					WHERE TopicID = $OldPageID");
-				G::$DB->query("
-					SELECT UserID, MIN(PostID)
-					FROM forums_last_read_topics
-					WHERE TopicID IN ($OldPageID, $NewPageID)
-					GROUP BY UserID
-					HAVING COUNT(1) = 2");
-				$Results = G::$DB->to_array(false, MYSQLI_NUM);
-				foreach ($Results as $Result) {
-					G::$DB->query("
-						UPDATE forums_last_read_topics
-						SET PostID = $Result[1]
-						WHERE TopicID = $NewPageID
-							AND UserID = $Result[0]");
-				}
-			}
-			G::$DB->query("
-				DELETE FROM users_subscriptions
-				WHERE TopicID = '$OldPageID'");
-			G::$DB->query("
-				DELETE FROM forums_last_read_topics
-				WHERE TopicID = $OldPageID");
-		} else {
-			if ($NewPageID !== null) {
-				G::$DB->query("
-					UPDATE IGNORE users_subscriptions_comments
-					SET PageID = '$NewPageID'
-					WHERE Page = '$Page'
-						AND PageID = '$OldPageID'");
-				// last read handling
-				// 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page)
-				G::$DB->query("
-					UPDATE IGNORE users_comments_last_read
-					SET PageID = '$NewPageID'
-					WHERE Page = '$Page'
-						AND PageID = $OldPageID");
-				// 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs)
-				G::$DB->query("
-					SELECT UserID, MIN(PostID)
-					FROM users_comments_last_read
-					WHERE Page = '$Page'
-						AND PageID IN ($OldPageID, $NewPageID)
-					GROUP BY UserID
-					HAVING COUNT(1) = 2");
-				$Results = G::$DB->to_array(false, MYSQLI_NUM);
-				// 3) update rows for those people found in 2) to the earlier post
-				foreach ($Results as $Result) {
-					G::$DB->query("
-						UPDATE users_comments_last_read
-						SET PostID = $Result[1]
-						WHERE Page = '$Page'
-							AND PageID = $NewPageID
-							AND UserID = $Result[0]");
-				}
-			}
-			G::$DB->query("
-				DELETE FROM users_subscriptions_comments
-				WHERE Page = '$Page'
-					AND PageID = '$OldPageID'");
-			G::$DB->query("
-				DELETE FROM users_comments_last_read
-				WHERE Page = '$Page'
-					AND PageID = '$OldPageID'");
-		}
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups).
+   * Passing $NewPageID = null will delete the subscriptions.
+   * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+   * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+   * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions
+   */
+  public static function move_subscriptions($Page, $OldPageID, $NewPageID) {
+    self::flush_subscriptions($Page, $OldPageID);
+    $QueryID = G::$DB->get_query_id();
+    if ($Page == 'forums') {
+      if ($NewPageID !== null) {
+        G::$DB->query("
+          UPDATE IGNORE users_subscriptions
+          SET TopicID = '$NewPageID'
+          WHERE TopicID = '$OldPageID'");
+        // explanation see below
+        G::$DB->query("
+          UPDATE IGNORE forums_last_read_topics
+          SET TopicID = $NewPageID
+          WHERE TopicID = $OldPageID");
+        G::$DB->query("
+          SELECT UserID, MIN(PostID)
+          FROM forums_last_read_topics
+          WHERE TopicID IN ($OldPageID, $NewPageID)
+          GROUP BY UserID
+          HAVING COUNT(1) = 2");
+        $Results = G::$DB->to_array(false, MYSQLI_NUM);
+        foreach ($Results as $Result) {
+          G::$DB->query("
+            UPDATE forums_last_read_topics
+            SET PostID = $Result[1]
+            WHERE TopicID = $NewPageID
+              AND UserID = $Result[0]");
+        }
+      }
+      G::$DB->query("
+        DELETE FROM users_subscriptions
+        WHERE TopicID = '$OldPageID'");
+      G::$DB->query("
+        DELETE FROM forums_last_read_topics
+        WHERE TopicID = $OldPageID");
+    } else {
+      if ($NewPageID !== null) {
+        G::$DB->query("
+          UPDATE IGNORE users_subscriptions_comments
+          SET PageID = '$NewPageID'
+          WHERE Page = '$Page'
+            AND PageID = '$OldPageID'");
+        // last read handling
+        // 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page)
+        G::$DB->query("
+          UPDATE IGNORE users_comments_last_read
+          SET PageID = '$NewPageID'
+          WHERE Page = '$Page'
+            AND PageID = $OldPageID");
+        // 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs)
+        G::$DB->query("
+          SELECT UserID, MIN(PostID)
+          FROM users_comments_last_read
+          WHERE Page = '$Page'
+            AND PageID IN ($OldPageID, $NewPageID)
+          GROUP BY UserID
+          HAVING COUNT(1) = 2");
+        $Results = G::$DB->to_array(false, MYSQLI_NUM);
+        // 3) update rows for those people found in 2) to the earlier post
+        foreach ($Results as $Result) {
+          G::$DB->query("
+            UPDATE users_comments_last_read
+            SET PostID = $Result[1]
+            WHERE Page = '$Page'
+              AND PageID = $NewPageID
+              AND UserID = $Result[0]");
+        }
+      }
+      G::$DB->query("
+        DELETE FROM users_subscriptions_comments
+        WHERE Page = '$Page'
+          AND PageID = '$OldPageID'");
+      G::$DB->query("
+        DELETE FROM users_comments_last_read
+        WHERE Page = '$Page'
+          AND PageID = '$OldPageID'");
+    }
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
-	 * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
-	 * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
-	 */
-	public static function flush_quote_notifications($Page, $PageID) {
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT UserID
-			FROM users_notify_quoted
-			WHERE Page = '$Page'
-				AND PageID = $PageID");
-		$Subscribers = G::$DB->collect('UserID');
-		foreach ($Subscribers as $Subscriber) {
-			G::$Cache->delete_value("notify_quoted_$Subscriber");
-		}
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
+   * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+   * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+   */
+  public static function flush_quote_notifications($Page, $PageID) {
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT UserID
+      FROM users_notify_quoted
+      WHERE Page = '$Page'
+        AND PageID = $PageID");
+    $Subscribers = G::$DB->collect('UserID');
+    foreach ($Subscribers as $Subscriber) {
+      G::$Cache->delete_value("notify_quoted_$Subscriber");
+    }
+    G::$DB->set_query_id($QueryID);
+  }
 }

classes/tags.class.php

@@ -16,7 +16,7 @@
  * Tags::format_top();
  * ?></pre>
  * e.g.:
- *	pop (2)
+ *  pop (2)
  *  rock (2)
  *  hip.hop (1)
  *  indie (1)
@@ -25,178 +25,178 @@
  * overall total amount of tags to provide a Top Tags list. Merging is optional.
  */
 class Tags {
-	/**
-	 * Collects all tags processed by the Tags Class
-	 * @static
-	 * @var array $All Class Tags
-	 */
-	private static $All = array();
+  /**
+   * Collects all tags processed by the Tags Class
+   * @static
+   * @var array $All Class Tags
+   */
+  private static $All = array();
 
-	/**
-	 * All tags in the current instance
-	 * @var array $Tags Instance Tags
-	 */
-	private $Tags = null;
+  /**
+   * All tags in the current instance
+   * @var array $Tags Instance Tags
+   */
+  private $Tags = null;
 
-	/**
-	 * @var array $TagLink Tag link list
-	 */
-	private $TagLink = array();
+  /**
+   * @var array $TagLink Tag link list
+   */
+  private $TagLink = array();
 
-	/**
-	 * @var string $Primary The primary tag
-	 */
-	private $Primary = '';
+  /**
+   * @var string $Primary The primary tag
+   */
+  private $Primary = '';
 
-	/**
-	 * Filter tags array to remove empty spaces.
-	 *
-	 * @param string $TagList A string of tags separated by a space
-	 * @param boolean $Merge Merge the tag list with the Class' tags
-	 *				E.g., compilations and soundtracks are skipped, so false
-	 */
-	public function __construct($TagList, $Merge = true) {
-		if ($TagList) {
-			$this->Tags = array_filter(explode(' ', str_replace('_', '.', $TagList)));
+  /**
+   * Filter tags array to remove empty spaces.
+   *
+   * @param string $TagList A string of tags separated by a space
+   * @param boolean $Merge Merge the tag list with the Class' tags
+   *        E.g., compilations and soundtracks are skipped, so false
+   */
+  public function __construct($TagList, $Merge = true) {
+    if ($TagList) {
+      $this->Tags = array_filter(explode(' ', str_replace('_', '.', $TagList)));
 
-			if ($Merge) {
-				self::$All = array_merge(self::$All, $this->Tags);
-			}
+      if ($Merge) {
+        self::$All = array_merge(self::$All, $this->Tags);
+      }
 
-			$this->Primary = $this->Tags[0];
+      $this->Primary = $this->Tags[0];
       sort($this->Tags);
-		} else {
-			$this->Tags = array();
-		}
-	}
+    } else {
+      $this->Tags = array();
+    }
+  }
 
-	/**
-	 * @return string Primary Tag
-	 */
-	public function get_primary() {
-		return $this->Primary;
-	}
+  /**
+   * @return string Primary Tag
+   */
+  public function get_primary() {
+    return $this->Primary;
+  }
 
-	/**
-	 * Set the primary tag
-	 * @param string $Primary
-	 */
-	public function set_primary($Primary) {
-		$this->Primary = (string)$Primary;
-	}
+  /**
+   * Set the primary tag
+   * @param string $Primary
+   */
+  public function set_primary($Primary) {
+    $this->Primary = (string)$Primary;
+  }
 
-	/**
-	 * Formats primary tag as a title
-	 * @return string Title
-	 */
-	public function title() {
-		return ucwords(str_replace('.', ' ', $this->Primary));
-	}
+  /**
+   * Formats primary tag as a title
+   * @return string Title
+   */
+  public function title() {
+    return ucwords(str_replace('.', ' ', $this->Primary));
+  }
 
-	/**
-	 * Formats primary tag as a CSS class
-	 * @return string CSS Class Name
-	 */
-	public function css_name() {
-		return 'tags_' . str_replace('.', '_', $this->Primary);
-	}
+  /**
+   * Formats primary tag as a CSS class
+   * @return string CSS Class Name
+   */
+  public function css_name() {
+    return 'tags_' . str_replace('.', '_', $this->Primary);
+  }
 
-	/**
-	 * @return array Tags
-	 */
-	public function get_tags() {
-		return $this->Tags;
-	}
+  /**
+   * @return array Tags
+   */
+  public function get_tags() {
+    return $this->Tags;
+  }
 
-	/**
-	 * @return array All tags
-	 */
-	public static function all() {
-		return self::$All;
-	}
+  /**
+   * @return array All tags
+   */
+  public static function all() {
+    return self::$All;
+  }
 
-	/**
-	 * Counts and sorts All tags
-	 * @return array All tags sorted
-	 */
-	public static function sorted() {
-		$Sorted = array_count_values(self::$All);
-		arsort($Sorted);
-		return $Sorted;
-	}
+  /**
+   * Counts and sorts All tags
+   * @return array All tags sorted
+   */
+  public static function sorted() {
+    $Sorted = array_count_values(self::$All);
+    arsort($Sorted);
+    return $Sorted;
+  }
 
-	/**
-	 * Formats tags
-	 * @param string $Link Link to a taglist page
-	 * @param string $ArtistName Restrict tag search by this artist
-	 * @return string List of tag links
-	 */
-	public function format($Link = 'torrents.php?taglist=', $ArtistName = '') {
-		if (!empty($ArtistName)) {
-			$ArtistName = "&amp;artistname=" . urlencode($ArtistName) . "&amp;action=advanced&amp;searchsubmit=1";
-		}
-		foreach ($this->Tags as $Tag) {
-			if (empty($this->TagLink[$Tag])) {
-				$this->TagLink[$Tag] = '<a href="' . $Link . $Tag . $ArtistName . '">' . $Tag . '</a>';
-			}
-		}
-		return implode(', ', $this->TagLink);
-	}
+  /**
+   * Formats tags
+   * @param string $Link Link to a taglist page
+   * @param string $ArtistName Restrict tag search by this artist
+   * @return string List of tag links
+   */
+  public function format($Link = 'torrents.php?taglist=', $ArtistName = '') {
+    if (!empty($ArtistName)) {
+      $ArtistName = "&amp;artistname=" . urlencode($ArtistName) . "&amp;action=advanced&amp;searchsubmit=1";
+    }
+    foreach ($this->Tags as $Tag) {
+      if (empty($this->TagLink[$Tag])) {
+        $this->TagLink[$Tag] = '<a href="' . $Link . $Tag . $ArtistName . '">' . $Tag . '</a>';
+      }
+    }
+    return implode(', ', $this->TagLink);
+  }
 
-	/**
-	 * Format a list of top tags
-	 * @param int $Max Max number of items to get
-	 * @param string $Link  Page query where more items of this tag type can be found
-	 * @param string $ArtistName Optional artist
-	 */
-	public static function format_top($Max = 5, $Link = 'torrents.php?taglist=', $ArtistName = '') {
-		if (empty(self::$All)) { ?>
-			<li>No torrent tags</li>
+  /**
+   * Format a list of top tags
+   * @param int $Max Max number of items to get
+   * @param string $Link  Page query where more items of this tag type can be found
+   * @param string $ArtistName Optional artist
+   */
+  public static function format_top($Max = 5, $Link = 'torrents.php?taglist=', $ArtistName = '') {
+    if (empty(self::$All)) { ?>
+      <li>No torrent tags</li>
 <?
-			return;
-		}
-		if (!empty($ArtistName)) {
-			$ArtistName = '&amp;artistname=' . urlencode($ArtistName) . '&amp;action=advanced&amp;searchsubmit=1';
-		}
-		foreach (array_slice(self::sorted(), 0, $Max) as $TagName => $Total) { ?>
-			<li><a href="<?=$Link . display_str($TagName) . $ArtistName?>"><?=display_str($TagName)?></a> (<?=$Total?>)</li>
-<?		}
-	}
+      return;
+    }
+    if (!empty($ArtistName)) {
+      $ArtistName = '&amp;artistname=' . urlencode($ArtistName) . '&amp;action=advanced&amp;searchsubmit=1';
+    }
+    foreach (array_slice(self::sorted(), 0, $Max) as $TagName => $Total) { ?>
+      <li><a href="<?=$Link . display_str($TagName) . $ArtistName?>"><?=display_str($TagName)?></a> (<?=$Total?>)</li>
+<?    }
+  }
 
-	/**
-	 * General purpose method to get all tag aliases from the DB
-	 * @return array
-	 */
-	public static function get_aliases() {
-		$TagAliases = G::$Cache->get_value('tag_aliases_search');
-		if ($TagAliases === false) {
-			G::$DB->query('
-			SELECT ID, BadTag, AliasTag
-			FROM tag_aliases
-			ORDER BY BadTag');
-			$TagAliases = G::$DB->to_array(false, MYSQLI_ASSOC, false);
-			// Unify tag aliases to be in_this_format as tags not in.this.format
-			array_walk_recursive($TagAliases, create_function('&$val', '$val = preg_replace("/\./","_", $val);'));
-			// Clean up the array for smaller cache size
-			foreach ($TagAliases as &$TagAlias) {
-				foreach (array_keys($TagAlias) as $Key) {
-					if (is_numeric($Key)) {
-						unset($TagAlias[$Key]);
-					}
-				}
-			}
-			G::$Cache->cache_value('tag_aliases_search', $TagAliases, 3600 * 24 * 7); // cache for 7 days
-		}
-		return $TagAliases;
-	}
+  /**
+   * General purpose method to get all tag aliases from the DB
+   * @return array
+   */
+  public static function get_aliases() {
+    $TagAliases = G::$Cache->get_value('tag_aliases_search');
+    if ($TagAliases === false) {
+      G::$DB->query('
+      SELECT ID, BadTag, AliasTag
+      FROM tag_aliases
+      ORDER BY BadTag');
+      $TagAliases = G::$DB->to_array(false, MYSQLI_ASSOC, false);
+      // Unify tag aliases to be in_this_format as tags not in.this.format
+      array_walk_recursive($TagAliases, create_function('&$val', '$val = preg_replace("/\./","_", $val);'));
+      // Clean up the array for smaller cache size
+      foreach ($TagAliases as &$TagAlias) {
+        foreach (array_keys($TagAlias) as $Key) {
+          if (is_numeric($Key)) {
+            unset($TagAlias[$Key]);
+          }
+        }
+      }
+      G::$Cache->cache_value('tag_aliases_search', $TagAliases, 3600 * 24 * 7); // cache for 7 days
+    }
+    return $TagAliases;
+  }
 
-	/**
-	 * Replace bad tags with tag aliases
-	 * @param array $Tags Array with sub-arrays 'include' and 'exclude'
-	 * @return array
-	 */
-	public static function remove_aliases($Tags) {
-		$TagAliases = self::get_aliases();
+  /**
+   * Replace bad tags with tag aliases
+   * @param array $Tags Array with sub-arrays 'include' and 'exclude'
+   * @return array
+   */
+  public static function remove_aliases($Tags) {
+    $TagAliases = self::get_aliases();
 
     if (isset($Tags['include'])) {
       $End = count($Tags['include']);
@@ -226,49 +226,49 @@ class Tags {
       $Tags['exclude'] = array_unique($Tags['exclude']);
     }
 
-		return $Tags;
-	}
+    return $Tags;
+  }
 
-	/**
-	 * Filters a list of include and exclude tags to be used in a Sphinx search
-	 * @param array $Tags An array of tags with sub-arrays 'include' and 'exclude'
-	 * @param integer $TagType Search for Any or All of these tags.
-	 * @return array Array keys predicate and input
-	 *               Predicate for a Sphinx 'taglist' query
-	 *               Input contains clean, aliased tags. Use it in a form instead of the user submitted string
-	 */
-	public static function tag_filter_sph($Tags, $TagType) {
-		$QueryParts = [];
-		$Tags = Tags::remove_aliases($Tags);
-		$TagList = str_replace('_', '.', implode(', ', array_merge($Tags['include'], $Tags['exclude'])));
+  /**
+   * Filters a list of include and exclude tags to be used in a Sphinx search
+   * @param array $Tags An array of tags with sub-arrays 'include' and 'exclude'
+   * @param integer $TagType Search for Any or All of these tags.
+   * @return array Array keys predicate and input
+   *               Predicate for a Sphinx 'taglist' query
+   *               Input contains clean, aliased tags. Use it in a form instead of the user submitted string
+   */
+  public static function tag_filter_sph($Tags, $TagType) {
+    $QueryParts = [];
+    $Tags = Tags::remove_aliases($Tags);
+    $TagList = str_replace('_', '.', implode(', ', array_merge($Tags['include'], $Tags['exclude'])));
 
-		foreach ($Tags['include'] as &$Tag) {
-			$Tag = Sphinxql::sph_escape_string($Tag);
-		}
+    foreach ($Tags['include'] as &$Tag) {
+      $Tag = Sphinxql::sph_escape_string($Tag);
+    }
 
-		if (!empty($Tags['exclude'])) {
-			foreach ($Tags['exclude'] as &$Tag) {
-				$Tag = '!' . Sphinxql::sph_escape_string(substr($Tag, 1));
-			}
-		}
+    if (!empty($Tags['exclude'])) {
+      foreach ($Tags['exclude'] as &$Tag) {
+        $Tag = '!' . Sphinxql::sph_escape_string(substr($Tag, 1));
+      }
+    }
 
-		// 'All' tags
-		if (!isset($TagType) || $TagType == 1) {
-			$SearchWords = array_merge($Tags['include'], $Tags['exclude']);
-			if (!empty($Tags)) {
-				$QueryParts[] = implode(' ', $SearchWords);
-			}
-		}
-		// 'Any' tags
-		else {
-			if (!empty($Tags['include'])) {
-				$QueryParts[] = '( ' . implode(' | ', $Tags['include']) . ' )';
-			}
-			if (!empty($Tags['exclude'])) {
-				$QueryParts[] = implode(' ', $Tags['exclude']);
-			}
-		}
+    // 'All' tags
+    if (!isset($TagType) || $TagType == 1) {
+      $SearchWords = array_merge($Tags['include'], $Tags['exclude']);
+      if (!empty($Tags)) {
+        $QueryParts[] = implode(' ', $SearchWords);
+      }
+    }
+    // 'Any' tags
+    else {
+      if (!empty($Tags['include'])) {
+        $QueryParts[] = '( ' . implode(' | ', $Tags['include']) . ' )';
+      }
+      if (!empty($Tags['exclude'])) {
+        $QueryParts[] = implode(' ', $Tags['exclude']);
+      }
+    }
 
-		return ['input' => $TagList, 'predicate' => implode(' ', $QueryParts)];
-	}
+    return ['input' => $TagList, 'predicate' => implode(' ', $QueryParts)];
+  }
 }

classes/templates.class.php

@@ -6,77 +6,77 @@
 // $TPL->get();
 
 class TEMPLATE {
-	var $file = '';
-	var $vars = array();
+  var $file = '';
+  var $vars = array();
 
-	function open($file) {
-		$this->file = file($file);
-	}
+  function open($file) {
+    $this->file = file($file);
+  }
 
-	function set($name, $var, $ifnone = '<span style="font-style: italic;">-None-</span>') {
-		if ($name != '') {
-			$this->vars[$name][0] = $var;
-			$this->vars[$name][1] = $ifnone;
-		}
-	}
+  function set($name, $var, $ifnone = '<span style="font-style: italic;">-None-</span>') {
+    if ($name != '') {
+      $this->vars[$name][0] = $var;
+      $this->vars[$name][1] = $ifnone;
+    }
+  }
 
-	function show() {
-		$TMPVAR = '';
-		for ($i = 0; $i < sizeof($this->file); $i++) {
-			$TMPVAR = $this->file[$i];
-			foreach ($this->vars as $k=>$v) {
-				if ($v[1] != '' && $v[0] == '') {
-					$v[0] = $v[1];
-				}
-				$TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
-			}
-			print $TMPVAR;
-		}
-	}
+  function show() {
+    $TMPVAR = '';
+    for ($i = 0; $i < sizeof($this->file); $i++) {
+      $TMPVAR = $this->file[$i];
+      foreach ($this->vars as $k=>$v) {
+        if ($v[1] != '' && $v[0] == '') {
+          $v[0] = $v[1];
+        }
+        $TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
+      }
+      print $TMPVAR;
+    }
+  }
 
-	function get() {
-		$RESULT = '';
-		$TMPVAR = '';
-		for ($i = 0; $i < sizeof($this->file); $i++) {
-			$TMPVAR = $this->file[$i];
-			foreach ($this->vars as $k=>$v) {
-				if ($v[1] != '' && $v[0] == '') {
-					$v[0] = $v[1];
-				}
-				$TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
-			}
-			$RESULT.= $TMPVAR;
-		}
-		return $RESULT;
-	}
+  function get() {
+    $RESULT = '';
+    $TMPVAR = '';
+    for ($i = 0; $i < sizeof($this->file); $i++) {
+      $TMPVAR = $this->file[$i];
+      foreach ($this->vars as $k=>$v) {
+        if ($v[1] != '' && $v[0] == '') {
+          $v[0] = $v[1];
+        }
+        $TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
+      }
+      $RESULT.= $TMPVAR;
+    }
+    return $RESULT;
+  }
 
-	function str_align($len, $str, $align, $fill) {
-		$strlen = strlen($str);
-		if ($strlen > $len) {
-			return substr($str, 0, $len);
+  function str_align($len, $str, $align, $fill) {
+    $strlen = strlen($str);
+    if ($strlen > $len) {
+      return substr($str, 0, $len);
 
-		} elseif (($strlen == 0) || ($len == 0)) {
-			return '';
+    } elseif (($strlen == 0) || ($len == 0)) {
+      return '';
 
-		} else {
-			if (($align == 'l') || ($align == 'left')) {
-				$result = $str.str_repeat($fill, ($len - $strlen));
+    } else {
+      if (($align == 'l') || ($align == 'left')) {
+        $result = $str.str_repeat($fill, ($len - $strlen));
 
-			} elseif (($align == 'r') || ($align == 'right')) {
-				$result = str_repeat($fill, ($len - $strlen)).$str;
+      } elseif (($align == 'r') || ($align == 'right')) {
+        $result = str_repeat($fill, ($len - $strlen)).$str;
 
-			} elseif (($align == 'c') || ($align == 'center')) {
-				$snm = intval(($len - $strlen) / 2);
-				if (($strlen + ($snm * 2)) == $len) {
-					$result = str_repeat($fill, $snm).$str;
+      } elseif (($align == 'c') || ($align == 'center')) {
+        $snm = intval(($len - $strlen) / 2);
+        if (($strlen + ($snm * 2)) == $len) {
+          $result = str_repeat($fill, $snm).$str;
 
-				} else {
-					$result = str_repeat($fill, $snm + 1).$str;
-				}
-				$result.= str_repeat($fill, $snm);
-			}
-			return $result;
-		}
-	}
+        } else {
+          $result = str_repeat($fill, $snm + 1).$str;
+        }
+        $result.= str_repeat($fill, $snm);
+      }
+      return $result;
+    }
+  }
 }
 ?>

classes/testing.class.php

@@ -1,150 +1,150 @@
 <?
 
 class Testing {
-	private static $ClassDirectories = array("classes");
-	private static $Classes = array();
-
-	/**
-	 * Initialize the testasble classes into a map keyed by class name
-	 */
-	public static function init() {
-		self::load_classes();
-	}
-
-	/**
-	 * Gets the class
-	 */
-	public static function get_classes() {
-		return self::$Classes;
-	}
-
-	/**
-	 * Loads all the classes within given directories
-	 */
-	private static function load_classes() {
-		foreach (self::$ClassDirectories as $Directory)  {
-			$Directory = SERVER_ROOT . "/" . $Directory . "/";
-			foreach (glob($Directory . "*.php") as $FileName) {
-				self::get_class_name($FileName);
-			}
-		}
-	}
-
-	/**
-	 * Gets the class and adds into the map
-	 */
-	private static function get_class_name($FileName) {
-		$Tokens = token_get_all(file_get_contents($FileName));
-		$IsTestable = false;
-		$IsClass = false;
-
-		foreach ($Tokens as $Token) {
-			if (is_array($Token)) {
-				if (!$IsTestable && $Token[0] == T_DOC_COMMENT && strpos($Token[1], "@TestClass")) {
-					$IsTestable = true;
-				}
-				if ($IsTestable && $Token[0] == T_CLASS) {
-					$IsClass = true;
-				} else if ($IsClass && $Token[0] == T_STRING) {
-					$ReflectionClass = new ReflectionClass($Token[1]);
-					if (count(self::get_testable_methods($ReflectionClass))) {
-						self::$Classes[$Token[1]] = new ReflectionClass($Token[1]);
-					}
-					$IsTestable = false;
-					$IsClass = false;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Checks if class exists in the map
-	 */
-	public static function has_class($Class) {
-		return array_key_exists($Class, self::$Classes);
-	}
-
-	/**
-	 * Checks if class has a given testable methood
-	 */
-	public static function has_testable_method($Class, $Method) {
-		$TestableMethods = self::get_testable_methods($Class);
-		foreach($TestableMethods as $TestMethod) {
-			if ($TestMethod->getName() === $Method) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get testable methods in a class, a testable method has a @Test
-	 */
-	public static function get_testable_methods($Class) {
-		if (is_string($Class)) {
-			$ReflectionClass = self::$Classes[$Class];
-		} else {
-			$ReflectionClass = $Class;
-		}
-		$ReflectionMethods = $ReflectionClass->getMethods();
-		$TestableMethods = array();
-		foreach($ReflectionMethods as $Method) {
-			if ($Method->isPublic() && $Method->isStatic() && strpos($Method->getDocComment(), "@Test")) {
-				$TestableMethods[] = $Method;
-			}
-		}
-		return $TestableMethods;
-	}
-
-
-	/**
-	 * Get the class comment
-	 */
-	public static function get_class_comment($Class) {
-		$ReflectionClass = self::$Classes[$Class];
-		return trim(str_replace(array("@TestClass", "*", "/"), "", $ReflectionClass->getDocComment()));
-	}
-
-	/**
-	 * Get the undocumented methods in a class
-	 */
-	public static function get_undocumented_methods($Class) {
-		$ReflectionClass = self::$Classes[$Class];
-		$Methods = array();
-		foreach($ReflectionClass->getMethods() as $Method) {
-			if (!$Method->getDocComment()) {
-				$Methods[] = $Method;
-			}
-		}
-		return $Methods;
-	}
-
-	/**
-	 * Get the documented methods
-	 */
-	public static function get_documented_methods($Class)  {
-		$ReflectionClass = self::$Classes[$Class];
-		$Methods = array();
-		foreach($ReflectionClass->getMethods() as $Method) {
-			if ($Method->getDocComment()) {
-				$Methods[] = $Method;
-			}
-		}
-		return $Methods;
-	}
-
-	/**
-	 * Get all methods in a class
-	 */
-	public static function get_methods($Class) {
-		return self::$Classes[$Class]->getMethods();
-	}
-
-	/**
-	 * Get a method  comment
-	 */
-	public static function get_method_comment($Method) {
-		return trim(str_replace(array("*", "/"), "", $Method->getDocComment()));
-	}
+  private static $ClassDirectories = array("classes");
+  private static $Classes = array();
+
+  /**
+   * Initialize the testasble classes into a map keyed by class name
+   */
+  public static function init() {
+    self::load_classes();
+  }
+
+  /**
+   * Gets the class
+   */
+  public static function get_classes() {
+    return self::$Classes;
+  }
+
+  /**
+   * Loads all the classes within given directories
+   */
+  private static function load_classes() {
+    foreach (self::$ClassDirectories as $Directory)  {
+      $Directory = SERVER_ROOT . "/" . $Directory . "/";
+      foreach (glob($Directory . "*.php") as $FileName) {
+        self::get_class_name($FileName);
+      }
+    }
+  }
+
+  /**
+   * Gets the class and adds into the map
+   */
+  private static function get_class_name($FileName) {
+    $Tokens = token_get_all(file_get_contents($FileName));
+    $IsTestable = false;
+    $IsClass = false;
+
+    foreach ($Tokens as $Token) {
+      if (is_array($Token)) {
+        if (!$IsTestable && $Token[0] == T_DOC_COMMENT && strpos($Token[1], "@TestClass")) {
+          $IsTestable = true;
+        }
+        if ($IsTestable && $Token[0] == T_CLASS) {
+          $IsClass = true;
+        } else if ($IsClass && $Token[0] == T_STRING) {
+          $ReflectionClass = new ReflectionClass($Token[1]);
+          if (count(self::get_testable_methods($ReflectionClass))) {
+            self::$Classes[$Token[1]] = new ReflectionClass($Token[1]);
+          }
+          $IsTestable = false;
+          $IsClass = false;
+        }
+      }
+    }
+  }
+
+  /**
+   * Checks if class exists in the map
+   */
+  public static function has_class($Class) {
+    return array_key_exists($Class, self::$Classes);
+  }
+
+  /**
+   * Checks if class has a given testable methood
+   */
+  public static function has_testable_method($Class, $Method) {
+    $TestableMethods = self::get_testable_methods($Class);
+    foreach($TestableMethods as $TestMethod) {
+      if ($TestMethod->getName() === $Method) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Get testable methods in a class, a testable method has a @Test
+   */
+  public static function get_testable_methods($Class) {
+    if (is_string($Class)) {
+      $ReflectionClass = self::$Classes[$Class];
+    } else {
+      $ReflectionClass = $Class;
+    }
+    $ReflectionMethods = $ReflectionClass->getMethods();
+    $TestableMethods = array();
+    foreach($ReflectionMethods as $Method) {
+      if ($Method->isPublic() && $Method->isStatic() && strpos($Method->getDocComment(), "@Test")) {
+        $TestableMethods[] = $Method;
+      }
+    }
+    return $TestableMethods;
+  }
+
+
+  /**
+   * Get the class comment
+   */
+  public static function get_class_comment($Class) {
+    $ReflectionClass = self::$Classes[$Class];
+    return trim(str_replace(array("@TestClass", "*", "/"), "", $ReflectionClass->getDocComment()));
+  }
+
+  /**
+   * Get the undocumented methods in a class
+   */
+  public static function get_undocumented_methods($Class) {
+    $ReflectionClass = self::$Classes[$Class];
+    $Methods = array();
+    foreach($ReflectionClass->getMethods() as $Method) {
+      if (!$Method->getDocComment()) {
+        $Methods[] = $Method;
+      }
+    }
+    return $Methods;
+  }
+
+  /**
+   * Get the documented methods
+   */
+  public static function get_documented_methods($Class)  {
+    $ReflectionClass = self::$Classes[$Class];
+    $Methods = array();
+    foreach($ReflectionClass->getMethods() as $Method) {
+      if ($Method->getDocComment()) {
+        $Methods[] = $Method;
+      }
+    }
+    return $Methods;
+  }
+
+  /**
+   * Get all methods in a class
+   */
+  public static function get_methods($Class) {
+    return self::$Classes[$Class]->getMethods();
+  }
+
+  /**
+   * Get a method  comment
+   */
+  public static function get_method_comment($Method) {
+    return trim(str_replace(array("*", "/"), "", $Method->getDocComment()));
+  }
 
 }

classes/testingview.class.php

@@ -1,175 +1,175 @@
 <?
 
 class TestingView {
-	/**
-	 * Render the linkbox
-	 */
-	public static function render_linkbox($Page) { ?>
-		<div class="linkbox">
-<?			if ($Page != "classes") { ?>
-				<a href="testing.php" class="brackets">Classes</a>
-<?			}
-			if ($Page != "comments") { ?>
-				<a href="testing.php?action=comments" class="brackets">Comments</a>
-<?			} ?>
-		</div>
-<?	}
+  /**
+   * Render the linkbox
+   */
+  public static function render_linkbox($Page) { ?>
+    <div class="linkbox">
+<?      if ($Page != "classes") { ?>
+        <a href="testing.php" class="brackets">Classes</a>
+<?      }
+      if ($Page != "comments") { ?>
+        <a href="testing.php?action=comments" class="brackets">Comments</a>
+<?      } ?>
+    </div>
+<?  }
 
-	/**
-	 * Render a list of classes
-	 */
-	public static function render_classes($Classes) { ?>
-		<table>
-			<tr class="colhead">
-				<td>
-					Class
-				</td>
-				<td>
-					Testable functions
-				</td>
-			</tr>
-<?			foreach($Classes as $Key => $Value) {
-				$Doc = Testing::get_class_comment($Key);
-				$Methods = count(Testing::get_testable_methods($Key));
+  /**
+   * Render a list of classes
+   */
+  public static function render_classes($Classes) { ?>
+    <table>
+      <tr class="colhead">
+        <td>
+          Class
+        </td>
+        <td>
+          Testable functions
+        </td>
+      </tr>
+<?      foreach($Classes as $Key => $Value) {
+        $Doc = Testing::get_class_comment($Key);
+        $Methods = count(Testing::get_testable_methods($Key));
 ?>
-				<tr>
-					<td>
-						<a href="testing.php?action=class&amp;name=<?=$Key?>" class="tooltip" title="<?=$Doc?>"><?=$Key?></a>
-					</td>
-					<td>
-						<?=$Methods?>
-					</td>
-				</tr>
-<?			} ?>
-		</table>
-<?	}
+        <tr>
+          <td>
+            <a href="testing.php?action=class&amp;name=<?=$Key?>" class="tooltip" title="<?=$Doc?>"><?=$Key?></a>
+          </td>
+          <td>
+            <?=$Methods?>
+          </td>
+        </tr>
+<?      } ?>
+    </table>
+<?  }
 
-	/**
-	 * Render functions in a class
-	 */
-	public static function render_functions($Methods) {
-		foreach($Methods as $Index => $Method) {
-			$ClassName = $Method->getDeclaringClass()->getName();
-			$MethodName = $Method->getName();
+  /**
+   * Render functions in a class
+   */
+  public static function render_functions($Methods) {
+    foreach($Methods as $Index => $Method) {
+      $ClassName = $Method->getDeclaringClass()->getName();
+      $MethodName = $Method->getName();
 ?>
-			<div class="box box2">
-				<div class="head">
-					<span><?=self::render_method_definition($Method)?></span>
-					<span style="float: right;">
-						<a href="#" class="brackets" onclick="$('#method_params_<?=$Index?>').gtoggle(); return false;">Params</a>
-						<a href="#" class="brackets run" data-gazelle-id="<?=$Index?>" data-gazelle-class="<?=$ClassName?>" data-gazelle-method="<?=$MethodName?>">Run</a>
-					</span>
-				</div>
-				<div class="pad hidden" id="method_params_<?=$Index?>">
-					<?self::render_method_params($Method);?>
-				</div>
-				<div class="pad hidden" id="method_results_<?=$Index?>">
-				</div>
-			</div>
-<?		}
-	}
+      <div class="box box2">
+        <div class="head">
+          <span><?=self::render_method_definition($Method)?></span>
+          <span style="float: right;">
+            <a href="#" class="brackets" onclick="$('#method_params_<?=$Index?>').gtoggle(); return false;">Params</a>
+            <a href="#" class="brackets run" data-gazelle-id="<?=$Index?>" data-gazelle-class="<?=$ClassName?>" data-gazelle-method="<?=$MethodName?>">Run</a>
+          </span>
+        </div>
+        <div class="pad hidden" id="method_params_<?=$Index?>">
+          <?self::render_method_params($Method);?>
+        </div>
+        <div class="pad hidden" id="method_results_<?=$Index?>">
+        </div>
+      </div>
+<?    }
+  }
 
-	/**
-	 * Render method parameters
-	 */
-	private static function render_method_params($Method) { ?>
-		<table>
-<?		foreach($Method->getParameters() as $Parameter) {
-			$DefaultValue = $Parameter->isDefaultValueAvailable() ? $Parameter->getDefaultValue() : "";
+  /**
+   * Render method parameters
+   */
+  private static function render_method_params($Method) { ?>
+    <table>
+<?    foreach($Method->getParameters() as $Parameter) {
+      $DefaultValue = $Parameter->isDefaultValueAvailable() ? $Parameter->getDefaultValue() : "";
 ?>
-			<tr>
-				<td class="label">
-					<?=$Parameter->getName()?>
-				</td>
-				<td>
-					<input type="text" name="<?=$Parameter->getName()?>" value="<?=$DefaultValue?>"/>
-				</td>
-			</tr>
-<?		} ?>
-		</table>
-<?	}
+      <tr>
+        <td class="label">
+          <?=$Parameter->getName()?>
+        </td>
+        <td>
+          <input type="text" name="<?=$Parameter->getName()?>" value="<?=$DefaultValue?>"/>
+        </td>
+      </tr>
+<?    } ?>
+    </table>
+<?  }
 
-	/**
-	 * Render the method definition
-	 */
-	private static function render_method_definition($Method) {
-		$Title = "<span class='tooltip' title='" . Testing::get_method_comment($Method) . "'>" . $Method->getName() . "</span> (";
-		foreach($Method->getParameters() as $Parameter) {
-			$Color = "red";
-			if ($Parameter->isDefaultValueAvailable()) {
-				$Color = "green";
-			}
-			$Title .= "<span style='color: $Color'>";
-			$Title .= "$" . $Parameter->getName();
-			if ($Parameter->isDefaultValueAvailable()) {
-				$Title .= " = " . $Parameter->getDefaultValue();
-			}
-			$Title .= "</span>";
-			$Title .= ", ";
+  /**
+   * Render the method definition
+   */
+  private static function render_method_definition($Method) {
+    $Title = "<span class='tooltip' title='" . Testing::get_method_comment($Method) . "'>" . $Method->getName() . "</span> (";
+    foreach($Method->getParameters() as $Parameter) {
+      $Color = "red";
+      if ($Parameter->isDefaultValueAvailable()) {
+        $Color = "green";
+      }
+      $Title .= "<span style='color: $Color'>";
+      $Title .= "$" . $Parameter->getName();
+      if ($Parameter->isDefaultValueAvailable()) {
+        $Title .= " = " . $Parameter->getDefaultValue();
+      }
+      $Title .= "</span>";
+      $Title .= ", ";
 
-		}
-		$Title = rtrim($Title, ", ");
-		$Title .= ")";
-		return $Title;
-	}
+    }
+    $Title = rtrim($Title, ", ");
+    $Title .= ")";
+    return $Title;
+  }
 
-	/**
-	 * Renders class documentation stats
-	 */
-	public static function render_missing_documentation($Classes) { ?>
-		<table>
-			<tr class="colhead">
-				<td>
-					Class
-				</td>
-				<td>
-					Class documented
-				</td>
-				<td>
-					Undocumented functions
-				</td>
-				<td>
-					Documented functions
-				</td>
-			</tr>
-<?			foreach($Classes as $Key => $Value) {
-				$ClassComment = Testing::get_class_comment($Key);
+  /**
+   * Renders class documentation stats
+   */
+  public static function render_missing_documentation($Classes) { ?>
+    <table>
+      <tr class="colhead">
+        <td>
+          Class
+        </td>
+        <td>
+          Class documented
+        </td>
+        <td>
+          Undocumented functions
+        </td>
+        <td>
+          Documented functions
+        </td>
+      </tr>
+<?      foreach($Classes as $Key => $Value) {
+        $ClassComment = Testing::get_class_comment($Key);
 ?>
-				<tr>
-					<td>
-						<?=$Key?>
-					</td>
-					<td>
-						<?=!empty($ClassComment) ? "Yes" : "No"?>
-					<td>
-						<?=count(Testing::get_undocumented_methods($Key))?>
-					</td>
-					<td>
-						<?=count(Testing::get_documented_methods($Key))?>
-					</td>
-				</tr>
-<?			} ?>
-		</table>
-<?	}
+        <tr>
+          <td>
+            <?=$Key?>
+          </td>
+          <td>
+            <?=!empty($ClassComment) ? "Yes" : "No"?>
+          <td>
+            <?=count(Testing::get_undocumented_methods($Key))?>
+          </td>
+          <td>
+            <?=count(Testing::get_documented_methods($Key))?>
+          </td>
+        </tr>
+<?      } ?>
+    </table>
+<?  }
 
-	/**
-	 * Pretty print any data
-	 */
-	public static function render_results($Data) {
-		$Results = '<pre><ul style="list-style-type: none">';
-		if (is_array($Data)) {
-			foreach ($Data as $Key => $Value){
-				if (is_array($Value)){
-					$Results .= '<li>' . $Key . ' => ' . self::render_results($Value) . '</li>';
-				} else{
-					$Results .= '<li>' . $Key . ' => ' . $Value . '</li>';
-				}
-			}
-		} else {
-			$Results .= '<li>' . $Data . '</li>';
-		}
-		$Results .= '</ul></pre>';
-		echo $Results;
-	}
+  /**
+   * Pretty print any data
+   */
+  public static function render_results($Data) {
+    $Results = '<pre><ul style="list-style-type: none">';
+    if (is_array($Data)) {
+      foreach ($Data as $Key => $Value){
+        if (is_array($Value)){
+          $Results .= '<li>' . $Key . ' => ' . self::render_results($Value) . '</li>';
+        } else{
+          $Results .= '<li>' . $Key . ' => ' . $Value . '</li>';
+        }
+      }
+    } else {
+      $Results .= '<li>' . $Data . '</li>';
+    }
+    $Results .= '</ul></pre>';
+    echo $Results;
+  }
 
 }

classes/textarea_preview.class.php

@@ -4,71 +4,71 @@
  * generate the required JavaScript that enables the previews to work.
  */
 class TEXTAREA_PREVIEW_SUPER {
-	/**
-	 * @static
-	 * @var int $Textareas Total number of textareas created
-	 */
-	protected static $Textareas = 0;
-
-	/**
-	 * @static
-	 * @var array $_ID Array of textarea IDs
-	 */
-	protected static $_ID = array();
-
-	/**
-	 * @static
-	 * @var bool For use in JavaScript method
-	 */
-	private static $Exectuted = false;
-
-	/**
-	 * This method should only run once with $all as true and should be placed
-	 * in the header or footer.
-	 *
-	 * If $all is true, it includes TextareaPreview and jQuery
-	 *
-	 * jQuery is required for this to work, include it in the headers.
-	 *
-	 * @static
-	 * @param bool $all Output all required scripts, otherwise just do iterator()
-	 * @example <pre><?php TEXT_PREVIEW::JavaScript(); ?></pre>
-	 * @return void
-	 */
-	public static function JavaScript ($all = true) {
-		if (self::$Textareas === 0) {
-			return;
-		}
-		if (self::$Exectuted === false && $all) {
-			View::parse('generic/textarea/script.phtml');
-		}
-
-		self::$Exectuted = true;
-		self::iterator();
-	}
-
-	/**
-	 * This iterator generates JavaScript to initialize each JavaScript
-	 * TextareaPreview object.
-	 *
-	 * It will generate a numeric or custom ID related to the textarea.
-	 * @static
-	 * @return void
-	 */
-	private static function iterator() {
-		$script = array();
-		for ($i = 0; $i < self::$Textareas; $i++) {
-			if (isset(self::$_ID[$i]) && is_string(self::$_ID[$i])) {
-				$a = sprintf('%d, "%s"', $i, self::$_ID[$i]);
-			} else {
-				$a = $i;
-			}
-			$script[] = sprintf('[%s]', $a);
-		}
-		if (!empty($script)) {
-			View::parse('generic/textarea/script_factory.phtml', array('script' => join(', ', $script)));
-		}
-	}
+  /**
+   * @static
+   * @var int $Textareas Total number of textareas created
+   */
+  protected static $Textareas = 0;
+
+  /**
+   * @static
+   * @var array $_ID Array of textarea IDs
+   */
+  protected static $_ID = array();
+
+  /**
+   * @static
+   * @var bool For use in JavaScript method
+   */
+  private static $Exectuted = false;
+
+  /**
+   * This method should only run once with $all as true and should be placed
+   * in the header or footer.
+   *
+   * If $all is true, it includes TextareaPreview and jQuery
+   *
+   * jQuery is required for this to work, include it in the headers.
+   *
+   * @static
+   * @param bool $all Output all required scripts, otherwise just do iterator()
+   * @example <pre><?php TEXT_PREVIEW::JavaScript(); ?></pre>
+   * @return void
+   */
+  public static function JavaScript ($all = true) {
+    if (self::$Textareas === 0) {
+      return;
+    }
+    if (self::$Exectuted === false && $all) {
+      View::parse('generic/textarea/script.phtml');
+    }
+
+    self::$Exectuted = true;
+    self::iterator();
+  }
+
+  /**
+   * This iterator generates JavaScript to initialize each JavaScript
+   * TextareaPreview object.
+   *
+   * It will generate a numeric or custom ID related to the textarea.
+   * @static
+   * @return void
+   */
+  private static function iterator() {
+    $script = array();
+    for ($i = 0; $i < self::$Textareas; $i++) {
+      if (isset(self::$_ID[$i]) && is_string(self::$_ID[$i])) {
+        $a = sprintf('%d, "%s"', $i, self::$_ID[$i]);
+      } else {
+        $a = $i;
+      }
+      $script[] = sprintf('[%s]', $a);
+    }
+    if (!empty($script)) {
+      View::parse('generic/textarea/script_factory.phtml', array('script' => join(', ', $script)));
+    }
+  }
 }
 
 /**
@@ -87,7 +87,7 @@ class TEXTAREA_PREVIEW_SUPER {
  *  // no buttons or wrap preview divs.
  *  // Buttons and preview divs are generated manually
  *  $text = new TEXTAREA_PREVIEW('body_text', 'body_text', 'default text',
- *					50, 20, false, false, array('disabled="disabled"', 'class="text"'));
+ *          50, 20, false, false, array('disabled="disabled"', 'class="text"'));
  *
  *  $text->buttons(); // output buttons
  *
@@ -100,121 +100,121 @@ class TEXTAREA_PREVIEW_SUPER {
  *
  * // some template
  * <div id="preview_wrap_<?=$id?>">
- *		<table>
- *			<tr>
- *				<td>
- *					<div id="preview_<?=$id?>"></div>
- *				</td>
- *			</tr>
- *		</table>
+ *    <table>
+ *      <tr>
+ *        <td>
+ *          <div id="preview_<?=$id?>"></div>
+ *        </td>
+ *      </tr>
+ *    </table>
  * </div>
  * </pre>
  */
 class TEXTAREA_PREVIEW extends TEXTAREA_PREVIEW_SUPER {
-	/**
-	 * @var int Unique ID
-	 */
-	private $id;
-
-	/**
-	 * Flag for preview output
-	 * @var bool $preview
-	 */
-	private $preview = false;
-
-	/**
-	 * String table
-	 * @var string Buffer
-	 */
-	private $buffer = null;
-
-	/**
-	 * This method creates a textarea
-	 *
-	 * @param string $Name		name attribute
-	 * @param string $ID		id attribute
-	 * @param string $Value		default text attribute
-	 * @param string $Cols		cols attribute
-	 * @param string $Rows		rows attribute
-	 * @param bool   $Preview	add the preview divs near the textarea
-	 * @param bool   $Buttons	add the edit/preview buttons near the textarea
-	 * @param bool   $Buffer	doesn't output the textarea, use getBuffer()
-	 * @param array  $ExtraAttributes	array of attribute="value"
-	 *
-	 * If false for $Preview, $Buttons, or $Buffer, use the appropriate
-	 * methods to add the those elements manually. Alternatively, use getID
-	 * to create your own.
-	 *
-	 * It's important to have the right IDs as they make the JS function properly.
-	 */
-	public function __construct($Name, $ID = '', $Value = '', $Cols = 50, $Rows = 10,
-		$Preview = true, $Buttons = true, $Buffer = false,
-		array $ExtraAttributes = array()
-	) {
-		$this->id = parent::$Textareas;
-		parent::$Textareas += 1;
-		array_push(parent::$_ID, $ID);
-
-		if (empty($ID)) {
-			$ID = 'quickpost_' . $this->id;
-		}
-
-		if (!empty($ExtraAttributes)) {
-			$Attributes = ' ' . implode(' ', $ExtraAttributes);
-		} else {
-			$Attributes = '';
-		}
-
-		if ($Preview === true) {
-			$this->preview();
-		}
-
-		$this->buffer = View::parse('generic/textarea/textarea.phtml', array(
-			'ID' => $ID,
-			'NID' => $this->id,
-			'Name' => &$Name,
-			'Value' => &$Value,
-			'Cols' => &$Cols,
-			'Rows' => &$Rows,
-			'Attributes' => &$Attributes
-		), $Buffer);
-
-		if ($Buttons === true) {
-			$this->buttons();
-		}
-	}
-
-	/**
-	 * Outputs the divs required for previewing the AJAX content
-	 * Will only output once
-	 */
-	public function preview() {
-		if (!$this->preview) {
-			View::parse('generic/textarea/preview.phtml', array('ID' => $this->id));
-		}
-		$this->preview = true;
-	}
-
-	/**
-	 * Outputs the preview and edit buttons
-	 * Can be called many times to place buttons in different areas
-	 */
-	public function buttons() {
-		View::parse('generic/textarea/buttons.phtml', array('ID' => $this->id));
-	}
-
-	/**
-	 * Returns the textarea's numeric ID.
-	 */
-	public function getID() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns textarea string when buffer is enabled in the constructor
-	 * @return string
-	 */
-	public function getBuffer() {
-		return $this->buffer;
-	}
+  /**
+   * @var int Unique ID
+   */
+  private $id;
+
+  /**
+   * Flag for preview output
+   * @var bool $preview
+   */
+  private $preview = false;
+
+  /**
+   * String table
+   * @var string Buffer
+   */
+  private $buffer = null;
+
+  /**
+   * This method creates a textarea
+   *
+   * @param string $Name    name attribute
+   * @param string $ID    id attribute
+   * @param string $Value    default text attribute
+   * @param string $Cols    cols attribute
+   * @param string $Rows    rows attribute
+   * @param bool   $Preview  add the preview divs near the textarea
+   * @param bool   $Buttons  add the edit/preview buttons near the textarea
+   * @param bool   $Buffer  doesn't output the textarea, use getBuffer()
+   * @param array  $ExtraAttributes  array of attribute="value"
+   *
+   * If false for $Preview, $Buttons, or $Buffer, use the appropriate
+   * methods to add the those elements manually. Alternatively, use getID
+   * to create your own.
+   *
+   * It's important to have the right IDs as they make the JS function properly.
+   */
+  public function __construct($Name, $ID = '', $Value = '', $Cols = 50, $Rows = 10,
+    $Preview = true, $Buttons = true, $Buffer = false,
+    array $ExtraAttributes = array()
+  ) {
+    $this->id = parent::$Textareas;
+    parent::$Textareas += 1;
+    array_push(parent::$_ID, $ID);
+
+    if (empty($ID)) {
+      $ID = 'quickpost_' . $this->id;
+    }
+
+    if (!empty($ExtraAttributes)) {
+      $Attributes = ' ' . implode(' ', $ExtraAttributes);
+    } else {
+      $Attributes = '';
+    }
+
+    if ($Preview === true) {
+      $this->preview();
+    }
+
+    $this->buffer = View::parse('generic/textarea/textarea.phtml', array(
+      'ID' => $ID,
+      'NID' => $this->id,
+      'Name' => &$Name,
+      'Value' => &$Value,
+      'Cols' => &$Cols,
+      'Rows' => &$Rows,
+      'Attributes' => &$Attributes
+    ), $Buffer);
+
+    if ($Buttons === true) {
+      $this->buttons();
+    }
+  }
+
+  /**
+   * Outputs the divs required for previewing the AJAX content
+   * Will only output once
+   */
+  public function preview() {
+    if (!$this->preview) {
+      View::parse('generic/textarea/preview.phtml', array('ID' => $this->id));
+    }
+    $this->preview = true;
+  }
+
+  /**
+   * Outputs the preview and edit buttons
+   * Can be called many times to place buttons in different areas
+   */
+  public function buttons() {
+    View::parse('generic/textarea/buttons.phtml', array('ID' => $this->id));
+  }
+
+  /**
+   * Returns the textarea's numeric ID.
+   */
+  public function getID() {
+    return $this->id;
+  }
+
+  /**
+   * Returns textarea string when buffer is enabled in the constructor
+   * @return string
+   */
+  public function getBuffer() {
+    return $this->buffer;
+  }
 }

classes/tools.class.php

@@ -1,45 +1,45 @@
 <?
 class Tools {
-	/**
-	 * Returns true if given IP is banned.
-	 *
-	 * @param string $IP
-	 */
-	public static function site_ban_ip($IP) {
-		global $Debug;
-		$A = substr($IP, 0, strcspn($IP, '.'));
-		$IPNum = Tools::ip_to_unsigned($IP);
-		$IPBans = G::$Cache->get_value('ip_bans_'.$A);
-		if (!is_array($IPBans)) {
-			$SQL = sprintf("
-				SELECT ID, FromIP, ToIP
-				FROM ip_bans
-				WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1);
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query($SQL);
-			$IPBans = G::$DB->to_array(0, MYSQLI_NUM);
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0);
-		}
-		$Debug->log_var($IPBans, 'IP bans for class '.$A);
-		foreach ($IPBans as $Index => $IPBan) {
-			list ($ID, $FromIP, $ToIP) = $IPBan;
-			if ($IPNum >= $FromIP && $IPNum <= $ToIP) {
-				return true;
-			}
-		}
+  /**
+   * Returns true if given IP is banned.
+   *
+   * @param string $IP
+   */
+  public static function site_ban_ip($IP) {
+    global $Debug;
+    $A = substr($IP, 0, strcspn($IP, '.'));
+    $IPNum = Tools::ip_to_unsigned($IP);
+    $IPBans = G::$Cache->get_value('ip_bans_'.$A);
+    if (!is_array($IPBans)) {
+      $SQL = sprintf("
+        SELECT ID, FromIP, ToIP
+        FROM ip_bans
+        WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1);
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query($SQL);
+      $IPBans = G::$DB->to_array(0, MYSQLI_NUM);
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0);
+    }
+    $Debug->log_var($IPBans, 'IP bans for class '.$A);
+    foreach ($IPBans as $Index => $IPBan) {
+      list ($ID, $FromIP, $ToIP) = $IPBan;
+      if ($IPNum >= $FromIP && $IPNum <= $ToIP) {
+        return true;
+      }
+    }
 
-		return false;
-	}
+    return false;
+  }
 
-	/**
-	 * Returns the unsigned form of an IP address.
-	 *
-	 * @param string $IP The IP address x.x.x.x
-	 * @return string the long it represents.
-	 */
-	public static function ip_to_unsigned($IP) {
-		$IPnum = sprintf('%u', ip2long($IP));
+  /**
+   * Returns the unsigned form of an IP address.
+   *
+   * @param string $IP The IP address x.x.x.x
+   * @return string the long it represents.
+   */
+  public static function ip_to_unsigned($IP) {
+    $IPnum = sprintf('%u', ip2long($IP));
     if (!$IPnum) {
       // Try to encode as IPv6 (stolen from stackoverflow)
       // Note that this is *wrong* and because of PHP's wankery stops being accurate after the most significant 16 digits or so
@@ -50,264 +50,264 @@ class Tools {
       }
       $IPnum = base_convert(ltrim($IPnum, '0'), 2, 10);
     }
-		return $IPnum;
-	}
+    return $IPnum;
+  }
 
-	/**
-	 * Geolocate an IP address using the database
-	 *
-	 * @param $IP the ip to fetch the country for
-	 * @return the country of origin
-	 */
-	public static function geoip($IP) {
-		static $IPs = array();
-		if (isset($IPs[$IP])) {
-			return $IPs[$IP];
-		}
-		if (is_number($IP)) {
-			$Long = $IP;
-		} else {
-			$Long = Tools::ip_to_unsigned($IP);
-		}
-		if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
-			return false;
-		}
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT EndIP, Code
-			FROM geoip_country
-			WHERE $Long >= StartIP
-			ORDER BY StartIP DESC
-			LIMIT 1");
-		if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) {
-			$Country = '?';
-		}
-		G::$DB->set_query_id($QueryID);
-		$IPs[$IP] = $Country;
-		return $Country;
-	}
+  /**
+   * Geolocate an IP address using the database
+   *
+   * @param $IP the ip to fetch the country for
+   * @return the country of origin
+   */
+  public static function geoip($IP) {
+    static $IPs = array();
+    if (isset($IPs[$IP])) {
+      return $IPs[$IP];
+    }
+    if (is_number($IP)) {
+      $Long = $IP;
+    } else {
+      $Long = Tools::ip_to_unsigned($IP);
+    }
+    if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
+      return false;
+    }
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT EndIP, Code
+      FROM geoip_country
+      WHERE $Long >= StartIP
+      ORDER BY StartIP DESC
+      LIMIT 1");
+    if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) {
+      $Country = '?';
+    }
+    G::$DB->set_query_id($QueryID);
+    $IPs[$IP] = $Country;
+    return $Country;
+  }
 
-	/**
-	 * Gets the hostname for an IP address
-	 *
-	 * @param $IP the IP to get the hostname for
-	 * @return hostname fetched
-	 */
-	public static function get_host_by_ip($IP) {
-		$testar = explode('.', $IP);
-		if (count($testar) != 4) {
-			return $IP;
-		}
-		for ($i = 0; $i < 4; ++$i) {
-			if (!is_numeric($testar[$i])) {
-				return $IP;
-			}
-		}
+  /**
+   * Gets the hostname for an IP address
+   *
+   * @param $IP the IP to get the hostname for
+   * @return hostname fetched
+   */
+  public static function get_host_by_ip($IP) {
+    $testar = explode('.', $IP);
+    if (count($testar) != 4) {
+      return $IP;
+    }
+    for ($i = 0; $i < 4; ++$i) {
+      if (!is_numeric($testar[$i])) {
+        return $IP;
+      }
+    }
 
-		$host = `host -W 1 $IP`;
-		return ($host ? end(explode(' ', $host)) : $IP);
-	}
+    $host = `host -W 1 $IP`;
+    return ($host ? end(explode(' ', $host)) : $IP);
+  }
 
-	/**
-	 * Gets an hostname using AJAX
-	 *
-	 * @param $IP the IP to fetch
-	 * @return a span with JavaScript code
-	 */
-	public static function get_host_by_ajax($IP) {
-		static $ID = 0;
-		++$ID;
-		return '<span id="host_'.$ID.'">Resolving host...<script type="text/javascript">ajax.get(\'tools.php?action=get_host&ip='.$IP.'\',function(host) {$(\'#host_'.$ID.'\').raw().innerHTML=host;});</script></span>';
-	}
+  /**
+   * Gets an hostname using AJAX
+   *
+   * @param $IP the IP to fetch
+   * @return a span with JavaScript code
+   */
+  public static function get_host_by_ajax($IP) {
+    static $ID = 0;
+    ++$ID;
+    return '<span id="host_'.$ID.'">Resolving host...<script type="text/javascript">ajax.get(\'tools.php?action=get_host&ip='.$IP.'\',function(host) {$(\'#host_'.$ID.'\').raw().innerHTML=host;});</script></span>';
+  }
 
 
-	/**
-	 * Looks up the full host of an IP address, by system call.
-	 * Used as the server-side counterpart to get_host_by_ajax.
-	 *
-	 * @param string $IP The IP address to look up.
-	 * @return string the host.
-	 */
-	public static function lookup_ip($IP) {
-		//TODO: use the G::$Cache
-		$Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
-		if (count($Output) == 1 && empty($Output[0])) {
-			//No output at all implies the command failed
-			return '';
-		}
+  /**
+   * Looks up the full host of an IP address, by system call.
+   * Used as the server-side counterpart to get_host_by_ajax.
+   *
+   * @param string $IP The IP address to look up.
+   * @return string the host.
+   */
+  public static function lookup_ip($IP) {
+    //TODO: use the G::$Cache
+    $Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
+    if (count($Output) == 1 && empty($Output[0])) {
+      //No output at all implies the command failed
+      return '';
+    }
 
-		if (count($Output) != 5) {
-			return false;
-		} else {
-			return trim($Output[4]);
-		}
-	}
+    if (count($Output) != 5) {
+      return false;
+    } else {
+      return trim($Output[4]);
+    }
+  }
 
-	/**
-	 * Format an IP address with links to IP history.
-	 *
-	 * @param string IP
-	 * @return string The HTML
-	 */
-	public static function display_ip($IP) {
-		$Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
-		$Line .= '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets tooltip">S</a>';
+  /**
+   * Format an IP address with links to IP history.
+   *
+   * @param string IP
+   * @return string The HTML
+   */
+  public static function display_ip($IP) {
+    $Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
+    $Line .= '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets tooltip">S</a>';
 
-		return $Line;
-	}
+    return $Line;
+  }
 
-	public static function get_country_code_by_ajax($IP) {
-		static $ID = 0;
-		++$ID;
-		return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\', function(cc) {$(\'#cc_'.$ID.'\').raw().innerHTML = cc;});</script></span>';
-	}
+  public static function get_country_code_by_ajax($IP) {
+    static $ID = 0;
+    ++$ID;
+    return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\', function(cc) {$(\'#cc_'.$ID.'\').raw().innerHTML = cc;});</script></span>';
+  }
 
 
-	/**
-	 * Disable an array of users.
-	 *
-	 * @param array $UserIDs (You can also send it one ID as an int, because fuck types)
-	 * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
-	 */
-	public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
-		$QueryID = G::$DB->get_query_id();
-		if (!is_array($UserIDs)) {
-			$UserIDs = array($UserIDs);
-		}
-		G::$DB->query("
-			UPDATE users_info AS i
-				JOIN users_main AS m ON m.ID = i.UserID
-			SET m.Enabled = '2',
-				m.can_leech = '0',
-				i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
-				i.BanDate = '".sqltime()."',
-				i.BanReason = '$BanReason',
-				i.RatioWatchDownload = ".($BanReason == 2 ? 'm.Downloaded' : "'0'")."
-			WHERE m.ID IN(".implode(',', $UserIDs).') ');
-		G::$Cache->decrement('stats_user_count', G::$DB->affected_rows());
-		foreach ($UserIDs as $UserID) {
-			G::$Cache->delete_value("enabled_$UserID");
-			G::$Cache->delete_value("user_info_$UserID");
-			G::$Cache->delete_value("user_info_heavy_$UserID");
-			G::$Cache->delete_value("user_stats_$UserID");
+  /**
+   * Disable an array of users.
+   *
+   * @param array $UserIDs (You can also send it one ID as an int, because fuck types)
+   * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
+   */
+  public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
+    $QueryID = G::$DB->get_query_id();
+    if (!is_array($UserIDs)) {
+      $UserIDs = array($UserIDs);
+    }
+    G::$DB->query("
+      UPDATE users_info AS i
+        JOIN users_main AS m ON m.ID = i.UserID
+      SET m.Enabled = '2',
+        m.can_leech = '0',
+        i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
+        i.BanDate = '".sqltime()."',
+        i.BanReason = '$BanReason',
+        i.RatioWatchDownload = ".($BanReason == 2 ? 'm.Downloaded' : "'0'")."
+      WHERE m.ID IN(".implode(',', $UserIDs).') ');
+    G::$Cache->decrement('stats_user_count', G::$DB->affected_rows());
+    foreach ($UserIDs as $UserID) {
+      G::$Cache->delete_value("enabled_$UserID");
+      G::$Cache->delete_value("user_info_$UserID");
+      G::$Cache->delete_value("user_info_heavy_$UserID");
+      G::$Cache->delete_value("user_stats_$UserID");
 
-			G::$DB->query("
-				SELECT SessionID
-				FROM users_sessions
-				WHERE UserID = '$UserID'
-					AND Active = 1");
-			while (list($SessionID) = G::$DB->next_record()) {
-				G::$Cache->delete_value("session_$UserID"."_$SessionID");
-			}
-			G::$Cache->delete_value("users_sessions_$UserID");
+      G::$DB->query("
+        SELECT SessionID
+        FROM users_sessions
+        WHERE UserID = '$UserID'
+          AND Active = 1");
+      while (list($SessionID) = G::$DB->next_record()) {
+        G::$Cache->delete_value("session_$UserID"."_$SessionID");
+      }
+      G::$Cache->delete_value("users_sessions_$UserID");
 
-			G::$DB->query("
-				DELETE FROM users_sessions
-				WHERE UserID = '$UserID'");
+      G::$DB->query("
+        DELETE FROM users_sessions
+        WHERE UserID = '$UserID'");
 
-		}
+    }
 
-		// Remove the users from the tracker.
-		G::$DB->query('
-			SELECT torrent_pass
-			FROM users_main
-			WHERE ID in ('.implode(', ', $UserIDs).')');
-		$PassKeys = G::$DB->collect('torrent_pass');
-		$Concat = '';
-		foreach ($PassKeys as $PassKey) {
-			if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated
-				Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
-				$Concat = $PassKey;
-			} else {
-				$Concat .= $PassKey;
-			}
-		}
-		Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
-		G::$DB->set_query_id($QueryID);
-	}
+    // Remove the users from the tracker.
+    G::$DB->query('
+      SELECT torrent_pass
+      FROM users_main
+      WHERE ID in ('.implode(', ', $UserIDs).')');
+    $PassKeys = G::$DB->collect('torrent_pass');
+    $Concat = '';
+    foreach ($PassKeys as $PassKey) {
+      if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated
+        Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
+        $Concat = $PassKey;
+      } else {
+        $Concat .= $PassKey;
+      }
+    }
+    Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * Warn a user.
-	 *
-	 * @param int $UserID
-	 * @param int $Duration length of warning in seconds
-	 * @param string $reason
-	 */
-	public static function warn_user($UserID, $Duration, $Reason) {
-		global $Time;
+  /**
+   * Warn a user.
+   *
+   * @param int $UserID
+   * @param int $Duration length of warning in seconds
+   * @param string $reason
+   */
+  public static function warn_user($UserID, $Duration, $Reason) {
+    global $Time;
 
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query("
-			SELECT Warned
-			FROM users_info
-			WHERE UserID = $UserID
-				AND Warned != '0000-00-00 00:00:00'");
-		if (G::$DB->has_results()) {
-			//User was already warned, appending new warning to old.
-			list($OldDate) = G::$DB->next_record();
-			$NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query("
+      SELECT Warned
+      FROM users_info
+      WHERE UserID = $UserID
+        AND Warned != '0000-00-00 00:00:00'");
+    if (G::$DB->has_results()) {
+      //User was already warned, appending new warning to old.
+      list($OldDate) = G::$DB->next_record();
+      $NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
 
-			Misc::send_pm($UserID, 0,
-				'You have received multiple warnings.',
-				"When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate.");
+      Misc::send_pm($UserID, 0,
+        'You have received multiple warnings.',
+        "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate.");
 
-			$AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
+      $AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
 
-			G::$DB->query('
-				UPDATE users_info
-				SET
-					Warned = \''.db_string($NewExpDate).'\',
-					WarnedTimes = WarnedTimes + 1,
-					AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
-				WHERE UserID = \''.db_string($UserID).'\'');
-		} else {
-			//Not changing, user was not already warned
-			$WarnTime = time_plus($Duration);
+      G::$DB->query('
+        UPDATE users_info
+        SET
+          Warned = \''.db_string($NewExpDate).'\',
+          WarnedTimes = WarnedTimes + 1,
+          AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+        WHERE UserID = \''.db_string($UserID).'\'');
+    } else {
+      //Not changing, user was not already warned
+      $WarnTime = time_plus($Duration);
 
-			G::$Cache->begin_transaction("user_info_$UserID");
-			G::$Cache->update_row(false, array('Warned' => $WarnTime));
-			G::$Cache->commit_transaction(0);
+      G::$Cache->begin_transaction("user_info_$UserID");
+      G::$Cache->update_row(false, array('Warned' => $WarnTime));
+      G::$Cache->commit_transaction(0);
 
-			$AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
+      $AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
 
-			G::$DB->query('
-				UPDATE users_info
-				SET
-					Warned = \''.db_string($WarnTime).'\',
-					WarnedTimes = WarnedTimes + 1,
-					AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
-				WHERE UserID = \''.db_string($UserID).'\'');
-		}
-		G::$DB->set_query_id($QueryID);
-	}
+      G::$DB->query('
+        UPDATE users_info
+        SET
+          Warned = \''.db_string($WarnTime).'\',
+          WarnedTimes = WarnedTimes + 1,
+          AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+        WHERE UserID = \''.db_string($UserID).'\'');
+    }
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	 * Update the notes of a user
-	 * @param unknown $UserID ID of user
-	 * @param unknown $AdminComment Comment to update with
-	 */
-	public static function update_user_notes($UserID, $AdminComment) {
-		$QueryID = G::$DB->get_query_id();
-		G::$DB->query('
-			UPDATE users_info
-			SET AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
-			WHERE UserID = \''.db_string($UserID).'\'');
-		G::$DB->set_query_id($QueryID);
-	}
+  /**
+   * Update the notes of a user
+   * @param unknown $UserID ID of user
+   * @param unknown $AdminComment Comment to update with
+   */
+  public static function update_user_notes($UserID, $AdminComment) {
+    $QueryID = G::$DB->get_query_id();
+    G::$DB->query('
+      UPDATE users_info
+      SET AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+      WHERE UserID = \''.db_string($UserID).'\'');
+    G::$DB->set_query_id($QueryID);
+  }
 
-	/**
-	* Check if an IP address is part of a given CIDR range.
-	* @param string $CheckIP the IP address to be looked up
-	* @param string $Subnet the CIDR subnet to be checked against
-	*/
-	public static function check_cidr_range($CheckIP, $Subnet) {
-		$IP = ip2long($CheckIP);
-		$CIDR = split('/', $Subnet);
-		$SubnetIP = ip2long($CIDR[0]);
-		$SubnetMaskBits = 32 - $CIDR[1];
+  /**
+  * Check if an IP address is part of a given CIDR range.
+  * @param string $CheckIP the IP address to be looked up
+  * @param string $Subnet the CIDR subnet to be checked against
+  */
+  public static function check_cidr_range($CheckIP, $Subnet) {
+    $IP = ip2long($CheckIP);
+    $CIDR = split('/', $Subnet);
+    $SubnetIP = ip2long($CIDR[0]);
+    $SubnetMaskBits = 32 - $CIDR[1];
 
-		return (($IP>>$SubnetMaskBits) == ($SubnetIP>>$SubnetMaskBits));
-	}
+    return (($IP>>$SubnetMaskBits) == ($SubnetIP>>$SubnetMaskBits));
+  }
 
 }
 ?>

classes/top10view.class.php

@@ -2,83 +2,83 @@
 
 class Top10View {
 
-	public static function render_linkbox($Selected) {
+  public static function render_linkbox($Selected) {
 ?>
-		<div class="linkbox">
-			<a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected == "torrents")?></a>
-			<a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected == "users")?></a>
-			<a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected == "tags")?></a>
-			<a href="top10.php?type=votes" class="brackets"><?=self::get_selected_link("Favorites", $Selected == "votes")?></a>
-			<a href="top10.php?type=donors" class="brackets"><?=self::get_selected_link("Donors", $Selected == "donors")?></a>
-		</div>
+    <div class="linkbox">
+      <a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected == "torrents")?></a>
+      <a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected == "users")?></a>
+      <a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected == "tags")?></a>
+      <a href="top10.php?type=votes" class="brackets"><?=self::get_selected_link("Favorites", $Selected == "votes")?></a>
+      <a href="top10.php?type=donors" class="brackets"><?=self::get_selected_link("Donors", $Selected == "donors")?></a>
+    </div>
 <?
-	}
+  }
 
-	private static function get_selected_link($String, $Selected) {
-		if ($Selected) {
-			return "<strong>$String</strong>";
-		} else {
-			return $String;
-		}
-	}
+  private static function get_selected_link($String, $Selected) {
+    if ($Selected) {
+      return "<strong>$String</strong>";
+    } else {
+      return $String;
+    }
+  }
 
-	public static function render_artist_tile($Artist, $Category) {
-		if (self::is_valid_artist($Artist)) {
-			switch ($Category) {
-				case 'weekly':
-				case 'hyped':
-					self::render_tile("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
-					break;
-				default:
-					break;
-			}
-		}
-	}
+  public static function render_artist_tile($Artist, $Category) {
+    if (self::is_valid_artist($Artist)) {
+      switch ($Category) {
+        case 'weekly':
+        case 'hyped':
+          self::render_tile("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
+          break;
+        default:
+          break;
+      }
+    }
+  }
 
-	private static function render_tile($Url, $Name, $Image) {
-		if (!empty($Image)) {
-			$Name = display_str($Name);
+  private static function render_tile($Url, $Name, $Image) {
+    if (!empty($Image)) {
+      $Name = display_str($Name);
 ?>
-			<li>
-				<a href="<?=$Url?><?=$Name?>">
-					<img class="tooltip large_tile" alt="<?=$Name?>" title="<?=$Name?>" src="<?=ImageTools::process($Image)?>" />
-				</a>
-			</li>
+      <li>
+        <a href="<?=$Url?><?=$Name?>">
+          <img class="tooltip large_tile" alt="<?=$Name?>" title="<?=$Name?>" src="<?=ImageTools::process($Image)?>" />
+        </a>
+      </li>
 <?
-		}
-	}
+    }
+  }
 
 
-	public static function render_artist_list($Artist, $Category) {
-		if (self::is_valid_artist($Artist)) {
-			switch ($Category) {
-	
-				case 'weekly':
-				case 'hyped':
-					self::render_list("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
-					break;
-				default:
-					break;
-			}
-		}
-	}
+  public static function render_artist_list($Artist, $Category) {
+    if (self::is_valid_artist($Artist)) {
+      switch ($Category) {
 
-	private static function render_list($Url, $Name, $Image) {
-		if (!empty($Image)) {
-			$UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];
-			$Image = ImageTools::process($Image);
-			$Title = "title=\"&lt;img class=&quot;large_tile&quot; src=&quot;$Image&quot; alt=&quot;&quot; /&gt;\"";
-			$Name = display_str($Name);
+        case 'weekly':
+        case 'hyped':
+          self::render_list("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  private static function render_list($Url, $Name, $Image) {
+    if (!empty($Image)) {
+      $UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];
+      $Image = ImageTools::process($Image);
+      $Title = "title=\"&lt;img class=&quot;large_tile&quot; src=&quot;$Image&quot; alt=&quot;&quot; /&gt;\"";
+      $Name = display_str($Name);
 ?>
-			<li>
-				<a class="tooltip_image" data-title-plain="<?=$Name?>" <?=$Title?> href="<?=$Url?><?=$Name?>"><?=$Name?></a>
-			</li>
+      <li>
+        <a class="tooltip_image" data-title-plain="<?=$Name?>" <?=$Title?> href="<?=$Url?><?=$Name?>"><?=$Name?></a>
+      </li>
 <?
-		}
-	}
+    }
+  }
 
-	private static function is_valid_artist($Artist) {
-		return $Artist['name'] != '[unknown]';
-	}
+  private static function is_valid_artist($Artist) {
+    return $Artist['name'] != '[unknown]';
+  }
 
 }

classes/torrent.class.php

@@ -1,6 +1,6 @@
 <?
 /*******************************************************************************
-|~~~~ Gazelle bencode parser											   ~~~~|
+|~~~~ Gazelle bencode parser                         ~~~~|
 --------------------------------------------------------------------------------
 
 Welcome to the Gazelle bencode parser. bencoding is the way of encoding data
@@ -12,9 +12,9 @@ There are 4 data types in bencode:
 * String
 * Int
 * List - array without keys
-	- like array('value', 'value 2', 'value 3', 'etc')
+  - like array('value', 'value 2', 'value 3', 'etc')
 * Dictionary - array with string keys
-	- like array['key 1'] = 'value 1'; array['key 2'] = 'value 2';
+  - like array['key 1'] = 'value 1'; array['key 2'] = 'value 2';
 
 Before you go any further, we recommend reading the sections on bencoding and
 metainfo file structure here: http://wiki.theory.org/BitTorrentSpecification
@@ -22,21 +22,21 @@ metainfo file structure here: http://wiki.theory.org/BitTorrentSpecification
 //----- How we store the data -----//
 
 * Strings
-	- Stored as php strings. Not difficult to remember.
+  - Stored as php strings. Not difficult to remember.
 
 * Integers
-	- Stored as php ints
-	- must be casted with (int)
+  - Stored as php ints
+  - must be casted with (int)
 
 * Lists
-	- Stored as a BENCODE_LIST object.
-	- The actual list is in BENCODE_LIST::$Val, as an array with incrementing integer indices
-	- The list in BENCODE_LIST::$Val is populated by the BENCODE_LIST::dec() function
+  - Stored as a BENCODE_LIST object.
+  - The actual list is in BENCODE_LIST::$Val, as an array with incrementing integer indices
+  - The list in BENCODE_LIST::$Val is populated by the BENCODE_LIST::dec() function
 
 * Dictionaries
-	- Stored as a BENCODE_DICT object.
-	- The actual list is in BENCODE_DICT::$Val, as an array with string indices
-	- The list in BENCODE_DICT::$Val is populated by the BENCODE_DICT::dec() function
+  - Stored as a BENCODE_DICT object.
+  - The actual list is in BENCODE_DICT::$Val, as an array with string indices
+  - The list in BENCODE_DICT::$Val is populated by the BENCODE_DICT::dec() function
 
 //----- BENCODE_* Objects -----//
 
@@ -44,19 +44,19 @@ Lists and dictionaries are stored as objects. They each have the following
 functions:
 
 * decode(Type, $Key)
-	- Decodes ANY bencoded element, given the type and the key
-	- Gets the position and string from $this
+  - Decodes ANY bencoded element, given the type and the key
+  - Gets the position and string from $this
 
 * encode($Val)
-	- Encodes ANY non-bencoded element, given the value
+  - Encodes ANY non-bencoded element, given the value
 
 * dec()
-	- Decodes either a dictionary or a list, depending on where it's called from
-	- Uses the decode() function quite a bit
+  - Decodes either a dictionary or a list, depending on where it's called from
+  - Uses the decode() function quite a bit
 
 * enc()
-	- Encodes either a dictionary or a list, depending on where it's called from
-	- Relies mostly on the encode() function
+  - Encodes either a dictionary or a list, depending on where it's called from
+  - Relies mostly on the encode() function
 
 Finally, as all torrents are just large dictionaries, the TORRENT class extends
 the BENCODE_DICT class.
@@ -64,269 +64,269 @@ the BENCODE_DICT class.
 
 *******************************************************************************/
 class BENCODE2 {
-	var $Val; // Decoded array
-	var $Pos = 1; // Pointer that indicates our position in the string
-	var $Str = ''; // Torrent string
-
-	function __construct($Val, $IsParsed = false) {
-		if (!$IsParsed) {
-			$this->Str = $Val;
-			$this->dec();
-		} else {
-			$this->Val = $Val;
-		}
-	}
-
-	// Decode an element based on the type. The type is really just an indicator.
-	function decode($Type, $Key) {
-		if (is_number($Type)) { // Element is a string
-			// Get length of string
-			$StrLen = $Type;
-			while ($this->Str[$this->Pos + 1] != ':') {
-				$this->Pos++;
-				$StrLen.=$this->Str[$this->Pos];
-			}
-			$this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
-
-			$this->Pos += $StrLen;
-			$this->Pos += 2;
-
-		} elseif ($Type == 'i') { // Element is an int
-			$this->Pos++;
-
-			// Find end of integer (first occurance of 'e' after position)
-			$End = strpos($this->Str, 'e', $this->Pos);
-
-			// Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string
-			$this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos);
-			$this->Pos = $End + 1;
-
-		} elseif ($Type == 'l') { // Element is a list
-			$this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
-			$this->Pos += $this->Val[$Key]->Pos;
-
-		} elseif ($Type == 'd') { // Element is a dictionary
-			$this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
-			$this->Pos += $this->Val[$Key]->Pos;
-			// Sort by key to respect spec
-			if (!empty($this->Val[$Key]->Val)) {
-				ksort($this->Val[$Key]->Val);
-			}
-
-		} else {
-			die('Invalid torrent file');
-		}
-	}
-
-	function encode($Val) {
-		if (is_int($Val)) { // Integer
-			return 'i'.$Val.'e';
-		} elseif (is_string($Val)) {
-			return strlen($Val).':'.$Val;
-		} elseif (is_object($Val)) {
-			return $Val->enc();
-		} else {
-			return 'fail';
-		}
-	}
+  var $Val; // Decoded array
+  var $Pos = 1; // Pointer that indicates our position in the string
+  var $Str = ''; // Torrent string
+
+  function __construct($Val, $IsParsed = false) {
+    if (!$IsParsed) {
+      $this->Str = $Val;
+      $this->dec();
+    } else {
+      $this->Val = $Val;
+    }
+  }
+
+  // Decode an element based on the type. The type is really just an indicator.
+  function decode($Type, $Key) {
+    if (is_number($Type)) { // Element is a string
+      // Get length of string
+      $StrLen = $Type;
+      while ($this->Str[$this->Pos + 1] != ':') {
+        $this->Pos++;
+        $StrLen.=$this->Str[$this->Pos];
+      }
+      $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
+
+      $this->Pos += $StrLen;
+      $this->Pos += 2;
+
+    } elseif ($Type == 'i') { // Element is an int
+      $this->Pos++;
+
+      // Find end of integer (first occurance of 'e' after position)
+      $End = strpos($this->Str, 'e', $this->Pos);
+
+      // Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string
+      $this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos);
+      $this->Pos = $End + 1;
+
+    } elseif ($Type == 'l') { // Element is a list
+      $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
+      $this->Pos += $this->Val[$Key]->Pos;
+
+    } elseif ($Type == 'd') { // Element is a dictionary
+      $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
+      $this->Pos += $this->Val[$Key]->Pos;
+      // Sort by key to respect spec
+      if (!empty($this->Val[$Key]->Val)) {
+        ksort($this->Val[$Key]->Val);
+      }
+
+    } else {
+      die('Invalid torrent file');
+    }
+  }
+
+  function encode($Val) {
+    if (is_int($Val)) { // Integer
+      return 'i'.$Val.'e';
+    } elseif (is_string($Val)) {
+      return strlen($Val).':'.$Val;
+    } elseif (is_object($Val)) {
+      return $Val->enc();
+    } else {
+      return 'fail';
+    }
+  }
 }
 
 class BENCODE_LIST extends BENCODE2 {
-	function enc() {
-		if (empty($this->Val)) {
-			return 'le';
-		}
-		$Str = 'l';
-		reset($this->Val);
-		foreach ($this->Val as $Value) {
-			$Str.=$this->encode($Value);
-		}
-		return $Str.'e';
-	}
-
-	// Decode a list
-	function dec() {
-		$Key = 0; // Array index
-		$Length = strlen($this->Str);
-		while ($this->Pos < $Length) {
-			$Type = $this->Str[$this->Pos];
-			// $Type now indicates what type of element we're dealing with
-			// It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-			if ($Type == 'e') { // End of list
-				$this->Pos += 1;
-				unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-				return;
-			}
-
-			// Decode the bencoded element.
-			// This function changes $this->Pos and $this->Val, so you don't have to.
-			$this->decode($Type, $Key);
-			++$Key;
-		}
-		return true;
-	}
+  function enc() {
+    if (empty($this->Val)) {
+      return 'le';
+    }
+    $Str = 'l';
+    reset($this->Val);
+    foreach ($this->Val as $Value) {
+      $Str.=$this->encode($Value);
+    }
+    return $Str.'e';
+  }
+
+  // Decode a list
+  function dec() {
+    $Key = 0; // Array index
+    $Length = strlen($this->Str);
+    while ($this->Pos < $Length) {
+      $Type = $this->Str[$this->Pos];
+      // $Type now indicates what type of element we're dealing with
+      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+      if ($Type == 'e') { // End of list
+        $this->Pos += 1;
+        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+        return;
+      }
+
+      // Decode the bencoded element.
+      // This function changes $this->Pos and $this->Val, so you don't have to.
+      $this->decode($Type, $Key);
+      ++$Key;
+    }
+    return true;
+  }
 }
 
 class BENCODE_DICT extends BENCODE2 {
-	function enc() {
-		if (empty($this->Val)) {
-			return 'de';
-		}
-		$Str = 'd';
-		reset($this->Val);
-		foreach ($this->Val as $Key => $Value) {
-			$Str.=strlen($Key).':'.$Key.$this->encode($Value);
-		}
-		return $Str.'e';
-	}
-
-	// Decode a dictionary
-	function dec() {
-		$Length = strlen($this->Str);
-		while ($this->Pos<$Length) {
-
-			if ($this->Str[$this->Pos] == 'e') { // End of dictionary
-				$this->Pos += 1;
-				unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-				return;
-			}
-
-			// Get the dictionary key
-			// Length of the key, in bytes
-			$KeyLen = $this->Str[$this->Pos];
-
-			// Allow for multi-digit lengths
-			while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
-				$this->Pos++;
-				$KeyLen.=$this->Str[$this->Pos];
-			}
-			// $this->Pos is now on the last letter of the key length
-			// Adding 2 brings it past that character and the ':' to the beginning of the string
-			$this->Pos += 2;
-
-			// Get the name of the key
-			$Key = substr($this->Str, $this->Pos, $KeyLen);
-
-			// Move the position past the key to the beginning of the element
-			$this->Pos += $KeyLen;
-			$Type = $this->Str[$this->Pos];
-			// $Type now indicates what type of element we're dealing with
-			// It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-			// Decode the bencoded element.
-			// This function changes $this->Pos and $this->Val, so you don't have to.
-			$this->decode($Type, $Key);
-
-
-		}
-		return true;
-	}
+  function enc() {
+    if (empty($this->Val)) {
+      return 'de';
+    }
+    $Str = 'd';
+    reset($this->Val);
+    foreach ($this->Val as $Key => $Value) {
+      $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+    }
+    return $Str.'e';
+  }
+
+  // Decode a dictionary
+  function dec() {
+    $Length = strlen($this->Str);
+    while ($this->Pos<$Length) {
+
+      if ($this->Str[$this->Pos] == 'e') { // End of dictionary
+        $this->Pos += 1;
+        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+        return;
+      }
+
+      // Get the dictionary key
+      // Length of the key, in bytes
+      $KeyLen = $this->Str[$this->Pos];
+
+      // Allow for multi-digit lengths
+      while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
+        $this->Pos++;
+        $KeyLen.=$this->Str[$this->Pos];
+      }
+      // $this->Pos is now on the last letter of the key length
+      // Adding 2 brings it past that character and the ':' to the beginning of the string
+      $this->Pos += 2;
+
+      // Get the name of the key
+      $Key = substr($this->Str, $this->Pos, $KeyLen);
+
+      // Move the position past the key to the beginning of the element
+      $this->Pos += $KeyLen;
+      $Type = $this->Str[$this->Pos];
+      // $Type now indicates what type of element we're dealing with
+      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+      // Decode the bencoded element.
+      // This function changes $this->Pos and $this->Val, so you don't have to.
+      $this->decode($Type, $Key);
+
+
+    }
+    return true;
+  }
 }
 
 
 class TORRENT extends BENCODE_DICT {
-	function dump() {
-		// Convenience function used for testing and figuring out how we store the data
-		print_r($this->Val);
-	}
-
-	function dump_data() {
-		// Function which serializes $this->Val for storage
-		return base64_encode(serialize($this->Val));
-	}
-
-	/*
-	To use this, please remove the announce-list unset in make_private and be sure to still set_announce_url for backwards compatibility
-	function set_multi_announce() {
-		$Trackers = func_get_args();
-		$AnnounceList = new BENCODE_LIST(array(),true);
-		foreach ($Trackers as $Tracker) {
-			$SubList = new BENCODE_LIST(array($Tracker),true);
-			unset($SubList->Str);
-			$AnnounceList->Val[] = $SubList;
-		}
-		$this->Val['announce-list'] = $AnnounceList;
-	}
-	*/
-
-	function set_announce_url($Announce) {
-		$this->Val['announce'] = $Announce;
-		ksort($this->Val);
-	}
-
-	// Returns an array of:
-	// 	* the files in the torrent
-	//	* the total size of files described therein
-	function file_list() {
-		$FileList = array();
-		if (!isset($this->Val['info']->Val['files'])) { // Single file mode
-			$TotalSize = $this->Val['info']->Val['length'];
-			$FileList[] = array($TotalSize, $this->get_name());
-		} else { // Multiple file mode
-			$FileNames = array();
-			$FileSizes = array();
-			$TotalSize = 0;
-			$Files = $this->Val['info']->Val['files']->Val;
-			if (isset($Files[0]->Val['path.utf-8'])) {
-				$PathKey = 'path.utf-8';
-			} else {
-				$PathKey = 'path';
-			}
-			foreach ($Files as $File) {
-				$FileSize = $File->Val['length'];
-				$TotalSize += $FileSize;
-
-				$FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
-				$FileSizes[] = $FileSize;
-				$FileNames[] = $FileName;
-			}
-			natcasesort($FileNames);
-			foreach ($FileNames as $Index => $FileName) {
-				$FileList[] = array($FileSizes[$Index], $FileName);
-			}
-		}
-		return array($TotalSize, $FileList);
-	}
-
-	function get_name() {
-		if (isset($this->Val['info']->Val['name.utf-8'])) {
-			return $this->Val['info']->Val['name.utf-8'];
-		} else {
-			return $this->Val['info']->Val['name'];
-		}
-	}
-
-	function make_private() {
-		//----- The following properties do not affect the infohash:
-
-		// anounce-list is an unofficial extension to the protocol
-		// that allows for multiple trackers per torrent
-		unset($this->Val['announce-list']);
-
-		// Bitcomet & Azureus cache peers in here
-		unset($this->Val['nodes']);
-
-		// Azureus stores the dht_backup_enable flag here
-		unset($this->Val['azureus_properties']);
-
-		// Remove web-seeds
-		unset($this->Val['url-list']);
-
-		// Remove libtorrent resume info
-		unset($this->Val['libtorrent_resume']);
-
-		//----- End properties that do not affect the infohash
-		if ($this->Val['info']->Val['private']) {
-			return true; // Torrent is private
-		} else {
-			// Torrent is not private!
-			// add private tracker flag and sort info dictionary
-			$this->Val['info']->Val['private'] = 1;
-			ksort($this->Val['info']->Val);
-			return false;
-		}
-	}
+  function dump() {
+    // Convenience function used for testing and figuring out how we store the data
+    print_r($this->Val);
+  }
+
+  function dump_data() {
+    // Function which serializes $this->Val for storage
+    return base64_encode(serialize($this->Val));
+  }
+
+  /*
+  To use this, please remove the announce-list unset in make_private and be sure to still set_announce_url for backwards compatibility
+  function set_multi_announce() {
+    $Trackers = func_get_args();
+    $AnnounceList = new BENCODE_LIST(array(),true);
+    foreach ($Trackers as $Tracker) {
+      $SubList = new BENCODE_LIST(array($Tracker),true);
+      unset($SubList->Str);
+      $AnnounceList->Val[] = $SubList;
+    }
+    $this->Val['announce-list'] = $AnnounceList;
+  }
+  */
+
+  function set_announce_url($Announce) {
+    $this->Val['announce'] = $Announce;
+    ksort($this->Val);
+  }
+
+  // Returns an array of:
+  //   * the files in the torrent
+  //  * the total size of files described therein
+  function file_list() {
+    $FileList = array();
+    if (!isset($this->Val['info']->Val['files'])) { // Single file mode
+      $TotalSize = $this->Val['info']->Val['length'];
+      $FileList[] = array($TotalSize, $this->get_name());
+    } else { // Multiple file mode
+      $FileNames = array();
+      $FileSizes = array();
+      $TotalSize = 0;
+      $Files = $this->Val['info']->Val['files']->Val;
+      if (isset($Files[0]->Val['path.utf-8'])) {
+        $PathKey = 'path.utf-8';
+      } else {
+        $PathKey = 'path';
+      }
+      foreach ($Files as $File) {
+        $FileSize = $File->Val['length'];
+        $TotalSize += $FileSize;
+
+        $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
+        $FileSizes[] = $FileSize;
+        $FileNames[] = $FileName;
+      }
+      natcasesort($FileNames);
+      foreach ($FileNames as $Index => $FileName) {
+        $FileList[] = array($FileSizes[$Index], $FileName);
+      }
+    }
+    return array($TotalSize, $FileList);
+  }
+
+  function get_name() {
+    if (isset($this->Val['info']->Val['name.utf-8'])) {
+      return $this->Val['info']->Val['name.utf-8'];
+    } else {
+      return $this->Val['info']->Val['name'];
+    }
+  }
+
+  function make_private() {
+    //----- The following properties do not affect the infohash:
+
+    // anounce-list is an unofficial extension to the protocol
+    // that allows for multiple trackers per torrent
+    unset($this->Val['announce-list']);
+
+    // Bitcomet & Azureus cache peers in here
+    unset($this->Val['nodes']);
+
+    // Azureus stores the dht_backup_enable flag here
+    unset($this->Val['azureus_properties']);
+
+    // Remove web-seeds
+    unset($this->Val['url-list']);
+
+    // Remove libtorrent resume info
+    unset($this->Val['libtorrent_resume']);
+
+    //----- End properties that do not affect the infohash
+    if ($this->Val['info']->Val['private']) {
+      return true; // Torrent is private
+    } else {
+      // Torrent is not private!
+      // add private tracker flag and sort info dictionary
+      $this->Val['info']->Val['private'] = 1;
+      ksort($this->Val['info']->Val);
+      return false;
+    }
+  }
 }
 
 ?>

classes/torrent_32bit.class.php

@@ -12,9 +12,9 @@ There are 4 data types in bencode:
 * String
 * Int
 * List - array without keys
-	- like array('value', 'value 2', 'value 3', 'etc')
+  - like array('value', 'value 2', 'value 3', 'etc')
 * Dictionary - array with string keys
-	- like array['key 1'] = 'value 1'; array['key 2'] = 'value 2';
+  - like array['key 1'] = 'value 1'; array['key 2'] = 'value 2';
 
 Before you go any further, we recommend reading the sections on bencoding and
 metainfo file structure here: http://wiki.theory.org/BitTorrentSpecification
@@ -22,22 +22,22 @@ metainfo file structure here: http://wiki.theory.org/BitTorrentSpecification
 //----- How we store the data -----//
 
 * Strings
-	- Stored as php strings. Not difficult to remember.
+  - Stored as php strings. Not difficult to remember.
 
 * Integers
-	- Stored as php strings with an [*INT*] marker
-	- Can be stored an an int on 64 bit boxes for uber speed (we do this)
-	- If stored as an int on 32 bit boxes, it won't allow for any size over 2 gigs
+  - Stored as php strings with an [*INT*] marker
+  - Can be stored an an int on 64 bit boxes for uber speed (we do this)
+  - If stored as an int on 32 bit boxes, it won't allow for any size over 2 gigs
 
 * Lists
-	- Stored as a BENCODE_LIST object.
-	- The actual list is in BENCODE_LIST::$Val, as an array with incrementing integer indices
-	- The list in BENCODE_LIST::$Val is populated by the BENCODE_LIST::dec() function
+  - Stored as a BENCODE_LIST object.
+  - The actual list is in BENCODE_LIST::$Val, as an array with incrementing integer indices
+  - The list in BENCODE_LIST::$Val is populated by the BENCODE_LIST::dec() function
 
 * Dictionaries
-	- Stored as a BENCODE_DICT object.
-	- The actual list is in BENCODE_DICT::$Val, as an array with incrementing integer indices
-	- The list in BENCODE_DICT::$Val is populated by the BENCODE_DICT::dec() function
+  - Stored as a BENCODE_DICT object.
+  - The actual list is in BENCODE_DICT::$Val, as an array with incrementing integer indices
+  - The list in BENCODE_DICT::$Val is populated by the BENCODE_DICT::dec() function
 
 //----- BENCODE_* Objects -----//
 
@@ -45,19 +45,19 @@ Lists and dictionaries are stored as objects. They each have the following
 functions:
 
 * decode(Type, $Key)
-	- Decodes ANY bencoded element, given the type and the key
-	- Gets the position and string from $this
+  - Decodes ANY bencoded element, given the type and the key
+  - Gets the position and string from $this
 
 * encode($Val)
-	- Encodes ANY non-bencoded element, given the value
+  - Encodes ANY non-bencoded element, given the value
 
 * dec()
-	- Decodes either a dictionary or a list, depending on where it's called from
-	- Uses the decode() function quite a bit
+  - Decodes either a dictionary or a list, depending on where it's called from
+  - Uses the decode() function quite a bit
 
 * enc()
-	- Encodes either a dictionary or a list, depending on where it's called from
-	- Relies mostly on the encode() function
+  - Encodes either a dictionary or a list, depending on where it's called from
+  - Relies mostly on the encode() function
 
 Finally, as all torrents are just large dictionaries, the TORRENT class extends
 the BENCODE_DICT class.
@@ -73,249 +73,249 @@ discovered that floats aren't accurate enough to use. :(
 
 *******************************************************************************/
 class BENCODE2 {
-	var $Val; // Decoded array
-	var $Pos = 1; // Pointer that indicates our position in the string
-	var $Str = ''; // Torrent string
-
-	function __construct($Val, $IsParsed = false) {
-		if (!$IsParsed) {
-			$this->Str = $Val;
-			$this->dec();
-		} else {
-			$this->Val = $Val;
-		}
-	}
-
-	// Decode an element based on the type
-	function decode($Type, $Key) {
-		if (ctype_digit($Type)) { // Element is a string
-			// Get length of string
-			$StrLen = $Type;
-			while ($this->Str[$this->Pos + 1] != ':') {
-				$this->Pos++;
-				$StrLen.=$this->Str[$this->Pos];
-			}
-			$this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
-
-			$this->Pos += $StrLen;
-			$this->Pos += 2;
-
-		} elseif ($Type == 'i') { // Element is an int
-			$this->Pos++;
-
-			// Find end of integer (first occurance of 'e' after position)
-			$End = strpos($this->Str, 'e', $this->Pos);
-
-			// Get the integer, and mark it as an int (on our version 64 bit box, we cast it to an int)
-			$this->Val[$Key] = '[*INT*]'.substr($this->Str, $this->Pos, $End-$this->Pos);
-			$this->Pos = $End + 1;
-
-		} elseif ($Type == 'l') { // Element is a list
-			$this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
-			$this->Pos += $this->Val[$Key]->Pos;
-
-		} elseif ($Type == 'd') { // Element is a dictionary
-			$this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
-			$this->Pos += $this->Val[$Key]->Pos;
-			// Sort by key to respect spec
-			ksort($this->Val[$Key]->Val);
-
-		} else {
-			die('Invalid torrent file');
-		}
-	}
-
-	function encode($Val) {
-		if (is_string($Val)) {
-			if (substr($Val, 0, 7) == '[*INT*]') {
-				return 'i'.substr($Val,7).'e';
-			} else {
-				return strlen($Val).':'.$Val;
-			}
-		} elseif (is_object($Val)) {
-			return $Val->enc();
-		} else {
-			return 'fail';
-		}
-	}
+  var $Val; // Decoded array
+  var $Pos = 1; // Pointer that indicates our position in the string
+  var $Str = ''; // Torrent string
+
+  function __construct($Val, $IsParsed = false) {
+    if (!$IsParsed) {
+      $this->Str = $Val;
+      $this->dec();
+    } else {
+      $this->Val = $Val;
+    }
+  }
+
+  // Decode an element based on the type
+  function decode($Type, $Key) {
+    if (ctype_digit($Type)) { // Element is a string
+      // Get length of string
+      $StrLen = $Type;
+      while ($this->Str[$this->Pos + 1] != ':') {
+        $this->Pos++;
+        $StrLen.=$this->Str[$this->Pos];
+      }
+      $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
+
+      $this->Pos += $StrLen;
+      $this->Pos += 2;
+
+    } elseif ($Type == 'i') { // Element is an int
+      $this->Pos++;
+
+      // Find end of integer (first occurance of 'e' after position)
+      $End = strpos($this->Str, 'e', $this->Pos);
+
+      // Get the integer, and mark it as an int (on our version 64 bit box, we cast it to an int)
+      $this->Val[$Key] = '[*INT*]'.substr($this->Str, $this->Pos, $End-$this->Pos);
+      $this->Pos = $End + 1;
+
+    } elseif ($Type == 'l') { // Element is a list
+      $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
+      $this->Pos += $this->Val[$Key]->Pos;
+
+    } elseif ($Type == 'd') { // Element is a dictionary
+      $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
+      $this->Pos += $this->Val[$Key]->Pos;
+      // Sort by key to respect spec
+      ksort($this->Val[$Key]->Val);
+
+    } else {
+      die('Invalid torrent file');
+    }
+  }
+
+  function encode($Val) {
+    if (is_string($Val)) {
+      if (substr($Val, 0, 7) == '[*INT*]') {
+        return 'i'.substr($Val,7).'e';
+      } else {
+        return strlen($Val).':'.$Val;
+      }
+    } elseif (is_object($Val)) {
+      return $Val->enc();
+    } else {
+      return 'fail';
+    }
+  }
 }
 
 class BENCODE_LIST extends BENCODE2 {
-	function enc() {
-		$Str = 'l';
-		reset($this->Val);
-		while (list($Key, $Value) = each($this->Val)) {
-			$Str.=$this->encode($Value);
-		}
-		return $Str.'e';
-	}
-
-	// Decode a list
-	function dec() {
-		$Key = 0; // Array index
-		$Length = strlen($this->Str);
-		while ($this->Pos<$Length) {
-			$Type = $this->Str[$this->Pos];
-			// $Type now indicates what type of element we're dealing with
-			// It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-			if ($Type == 'e') { // End of list
-				$this->Pos += 1;
-				unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-				return;
-			}
-
-			// Decode the bencoded element.
-			// This function changes $this->Pos and $this->Val, so you don't have to.
-			$this->decode($Type, $Key);
-			++ $Key;
-		}
-		return true;
-	}
+  function enc() {
+    $Str = 'l';
+    reset($this->Val);
+    while (list($Key, $Value) = each($this->Val)) {
+      $Str.=$this->encode($Value);
+    }
+    return $Str.'e';
+  }
+
+  // Decode a list
+  function dec() {
+    $Key = 0; // Array index
+    $Length = strlen($this->Str);
+    while ($this->Pos<$Length) {
+      $Type = $this->Str[$this->Pos];
+      // $Type now indicates what type of element we're dealing with
+      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+      if ($Type == 'e') { // End of list
+        $this->Pos += 1;
+        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+        return;
+      }
+
+      // Decode the bencoded element.
+      // This function changes $this->Pos and $this->Val, so you don't have to.
+      $this->decode($Type, $Key);
+      ++ $Key;
+    }
+    return true;
+  }
 }
 
 class BENCODE_DICT extends BENCODE2 {
-	function enc() {
-		$Str = 'd';
-		reset($this->Val);
-		while (list($Key, $Value) = each($this->Val)) {
-			$Str.=strlen($Key).':'.$Key.$this->encode($Value);
-		}
-		return $Str.'e';
-	}
-
-	// Decode a dictionary
-	function dec() {
-		$Length = strlen($this->Str);
-		while ($this->Pos < $Length) {
-
-			if ($this->Str[$this->Pos] == 'e') { // End of dictionary
-				$this->Pos += 1;
-				unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-				return;
-			}
-
-			// Get the dictionary key
-			// Length of the key, in bytes
-			$KeyLen = $this->Str[$this->Pos];
-
-			// Allow for multi-digit lengths
-			while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
-				$this->Pos++;
-				$KeyLen.=$this->Str[$this->Pos];
-			}
-			// $this->Pos is now on the last letter of the key length
-			// Adding 2 brings it past that character and the ':' to the beginning of the string
-			$this->Pos+=2;
-
-			// Get the name of the key
-			$Key = substr($this->Str, $this->Pos, $KeyLen);
-
-			// Move the position past the key to the beginning of the element
-			$this->Pos += $KeyLen;
-			$Type = $this->Str[$this->Pos];
-			// $Type now indicates what type of element we're dealing with
-			// It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-			// Decode the bencoded element.
-			// This function changes $this->Pos and $this->Val, so you don't have to.
-			$this->decode($Type, $Key);
-
-
-		}
-		return true;
-	}
+  function enc() {
+    $Str = 'd';
+    reset($this->Val);
+    while (list($Key, $Value) = each($this->Val)) {
+      $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+    }
+    return $Str.'e';
+  }
+
+  // Decode a dictionary
+  function dec() {
+    $Length = strlen($this->Str);
+    while ($this->Pos < $Length) {
+
+      if ($this->Str[$this->Pos] == 'e') { // End of dictionary
+        $this->Pos += 1;
+        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+        return;
+      }
+
+      // Get the dictionary key
+      // Length of the key, in bytes
+      $KeyLen = $this->Str[$this->Pos];
+
+      // Allow for multi-digit lengths
+      while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
+        $this->Pos++;
+        $KeyLen.=$this->Str[$this->Pos];
+      }
+      // $this->Pos is now on the last letter of the key length
+      // Adding 2 brings it past that character and the ':' to the beginning of the string
+      $this->Pos+=2;
+
+      // Get the name of the key
+      $Key = substr($this->Str, $this->Pos, $KeyLen);
+
+      // Move the position past the key to the beginning of the element
+      $this->Pos += $KeyLen;
+      $Type = $this->Str[$this->Pos];
+      // $Type now indicates what type of element we're dealing with
+      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+      // Decode the bencoded element.
+      // This function changes $this->Pos and $this->Val, so you don't have to.
+      $this->decode($Type, $Key);
+
+
+    }
+    return true;
+  }
 }
 
 
 class TORRENT extends BENCODE_DICT {
-	function dump() {
-		// Convenience function used for testing and figuring out how we store the data
-		print_r($this->Val);
-	}
-
-	function dump_data() {
-		// Function which serializes $this->Val for storage
-		return base64_encode(serialize($this->Val));
-	}
-
-	function set_announce_url($Announce) {
-		$this->Val['announce'] = $Announce;
-		ksort($this->Val);
-	}
-
-	// Returns an array of:
-	// 	* the files in the torrent
-	//	* the total size of files described therein
-	function file_list() {
-		$FileList = array();
-		if (!isset($this->Val['info']->Val['files'])) { // Single file mode
-			$TotalSize = substr($this->Val['info']->Val['length'],7);
-			$FileList[] = array($TotalSize, $this->get_name());
-		} else { // Multiple file mode
-			$FileNames = array();
-			$FileSizes = array();
-			$TotalSize = 0;
-			$Files = $this->Val['info']->Val['files']->Val;
-			if (isset($Files[0]->Val['path.utf-8'])) {
-				$PathKey = 'path.utf-8';
-			} else {
-				$PathKey = 'path';
-			}
-			foreach ($Files as $File) {
-				$FileSize = substr($File->Val['length'], 7);
-				$TotalSize += $FileSize;
-
-				$FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
-				$FileSizes[] = $FileSize;
-				$FileNames[] = $FileName;
-			}
-			natcasesort($FileNames);
-			foreach ($FileNames as $Index => $FileName) {
-				$FileList[] = array($FileSizes[$Index], $FileName);
-			}
-		}
-		return array($TotalSize, $FileList);
-	}
-
-	function get_name() {
-		if (isset($this->Val['info']->Val['name.utf-8'])) {
-			return $this->Val['info']->Val['name.utf-8'];
-		} else {
-			return $this->Val['info']->Val['name'];
-		}
-	}
-
-	function make_private() {
-		//----- The following properties do not affect the infohash:
-
-		// anounce-list is an unofficial extension to the protocol
-		// that allows for multiple trackers per torrent
-		unset($this->Val['announce-list']);
-
-		// Bitcomet & Azureus cache peers in here
-		unset($this->Val['nodes']);
-
-		// Azureus stores the dht_backup_enable flag here
-		unset($this->Val['azureus_properties']);
-
-		// Remove web-seeds
-		unset($this->Val['url-list']);
-
-		// Remove libtorrent resume info
-		unset($this->Val['libtorrent_resume']);
-
-		//----- End properties that do not affect the infohash
-
-		if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') {
-			return true;
-		} else {
-			// Torrent is not private!
-			// add private tracker flag and sort info dictionary
-			$this->Val['info']->Val['private'] = '[*INT*]1';
-			ksort($this->Val['info']->Val);
-			return false;
-		}
-	}
+  function dump() {
+    // Convenience function used for testing and figuring out how we store the data
+    print_r($this->Val);
+  }
+
+  function dump_data() {
+    // Function which serializes $this->Val for storage
+    return base64_encode(serialize($this->Val));
+  }
+
+  function set_announce_url($Announce) {
+    $this->Val['announce'] = $Announce;
+    ksort($this->Val);
+  }
+
+  // Returns an array of:
+  //   * the files in the torrent
+  //  * the total size of files described therein
+  function file_list() {
+    $FileList = array();
+    if (!isset($this->Val['info']->Val['files'])) { // Single file mode
+      $TotalSize = substr($this->Val['info']->Val['length'],7);
+      $FileList[] = array($TotalSize, $this->get_name());
+    } else { // Multiple file mode
+      $FileNames = array();
+      $FileSizes = array();
+      $TotalSize = 0;
+      $Files = $this->Val['info']->Val['files']->Val;
+      if (isset($Files[0]->Val['path.utf-8'])) {
+        $PathKey = 'path.utf-8';
+      } else {
+        $PathKey = 'path';
+      }
+      foreach ($Files as $File) {
+        $FileSize = substr($File->Val['length'], 7);
+        $TotalSize += $FileSize;
+
+        $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
+        $FileSizes[] = $FileSize;
+        $FileNames[] = $FileName;
+      }
+      natcasesort($FileNames);
+      foreach ($FileNames as $Index => $FileName) {
+        $FileList[] = array($FileSizes[$Index], $FileName);
+      }
+    }
+    return array($TotalSize, $FileList);
+  }
+
+  function get_name() {
+    if (isset($this->Val['info']->Val['name.utf-8'])) {
+      return $this->Val['info']->Val['name.utf-8'];
+    } else {
+      return $this->Val['info']->Val['name'];
+    }
+  }
+
+  function make_private() {
+    //----- The following properties do not affect the infohash:
+
+    // anounce-list is an unofficial extension to the protocol
+    // that allows for multiple trackers per torrent
+    unset($this->Val['announce-list']);
+
+    // Bitcomet & Azureus cache peers in here
+    unset($this->Val['nodes']);
+
+    // Azureus stores the dht_backup_enable flag here
+    unset($this->Val['azureus_properties']);
+
+    // Remove web-seeds
+    unset($this->Val['url-list']);
+
+    // Remove libtorrent resume info
+    unset($this->Val['libtorrent_resume']);
+
+    //----- End properties that do not affect the infohash
+
+    if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') {
+      return true;
+    } else {
+      // Torrent is not private!
+      // add private tracker flag and sort info dictionary
+      $this->Val['info']->Val['private'] = '[*INT*]1';
+      ksort($this->Val['info']->Val);
+      return false;
+    }
+  }
 }
 ?>

classes/torrentsdl.class.php

@@ -3,244 +3,244 @@
  * Class for functions related to the features involving torrent downloads
  */
 class TorrentsDL {
-	const ChunkSize = 100;
-	const MaxPathLength = 200;
-	private $QueryResult;
-	private $QueryRowNum = 0;
-	private $Zip;
-	private $IDBoundaries;
-	private $FailedFiles = array();
-	private $NumAdded = 0;
-	private $NumFound = 0;
-	private $Size = 0;
-	private $Title;
-	private $User;
-	private $AnnounceURL;
-	private $AnnounceList;
+  const ChunkSize = 100;
+  const MaxPathLength = 200;
+  private $QueryResult;
+  private $QueryRowNum = 0;
+  private $Zip;
+  private $IDBoundaries;
+  private $FailedFiles = array();
+  private $NumAdded = 0;
+  private $NumFound = 0;
+  private $Size = 0;
+  private $Title;
+  private $User;
+  private $AnnounceURL;
+  private $AnnounceList;
 
-	/**
-	 * Create a Zip object and store the query results
-	 *
-	 * @param mysqli_result $QueryResult results from a query on the collector pages
-	 * @param string $Title name of the collection that will be created
-	 * @param string $AnnounceURL URL to add to the created torrents
-	 */
-	public function __construct(&$QueryResult, $Title) {
-		G::$Cache->InternalCache = false; // The internal cache is almost completely useless for this
-		Zip::unlimit(); // Need more memory and longer timeout
-		$this->QueryResult = $QueryResult;
-		$this->Title = $Title;
-		$this->User = G::$LoggedUser;
-		$this->AnnounceURL = ANNOUNCE_URLS[0][0]."/".G::$LoggedUser['torrent_pass']."/announce";
+  /**
+   * Create a Zip object and store the query results
+   *
+   * @param mysqli_result $QueryResult results from a query on the collector pages
+   * @param string $Title name of the collection that will be created
+   * @param string $AnnounceURL URL to add to the created torrents
+   */
+  public function __construct(&$QueryResult, $Title) {
+    G::$Cache->InternalCache = false; // The internal cache is almost completely useless for this
+    Zip::unlimit(); // Need more memory and longer timeout
+    $this->QueryResult = $QueryResult;
+    $this->Title = $Title;
+    $this->User = G::$LoggedUser;
+    $this->AnnounceURL = ANNOUNCE_URLS[0][0]."/".G::$LoggedUser['torrent_pass']."/announce";
     function add_passkey($Ann) {
       return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann."/".G::$LoggedUser['torrent_pass']."/announce";
     }
-		$this->AnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? array() : array_map('add_passkey', ANNOUNCE_URLS);
-		$this->Zip = new Zip(Misc::file_string($Title));
-	}
+    $this->AnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? array() : array_map('add_passkey', ANNOUNCE_URLS);
+    $this->Zip = new Zip(Misc::file_string($Title));
+  }
 
-	/**
-	 * Store the results from a DB query in smaller chunks to save memory
-	 *
-	 * @param string $Key the key to use in the result hash map
-	 * @return array with results and torrent group IDs or false if there are no results left
-	 */
-	public function get_downloads($Key) {
-		$GroupIDs = $Downloads = array();
-		$OldQuery = G::$DB->get_query_id();
-		G::$DB->set_query_id($this->QueryResult);
-		if (!isset($this->IDBoundaries)) {
-			if ($Key == 'TorrentID') {
-				$this->IDBoundaries = false;
-			} else {
-				$this->IDBoundaries = G::$DB->to_pair($Key, 'TorrentID', false);
-			}
-		}
-		$Found = 0;
-		while ($Download = G::$DB->next_record(MYSQLI_ASSOC, false)) {
-			if (!$this->IDBoundaries || $Download['TorrentID'] == $this->IDBoundaries[$Download[$Key]]) {
-				$Found++;
-				$Downloads[$Download[$Key]] = $Download;
-				$GroupIDs[$Download['TorrentID']] = $Download['GroupID'];
-				if ($Found >= self::ChunkSize) {
-					break;
-				}
-			}
-		}
-		$this->NumFound += $Found;
-		G::$DB->set_query_id($OldQuery);
-		if (empty($Downloads)) {
-			return false;
-		}
-		return array($Downloads, $GroupIDs);
-	}
+  /**
+   * Store the results from a DB query in smaller chunks to save memory
+   *
+   * @param string $Key the key to use in the result hash map
+   * @return array with results and torrent group IDs or false if there are no results left
+   */
+  public function get_downloads($Key) {
+    $GroupIDs = $Downloads = array();
+    $OldQuery = G::$DB->get_query_id();
+    G::$DB->set_query_id($this->QueryResult);
+    if (!isset($this->IDBoundaries)) {
+      if ($Key == 'TorrentID') {
+        $this->IDBoundaries = false;
+      } else {
+        $this->IDBoundaries = G::$DB->to_pair($Key, 'TorrentID', false);
+      }
+    }
+    $Found = 0;
+    while ($Download = G::$DB->next_record(MYSQLI_ASSOC, false)) {
+      if (!$this->IDBoundaries || $Download['TorrentID'] == $this->IDBoundaries[$Download[$Key]]) {
+        $Found++;
+        $Downloads[$Download[$Key]] = $Download;
+        $GroupIDs[$Download['TorrentID']] = $Download['GroupID'];
+        if ($Found >= self::ChunkSize) {
+          break;
+        }
+      }
+    }
+    $this->NumFound += $Found;
+    G::$DB->set_query_id($OldQuery);
+    if (empty($Downloads)) {
+      return false;
+    }
+    return array($Downloads, $GroupIDs);
+  }
 
-	/**
-	 * Add a file to the zip archive
-	 *
-	 * @param string $TorrentData bencoded torrent without announce url (new format) or TORRENT object (old format)
-	 * @param array $Info file info stored as an array with at least the keys
-	 *  Artist, Name, Year, Media, Format, Encoding and TorrentID
-	 * @param string $FolderName folder name
-	 */
-	public function add_file(&$TorrentData, $Info, $FolderName = '') {
-		$FolderName = Misc::file_string($FolderName);
-		$MaxPathLength = $FolderName ? (self::MaxPathLength - strlen($FolderName) - 1) : self::MaxPathLength;
-		$FileName = self::construct_file_name($Info['Artist'], $Info['Name'], $Info['Year'], $Info['Media'], $Info['Format'], $Info['Encoding'], $Info['TorrentID'], false, $MaxPathLength);
-		$this->Size += $Info['Size'];
-		$this->NumAdded++;
-		$this->Zip->add_file(self::get_file($TorrentData, $this->AnnounceURL, $this->AnnounceList), ($FolderName ? "$FolderName/" : "") . $FileName);
-		usleep(25000); // We don't want to send much faster than the client can receive
-	}
+  /**
+   * Add a file to the zip archive
+   *
+   * @param string $TorrentData bencoded torrent without announce url (new format) or TORRENT object (old format)
+   * @param array $Info file info stored as an array with at least the keys
+   *  Artist, Name, Year, Media, Format, Encoding and TorrentID
+   * @param string $FolderName folder name
+   */
+  public function add_file(&$TorrentData, $Info, $FolderName = '') {
+    $FolderName = Misc::file_string($FolderName);
+    $MaxPathLength = $FolderName ? (self::MaxPathLength - strlen($FolderName) - 1) : self::MaxPathLength;
+    $FileName = self::construct_file_name($Info['Artist'], $Info['Name'], $Info['Year'], $Info['Media'], $Info['Format'], $Info['Encoding'], $Info['TorrentID'], false, $MaxPathLength);
+    $this->Size += $Info['Size'];
+    $this->NumAdded++;
+    $this->Zip->add_file(self::get_file($TorrentData, $this->AnnounceURL, $this->AnnounceList), ($FolderName ? "$FolderName/" : "") . $FileName);
+    usleep(25000); // We don't want to send much faster than the client can receive
+  }
 
-	/**
-	 * Add a file to the list of files that could not be downloaded
-	 *
-	 * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
-	 */
-	public function fail_file($Info) {
-		$this->FailedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
-	}
+  /**
+   * Add a file to the list of files that could not be downloaded
+   *
+   * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
+   */
+  public function fail_file($Info) {
+    $this->FailedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
+  }
 
-	/**
-	 * Add a file to the list of files that did not match the user's format or quality requirements
-	 *
-	 * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
-	 */
-	public function skip_file($Info) {
-		$this->SkippedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
-	}
+  /**
+   * Add a file to the list of files that did not match the user's format or quality requirements
+   *
+   * @param array $Info file info stored as an array with at least the keys Artist, Name and Year
+   */
+  public function skip_file($Info) {
+    $this->SkippedFiles[] = $Info['Artist'] . $Info['Name'] . " $Info[Year]";
+  }
 
-	/**
-	 * Add a summary to the archive and include a list of files that could not be added. Close the zip archive
-	 *
-	 * @param bool $FilterStats whether to include filter stats in the report
-	 */
-	public function finalize($FilterStats = true) {
-		$this->Zip->add_file($this->summary($FilterStats), "Summary.txt");
-		if (!empty($this->FailedFiles)) {
-			$this->Zip->add_file($this->errors(), "Errors.txt");
-		}
-		$this->Zip->close_stream();
-	}
+  /**
+   * Add a summary to the archive and include a list of files that could not be added. Close the zip archive
+   *
+   * @param bool $FilterStats whether to include filter stats in the report
+   */
+  public function finalize($FilterStats = true) {
+    $this->Zip->add_file($this->summary($FilterStats), "Summary.txt");
+    if (!empty($this->FailedFiles)) {
+      $this->Zip->add_file($this->errors(), "Errors.txt");
+    }
+    $this->Zip->close_stream();
+  }
 
-	/**
-	 * Produce a summary text over the collector results
-	 *
-	 * @param bool $FilterStats whether to include filter stats in the report
-	 * @return summary text
-	 */
-	public function summary($FilterStats) {
-		global $ScriptStartTime;
-		$Time = number_format(1000 * (microtime(true) - $ScriptStartTime), 2)." ms";
-		$Used = Format::get_size(memory_get_usage(true));
-		$Date = date("M d Y, H:i");
-		$NumSkipped = count($this->SkippedFiles);
-		return "Collector Download Summary for $this->Title - " . SITE_NAME . "\r\n"
-			. "\r\n"
-			. "User:		{$this->User[Username]}\r\n"
-			. "Passkey:	{$this->User[torrent_pass]}\r\n"
-			. "\r\n"
-			. "Time:		$Time\r\n"
-			. "Used:		$Used\r\n"
-			. "Date:		$Date\r\n"
-			. "\r\n"
-			. ($FilterStats !== false
-				? "Torrent groups analyzed:	$this->NumFound\r\n"
-					. "Torrent groups filtered:	$NumSkipped\r\n"
-				: "")
-			. "Torrents downloaded:		$this->NumAdded\r\n"
-			. "\r\n"
-			. "Total size of torrents (ratio hit): ".Format::get_size($this->Size)."\r\n"
-			. ($NumSkipped
-				? "\r\n"
-					. "Albums unavailable within your criteria (consider making a request for your desired format):\r\n"
-					. implode("\r\n", $this->SkippedFiles) . "\r\n"
-				: "");
-	}
+  /**
+   * Produce a summary text over the collector results
+   *
+   * @param bool $FilterStats whether to include filter stats in the report
+   * @return summary text
+   */
+  public function summary($FilterStats) {
+    global $ScriptStartTime;
+    $Time = number_format(1000 * (microtime(true) - $ScriptStartTime), 2)." ms";
+    $Used = Format::get_size(memory_get_usage(true));
+    $Date = date("M d Y, H:i");
+    $NumSkipped = count($this->SkippedFiles);
+    return "Collector Download Summary for $this->Title - " . SITE_NAME . "\r\n"
+      . "\r\n"
+      . "User:    {$this->User[Username]}\r\n"
+      . "Passkey:  {$this->User[torrent_pass]}\r\n"
+      . "\r\n"
+      . "Time:    $Time\r\n"
+      . "Used:    $Used\r\n"
+      . "Date:    $Date\r\n"
+      . "\r\n"
+      . ($FilterStats !== false
+        ? "Torrent groups analyzed:  $this->NumFound\r\n"
+          . "Torrent groups filtered:  $NumSkipped\r\n"
+        : "")
+      . "Torrents downloaded:    $this->NumAdded\r\n"
+      . "\r\n"
+      . "Total size of torrents (ratio hit): ".Format::get_size($this->Size)."\r\n"
+      . ($NumSkipped
+        ? "\r\n"
+          . "Albums unavailable within your criteria (consider making a request for your desired format):\r\n"
+          . implode("\r\n", $this->SkippedFiles) . "\r\n"
+        : "");
+  }
 
-	/**
-	 * Compile a list of files that could not be added to the archive
-	 *
-	 * @return list of files
-	 */
-	public function errors() {
-		return "A server error occurred. Please try again at a later time.\r\n"
-			. "\r\n"
-			. "The following torrents could not be downloaded:\r\n"
-			. implode("\r\n", $this->FailedFiles) . "\r\n";
-	}
+  /**
+   * Compile a list of files that could not be added to the archive
+   *
+   * @return list of files
+   */
+  public function errors() {
+    return "A server error occurred. Please try again at a later time.\r\n"
+      . "\r\n"
+      . "The following torrents could not be downloaded:\r\n"
+      . implode("\r\n", $this->FailedFiles) . "\r\n";
+  }
 
-	/**
-	 * Combine a bunch of torrent info into a standardized file name
-	 *
-	 * @params most input variables are self-explanatory
-	 * @param int $TorrentID if given, append "-TorrentID" to torrent name
-	 * @param bool $Txt whether to use .txt or .torrent as file extension
-	 * @param int $MaxLength maximum file name length
-	 * @return file name with at most $MaxLength characters
-	 */
-	public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $Txt = false, $MaxLength = self::MaxPathLength) {
-		$MaxLength -= ($Txt ? 4 : 8);
-		if ($TorrentID !== false) {
-			$MaxLength -= (strlen($TorrentID) + 1);
-		}
-		$TorrentArtist = Misc::file_string($Artist);
-		$TorrentName = Misc::file_string($Album);
-		if ($Year > 0) {
-			$TorrentName .= " - $Year";
-		}
-		$TorrentInfo = array();
-		if ($Media != '') {
-			$TorrentInfo[] = $Media;
-		}
-		if ($Format != '') {
-			$TorrentInfo[] = $Format;
-		}
-		if ($Encoding != '') {
-			$TorrentInfo[] = $Encoding;
-		}
-		if (!empty($TorrentInfo)) {
-			$TorrentInfo = ' (' . Misc::file_string(implode(' - ', $TorrentInfo)) . ')';
-		} else {
-			$TorrentInfo = '';
-		}
+  /**
+   * Combine a bunch of torrent info into a standardized file name
+   *
+   * @params most input variables are self-explanatory
+   * @param int $TorrentID if given, append "-TorrentID" to torrent name
+   * @param bool $Txt whether to use .txt or .torrent as file extension
+   * @param int $MaxLength maximum file name length
+   * @return file name with at most $MaxLength characters
+   */
+  public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $Txt = false, $MaxLength = self::MaxPathLength) {
+    $MaxLength -= ($Txt ? 4 : 8);
+    if ($TorrentID !== false) {
+      $MaxLength -= (strlen($TorrentID) + 1);
+    }
+    $TorrentArtist = Misc::file_string($Artist);
+    $TorrentName = Misc::file_string($Album);
+    if ($Year > 0) {
+      $TorrentName .= " - $Year";
+    }
+    $TorrentInfo = array();
+    if ($Media != '') {
+      $TorrentInfo[] = $Media;
+    }
+    if ($Format != '') {
+      $TorrentInfo[] = $Format;
+    }
+    if ($Encoding != '') {
+      $TorrentInfo[] = $Encoding;
+    }
+    if (!empty($TorrentInfo)) {
+      $TorrentInfo = ' (' . Misc::file_string(implode(' - ', $TorrentInfo)) . ')';
+    } else {
+      $TorrentInfo = '';
+    }
 
-		if (!$TorrentName) {
-			$TorrentName = 'No Name';
-		} elseif (mb_strlen($TorrentArtist . $TorrentName . $TorrentInfo, 'UTF-8') <= $MaxLength) {
-			$TorrentName = $TorrentArtist . $TorrentName;
-		}
+    if (!$TorrentName) {
+      $TorrentName = 'No Name';
+    } elseif (mb_strlen($TorrentArtist . $TorrentName . $TorrentInfo, 'UTF-8') <= $MaxLength) {
+      $TorrentName = $TorrentArtist . $TorrentName;
+    }
 
-		$TorrentName = Format::cut_string($TorrentName . $TorrentInfo, $MaxLength, true, false);
-		if ($TorrentID !== false) {
-			$TorrentName .= "-$TorrentID";
-		}
-		if ($Txt) {
-			return "$TorrentName.txt";
-		}
-		return "$TorrentName.torrent";
-	}
+    $TorrentName = Format::cut_string($TorrentName . $TorrentInfo, $MaxLength, true, false);
+    if ($TorrentID !== false) {
+      $TorrentName .= "-$TorrentID";
+    }
+    if ($Txt) {
+      return "$TorrentName.txt";
+    }
+    return "$TorrentName.torrent";
+  }
 
-	/**
-	 * Convert a stored torrent into a binary file that can be loaded in a torrent client
-	 *
-	 * @param mixed $TorrentData bencoded torrent without announce URL (new format) or TORRENT object (old format)
-	 * @return bencoded string
-	 */
-	public static function get_file(&$TorrentData, $AnnounceURL, $AnnounceList = array()) {
-		if (Misc::is_new_torrent($TorrentData)) {
-			$Bencode = BencodeTorrent::add_announce_url($TorrentData, $AnnounceURL);
-			if (!empty($AnnounceList)) {
-				$Bencode = BencodeTorrent::add_announce_list($Bencode, $AnnounceList);
-			}
-			return $Bencode;
-		}
-		$Tor = new TORRENT(unserialize(base64_decode($TorrentData)), true);
-		$Tor->set_announce_url($AnnounceURL);
-		unset($Tor->Val['announce-list']);
-		unset($Tor->Val['url-list']);
-		unset($Tor->Val['libtorrent_resume']);
-		return $Tor->enc();
-	}
+  /**
+   * Convert a stored torrent into a binary file that can be loaded in a torrent client
+   *
+   * @param mixed $TorrentData bencoded torrent without announce URL (new format) or TORRENT object (old format)
+   * @return bencoded string
+   */
+  public static function get_file(&$TorrentData, $AnnounceURL, $AnnounceList = array()) {
+    if (Misc::is_new_torrent($TorrentData)) {
+      $Bencode = BencodeTorrent::add_announce_url($TorrentData, $AnnounceURL);
+      if (!empty($AnnounceList)) {
+        $Bencode = BencodeTorrent::add_announce_list($Bencode, $AnnounceList);
+      }
+      return $Bencode;
+    }
+    $Tor = new TORRENT(unserialize(base64_decode($TorrentData)), true);
+    $Tor->set_announce_url($AnnounceURL);
+    unset($Tor->Val['announce-list']);
+    unset($Tor->Val['url-list']);
+    unset($Tor->Val['libtorrent_resume']);
+    return $Tor->enc();
+  }
 }

classes/tracker.class.php

@@ -1,178 +1,178 @@
 <?
 // TODO: Turn this into a class with nice functions like update_user, delete_torrent, etc.
 class Tracker {
-	const STATS_MAIN = 0;
-	const STATS_USER = 1;
+  const STATS_MAIN = 0;
+  const STATS_USER = 1;
 
-	public static $Requests = array();
+  public static $Requests = array();
 
-	/**
-	 * Send a GET request over a socket directly to the tracker
-	 * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
-	 * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
-	 *
-	 * @param string $Action The action to send
-	 * @param array $Updates An associative array of key->value pairs to send to the tracker
-	 * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
-	 */
-	public static function update_tracker($Action, $Updates, $ToIRC = false) {
-		// Build request
-		$Get = TRACKER_SECRET . "/update?action=$Action";
-		foreach ($Updates as $Key => $Value) {
-			$Get .= "&$Key=$Value";
-		}
+  /**
+   * Send a GET request over a socket directly to the tracker
+   * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
+   * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
+   *
+   * @param string $Action The action to send
+   * @param array $Updates An associative array of key->value pairs to send to the tracker
+   * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
+   */
+  public static function update_tracker($Action, $Updates, $ToIRC = false) {
+    // Build request
+    $Get = TRACKER_SECRET . "/update?action=$Action";
+    foreach ($Updates as $Key => $Value) {
+      $Get .= "&$Key=$Value";
+    }
 
-		$MaxAttempts = 3;
-		$Err = false;
-		if (self::send_request($Get, $MaxAttempts, $Err) === false) {
-			send_irc("PRIVMSG #tracker :$MaxAttempts $Err $Get");
-			if (G::$Cache->get_value('ocelot_error_reported') === false) {
-				send_irc('PRIVMSG ' . ADMIN_CHAN . " :Failed to update ocelot: $Err : $Get");
-				G::$Cache->cache_value('ocelot_error_reported', true, 3600);
-			}
-			return false;
-		}
-		return true;
-	}
+    $MaxAttempts = 3;
+    $Err = false;
+    if (self::send_request($Get, $MaxAttempts, $Err) === false) {
+      send_irc("PRIVMSG #tracker :$MaxAttempts $Err $Get");
+      if (G::$Cache->get_value('ocelot_error_reported') === false) {
+        send_irc('PRIVMSG ' . ADMIN_CHAN . " :Failed to update ocelot: $Err : $Get");
+        G::$Cache->cache_value('ocelot_error_reported', true, 3600);
+      }
+      return false;
+    }
+    return true;
+  }
 
-	/**
-	 * Get global peer stats from the tracker
-	 *
-	 * @return array(0 => $Leeching, 1 => $Seeding) or false if request failed
-	 */
-	public static function global_peer_count() {
-		$Stats = self::get_stats(self::STATS_MAIN);
-		if (isset($Stats['leechers tracked']) && isset($Stats['seeders tracked'])) {
-			$Leechers = $Stats['leechers tracked'];
-			$Seeders = $Stats['seeders tracked'];
-		} else {
-			return false;
-		}
-		return array($Leechers, $Seeders);
-	}
+  /**
+   * Get global peer stats from the tracker
+   *
+   * @return array(0 => $Leeching, 1 => $Seeding) or false if request failed
+   */
+  public static function global_peer_count() {
+    $Stats = self::get_stats(self::STATS_MAIN);
+    if (isset($Stats['leechers tracked']) && isset($Stats['seeders tracked'])) {
+      $Leechers = $Stats['leechers tracked'];
+      $Seeders = $Stats['seeders tracked'];
+    } else {
+      return false;
+    }
+    return array($Leechers, $Seeders);
+  }
 
-	/**
-	 * Get peer stats for a user from the tracker
-	 *
-	 * @param string $TorrentPass The user's pass key
-	 * @return array(0 => $Leeching, 1 => $Seeding) or false if the request failed
-	 */
-	public static function user_peer_count($TorrentPass) {
-		$Stats = self::get_stats(self::STATS_USER, array('key' => $TorrentPass));
-		if ($Stats === false) {
-			return false;
-		}
-		if (isset($Stats['leeching']) && isset($Stats['seeding'])) {
-			$Leeching = $Stats['leeching'];
-			$Seeding = $Stats['seeding'];
-		} else {
-			// User doesn't exist, but don't tell anyone
-			$Leeching = $Seeding = 0;
-		}
-		return array($Leeching, $Seeding);
-	}
+  /**
+   * Get peer stats for a user from the tracker
+   *
+   * @param string $TorrentPass The user's pass key
+   * @return array(0 => $Leeching, 1 => $Seeding) or false if the request failed
+   */
+  public static function user_peer_count($TorrentPass) {
+    $Stats = self::get_stats(self::STATS_USER, array('key' => $TorrentPass));
+    if ($Stats === false) {
+      return false;
+    }
+    if (isset($Stats['leeching']) && isset($Stats['seeding'])) {
+      $Leeching = $Stats['leeching'];
+      $Seeding = $Stats['seeding'];
+    } else {
+      // User doesn't exist, but don't tell anyone
+      $Leeching = $Seeding = 0;
+    }
+    return array($Leeching, $Seeding);
+  }
 
-	/**
-	 * Get whatever info the tracker has to report
-	 *
-	 * @return results from get_stats()
-	 */
-	public static function info() {
-		return self::get_stats(self::STATS_MAIN);
-	}
+  /**
+   * Get whatever info the tracker has to report
+   *
+   * @return results from get_stats()
+   */
+  public static function info() {
+    return self::get_stats(self::STATS_MAIN);
+  }
 
-	/**
-	 * Send a stats request to the tracker and process the results
-	 *
-	 * @param int $Type Stats type to get
-	 * @param array $Params Parameters required by stats type
-	 * @return array with stats in named keys or false if the request failed
-	 */
-	private static function get_stats($Type, $Params = false) {
-		if (!defined('TRACKER_REPORTKEY')) {
-			return false;
-		}
-		$Get = TRACKER_REPORTKEY . '/report?';
-		if ($Type === self::STATS_MAIN) {
-			$Get .= 'get=stats';
-		} elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
-			$Get .= "get=user&key=$Params[key]";
-		} else {
-			return false;
-		}
-		$Response = self::send_request($Get);
-		if ($Response === false) {
-			return false;
-		}
-		$Stats = array();
-		foreach (explode("\n", $Response) as $Stat) {
-			list($Val, $Key) = explode(" ", $Stat, 2);
-			$Stats[$Key] = $Val;
-		}
-		return $Stats;
-	}
+  /**
+   * Send a stats request to the tracker and process the results
+   *
+   * @param int $Type Stats type to get
+   * @param array $Params Parameters required by stats type
+   * @return array with stats in named keys or false if the request failed
+   */
+  private static function get_stats($Type, $Params = false) {
+    if (!defined('TRACKER_REPORTKEY')) {
+      return false;
+    }
+    $Get = TRACKER_REPORTKEY . '/report?';
+    if ($Type === self::STATS_MAIN) {
+      $Get .= 'get=stats';
+    } elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
+      $Get .= "get=user&key=$Params[key]";
+    } else {
+      return false;
+    }
+    $Response = self::send_request($Get);
+    if ($Response === false) {
+      return false;
+    }
+    $Stats = array();
+    foreach (explode("\n", $Response) as $Stat) {
+      list($Val, $Key) = explode(" ", $Stat, 2);
+      $Stats[$Key] = $Val;
+    }
+    return $Stats;
+  }
 
-	/**
-	 * Send a request to the tracker
-	 *
-	 * @param string $Path GET string to send to the tracker
-	 * @param int $MaxAttempts Maximum number of failed attempts before giving up
-	 * @param $Err Variable to use as storage for the error string if the request fails
-	 * @return tracker response message or false if the request failed
-	 */
-	private static function send_request($Get, $MaxAttempts = 1, &$Err = false) {
-		$Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
-		$Attempts = 0;
-		$Sleep = 0;
-		$Success = false;
-		$StartTime = microtime(true);
-		while (!$Success && $Attempts++ < $MaxAttempts) {
-			if ($Sleep) {
-				sleep($Sleep);
-			}
+  /**
+   * Send a request to the tracker
+   *
+   * @param string $Path GET string to send to the tracker
+   * @param int $MaxAttempts Maximum number of failed attempts before giving up
+   * @param $Err Variable to use as storage for the error string if the request fails
+   * @return tracker response message or false if the request failed
+   */
+  private static function send_request($Get, $MaxAttempts = 1, &$Err = false) {
+    $Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
+    $Attempts = 0;
+    $Sleep = 0;
+    $Success = false;
+    $StartTime = microtime(true);
+    while (!$Success && $Attempts++ < $MaxAttempts) {
+      if ($Sleep) {
+        sleep($Sleep);
+      }
       $Sleep = 6;
 
-			// Send request
-			$File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
-			if ($File) {
-				if (fwrite($File, $Header) === false) {
-					$Err = "Failed to fwrite()";
-					$Sleep = 3;
-					continue;
-				}
-			} else {
-				$Err = "Failed to fsockopen() - $ErrorNum - $ErrorString";
-				continue;
-			}
+      // Send request
+      $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
+      if ($File) {
+        if (fwrite($File, $Header) === false) {
+          $Err = "Failed to fwrite()";
+          $Sleep = 3;
+          continue;
+        }
+      } else {
+        $Err = "Failed to fsockopen() - $ErrorNum - $ErrorString";
+        continue;
+      }
 
-			// Check for response.
-			$Response = '';
-			while (!feof($File)) {
-				$Response .= fread($File, 1024);
-			}
-			$DataStart = strpos($Response, "\r\n\r\n") + 4;
-			$DataEnd = strrpos($Response, "\n");
-			if ($DataEnd > $DataStart) {
-				$Data = substr($Response, $DataStart, $DataEnd - $DataStart);
-			} else {
-				$Data = "";
-			}
-			$Status = substr($Response, $DataEnd + 1);
-			if ($Status == "success") {
-				$Success = true;
-			}
-		}
-		$Request = array(
-			'path' => substr($Get, strpos($Get, '/')),
-			'response' => ($Success ? $Data : $Response),
-			'status' => ($Success ? 'ok' : 'failed'),
-			'time' => 1000 * (microtime(true) - $StartTime)
-		);
-		self::$Requests[] = $Request;
-		if ($Success) {
-			return $Data;
-		}
-		return false;
-	}
+      // Check for response.
+      $Response = '';
+      while (!feof($File)) {
+        $Response .= fread($File, 1024);
+      }
+      $DataStart = strpos($Response, "\r\n\r\n") + 4;
+      $DataEnd = strrpos($Response, "\n");
+      if ($DataEnd > $DataStart) {
+        $Data = substr($Response, $DataStart, $DataEnd - $DataStart);
+      } else {
+        $Data = "";
+      }
+      $Status = substr($Response, $DataEnd + 1);
+      if ($Status == "success") {
+        $Success = true;
+      }
+    }
+    $Request = array(
+      'path' => substr($Get, strpos($Get, '/')),
+      'response' => ($Success ? $Data : $Response),
+      'status' => ($Success ? 'ok' : 'failed'),
+      'time' => 1000 * (microtime(true) - $StartTime)
+    );
+    self::$Requests[] = $Request;
+    if ($Success) {
+      return $Data;
+    }
+    return false;
+  }
 }
 ?>

classes/useragent.class.php

@@ -1,160 +1,160 @@
 <?
 class UserAgent {
-	private static $Browsers = array(
-		//Less popular
-		'Shiira'			=> 'Shiira',
-		'Songbird'			=> 'Songbird',
-		'SeaMonkey'			=> 'SeaMonkey',
-		'OmniWeb'			=> 'OmniWeb',
-		'Camino'			=> 'Camino',
-		'Chimera'			=> 'Chimera',
-		'Epiphany'			=> 'Epiphany',
-		'Konqueror'			=> 'Konqueror',
-		'Iceweasel'			=> 'Iceweasel',
-		'Lynx'				=> 'Lynx',
-		'Links'				=> 'Links',
-		'libcurl'			=> 'cURL',
-		'midori'			=> 'Midori',
-		'Blackberry'		=> 'BlackBerry Browser',
-		//Big names
-		'Firefox'			=> 'Firefox',
-		'OPR'				=> 'Opera Blink', # Opera 15+ (the version running Blink)
-		'Opera'				=> 'Opera',
-		'Chrome'			=> 'Chrome',
-		'Safari'			=> 'Safari',
-		//Put Chrome Frame above IE
-		'chromeframe'		=> 'Chrome Frame',
-		'x-clock'			=> 'Chrome Frame',
-		'MSIE'				=> 'Internet Explorer',
-		'Trident'			=> 'Internet Explorer',
-		//Firefox versions
-		'Shiretoko'			=> 'Firefox (Experimental)',
-		'Minefield'			=> 'Firefox (Experimental)',
-		'GranParadiso'		=> 'Firefox (Experimental)',
-		'Namoroka'			=> 'Firefox (Experimental)',
-		'AppleWebKit'		=> 'WebKit',
-		'Mozilla'			=> 'Mozilla'
-		//Weird shit
-		/*
-		'WWW-Mechanize'		=> 'Perl',
-		'Wget'				=> 'Wget',
-		'BTWebClient'		=> 'µTorrent',
-		'Transmission'		=> 'Transmission',
-		'Java'				=> 'Java',
-		'RSS'				=> 'RSS Downloader'
-		*/
-	);
+  private static $Browsers = array(
+    //Less popular
+    'Shiira'      => 'Shiira',
+    'Songbird'      => 'Songbird',
+    'SeaMonkey'      => 'SeaMonkey',
+    'OmniWeb'      => 'OmniWeb',
+    'Camino'      => 'Camino',
+    'Chimera'      => 'Chimera',
+    'Epiphany'      => 'Epiphany',
+    'Konqueror'      => 'Konqueror',
+    'Iceweasel'      => 'Iceweasel',
+    'Lynx'        => 'Lynx',
+    'Links'        => 'Links',
+    'libcurl'      => 'cURL',
+    'midori'      => 'Midori',
+    'Blackberry'    => 'BlackBerry Browser',
+    //Big names
+    'Firefox'      => 'Firefox',
+    'OPR'        => 'Opera Blink', # Opera 15+ (the version running Blink)
+    'Opera'        => 'Opera',
+    'Chrome'      => 'Chrome',
+    'Safari'      => 'Safari',
+    //Put Chrome Frame above IE
+    'chromeframe'    => 'Chrome Frame',
+    'x-clock'      => 'Chrome Frame',
+    'MSIE'        => 'Internet Explorer',
+    'Trident'      => 'Internet Explorer',
+    //Firefox versions
+    'Shiretoko'      => 'Firefox (Experimental)',
+    'Minefield'      => 'Firefox (Experimental)',
+    'GranParadiso'    => 'Firefox (Experimental)',
+    'Namoroka'      => 'Firefox (Experimental)',
+    'AppleWebKit'    => 'WebKit',
+    'Mozilla'      => 'Mozilla'
+    //Weird shit
+    /*
+    'WWW-Mechanize'    => 'Perl',
+    'Wget'        => 'Wget',
+    'BTWebClient'    => 'µTorrent',
+    'Transmission'    => 'Transmission',
+    'Java'        => 'Java',
+    'RSS'        => 'RSS Downloader'
+    */
+  );
 
-	private static $OperatingSystems = array(
-		//Mobile
-		'SymbianOS'			=> 'Symbian',
-		'blackberry'		=> 'BlackBerry',
-		'iphone'			=> 'iPhone',
-		'ipod'				=> 'iPhone',
-		'android'			=> 'Android',
-		'palm'				=> 'Palm',
-		'mot-razr'			=> 'Motorola Razr',
-		// 'tablet PC'			=> 'Windows RT',
-		// 'ARM; Trident'		=> 'Windows RT',
-		//Windows
-		'Windows NT 10.0'	=> 'Windows 10',
-		'Windows NT 6.4'		=> 'Windows 10',
-		'Windows NT 6.3'	=> 'Windows 8.1',
-		'Windows 8.1'		=> 'Windows 8.1',
-		'Windows NT 6.2'	=> 'Windows 8',
-		'Windows 8'			=> 'Windows 8',
-		'Windows NT 6.1'	=> 'Windows 7',
-		'Windows 7'			=> 'Windows 7',
-		'Windows NT 6.0'	=> 'Windows Vista',
-		'Windows Vista'		=> 'Windows Vista',
-		'windows nt 5.2'	=> 'Windows 2003',
-		'windows 2003'		=> 'Windows 2003',
-		'windows nt 5.0'	=> 'Windows 2000',
-		'windows 2000'		=> 'Windows 2000',
-		'windows nt 5.1'	=> 'Windows XP',
-		'windows xp'		=> 'Windows XP',
-		'Win 9x 4.90'		=> 'Windows ME',
-		'Windows Me'		=> 'Windows ME',
-		'windows nt'		=> 'Windows NT',
-		'winnt'				=> 'Windows NT',
-		'windows 98'		=> 'Windows 98',
-		'windows ce'		=> 'Windows CE',
-		'win98'				=> 'Windows 98',
-		'windows 95'		=> 'Windows 95',
-		'windows 95'		=> 'Windows 95',
-		'win95'				=> 'Windows 95',
-		'win16'				=> 'Windows 3.1',
-		//'windows'			=> 'Windows',
-		'cros'				=> 'Chrome OS',
-		//OS X
-		'os x'				=> 'Mac OS X',
-		'macintosh'			=> 'Mac OS X',
-		'darwin'			=> 'Mac OS X',
-		//Less popular
-		'ubuntu'			=> 'Ubuntu',
-		'debian'			=> 'Debian',
-		'fedora'			=> 'Fedora',
-		'freebsd'			=> 'FreeBSD',
-		'openbsd'			=> 'OpenBSD',
-		'bsd'				=> 'BSD',
-		'x11'				=> 'Linux',
-		'gnu'				=> 'Linux',
-		'linux'				=> 'Linux',
-		'unix'				=> 'Unix',
-		'Sun OS'			=> 'Sun',
-		'Sun'				=> 'Sun',
-		//Weird shit
-		/*
-		'WWW-Mechanize'		=> 'Perl',
-		'Wget'				=> 'Wget',
-		'BTWebClient'		=> 'µTorrent',
-		'Transmission'		=> 'Transmission',
-		'Java'				=> 'Java',
-		'RSS'				=> 'RSS Downloader',
-		*/
-		//Catch-all
-		'win'				=> 'Windows',
-		'mac'				=> 'Mac OS X'
-	);
+  private static $OperatingSystems = array(
+    //Mobile
+    'SymbianOS'      => 'Symbian',
+    'blackberry'    => 'BlackBerry',
+    'iphone'      => 'iPhone',
+    'ipod'        => 'iPhone',
+    'android'      => 'Android',
+    'palm'        => 'Palm',
+    'mot-razr'      => 'Motorola Razr',
+    // 'tablet PC'      => 'Windows RT',
+    // 'ARM; Trident'    => 'Windows RT',
+    //Windows
+    'Windows NT 10.0'  => 'Windows 10',
+    'Windows NT 6.4'    => 'Windows 10',
+    'Windows NT 6.3'  => 'Windows 8.1',
+    'Windows 8.1'    => 'Windows 8.1',
+    'Windows NT 6.2'  => 'Windows 8',
+    'Windows 8'      => 'Windows 8',
+    'Windows NT 6.1'  => 'Windows 7',
+    'Windows 7'      => 'Windows 7',
+    'Windows NT 6.0'  => 'Windows Vista',
+    'Windows Vista'    => 'Windows Vista',
+    'windows nt 5.2'  => 'Windows 2003',
+    'windows 2003'    => 'Windows 2003',
+    'windows nt 5.0'  => 'Windows 2000',
+    'windows 2000'    => 'Windows 2000',
+    'windows nt 5.1'  => 'Windows XP',
+    'windows xp'    => 'Windows XP',
+    'Win 9x 4.90'    => 'Windows ME',
+    'Windows Me'    => 'Windows ME',
+    'windows nt'    => 'Windows NT',
+    'winnt'        => 'Windows NT',
+    'windows 98'    => 'Windows 98',
+    'windows ce'    => 'Windows CE',
+    'win98'        => 'Windows 98',
+    'windows 95'    => 'Windows 95',
+    'windows 95'    => 'Windows 95',
+    'win95'        => 'Windows 95',
+    'win16'        => 'Windows 3.1',
+    //'windows'      => 'Windows',
+    'cros'        => 'Chrome OS',
+    //OS X
+    'os x'        => 'Mac OS X',
+    'macintosh'      => 'Mac OS X',
+    'darwin'      => 'Mac OS X',
+    //Less popular
+    'ubuntu'      => 'Ubuntu',
+    'debian'      => 'Debian',
+    'fedora'      => 'Fedora',
+    'freebsd'      => 'FreeBSD',
+    'openbsd'      => 'OpenBSD',
+    'bsd'        => 'BSD',
+    'x11'        => 'Linux',
+    'gnu'        => 'Linux',
+    'linux'        => 'Linux',
+    'unix'        => 'Unix',
+    'Sun OS'      => 'Sun',
+    'Sun'        => 'Sun',
+    //Weird shit
+    /*
+    'WWW-Mechanize'    => 'Perl',
+    'Wget'        => 'Wget',
+    'BTWebClient'    => 'µTorrent',
+    'Transmission'    => 'Transmission',
+    'Java'        => 'Java',
+    'RSS'        => 'RSS Downloader',
+    */
+    //Catch-all
+    'win'        => 'Windows',
+    'mac'        => 'Mac OS X'
+  );
 
-	public static function operating_system(&$UserAgentString) {
-		if (empty($UserAgentString)) {
-			return 'Hidden';
-		}
-		foreach (self::$OperatingSystems as $String => $OperatingSystem) {
-			if (stripos($UserAgentString, $String) !== false) {
-				return $OperatingSystem;
-			}
-		}
-		return 'Unknown';
-	}
+  public static function operating_system(&$UserAgentString) {
+    if (empty($UserAgentString)) {
+      return 'Hidden';
+    }
+    foreach (self::$OperatingSystems as $String => $OperatingSystem) {
+      if (stripos($UserAgentString, $String) !== false) {
+        return $OperatingSystem;
+      }
+    }
+    return 'Unknown';
+  }
 
-	public static function mobile(&$UserAgentString) {
-		if (strpos($UserAgentString, 'iPad') !== false) {
-			return false;
-		}
+  public static function mobile(&$UserAgentString) {
+    if (strpos($UserAgentString, 'iPad') !== false) {
+      return false;
+    }
 
-		// "Mobi" catches "Mobile" too
-		if (strpos($UserAgentString, 'Device') || strpos($UserAgentString, 'Mobi') || strpos($UserAgentString, 'Mini') || strpos($UserAgentString, 'webOS')) {
-			return true;
-		}
-		return false;
-	}
+    // "Mobi" catches "Mobile" too
+    if (strpos($UserAgentString, 'Device') || strpos($UserAgentString, 'Mobi') || strpos($UserAgentString, 'Mini') || strpos($UserAgentString, 'webOS')) {
+      return true;
+    }
+    return false;
+  }
 
-	public static function browser(&$UserAgentString) {
-		if (empty($UserAgentString)) {
-			return 'Hidden';
-		}
-		$Return = 'Unknown';
-		foreach (self::$Browsers as $String => $Browser) {
-			if (strpos($UserAgentString, $String) !== false) {
-				$Return = $Browser;
-				break;
-			}
-		}
-		if (self::mobile($UserAgentString)) {
-			$Return .= ' Mobile';
-		}
-		return $Return;
-	}
+  public static function browser(&$UserAgentString) {
+    if (empty($UserAgentString)) {
+      return 'Hidden';
+    }
+    $Return = 'Unknown';
+    foreach (self::$Browsers as $String => $Browser) {
+      if (strpos($UserAgentString, $String) !== false) {
+        $Return = $Browser;
+        break;
+      }
+    }
+    if (self::mobile($UserAgentString)) {
+      $Return .= ' Mobile';
+    }
+    return $Return;
+  }
 }

classes/userrank.class.php

@@ -1,161 +1,161 @@
 <?
 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("
-			CREATE TEMPORARY TABLE temp_stats (
-				ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-				Val bigint(20) NOT NULL
-			);");
-
-		G::$DB->query("
-			INSERT INTO temp_stats (Val) ".
-			$Query);
-
-		G::$DB->query("
-			SELECT COUNT(ID)
-			FROM temp_stats");
-		list($UserCount) = G::$DB->next_record();
-
-		G::$DB->query("
-			SELECT MIN(Val)
-			FROM temp_stats
-			GROUP BY CEIL(ID / (".(int)$UserCount." / 100));");
-
-		$Table = G::$DB->to_array();
-
-		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);
-
-		return $Table;
-	}
-
-	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 =  "
-					SELECT Downloaded
-					FROM users_main
-					WHERE Enabled = '1'
-						AND Downloaded > 0
-					ORDER BY Downloaded;";
-				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 = "
-					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 = "
-					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 = "
-					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
-					ORDER BY Bounty;";
-				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
-						JOIN torrents AS t ON t.GroupID = tg.ID
-					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;
-		}
-
-		$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
-	}
-
-	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;
-	}
+  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("
+      CREATE TEMPORARY TABLE temp_stats (
+        ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+        Val bigint(20) NOT NULL
+      );");
+
+    G::$DB->query("
+      INSERT INTO temp_stats (Val) ".
+      $Query);
+
+    G::$DB->query("
+      SELECT COUNT(ID)
+      FROM temp_stats");
+    list($UserCount) = G::$DB->next_record();
+
+    G::$DB->query("
+      SELECT MIN(Val)
+      FROM temp_stats
+      GROUP BY CEIL(ID / (".(int)$UserCount." / 100));");
+
+    $Table = G::$DB->to_array();
+
+    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);
+
+    return $Table;
+  }
+
+  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 =  "
+          SELECT Downloaded
+          FROM users_main
+          WHERE Enabled = '1'
+            AND Downloaded > 0
+          ORDER BY Downloaded;";
+        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 = "
+          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 = "
+          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 = "
+          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
+          ORDER BY Bounty;";
+        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
+            JOIN torrents AS t ON t.GroupID = tg.ID
+          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;
+    }
+
+    $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
+  }
+
+  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;
+  }
 
 }
 

classes/util.php

@@ -9,30 +9,30 @@
  * @return bool
  */
 if (PHP_INT_SIZE === 4) {
-	function is_number($Str) {
-		if ($Str === null || $Str === '') {
-			return false;
-		}
-		if (is_int($Str)) {
-			return true;
-		}
-		if ($Str[0] == '-' || $Str[0] == '+') { // Leading plus/minus signs are ok
-			$Str[0] = 0;
-		}
-		return ltrim($Str, "0..9") === '';
-	}
+  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") === '';
+  }
 } 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;
+  list($Y, $M, $D) = explode('-', $Date);
+  if (checkdate($M, $D, $Y)) {
+    return true;
+  }
+  return false;
 }
 
 /**
@@ -43,15 +43,15 @@ function is_date($Date) {
  * @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);
-		}
-	}
+  // 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);
+    }
+  }
 }
 
 /**
@@ -62,31 +62,31 @@ function assert_numbers(&$Base, $Keys, $Error = 0) {
  *         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;
-		}
-	}
-	if (is_numeric($Value)) {
-		if ($Value == 1) {
-			return true;
-		} elseif ($Value == 0) {
-			return false;
-		}
-	}
-	return null;
+  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;
+    }
+  }
+  if (is_numeric($Value)) {
+    if ($Value == 1) {
+      return true;
+    } elseif ($Value == 0) {
+      return false;
+    }
+  }
+  return null;
 }
 
 /**
@@ -97,33 +97,33 @@ function is_bool_value($Value) {
  * @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,5};)/m", '&', $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;
+  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,5};)/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;
 }
 
 
@@ -133,10 +133,10 @@ function display_str($Str) {
  * @param string $Raw An IRC protocol snippet to send.
  */
 function send_irc($Raw) {
-	$IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
-	$Raw = str_replace(array("\n", "\r"), '', $Raw);
-	fwrite($IRCSocket, $Raw);
-	fclose($IRCSocket);
+  $IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
+  $Raw = str_replace(array("\n", "\r"), '', $Raw);
+  fwrite($IRCSocket, $Raw);
+  fclose($IRCSocket);
 }
 
 
@@ -144,16 +144,16 @@ function send_irc($Raw) {
  * Display a critical error and kills the page.
  *
  * @param string $Error Error type. Automatically supported:
- *	403, 404, 0 (invalid input), -1 (invalid request)
- *	If you use your own string for Error, it becomes the error description.
+ *  403, 404, 0 (invalid input), -1 (invalid request)
+ *  If you use your own string for Error, it becomes the error description.
  * @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();
+  global $Debug;
+  require(SERVER_ROOT.'/sections/error/index.php');
+  $Debug->profile();
+  die();
 }
 
 
@@ -161,11 +161,11 @@ function error($Error, $NoHTML = false, $Log = false) {
  * Convenience function. See doc in permissions.class.php
  */
 function check_perms($PermissionName, $MinClass = 0) {
-	return Permissions::check_perms($PermissionName, $MinClass);
+  return Permissions::check_perms($PermissionName, $MinClass);
 }
 
 function get_permissions_for_user($UserID, $CustomPermissions = false) {
-	return Permissions::get_permissions_for_user($UserID, $CustomPermissions = false);
+  return Permissions::get_permissions_for_user($UserID, $CustomPermissions = false);
 }
 
 /**
@@ -173,27 +173,27 @@ function get_permissions_for_user($UserID, $CustomPermissions = false) {
  * DO NOT USE THIS FUNCTION!
  */
 function json_die($Status, $Message) {
-	json_print($Status, $Message);
-	die();
+  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' => array()));
-	}
+  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' => array()));
+  }
 }
 
 /**
  * Print the site's URL including the appropriate URI scheme, including the trailing slash
  */
 function site_url() {
-	return 'https://' . SITE_DOMAIN . '/';
+  return 'https://' . SITE_DOMAIN . '/';
 }
 ?>

classes/validate.class.php

@@ -6,294 +6,294 @@ Finish the GenerateJS stuff
 //-----------------------------------*/
 
 class VALIDATE {
-	var $Fields = array();
-
-	function SetFields($FieldName, $Required, $FieldType, $ErrorMessage, $Options = array()) {
-		$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 .= "//<![CDATA[\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 = '';
-		}
-
-		$ReturnJS .= "}\r\n";
-		$ReturnJS .= "//]]>\r\n";
-		$ReturnJS .= "</script>\r\n";
-		return $ReturnJS;
-	}
+  var $Fields = array();
+
+  function SetFields($FieldName, $Required, $FieldType, $ErrorMessage, $Options = array()) {
+    $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 .= "//<![CDATA[\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 = '';
+    }
+
+    $ReturnJS .= "}\r\n";
+    $ReturnJS .= "//]]>\r\n";
+    $ReturnJS .= "</script>\r\n";
+    return $ReturnJS;
+  }
 }
 ?>

classes/view.class.php

@@ -1,34 +1,34 @@
 <?
 class View {
-	/**
-	 * @var string Path relative to where (P)HTML templates reside
-	 */
-	const IncludePath = './design/views/';
+  /**
+   * @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 {
+    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
       $TT = (!isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster']);
       $Scripts = array_merge(['jquery', 'script_start', 'ajax.class', 'global', 'jquery.autocomplete', 'autocomplete'], ($TT ? ['tooltipster', 'tooltipster_settings'] : []), explode(',', $JSIncludes));
@@ -42,102 +42,102 @@ class View {
         if (trim($Style) == '') { continue; }
         header('Link: </'.STATIC_SERVER.'styles/'.$Style.'/style.css?v='.filemtime(SERVER_ROOT.'/static/styles/'.$Style.'/style.css').'>; rel=preload;', false);
       }
-			require(SERVER_ROOT.'/design/privateheader.php');
-		}
-	}
+      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 = array()) {
-		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 = array()) {
+    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;
-		}
-		$ClassName::render($Args);
-	}
+      // 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);
+  }
 
-	/**
-	 * 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 = array(), $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 = array(), $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;
+    }
+  }
 }

classes/votes.class.php

@@ -1,314 +1,314 @@
 <?
 class Votes {
-	/**
-	 * Confidence level for binomial scoring
-	 */
-	//const Z_VAL = 1.645211440143815; // p-value .95
-	const Z_VAL = 1.281728756502709; // p-value .90
-
-	/**
-	 * Generate voting links for torrent pages, etc.
-	 * @param $GroupID
-	 * @param $Vote The pre-existing vote, if it exists 'Up'|'Down'
-	 */
-	public static function vote_link($GroupID, $Vote = '') {
-		if (!G::$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?>
-			<span class="votespan brackets" style="white-space: nowrap;">
-				Vote:
-				<a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvote">&and;</a>
-				<span class="tooltip voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvoted">&and;</span>
-				<a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvote">&or;</a>
-				<span class="tooltip voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvoted">&or;</span>
-				<a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote) ? ' hidden' : '')?>" title="Clear your vote">x</a>
-			</span>
-<?		}
-	}
-
-	/**
-	 * Returns an array with User Vote data: GroupID and vote type
-	 * @param string|int $UserID
-	 * @return array GroupID=>(GroupID, 'Up'|'Down')
-	 */
-	public static function get_user_votes($UserID) {
-		if ((int)$UserID == 0) {
-			return array();
-		}
-
-		$UserVotes = G::$Cache->get_value("voted_albums_$UserID");
-		if ($UserVotes === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT GroupID, Type
-				FROM users_votes
-				WHERE UserID = $UserID");
-			$UserVotes = G::$DB->to_array('GroupID', MYSQL_ASSOC, false);
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value("voted_albums_$UserID", $UserVotes);
-		}
-		return $UserVotes;
-	}
-
-	/**
-	 * Returns an array with torrent group vote data
-	 * @param string|int $GroupID
-	 * @return array (Upvotes, Total Votes)
-	 */
-	public static function get_group_votes($GroupID) {
-		if (!is_number($GroupID)) {
-			return array('Ups' => 0, 'Total' => 0);
-		}
-		$GroupVotes = G::$Cache->get_value("votes_$GroupID");
-		if ($GroupVotes === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT Ups AS Ups, Total AS Total
-				FROM torrents_votes
-				WHERE GroupID = $GroupID");
-			if (!G::$DB->has_results()) {
-				$GroupVotes = array('Ups' => 0, 'Total' => 0);
-			} else {
-				$GroupVotes = G::$DB->next_record(MYSQLI_ASSOC, false);
-			}
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value("votes_$GroupID", $GroupVotes, 259200); // 3 days
-		}
-		return $GroupVotes;
-	}
-
-	/**
-	 * Computes the inverse normal CDF of a p-value
-	 * @param float $GroupID
-	 * @return float Inverse Normal CDF
-	 */
-	private function inverse_ncdf($p) {
-	/***************************************************************************
-	 *																inverse_ncdf.php
-	 *														-------------------
-	 *	 begin								: Friday, January 16, 2004
-	 *	 copyright						: (C) 2004 Michael Nickerson
-	 *	 email								: nickersonm@yahoo.com
-	 *
-	 ***************************************************************************/
-
-		//Inverse ncdf approximation by Peter John Acklam, implementation adapted to
-		//PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
-		//a guide.	http://home.online.no/~pjacklam/notes/invnorm/index.html
-		//I have not checked the accuracy of this implementation.	Be aware that PHP
-		//will truncate the coeficcients to 14 digits.
-
-		//You have permission to use and distribute this function freely for
-		//whatever purpose you want, but please show common courtesy and give credit
-		//where credit is due.
-
-		//Input paramater is $p - probability - where 0 < p < 1.
-
-		//Coefficients in rational approximations
-		$a = array(1 => -3.969683028665376e+01, 2 => 2.209460984245205e+02,
-				   3 => -2.759285104469687e+02, 4 => 1.383577518672690e+02,
-				   5 => -3.066479806614716e+01, 6 => 2.506628277459239e+00);
-
-		$b = array(1 => -5.447609879822406e+01, 2 => 1.615858368580409e+02,
-				   3 => -1.556989798598866e+02, 4 => 6.680131188771972e+01,
-				   5 => -1.328068155288572e+01);
-
-		$c = array(1 => -7.784894002430293e-03, 2 => -3.223964580411365e-01,
-				   3 => -2.400758277161838e+00, 4 => -2.549732539343734e+00,
-				   5 => 4.374664141464968e+00,  6 => 2.938163982698783e+00);
-
-		$d = array(1 => 7.784695709041462e-03, 2 => 3.224671290700398e-01,
-				   3 => 2.445134137142996e+00, 4 => 3.754408661907416e+00);
-
-		//Define break-points.
-		$p_low  = 0.02425;									 //Use lower region approx. below this
-		$p_high = 1 - $p_low;								 //Use upper region approx. above this
-
-		//Define/list variables (doesn't really need a definition)
-		//$p (probability), $sigma (std. deviation), and $mu (mean) are user inputs
-		$q = null; $x = null; $y = null; $r = null;
-
-		//Rational approximation for lower region.
-		if (0 < $p && $p < $p_low) {
-			$q = sqrt(-2 * log($p));
-			$x = ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) *
-					 $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) *
-					 $q + 1);
-		}
-
-		//Rational approximation for central region.
-		elseif ($p_low <= $p && $p <= $p_high) {
-			$q = $p - 0.5;
-			$r = $q * $q;
-			$x = ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) *
-					 $r + $a[6]) * $q / ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r +
-					 $b[4]) * $r + $b[5]) * $r + 1);
-		}
-
-		//Rational approximation for upper region.
-		elseif ($p_high < $p && $p < 1) {
-			$q = sqrt(-2 * log(1 - $p));
-			$x = -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q +
-					 $c[5]) * $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) *
-					 $q + $d[4]) * $q + 1);
-		}
-
-		//If 0 < p < 1, return a null value
-		else {
-			$x = null;
-		}
-
-		return $x;
-		//END inverse ncdf implementation.
-	}
-
-	/**
-	 * Implementation of the algorithm described at http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
-	 * @param int $Ups Number of upvotes
-	 * @param int $Total Number of total votes
-	 * @return float Ranking score
-	 */
-	public static function binomial_score($Ups, $Total) {
-		if (($Total <= 0) || ($Ups < 0)) {
-			return 0;
-		}
-		$phat = $Ups / $Total;
-		$Numerator = ($phat + self::Z_VAL * self::Z_VAL / (2 * $Total) - self::Z_VAL * sqrt(($phat * (1 - $phat) + self::Z_VAL * self::Z_VAL / (4 * $Total)) / $Total));
-		$Denominator = (1 + self::Z_VAL * self::Z_VAL / $Total);
-		return ($Numerator / $Denominator);
-	}
-
-	/**
-	 * Gets where this album ranks overall, for its year, and for its decade.  This is really just a wrapper.
-	 * @param int $GroupID GroupID of the album
-	 * @param int $Year Year it was released
-	 * @return array ('overall'=><overall rank>, 'year'=><rank for its year>, 'decade'=><rank for its decade>)
-	 */
-	public static function get_ranking($GroupID, $Year) {
-		$GroupID = (int)$GroupID;
-		$Year = (int)$Year;
-		if ($GroupID <= 0 || $Year <= 0) {
-			return false;
-		}
-
-		return array(
-				'overall' => Votes::get_rank_all($GroupID),
-				'year'    => Votes::get_rank_year($GroupID, $Year),
-				'decade'  => Votes::get_rank_decade($GroupID, $Year));
-	}
-
-	/**
-	 * Gets where this album ranks overall.
-	 * @param int $GroupID GroupID of the album
-	 * @return int Rank
-	 */
-	public static function get_rank_all($GroupID) {
-		$GroupID = (int)$GroupID;
-		if ($GroupID <= 0) {
-			return false;
-		}
-
-		$Rankings = G::$Cache->get_value('voting_ranks_overall');
-		if ($Rankings === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query('
-				SELECT GroupID, Score
-				FROM torrents_votes
-				ORDER BY Score DESC
-				LIMIT 100');
-			$Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value('voting_ranks_overall', $Rankings, 259200); // 3 days
-		}
-
-		return ($Rankings[$GroupID] ?? false);
-	}
-
-	/**
-	 * Gets where this album ranks in its year.
-	 * @param int $GroupID GroupID of the album
-	 * @param int $Year Year it was released
-	 * @return int Rank for its year
-	 */
-	public static function get_rank_year($GroupID, $Year) {
-		$GroupID = (int)$GroupID;
-		$Year = (int)$Year;
-		if ($GroupID <= 0 || $Year <= 0) {
-			return false;
-		}
-
-		$Rankings = G::$Cache->get_value("voting_ranks_year_$Year");
-		if ($Rankings === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT GroupID, Score
-				FROM torrents_votes  AS v
-					JOIN torrents_group AS g ON g.ID = v.GroupID
-				WHERE g.Year = $Year
-				ORDER BY Score DESC
-				LIMIT 100");
-			$Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value("voting_ranks_year_$Year", $Rankings, 259200); // 3 days
-		}
-
-		return ($Rankings[$GroupID] ?? false);
-	}
-
-	/**
-	 * Gets where this album ranks in its decade.
-	 * @param int $GroupID GroupID of the album
-	 * @param int $Year Year it was released
-	 * @return int Rank for its year
-	 */
-	public static function get_rank_decade($GroupID, $Year) {
-		$GroupID = (int)$GroupID;
-		$Year = (int)$Year;
-		if ($GroupID <= 0 || $Year <= 0) {
-			return false;
-		}
-
-		// First year of the decade
-		$Year = $Year - ($Year % 10);
-
-		$Rankings = G::$Cache->get_value("voting_ranks_decade_$Year");
-		if ($Rankings === false) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT GroupID, Score
-				FROM torrents_votes  AS v
-					JOIN torrents_group AS g ON g.ID = v.GroupID
-				WHERE g.Year BETWEEN $Year AND " . ($Year + 9) . "
-					  AND g.CategoryID = 1
-				ORDER BY Score DESC
-				LIMIT 100");
-			$Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value("voting_ranks_decade_$Year", $Rankings, 259200); // 3 days
-		}
-
-		return ($Rankings[$GroupID] ?? false);
-	}
-
-	/**
-	 * Turn vote scores into vote ranks. This basically only sorts out tied ranks
-	 *
-	 * @param array $GroupScores array (<GroupID> => <Score>) ordered by Score
-	 * @return array (<GroupID> => <Rank>)
-	 */
-	public static function calc_ranks($GroupScores) {
-		$Rankings = array();
-		$PrevScore = $PrevRank = false;
-		$Rank = 1;
-		foreach ($GroupScores as $GroupID => $Score) {
-			if ($Score === $PrevScore) {
-				$Rankings[$GroupID] = $PrevRank;
-			} else {
-				$Rankings[$GroupID] = $Rank;
-				$PrevRank = $Rank;
-				$PrevScore = $Score;
-			}
-			$Rank++;
-		}
-		return $Rankings;
-	}
+  /**
+   * Confidence level for binomial scoring
+   */
+  //const Z_VAL = 1.645211440143815; // p-value .95
+  const Z_VAL = 1.281728756502709; // p-value .90
+
+  /**
+   * Generate voting links for torrent pages, etc.
+   * @param $GroupID
+   * @param $Vote The pre-existing vote, if it exists 'Up'|'Down'
+   */
+  public static function vote_link($GroupID, $Vote = '') {
+    if (!G::$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?>
+      <span class="votespan brackets" style="white-space: nowrap;">
+        Vote:
+        <a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvote">&and;</a>
+        <span class="tooltip voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvoted">&and;</span>
+        <a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvote">&or;</a>
+        <span class="tooltip voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvoted">&or;</span>
+        <a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote) ? ' hidden' : '')?>" title="Clear your vote">x</a>
+      </span>
+<?    }
+  }
+
+  /**
+   * Returns an array with User Vote data: GroupID and vote type
+   * @param string|int $UserID
+   * @return array GroupID=>(GroupID, 'Up'|'Down')
+   */
+  public static function get_user_votes($UserID) {
+    if ((int)$UserID == 0) {
+      return array();
+    }
+
+    $UserVotes = G::$Cache->get_value("voted_albums_$UserID");
+    if ($UserVotes === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT GroupID, Type
+        FROM users_votes
+        WHERE UserID = $UserID");
+      $UserVotes = G::$DB->to_array('GroupID', MYSQL_ASSOC, false);
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value("voted_albums_$UserID", $UserVotes);
+    }
+    return $UserVotes;
+  }
+
+  /**
+   * Returns an array with torrent group vote data
+   * @param string|int $GroupID
+   * @return array (Upvotes, Total Votes)
+   */
+  public static function get_group_votes($GroupID) {
+    if (!is_number($GroupID)) {
+      return array('Ups' => 0, 'Total' => 0);
+    }
+    $GroupVotes = G::$Cache->get_value("votes_$GroupID");
+    if ($GroupVotes === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT Ups AS Ups, Total AS Total
+        FROM torrents_votes
+        WHERE GroupID = $GroupID");
+      if (!G::$DB->has_results()) {
+        $GroupVotes = array('Ups' => 0, 'Total' => 0);
+      } else {
+        $GroupVotes = G::$DB->next_record(MYSQLI_ASSOC, false);
+      }
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value("votes_$GroupID", $GroupVotes, 259200); // 3 days
+    }
+    return $GroupVotes;
+  }
+
+  /**
+   * Computes the inverse normal CDF of a p-value
+   * @param float $GroupID
+   * @return float Inverse Normal CDF
+   */
+  private function inverse_ncdf($p) {
+  /***************************************************************************
+   *                                inverse_ncdf.php
+   *                            -------------------
+   *   begin                : Friday, January 16, 2004
+   *   copyright            : (C) 2004 Michael Nickerson
+   *   email                : nickersonm@yahoo.com
+   *
+   ***************************************************************************/
+
+    //Inverse ncdf approximation by Peter John Acklam, implementation adapted to
+    //PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
+    //a guide.  http://home.online.no/~pjacklam/notes/invnorm/index.html
+    //I have not checked the accuracy of this implementation.  Be aware that PHP
+    //will truncate the coeficcients to 14 digits.
+
+    //You have permission to use and distribute this function freely for
+    //whatever purpose you want, but please show common courtesy and give credit
+    //where credit is due.
+
+    //Input paramater is $p - probability - where 0 < p < 1.
+
+    //Coefficients in rational approximations
+    $a = array(1 => -3.969683028665376e+01, 2 => 2.209460984245205e+02,
+           3 => -2.759285104469687e+02, 4 => 1.383577518672690e+02,
+           5 => -3.066479806614716e+01, 6 => 2.506628277459239e+00);
+
+    $b = array(1 => -5.447609879822406e+01, 2 => 1.615858368580409e+02,
+           3 => -1.556989798598866e+02, 4 => 6.680131188771972e+01,
+           5 => -1.328068155288572e+01);
+
+    $c = array(1 => -7.784894002430293e-03, 2 => -3.223964580411365e-01,
+           3 => -2.400758277161838e+00, 4 => -2.549732539343734e+00,
+           5 => 4.374664141464968e+00,  6 => 2.938163982698783e+00);
+
+    $d = array(1 => 7.784695709041462e-03, 2 => 3.224671290700398e-01,
+           3 => 2.445134137142996e+00, 4 => 3.754408661907416e+00);
+
+    //Define break-points.
+    $p_low  = 0.02425;                   //Use lower region approx. below this
+    $p_high = 1 - $p_low;                 //Use upper region approx. above this
+
+    //Define/list variables (doesn't really need a definition)
+    //$p (probability), $sigma (std. deviation), and $mu (mean) are user inputs
+    $q = null; $x = null; $y = null; $r = null;
+
+    //Rational approximation for lower region.
+    if (0 < $p && $p < $p_low) {
+      $q = sqrt(-2 * log($p));
+      $x = ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) *
+           $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) *
+           $q + 1);
+    }
+
+    //Rational approximation for central region.
+    elseif ($p_low <= $p && $p <= $p_high) {
+      $q = $p - 0.5;
+      $r = $q * $q;
+      $x = ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) *
+           $r + $a[6]) * $q / ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r +
+           $b[4]) * $r + $b[5]) * $r + 1);
+    }
+
+    //Rational approximation for upper region.
+    elseif ($p_high < $p && $p < 1) {
+      $q = sqrt(-2 * log(1 - $p));
+      $x = -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q +
+           $c[5]) * $q + $c[6]) / (((($d[1] * $q + $d[2]) * $q + $d[3]) *
+           $q + $d[4]) * $q + 1);
+    }
+
+    //If 0 < p < 1, return a null value
+    else {
+      $x = null;
+    }
+
+    return $x;
+    //END inverse ncdf implementation.
+  }
+
+  /**
+   * Implementation of the algorithm described at http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
+   * @param int $Ups Number of upvotes
+   * @param int $Total Number of total votes
+   * @return float Ranking score
+   */
+  public static function binomial_score($Ups, $Total) {
+    if (($Total <= 0) || ($Ups < 0)) {
+      return 0;
+    }
+    $phat = $Ups / $Total;
+    $Numerator = ($phat + self::Z_VAL * self::Z_VAL / (2 * $Total) - self::Z_VAL * sqrt(($phat * (1 - $phat) + self::Z_VAL * self::Z_VAL / (4 * $Total)) / $Total));
+    $Denominator = (1 + self::Z_VAL * self::Z_VAL / $Total);
+    return ($Numerator / $Denominator);
+  }
+
+  /**
+   * Gets where this album ranks overall, for its year, and for its decade.  This is really just a wrapper.
+   * @param int $GroupID GroupID of the album
+   * @param int $Year Year it was released
+   * @return array ('overall'=><overall rank>, 'year'=><rank for its year>, 'decade'=><rank for its decade>)
+   */
+  public static function get_ranking($GroupID, $Year) {
+    $GroupID = (int)$GroupID;
+    $Year = (int)$Year;
+    if ($GroupID <= 0 || $Year <= 0) {
+      return false;
+    }
+
+    return array(
+        'overall' => Votes::get_rank_all($GroupID),
+        'year'    => Votes::get_rank_year($GroupID, $Year),
+        'decade'  => Votes::get_rank_decade($GroupID, $Year));
+  }
+
+  /**
+   * Gets where this album ranks overall.
+   * @param int $GroupID GroupID of the album
+   * @return int Rank
+   */
+  public static function get_rank_all($GroupID) {
+    $GroupID = (int)$GroupID;
+    if ($GroupID <= 0) {
+      return false;
+    }
+
+    $Rankings = G::$Cache->get_value('voting_ranks_overall');
+    if ($Rankings === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query('
+        SELECT GroupID, Score
+        FROM torrents_votes
+        ORDER BY Score DESC
+        LIMIT 100');
+      $Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value('voting_ranks_overall', $Rankings, 259200); // 3 days
+    }
+
+    return ($Rankings[$GroupID] ?? false);
+  }
+
+  /**
+   * Gets where this album ranks in its year.
+   * @param int $GroupID GroupID of the album
+   * @param int $Year Year it was released
+   * @return int Rank for its year
+   */
+  public static function get_rank_year($GroupID, $Year) {
+    $GroupID = (int)$GroupID;
+    $Year = (int)$Year;
+    if ($GroupID <= 0 || $Year <= 0) {
+      return false;
+    }
+
+    $Rankings = G::$Cache->get_value("voting_ranks_year_$Year");
+    if ($Rankings === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT GroupID, Score
+        FROM torrents_votes  AS v
+          JOIN torrents_group AS g ON g.ID = v.GroupID
+        WHERE g.Year = $Year
+        ORDER BY Score DESC
+        LIMIT 100");
+      $Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value("voting_ranks_year_$Year", $Rankings, 259200); // 3 days
+    }
+
+    return ($Rankings[$GroupID] ?? false);
+  }
+
+  /**
+   * Gets where this album ranks in its decade.
+   * @param int $GroupID GroupID of the album
+   * @param int $Year Year it was released
+   * @return int Rank for its year
+   */
+  public static function get_rank_decade($GroupID, $Year) {
+    $GroupID = (int)$GroupID;
+    $Year = (int)$Year;
+    if ($GroupID <= 0 || $Year <= 0) {
+      return false;
+    }
+
+    // First year of the decade
+    $Year = $Year - ($Year % 10);
+
+    $Rankings = G::$Cache->get_value("voting_ranks_decade_$Year");
+    if ($Rankings === false) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT GroupID, Score
+        FROM torrents_votes  AS v
+          JOIN torrents_group AS g ON g.ID = v.GroupID
+        WHERE g.Year BETWEEN $Year AND " . ($Year + 9) . "
+            AND g.CategoryID = 1
+        ORDER BY Score DESC
+        LIMIT 100");
+      $Rankings = self::calc_ranks(G::$DB->to_pair(0, 1, false));
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value("voting_ranks_decade_$Year", $Rankings, 259200); // 3 days
+    }
+
+    return ($Rankings[$GroupID] ?? false);
+  }
+
+  /**
+   * Turn vote scores into vote ranks. This basically only sorts out tied ranks
+   *
+   * @param array $GroupScores array (<GroupID> => <Score>) ordered by Score
+   * @return array (<GroupID> => <Rank>)
+   */
+  public static function calc_ranks($GroupScores) {
+    $Rankings = array();
+    $PrevScore = $PrevRank = false;
+    $Rank = 1;
+    foreach ($GroupScores as $GroupID => $Score) {
+      if ($Score === $PrevScore) {
+        $Rankings[$GroupID] = $PrevRank;
+      } else {
+        $Rankings[$GroupID] = $Rank;
+        $PrevRank = $Rank;
+        $PrevScore = $Score;
+      }
+      $Rank++;
+    }
+    return $Rankings;
+  }
 }
 ?>

classes/wiki.class.php

@@ -1,100 +1,100 @@
 <?
 class Wiki {
-	/**
-	 * Normalize an alias
-	 * @param string $str
-	 * @return string
-	 */
-	public static function normalize_alias($str) {
-		return trim(substr(preg_replace('/[^a-z0-9]/', '', strtolower(htmlentities($str))), 0, 50));
-	}
+  /**
+   * Normalize an alias
+   * @param string $str
+   * @return string
+   */
+  public static function normalize_alias($str) {
+    return trim(substr(preg_replace('/[^a-z0-9]/', '', strtolower(htmlentities($str))), 0, 50));
+  }
 
-	/**
-	 * Get all aliases in an associative array of Alias => ArticleID
-	 * @return array
-	 */
-	public static function get_aliases() {
-		$Aliases = G::$Cache->get_value('wiki_aliases');
-		if (!$Aliases) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT Alias, ArticleID
-				FROM wiki_aliases");
-			$Aliases = G::$DB->to_pair('Alias', 'ArticleID');
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks
-		}
-		return $Aliases;
-	}
+  /**
+   * Get all aliases in an associative array of Alias => ArticleID
+   * @return array
+   */
+  public static function get_aliases() {
+    $Aliases = G::$Cache->get_value('wiki_aliases');
+    if (!$Aliases) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT Alias, ArticleID
+        FROM wiki_aliases");
+      $Aliases = G::$DB->to_pair('Alias', 'ArticleID');
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks
+    }
+    return $Aliases;
+  }
 
-	/**
-	 * Flush the alias cache. Call this whenever you touch the wiki_aliases table.
-	 */
-	public static function flush_aliases() {
-		G::$Cache->delete_value('wiki_aliases');
-	}
+  /**
+   * Flush the alias cache. Call this whenever you touch the wiki_aliases table.
+   */
+  public static function flush_aliases() {
+    G::$Cache->delete_value('wiki_aliases');
+  }
 
-	/**
-	 * Get the ArticleID corresponding to an alias
-	 * @param string $Alias
-	 * @return int
-	 */
-	public static function alias_to_id($Alias) {
-		$Aliases = self::get_aliases();
-		$Alias = self::normalize_alias($Alias);
-		if (!isset($Aliases[$Alias])) {
-			return false;
-		} else {
-			return (int)$Aliases[$Alias];
-		}
-	}
+  /**
+   * Get the ArticleID corresponding to an alias
+   * @param string $Alias
+   * @return int
+   */
+  public static function alias_to_id($Alias) {
+    $Aliases = self::get_aliases();
+    $Alias = self::normalize_alias($Alias);
+    if (!isset($Aliases[$Alias])) {
+      return false;
+    } else {
+      return (int)$Aliases[$Alias];
+    }
+  }
 
-	/**
-	 * Get an article; returns false on error if $Error = false
-	 * @param int $ArticleID
-	 * @param bool $Error
-	 * @return array|bool
-	 */
-	public static function get_article($ArticleID, $Error = true) {
-		$Contents = G::$Cache->get_value('wiki_article_'.$ArticleID);
-		if (!$Contents) {
-			$QueryID = G::$DB->get_query_id();
-			G::$DB->query("
-				SELECT
-					w.Revision,
-					w.Title,
-					w.Body,
-					w.MinClassRead,
-					w.MinClassEdit,
-					w.Date,
-					w.Author,
-					u.Username,
-					GROUP_CONCAT(a.Alias),
-					GROUP_CONCAT(a.UserID)
-				FROM wiki_articles AS w
-					LEFT JOIN wiki_aliases AS a ON w.ID=a.ArticleID
-					LEFT JOIN users_main AS u ON u.ID=w.Author
-				WHERE w.ID='$ArticleID'
-				GROUP BY w.ID");
-			if (!G::$DB->has_results()) {
-				if ($Error) {
-					error(404);
-				} else {
-					return false;
-				}
-			}
-			$Contents = G::$DB->to_array();
-			G::$DB->set_query_id($QueryID);
-			G::$Cache->cache_value('wiki_article_'.$ArticleID, $Contents, 3600 * 24 * 14); // 2 weeks
-		}
-		return $Contents;
-	}
+  /**
+   * Get an article; returns false on error if $Error = false
+   * @param int $ArticleID
+   * @param bool $Error
+   * @return array|bool
+   */
+  public static function get_article($ArticleID, $Error = true) {
+    $Contents = G::$Cache->get_value('wiki_article_'.$ArticleID);
+    if (!$Contents) {
+      $QueryID = G::$DB->get_query_id();
+      G::$DB->query("
+        SELECT
+          w.Revision,
+          w.Title,
+          w.Body,
+          w.MinClassRead,
+          w.MinClassEdit,
+          w.Date,
+          w.Author,
+          u.Username,
+          GROUP_CONCAT(a.Alias),
+          GROUP_CONCAT(a.UserID)
+        FROM wiki_articles AS w
+          LEFT JOIN wiki_aliases AS a ON w.ID=a.ArticleID
+          LEFT JOIN users_main AS u ON u.ID=w.Author
+        WHERE w.ID='$ArticleID'
+        GROUP BY w.ID");
+      if (!G::$DB->has_results()) {
+        if ($Error) {
+          error(404);
+        } else {
+          return false;
+        }
+      }
+      $Contents = G::$DB->to_array();
+      G::$DB->set_query_id($QueryID);
+      G::$Cache->cache_value('wiki_article_'.$ArticleID, $Contents, 3600 * 24 * 14); // 2 weeks
+    }
+    return $Contents;
+  }
 
-	/**
-	 * Flush an article's cache. Call this whenever you edited a wiki article or its aliases.
-	 * @param int $ArticleID
-	 */
-	public static function flush_article($ArticleID) {
-		G::$Cache->delete_value('wiki_article_'.$ArticleID);
-	}
+  /**
+   * Flush an article's cache. Call this whenever you edited a wiki article or its aliases.
+   * @param int $ArticleID
+   */
+  public static function flush_article($ArticleID) {
+    G::$Cache->delete_value('wiki_article_'.$ArticleID);
+  }
 }

classes/zip.class.php

@@ -21,12 +21,12 @@ Basic concept is construct archive, add files, and serve on the fly.
 
 $Zip = new Zip('FileName');
 
-	Adds the headers so that add_file can stream and we don't need to create a massive buffer.
-	open_stream(); was integrated into the constructor to conform with Object-Oriented Standards.
+  Adds the headers so that add_file can stream and we don't need to create a massive buffer.
+  open_stream(); was integrated into the constructor to conform with Object-Oriented Standards.
 
 $Zip->unlimit();
 
-	A simple shortcut function for raising the basic PHP limits, time and memory for larger archives.
+  A simple shortcut function for raising the basic PHP limits, time and memory for larger archives.
 
 -----
 
@@ -34,11 +34,11 @@ $Zip->unlimit();
 
 $Zip->add_file(file_get_contents("data/file.txt"), "File.txt");
 
-	Adds the contents of data/file.txt into File.txt in the archive root.
+  Adds the contents of data/file.txt into File.txt in the archive root.
 
 $Zip->add_file($TorrentData, "Bookmarks/Artist - Album [2008].torrent");
 
-	Adds the parsed torrent to the archive in the Bookmarks folder (created simply by placing it in the path).
+  Adds the parsed torrent to the archive in the Bookmarks folder (created simply by placing it in the path).
 
 -----
 
@@ -46,15 +46,15 @@ $Zip->add_file($TorrentData, "Bookmarks/Artist - Album [2008].torrent");
 
 $Zip->close_stream();
 
-	This collects everything put together thus far in the archive, and streams it to the user in the form of Test7.zip
+  This collects everything put together thus far in the archive, and streams it to the user in the form of Test7.zip
 
 //------ Explanation of basic functions ------//
 
 add_file(Contents, Internal Path)
-	Adds the contents to the archive, where it will be extracted to Internal Path.
+  Adds the contents to the archive, where it will be extracted to Internal Path.
 
 close_stream();
-	Collect and stream to the user.
+  Collect and stream to the user.
 
 //------------- Detailed example -------------//
 
@@ -74,113 +74,113 @@ http://www.fileformat.info/tool/hexdump.htm - Useful for analyzing ZIP files
 |*************************************************************************/
 
 if (!extension_loaded('zlib')) {
-	error('Zlib Extension not loaded.');
+  error('Zlib Extension not loaded.');
 }
 /*
 //Handles timestamps
 function dostime($TimeStamp = 0) {
-	if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-		if ($TimeStamp == '0000-00-00 00:00:00') {
-			return 'Never';
-		}
-		$TimeStamp = strtotime($TimeStamp);
-	}
-	$Date = (($TimeStamp == 0) ? getdate() : getdate($TimeStamp));
-	$Hex = dechex((($Date['year'] - 1980) << 25) | ($Date['mon'] << 21) | ($Date['mday'] << 16) | ($Date['hours'] << 11) | ($Date['minutes'] << 5) | ($Date['seconds'] >> 1));
-	eval("\$Return = \"\x$Hex[6]$Hex[7]\x$Hex[4]$Hex[5]\x$Hex[2]$Hex[3]\x$Hex[0]$Hex[1]\";");
-	return $Return;
+  if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
+    if ($TimeStamp == '0000-00-00 00:00:00') {
+      return 'Never';
+    }
+    $TimeStamp = strtotime($TimeStamp);
+  }
+  $Date = (($TimeStamp == 0) ? getdate() : getdate($TimeStamp));
+  $Hex = dechex((($Date['year'] - 1980) << 25) | ($Date['mon'] << 21) | ($Date['mday'] << 16) | ($Date['hours'] << 11) | ($Date['minutes'] << 5) | ($Date['seconds'] >> 1));
+  eval("\$Return = \"\x$Hex[6]$Hex[7]\x$Hex[4]$Hex[5]\x$Hex[2]$Hex[3]\x$Hex[0]$Hex[1]\";");
+  return $Return;
 }
 */
 
 class Zip {
-	public $ArchiveSize = 0; // Total size
-	public $ArchiveFiles = 0; // Total files
-	private $Structure = ''; // Structure saved to memory
-	private $FileOffset = 0; // Offset to write data
-	private $Data = ''; //An idea
-
-	public function __construct ($ArchiveName = 'Archive') {
-		header("Content-type: application/octet-stream"); // Stream download
-		header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); // Name the archive - Should not be urlencoded
-	}
-
-	public static function unlimit () {
-		ob_end_clean();
-		set_time_limit(3600); // Limit 1 hour
-		ini_set('memory_limit', '1024M'); // Because the buffers can get extremely large
-	}
-
-	public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
-		/* File header */
-		$this->Data = "\x50\x4b\x03\x04"; // PK signature
-		$this->Data .= "\x14\x00"; // Version requirements
-		$this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
-		$this->Data .= "\x08\x00"; // Compression
-		//$this->Data .= dostime($TimeStamp); // Last modified
-		$this->Data .= "\x00\x00\x00\x00";
-		$DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times.
-		$CRC32 = crc32($FileData); // Ditto.
-		$ZipData = gzcompress($FileData); // Ditto.
-		$ZipData = substr ($ZipData, 2, (strlen($ZipData) - 6)); // Checksum resolution
-		$ZipLength = strlen($ZipData); // Ditto.
-		$this->Data .= pack('V', $CRC32); // CRC-32
-		$this->Data .= pack('V', $ZipLength); // Compressed file size
-		$this->Data .= pack('V', $DataLength); // Uncompressed file size
-		$this->Data .= pack('v', strlen($ArchivePath)); // Path name length
-		$this->Data .="\x00\x00"; // Extra field length (0'd so we can ignore this)
-		$this->Data .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
-		/* END file header */
-
-		/* File data */
-		$this->Data .= $ZipData; // File data
-		/* END file data */
-
-		/* Data descriptor
-		Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
-		$this->Data .= pack('V', $CRC32); // CRC-32
-		$this->Data .= pack('V', $ZipLength); // Compressed file size
-		$this->Data .= pack('V', $DataLength); // Uncompressed file size
-		END data descriptor */
-
-		$FileDataLength = strlen($this->Data);
-		$this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
-		$CurrentOffset = $this->ArchiveSize; // Update offsets
-		echo $this->Data; // Get this out to reduce our memory consumption
-
-		/* Central Directory Structure */
-		$CDS = "\x50\x4b\x01\x02"; // CDS signature
-		$CDS .="\x14\x00"; // Constructor version
-		$CDS .="\x14\x00"; // Version requirements
-		$CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
-		$CDS .="\x08\x00"; // Compression
-		$CDS .="\x00\x00\x00\x00"; // Last modified
-		$CDS .= pack('V', $CRC32); // CRC-32
-		$CDS .= pack('V', $ZipLength); // Compressed file size
-		$CDS .= pack('V', $DataLength); // Uncompressed file size
-		$CDS .= pack('v', strlen($ArchivePath)); // Path name length
-		$CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
-		$CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
-		$CDS .="\x00\x00"; // Disk number start (0 seems valid)
-		$CDS .="\x00\x00"; // Internal file attributes (again with the 0's)
-		$CDS .="\x20\x00\x00\x00"; // External file attributes
-		$CDS .= pack('V', $this->FileOffset); // Offsets
-		$CDS .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
-		/* END central Directory Structure */
-
-		$this->FileOffset = $CurrentOffset; // Update offsets
-		$this->Structure .= $CDS; // Append to structure
-		$this->ArchiveFiles++; // Increment file count
-	}
-
-	public function close_stream() {
-		echo $this->Structure; // Structure Root
-		echo "\x50\x4b\x05\x06"; // End of central directory signature
-		echo "\x00\x00"; // This disk
-		echo "\x00\x00"; // CDS start
-		echo pack('v', $this->ArchiveFiles); // Handle the number of entries
-		echo pack('v', $this->ArchiveFiles); // Ditto
-		echo pack('V', strlen($this->Structure)); //Size
-		echo pack('V', $this->ArchiveSize); // Offset
-		echo "\x00\x00"; // No comment, close it off
-	}
+  public $ArchiveSize = 0; // Total size
+  public $ArchiveFiles = 0; // Total files
+  private $Structure = ''; // Structure saved to memory
+  private $FileOffset = 0; // Offset to write data
+  private $Data = ''; //An idea
+
+  public function __construct ($ArchiveName = 'Archive') {
+    header("Content-type: application/octet-stream"); // Stream download
+    header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); // Name the archive - Should not be urlencoded
+  }
+
+  public static function unlimit () {
+    ob_end_clean();
+    set_time_limit(3600); // Limit 1 hour
+    ini_set('memory_limit', '1024M'); // Because the buffers can get extremely large
+  }
+
+  public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
+    /* File header */
+    $this->Data = "\x50\x4b\x03\x04"; // PK signature
+    $this->Data .= "\x14\x00"; // Version requirements
+    $this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
+    $this->Data .= "\x08\x00"; // Compression
+    //$this->Data .= dostime($TimeStamp); // Last modified
+    $this->Data .= "\x00\x00\x00\x00";
+    $DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times.
+    $CRC32 = crc32($FileData); // Ditto.
+    $ZipData = gzcompress($FileData); // Ditto.
+    $ZipData = substr ($ZipData, 2, (strlen($ZipData) - 6)); // Checksum resolution
+    $ZipLength = strlen($ZipData); // Ditto.
+    $this->Data .= pack('V', $CRC32); // CRC-32
+    $this->Data .= pack('V', $ZipLength); // Compressed file size
+    $this->Data .= pack('V', $DataLength); // Uncompressed file size
+    $this->Data .= pack('v', strlen($ArchivePath)); // Path name length
+    $this->Data .="\x00\x00"; // Extra field length (0'd so we can ignore this)
+    $this->Data .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
+    /* END file header */
+
+    /* File data */
+    $this->Data .= $ZipData; // File data
+    /* END file data */
+
+    /* Data descriptor
+    Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
+    $this->Data .= pack('V', $CRC32); // CRC-32
+    $this->Data .= pack('V', $ZipLength); // Compressed file size
+    $this->Data .= pack('V', $DataLength); // Uncompressed file size
+    END data descriptor */
+
+    $FileDataLength = strlen($this->Data);
+    $this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
+    $CurrentOffset = $this->ArchiveSize; // Update offsets
+    echo $this->Data; // Get this out to reduce our memory consumption
+
+    /* Central Directory Structure */
+    $CDS = "\x50\x4b\x01\x02"; // CDS signature
+    $CDS .="\x14\x00"; // Constructor version
+    $CDS .="\x14\x00"; // Version requirements
+    $CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
+    $CDS .="\x08\x00"; // Compression
+    $CDS .="\x00\x00\x00\x00"; // Last modified
+    $CDS .= pack('V', $CRC32); // CRC-32
+    $CDS .= pack('V', $ZipLength); // Compressed file size
+    $CDS .= pack('V', $DataLength); // Uncompressed file size
+    $CDS .= pack('v', strlen($ArchivePath)); // Path name length
+    $CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
+    $CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
+    $CDS .="\x00\x00"; // Disk number start (0 seems valid)
+    $CDS .="\x00\x00"; // Internal file attributes (again with the 0's)
+    $CDS .="\x20\x00\x00\x00"; // External file attributes
+    $CDS .= pack('V', $this->FileOffset); // Offsets
+    $CDS .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
+    /* END central Directory Structure */
+
+    $this->FileOffset = $CurrentOffset; // Update offsets
+    $this->Structure .= $CDS; // Append to structure
+    $this->ArchiveFiles++; // Increment file count
+  }
+
+  public function close_stream() {
+    echo $this->Structure; // Structure Root
+    echo "\x50\x4b\x05\x06"; // End of central directory signature
+    echo "\x00\x00"; // This disk
+    echo "\x00\x00"; // CDS start
+    echo pack('v', $this->ArchiveFiles); // Handle the number of entries
+    echo pack('v', $this->ArchiveFiles); // Ditto
+    echo pack('V', strlen($this->Structure)); //Size
+    echo pack('V', $this->ArchiveSize); // Offset
+    echo "\x00\x00"; // No comment, close it off
+  }
 }

design/privatefooter.php

@@ -1,44 +1,44 @@
 </div>
 <?php TEXTAREA_PREVIEW::JavaScript(); ?>
 <div id="footer">
-<? 	if (!empty($Options['disclaimer'])) { ?>
-	<br /><br />
-	<div id="disclaimer_container" class="thin" style="text-align: center; margin-bottom: 20px;">
-		None of the files shown here are actually hosted on this server. The links are provided solely by this site's users. These BitTorrent files are meant for the distribution of backup files. By downloading the BitTorrent file, you are claiming that you own the original file. The administrator of this site (<?=site_url()?>) holds NO RESPONSIBILITY if these files are misused in any way and cannot be held responsible for what its users post, or any other actions of it.
-	</div>
-	<div class='thin'><a href='/canary.php'>Warrant Canary</a></div>
+<?   if (!empty($Options['disclaimer'])) { ?>
+  <br /><br />
+  <div id="disclaimer_container" class="thin" style="text-align: center; margin-bottom: 20px;">
+    None of the files shown here are actually hosted on this server. The links are provided solely by this site's users. These BitTorrent files are meant for the distribution of backup files. By downloading the BitTorrent file, you are claiming that you own the original file. The administrator of this site (<?=site_url()?>) holds NO RESPONSIBILITY if these files are misused in any way and cannot be held responsible for what its users post, or any other actions of it.
+  </div>
+  <div class='thin'><a href='/canary.php'>Warrant Canary</a></div>
 <?
-	}
-	if (count($UserSessions) > 1) {
-		foreach ($UserSessions as $ThisSessionID => $Session) {
-			if ($ThisSessionID != $SessionID) {
-				$LastActive = $Session;
-				break;
-			}
-		}
-	}
+  }
+  if (count($UserSessions) > 1) {
+    foreach ($UserSessions as $ThisSessionID => $Session) {
+      if ($ThisSessionID != $SessionID) {
+        $LastActive = $Session;
+        break;
+      }
+    }
+  }
 
-	$Load = sys_getloadavg();
+  $Load = sys_getloadavg();
 ?>
-	<p>Site and design &copy; <?=date('Y')?> <?=SITE_NAME?></p>
-<?	if (!empty($LastActive)) { ?>
-	<p>
-		<a href="user.php?action=sessions">
-			<span class="tooltip" title="Manage sessions">Last activity: </span><?=time_diff($LastActive['LastUpdate'])?><span class="tooltip" title="Manage sessions"> from <?=(apc_exists('DBKEY')?(DBCrypt::decrypt($LastActive['IP'])):'[Encrypted]') ?></span>
-		</a>
-	</p>
-<?	} ?>
-	<p>
-		<strong>Time:</strong> <span><?=number_format(((microtime(true) - $ScriptStartTime) * 1000), 5)?> ms</span>
-		<strong>Used:</strong> <span><?=Format::get_size(memory_get_usage(true))?></span>
-		<strong>Load:</strong> <span><?=number_format($Load[0], 2).' '.number_format($Load[1], 2).' '.number_format($Load[2], 2)?></span>
-		<strong>Date:</strong> <span id="site_date"><?=date('M d Y')?></span>, <span id="site_time"><?=date('H:i')?></span>
+  <p>Site and design &copy; <?=date('Y')?> <?=SITE_NAME?></p>
+<?  if (!empty($LastActive)) { ?>
+  <p>
+    <a href="user.php?action=sessions">
+      <span class="tooltip" title="Manage sessions">Last activity: </span><?=time_diff($LastActive['LastUpdate'])?><span class="tooltip" title="Manage sessions"> from <?=(apc_exists('DBKEY')?(DBCrypt::decrypt($LastActive['IP'])):'[Encrypted]') ?></span>
+    </a>
+  </p>
+<?  } ?>
+  <p>
+    <strong>Time:</strong> <span><?=number_format(((microtime(true) - $ScriptStartTime) * 1000), 5)?> ms</span>
+    <strong>Used:</strong> <span><?=Format::get_size(memory_get_usage(true))?></span>
+    <strong>Load:</strong> <span><?=number_format($Load[0], 2).' '.number_format($Load[1], 2).' '.number_format($Load[2], 2)?></span>
+    <strong>Date:</strong> <span id="site_date"><?=date('M d Y')?></span>, <span id="site_time"><?=date('H:i')?></span>
 
-	</p>
-	</div>
+  </p>
+  </div>
 <? if (DEBUG_MODE || check_perms('site_debug')) { ?>
-	<!-- Begin Debugging -->
-	<div id="site_debug">
+  <!-- Begin Debugging -->
+  <div id="site_debug">
 <?
 $Debug->perf_table();
 $Debug->flag_table();
@@ -49,8 +49,8 @@ $Debug->cache_table();
 $Debug->vars_table();
 $Debug->ocelot_table();
 ?>
-	</div>
-	<!-- End Debugging -->
+  </div>
+  <!-- End Debugging -->
 <? } ?>
 
 </div>
@@ -59,9 +59,9 @@ $Debug->ocelot_table();
 <?
 global $NotificationSpans;
 if (!empty($NotificationSpans)) {
-	foreach ($NotificationSpans as $Notification) {
-		echo "$Notification\n";
-	}
+  foreach ($NotificationSpans as $Notification) {
+    echo "$Notification\n";
+  }
 }
 ?>
 <!-- Extra divs, for stylesheet developers to add imagery -->

design/publicfooter.php

@@ -3,7 +3,7 @@
   </table>
 </div>
 <div id="foot">
-	<span><a href="#"><?=SITE_NAME?></a> | <a href="https://what.cd/gazelle/">Project Gazelle</a></span>
+  <span><a href="#"><?=SITE_NAME?></a> | <a href="https://what.cd/gazelle/">Project Gazelle</a></span>
 </div>
 </body>
 </html>

design/publicheader.php

@@ -5,16 +5,16 @@ define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<title><?=display_str($PageTitle)?></title>
-	<meta http-equiv="X-UA-Compatible" content="chrome=1; IE=edge" />
-	<link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico');?>" />
-	<link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css" />
-	<script src="<?=STATIC_SERVER?>functions/jquery.js" type="text/javascript"></script>
-	<script src="<?=STATIC_SERVER?>functions/script_start.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/script_start.js')?>" type="text/javascript"></script>
-	<script src="<?=STATIC_SERVER?>functions/ajax.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/ajax.class.js')?>" type="text/javascript"></script>
-	<script src="<?=STATIC_SERVER?>functions/cookie.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/cookie.class.js')?>" type="text/javascript"></script>
-	<script src="<?=STATIC_SERVER?>functions/storage.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/storage.class.js')?>" type="text/javascript"></script>
-	<script src="<?=STATIC_SERVER?>functions/global.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/global.js')?>" type="text/javascript"></script>
+  <title><?=display_str($PageTitle)?></title>
+  <meta http-equiv="X-UA-Compatible" content="chrome=1; IE=edge" />
+  <link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico');?>" />
+  <link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css" />
+  <script src="<?=STATIC_SERVER?>functions/jquery.js" type="text/javascript"></script>
+  <script src="<?=STATIC_SERVER?>functions/script_start.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/script_start.js')?>" type="text/javascript"></script>
+  <script src="<?=STATIC_SERVER?>functions/ajax.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/ajax.class.js')?>" type="text/javascript"></script>
+  <script src="<?=STATIC_SERVER?>functions/cookie.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/cookie.class.js')?>" type="text/javascript"></script>
+  <script src="<?=STATIC_SERVER?>functions/storage.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/storage.class.js')?>" type="text/javascript"></script>
+  <script src="<?=STATIC_SERVER?>functions/global.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/global.js')?>" type="text/javascript"></script>
 <? $img = array_diff(scandir(SERVER_ROOT.'/misc/bg', 1), array('.', '..')); ?>
   <style> #content { background-image: url(<? echo("'/misc/bg/" . $img[rand(0,count($img)-1)] . "'"); ?>); }</style>
 </head>

design/views/generic/reply/quickreply.php

@@ -5,13 +5,13 @@
  *
  * To include it in a section use this example.
 
-		View::parse('generic/reply/quickreply.php', array(
-			'InputTitle' => 'Post reply',
-			'InputName' => 'thread',
-			'InputID' => $ThreadID,
-			'ForumID' => $ForumID,
-			'TextareaCols' => 90
-		));
+    View::parse('generic/reply/quickreply.php', array(
+      'InputTitle' => 'Post reply',
+      'InputName' => 'thread',
+      'InputID' => $ThreadID,
+      'ForumID' => $ForumID,
+      'TextareaCols' => 90
+    ));
 
  * Note that InputName and InputID are the only required variables
  * They're used to construct the $_POST.
@@ -27,133 +27,133 @@
  * comments), add a key 'SubscribeBox' to the array passed to View::parse.
  * Example:
 
-		View::parse('generic/reply/quickreply.php', array(
-			'InputTitle' => 'Post comment',
-			'InputName' => 'groupid',
-			'InputID' => $GroupID,
-			'TextareaCols' => 65,
-			'SubscribeBox' => true
-		));
+    View::parse('generic/reply/quickreply.php', array(
+      'InputTitle' => 'Post comment',
+      'InputName' => 'groupid',
+      'InputID' => $GroupID,
+      'TextareaCols' => 65,
+      'SubscribeBox' => true
+    ));
  */
-	global $HeavyInfo, $UserSubscriptions, $ThreadInfo, $Document;
+  global $HeavyInfo, $UserSubscriptions, $ThreadInfo, $Document;
 
-	if (G::$LoggedUser['DisablePosting']) {
-		return;
-	}
-	if (!isset($TextareaCols)) {
-		$TextareaCols = 70;
-	}
-	if (!isset($TextareaRows)) {
-		$TextareaRows = 8;
-	}
-	if (!isset($InputAction)) {
-		$InputAction = 'reply';
-	}
-	if (!isset($InputTitle)) {
-		$InputTitle = 'Post comment';
-	}
-	if (!isset($Action)) {
-		$Action = '';
-	}
+  if (G::$LoggedUser['DisablePosting']) {
+    return;
+  }
+  if (!isset($TextareaCols)) {
+    $TextareaCols = 70;
+  }
+  if (!isset($TextareaRows)) {
+    $TextareaRows = 8;
+  }
+  if (!isset($InputAction)) {
+    $InputAction = 'reply';
+  }
+  if (!isset($InputTitle)) {
+    $InputTitle = 'Post comment';
+  }
+  if (!isset($Action)) {
+    $Action = '';
+  }
 
-	// TODO: Remove inline styles
+  // TODO: Remove inline styles
 
-	// Old to do?
-	// TODO: Preview, come up with a standard, make it look like post or just a
-	// block of formatted BBcode, but decide and write some proper XHTML
+  // Old to do?
+  // TODO: Preview, come up with a standard, make it look like post or just a
+  // block of formatted BBcode, but decide and write some proper XHTML
 
 
-	$ReplyText = new TEXTAREA_PREVIEW('body', 'quickpost', '',
-			$TextareaCols, $TextareaRows, false, false, true, array(
-				'tabindex="1"',
-				'onkeyup="resize(\'quickpost\')"'
-			));
+  $ReplyText = new TEXTAREA_PREVIEW('body', 'quickpost', '',
+      $TextareaCols, $TextareaRows, false, false, true, array(
+        'tabindex="1"',
+        'onkeyup="resize(\'quickpost\')"'
+      ));
 ?>
 
-			<br />
-			<div id="reply_box">
-				<h3><?=$InputTitle?></h3>
-				<div class="box pad">
-					<table class="forum_post box vertical_margin hidden preview_wrap" id="preview_wrap_<?=$ReplyText->getID()?>">
-						<colgroup>
-<?	if (Users::has_avatars_enabled()) { ?>
-							<col class="col_avatar" />
-<?	} ?>
-							<col class="col_post_body" />
-						</colgroup>
-						<tr class="colhead_dark">
-							<td colspan="<?=(Users::has_avatars_enabled() ? 2 : 1)?>">
-								<div style="float: left;"><a href="#quickreplypreview">#XXXXXX</a>
-									by <strong><?=Users::format_username(G::$LoggedUser['ID'], true, true, true, true)?></strong> Just now
-								</div>
-								<div style="float: right;">
-									<a href="#quickreplypreview" class="brackets">Report</a>
-									&nbsp;
-									<a href="#">&uarr;</a>
-								</div>
-							</td>
-						</tr>
-						<tr>
-<?	if (Users::has_avatars_enabled()) { ?>
-							<td class="avatar" valign="top">
-								<?=Users::show_avatar(G::$LoggedUser['Avatar'], G::$LoggedUser['ID'], G::$LoggedUser['Username'], (!isset($HeavyInfo['DisableAvatars']) || $HeavyInfo['DisableAvatars']))?>
-							</td>
-<?	} ?>
-							<td class="body" valign="top">
-								<div id="contentpreview" style="text-align: left;">
-									<div id="preview_<?=$ReplyText->getID()?>"></div>
-								</div>
-							</td>
-						</tr>
-					</table>
-					<form class="send_form center" name="reply" id="quickpostform" action="<?=$Action?>" method="post"<? if (!check_perms('users_mod')) { ?> onsubmit="quickpostform.submit_button.disabled = true;"<? } ?>>
-						<input type="hidden" name="action" value="<?=$InputAction?>" />
-						<input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
-						<input type="hidden" name="<?=$InputName?>" value="<?=$InputID?>" />
-						<div id="quickreplytext">
+      <br />
+      <div id="reply_box">
+        <h3><?=$InputTitle?></h3>
+        <div class="box pad">
+          <table class="forum_post box vertical_margin hidden preview_wrap" id="preview_wrap_<?=$ReplyText->getID()?>">
+            <colgroup>
+<?  if (Users::has_avatars_enabled()) { ?>
+              <col class="col_avatar" />
+<?  } ?>
+              <col class="col_post_body" />
+            </colgroup>
+            <tr class="colhead_dark">
+              <td colspan="<?=(Users::has_avatars_enabled() ? 2 : 1)?>">
+                <div style="float: left;"><a href="#quickreplypreview">#XXXXXX</a>
+                  by <strong><?=Users::format_username(G::$LoggedUser['ID'], true, true, true, true)?></strong> Just now
+                </div>
+                <div style="float: right;">
+                  <a href="#quickreplypreview" class="brackets">Report</a>
+                  &nbsp;
+                  <a href="#">&uarr;</a>
+                </div>
+              </td>
+            </tr>
+            <tr>
+<?  if (Users::has_avatars_enabled()) { ?>
+              <td class="avatar" valign="top">
+                <?=Users::show_avatar(G::$LoggedUser['Avatar'], G::$LoggedUser['ID'], G::$LoggedUser['Username'], (!isset($HeavyInfo['DisableAvatars']) || $HeavyInfo['DisableAvatars']))?>
+              </td>
+<?  } ?>
+              <td class="body" valign="top">
+                <div id="contentpreview" style="text-align: left;">
+                  <div id="preview_<?=$ReplyText->getID()?>"></div>
+                </div>
+              </td>
+            </tr>
+          </table>
+          <form class="send_form center" name="reply" id="quickpostform" action="<?=$Action?>" method="post"<? if (!check_perms('users_mod')) { ?> onsubmit="quickpostform.submit_button.disabled = true;"<? } ?>>
+            <input type="hidden" name="action" value="<?=$InputAction?>" />
+            <input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
+            <input type="hidden" name="<?=$InputName?>" value="<?=$InputID?>" />
+            <div id="quickreplytext">
 <?
-							echo $ReplyText->getBuffer();
+              echo $ReplyText->getBuffer();
 ?>
-							<br />
-						</div>
-						<div class="preview_submit">
+              <br />
+            </div>
+            <div class="preview_submit">
 <?
-	if (isset($SubscribeBox) && !isset($ForumID) && Subscriptions::has_subscribed_comments($Document, $InputID) === false) {
+  if (isset($SubscribeBox) && !isset($ForumID) && Subscriptions::has_subscribed_comments($Document, $InputID) === false) {
 ?>
-							<input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : ''?> tabindex="2" />
-							<label for="subscribebox">Subscribe</label>
+              <input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : ''?> tabindex="2" />
+              <label for="subscribebox">Subscribe</label>
 <?
-	}
-	// Forum thread logic
-	// This might use some more abstraction
-	if (isset($ForumID)) {
-		if (!Subscriptions::has_subscribed($InputID)) {
+  }
+  // Forum thread logic
+  // This might use some more abstraction
+  if (isset($ForumID)) {
+    if (!Subscriptions::has_subscribed($InputID)) {
 ?>
-							<input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : ''?> tabindex="2" />
-							<label for="subscribebox">Subscribe</label>
+              <input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : ''?> tabindex="2" />
+              <label for="subscribebox">Subscribe</label>
 <?
-		}
-		if ($ThreadInfo['LastPostAuthorID'] == G::$LoggedUser['ID']
-			&& (check_perms('site_forums_double_post')
-				|| in_array($ForumID, FORUMS_TO_ALLOW_DOUBLE_POST))
-		) {
+    }
+    if ($ThreadInfo['LastPostAuthorID'] == G::$LoggedUser['ID']
+      && (check_perms('site_forums_double_post')
+        || in_array($ForumID, FORUMS_TO_ALLOW_DOUBLE_POST))
+    ) {
 ?>
-							<input id="mergebox" type="checkbox" name="merge" tabindex="2" />
-							<label for="mergebox">Merge</label>
+              <input id="mergebox" type="checkbox" name="merge" tabindex="2" />
+              <label for="mergebox">Merge</label>
 <?
-		}
-		if (!G::$LoggedUser['DisableAutoSave']) {
+    }
+    if (!G::$LoggedUser['DisableAutoSave']) {
 ?>
-							<script type="application/javascript">
-								var storedTempTextarea = new StoreText('quickpost', 'quickpostform', <?=$InputID?>);
-							</script>
+              <script type="application/javascript">
+                var storedTempTextarea = new StoreText('quickpost', 'quickpostform', <?=$InputID?>);
+              </script>
 <?
-		}
-	}
+    }
+  }
 ?>
-							<input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" tabindex="1" />
-							<input type="submit" value="Post reply" id="submit_button" tabindex="1" />
-						</div>
-					</form>
-				</div>
-			</div>
+              <input type="button" value="Preview" class="hidden button_preview_<?=$ReplyText->getID()?>" tabindex="1" />
+              <input type="submit" value="Post reply" id="submit_button" tabindex="1" />
+            </div>
+          </form>
+        </div>
+      </div>

design/views/generic/textarea/buttons.phtml

@@ -1,3 +1,3 @@
 <div class="submit_div preview_submit">
-	<input type="button" value="Preview" class="hidden button_preview_<?=$ID?>" />
+  <input type="button" value="Preview" class="hidden button_preview_<?=$ID?>" />
 </div>

design/views/generic/textarea/preview.phtml

@@ -1,4 +1,4 @@
 
 <div class="box vertical_space body hidden preview_wrap" id="preview_wrap_<?=$ID?>">
-	<div id="preview_<?=$ID?>"></div>
+  <div id="preview_<?=$ID?>"></div>
 </div>

design/views/generic/textarea/script_factory.phtml

@@ -1,4 +1,4 @@
 
 <script type="text/javascript" class="preview_code">
-	$(document).ready(function () { TextareaPreview.factory([<?=$script?>]); });
+  $(document).ready(function () { TextareaPreview.factory([<?=$script?>]); });
 </script>

design/views/generic/textarea/textarea.phtml

@@ -1,4 +1,4 @@
 
 <div id="textarea_wrap_<?=$NID?>" class="field_div textarea_wrap">
-	<textarea name="<?=$Name?>" id="<?=$ID?>" cols="<?=$Cols?>" rows="<?=$Rows?>" <?=$Attributes?>><?=$Value?></textarea>
+  <textarea name="<?=$Name?>" id="<?=$ID?>" cols="<?=$Cols?>" rows="<?=$Rows?>" <?=$Attributes?>><?=$Value?></textarea>
 </div>

feeds.php

@@ -1,14 +1,14 @@
 <?
 /*-- Feed Start Class ----------------------------------*/
 /*------------------------------------------------------*/
-/* Simplified version of script_start, used for the	 */
-/* sitewide RSS system.								 */
+/* Simplified version of script_start, used for the   */
+/* sitewide RSS system.                 */
 /*------------------------------------------------------*/
 /********************************************************/
 
 // Let's prevent people from clearing feeds
 if (isset($_GET['clearcache'])) {
-	unset($_GET['clearcache']);
+  unset($_GET['clearcache']);
 }
 
 require 'classes/config.php'; // The config contains all site-wide configuration information as well as memcached rules
@@ -20,91 +20,91 @@ $Cache = NEW CACHE(MEMCACHED_SERVERS); // Load the caching class
 $Feed = NEW FEED; // Load the time class
 
 function check_perms() {
-	return false;
+  return false;
 }
 
 function is_number($Str) {
-	if ($Str < 0) {
-		return false;
-	}
-	// We're converting input to an int, then string, and comparing to the original
-	return ($Str == strval(intval($Str)));
+  if ($Str < 0) {
+    return false;
+  }
+  // We're converting input to an int, then string, and comparing to the original
+  return ($Str == strval(intval($Str)));
 }
 
 function display_str($Str) {
-	if ($Str != '') {
-		$Str = 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,5};)/m", '&amp;', $Str);
+  if ($Str != '') {
+    $Str = 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,5};)/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;'
-		);
+    $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;'
-		);
+    $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;
+    $Str = str_replace($Replace, $With, $Str);
+  }
+  return $Str;
 }
 
 function make_utf8($Str) {
-	if ($Str != '') {
-		if (is_utf8($Str)) {
-			$Encoding = 'UTF-8';
-		}
-		if (empty($Encoding)) {
-			$Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
-		}
-		if (empty($Encoding)) {
-			$Encoding = 'ISO-8859-1';
-		}
-		if ($Encoding == 'UTF-8') {
-			return $Str;
-		} else {
-			return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
-		}
-	}
+  if ($Str != '') {
+    if (is_utf8($Str)) {
+      $Encoding = 'UTF-8';
+    }
+    if (empty($Encoding)) {
+      $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
+    }
+    if (empty($Encoding)) {
+      $Encoding = 'ISO-8859-1';
+    }
+    if ($Encoding == 'UTF-8') {
+      return $Str;
+    } else {
+      return @mb_convert_encoding($Str, 'UTF-8', $Encoding);
+    }
+  }
 }
 
 function is_utf8($Str) {
-	return preg_match('%^(?:
-		[\x09\x0A\x0D\x20-\x7E]			 // ASCII
-		| [\xC2-\xDF][\x80-\xBF]			// non-overlong 2-byte
-		| \xE0[\xA0-\xBF][\x80-\xBF]		// excluding overlongs
-		| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte
-		| \xED[\x80-\x9F][\x80-\xBF]		// excluding surrogates
-		| \xF0[\x90-\xBF][\x80-\xBF]{2}	 // planes 1-3
-		| [\xF1-\xF3][\x80-\xBF]{3}		 // planes 4-15
-		| \xF4[\x80-\x8F][\x80-\xBF]{2}	 // plane 16
-		)*$%xs', $Str
-	);
+  return preg_match('%^(?:
+    [\x09\x0A\x0D\x20-\x7E]       // ASCII
+    | [\xC2-\xDF][\x80-\xBF]      // non-overlong 2-byte
+    | \xE0[\xA0-\xBF][\x80-\xBF]    // excluding overlongs
+    | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte
+    | \xED[\x80-\x9F][\x80-\xBF]    // excluding surrogates
+    | \xF0[\x90-\xBF][\x80-\xBF]{2}   // planes 1-3
+    | [\xF1-\xF3][\x80-\xBF]{3}     // planes 4-15
+    | \xF4[\x80-\x8F][\x80-\xBF]{2}   // plane 16
+    )*$%xs', $Str
+  );
 }
 
 function display_array($Array, $Escape = array()) {
-	foreach ($Array as $Key => $Val) {
-		if ((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
-			$Array[$Key] = display_str($Val);
-		}
-	}
-	return $Array;
+  foreach ($Array as $Key => $Val) {
+    if ((!is_array($Escape) && $Escape == true) || !in_array($Key, $Escape)) {
+      $Array[$Key] = display_str($Val);
+    }
+  }
+  return $Array;
 }
 
 /**
  * Print the site's URL including the appropriate URI scheme, including the trailing slash
  */
 function site_url() {
-	return 'https://' . SITE_DOMAIN . '/';
+  return 'https://' . SITE_DOMAIN . '/';
 }
 
 header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');

image.php

@@ -3,101 +3,101 @@
 error_reporting(E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR);
 
 if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-	header("HTTP/1.1 304 Not Modified");
-	die();
+  header("HTTP/1.1 304 Not Modified");
+  die();
 }
 
 header('Expires: '.date('D, d-M-Y H:i:s \U\T\C', time() + 3600 * 24 * 120)); // 120 days
 header('Last-Modified: '.date('D, d-M-Y H:i:s \U\T\C', time()));
 
 if (!extension_loaded('gd')) {
-	error('nogd');
+  error('nogd');
 }
 
 function img_error($Type) {
-	header('Content-type: image/gif');
-	die(file_get_contents(SERVER_ROOT.'/sections/image/'.$Type.'.gif'));
+  header('Content-type: image/gif');
+  die(file_get_contents(SERVER_ROOT.'/sections/image/'.$Type.'.gif'));
 }
 
 function invisible($Image) {
-	$Count = imagecolorstotal($Image);
-	if ($Count == 0) {
-		return false;
-	}
-	$TotalAlpha = 0;
-	for ($i = 0; $i < $Count; ++$i) {
-		$Color = imagecolorsforindex($Image, $i);
-		$TotalAlpha += $Color['alpha'];
-	}
-	return (($TotalAlpha / $Count) == 127);
+  $Count = imagecolorstotal($Image);
+  if ($Count == 0) {
+    return false;
+  }
+  $TotalAlpha = 0;
+  for ($i = 0; $i < $Count; ++$i) {
+    $Color = imagecolorsforindex($Image, $i);
+    $TotalAlpha += $Color['alpha'];
+  }
+  return (($TotalAlpha / $Count) == 127);
 
 }
 
 function verysmall($Image) {
-	return ((imagesx($Image) * imagesy($Image)) < 25);
+  return ((imagesx($Image) * imagesy($Image)) < 25);
 }
 
 function image_type($Data) {
-	if (!strncmp($Data, 'GIF', 3)) {
-		return 'gif';
-	}
-	if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
-		return 'png';
-	}
-	if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
-		return 'jpeg';
-	}
-	if (!strncmp($Data, 'BM', 2)) {
-		return 'bmp';
-	}
-	if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
-		return 'tiff';
-	}
-	if (!substr_compare($Data, 'webm', 31, 4)) {
-		return 'webm';
-	}
+  if (!strncmp($Data, 'GIF', 3)) {
+    return 'gif';
+  }
+  if (!strncmp($Data, pack('H*', '89504E47'), 4)) {
+    return 'png';
+  }
+  if (!strncmp($Data, pack('H*', 'FFD8'), 2)) {
+    return 'jpeg';
+  }
+  if (!strncmp($Data, 'BM', 2)) {
+    return 'bmp';
+  }
+  if (!strncmp($Data, 'II', 2) || !strncmp($Data, 'MM', 2)) {
+    return 'tiff';
+  }
+  if (!substr_compare($Data, 'webm', 31, 4)) {
+    return 'webm';
+  }
 }
 
 function image_height($Type, $Data) {
-	$Length = strlen($Data);
-	global $URL, $_GET;
-	switch ($Type) {
-		case 'jpeg':
-			// See http://www.obrador.com/essentialjpeg/headerinfo.htm
-			$i = 4;
-			$Data = (substr($Data, $i));
-			$Block = unpack('nLength', $Data);
-			$Data = substr($Data, $Block['Length']);
-			$i += $Block['Length'];
-			$Str []= "Started 4, + ".$Block['Length'];
-			while ($Data != '') { // iterate through the blocks until we find the start of frame marker (FFC0)
-				$Block = unpack('CBlock/CType/nLength', $Data); // Get info about the block
-				if ($Block['Block'] != '255') { // We should be at the start of a new block
-					break;
-				}
-				if ($Block['Type'] != '192') { // C0
-					$Data = substr($Data, $Block['Length'] + 2); // Next block
-					$Str []= "Started $i, + ".($Block['Length'] + 2);
-					$i += ($Block['Length'] + 2);
-				} else { // We're at the FFC0 block
-					$Data = substr($Data, 5); // Skip FF C0 Length(2) precision(1)
-					$i += 5;
-					$Height = unpack('nHeight', $Data);
-					return $Height['Height'];
-				}
-			}
-			break;
-		case 'gif':
-			$Data = substr($Data, 8);
-			$Height = unpack('vHeight', $Data);
-			return $Height['Height'];
-		case 'png':
-			$Data = substr($Data, 20);
-			$Height = unpack('NHeight', $Data);
-			return $Height['Height'];
-		default:
-			return 0;
-	}
+  $Length = strlen($Data);
+  global $URL, $_GET;
+  switch ($Type) {
+    case 'jpeg':
+      // See http://www.obrador.com/essentialjpeg/headerinfo.htm
+      $i = 4;
+      $Data = (substr($Data, $i));
+      $Block = unpack('nLength', $Data);
+      $Data = substr($Data, $Block['Length']);
+      $i += $Block['Length'];
+      $Str []= "Started 4, + ".$Block['Length'];
+      while ($Data != '') { // iterate through the blocks until we find the start of frame marker (FFC0)
+        $Block = unpack('CBlock/CType/nLength', $Data); // Get info about the block
+        if ($Block['Block'] != '255') { // We should be at the start of a new block
+          break;
+        }
+        if ($Block['Type'] != '192') { // C0
+          $Data = substr($Data, $Block['Length'] + 2); // Next block
+          $Str []= "Started $i, + ".($Block['Length'] + 2);
+          $i += ($Block['Length'] + 2);
+        } else { // We're at the FFC0 block
+          $Data = substr($Data, 5); // Skip FF C0 Length(2) precision(1)
+          $i += 5;
+          $Height = unpack('nHeight', $Data);
+          return $Height['Height'];
+        }
+      }
+      break;
+    case 'gif':
+      $Data = substr($Data, 8);
+      $Height = unpack('vHeight', $Data);
+      return $Height['Height'];
+    case 'png':
+      $Data = substr($Data, 20);
+      $Height = unpack('NHeight', $Data);
+      return $Height['Height'];
+    default:
+      return 0;
+  }
 }
 
 define('SKIP_NO_CACHE_HEADERS', 1);

sections/ajax/anidb.php

@@ -1,53 +1,53 @@
 <?
 
 if (empty($_GET['aid'])) {
-	json_die();
+  json_die();
 }
 
 $aid = $_GET['aid'];
 
 if ($Cache->get_value('anidb_json_'.$aid)) {
-	json_die("success", $Cache->get_value('anidb_json_'.$aid));
+  json_die("success", $Cache->get_value('anidb_json_'.$aid));
 } else {
 
-	$anidb_url = 'http://api.anidb.net:9001/httpapi?request=anime&client='.API_KEYS['ANIDB'].'&clientver=1&protover=1&aid='.$aid;
+  $anidb_url = 'http://api.anidb.net:9001/httpapi?request=anime&client='.API_KEYS['ANIDB'].'&clientver=1&protover=1&aid='.$aid;
 
-	$crl = curl_init();
-	curl_setopt($crl, CURLOPT_URL, $anidb_url);
-	curl_setopt($crl, CURLOPT_RETURNTRANSFER, 1);
-	curl_setopt($crl, CURLOPT_CONNEECTTIMEOUT, 5);
-	$ret = curl_exec($crl);
-	curl_close($curl);
+  $crl = curl_init();
+  curl_setopt($crl, CURLOPT_URL, $anidb_url);
+  curl_setopt($crl, CURLOPT_RETURNTRANSFER, 1);
+  curl_setopt($crl, CURLOPT_CONNEECTTIMEOUT, 5);
+  $ret = curl_exec($crl);
+  curl_close($curl);
 
-	$anidb_xml = new SimpleXMLElement(zlib_decode($ret));
+  $anidb_xml = new SimpleXMLElement(zlib_decode($ret));
 
-	if ($anidb_xml->xpath('/error')) {
-		json_die("failure", $anidb_xml->xpath('/error')[0]."");
-	}
+  if ($anidb_xml->xpath('/error')) {
+    json_die("failure", $anidb_xml->xpath('/error')[0]."");
+  }
 
-	$title = $anidb_xml->xpath('//titles/title[@type = "main"]')[0].'';
-	$title = (empty($title))?$anidb_xml->xpath('//titles/title[@xml:lang = "en" and @type = "official"]')[0].'':$title;
+  $title = $anidb_xml->xpath('//titles/title[@type = "main"]')[0].'';
+  $title = (empty($title))?$anidb_xml->xpath('//titles/title[@xml:lang = "en" and @type = "official"]')[0].'':$title;
 
-	$title_jp = $anidb_xml->xpath('//titles/title[@xml:lang = "ja" and @type = "official"]')[0].'';
+  $title_jp = $anidb_xml->xpath('//titles/title[@xml:lang = "ja" and @type = "official"]')[0].'';
 
-	$artist = $anidb_xml->xpath('//creators/name[@type = "Animation Work"]')[0].'';
+  $artist = $anidb_xml->xpath('//creators/name[@type = "Animation Work"]')[0].'';
 
-	$year = substr($anidb_xml->startdate, 0, 4);
+  $year = substr($anidb_xml->startdate, 0, 4);
 
-	$desc = preg_replace('/http:\/\/anidb.net\S+ \[(.*?)\]/', '$1', ($anidb_xml->description).'');
+  $desc = preg_replace('/http:\/\/anidb.net\S+ \[(.*?)\]/', '$1', ($anidb_xml->description).'');
 
-	$json_str = array(
-		'id' => $aid,
-		'title' => $title,
-		'title_jp' => $title_jp,
-		'artist' => $artist,
-		'year' => $year,
-		'description' => $desc
-	);
+  $json_str = array(
+    'id' => $aid,
+    'title' => $title,
+    'title_jp' => $title_jp,
+    'artist' => $artist,
+    'year' => $year,
+    'description' => $desc
+  );
 
-	$Cache->cache_value('anidb_json_'.$aid, $json_str, 86400);
+  $Cache->cache_value('anidb_json_'.$aid, $json_str, 86400);
 
-	json_die("success", $json_str);
+  json_die("success", $json_str);
 }
 
 ?>

sections/ajax/announcements.php

@@ -1,83 +1,83 @@
 <?
 if (!$News = $Cache->get_value('news')) {
-	$DB->query("
-		SELECT
-			ID,
-			Title,
-			Body,
-			Time
-		FROM news
-		ORDER BY Time DESC
-		LIMIT 5");
-	$News = $DB->to_array(false, MYSQLI_NUM, false);
-	$Cache->cache_value('news', $News, 3600 * 24 * 30);
-	$Cache->cache_value('news_latest_id', $News[0][0], 0);
+  $DB->query("
+    SELECT
+      ID,
+      Title,
+      Body,
+      Time
+    FROM news
+    ORDER BY Time DESC
+    LIMIT 5");
+  $News = $DB->to_array(false, MYSQLI_NUM, false);
+  $Cache->cache_value('news', $News, 3600 * 24 * 30);
+  $Cache->cache_value('news_latest_id', $News[0][0], 0);
 }
 
 if ($LoggedUser['LastReadNews'] != $News[0][0]) {
-	$Cache->begin_transaction("user_info_heavy_$UserID");
-	$Cache->update_row(false, array('LastReadNews' => $News[0][0]));
-	$Cache->commit_transaction(0);
-	$DB->query("
-		UPDATE users_info
-		SET LastReadNews = '".$News[0][0]."'
-		WHERE UserID = $UserID");
-	$LoggedUser['LastReadNews'] = $News[0][0];
+  $Cache->begin_transaction("user_info_heavy_$UserID");
+  $Cache->update_row(false, array('LastReadNews' => $News[0][0]));
+  $Cache->commit_transaction(0);
+  $DB->query("
+    UPDATE users_info
+    SET LastReadNews = '".$News[0][0]."'
+    WHERE UserID = $UserID");
+  $LoggedUser['LastReadNews'] = $News[0][0];
 }
 
 if (($Blog = $Cache->get_value('blog')) === false) {
-	$DB->query("
-		SELECT
-			b.ID,
-			um.Username,
-			b.UserID,
-			b.Title,
-			b.Body,
-			b.Time,
-			b.ThreadID
-		FROM blog AS b
-			LEFT JOIN users_main AS um ON b.UserID = um.ID
-		ORDER BY Time DESC
-		LIMIT 20");
-	$Blog = $DB->to_array();
-	$Cache->cache_value('blog', $Blog, 1209600);
+  $DB->query("
+    SELECT
+      b.ID,
+      um.Username,
+      b.UserID,
+      b.Title,
+      b.Body,
+      b.Time,
+      b.ThreadID
+    FROM blog AS b
+      LEFT JOIN users_main AS um ON b.UserID = um.ID
+    ORDER BY Time DESC
+    LIMIT 20");
+  $Blog = $DB->to_array();
+  $Cache->cache_value('blog', $Blog, 1209600);
 }
 $JsonBlog = array();
 for ($i = 0; $i < 5; $i++) {
-	list($BlogID, $Author, $AuthorID, $Title, $Body, $BlogTime, $ThreadID) = $Blog[$i];
-	$JsonBlog[] = array(
-		'blogId' => (int)$BlogID,
-		'author' => $Author,
-		'title' => $Title,
-		'bbBody' => $Body,
-		'body' => Text::full_format($Body),
-		'blogTime' => $BlogTime,
-		'threadId' => (int)$ThreadID
-	);
+  list($BlogID, $Author, $AuthorID, $Title, $Body, $BlogTime, $ThreadID) = $Blog[$i];
+  $JsonBlog[] = array(
+    'blogId' => (int)$BlogID,
+    'author' => $Author,
+    'title' => $Title,
+    'bbBody' => $Body,
+    'body' => Text::full_format($Body),
+    'blogTime' => $BlogTime,
+    'threadId' => (int)$ThreadID
+  );
 }
 
 $JsonAnnouncements = array();
 $Count = 0;
 foreach ($News as $NewsItem) {
-	list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
-	if (strtotime($NewsTime) > time()) {
-		continue;
-	}
+  list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
+  if (strtotime($NewsTime) > time()) {
+    continue;
+  }
 
-	$JsonAnnouncements[] = array(
-		'newsId' => (int)$NewsID,
-		'title' => $Title,
-		'bbBody' => $Body,
-		'body' => Text::full_format($Body),
-		'newsTime' => $NewsTime
-	);
+  $JsonAnnouncements[] = array(
+    'newsId' => (int)$NewsID,
+    'title' => $Title,
+    'bbBody' => $Body,
+    'body' => Text::full_format($Body),
+    'newsTime' => $NewsTime
+  );
 
-	if (++$Count > 4) {
-		break;
-	}
+  if (++$Count > 4) {
+    break;
+  }
 }
 
 json_die("success", array(
-	'announcements' => $JsonAnnouncements,
-	'blogPosts' => $JsonBlog
+  'announcements' => $JsonAnnouncements,
+  'blogPosts' => $JsonBlog
 ));

sections/ajax/artist.php

@@ -1,202 +1,202 @@
 <?
 //For sorting tags
 function compare($X, $Y) {
-	return($Y['count'] - $X['count']);
+  return($Y['count'] - $X['count']);
 }
 
 if (!empty($_GET['artistreleases'])) {
-	$OnlyArtistReleases = true;
+  $OnlyArtistReleases = true;
 }
 
 if ($_GET['id'] && $_GET['artistname']) {
-	json_die("failure", "bad parameters");
+  json_die("failure", "bad parameters");
 }
 
 $ArtistID = $_GET['id'];
 if ($ArtistID && !is_number($ArtistID)) {
-	json_die("failure");
+  json_die("failure");
 }
 
 if (empty($ArtistID)) {
-	if (!empty($_GET['artistname'])) {
-		$Name = db_string(trim($_GET['artistname']));
-		$DB->query("
-			SELECT ArtistID
-			FROM artists_alias
-			WHERE Name LIKE '$Name'");
-		if (!(list($ArtistID) = $DB->next_record(MYSQLI_NUM, false))) {
-			json_die("failure");
-		}
-		// If we get here, we got the ID!
-	}
+  if (!empty($_GET['artistname'])) {
+    $Name = db_string(trim($_GET['artistname']));
+    $DB->query("
+      SELECT ArtistID
+      FROM artists_alias
+      WHERE Name LIKE '$Name'");
+    if (!(list($ArtistID) = $DB->next_record(MYSQLI_NUM, false))) {
+      json_die("failure");
+    }
+    // If we get here, we got the ID!
+  }
 }
 
 if (!empty($_GET['revisionid'])) { // if they're viewing an old revision
-	$RevisionID = $_GET['revisionid'];
-	if (!is_number($RevisionID)) {
-		error(0);
-	}
-	$Data = $Cache->get_value("artist_$ArtistID"."_revision_$RevisionID");
+  $RevisionID = $_GET['revisionid'];
+  if (!is_number($RevisionID)) {
+    error(0);
+  }
+  $Data = $Cache->get_value("artist_$ArtistID"."_revision_$RevisionID");
 } else { // viewing the live version
-	$Data = $Cache->get_value("artist_$ArtistID");
-	$RevisionID = false;
+  $Data = $Cache->get_value("artist_$ArtistID");
+  $RevisionID = false;
 }
 if ($Data) {
-//	list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , , $VanityHouseArtist)) = each($Data);
-	list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , )) = each($Data);
+//  list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , , $VanityHouseArtist)) = each($Data);
+  list($K, list($Name, $Image, $Body, $NumSimilar, $SimilarArray, , )) = each($Data);
 } else {
-	if ($RevisionID) {
-	/*
-		$sql = "
-			SELECT
-				a.Name,
-				wiki.Image,
-				wiki.body,
-				a.VanityHouse
-			FROM wiki_artists AS wiki
-				LEFT JOIN artists_group AS a ON wiki.RevisionID = a.RevisionID
-			WHERE wiki.RevisionID = '$RevisionID' ";
-	*/
-		$sql = "
-			SELECT
-				a.Name,
-				wiki.Image,
-				wiki.body
-			FROM wiki_artists AS wiki
-				LEFT JOIN artists_group AS a ON wiki.RevisionID = a.RevisionID
-			WHERE wiki.RevisionID = '$RevisionID' ";
-	} else {
-	/*
-		$sql = "
-			SELECT
-				a.Name,
-				wiki.Image,
-				wiki.body,
-				a.VanityHouse
-			FROM artists_group AS a
-				LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID = a.RevisionID
-			WHERE a.ArtistID = '$ArtistID' ";
-	*/
-		$sql = "
-			SELECT
-				a.Name,
-				wiki.Image,
-				wiki.body
-			FROM artists_group AS a
-				LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID = a.RevisionID
-			WHERE a.ArtistID = '$ArtistID' ";
-	}
-	$sql .= " GROUP BY a.ArtistID";
-	$DB->query($sql);
+  if ($RevisionID) {
+  /*
+    $sql = "
+      SELECT
+        a.Name,
+        wiki.Image,
+        wiki.body,
+        a.VanityHouse
+      FROM wiki_artists AS wiki
+        LEFT JOIN artists_group AS a ON wiki.RevisionID = a.RevisionID
+      WHERE wiki.RevisionID = '$RevisionID' ";
+  */
+    $sql = "
+      SELECT
+        a.Name,
+        wiki.Image,
+        wiki.body
+      FROM wiki_artists AS wiki
+        LEFT JOIN artists_group AS a ON wiki.RevisionID = a.RevisionID
+      WHERE wiki.RevisionID = '$RevisionID' ";
+  } else {
+  /*
+    $sql = "
+      SELECT
+        a.Name,
+        wiki.Image,
+        wiki.body,
+        a.VanityHouse
+      FROM artists_group AS a
+        LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID = a.RevisionID
+      WHERE a.ArtistID = '$ArtistID' ";
+  */
+    $sql = "
+      SELECT
+        a.Name,
+        wiki.Image,
+        wiki.body
+      FROM artists_group AS a
+        LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID = a.RevisionID
+      WHERE a.ArtistID = '$ArtistID' ";
+  }
+  $sql .= " GROUP BY a.ArtistID";
+  $DB->query($sql);
 
-	if (!$DB->has_results()) {
-		json_die("failure");
-	}
+  if (!$DB->has_results()) {
+    json_die("failure");
+  }
 
 //  list($Name, $Image, $Body, $VanityHouseArtist) = $DB->next_record(MYSQLI_NUM, array(0));
-	list($Name, $Image, $Body) = $DB->next_record(MYSQLI_NUM, array(0));
+  list($Name, $Image, $Body) = $DB->next_record(MYSQLI_NUM, array(0));
 }
 
 // Requests
 $Requests = array();
 if (empty($LoggedUser['DisableRequests'])) {
-	$Requests = $Cache->get_value("artists_requests_$ArtistID");
-	if (!is_array($Requests)) {
-		$DB->query("
-			SELECT
-				r.ID,
-				r.CategoryID,
-				r.Title,
-				r.Year,
-				r.TimeAdded,
-				COUNT(rv.UserID) AS Votes,
-				SUM(rv.Bounty) AS Bounty
-			FROM requests AS r
-				LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
-				LEFT JOIN requests_artists AS ra ON r.ID = ra.RequestID
-			WHERE ra.ArtistID = $ArtistID
-				AND r.TorrentID = 0
-			GROUP BY r.ID
-			ORDER BY Votes DESC");
-	
-		if ($DB->has_results()) {
-			$Requests = $DB->to_array('ID', MYSQLI_ASSOC, false);
-		} else {
-			$Requests = array();
-		}
-		$Cache->cache_value("artists_requests_$ArtistID", $Requests);
-	}
+  $Requests = $Cache->get_value("artists_requests_$ArtistID");
+  if (!is_array($Requests)) {
+    $DB->query("
+      SELECT
+        r.ID,
+        r.CategoryID,
+        r.Title,
+        r.Year,
+        r.TimeAdded,
+        COUNT(rv.UserID) AS Votes,
+        SUM(rv.Bounty) AS Bounty
+      FROM requests AS r
+        LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
+        LEFT JOIN requests_artists AS ra ON r.ID = ra.RequestID
+      WHERE ra.ArtistID = $ArtistID
+        AND r.TorrentID = 0
+      GROUP BY r.ID
+      ORDER BY Votes DESC");
+
+    if ($DB->has_results()) {
+      $Requests = $DB->to_array('ID', MYSQLI_ASSOC, false);
+    } else {
+      $Requests = array();
+    }
+    $Cache->cache_value("artists_requests_$ArtistID", $Requests);
+  }
 }
 $NumRequests = count($Requests);
 
 if (($Importances = $Cache->get_value("artist_groups_$ArtistID")) === false) {
-	/*
-	$DB->query("
-		SELECT
-			DISTINCTROW ta.GroupID, ta.Importance, tg.VanityHouse, tg.Year
-		FROM torrents_artists AS ta
-			JOIN torrents_group AS tg ON tg.ID = ta.GroupID
-		WHERE ta.ArtistID = '$ArtistID'
-		ORDER BY tg.Year DESC, tg.Name DESC");
-	*/
-	$DB->query("
-		SELECT
-			DISTINCTROW ta.GroupID, ta.Importance, tg.Year
-		FROM torrents_artists AS ta
-			JOIN torrents_group AS tg ON tg.ID = ta.GroupID
-		WHERE ta.ArtistID = '$ArtistID'
-		ORDER BY tg.Year DESC, tg.Name DESC");
-	$GroupIDs = $DB->collect('GroupID');
-	$Importances = $DB->to_array(false, MYSQLI_BOTH, false);
-	$Cache->cache_value("artist_groups_$ArtistID", $Importances, 0);
+  /*
+  $DB->query("
+    SELECT
+      DISTINCTROW ta.GroupID, ta.Importance, tg.VanityHouse, tg.Year
+    FROM torrents_artists AS ta
+      JOIN torrents_group AS tg ON tg.ID = ta.GroupID
+    WHERE ta.ArtistID = '$ArtistID'
+    ORDER BY tg.Year DESC, tg.Name DESC");
+  */
+  $DB->query("
+    SELECT
+      DISTINCTROW ta.GroupID, ta.Importance, tg.Year
+    FROM torrents_artists AS ta
+      JOIN torrents_group AS tg ON tg.ID = ta.GroupID
+    WHERE ta.ArtistID = '$ArtistID'
+    ORDER BY tg.Year DESC, tg.Name DESC");
+  $GroupIDs = $DB->collect('GroupID');
+  $Importances = $DB->to_array(false, MYSQLI_BOTH, false);
+  $Cache->cache_value("artist_groups_$ArtistID", $Importances, 0);
 } else {
-	$GroupIDs = array();
-	foreach ($Importances as $Group) {
-		$GroupIDs[] = $Group['GroupID'];
-	}
+  $GroupIDs = array();
+  foreach ($Importances as $Group) {
+    $GroupIDs[] = $Group['GroupID'];
+  }
 }
 if (count($GroupIDs) > 0) {
-	$TorrentList = Torrents::get_groups($GroupIDs, true, true);
+  $TorrentList = Torrents::get_groups($GroupIDs, true, true);
 } else {
-	$TorrentList = array();
+  $TorrentList = array();
 }
 $NumGroups = count($TorrentList);
 
 //Get list of used release types
 $UsedReleases = array();
 foreach ($TorrentList as $GroupID=>$Group) {
-	if ($Importances[$GroupID]['Importance'] == '2') {
-		$TorrentList[$GroupID]['ReleaseType'] = 1024;
-		$GuestAlbums = true;
-	}
-	if ($Importances[$GroupID]['Importance'] == '3') {
-		$TorrentList[$GroupID]['ReleaseType'] = 1023;
-		$RemixerAlbums = true;
-	}
-	if ($Importances[$GroupID]['Importance'] == '4') {
-		$TorrentList[$GroupID]['ReleaseType'] = 1022;
-		$ComposerAlbums = true;
-	}
-	if ($Importances[$GroupID]['Importance'] == '7') {
-		$TorrentList[$GroupID]['ReleaseType'] = 1021;
-		$ProducerAlbums = true;
-	}
-	if (!in_array($TorrentList[$GroupID]['ReleaseType'], $UsedReleases)) {
-		$UsedReleases[] = $TorrentList[$GroupID]['ReleaseType'];
-	}
+  if ($Importances[$GroupID]['Importance'] == '2') {
+    $TorrentList[$GroupID]['ReleaseType'] = 1024;
+    $GuestAlbums = true;
+  }
+  if ($Importances[$GroupID]['Importance'] == '3') {
+    $TorrentList[$GroupID]['ReleaseType'] = 1023;
+    $RemixerAlbums = true;
+  }
+  if ($Importances[$GroupID]['Importance'] == '4') {
+    $TorrentList[$GroupID]['ReleaseType'] = 1022;
+    $ComposerAlbums = true;
+  }
+  if ($Importances[$GroupID]['Importance'] == '7') {
+    $TorrentList[$GroupID]['ReleaseType'] = 1021;
+    $ProducerAlbums = true;
+  }
+  if (!in_array($TorrentList[$GroupID]['ReleaseType'], $UsedReleases)) {
+    $UsedReleases[] = $TorrentList[$GroupID]['ReleaseType'];
+  }
 }
 
 if (!empty($GuestAlbums)) {
-	$ReleaseTypes[1024] = 'Guest Appearance';
+  $ReleaseTypes[1024] = 'Guest Appearance';
 }
 if (!empty($RemixerAlbums)) {
-	$ReleaseTypes[1023] = 'Remixed By';
+  $ReleaseTypes[1023] = 'Remixed By';
 }
 if (!empty($ComposerAlbums)) {
-	$ReleaseTypes[1022] = 'Composition';
+  $ReleaseTypes[1022] = 'Composition';
 }
 if (!empty($ProducerAlbums)) {
-	$ReleaseTypes[1021] = 'Produced By';
+  $ReleaseTypes[1021] = 'Produced By';
 }
 
 reset($TorrentList);
@@ -205,168 +205,168 @@ $JsonTorrents = array();
 $Tags = array();
 $NumTorrents = $NumSeeders = $NumLeechers = $NumSnatches = 0;
 foreach ($GroupIDs as $GroupID) {
-	if (!isset($TorrentList[$GroupID])) {
-		continue;
-	}
-	$Group = $TorrentList[$GroupID];
-	extract(Torrents::array_group($Group));
+  if (!isset($TorrentList[$GroupID])) {
+    continue;
+  }
+  $Group = $TorrentList[$GroupID];
+  extract(Torrents::array_group($Group));
 
-	foreach ($Artists as &$Artist) {
-		$Artist['id'] = (int)$Artist['id'];
-		$Artist['aliasid'] = (int)$Artist['aliasid'];
-	}
+  foreach ($Artists as &$Artist) {
+    $Artist['id'] = (int)$Artist['id'];
+    $Artist['aliasid'] = (int)$Artist['aliasid'];
+  }
 
-	foreach ($ExtendedArtists as &$ArtistGroup) {
-		foreach ($ArtistGroup as &$Artist) {
-			$Artist['id'] = (int)$Artist['id'];
-			$Artist['aliasid'] = (int)$Artist['aliasid'];
-		}
-	}
+  foreach ($ExtendedArtists as &$ArtistGroup) {
+    foreach ($ArtistGroup as &$Artist) {
+      $Artist['id'] = (int)$Artist['id'];
+      $Artist['aliasid'] = (int)$Artist['aliasid'];
+    }
+  }
 
-	$Found = Misc::search_array($Artists, 'id', $ArtistID);
-	if (isset($OnlyArtistReleases) && empty($Found)) {
-		continue;
-	}
+  $Found = Misc::search_array($Artists, 'id', $ArtistID);
+  if (isset($OnlyArtistReleases) && empty($Found)) {
+    continue;
+  }
 
-	$GroupVanityHouse = $Importances[$GroupID]['VanityHouse'];
+  $GroupVanityHouse = $Importances[$GroupID]['VanityHouse'];
 
-	$TagList = explode(' ',str_replace('_', '.', $TagList));
+  $TagList = explode(' ',str_replace('_', '.', $TagList));
 
-	// $Tags array is for the sidebar on the right
-	foreach ($TagList as $Tag) {
-		if (!isset($Tags[$Tag])) {
-			$Tags[$Tag] = array('name' => $Tag, 'count' => 1);
-		} else {
-			$Tags[$Tag]['count']++;
-		}
-	}
-	$InnerTorrents = array();
-	foreach ($Torrents as $Torrent) {
-		$NumTorrents++;
-		$NumSeeders += $Torrent['Seeders'];
-		$NumLeechers += $Torrent['Leechers'];
-		$NumSnatches += $Torrent['Snatched'];
+  // $Tags array is for the sidebar on the right
+  foreach ($TagList as $Tag) {
+    if (!isset($Tags[$Tag])) {
+      $Tags[$Tag] = array('name' => $Tag, 'count' => 1);
+    } else {
+      $Tags[$Tag]['count']++;
+    }
+  }
+  $InnerTorrents = array();
+  foreach ($Torrents as $Torrent) {
+    $NumTorrents++;
+    $NumSeeders += $Torrent['Seeders'];
+    $NumLeechers += $Torrent['Leechers'];
+    $NumSnatches += $Torrent['Snatched'];
 
-		$InnerTorrents[] = array(
-			'id' => (int)$Torrent['ID'],
-			'groupId' => (int)$Torrent['GroupID'],
-			'media' => $Torrent['Media'],
-			'format' => $Torrent['Format'],
-			'encoding' => $Torrent['Encoding'],
-			'remasterYear' => (int)$Torrent['RemasterYear'],
-			'remastered' => $Torrent['Remastered'] == 1,
-			'remasterTitle' => $Torrent['RemasterTitle'],
-			'remasterRecordLabel' => $Torrent['RemasterRecordLabel'],
-			'scene' => $Torrent['Scene'] == 1,
-			'hasLog' => $Torrent['HasLog'] == 1,
-			'hasCue' => $Torrent['HasCue'] == 1,
-			'logScore' => (int)$Torrent['LogScore'],
-			'fileCount' => (int)$Torrent['FileCount'],
-			'freeTorrent' => $Torrent['FreeTorrent'] == 1,
-			'size' => (int)$Torrent['Size'],
-			'leechers' => (int)$Torrent['Leechers'],
-			'seeders' => (int)$Torrent['Seeders'],
-			'snatched' => (int)$Torrent['Snatched'],
-			'time' => $Torrent['Time'],
-			'hasFile' => (int)$Torrent['HasFile']
-		);
-	}
-	$JsonTorrents[] = array(
-		'groupId' => (int)$GroupID,
-		'groupName' => $GroupName,
-		'groupYear' => (int)$GroupYear,
-		'groupRecordLabel' => $GroupRecordLabel,
-		'groupCatalogueNumber' => $GroupCatalogueNumber,
-		'groupCategoryID' => $GroupCategoryID,
-		'tags' => $TagList,
-		'releaseType' => (int)$ReleaseType,
-		'wikiImage' => $WikiImage,
-		'groupVanityHouse' => $GroupVanityHouse == 1,
-		'hasBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
-		'artists' => $Artists,
-		'extendedArtists' => $ExtendedArtists,
-		'torrent' => $InnerTorrents,
+    $InnerTorrents[] = array(
+      'id' => (int)$Torrent['ID'],
+      'groupId' => (int)$Torrent['GroupID'],
+      'media' => $Torrent['Media'],
+      'format' => $Torrent['Format'],
+      'encoding' => $Torrent['Encoding'],
+      'remasterYear' => (int)$Torrent['RemasterYear'],
+      'remastered' => $Torrent['Remastered'] == 1,
+      'remasterTitle' => $Torrent['RemasterTitle'],
+      'remasterRecordLabel' => $Torrent['RemasterRecordLabel'],
+      'scene' => $Torrent['Scene'] == 1,
+      'hasLog' => $Torrent['HasLog'] == 1,
+      'hasCue' => $Torrent['HasCue'] == 1,
+      'logScore' => (int)$Torrent['LogScore'],
+      'fileCount' => (int)$Torrent['FileCount'],
+      'freeTorrent' => $Torrent['FreeTorrent'] == 1,
+      'size' => (int)$Torrent['Size'],
+      'leechers' => (int)$Torrent['Leechers'],
+      'seeders' => (int)$Torrent['Seeders'],
+      'snatched' => (int)$Torrent['Snatched'],
+      'time' => $Torrent['Time'],
+      'hasFile' => (int)$Torrent['HasFile']
+    );
+  }
+  $JsonTorrents[] = array(
+    'groupId' => (int)$GroupID,
+    'groupName' => $GroupName,
+    'groupYear' => (int)$GroupYear,
+    'groupRecordLabel' => $GroupRecordLabel,
+    'groupCatalogueNumber' => $GroupCatalogueNumber,
+    'groupCategoryID' => $GroupCategoryID,
+    'tags' => $TagList,
+    'releaseType' => (int)$ReleaseType,
+    'wikiImage' => $WikiImage,
+    'groupVanityHouse' => $GroupVanityHouse == 1,
+    'hasBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
+    'artists' => $Artists,
+    'extendedArtists' => $ExtendedArtists,
+    'torrent' => $InnerTorrents,
 
-	);
+  );
 }
 
 $JsonSimilar = array();
 if (empty($SimilarArray)) {
-	$DB->query("
-		SELECT
-			s2.ArtistID,
-			a.Name,
-			ass.Score,
-			ass.SimilarID
-		FROM artists_similar AS s1
-			JOIN artists_similar AS s2 ON s1.SimilarID = s2.SimilarID AND s1.ArtistID != s2.ArtistID
-			JOIN artists_similar_scores AS ass ON ass.SimilarID = s1.SimilarID
-			JOIN artists_group AS a ON a.ArtistID = s2.ArtistID
-		WHERE s1.ArtistID = '$ArtistID'
-		ORDER BY ass.Score DESC
-		LIMIT 30
-	");
-	$SimilarArray = $DB->to_array();
-	foreach ($SimilarArray as $Similar) {
-		$JsonSimilar[] = array(
-			'artistId' => (int)$Similar['ArtistID'],
-			'name' => $Similar['Name'],
-			'score' => (int)$Similar['Score'],
-			'similarId' => (int)$Similar['SimilarID']
-		);
-	}
-	$NumSimilar = count($SimilarArray);
+  $DB->query("
+    SELECT
+      s2.ArtistID,
+      a.Name,
+      ass.Score,
+      ass.SimilarID
+    FROM artists_similar AS s1
+      JOIN artists_similar AS s2 ON s1.SimilarID = s2.SimilarID AND s1.ArtistID != s2.ArtistID
+      JOIN artists_similar_scores AS ass ON ass.SimilarID = s1.SimilarID
+      JOIN artists_group AS a ON a.ArtistID = s2.ArtistID
+    WHERE s1.ArtistID = '$ArtistID'
+    ORDER BY ass.Score DESC
+    LIMIT 30
+  ");
+  $SimilarArray = $DB->to_array();
+  foreach ($SimilarArray as $Similar) {
+    $JsonSimilar[] = array(
+      'artistId' => (int)$Similar['ArtistID'],
+      'name' => $Similar['Name'],
+      'score' => (int)$Similar['Score'],
+      'similarId' => (int)$Similar['SimilarID']
+    );
+  }
+  $NumSimilar = count($SimilarArray);
 } else {
-	//If data already exists, use it
-	foreach ($SimilarArray as $Similar) {
-		$JsonSimilar[] = array(
-			'artistId' => (int)$Similar['ArtistID'],
-			'name' => $Similar['Name'],
-			'score' => (int)$Similar['Score'],
-			'similarId' => (int)$Similar['SimilarID']
-		);
-	}
+  //If data already exists, use it
+  foreach ($SimilarArray as $Similar) {
+    $JsonSimilar[] = array(
+      'artistId' => (int)$Similar['ArtistID'],
+      'name' => $Similar['Name'],
+      'score' => (int)$Similar['Score'],
+      'similarId' => (int)$Similar['SimilarID']
+    );
+  }
 }
 
 $JsonRequests = array();
 foreach ($Requests as $RequestID => $Request) {
-	$JsonRequests[] = array(
-		'requestId' => (int)$RequestID,
-		'categoryId' => (int)$Request['CategoryID'],
-		'title' => $Request['Title'],
-		'year' => (int)$Request['Year'],
-		'timeAdded' => $Request['TimeAdded'],
-		'votes' => (int)$Request['Votes'],
-		'bounty' => (int)$Request['Bounty']
-	);
+  $JsonRequests[] = array(
+    'requestId' => (int)$RequestID,
+    'categoryId' => (int)$Request['CategoryID'],
+    'title' => $Request['Title'],
+    'year' => (int)$Request['Year'],
+    'timeAdded' => $Request['TimeAdded'],
+    'votes' => (int)$Request['Votes'],
+    'bounty' => (int)$Request['Bounty']
+  );
 }
 
 //notifications disabled by default
 $notificationsEnabled = false;
 if (check_perms('site_torrents_notify')) {
-	if (($Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
-		$DB->query("
-			SELECT ID, Artists
-			FROM users_notify_filters
-			WHERE UserID = '$LoggedUser[ID]'
-				AND Label = 'Artist notifications'
-			LIMIT 1");
-		$Notify = $DB->next_record(MYSQLI_ASSOC, false);
-		$Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
-	}
-	if (stripos($Notify['Artists'], "|$Name|") === false) {
-		$notificationsEnabled = false;
-	} else {
-		$notificationsEnabled = true;
-	}
+  if (($Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
+    $DB->query("
+      SELECT ID, Artists
+      FROM users_notify_filters
+      WHERE UserID = '$LoggedUser[ID]'
+        AND Label = 'Artist notifications'
+      LIMIT 1");
+    $Notify = $DB->next_record(MYSQLI_ASSOC, false);
+    $Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
+  }
+  if (stripos($Notify['Artists'], "|$Name|") === false) {
+    $notificationsEnabled = false;
+  } else {
+    $notificationsEnabled = true;
+  }
 }
 
 // Cache page for later use
 
 if ($RevisionID) {
-	$Key = "artist_$ArtistID"."_revision_$RevisionID";
+  $Key = "artist_$ArtistID"."_revision_$RevisionID";
 } else {
-	$Key = "artist_$ArtistID";
+  $Key = "artist_$ArtistID";
 }
 
 $Data = array(array($Name, $Image, $Body, $NumSimilar, $SimilarArray, array(), array(), $VanityHouseArtist));
@@ -374,24 +374,24 @@ $Data = array(array($Name, $Image, $Body, $NumSimilar, $SimilarArray, array(), a
 $Cache->cache_value($Key, $Data, 3600);
 
 json_die("success", array(
-	'id' => (int)$ArtistID,
-	'name' => $Name,
-	'notificationsEnabled' => $notificationsEnabled,
-	'hasBookmarked' => Bookmarks::has_bookmarked('artist', $ArtistID),
-	'image' => $Image,
-	'body' => Text::full_format($Body),
-	'vanityHouse' => $VanityHouseArtist == 1,
-	'tags' => array_values($Tags),
-	'similarArtists' => $JsonSimilar,
-	'statistics' => array(
-		'numGroups' => $NumGroups,
-		'numTorrents' => $NumTorrents,
-		'numSeeders' => $NumSeeders,
-		'numLeechers' => $NumLeechers,
-		'numSnatches' => $NumSnatches
-	),
-	'torrentgroup' => $JsonTorrents,
-	'requests' => $JsonRequests
+  'id' => (int)$ArtistID,
+  'name' => $Name,
+  'notificationsEnabled' => $notificationsEnabled,
+  'hasBookmarked' => Bookmarks::has_bookmarked('artist', $ArtistID),
+  'image' => $Image,
+  'body' => Text::full_format($Body),
+  'vanityHouse' => $VanityHouseArtist == 1,
+  'tags' => array_values($Tags),
+  'similarArtists' => $JsonSimilar,
+  'statistics' => array(
+    'numGroups' => $NumGroups,
+    'numTorrents' => $NumTorrents,
+    'numSeeders' => $NumSeeders,
+    'numLeechers' => $NumLeechers,
+    'numSnatches' => $NumSnatches
+  ),
+  'torrentgroup' => $JsonTorrents,
+  'requests' => $JsonRequests
 ));
 
 ?>

sections/ajax/better/index.php

@@ -3,36 +3,36 @@
 
 enforce_login();
 if (isset($_GET['method'])) {
-	switch ($_GET['method']) {
-		case 'transcode':
-			include(SERVER_ROOT.'/sections/ajax/better/transcode.php');
-			break;
-		case 'single':
-			include(SERVER_ROOT.'/sections/ajax/better/single.php');
-			break;
-		case 'snatch':
-			include(SERVER_ROOT.'/sections/ajax/better/snatch.php');
-			break;
-		case 'artistless':
-			include(SERVER_ROOT.'/sections/ajax/better/artistless.php');
-			break;
-		case 'tags':
-			include(SERVER_ROOT.'/sections/ajax/better/tags.php');
-			break;
-		case 'folders':
-			include(SERVER_ROOT.'/sections/ajax/better/folders.php');
-			break;
-		case 'files':
-			include(SERVER_ROOT.'/sections/ajax/better/files.php');
-			break;
-		case 'upload':
-			include(SERVER_ROOT.'/sections/ajax/better/upload.php');
-			break;
-		default:
-			print json_encode(array('status' => 'failure'));
-			break;
-	}
+  switch ($_GET['method']) {
+    case 'transcode':
+      include(SERVER_ROOT.'/sections/ajax/better/transcode.php');
+      break;
+    case 'single':
+      include(SERVER_ROOT.'/sections/ajax/better/single.php');
+      break;
+    case 'snatch':
+      include(SERVER_ROOT.'/sections/ajax/better/snatch.php');
+      break;
+    case 'artistless':
+      include(SERVER_ROOT.'/sections/ajax/better/artistless.php');
+      break;
+    case 'tags':
+      include(SERVER_ROOT.'/sections/ajax/better/tags.php');
+      break;
+    case 'folders':
+      include(SERVER_ROOT.'/sections/ajax/better/folders.php');
+      break;
+    case 'files':
+      include(SERVER_ROOT.'/sections/ajax/better/files.php');
+      break;
+    case 'upload':
+      include(SERVER_ROOT.'/sections/ajax/better/upload.php');
+      break;
+    default:
+      print json_encode(array('status' => 'failure'));
+      break;
+  }
 } else {
-	print json_encode(array('status' => 'failure'));
+  print json_encode(array('status' => 'failure'));
 }
 ?>

sections/ajax/better/single.php

@@ -1,55 +1,55 @@
 <?
 if (($Results = $Cache->get_value('better_single_groupids')) === false) {
-	$DB->query("
-		SELECT
-			t.ID AS TorrentID,
-			t.GroupID AS GroupID
-		FROM xbt_files_users AS x
-			JOIN torrents AS t ON t.ID=x.fid
-		WHERE t.Format='FLAC'
-		GROUP BY x.fid
-		HAVING COUNT(x.uid) = 1
-		ORDER BY t.LogScore DESC, t.Time ASC
-		LIMIT 30");
+  $DB->query("
+    SELECT
+      t.ID AS TorrentID,
+      t.GroupID AS GroupID
+    FROM xbt_files_users AS x
+      JOIN torrents AS t ON t.ID=x.fid
+    WHERE t.Format='FLAC'
+    GROUP BY x.fid
+    HAVING COUNT(x.uid) = 1
+    ORDER BY t.LogScore DESC, t.Time ASC
+    LIMIT 30");
 
-	$Results = $DB->to_pair('GroupID', 'TorrentID', false);
-	$Cache->cache_value('better_single_groupids', $Results, 30 * 60);
+  $Results = $DB->to_pair('GroupID', 'TorrentID', false);
+  $Cache->cache_value('better_single_groupids', $Results, 30 * 60);
 }
 
 $Groups = Torrents::get_groups(array_keys($Results));
 
 $JsonResults = array();
 foreach ($Results as $GroupID => $FlacID) {
-	if (!isset($Groups[$GroupID])) {
-		continue;
-	}
-	$Group = $Groups[$GroupID];
-	extract(Torrents::array_group($Group));
+  if (!isset($Groups[$GroupID])) {
+    continue;
+  }
+  $Group = $Groups[$GroupID];
+  extract(Torrents::array_group($Group));
 
-	$JsonArtists = array();
-	if (count($Artists) > 0) {
-		foreach ($Artists as $Artist) {
-			$JsonArtists[] = array(
-				'id' => (int)$Artist['id'],
-				'name' => $Artist['name'],
-				'aliasId' => (int)$Artist['aliasid']
-			);
-		}
-	}
+  $JsonArtists = array();
+  if (count($Artists) > 0) {
+    foreach ($Artists as $Artist) {
+      $JsonArtists[] = array(
+        'id' => (int)$Artist['id'],
+        'name' => $Artist['name'],
+        'aliasId' => (int)$Artist['aliasid']
+      );
+    }
+  }
 
-	$JsonResults[] = array(
-		'torrentId' => (int)$FlacID,
-		'groupId' => (int)$GroupID,
-		'artist' => $JsonArtists,
-		'groupName' => $GroupName,
-		'groupYear' => (int)$GroupYear,
-		'downloadUrl' => "torrents.php?action=download&id=$FlacID&authkey=".$LoggedUser['AuthKey'].'&torrent_pass='.$LoggedUser['torrent_pass']
-	);
+  $JsonResults[] = array(
+    'torrentId' => (int)$FlacID,
+    'groupId' => (int)$GroupID,
+    'artist' => $JsonArtists,
+    'groupName' => $GroupName,
+    'groupYear' => (int)$GroupYear,
+    'downloadUrl' => "torrents.php?action=download&id=$FlacID&authkey=".$LoggedUser['AuthKey'].'&torrent_pass='.$LoggedUser['torrent_pass']
+  );
 }
 
 print json_encode(
-	array(
-		'status' => 'success',
-		'response' => $JsonResults
-	)
+  array(
+    'status' => 'success',
+    'response' => $JsonResults
+  )
 );