mdaniels5757 / waca

includes/Providers/FakeLocationProvider.php

Indentation +4 added lines, -4 removed lines

@@ -15,8 +15,8 @@
  */
 class FakeLocationProvider implements ILocationProvider
 {
-    public function getIpLocation($address)
-    {
-        return null;
-    }
+	public function getIpLocation($address)
+	{
+		return null;
+	}
 }

includes/Providers/GlobalState/FakeGlobalStateProvider.php

Indentation +20 added lines, -20 removed lines

@@ -18,28 +18,28 @@
  */
 class FakeGlobalStateProvider extends GlobalStateProvider implements IGlobalStateProvider
 {
-    var $server = array();
-    var $get = array();
-    var $post = array();
-    var $session = array();
+	var $server = array();
+	var $get = array();
+	var $post = array();
+	var $session = array();
 
-    public function &getServerSuperGlobal()
-    {
-        return $this->server;
-    }
+	public function &getServerSuperGlobal()
+	{
+		return $this->server;
+	}
 
-    public function &getGetSuperGlobal()
-    {
-        return $this->get;
-    }
+	public function &getGetSuperGlobal()
+	{
+		return $this->get;
+	}
 
-    public function &getPostSuperGlobal()
-    {
-        return $this->post;
-    }
+	public function &getPostSuperGlobal()
+	{
+		return $this->post;
+	}
 
-    public function &getSessionSuperGlobal()
-    {
-        return $this->session;
-    }
+	public function &getSessionSuperGlobal()
+	{
+		return $this->session;
+	}
 }
\ No newline at end of file

includes/Providers/GlobalState/IGlobalStateProvider.php

Indentation +16 added lines, -16 removed lines

@@ -14,23 +14,23 @@
  */
 interface IGlobalStateProvider
 {
-    /**
-     * @return array
-     */
-    public function getServerSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getServerSuperGlobal();
 
-    /**
-     * @return array
-     */
-    public function getGetSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getGetSuperGlobal();
 
-    /**
-     * @return array
-     */
-    public function getPostSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getPostSuperGlobal();
 
-    /**
-     * @return array
-     */
-    public function getSessionSuperGlobal();
+	/**
+	 * @return array
+	 */
+	public function getSessionSuperGlobal();
 }
\ No newline at end of file

includes/Providers/GlobalState/GlobalStateProvider.php

Indentation +28 added lines, -28 removed lines

@@ -18,35 +18,35 @@
  */
 class GlobalStateProvider implements IGlobalStateProvider
 {
-    /**
-     * @return array
-     */
-    public function &getServerSuperGlobal()
-    {
-        return $_SERVER;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getServerSuperGlobal()
+	{
+		return $_SERVER;
+	}
 
-    /**
-     * @return array
-     */
-    public function &getGetSuperGlobal()
-    {
-        return $_GET;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getGetSuperGlobal()
+	{
+		return $_GET;
+	}
 
-    /**
-     * @return array
-     */
-    public function &getPostSuperGlobal()
-    {
-        return $_POST;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getPostSuperGlobal()
+	{
+		return $_POST;
+	}
 
-    /**
-     * @return array
-     */
-    public function &getSessionSuperGlobal()
-    {
-        return $_SESSION;
-    }
+	/**
+	 * @return array
+	 */
+	public function &getSessionSuperGlobal()
+	{
+		return $_SESSION;
+	}
 }
\ No newline at end of file

includes/Providers/Interfaces/ILocationProvider.php

Indentation +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@
  */
 interface ILocationProvider
 {
-    /**
-     * @param string $address IP address
-     *
-     * @return array
-     */
-    public function getIpLocation($address);
+	/**
+	 * @param string $address IP address
+	 *
+	 * @return array
+	 */
+	public function getIpLocation($address);
 }

includes/Providers/Interfaces/IXffTrustProvider.php

Indentation +34 added lines, -34 removed lines

@@ -19,41 +19,41 @@
  */
 interface IXffTrustProvider
 {
-    /**
-     * Returns a value if the IP address is a trusted proxy
-     *
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function isTrusted($ip);
+	/**
+	 * Returns a value if the IP address is a trusted proxy
+	 *
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function isTrusted($ip);
 
-    /**
-     * Gets the last trusted IP in the proxy chain.
-     *
-     * @param string $ip      The IP address from REMOTE_ADDR
-     * @param string $proxyIp The contents of the XFF header.
-     *
-     * @return string Trusted source IP address
-     */
-    public function getTrustedClientIp($ip, $proxyIp);
+	/**
+	 * Gets the last trusted IP in the proxy chain.
+	 *
+	 * @param string $ip      The IP address from REMOTE_ADDR
+	 * @param string $proxyIp The contents of the XFF header.
+	 *
+	 * @return string Trusted source IP address
+	 */
+	public function getTrustedClientIp($ip, $proxyIp);
 
-    /**
-     * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
-     *
-     * @param array  $haystack
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function ipInRange($haystack, $ip);
+	/**
+	 * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
+	 *
+	 * @param array  $haystack
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function ipInRange($haystack, $ip);
 
-    /**
-     * Explodes a CIDR range into an array of addresses
-     *
-     * @param string $range A CIDR-format range
-     *
-     * @return array An array containing every IP address in the range
-     */
-    public function explodeCidr($range);
+	/**
+	 * Explodes a CIDR range into an array of addresses
+	 *
+	 * @param string $range A CIDR-format range
+	 *
+	 * @return array An array containing every IP address in the range
+	 */
+	public function explodeCidr($range);
 }

includes/Providers/Interfaces/IRDnsProvider.php

Indentation +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@
  */
 interface IRDnsProvider
 {
-    /**
-     * Gets the reverse DNS address for an IP
-     *
-     * @param string $address
-     *
-     * @return string
-     */
-    public function getReverseDNS($address);
+	/**
+	 * Gets the reverse DNS address for an IP
+	 *
+	 * @param string $address
+	 *
+	 * @return string
+	 */
+	public function getReverseDNS($address);
 }

includes/Providers/Interfaces/IAntiSpoofProvider.php

Indentation +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@
  */
 interface IAntiSpoofProvider
 {
-    /**
-     * @param string $username
-     *
-     * @return array
-     */
-    public function getSpoofs($username);
+	/**
+	 * @param string $username
+	 *
+	 * @return array
+	 */
+	public function getSpoofs($username);
 }

includes/Providers/XffTrustProvider.php

Indentation +152 added lines, -152 removed lines

@@ -22,156 +22,156 @@
  */
 class XffTrustProvider implements IXffTrustProvider
 {
-    /**
-     * Array of IP addresses which are TRUSTED proxies
-     * @var string[]
-     */
-    private $trustedCache = array();
-    /**
-     * Array of IP addresses which are UNTRUSTED proxies
-     * @var string[]
-     */
-    private $untrustedCache = array();
-    /** @var PDOStatement */
-    private $trustedQuery;
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-
-    /**
-     * Creates a new instance of the trust provider
-     *
-     * @param string[]    $squidIpList List of IP addresses to pre-approve
-     * @param PdoDatabase $database
-     */
-    public function __construct($squidIpList, PdoDatabase $database)
-    {
-        $this->trustedCache = $squidIpList;
-        $this->database = $database;
-    }
-
-    /**
-     * Returns a value if the IP address is a trusted proxy
-     *
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function isTrusted($ip)
-    {
-        if (in_array($ip, $this->trustedCache)) {
-            return true;
-        }
-
-        if (in_array($ip, $this->untrustedCache)) {
-            return false;
-        }
-
-        if ($this->trustedQuery === null) {
-            $query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
-            $this->trustedQuery = $this->database->prepare($query);
-        }
-
-        $this->trustedQuery->execute(array(":ip" => $ip));
-        $result = $this->trustedQuery->fetchColumn();
-        $this->trustedQuery->closeCursor();
-
-        if ($result == 0) {
-            $this->untrustedCache[] = $ip;
-
-            return false;
-        }
-
-        if ($result >= 1) {
-            $this->trustedCache[] = $ip;
-
-            return true;
-        }
-
-        // something weird has happened if we've got here.
-        // default to untrusted.
-        return false;
-    }
-
-    /**
-     * Gets the last trusted IP in the proxy chain.
-     *
-     * @param string $ip      The IP address from REMOTE_ADDR
-     * @param string $proxyIp The contents of the XFF header.
-     *
-     * @return string Trusted source IP address
-     */
-    public function getTrustedClientIp($ip, $proxyIp)
-    {
-        $clientIpAddress = $ip;
-        if ($proxyIp) {
-            $ipList = explode(",", $proxyIp);
-            $ipList[] = $clientIpAddress;
-            $ipList = array_reverse($ipList);
-
-            foreach ($ipList as $ipNumber => $ipAddress) {
-                if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
-                    continue;
-                }
-
-                $clientIpAddress = $ipAddress;
-                break;
-            }
-        }
-
-        return $clientIpAddress;
-    }
-
-    /**
-     * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
-     *
-     * @param array  $haystack
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function ipInRange($haystack, $ip)
-    {
-        $needle = ip2long($ip);
-
-        foreach ($haystack as $low => $high) {
-            if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Explodes a CIDR range into an array of addresses
-     *
-     * @param string $range A CIDR-format range
-     *
-     * @return array An array containing every IP address in the range
-     */
-    public function explodeCidr($range)
-    {
-        $cidrData = explode('/', $range);
-
-        if (!isset($cidrData[1])) {
-            return array($range);
-        }
-
-        $blow = (
-            str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
-            str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
-        );
-        $bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
-
-        $list = array();
-
-        $bindecBHigh = bindec($bhigh);
-        for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
-            $list[] = long2ip($x);
-        }
-
-        return $list;
-    }
+	/**
+	 * Array of IP addresses which are TRUSTED proxies
+	 * @var string[]
+	 */
+	private $trustedCache = array();
+	/**
+	 * Array of IP addresses which are UNTRUSTED proxies
+	 * @var string[]
+	 */
+	private $untrustedCache = array();
+	/** @var PDOStatement */
+	private $trustedQuery;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+
+	/**
+	 * Creates a new instance of the trust provider
+	 *
+	 * @param string[]    $squidIpList List of IP addresses to pre-approve
+	 * @param PdoDatabase $database
+	 */
+	public function __construct($squidIpList, PdoDatabase $database)
+	{
+		$this->trustedCache = $squidIpList;
+		$this->database = $database;
+	}
+
+	/**
+	 * Returns a value if the IP address is a trusted proxy
+	 *
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function isTrusted($ip)
+	{
+		if (in_array($ip, $this->trustedCache)) {
+			return true;
+		}
+
+		if (in_array($ip, $this->untrustedCache)) {
+			return false;
+		}
+
+		if ($this->trustedQuery === null) {
+			$query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
+			$this->trustedQuery = $this->database->prepare($query);
+		}
+
+		$this->trustedQuery->execute(array(":ip" => $ip));
+		$result = $this->trustedQuery->fetchColumn();
+		$this->trustedQuery->closeCursor();
+
+		if ($result == 0) {
+			$this->untrustedCache[] = $ip;
+
+			return false;
+		}
+
+		if ($result >= 1) {
+			$this->trustedCache[] = $ip;
+
+			return true;
+		}
+
+		// something weird has happened if we've got here.
+		// default to untrusted.
+		return false;
+	}
+
+	/**
+	 * Gets the last trusted IP in the proxy chain.
+	 *
+	 * @param string $ip      The IP address from REMOTE_ADDR
+	 * @param string $proxyIp The contents of the XFF header.
+	 *
+	 * @return string Trusted source IP address
+	 */
+	public function getTrustedClientIp($ip, $proxyIp)
+	{
+		$clientIpAddress = $ip;
+		if ($proxyIp) {
+			$ipList = explode(",", $proxyIp);
+			$ipList[] = $clientIpAddress;
+			$ipList = array_reverse($ipList);
+
+			foreach ($ipList as $ipNumber => $ipAddress) {
+				if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
+					continue;
+				}
+
+				$clientIpAddress = $ipAddress;
+				break;
+			}
+		}
+
+		return $clientIpAddress;
+	}
+
+	/**
+	 * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
+	 *
+	 * @param array  $haystack
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function ipInRange($haystack, $ip)
+	{
+		$needle = ip2long($ip);
+
+		foreach ($haystack as $low => $high) {
+			if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Explodes a CIDR range into an array of addresses
+	 *
+	 * @param string $range A CIDR-format range
+	 *
+	 * @return array An array containing every IP address in the range
+	 */
+	public function explodeCidr($range)
+	{
+		$cidrData = explode('/', $range);
+
+		if (!isset($cidrData[1])) {
+			return array($range);
+		}
+
+		$blow = (
+			str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
+			str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
+		);
+		$bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
+
+		$list = array();
+
+		$bindecBHigh = bindec($bhigh);
+		for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
+			$list[] = long2ip($x);
+		}
+
+		return $list;
+	}
 }