chamilo / chamilo-lms

plugin/buycourses/src/Requests/Hooks.php

Indentation +46 added lines, -46 removed lines

@@ -13,56 +13,56 @@
  * @subpackage Utilities
  */
 class Requests_Hooks implements Requests_Hooker {
-	/**
-	 * Registered callbacks for each hook
-	 *
-	 * @var array
-	 */
-	protected $hooks = array();
+    /**
+     * Registered callbacks for each hook
+     *
+     * @var array
+     */
+    protected $hooks = array();
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		// pass
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        // pass
+    }
 
-	/**
-	 * Register a callback for a hook
-	 *
-	 * @param string $hook Hook name
-	 * @param callback $callback Function/method to call on event
-	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
-	 */
-	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
-			$this->hooks[$hook] = array();
-		}
-		if (!isset($this->hooks[$hook][$priority])) {
-			$this->hooks[$hook][$priority] = array();
-		}
+    /**
+     * Register a callback for a hook
+     *
+     * @param string $hook Hook name
+     * @param callback $callback Function/method to call on event
+     * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
+     */
+    public function register($hook, $callback, $priority = 0) {
+        if (!isset($this->hooks[$hook])) {
+            $this->hooks[$hook] = array();
+        }
+        if (!isset($this->hooks[$hook][$priority])) {
+            $this->hooks[$hook][$priority] = array();
+        }
 
-		$this->hooks[$hook][$priority][] = $callback;
-	}
+        $this->hooks[$hook][$priority][] = $callback;
+    }
 
-	/**
-	 * Dispatch a message
-	 *
-	 * @param string $hook Hook name
-	 * @param array $parameters Parameters to pass to callbacks
-	 * @return boolean Successfulness
-	 */
-	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
-			return false;
-		}
+    /**
+     * Dispatch a message
+     *
+     * @param string $hook Hook name
+     * @param array $parameters Parameters to pass to callbacks
+     * @return boolean Successfulness
+     */
+    public function dispatch($hook, $parameters = array()) {
+        if (empty($this->hooks[$hook])) {
+            return false;
+        }
 
-		foreach ($this->hooks[$hook] as $priority => $hooked) {
-			foreach ($hooked as $callback) {
-				call_user_func_array($callback, $parameters);
-			}
-		}
+        foreach ($this->hooks[$hook] as $priority => $hooked) {
+            foreach ($hooked as $callback) {
+                call_user_func_array($callback, $parameters);
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 }
\ No newline at end of file

plugin/buycourses/src/Requests/Transport.php

Indentation +23 added lines, -23 removed lines

@@ -13,29 +13,29 @@
  * @subpackage Transport
  */
 interface Requests_Transport {
-	/**
-	 * Perform a request
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return string Raw HTTP result
-	 */
-	public function request($url, $headers = array(), $data = array(), $options = array());
+    /**
+     * Perform a request
+     *
+     * @param string $url URL to request
+     * @param array $headers Associative array of request headers
+     * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+     * @param array $options Request options, see {@see Requests::response()} for documentation
+     * @return string Raw HTTP result
+     */
+    public function request($url, $headers = array(), $data = array(), $options = array());
 
-	/**
-	 * Send multiple requests simultaneously
-	 *
-	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
-	 * @param array $options Global options, see {@see Requests::response()} for documentation
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
-	 */
-	public function request_multiple($requests, $options);
+    /**
+     * Send multiple requests simultaneously
+     *
+     * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
+     * @param array $options Global options, see {@see Requests::response()} for documentation
+     * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
+     */
+    public function request_multiple($requests, $options);
 
-	/**
-	 * Self-test whether the transport can be used
-	 * @return bool
-	 */
-	public static function test();
+    /**
+     * Self-test whether the transport can be used
+     * @return bool
+     */
+    public static function test();
 }
\ No newline at end of file

plugin/buycourses/src/Requests/IRI.php

Indentation +1017 added lines, -1017 removed lines

@@ -64,1021 +64,1021 @@
  * @property string $ifragment Fragment part of the IRI (after '#')
  */
 class Requests_IRI {
-	/**
-	 * Scheme
-	 *
-	 * @var string
-	 */
-	protected $scheme = null;
-
-	/**
-	 * User Information
-	 *
-	 * @var string
-	 */
-	protected $iuserinfo = null;
-
-	/**
-	 * ihost
-	 *
-	 * @var string
-	 */
-	protected $ihost = null;
-
-	/**
-	 * Port
-	 *
-	 * @var string
-	 */
-	protected $port = null;
-
-	/**
-	 * ipath
-	 *
-	 * @var string
-	 */
-	protected $ipath = '';
-
-	/**
-	 * iquery
-	 *
-	 * @var string
-	 */
-	protected $iquery = null;
-
-	/**
-	 * ifragment
-	 *
-	 * @var string
-	 */
-	protected $ifragment = null;
-
-	/**
-	 * Normalization database
-	 *
-	 * Each key is the scheme, each value is an array with each key as the IRI
-	 * part and value as the default value for that part.
-	 */
-	protected $normalization = array(
-		'acap' => array(
-			'port' => 674
-		),
-		'dict' => array(
-			'port' => 2628
-		),
-		'file' => array(
-			'ihost' => 'localhost'
-		),
-		'http' => array(
-			'port' => 80,
-		),
-		'https' => array(
-			'port' => 443,
-		),
-	);
-
-	/**
-	 * Return the entire IRI when you try and read the object as a string
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		return $this->get_iri();
-	}
-
-	/**
-	 * Overload __set() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 * @param mixed $value Property value
-	 */
-	public function __set($name, $value) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
-			   $name === 'iauthority'
-			|| $name === 'iuserinfo'
-			|| $name === 'ihost'
-			|| $name === 'ipath'
-			|| $name === 'iquery'
-			|| $name === 'ifragment'
-		) {
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
-		}
-	}
-
-	/**
-	 * Overload __get() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 * @return mixed
-	 */
-	public function __get($name) {
-		// isset() returns false for null, we don't want to do that
-		// Also why we use array_key_exists below instead of isset()
-		$props = get_object_vars($this);
-
-		if (
-			$name === 'iri' ||
-			$name === 'uri' ||
-			$name === 'iauthority' ||
-			$name === 'authority'
-		) {
-			$method = 'get_' . $name;
-			$return = $this->$method();
-		}
-		elseif (array_key_exists($name, $props)) {
-			$return = $this->$name;
-		}
-		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
-			$name = $prop;
-			$return = $this->$prop;
-		}
-		// ischeme -> scheme
-		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
-			$name = $prop;
-			$return = $this->$prop;
-		}
-		else {
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
-			$return = null;
-		}
-
-		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
-			return $this->normalization[$this->scheme][$name];
-		}
-		else {
-			return $return;
-		}
-	}
-
-	/**
-	 * Overload __isset() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 * @return bool
-	 */
-	public function __isset($name) {
-		return (method_exists($this, 'get_' . $name) || isset($this->$name));
-	}
-
-	/**
-	 * Overload __unset() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 */
-	public function __unset($name) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), '');
-		}
-	}
-
-	/**
-	 * Create a new IRI object, from a specified string
-	 *
-	 * @param string|null $iri
-	 */
-	public function __construct($iri = null) {
-		$this->set_iri($iri);
-	}
-
-	/**
-	 * Create a new IRI object by resolving a relative IRI
-	 *
-	 * Returns false if $base is not absolute, otherwise an IRI.
-	 *
-	 * @param IRI|string $base (Absolute) Base IRI
-	 * @param IRI|string $relative Relative IRI
-	 * @return IRI|false
-	 */
-	public static function absolutize($base, $relative) {
-		if (!($relative instanceof Requests_IRI)) {
-			$relative = new Requests_IRI($relative);
-		}
-		if (!$relative->is_valid()) {
-			return false;
-		}
-		elseif ($relative->scheme !== null) {
-			return clone $relative;
-		}
-
-		if (!($base instanceof Requests_IRI)) {
-			$base = new Requests_IRI($base);
-		}
-		if ($base->scheme === null || !$base->is_valid()) {
-			return false;
-		}
-
-		if ($relative->get_iri() !== '') {
-			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
-				$target = clone $relative;
-				$target->scheme = $base->scheme;
-			}
-			else {
-				$target = new Requests_IRI;
-				$target->scheme = $base->scheme;
-				$target->iuserinfo = $base->iuserinfo;
-				$target->ihost = $base->ihost;
-				$target->port = $base->port;
-				if ($relative->ipath !== '') {
-					if ($relative->ipath[0] === '/') {
-						$target->ipath = $relative->ipath;
-					}
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
-						$target->ipath = '/' . $relative->ipath;
-					}
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
-						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-					}
-					else {
-						$target->ipath = $relative->ipath;
-					}
-					$target->ipath = $target->remove_dot_segments($target->ipath);
-					$target->iquery = $relative->iquery;
-				}
-				else {
-					$target->ipath = $base->ipath;
-					if ($relative->iquery !== null) {
-						$target->iquery = $relative->iquery;
-					}
-					elseif ($base->iquery !== null) {
-						$target->iquery = $base->iquery;
-					}
-				}
-				$target->ifragment = $relative->ifragment;
-			}
-		}
-		else {
-			$target = clone $base;
-			$target->ifragment = null;
-		}
-		$target->scheme_normalization();
-		return $target;
-	}
-
-	/**
-	 * Parse an IRI into scheme/authority/path/query/fragment segments
-	 *
-	 * @param string $iri
-	 * @return array
-	 */
-	protected function parse_iri($iri) {
-		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
-		$has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
-		if (!$has_match) {
-			throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
-		}
-
-		if ($match[1] === '') {
-			$match['scheme'] = null;
-		}
-		if (!isset($match[3]) || $match[3] === '') {
-			$match['authority'] = null;
-		}
-		if (!isset($match[5])) {
-			$match['path'] = '';
-		}
-		if (!isset($match[6]) || $match[6] === '') {
-			$match['query'] = null;
-		}
-		if (!isset($match[8]) || $match[8] === '') {
-			$match['fragment'] = null;
-		}
-		return $match;
-	}
-
-	/**
-	 * Remove dot segments from a path
-	 *
-	 * @param string $input
-	 * @return string
-	 */
-	protected function remove_dot_segments($input) {
-		$output = '';
-		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
-			// A: If the input buffer begins with a prefix of "../" or "./",
-			// then remove that prefix from the input buffer; otherwise,
-			if (strpos($input, '../') === 0) {
-				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0) {
-				$input = substr($input, 2);
-			}
-			// B: if the input buffer begins with a prefix of "/./" or "/.",
-			// where "." is a complete path segment, then replace that prefix
-			// with "/" in the input buffer; otherwise,
-			elseif (strpos($input, '/./') === 0) {
-				$input = substr($input, 2);
-			}
-			elseif ($input === '/.') {
-				$input = '/';
-			}
-			// C: if the input buffer begins with a prefix of "/../" or "/..",
-			// where ".." is a complete path segment, then replace that prefix
-			// with "/" in the input buffer and remove the last segment and its
-			// preceding "/" (if any) from the output buffer; otherwise,
-			elseif (strpos($input, '/../') === 0) {
-				$input = substr($input, 3);
-				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..') {
-				$input = '/';
-				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			// D: if the input buffer consists only of "." or "..", then remove
-			// that from the input buffer; otherwise,
-			elseif ($input === '.' || $input === '..') {
-				$input = '';
-			}
-			// E: move the first path segment in the input buffer to the end of
-			// the output buffer, including the initial "/" character (if any)
-			// and any subsequent characters up to, but not including, the next
-			// "/" character or the end of the input buffer
-			elseif (($pos = strpos($input, '/', 1)) !== false) {
-				$output .= substr($input, 0, $pos);
-				$input = substr_replace($input, '', 0, $pos);
-			}
-			else {
-				$output .= $input;
-				$input = '';
-			}
-		}
-		return $output . $input;
-	}
-
-	/**
-	 * Replace invalid character with percent encoding
-	 *
-	 * @param string $string Input string
-	 * @param string $extra_chars Valid characters not in iunreserved or
-	 *                            iprivate (this is ASCII-only)
-	 * @param bool $iprivate Allow iprivate
-	 * @return string
-	 */
-	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) {
-		// Normalize as many pct-encoded sections as possible
-		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
-
-		// Replace invalid percent characters
-		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
-
-		// Add unreserved and % to $extra_chars (the latter is safe because all
-		// pct-encoded sections are now valid).
-		$extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
-
-		// Now replace any bytes that aren't allowed with their pct-encoded versions
-		$position = 0;
-		$strlen = strlen($string);
-		while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
-			$value = ord($string[$position]);
-
-			// Start position
-			$start = $position;
-
-			// By default we are valid
-			$valid = true;
-
-			// No one byte sequences are valid due to the while.
-			// Two byte sequence:
-			if (($value & 0xE0) === 0xC0) {
-				$character = ($value & 0x1F) << 6;
-				$length = 2;
-				$remaining = 1;
-			}
-			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
-				$character = ($value & 0x0F) << 12;
-				$length = 3;
-				$remaining = 2;
-			}
-			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
-				$character = ($value & 0x07) << 18;
-				$length = 4;
-				$remaining = 3;
-			}
-			// Invalid byte:
-			else {
-				$valid = false;
-				$length = 1;
-				$remaining = 0;
-			}
-
-			if ($remaining) {
-				if ($position + $length <= $strlen) {
-					for ($position++; $remaining; $position++) {
-						$value = ord($string[$position]);
-
-						// Check that the byte is valid, then add it to the character:
-						if (($value & 0xC0) === 0x80) {
-							$character |= ($value & 0x3F) << (--$remaining * 6);
-						}
-						// If it is invalid, count the sequence as invalid and reprocess the current byte:
-						else {
-							$valid = false;
-							$position--;
-							break;
-						}
-					}
-				}
-				else {
-					$position = $strlen - 1;
-					$valid = false;
-				}
-			}
-
-			// Percent encode anything invalid or not in ucschar
-			if (
-				// Invalid sequences
-				!$valid
-				// Non-shortest form sequences are invalid
-				|| $length > 1 && $character <= 0x7F
-				|| $length > 2 && $character <= 0x7FF
-				|| $length > 3 && $character <= 0xFFFF
-				// Outside of range of ucschar codepoints
-				// Noncharacters
-				|| ($character & 0xFFFE) === 0xFFFE
-				|| $character >= 0xFDD0 && $character <= 0xFDEF
-				|| (
-					// Everything else not in ucschar
-					   $character > 0xD7FF && $character < 0xF900
-					|| $character < 0xA0
-					|| $character > 0xEFFFD
-				)
-				&& (
-					// Everything not in iprivate, if it applies
-					   !$iprivate
-					|| $character < 0xE000
-					|| $character > 0x10FFFD
-				)
-			) {
-				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid) {
-					$position--;
-				}
-
-				for ($j = $start; $j <= $position; $j++) {
-					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
-					$j += 2;
-					$position += 2;
-					$strlen += 2;
-				}
-			}
-		}
-
-		return $string;
-	}
-
-	/**
-	 * Callback function for preg_replace_callback.
-	 *
-	 * Removes sequences of percent encoded bytes that represent UTF-8
-	 * encoded characters in iunreserved
-	 *
-	 * @param array $match PCRE match
-	 * @return string Replacement
-	 */
-	protected function remove_iunreserved_percent_encoded($match) {
-		// As we just have valid percent encoded sequences we can just explode
-		// and ignore the first member of the returned array (an empty string).
-		$bytes = explode('%', $match[0]);
-
-		// Initialize the new string (this is what will be returned) and that
-		// there are no bytes remaining in the current sequence (unsurprising
-		// at the first byte!).
-		$string = '';
-		$remaining = 0;
-
-		// Loop over each and every byte, and set $value to its value
-		for ($i = 1, $len = count($bytes); $i < $len; $i++) {
-			$value = hexdec($bytes[$i]);
-
-			// If we're the first byte of sequence:
-			if (!$remaining) {
-				// Start position
-				$start = $i;
-
-				// By default we are valid
-				$valid = true;
-
-				// One byte sequence:
-				if ($value <= 0x7F) {
-					$character = $value;
-					$length = 1;
-				}
-				// Two byte sequence:
-				elseif (($value & 0xE0) === 0xC0) {
-					$character = ($value & 0x1F) << 6;
-					$length = 2;
-					$remaining = 1;
-				}
-				// Three byte sequence:
-				elseif (($value & 0xF0) === 0xE0) {
-					$character = ($value & 0x0F) << 12;
-					$length = 3;
-					$remaining = 2;
-				}
-				// Four byte sequence:
-				elseif (($value & 0xF8) === 0xF0) {
-					$character = ($value & 0x07) << 18;
-					$length = 4;
-					$remaining = 3;
-				}
-				// Invalid byte:
-				else {
-					$valid = false;
-					$remaining = 0;
-				}
-			}
-			// Continuation byte:
-			else {
-				// Check that the byte is valid, then add it to the character:
-				if (($value & 0xC0) === 0x80) {
-					$remaining--;
-					$character |= ($value & 0x3F) << ($remaining * 6);
-				}
-				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
-				else {
-					$valid = false;
-					$remaining = 0;
-					$i--;
-				}
-			}
-
-			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining) {
-				// Percent encode anything invalid or not in iunreserved
-				if (
-					// Invalid sequences
-					!$valid
-					// Non-shortest form sequences are invalid
-					|| $length > 1 && $character <= 0x7F
-					|| $length > 2 && $character <= 0x7FF
-					|| $length > 3 && $character <= 0xFFFF
-					// Outside of range of iunreserved codepoints
-					|| $character < 0x2D
-					|| $character > 0xEFFFD
-					// Noncharacters
-					|| ($character & 0xFFFE) === 0xFFFE
-					|| $character >= 0xFDD0 && $character <= 0xFDEF
-					// Everything else not in iunreserved (this is all BMP)
-					|| $character === 0x2F
-					|| $character > 0x39 && $character < 0x41
-					|| $character > 0x5A && $character < 0x61
-					|| $character > 0x7A && $character < 0x7E
-					|| $character > 0x7E && $character < 0xA0
-					|| $character > 0xD7FF && $character < 0xF900
-				) {
-					for ($j = $start; $j <= $i; $j++) {
-						$string .= '%' . strtoupper($bytes[$j]);
-					}
-				}
-				else {
-					for ($j = $start; $j <= $i; $j++) {
-						$string .= chr(hexdec($bytes[$j]));
-					}
-				}
-			}
-		}
-
-		// If we have any bytes left over they are invalid (i.e., we are
-		// mid-way through a multi-byte sequence)
-		if ($remaining) {
-			for ($j = $start; $j < $len; $j++) {
-				$string .= '%' . strtoupper($bytes[$j]);
-			}
-		}
-
-		return $string;
-	}
-
-	protected function scheme_normalization() {
-		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
-			$this->iuserinfo = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
-			$this->ihost = null;
-		}
-		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
-			$this->port = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
-			$this->ipath = '';
-		}
-		if (isset($this->ihost) && empty($this->ipath)) {
-			$this->ipath = '/';
-		}
-		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
-			$this->iquery = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
-			$this->ifragment = null;
-		}
-	}
-
-	/**
-	 * Check if the object represents a valid IRI. This needs to be done on each
-	 * call as some things change depending on another part of the IRI.
-	 *
-	 * @return bool
-	 */
-	public function is_valid() {
-		$isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
-		if ($this->ipath !== '' &&
-			(
-				$isauthority && $this->ipath[0] !== '/' ||
-				(
-					$this->scheme === null &&
-					!$isauthority &&
-					strpos($this->ipath, ':') !== false &&
-					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
-				)
-			)
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Set the entire IRI. Returns true on success, false on failure (if there
-	 * are any invalid characters).
-	 *
-	 * @param string $iri
-	 * @return bool
-	 */
-	protected function set_iri($iri) {
-		static $cache;
-		if (!$cache) {
-			$cache = array();
-		}
-
-		if ($iri === null) {
-			return true;
-		}
-		if (isset($cache[$iri])) {
-			list($this->scheme,
-				 $this->iuserinfo,
-				 $this->ihost,
-				 $this->port,
-				 $this->ipath,
-				 $this->iquery,
-				 $this->ifragment,
-				 $return) = $cache[$iri];
-			return $return;
-		}
-
-		$parsed = $this->parse_iri((string) $iri);
-
-		$return = $this->set_scheme($parsed['scheme'])
-			&& $this->set_authority($parsed['authority'])
-			&& $this->set_path($parsed['path'])
-			&& $this->set_query($parsed['query'])
-			&& $this->set_fragment($parsed['fragment']);
-
-		$cache[$iri] = array($this->scheme,
-							 $this->iuserinfo,
-							 $this->ihost,
-							 $this->port,
-							 $this->ipath,
-							 $this->iquery,
-							 $this->ifragment,
-							 $return);
-		return $return;
-	}
-
-	/**
-	 * Set the scheme. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $scheme
-	 * @return bool
-	 */
-	protected function set_scheme($scheme) {
-		if ($scheme === null) {
-			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
-			$this->scheme = null;
-			return false;
-		}
-		else {
-			$this->scheme = strtolower($scheme);
-		}
-		return true;
-	}
-
-	/**
-	 * Set the authority. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $authority
-	 * @return bool
-	 */
-	protected function set_authority($authority) {
-		static $cache;
-		if (!$cache) {
-			$cache = array();
-		}
-
-		if ($authority === null) {
-			$this->iuserinfo = null;
-			$this->ihost = null;
-			$this->port = null;
-			return true;
-		}
-		if (isset($cache[$authority])) {
-			list($this->iuserinfo,
-				 $this->ihost,
-				 $this->port,
-				 $return) = $cache[$authority];
-
-			return $return;
-		}
-
-		$remaining = $authority;
-		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
-			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
-			$remaining = substr($remaining, $iuserinfo_end + 1);
-		}
-		else {
-			$iuserinfo = null;
-		}
-		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
-			$port = substr($remaining, $port_start + 1);
-			if ($port === false || $port === '') {
-				$port = null;
-			}
-			$remaining = substr($remaining, 0, $port_start);
-		}
-		else {
-			$port = null;
-		}
-
-		$return = $this->set_userinfo($iuserinfo) &&
-				  $this->set_host($remaining) &&
-				  $this->set_port($port);
-
-		$cache[$authority] = array($this->iuserinfo,
-								   $this->ihost,
-								   $this->port,
-								   $return);
-
-		return $return;
-	}
-
-	/**
-	 * Set the iuserinfo.
-	 *
-	 * @param string $iuserinfo
-	 * @return bool
-	 */
-	protected function set_userinfo($iuserinfo) {
-		if ($iuserinfo === null) {
-			$this->iuserinfo = null;
-		}
-		else {
-			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
-			$this->scheme_normalization();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Set the ihost. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $ihost
-	 * @return bool
-	 */
-	protected function set_host($ihost) {
-		if ($ihost === null) {
-			$this->ihost = null;
-			return true;
-		}
-		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
-			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
-				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else {
-				$this->ihost = null;
-				return false;
-			}
-		}
-		else {
-			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
-
-			// Lowercase, but ignore pct-encoded sections (as they should
-			// remain uppercase). This must be done after the previous step
-			// as that can add unescaped characters.
-			$position = 0;
-			$strlen = strlen($ihost);
-			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
-				if ($ihost[$position] === '%') {
-					$position += 3;
-				}
-				else {
-					$ihost[$position] = strtolower($ihost[$position]);
-					$position++;
-				}
-			}
-
-			$this->ihost = $ihost;
-		}
-
-		$this->scheme_normalization();
-
-		return true;
-	}
-
-	/**
-	 * Set the port. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $port
-	 * @return bool
-	 */
-	protected function set_port($port) {
-		if ($port === null) {
-			$this->port = null;
-			return true;
-		}
-
-		if (strspn($port, '0123456789') === strlen($port)) {
-			$this->port = (int) $port;
-			$this->scheme_normalization();
-			return true;
-		}
-
-		$this->port = null;
-		return false;
-	}
-
-	/**
-	 * Set the ipath.
-	 *
-	 * @param string $ipath
-	 * @return bool
-	 */
-	protected function set_path($ipath) {
-		static $cache;
-		if (!$cache) {
-			$cache = array();
-		}
-
-		$ipath = (string) $ipath;
-
-		if (isset($cache[$ipath])) {
-			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else {
-			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
-			$removed = $this->remove_dot_segments($valid);
-
-			$cache[$ipath] = array($valid, $removed);
-			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
-		}
-		$this->scheme_normalization();
-		return true;
-	}
-
-	/**
-	 * Set the iquery.
-	 *
-	 * @param string $iquery
-	 * @return bool
-	 */
-	protected function set_query($iquery) {
-		if ($iquery === null) {
-			$this->iquery = null;
-		}
-		else {
-			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
-			$this->scheme_normalization();
-		}
-		return true;
-	}
-
-	/**
-	 * Set the ifragment.
-	 *
-	 * @param string $ifragment
-	 * @return bool
-	 */
-	protected function set_fragment($ifragment) {
-		if ($ifragment === null) {
-			$this->ifragment = null;
-		}
-		else {
-			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
-			$this->scheme_normalization();
-		}
-		return true;
-	}
-
-	/**
-	 * Convert an IRI to a URI (or parts thereof)
-	 *
-	 * @param string|bool IRI to convert (or false from {@see get_iri})
-	 * @return string|false URI if IRI is valid, false otherwise.
-	 */
-	protected function to_uri($string) {
-		if (!is_string($string)) {
-			return false;
-		}
-
-		static $non_ascii;
-		if (!$non_ascii) {
-			$non_ascii = implode('', range("\x80", "\xFF"));
-		}
-
-		$position = 0;
-		$strlen = strlen($string);
-		while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
-			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
-			$position += 3;
-			$strlen += 2;
-		}
-
-		return $string;
-	}
-
-	/**
-	 * Get the complete IRI
-	 *
-	 * @return string
-	 */
-	protected function get_iri() {
-		if (!$this->is_valid()) {
-			return false;
-		}
-
-		$iri = '';
-		if ($this->scheme !== null) {
-			$iri .= $this->scheme . ':';
-		}
-		if (($iauthority = $this->get_iauthority()) !== null) {
-			$iri .= '//' . $iauthority;
-		}
-		$iri .= $this->ipath;
-		if ($this->iquery !== null) {
-			$iri .= '?' . $this->iquery;
-		}
-		if ($this->ifragment !== null) {
-			$iri .= '#' . $this->ifragment;
-		}
-
-		return $iri;
-	}
-
-	/**
-	 * Get the complete URI
-	 *
-	 * @return string
-	 */
-	protected function get_uri() {
-		return $this->to_uri($this->get_iri());
-	}
-
-	/**
-	 * Get the complete iauthority
-	 *
-	 * @return string
-	 */
-	protected function get_iauthority() {
-		if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
-			return null;
-		}
-
-		$iauthority = '';
-		if ($this->iuserinfo !== null) {
-			$iauthority .= $this->iuserinfo . '@';
-		}
-		if ($this->ihost !== null) {
-			$iauthority .= $this->ihost;
-		}
-		if ($this->port !== null) {
-			$iauthority .= ':' . $this->port;
-		}
-		return $iauthority;
-	}
-
-	/**
-	 * Get the complete authority
-	 *
-	 * @return string
-	 */
-	protected function get_authority() {
-		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority)) {
-			return $this->to_uri($iauthority);
-		}
-		else {
-			return $iauthority;
-		}
-	}
+    /**
+     * Scheme
+     *
+     * @var string
+     */
+    protected $scheme = null;
+
+    /**
+     * User Information
+     *
+     * @var string
+     */
+    protected $iuserinfo = null;
+
+    /**
+     * ihost
+     *
+     * @var string
+     */
+    protected $ihost = null;
+
+    /**
+     * Port
+     *
+     * @var string
+     */
+    protected $port = null;
+
+    /**
+     * ipath
+     *
+     * @var string
+     */
+    protected $ipath = '';
+
+    /**
+     * iquery
+     *
+     * @var string
+     */
+    protected $iquery = null;
+
+    /**
+     * ifragment
+     *
+     * @var string
+     */
+    protected $ifragment = null;
+
+    /**
+     * Normalization database
+     *
+     * Each key is the scheme, each value is an array with each key as the IRI
+     * part and value as the default value for that part.
+     */
+    protected $normalization = array(
+        'acap' => array(
+            'port' => 674
+        ),
+        'dict' => array(
+            'port' => 2628
+        ),
+        'file' => array(
+            'ihost' => 'localhost'
+        ),
+        'http' => array(
+            'port' => 80,
+        ),
+        'https' => array(
+            'port' => 443,
+        ),
+    );
+
+    /**
+     * Return the entire IRI when you try and read the object as a string
+     *
+     * @return string
+     */
+    public function __toString() {
+        return $this->get_iri();
+    }
+
+    /**
+     * Overload __set() to provide access via properties
+     *
+     * @param string $name Property name
+     * @param mixed $value Property value
+     */
+    public function __set($name, $value) {
+        if (method_exists($this, 'set_' . $name)) {
+            call_user_func(array($this, 'set_' . $name), $value);
+        }
+        elseif (
+                $name === 'iauthority'
+            || $name === 'iuserinfo'
+            || $name === 'ihost'
+            || $name === 'ipath'
+            || $name === 'iquery'
+            || $name === 'ifragment'
+        ) {
+            call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+        }
+    }
+
+    /**
+     * Overload __get() to provide access via properties
+     *
+     * @param string $name Property name
+     * @return mixed
+     */
+    public function __get($name) {
+        // isset() returns false for null, we don't want to do that
+        // Also why we use array_key_exists below instead of isset()
+        $props = get_object_vars($this);
+
+        if (
+            $name === 'iri' ||
+            $name === 'uri' ||
+            $name === 'iauthority' ||
+            $name === 'authority'
+        ) {
+            $method = 'get_' . $name;
+            $return = $this->$method();
+        }
+        elseif (array_key_exists($name, $props)) {
+            $return = $this->$name;
+        }
+        // host -> ihost
+        elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
+            $name = $prop;
+            $return = $this->$prop;
+        }
+        // ischeme -> scheme
+        elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
+            $name = $prop;
+            $return = $this->$prop;
+        }
+        else {
+            trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+            $return = null;
+        }
+
+        if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+            return $this->normalization[$this->scheme][$name];
+        }
+        else {
+            return $return;
+        }
+    }
+
+    /**
+     * Overload __isset() to provide access via properties
+     *
+     * @param string $name Property name
+     * @return bool
+     */
+    public function __isset($name) {
+        return (method_exists($this, 'get_' . $name) || isset($this->$name));
+    }
+
+    /**
+     * Overload __unset() to provide access via properties
+     *
+     * @param string $name Property name
+     */
+    public function __unset($name) {
+        if (method_exists($this, 'set_' . $name)) {
+            call_user_func(array($this, 'set_' . $name), '');
+        }
+    }
+
+    /**
+     * Create a new IRI object, from a specified string
+     *
+     * @param string|null $iri
+     */
+    public function __construct($iri = null) {
+        $this->set_iri($iri);
+    }
+
+    /**
+     * Create a new IRI object by resolving a relative IRI
+     *
+     * Returns false if $base is not absolute, otherwise an IRI.
+     *
+     * @param IRI|string $base (Absolute) Base IRI
+     * @param IRI|string $relative Relative IRI
+     * @return IRI|false
+     */
+    public static function absolutize($base, $relative) {
+        if (!($relative instanceof Requests_IRI)) {
+            $relative = new Requests_IRI($relative);
+        }
+        if (!$relative->is_valid()) {
+            return false;
+        }
+        elseif ($relative->scheme !== null) {
+            return clone $relative;
+        }
+
+        if (!($base instanceof Requests_IRI)) {
+            $base = new Requests_IRI($base);
+        }
+        if ($base->scheme === null || !$base->is_valid()) {
+            return false;
+        }
+
+        if ($relative->get_iri() !== '') {
+            if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
+                $target = clone $relative;
+                $target->scheme = $base->scheme;
+            }
+            else {
+                $target = new Requests_IRI;
+                $target->scheme = $base->scheme;
+                $target->iuserinfo = $base->iuserinfo;
+                $target->ihost = $base->ihost;
+                $target->port = $base->port;
+                if ($relative->ipath !== '') {
+                    if ($relative->ipath[0] === '/') {
+                        $target->ipath = $relative->ipath;
+                    }
+                    elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+                        $target->ipath = '/' . $relative->ipath;
+                    }
+                    elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+                        $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+                    }
+                    else {
+                        $target->ipath = $relative->ipath;
+                    }
+                    $target->ipath = $target->remove_dot_segments($target->ipath);
+                    $target->iquery = $relative->iquery;
+                }
+                else {
+                    $target->ipath = $base->ipath;
+                    if ($relative->iquery !== null) {
+                        $target->iquery = $relative->iquery;
+                    }
+                    elseif ($base->iquery !== null) {
+                        $target->iquery = $base->iquery;
+                    }
+                }
+                $target->ifragment = $relative->ifragment;
+            }
+        }
+        else {
+            $target = clone $base;
+            $target->ifragment = null;
+        }
+        $target->scheme_normalization();
+        return $target;
+    }
+
+    /**
+     * Parse an IRI into scheme/authority/path/query/fragment segments
+     *
+     * @param string $iri
+     * @return array
+     */
+    protected function parse_iri($iri) {
+        $iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
+        $has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
+        if (!$has_match) {
+            throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
+        }
+
+        if ($match[1] === '') {
+            $match['scheme'] = null;
+        }
+        if (!isset($match[3]) || $match[3] === '') {
+            $match['authority'] = null;
+        }
+        if (!isset($match[5])) {
+            $match['path'] = '';
+        }
+        if (!isset($match[6]) || $match[6] === '') {
+            $match['query'] = null;
+        }
+        if (!isset($match[8]) || $match[8] === '') {
+            $match['fragment'] = null;
+        }
+        return $match;
+    }
+
+    /**
+     * Remove dot segments from a path
+     *
+     * @param string $input
+     * @return string
+     */
+    protected function remove_dot_segments($input) {
+        $output = '';
+        while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
+            // A: If the input buffer begins with a prefix of "../" or "./",
+            // then remove that prefix from the input buffer; otherwise,
+            if (strpos($input, '../') === 0) {
+                $input = substr($input, 3);
+            }
+            elseif (strpos($input, './') === 0) {
+                $input = substr($input, 2);
+            }
+            // B: if the input buffer begins with a prefix of "/./" or "/.",
+            // where "." is a complete path segment, then replace that prefix
+            // with "/" in the input buffer; otherwise,
+            elseif (strpos($input, '/./') === 0) {
+                $input = substr($input, 2);
+            }
+            elseif ($input === '/.') {
+                $input = '/';
+            }
+            // C: if the input buffer begins with a prefix of "/../" or "/..",
+            // where ".." is a complete path segment, then replace that prefix
+            // with "/" in the input buffer and remove the last segment and its
+            // preceding "/" (if any) from the output buffer; otherwise,
+            elseif (strpos($input, '/../') === 0) {
+                $input = substr($input, 3);
+                $output = substr_replace($output, '', strrpos($output, '/'));
+            }
+            elseif ($input === '/..') {
+                $input = '/';
+                $output = substr_replace($output, '', strrpos($output, '/'));
+            }
+            // D: if the input buffer consists only of "." or "..", then remove
+            // that from the input buffer; otherwise,
+            elseif ($input === '.' || $input === '..') {
+                $input = '';
+            }
+            // E: move the first path segment in the input buffer to the end of
+            // the output buffer, including the initial "/" character (if any)
+            // and any subsequent characters up to, but not including, the next
+            // "/" character or the end of the input buffer
+            elseif (($pos = strpos($input, '/', 1)) !== false) {
+                $output .= substr($input, 0, $pos);
+                $input = substr_replace($input, '', 0, $pos);
+            }
+            else {
+                $output .= $input;
+                $input = '';
+            }
+        }
+        return $output . $input;
+    }
+
+    /**
+     * Replace invalid character with percent encoding
+     *
+     * @param string $string Input string
+     * @param string $extra_chars Valid characters not in iunreserved or
+     *                            iprivate (this is ASCII-only)
+     * @param bool $iprivate Allow iprivate
+     * @return string
+     */
+    protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) {
+        // Normalize as many pct-encoded sections as possible
+        $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
+
+        // Replace invalid percent characters
+        $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+
+        // Add unreserved and % to $extra_chars (the latter is safe because all
+        // pct-encoded sections are now valid).
+        $extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
+
+        // Now replace any bytes that aren't allowed with their pct-encoded versions
+        $position = 0;
+        $strlen = strlen($string);
+        while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
+            $value = ord($string[$position]);
+
+            // Start position
+            $start = $position;
+
+            // By default we are valid
+            $valid = true;
+
+            // No one byte sequences are valid due to the while.
+            // Two byte sequence:
+            if (($value & 0xE0) === 0xC0) {
+                $character = ($value & 0x1F) << 6;
+                $length = 2;
+                $remaining = 1;
+            }
+            // Three byte sequence:
+            elseif (($value & 0xF0) === 0xE0) {
+                $character = ($value & 0x0F) << 12;
+                $length = 3;
+                $remaining = 2;
+            }
+            // Four byte sequence:
+            elseif (($value & 0xF8) === 0xF0) {
+                $character = ($value & 0x07) << 18;
+                $length = 4;
+                $remaining = 3;
+            }
+            // Invalid byte:
+            else {
+                $valid = false;
+                $length = 1;
+                $remaining = 0;
+            }
+
+            if ($remaining) {
+                if ($position + $length <= $strlen) {
+                    for ($position++; $remaining; $position++) {
+                        $value = ord($string[$position]);
+
+                        // Check that the byte is valid, then add it to the character:
+                        if (($value & 0xC0) === 0x80) {
+                            $character |= ($value & 0x3F) << (--$remaining * 6);
+                        }
+                        // If it is invalid, count the sequence as invalid and reprocess the current byte:
+                        else {
+                            $valid = false;
+                            $position--;
+                            break;
+                        }
+                    }
+                }
+                else {
+                    $position = $strlen - 1;
+                    $valid = false;
+                }
+            }
+
+            // Percent encode anything invalid or not in ucschar
+            if (
+                // Invalid sequences
+                !$valid
+                // Non-shortest form sequences are invalid
+                || $length > 1 && $character <= 0x7F
+                || $length > 2 && $character <= 0x7FF
+                || $length > 3 && $character <= 0xFFFF
+                // Outside of range of ucschar codepoints
+                // Noncharacters
+                || ($character & 0xFFFE) === 0xFFFE
+                || $character >= 0xFDD0 && $character <= 0xFDEF
+                || (
+                    // Everything else not in ucschar
+                        $character > 0xD7FF && $character < 0xF900
+                    || $character < 0xA0
+                    || $character > 0xEFFFD
+                )
+                && (
+                    // Everything not in iprivate, if it applies
+                        !$iprivate
+                    || $character < 0xE000
+                    || $character > 0x10FFFD
+                )
+            ) {
+                // If we were a character, pretend we weren't, but rather an error.
+                if ($valid) {
+                    $position--;
+                }
+
+                for ($j = $start; $j <= $position; $j++) {
+                    $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+                    $j += 2;
+                    $position += 2;
+                    $strlen += 2;
+                }
+            }
+        }
+
+        return $string;
+    }
+
+    /**
+     * Callback function for preg_replace_callback.
+     *
+     * Removes sequences of percent encoded bytes that represent UTF-8
+     * encoded characters in iunreserved
+     *
+     * @param array $match PCRE match
+     * @return string Replacement
+     */
+    protected function remove_iunreserved_percent_encoded($match) {
+        // As we just have valid percent encoded sequences we can just explode
+        // and ignore the first member of the returned array (an empty string).
+        $bytes = explode('%', $match[0]);
+
+        // Initialize the new string (this is what will be returned) and that
+        // there are no bytes remaining in the current sequence (unsurprising
+        // at the first byte!).
+        $string = '';
+        $remaining = 0;
+
+        // Loop over each and every byte, and set $value to its value
+        for ($i = 1, $len = count($bytes); $i < $len; $i++) {
+            $value = hexdec($bytes[$i]);
+
+            // If we're the first byte of sequence:
+            if (!$remaining) {
+                // Start position
+                $start = $i;
+
+                // By default we are valid
+                $valid = true;
+
+                // One byte sequence:
+                if ($value <= 0x7F) {
+                    $character = $value;
+                    $length = 1;
+                }
+                // Two byte sequence:
+                elseif (($value & 0xE0) === 0xC0) {
+                    $character = ($value & 0x1F) << 6;
+                    $length = 2;
+                    $remaining = 1;
+                }
+                // Three byte sequence:
+                elseif (($value & 0xF0) === 0xE0) {
+                    $character = ($value & 0x0F) << 12;
+                    $length = 3;
+                    $remaining = 2;
+                }
+                // Four byte sequence:
+                elseif (($value & 0xF8) === 0xF0) {
+                    $character = ($value & 0x07) << 18;
+                    $length = 4;
+                    $remaining = 3;
+                }
+                // Invalid byte:
+                else {
+                    $valid = false;
+                    $remaining = 0;
+                }
+            }
+            // Continuation byte:
+            else {
+                // Check that the byte is valid, then add it to the character:
+                if (($value & 0xC0) === 0x80) {
+                    $remaining--;
+                    $character |= ($value & 0x3F) << ($remaining * 6);
+                }
+                // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
+                else {
+                    $valid = false;
+                    $remaining = 0;
+                    $i--;
+                }
+            }
+
+            // If we've reached the end of the current byte sequence, append it to Unicode::$data
+            if (!$remaining) {
+                // Percent encode anything invalid or not in iunreserved
+                if (
+                    // Invalid sequences
+                    !$valid
+                    // Non-shortest form sequences are invalid
+                    || $length > 1 && $character <= 0x7F
+                    || $length > 2 && $character <= 0x7FF
+                    || $length > 3 && $character <= 0xFFFF
+                    // Outside of range of iunreserved codepoints
+                    || $character < 0x2D
+                    || $character > 0xEFFFD
+                    // Noncharacters
+                    || ($character & 0xFFFE) === 0xFFFE
+                    || $character >= 0xFDD0 && $character <= 0xFDEF
+                    // Everything else not in iunreserved (this is all BMP)
+                    || $character === 0x2F
+                    || $character > 0x39 && $character < 0x41
+                    || $character > 0x5A && $character < 0x61
+                    || $character > 0x7A && $character < 0x7E
+                    || $character > 0x7E && $character < 0xA0
+                    || $character > 0xD7FF && $character < 0xF900
+                ) {
+                    for ($j = $start; $j <= $i; $j++) {
+                        $string .= '%' . strtoupper($bytes[$j]);
+                    }
+                }
+                else {
+                    for ($j = $start; $j <= $i; $j++) {
+                        $string .= chr(hexdec($bytes[$j]));
+                    }
+                }
+            }
+        }
+
+        // If we have any bytes left over they are invalid (i.e., we are
+        // mid-way through a multi-byte sequence)
+        if ($remaining) {
+            for ($j = $start; $j < $len; $j++) {
+                $string .= '%' . strtoupper($bytes[$j]);
+            }
+        }
+
+        return $string;
+    }
+
+    protected function scheme_normalization() {
+        if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
+            $this->iuserinfo = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
+            $this->ihost = null;
+        }
+        if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
+            $this->port = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
+            $this->ipath = '';
+        }
+        if (isset($this->ihost) && empty($this->ipath)) {
+            $this->ipath = '/';
+        }
+        if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
+            $this->iquery = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
+            $this->ifragment = null;
+        }
+    }
+
+    /**
+     * Check if the object represents a valid IRI. This needs to be done on each
+     * call as some things change depending on another part of the IRI.
+     *
+     * @return bool
+     */
+    public function is_valid() {
+        $isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
+        if ($this->ipath !== '' &&
+            (
+                $isauthority && $this->ipath[0] !== '/' ||
+                (
+                    $this->scheme === null &&
+                    !$isauthority &&
+                    strpos($this->ipath, ':') !== false &&
+                    (strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
+                )
+            )
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the entire IRI. Returns true on success, false on failure (if there
+     * are any invalid characters).
+     *
+     * @param string $iri
+     * @return bool
+     */
+    protected function set_iri($iri) {
+        static $cache;
+        if (!$cache) {
+            $cache = array();
+        }
+
+        if ($iri === null) {
+            return true;
+        }
+        if (isset($cache[$iri])) {
+            list($this->scheme,
+                    $this->iuserinfo,
+                    $this->ihost,
+                    $this->port,
+                    $this->ipath,
+                    $this->iquery,
+                    $this->ifragment,
+                    $return) = $cache[$iri];
+            return $return;
+        }
+
+        $parsed = $this->parse_iri((string) $iri);
+
+        $return = $this->set_scheme($parsed['scheme'])
+            && $this->set_authority($parsed['authority'])
+            && $this->set_path($parsed['path'])
+            && $this->set_query($parsed['query'])
+            && $this->set_fragment($parsed['fragment']);
+
+        $cache[$iri] = array($this->scheme,
+                                $this->iuserinfo,
+                                $this->ihost,
+                                $this->port,
+                                $this->ipath,
+                                $this->iquery,
+                                $this->ifragment,
+                                $return);
+        return $return;
+    }
+
+    /**
+     * Set the scheme. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $scheme
+     * @return bool
+     */
+    protected function set_scheme($scheme) {
+        if ($scheme === null) {
+            $this->scheme = null;
+        }
+        elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+            $this->scheme = null;
+            return false;
+        }
+        else {
+            $this->scheme = strtolower($scheme);
+        }
+        return true;
+    }
+
+    /**
+     * Set the authority. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $authority
+     * @return bool
+     */
+    protected function set_authority($authority) {
+        static $cache;
+        if (!$cache) {
+            $cache = array();
+        }
+
+        if ($authority === null) {
+            $this->iuserinfo = null;
+            $this->ihost = null;
+            $this->port = null;
+            return true;
+        }
+        if (isset($cache[$authority])) {
+            list($this->iuserinfo,
+                    $this->ihost,
+                    $this->port,
+                    $return) = $cache[$authority];
+
+            return $return;
+        }
+
+        $remaining = $authority;
+        if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
+            $iuserinfo = substr($remaining, 0, $iuserinfo_end);
+            $remaining = substr($remaining, $iuserinfo_end + 1);
+        }
+        else {
+            $iuserinfo = null;
+        }
+        if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
+            $port = substr($remaining, $port_start + 1);
+            if ($port === false || $port === '') {
+                $port = null;
+            }
+            $remaining = substr($remaining, 0, $port_start);
+        }
+        else {
+            $port = null;
+        }
+
+        $return = $this->set_userinfo($iuserinfo) &&
+                  $this->set_host($remaining) &&
+                  $this->set_port($port);
+
+        $cache[$authority] = array($this->iuserinfo,
+                                    $this->ihost,
+                                    $this->port,
+                                    $return);
+
+        return $return;
+    }
+
+    /**
+     * Set the iuserinfo.
+     *
+     * @param string $iuserinfo
+     * @return bool
+     */
+    protected function set_userinfo($iuserinfo) {
+        if ($iuserinfo === null) {
+            $this->iuserinfo = null;
+        }
+        else {
+            $this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
+            $this->scheme_normalization();
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the ihost. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $ihost
+     * @return bool
+     */
+    protected function set_host($ihost) {
+        if ($ihost === null) {
+            $this->ihost = null;
+            return true;
+        }
+        if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
+            if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
+                $this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
+            }
+            else {
+                $this->ihost = null;
+                return false;
+            }
+        }
+        else {
+            $ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
+
+            // Lowercase, but ignore pct-encoded sections (as they should
+            // remain uppercase). This must be done after the previous step
+            // as that can add unescaped characters.
+            $position = 0;
+            $strlen = strlen($ihost);
+            while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
+                if ($ihost[$position] === '%') {
+                    $position += 3;
+                }
+                else {
+                    $ihost[$position] = strtolower($ihost[$position]);
+                    $position++;
+                }
+            }
+
+            $this->ihost = $ihost;
+        }
+
+        $this->scheme_normalization();
+
+        return true;
+    }
+
+    /**
+     * Set the port. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $port
+     * @return bool
+     */
+    protected function set_port($port) {
+        if ($port === null) {
+            $this->port = null;
+            return true;
+        }
+
+        if (strspn($port, '0123456789') === strlen($port)) {
+            $this->port = (int) $port;
+            $this->scheme_normalization();
+            return true;
+        }
+
+        $this->port = null;
+        return false;
+    }
+
+    /**
+     * Set the ipath.
+     *
+     * @param string $ipath
+     * @return bool
+     */
+    protected function set_path($ipath) {
+        static $cache;
+        if (!$cache) {
+            $cache = array();
+        }
+
+        $ipath = (string) $ipath;
+
+        if (isset($cache[$ipath])) {
+            $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
+        }
+        else {
+            $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
+            $removed = $this->remove_dot_segments($valid);
+
+            $cache[$ipath] = array($valid, $removed);
+            $this->ipath = ($this->scheme !== null) ? $removed : $valid;
+        }
+        $this->scheme_normalization();
+        return true;
+    }
+
+    /**
+     * Set the iquery.
+     *
+     * @param string $iquery
+     * @return bool
+     */
+    protected function set_query($iquery) {
+        if ($iquery === null) {
+            $this->iquery = null;
+        }
+        else {
+            $this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
+            $this->scheme_normalization();
+        }
+        return true;
+    }
+
+    /**
+     * Set the ifragment.
+     *
+     * @param string $ifragment
+     * @return bool
+     */
+    protected function set_fragment($ifragment) {
+        if ($ifragment === null) {
+            $this->ifragment = null;
+        }
+        else {
+            $this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
+            $this->scheme_normalization();
+        }
+        return true;
+    }
+
+    /**
+     * Convert an IRI to a URI (or parts thereof)
+     *
+     * @param string|bool IRI to convert (or false from {@see get_iri})
+     * @return string|false URI if IRI is valid, false otherwise.
+     */
+    protected function to_uri($string) {
+        if (!is_string($string)) {
+            return false;
+        }
+
+        static $non_ascii;
+        if (!$non_ascii) {
+            $non_ascii = implode('', range("\x80", "\xFF"));
+        }
+
+        $position = 0;
+        $strlen = strlen($string);
+        while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
+            $string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
+            $position += 3;
+            $strlen += 2;
+        }
+
+        return $string;
+    }
+
+    /**
+     * Get the complete IRI
+     *
+     * @return string
+     */
+    protected function get_iri() {
+        if (!$this->is_valid()) {
+            return false;
+        }
+
+        $iri = '';
+        if ($this->scheme !== null) {
+            $iri .= $this->scheme . ':';
+        }
+        if (($iauthority = $this->get_iauthority()) !== null) {
+            $iri .= '//' . $iauthority;
+        }
+        $iri .= $this->ipath;
+        if ($this->iquery !== null) {
+            $iri .= '?' . $this->iquery;
+        }
+        if ($this->ifragment !== null) {
+            $iri .= '#' . $this->ifragment;
+        }
+
+        return $iri;
+    }
+
+    /**
+     * Get the complete URI
+     *
+     * @return string
+     */
+    protected function get_uri() {
+        return $this->to_uri($this->get_iri());
+    }
+
+    /**
+     * Get the complete iauthority
+     *
+     * @return string
+     */
+    protected function get_iauthority() {
+        if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
+            return null;
+        }
+
+        $iauthority = '';
+        if ($this->iuserinfo !== null) {
+            $iauthority .= $this->iuserinfo . '@';
+        }
+        if ($this->ihost !== null) {
+            $iauthority .= $this->ihost;
+        }
+        if ($this->port !== null) {
+            $iauthority .= ':' . $this->port;
+        }
+        return $iauthority;
+    }
+
+    /**
+     * Get the complete authority
+     *
+     * @return string
+     */
+    protected function get_authority() {
+        $iauthority = $this->get_iauthority();
+        if (is_string($iauthority)) {
+            return $this->to_uri($iauthority);
+        }
+        else {
+            return $iauthority;
+        }
+    }
 }

plugin/buycourses/src/Requests/IPv6.php

Indentation +159 added lines, -159 removed lines

@@ -16,175 +16,175 @@
  * @subpackage Utilities
  */
 class Requests_IPv6 {
-	/**
-	 * Uncompresses an IPv6 address
-	 *
-	 * RFC 4291 allows you to compress consecutive zero pieces in an address to
-	 * '::'. This method expects a valid IPv6 address and expands the '::' to
-	 * the required number of zero pieces.
-	 *
-	 * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
-	 *           ::1         ->  0:0:0:0:0:0:0:1
-	 *
-	 * @author Alexander Merz <alexander.merz@web.de>
-	 * @author elfrink at introweb dot nl
-	 * @author Josh Peck <jmp at joshpeck dot org>
-	 * @copyright 2003-2005 The PHP Group
-	 * @license http://www.opensource.org/licenses/bsd-license.php
-	 * @param string $ip An IPv6 address
-	 * @return string The uncompressed IPv6 address
-	 */
-	public static function uncompress($ip) {
-		if (substr_count($ip, '::') !== 1) {
-			return $ip;
-		}
+    /**
+     * Uncompresses an IPv6 address
+     *
+     * RFC 4291 allows you to compress consecutive zero pieces in an address to
+     * '::'. This method expects a valid IPv6 address and expands the '::' to
+     * the required number of zero pieces.
+     *
+     * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
+     *           ::1         ->  0:0:0:0:0:0:0:1
+     *
+     * @author Alexander Merz <alexander.merz@web.de>
+     * @author elfrink at introweb dot nl
+     * @author Josh Peck <jmp at joshpeck dot org>
+     * @copyright 2003-2005 The PHP Group
+     * @license http://www.opensource.org/licenses/bsd-license.php
+     * @param string $ip An IPv6 address
+     * @return string The uncompressed IPv6 address
+     */
+    public static function uncompress($ip) {
+        if (substr_count($ip, '::') !== 1) {
+            return $ip;
+        }
 
-		list($ip1, $ip2) = explode('::', $ip);
-		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
-		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
+        list($ip1, $ip2) = explode('::', $ip);
+        $c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
+        $c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
-			$c2++;
-		}
-		// ::
-		if ($c1 === -1 && $c2 === -1) {
-			$ip = '0:0:0:0:0:0:0:0';
-		}
-		// ::xxx
-		else if ($c1 === -1) {
-			$fill = str_repeat('0:', 7 - $c2);
-			$ip = str_replace('::', $fill, $ip);
-		}
-		// xxx::
-		else if ($c2 === -1) {
-			$fill = str_repeat(':0', 7 - $c1);
-			$ip = str_replace('::', $fill, $ip);
-		}
-		// xxx::xxx
-		else {
-			$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
-			$ip = str_replace('::', $fill, $ip);
-		}
-		return $ip;
-	}
+        if (strpos($ip2, '.') !== false) {
+            $c2++;
+        }
+        // ::
+        if ($c1 === -1 && $c2 === -1) {
+            $ip = '0:0:0:0:0:0:0:0';
+        }
+        // ::xxx
+        else if ($c1 === -1) {
+            $fill = str_repeat('0:', 7 - $c2);
+            $ip = str_replace('::', $fill, $ip);
+        }
+        // xxx::
+        else if ($c2 === -1) {
+            $fill = str_repeat(':0', 7 - $c1);
+            $ip = str_replace('::', $fill, $ip);
+        }
+        // xxx::xxx
+        else {
+            $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+            $ip = str_replace('::', $fill, $ip);
+        }
+        return $ip;
+    }
 
-	/**
-	 * Compresses an IPv6 address
-	 *
-	 * RFC 4291 allows you to compress consecutive zero pieces in an address to
-	 * '::'. This method expects a valid IPv6 address and compresses consecutive
-	 * zero pieces to '::'.
-	 *
-	 * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
-	 *           0:0:0:0:0:0:0:1        ->  ::1
-	 *
-	 * @see uncompress()
-	 * @param string $ip An IPv6 address
-	 * @return string The compressed IPv6 address
-	 */
-	public static function compress($ip) {
-		// Prepare the IP to be compressed
-		$ip = self::uncompress($ip);
-		$ip_parts = self::split_v6_v4($ip);
+    /**
+     * Compresses an IPv6 address
+     *
+     * RFC 4291 allows you to compress consecutive zero pieces in an address to
+     * '::'. This method expects a valid IPv6 address and compresses consecutive
+     * zero pieces to '::'.
+     *
+     * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
+     *           0:0:0:0:0:0:0:1        ->  ::1
+     *
+     * @see uncompress()
+     * @param string $ip An IPv6 address
+     * @return string The compressed IPv6 address
+     */
+    public static function compress($ip) {
+        // Prepare the IP to be compressed
+        $ip = self::uncompress($ip);
+        $ip_parts = self::split_v6_v4($ip);
 
-		// Replace all leading zeros
-		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
+        // Replace all leading zeros
+        $ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
 
-		// Find bunches of zeros
-		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
-			$max = 0;
-			$pos = null;
-			foreach ($matches[0] as $match) {
-				if (strlen($match[0]) > $max) {
-					$max = strlen($match[0]);
-					$pos = $match[1];
-				}
-			}
+        // Find bunches of zeros
+        if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
+            $max = 0;
+            $pos = null;
+            foreach ($matches[0] as $match) {
+                if (strlen($match[0]) > $max) {
+                    $max = strlen($match[0]);
+                    $pos = $match[1];
+                }
+            }
 
-			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
-		}
+            $ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
+        }
 
-		if ($ip_parts[1] !== '') {
-			return implode(':', $ip_parts);
-		}
-		else {
-			return $ip_parts[0];
-		}
-	}
+        if ($ip_parts[1] !== '') {
+            return implode(':', $ip_parts);
+        }
+        else {
+            return $ip_parts[0];
+        }
+    }
 
-	/**
-	 * Splits an IPv6 address into the IPv6 and IPv4 representation parts
-	 *
-	 * RFC 4291 allows you to represent the last two parts of an IPv6 address
-	 * using the standard IPv4 representation
-	 *
-	 * Example:  0:0:0:0:0:0:13.1.68.3
-	 *           0:0:0:0:0:FFFF:129.144.52.38
-	 *
-	 * @param string $ip An IPv6 address
-	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
-	 */
-	protected static function split_v6_v4($ip) {
-		if (strpos($ip, '.') !== false) {
-			$pos = strrpos($ip, ':');
-			$ipv6_part = substr($ip, 0, $pos);
-			$ipv4_part = substr($ip, $pos + 1);
-			return array($ipv6_part, $ipv4_part);
-		}
-		else {
-			return array($ip, '');
-		}
-	}
+    /**
+     * Splits an IPv6 address into the IPv6 and IPv4 representation parts
+     *
+     * RFC 4291 allows you to represent the last two parts of an IPv6 address
+     * using the standard IPv4 representation
+     *
+     * Example:  0:0:0:0:0:0:13.1.68.3
+     *           0:0:0:0:0:FFFF:129.144.52.38
+     *
+     * @param string $ip An IPv6 address
+     * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+     */
+    protected static function split_v6_v4($ip) {
+        if (strpos($ip, '.') !== false) {
+            $pos = strrpos($ip, ':');
+            $ipv6_part = substr($ip, 0, $pos);
+            $ipv4_part = substr($ip, $pos + 1);
+            return array($ipv6_part, $ipv4_part);
+        }
+        else {
+            return array($ip, '');
+        }
+    }
 
-	/**
-	 * Checks an IPv6 address
-	 *
-	 * Checks if the given IP is a valid IPv6 address
-	 *
-	 * @param string $ip An IPv6 address
-	 * @return bool true if $ip is a valid IPv6 address
-	 */
-	public static function check_ipv6($ip) {
-		$ip = self::uncompress($ip);
-		list($ipv6, $ipv4) = self::split_v6_v4($ip);
-		$ipv6 = explode(':', $ipv6);
-		$ipv4 = explode('.', $ipv4);
-		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
-			foreach ($ipv6 as $ipv6_part) {
-				// The section can't be empty
-				if ($ipv6_part === '') {
-					return false;
-				}
+    /**
+     * Checks an IPv6 address
+     *
+     * Checks if the given IP is a valid IPv6 address
+     *
+     * @param string $ip An IPv6 address
+     * @return bool true if $ip is a valid IPv6 address
+     */
+    public static function check_ipv6($ip) {
+        $ip = self::uncompress($ip);
+        list($ipv6, $ipv4) = self::split_v6_v4($ip);
+        $ipv6 = explode(':', $ipv6);
+        $ipv4 = explode('.', $ipv4);
+        if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
+            foreach ($ipv6 as $ipv6_part) {
+                // The section can't be empty
+                if ($ipv6_part === '') {
+                    return false;
+                }
 
-				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4) {
-					return false;
-				}
+                // Nor can it be over four characters
+                if (strlen($ipv6_part) > 4) {
+                    return false;
+                }
 
-				// Remove leading zeros (this is safe because of the above)
-				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '') {
-					$ipv6_part = '0';
-				}
+                // Remove leading zeros (this is safe because of the above)
+                $ipv6_part = ltrim($ipv6_part, '0');
+                if ($ipv6_part === '') {
+                    $ipv6_part = '0';
+                }
 
-				// Check the value is valid
-				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
-					return false;
-				}
-			}
-			if (count($ipv4) === 4) {
-				foreach ($ipv4 as $ipv4_part) {
-					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
+                // Check the value is valid
+                $value = hexdec($ipv6_part);
+                if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+                    return false;
+                }
+            }
+            if (count($ipv4) === 4) {
+                foreach ($ipv4 as $ipv4_part) {
+                    $value = (int) $ipv4_part;
+                    if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }

plugin/buycourses/src/Requests/Proxy.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * @since 1.6
  */
 interface Requests_Proxy {
-	/**
-	 * Register hooks as needed
-	 *
-	 * This method is called in {@see Requests::request} when the user has set
-	 * an instance as the 'auth' option. Use this callback to register all the
-	 * hooks you'll need.
-	 *
-	 * @see Requests_Hooks::register
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks &$hooks);
+    /**
+     * Register hooks as needed
+     *
+     * This method is called in {@see Requests::request} when the user has set
+     * an instance as the 'auth' option. Use this callback to register all the
+     * hooks you'll need.
+     *
+     * @see Requests_Hooks::register
+     * @param Requests_Hooks $hooks Hook system
+     */
+    public function register(Requests_Hooks &$hooks);
 }
\ No newline at end of file

plugin/buycourses/src/Requests/Exception.php

Indentation +43 added lines, -43 removed lines

@@ -11,52 +11,52 @@
  * @package Requests
  */
 class Requests_Exception extends Exception {
-	/**
-	 * Type of exception
-	 *
-	 * @var string
-	 */
-	protected $type;
+    /**
+     * Type of exception
+     *
+     * @var string
+     */
+    protected $type;
 
-	/**
-	 * Data associated with the exception
-	 *
-	 * @var mixed
-	 */
-	protected $data;
+    /**
+     * Data associated with the exception
+     *
+     * @var mixed
+     */
+    protected $data;
 
-	/**
-	 * Create a new exception
-	 *
-	 * @param string $message Exception message
-	 * @param string $type Exception type
-	 * @param mixed $data Associated data
-	 * @param integer $code Exception numerical code, if applicable
-	 */
-	public function __construct($message, $type, $data = null, $code = 0) {
-		parent::__construct($message, $code);
+    /**
+     * Create a new exception
+     *
+     * @param string $message Exception message
+     * @param string $type Exception type
+     * @param mixed $data Associated data
+     * @param integer $code Exception numerical code, if applicable
+     */
+    public function __construct($message, $type, $data = null, $code = 0) {
+        parent::__construct($message, $code);
 
-		$this->type = $type;
-		$this->data = $data;
-	}
+        $this->type = $type;
+        $this->data = $data;
+    }
 
-	/**
-	 * Like {@see getCode()}, but a string code.
-	 *
-	 * @codeCoverageIgnore
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * Like {@see getCode()}, but a string code.
+     *
+     * @codeCoverageIgnore
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * Gives any relevant data
-	 *
-	 * @codeCoverageIgnore
-	 * @return mixed
-	 */
-	public function getData() {
-		return $this->data;
-	}
+    /**
+     * Gives any relevant data
+     *
+     * @codeCoverageIgnore
+     * @return mixed
+     */
+    public function getData() {
+        return $this->data;
+    }
 }
\ No newline at end of file

plugin/buycourses/src/Requests.php

Indentation +945 added lines, -945 removed lines

@@ -19,241 +19,241 @@ 
  * @package Requests
  */
 class Requests {
-	/**
-	 * POST method
-	 *
-	 * @var string
-	 */
-	const POST = 'POST';
-
-	/**
-	 * PUT method
-	 *
-	 * @var string
-	 */
-	const PUT = 'PUT';
-
-	/**
-	 * GET method
-	 *
-	 * @var string
-	 */
-	const GET = 'GET';
-
-	/**
-	 * HEAD method
-	 *
-	 * @var string
-	 */
-	const HEAD = 'HEAD';
-
-	/**
-	 * DELETE method
-	 *
-	 * @var string
-	 */
-	const DELETE = 'DELETE';
-
-	/**
-	 * OPTIONS method
-	 *
-	 * @var string
-	 */
-	const OPTIONS = 'OPTIONS';
-
-	/**
-	 * TRACE method
-	 *
-	 * @var string
-	 */
-	const TRACE = 'TRACE';
-
-	/**
-	 * PATCH method
-	 *
-	 * @link https://tools.ietf.org/html/rfc5789
-	 * @var string
-	 */
-	const PATCH = 'PATCH';
-
-	/**
-	 * Default size of buffer size to read streams
-	 *
-	 * @var integer
-	 */
-	const BUFFER_SIZE = 1160;
-
-	/**
-	 * Current version of Requests
-	 *
-	 * @var string
-	 */
-	const VERSION = '1.7';
-
-	/**
-	 * Registered transport classes
-	 *
-	 * @var array
-	 */
-	protected static $transports = array();
-
-	/**
-	 * Selected transport name
-	 *
-	 * Use {@see get_transport()} instead
-	 *
-	 * @var array
-	 */
-	public static $transport = array();
-
-	/**
-	 * Default certificate path.
-	 *
-	 * @see Requests::get_certificate_path()
-	 * @see Requests::set_certificate_path()
-	 *
-	 * @var string
-	 */
-	protected static $certificate_path;
-
-	/**
-	 * This is a static class, do not instantiate it
-	 *
-	 * @codeCoverageIgnore
-	 */
-	private function __construct() {}
-
-	/**
-	 * Autoloader for Requests
-	 *
-	 * Register this with {@see register_autoloader()} if you'd like to avoid
-	 * having to create your own.
-	 *
-	 * (You can also use `spl_autoload_register` directly if you'd prefer.)
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @param string $class Class name to load
-	 */
-	public static function autoloader($class) {
-		// Check that the class starts with "Requests"
-		if (strpos($class, 'Requests') !== 0) {
-			return;
-		}
-
-		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-			require_once(dirname(__FILE__) . '/' . $file . '.php');
-		}
-	}
-
-	/**
-	 * Register the built-in autoloader
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function register_autoloader() {
-		spl_autoload_register(array('Requests', 'autoloader'));
-	}
-
-	/**
-	 * Register a transport
-	 *
-	 * @param string $transport Transport class to add, must support the Requests_Transport interface
-	 */
-	public static function add_transport($transport) {
-		if (empty(self::$transports)) {
-			self::$transports = array(
-				'Requests_Transport_cURL',
-				'Requests_Transport_fsockopen',
-			);
-		}
-
-		self::$transports = array_merge(self::$transports, array($transport));
-	}
-
-	/**
-	 * Get a working transport
-	 *
-	 * @throws Requests_Exception If no valid transport is found (`notransport`)
-	 * @return Requests_Transport
-	 */
-	protected static function get_transport($capabilities = array()) {
-		// Caching code, don't bother testing coverage
-		// @codeCoverageIgnoreStart
-		// array of capabilities as a string to be used as an array key
-		ksort($capabilities);
-		$cap_string = serialize($capabilities);
-
-		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
-			return new self::$transport[$cap_string]();
-		}
-		// @codeCoverageIgnoreEnd
-
-		if (empty(self::$transports)) {
-			self::$transports = array(
-				'Requests_Transport_cURL',
-				'Requests_Transport_fsockopen',
-			);
-		}
-
-		// Find us a working transport
-		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
-				continue;
-			}
-
-			$result = call_user_func(array($class, 'test'), $capabilities);
-			if ($result) {
-				self::$transport[$cap_string] = $class;
-				break;
-			}
-		}
-		if (self::$transport[$cap_string] === null) {
-			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
-		}
-
-		return new self::$transport[$cap_string]();
-	}
-
-	/**#@+
+    /**
+     * POST method
+     *
+     * @var string
+     */
+    const POST = 'POST';
+
+    /**
+     * PUT method
+     *
+     * @var string
+     */
+    const PUT = 'PUT';
+
+    /**
+     * GET method
+     *
+     * @var string
+     */
+    const GET = 'GET';
+
+    /**
+     * HEAD method
+     *
+     * @var string
+     */
+    const HEAD = 'HEAD';
+
+    /**
+     * DELETE method
+     *
+     * @var string
+     */
+    const DELETE = 'DELETE';
+
+    /**
+     * OPTIONS method
+     *
+     * @var string
+     */
+    const OPTIONS = 'OPTIONS';
+
+    /**
+     * TRACE method
+     *
+     * @var string
+     */
+    const TRACE = 'TRACE';
+
+    /**
+     * PATCH method
+     *
+     * @link https://tools.ietf.org/html/rfc5789
+     * @var string
+     */
+    const PATCH = 'PATCH';
+
+    /**
+     * Default size of buffer size to read streams
+     *
+     * @var integer
+     */
+    const BUFFER_SIZE = 1160;
+
+    /**
+     * Current version of Requests
+     *
+     * @var string
+     */
+    const VERSION = '1.7';
+
+    /**
+     * Registered transport classes
+     *
+     * @var array
+     */
+    protected static $transports = array();
+
+    /**
+     * Selected transport name
+     *
+     * Use {@see get_transport()} instead
+     *
+     * @var array
+     */
+    public static $transport = array();
+
+    /**
+     * Default certificate path.
+     *
+     * @see Requests::get_certificate_path()
+     * @see Requests::set_certificate_path()
+     *
+     * @var string
+     */
+    protected static $certificate_path;
+
+    /**
+     * This is a static class, do not instantiate it
+     *
+     * @codeCoverageIgnore
+     */
+    private function __construct() {}
+
+    /**
+     * Autoloader for Requests
+     *
+     * Register this with {@see register_autoloader()} if you'd like to avoid
+     * having to create your own.
+     *
+     * (You can also use `spl_autoload_register` directly if you'd prefer.)
+     *
+     * @codeCoverageIgnore
+     *
+     * @param string $class Class name to load
+     */
+    public static function autoloader($class) {
+        // Check that the class starts with "Requests"
+        if (strpos($class, 'Requests') !== 0) {
+            return;
+        }
+
+        $file = str_replace('_', '/', $class);
+        if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
+            require_once(dirname(__FILE__) . '/' . $file . '.php');
+        }
+    }
+
+    /**
+     * Register the built-in autoloader
+     *
+     * @codeCoverageIgnore
+     */
+    public static function register_autoloader() {
+        spl_autoload_register(array('Requests', 'autoloader'));
+    }
+
+    /**
+     * Register a transport
+     *
+     * @param string $transport Transport class to add, must support the Requests_Transport interface
+     */
+    public static function add_transport($transport) {
+        if (empty(self::$transports)) {
+            self::$transports = array(
+                'Requests_Transport_cURL',
+                'Requests_Transport_fsockopen',
+            );
+        }
+
+        self::$transports = array_merge(self::$transports, array($transport));
+    }
+
+    /**
+     * Get a working transport
+     *
+     * @throws Requests_Exception If no valid transport is found (`notransport`)
+     * @return Requests_Transport
+     */
+    protected static function get_transport($capabilities = array()) {
+        // Caching code, don't bother testing coverage
+        // @codeCoverageIgnoreStart
+        // array of capabilities as a string to be used as an array key
+        ksort($capabilities);
+        $cap_string = serialize($capabilities);
+
+        // Don't search for a transport if it's already been done for these $capabilities
+        if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
+            return new self::$transport[$cap_string]();
+        }
+        // @codeCoverageIgnoreEnd
+
+        if (empty(self::$transports)) {
+            self::$transports = array(
+                'Requests_Transport_cURL',
+                'Requests_Transport_fsockopen',
+            );
+        }
+
+        // Find us a working transport
+        foreach (self::$transports as $class) {
+            if (!class_exists($class)) {
+                continue;
+            }
+
+            $result = call_user_func(array($class, 'test'), $capabilities);
+            if ($result) {
+                self::$transport[$cap_string] = $class;
+                break;
+            }
+        }
+        if (self::$transport[$cap_string] === null) {
+            throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
+        }
+
+        return new self::$transport[$cap_string]();
+    }
+
+    /**#@+
 	 * @see request()
 	 * @param string $url
 	 * @param array $headers
 	 * @param array $options
 	 * @return Requests_Response
 	 */
-	/**
-	 * Send a GET request
-	 */
-	public static function get($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::GET, $options);
-	}
-
-	/**
-	 * Send a HEAD request
-	 */
-	public static function head($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::HEAD, $options);
-	}
-
-	/**
-	 * Send a DELETE request
-	 */
-	public static function delete($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::DELETE, $options);
-	}
-
-	/**
-	 * Send a TRACE request
-	 */
-	public static function trace($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::TRACE, $options);
-	}
-	/**#@-*/
-
-	/**#@+
+    /**
+     * Send a GET request
+     */
+    public static function get($url, $headers = array(), $options = array()) {
+        return self::request($url, $headers, null, self::GET, $options);
+    }
+
+    /**
+     * Send a HEAD request
+     */
+    public static function head($url, $headers = array(), $options = array()) {
+        return self::request($url, $headers, null, self::HEAD, $options);
+    }
+
+    /**
+     * Send a DELETE request
+     */
+    public static function delete($url, $headers = array(), $options = array()) {
+        return self::request($url, $headers, null, self::DELETE, $options);
+    }
+
+    /**
+     * Send a TRACE request
+     */
+    public static function trace($url, $headers = array(), $options = array()) {
+        return self::request($url, $headers, null, self::TRACE, $options);
+    }
+    /**#@-*/
+
+    /**#@+
 	 * @see request()
 	 * @param string $url
 	 * @param array $headers
@@ -261,720 +261,720 @@ 
 	 * @param array $options
 	 * @return Requests_Response
 	 */
-	/**
-	 * Send a POST request
-	 */
-	public static function post($url, $headers = array(), $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::POST, $options);
-	}
-	/**
-	 * Send a PUT request
-	 */
-	public static function put($url, $headers = array(), $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::PUT, $options);
-	}
-
-	/**
-	 * Send an OPTIONS request
-	 */
-	public static function options($url, $headers = array(), $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::OPTIONS, $options);
-	}
-
-	/**
-	 * Send a PATCH request
-	 *
-	 * Note: Unlike {@see post} and {@see put}, `$headers` is required, as the
-	 * specification recommends that should send an ETag
-	 *
-	 * @link https://tools.ietf.org/html/rfc5789
-	 */
-	public static function patch($url, $headers, $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::PATCH, $options);
-	}
-	/**#@-*/
-
-	/**
-	 * Main interface for HTTP requests
-	 *
-	 * This method initiates a request and sends it via a transport before
-	 * parsing.
-	 *
-	 * The `$options` parameter takes an associative array with the following
-	 * options:
-	 *
-	 * - `timeout`: How long should we wait for a response?
-	 *    Note: for cURL, a minimum of 1 second applies, as DNS resolution
-	 *    operates at second-resolution only.
-	 *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
-	 * - `connect_timeout`: How long should we wait while trying to connect?
-	 *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
-	 * - `useragent`: Useragent to send to the server
-	 *    (string, default: php-requests/$version)
-	 * - `follow_redirects`: Should we follow 3xx redirects?
-	 *    (boolean, default: true)
-	 * - `redirects`: How many times should we redirect before erroring?
-	 *    (integer, default: 10)
-	 * - `blocking`: Should we block processing on this request?
-	 *    (boolean, default: true)
-	 * - `filename`: File to stream the body to instead.
-	 *    (string|boolean, default: false)
-	 * - `auth`: Authentication handler or array of user/password details to use
-	 *    for Basic authentication
-	 *    (Requests_Auth|array|boolean, default: false)
-	 * - `proxy`: Proxy details to use for proxy by-passing and authentication
-	 *    (Requests_Proxy|array|string|boolean, default: false)
-	 * - `max_bytes`: Limit for the response body size.
-	 *    (integer|boolean, default: false)
-	 * - `idn`: Enable IDN parsing
-	 *    (boolean, default: true)
-	 * - `transport`: Custom transport. Either a class name, or a
-	 *    transport object. Defaults to the first working transport from
-	 *    {@see getTransport()}
-	 *    (string|Requests_Transport, default: {@see getTransport()})
-	 * - `hooks`: Hooks handler.
-	 *    (Requests_Hooker, default: new Requests_Hooks())
-	 * - `verify`: Should we verify SSL certificates? Allows passing in a custom
-	 *    certificate file as a string. (Using true uses the system-wide root
-	 *    certificate store instead, but this may have different behaviour
-	 *    across transports.)
-	 *    (string|boolean, default: library/Requests/Transport/cacert.pem)
-	 * - `verifyname`: Should we verify the common name in the SSL certificate?
-	 *    (boolean: default, true)
-	 * - `data_format`: How should we send the `$data` parameter?
-	 *    (string, one of 'query' or 'body', default: 'query' for
-	 *    HEAD/GET/DELETE, 'body' for POST/PUT/OPTIONS/PATCH)
-	 *
-	 * @throws Requests_Exception On invalid URLs (`nonhttp`)
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Extra headers to send with the request
-	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
-	 * @param string $type HTTP request type (use Requests constants)
-	 * @param array $options Options for the request (see description for more information)
-	 * @return Requests_Response
-	 */
-	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
-		if (empty($options['type'])) {
-			$options['type'] = $type;
-		}
-		$options = array_merge(self::get_default_options(), $options);
-
-		self::set_defaults($url, $headers, $data, $type, $options);
-
-		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
-
-		if (!empty($options['transport'])) {
-			$transport = $options['transport'];
-
-			if (is_string($options['transport'])) {
-				$transport = new $transport();
-			}
-		}
-		else {
-			$need_ssl = (0 === stripos($url, 'https://'));
-			$capabilities = array('ssl' => $need_ssl);
-			$transport = self::get_transport($capabilities);
-		}
-		$response = $transport->request($url, $headers, $data, $options);
-
-		$options['hooks']->dispatch('requests.before_parse', array(&$response, $url, $headers, $data, $type, $options));
-
-		return self::parse_response($response, $url, $headers, $data, $options);
-	}
-
-	/**
-	 * Send multiple HTTP requests simultaneously
-	 *
-	 * The `$requests` parameter takes an associative or indexed array of
-	 * request fields. The key of each request can be used to match up the
-	 * request with the returned data, or with the request passed into your
-	 * `multiple.request.complete` callback.
-	 *
-	 * The request fields value is an associative array with the following keys:
-	 *
-	 * - `url`: Request URL Same as the `$url` parameter to
-	 *    {@see Requests::request}
-	 *    (string, required)
-	 * - `headers`: Associative array of header fields. Same as the `$headers`
-	 *    parameter to {@see Requests::request}
-	 *    (array, default: `array()`)
-	 * - `data`: Associative array of data fields or a string. Same as the
-	 *    `$data` parameter to {@see Requests::request}
-	 *    (array|string, default: `array()`)
-	 * - `type`: HTTP request type (use Requests constants). Same as the `$type`
-	 *    parameter to {@see Requests::request}
-	 *    (string, default: `Requests::GET`)
-	 * - `cookies`: Associative array of cookie name to value, or cookie jar.
-	 *    (array|Requests_Cookie_Jar)
-	 *
-	 * If the `$options` parameter is specified, individual requests will
-	 * inherit options from it. This can be used to use a single hooking system,
-	 * or set all the types to `Requests::POST`, for example.
-	 *
-	 * In addition, the `$options` parameter takes the following global options:
-	 *
-	 * - `complete`: A callback for when a request is complete. Takes two
-	 *    parameters, a Requests_Response/Requests_Exception reference, and the
-	 *    ID from the request array (Note: this can also be overridden on a
-	 *    per-request basis, although that's a little silly)
-	 *    (callback)
-	 *
-	 * @param array $requests Requests data (see description for more information)
-	 * @param array $options Global and default options (see {@see Requests::request})
-	 * @return array Responses (either Requests_Response or a Requests_Exception object)
-	 */
-	public static function request_multiple($requests, $options = array()) {
-		$options = array_merge(self::get_default_options(true), $options);
-
-		if (!empty($options['hooks'])) {
-			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
-				$options['hooks']->register('multiple.request.complete', $options['complete']);
-			}
-		}
-
-		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
-				$request['headers'] = array();
-			}
-			if (!isset($request['data'])) {
-				$request['data'] = array();
-			}
-			if (!isset($request['type'])) {
-				$request['type'] = self::GET;
-			}
-			if (!isset($request['options'])) {
-				$request['options'] = $options;
-				$request['options']['type'] = $request['type'];
-			}
-			else {
-				if (empty($request['options']['type'])) {
-					$request['options']['type'] = $request['type'];
-				}
-				$request['options'] = array_merge($options, $request['options']);
-			}
-
-			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
-
-			// Ensure we only hook in once
-			if ($request['options']['hooks'] !== $options['hooks']) {
-				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
-					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
-				}
-			}
-		}
-		unset($request);
-
-		if (!empty($options['transport'])) {
-			$transport = $options['transport'];
-
-			if (is_string($options['transport'])) {
-				$transport = new $transport();
-			}
-		}
-		else {
-			$transport = self::get_transport();
-		}
-		$responses = $transport->request_multiple($requests, $options);
-
-		foreach ($responses as $id => &$response) {
-			// If our hook got messed with somehow, ensure we end up with the
-			// correct response
-			if (is_string($response)) {
-				$request = $requests[$id];
-				self::parse_multiple($response, $request);
-				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
-			}
-		}
-
-		return $responses;
-	}
-
-	/**
-	 * Get the default options
-	 *
-	 * @see Requests::request() for values returned by this method
-	 * @param boolean $multirequest Is this a multirequest?
-	 * @return array Default option values
-	 */
-	protected static function get_default_options($multirequest = false) {
-		$defaults = array(
-			'timeout' => 10,
-			'connect_timeout' => 10,
-			'useragent' => 'php-requests/' . self::VERSION,
-			'protocol_version' => 1.1,
-			'redirected' => 0,
-			'redirects' => 10,
-			'follow_redirects' => true,
-			'blocking' => true,
-			'type' => self::GET,
-			'filename' => false,
-			'auth' => false,
-			'proxy' => false,
-			'cookies' => false,
-			'max_bytes' => false,
-			'idn' => true,
-			'hooks' => null,
-			'transport' => null,
-			'verify' => Requests::get_certificate_path(),
-			'verifyname' => true,
-		);
-		if ($multirequest !== false) {
-			$defaults['complete'] = null;
-		}
-		return $defaults;
-	}
-
-	/**
-	 * Get default certificate path.
-	 *
-	 * @return string Default certificate path.
-	 */
-	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
-			return Requests::$certificate_path;
-		}
-
-		return dirname(__FILE__) . '/Requests/Transport/cacert.pem';
-	}
-
-	/**
-	 * Set default certificate path.
-	 *
-	 * @param string $path Certificate path, pointing to a PEM file.
-	 */
-	public static function set_certificate_path( $path ) {
-		Requests::$certificate_path = $path;
-	}
-
-	/**
-	 * Set the default values
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Extra headers to send with the request
-	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
-	 * @param string $type HTTP request type
-	 * @param array $options Options for the request
-	 * @return array $options
-	 */
-	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
-			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
-		}
-
-		if (empty($options['hooks'])) {
-			$options['hooks'] = new Requests_Hooks();
-		}
-
-		if (is_array($options['auth'])) {
-			$options['auth'] = new Requests_Auth_Basic($options['auth']);
-		}
-		if ($options['auth'] !== false) {
-			$options['auth']->register($options['hooks']);
-		}
-
-		if (is_string($options['proxy']) || is_array($options['proxy'])) {
-			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
-		}
-		if ($options['proxy'] !== false) {
-			$options['proxy']->register($options['hooks']);
-		}
-
-		if (is_array($options['cookies'])) {
-			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
-		}
-		elseif (empty($options['cookies'])) {
-			$options['cookies'] = new Requests_Cookie_Jar();
-		}
-		if ($options['cookies'] !== false) {
-			$options['cookies']->register($options['hooks']);
-		}
-
-		if ($options['idn'] !== false) {
-			$iri = new Requests_IRI($url);
-			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
-			$url = $iri->uri;
-		}
-
-		// Massage the type to ensure we support it.
-		$type = strtoupper($type);
-
-		if (!isset($options['data_format'])) {
-			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
-				$options['data_format'] = 'query';
-			}
-			else {
-				$options['data_format'] = 'body';
-			}
-		}
-	}
-
-	/**
-	 * HTTP response parser
-	 *
-	 * @throws Requests_Exception On missing head/body separator (`requests.no_crlf_separator`)
-	 * @throws Requests_Exception On missing head/body separator (`noversion`)
-	 * @throws Requests_Exception On missing head/body separator (`toomanyredirects`)
-	 *
-	 * @param string $headers Full response text including headers and body
-	 * @param string $url Original request URL
-	 * @param array $req_headers Original $headers array passed to {@link request()}, in case we need to follow redirects
-	 * @param array $req_data Original $data array passed to {@link request()}, in case we need to follow redirects
-	 * @param array $options Original $options array passed to {@link request()}, in case we need to follow redirects
-	 * @return Requests_Response
-	 */
-	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
-		$return = new Requests_Response();
-		if (!$options['blocking']) {
-			return $return;
-		}
-
-		$return->raw = $headers;
-		$return->url = $url;
-
-		if (!$options['filename']) {
-			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
-				// Crap!
-				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
-			}
-
-			$headers = substr($return->raw, 0, $pos);
-			$return->body = substr($return->raw, $pos + strlen("\n\r\n\r"));
-		}
-		else {
-			$return->body = '';
-		}
-		// Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
-		$headers = str_replace("\r\n", "\n", $headers);
-		// Unfold headers (replace [CRLF] 1*( SP | HT ) with SP) as per RFC 2616 (section 2.2)
-		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
-		$headers = explode("\n", $headers);
-		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
-		if (empty($matches)) {
-			throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
-		}
-		$return->protocol_version = (float) $matches[1];
-		$return->status_code = (int) $matches[2];
-		if ($return->status_code >= 200 && $return->status_code < 300) {
-			$return->success = true;
-		}
-
-		foreach ($headers as $header) {
-			list($key, $value) = explode(':', $header, 2);
-			$value = trim($value);
-			preg_replace('#(\s+)#i', ' ', $value);
-			$return->headers[$key] = $value;
-		}
-		if (isset($return->headers['transfer-encoding'])) {
-			$return->body = self::decode_chunked($return->body);
-			unset($return->headers['transfer-encoding']);
-		}
-		if (isset($return->headers['content-encoding'])) {
-			$return->body = self::decompress($return->body);
-		}
-
-		//fsockopen and cURL compatibility
-		if (isset($return->headers['connection'])) {
-			unset($return->headers['connection']);
-		}
-
-		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
-
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
-			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
-				if ($return->status_code === 303) {
-					$options['type'] = self::GET;
-				}
-				$options['redirected']++;
-				$location = $return->headers['location'];
-				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
-					// relative redirect, for compatibility make it absolute
-					$location = Requests_IRI::absolutize($url, $location);
-					$location = $location->uri;
-				}
-
-				$hook_args = array(
-					&$location,
-					&$req_headers,
-					&$req_data,
-					&$options,
-					$return
-				);
-				$options['hooks']->dispatch('requests.before_redirect', $hook_args);
-				$redirected = self::request($location, $req_headers, $req_data, $options['type'], $options);
-				$redirected->history[] = $return;
-				return $redirected;
-			}
-			elseif ($options['redirected'] >= $options['redirects']) {
-				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
-			}
-		}
-
-		$return->redirects = $options['redirected'];
-
-		$options['hooks']->dispatch('requests.after_request', array(&$return, $req_headers, $req_data, $options));
-		return $return;
-	}
-
-	/**
-	 * Callback for `transport.internal.parse_response`
-	 *
-	 * Internal use only. Converts a raw HTTP response to a Requests_Response
-	 * while still executing a multiple request.
-	 *
-	 * @param string $response Full response text including headers and body (will be overwritten with Response instance)
-	 * @param array $request Request data as passed into {@see Requests::request_multiple()}
-	 * @return null `$response` is either set to a Requests_Response instance, or a Requests_Exception object
-	 */
-	public static function parse_multiple(&$response, $request) {
-		try {
-			$url = $request['url'];
-			$headers = $request['headers'];
-			$data = $request['data'];
-			$options = $request['options'];
-			$response = self::parse_response($response, $url, $headers, $data, $options);
-		}
-		catch (Requests_Exception $e) {
-			$response = $e;
-		}
-	}
-
-	/**
-	 * Decoded a chunked body as per RFC 2616
-	 *
-	 * @see https://tools.ietf.org/html/rfc2616#section-3.6.1
-	 * @param string $data Chunked body
-	 * @return string Decoded body
-	 */
-	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
-			return $data;
-		}
-
-
-
-		$decoded = '';
-		$encoded = $data;
-
-		while (true) {
-			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
-				// Looks like it's not chunked after all
-				return $data;
-			}
-
-			$length = hexdec(trim($matches[1]));
-			if ($length === 0) {
-				// Ignore trailer headers
-				return $decoded;
-			}
-
-			$chunk_length = strlen($matches[0]);
-			$decoded .= substr($encoded, $chunk_length, $length);
-			$encoded = substr($encoded, $chunk_length + $length + 2);
-
-			if (trim($encoded) === '0' || empty($encoded)) {
-				return $decoded;
-			}
-		}
-
-		// We'll never actually get down here
-		// @codeCoverageIgnoreStart
-	}
-	// @codeCoverageIgnoreEnd
-
-	/**
-	 * Convert a key => value array to a 'key: value' array for headers
-	 *
-	 * @param array $array Dictionary of header values
-	 * @return array List of headers
-	 */
-	public static function flatten($array) {
-		$return = array();
-		foreach ($array as $key => $value) {
-			$return[] = sprintf('%s: %s', $key, $value);
-		}
-		return $return;
-	}
-
-	/**
-	 * Convert a key => value array to a 'key: value' array for headers
-	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Misspelling of {@see Requests::flatten}
-	 * @param array $array Dictionary of header values
-	 * @return array List of headers
-	 */
-	public static function flattern($array) {
-		return self::flatten($array);
-	}
-
-	/**
-	 * Decompress an encoded body
-	 *
-	 * Implements gzip, compress and deflate. Guesses which it is by attempting
-	 * to decode.
-	 *
-	 * @param string $data Compressed data in one of the above formats
-	 * @return string Decompressed string
-	 */
-	public static function decompress($data) {
-		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
-			// Not actually compressed. Probably cURL ruining this for us.
-			return $data;
-		}
-
-		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
-			return $decoded;
-		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
-			return $decoded;
-		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
-			return $decoded;
-		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
-			return $decoded;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Decompression of deflated string while staying compatible with the majority of servers.
-	 *
-	 * Certain Servers will return deflated data with headers which PHP's gzinflate()
-	 * function cannot handle out of the box. The following function has been created from
-	 * various snippets on the gzinflate() PHP documentation.
-	 *
-	 * Warning: Magic numbers within. Due to the potential different formats that the compressed
-	 * data may be returned in, some "magic offsets" are needed to ensure proper decompression
-	 * takes place. For a simple progmatic way to determine the magic offset in use, see:
-	 * https://core.trac.wordpress.org/ticket/18273
-	 *
-	 * @since 2.8.1
-	 * @link https://core.trac.wordpress.org/ticket/18273
-	 * @link https://secure.php.net/manual/en/function.gzinflate.php#70875
-	 * @link https://secure.php.net/manual/en/function.gzinflate.php#77336
-	 *
-	 * @param string $gzData String to decompress.
-	 * @return string|bool False on failure.
-	 */
-	public static function compatible_gzinflate($gzData) {
-		// Compressed data might contain a full zlib header, if so strip it for
-		// gzinflate()
-		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
-			$i = 10;
-			$flg = ord(substr($gzData, 3, 1));
-			if ($flg > 0) {
-				if ($flg & 4) {
-					list($xlen) = unpack('v', substr($gzData, $i, 2));
-					$i = $i + 2 + $xlen;
-				}
-				if ($flg & 8) {
-					$i = strpos($gzData, "\0", $i) + 1;
-				}
-				if ($flg & 16) {
-					$i = strpos($gzData, "\0", $i) + 1;
-				}
-				if ($flg & 2) {
-					$i = $i + 2;
-				}
-			}
-			$decompressed = self::compatible_gzinflate(substr($gzData, $i));
-			if (false !== $decompressed) {
-				return $decompressed;
-			}
-		}
-
-		// If the data is Huffman Encoded, we must first strip the leading 2
-		// byte Huffman marker for gzinflate()
-		// The response is Huffman coded by many compressors such as
-		// java.util.zip.Deflater, Ruby’s Zlib::Deflate, and .NET's
-		// System.IO.Compression.DeflateStream.
-		//
-		// See https://decompres.blogspot.com/ for a quick explanation of this
-		// data type
-		$huffman_encoded = false;
-
-		// low nibble of first byte should be 0x08
-		list(, $first_nibble)    = unpack('h', $gzData);
-
-		// First 2 bytes should be divisible by 0x1F
-		list(, $first_two_bytes) = unpack('n', $gzData);
-
-		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
-			$huffman_encoded = true;
-		}
-
-		if ($huffman_encoded) {
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
-				return $decompressed;
-			}
-		}
-
-		if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
-			// ZIP file format header
-			// Offset 6: 2 bytes, General-purpose field
-			// Offset 26: 2 bytes, filename length
-			// Offset 28: 2 bytes, optional field length
-			// Offset 30: Filename field, followed by optional field, followed
-			// immediately by data
-			list(, $general_purpose_flag) = unpack('v', substr($gzData, 6, 2));
-
-			// If the file has been compressed on the fly, 0x08 bit is set of
-			// the general purpose field. We can use this to differentiate
-			// between a compressed document, and a ZIP file
-			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
-
-			if (!$zip_compressed_on_the_fly) {
-				// Don't attempt to decode a compressed zip file
-				return $gzData;
-			}
-
-			// Determine the first byte of data, based on the above ZIP header
-			// offsets:
-			$first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
-				return $decompressed;
-			}
-			return false;
-		}
-
-		// Finally fall back to straight gzinflate
-		if (false !== ($decompressed = @gzinflate($gzData))) {
-			return $decompressed;
-		}
-
-		// Fallback for all above failing, not expected, but included for
-		// debugging and preventing regressions and to track stats
-		if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
-			return $decompressed;
-		}
-
-		return false;
-	}
-
-	public static function match_domain($host, $reference) {
-		// Check for a direct match
-		if ($host === $reference) {
-			return true;
-		}
-
-		// Calculate the valid wildcard match if the host is not an IP address
-		// Also validates that the host has 3 parts or more, as per Firefox's
-		// ruleset.
-		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
-			$parts[0] = '*';
-			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
-				return true;
-			}
-		}
-
-		return false;
-	}
+    /**
+     * Send a POST request
+     */
+    public static function post($url, $headers = array(), $data = array(), $options = array()) {
+        return self::request($url, $headers, $data, self::POST, $options);
+    }
+    /**
+     * Send a PUT request
+     */
+    public static function put($url, $headers = array(), $data = array(), $options = array()) {
+        return self::request($url, $headers, $data, self::PUT, $options);
+    }
+
+    /**
+     * Send an OPTIONS request
+     */
+    public static function options($url, $headers = array(), $data = array(), $options = array()) {
+        return self::request($url, $headers, $data, self::OPTIONS, $options);
+    }
+
+    /**
+     * Send a PATCH request
+     *
+     * Note: Unlike {@see post} and {@see put}, `$headers` is required, as the
+     * specification recommends that should send an ETag
+     *
+     * @link https://tools.ietf.org/html/rfc5789
+     */
+    public static function patch($url, $headers, $data = array(), $options = array()) {
+        return self::request($url, $headers, $data, self::PATCH, $options);
+    }
+    /**#@-*/
+
+    /**
+     * Main interface for HTTP requests
+     *
+     * This method initiates a request and sends it via a transport before
+     * parsing.
+     *
+     * The `$options` parameter takes an associative array with the following
+     * options:
+     *
+     * - `timeout`: How long should we wait for a response?
+     *    Note: for cURL, a minimum of 1 second applies, as DNS resolution
+     *    operates at second-resolution only.
+     *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
+     * - `connect_timeout`: How long should we wait while trying to connect?
+     *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
+     * - `useragent`: Useragent to send to the server
+     *    (string, default: php-requests/$version)
+     * - `follow_redirects`: Should we follow 3xx redirects?
+     *    (boolean, default: true)
+     * - `redirects`: How many times should we redirect before erroring?
+     *    (integer, default: 10)
+     * - `blocking`: Should we block processing on this request?
+     *    (boolean, default: true)
+     * - `filename`: File to stream the body to instead.
+     *    (string|boolean, default: false)
+     * - `auth`: Authentication handler or array of user/password details to use
+     *    for Basic authentication
+     *    (Requests_Auth|array|boolean, default: false)
+     * - `proxy`: Proxy details to use for proxy by-passing and authentication
+     *    (Requests_Proxy|array|string|boolean, default: false)
+     * - `max_bytes`: Limit for the response body size.
+     *    (integer|boolean, default: false)
+     * - `idn`: Enable IDN parsing
+     *    (boolean, default: true)
+     * - `transport`: Custom transport. Either a class name, or a
+     *    transport object. Defaults to the first working transport from
+     *    {@see getTransport()}
+     *    (string|Requests_Transport, default: {@see getTransport()})
+     * - `hooks`: Hooks handler.
+     *    (Requests_Hooker, default: new Requests_Hooks())
+     * - `verify`: Should we verify SSL certificates? Allows passing in a custom
+     *    certificate file as a string. (Using true uses the system-wide root
+     *    certificate store instead, but this may have different behaviour
+     *    across transports.)
+     *    (string|boolean, default: library/Requests/Transport/cacert.pem)
+     * - `verifyname`: Should we verify the common name in the SSL certificate?
+     *    (boolean: default, true)
+     * - `data_format`: How should we send the `$data` parameter?
+     *    (string, one of 'query' or 'body', default: 'query' for
+     *    HEAD/GET/DELETE, 'body' for POST/PUT/OPTIONS/PATCH)
+     *
+     * @throws Requests_Exception On invalid URLs (`nonhttp`)
+     *
+     * @param string $url URL to request
+     * @param array $headers Extra headers to send with the request
+     * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
+     * @param string $type HTTP request type (use Requests constants)
+     * @param array $options Options for the request (see description for more information)
+     * @return Requests_Response
+     */
+    public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
+        if (empty($options['type'])) {
+            $options['type'] = $type;
+        }
+        $options = array_merge(self::get_default_options(), $options);
+
+        self::set_defaults($url, $headers, $data, $type, $options);
+
+        $options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
+
+        if (!empty($options['transport'])) {
+            $transport = $options['transport'];
+
+            if (is_string($options['transport'])) {
+                $transport = new $transport();
+            }
+        }
+        else {
+            $need_ssl = (0 === stripos($url, 'https://'));
+            $capabilities = array('ssl' => $need_ssl);
+            $transport = self::get_transport($capabilities);
+        }
+        $response = $transport->request($url, $headers, $data, $options);
+
+        $options['hooks']->dispatch('requests.before_parse', array(&$response, $url, $headers, $data, $type, $options));
+
+        return self::parse_response($response, $url, $headers, $data, $options);
+    }
+
+    /**
+     * Send multiple HTTP requests simultaneously
+     *
+     * The `$requests` parameter takes an associative or indexed array of
+     * request fields. The key of each request can be used to match up the
+     * request with the returned data, or with the request passed into your
+     * `multiple.request.complete` callback.
+     *
+     * The request fields value is an associative array with the following keys:
+     *
+     * - `url`: Request URL Same as the `$url` parameter to
+     *    {@see Requests::request}
+     *    (string, required)
+     * - `headers`: Associative array of header fields. Same as the `$headers`
+     *    parameter to {@see Requests::request}
+     *    (array, default: `array()`)
+     * - `data`: Associative array of data fields or a string. Same as the
+     *    `$data` parameter to {@see Requests::request}
+     *    (array|string, default: `array()`)
+     * - `type`: HTTP request type (use Requests constants). Same as the `$type`
+     *    parameter to {@see Requests::request}
+     *    (string, default: `Requests::GET`)
+     * - `cookies`: Associative array of cookie name to value, or cookie jar.
+     *    (array|Requests_Cookie_Jar)
+     *
+     * If the `$options` parameter is specified, individual requests will
+     * inherit options from it. This can be used to use a single hooking system,
+     * or set all the types to `Requests::POST`, for example.
+     *
+     * In addition, the `$options` parameter takes the following global options:
+     *
+     * - `complete`: A callback for when a request is complete. Takes two
+     *    parameters, a Requests_Response/Requests_Exception reference, and the
+     *    ID from the request array (Note: this can also be overridden on a
+     *    per-request basis, although that's a little silly)
+     *    (callback)
+     *
+     * @param array $requests Requests data (see description for more information)
+     * @param array $options Global and default options (see {@see Requests::request})
+     * @return array Responses (either Requests_Response or a Requests_Exception object)
+     */
+    public static function request_multiple($requests, $options = array()) {
+        $options = array_merge(self::get_default_options(true), $options);
+
+        if (!empty($options['hooks'])) {
+            $options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
+            if (!empty($options['complete'])) {
+                $options['hooks']->register('multiple.request.complete', $options['complete']);
+            }
+        }
+
+        foreach ($requests as $id => &$request) {
+            if (!isset($request['headers'])) {
+                $request['headers'] = array();
+            }
+            if (!isset($request['data'])) {
+                $request['data'] = array();
+            }
+            if (!isset($request['type'])) {
+                $request['type'] = self::GET;
+            }
+            if (!isset($request['options'])) {
+                $request['options'] = $options;
+                $request['options']['type'] = $request['type'];
+            }
+            else {
+                if (empty($request['options']['type'])) {
+                    $request['options']['type'] = $request['type'];
+                }
+                $request['options'] = array_merge($options, $request['options']);
+            }
+
+            self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
+
+            // Ensure we only hook in once
+            if ($request['options']['hooks'] !== $options['hooks']) {
+                $request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
+                if (!empty($request['options']['complete'])) {
+                    $request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
+                }
+            }
+        }
+        unset($request);
+
+        if (!empty($options['transport'])) {
+            $transport = $options['transport'];
+
+            if (is_string($options['transport'])) {
+                $transport = new $transport();
+            }
+        }
+        else {
+            $transport = self::get_transport();
+        }
+        $responses = $transport->request_multiple($requests, $options);
+
+        foreach ($responses as $id => &$response) {
+            // If our hook got messed with somehow, ensure we end up with the
+            // correct response
+            if (is_string($response)) {
+                $request = $requests[$id];
+                self::parse_multiple($response, $request);
+                $request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
+            }
+        }
+
+        return $responses;
+    }
+
+    /**
+     * Get the default options
+     *
+     * @see Requests::request() for values returned by this method
+     * @param boolean $multirequest Is this a multirequest?
+     * @return array Default option values
+     */
+    protected static function get_default_options($multirequest = false) {
+        $defaults = array(
+            'timeout' => 10,
+            'connect_timeout' => 10,
+            'useragent' => 'php-requests/' . self::VERSION,
+            'protocol_version' => 1.1,
+            'redirected' => 0,
+            'redirects' => 10,
+            'follow_redirects' => true,
+            'blocking' => true,
+            'type' => self::GET,
+            'filename' => false,
+            'auth' => false,
+            'proxy' => false,
+            'cookies' => false,
+            'max_bytes' => false,
+            'idn' => true,
+            'hooks' => null,
+            'transport' => null,
+            'verify' => Requests::get_certificate_path(),
+            'verifyname' => true,
+        );
+        if ($multirequest !== false) {
+            $defaults['complete'] = null;
+        }
+        return $defaults;
+    }
+
+    /**
+     * Get default certificate path.
+     *
+     * @return string Default certificate path.
+     */
+    public static function get_certificate_path() {
+        if ( ! empty( Requests::$certificate_path ) ) {
+            return Requests::$certificate_path;
+        }
+
+        return dirname(__FILE__) . '/Requests/Transport/cacert.pem';
+    }
+
+    /**
+     * Set default certificate path.
+     *
+     * @param string $path Certificate path, pointing to a PEM file.
+     */
+    public static function set_certificate_path( $path ) {
+        Requests::$certificate_path = $path;
+    }
+
+    /**
+     * Set the default values
+     *
+     * @param string $url URL to request
+     * @param array $headers Extra headers to send with the request
+     * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
+     * @param string $type HTTP request type
+     * @param array $options Options for the request
+     * @return array $options
+     */
+    protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
+        if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+            throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
+        }
+
+        if (empty($options['hooks'])) {
+            $options['hooks'] = new Requests_Hooks();
+        }
+
+        if (is_array($options['auth'])) {
+            $options['auth'] = new Requests_Auth_Basic($options['auth']);
+        }
+        if ($options['auth'] !== false) {
+            $options['auth']->register($options['hooks']);
+        }
+
+        if (is_string($options['proxy']) || is_array($options['proxy'])) {
+            $options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
+        }
+        if ($options['proxy'] !== false) {
+            $options['proxy']->register($options['hooks']);
+        }
+
+        if (is_array($options['cookies'])) {
+            $options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
+        }
+        elseif (empty($options['cookies'])) {
+            $options['cookies'] = new Requests_Cookie_Jar();
+        }
+        if ($options['cookies'] !== false) {
+            $options['cookies']->register($options['hooks']);
+        }
+
+        if ($options['idn'] !== false) {
+            $iri = new Requests_IRI($url);
+            $iri->host = Requests_IDNAEncoder::encode($iri->ihost);
+            $url = $iri->uri;
+        }
+
+        // Massage the type to ensure we support it.
+        $type = strtoupper($type);
+
+        if (!isset($options['data_format'])) {
+            if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
+                $options['data_format'] = 'query';
+            }
+            else {
+                $options['data_format'] = 'body';
+            }
+        }
+    }
+
+    /**
+     * HTTP response parser
+     *
+     * @throws Requests_Exception On missing head/body separator (`requests.no_crlf_separator`)
+     * @throws Requests_Exception On missing head/body separator (`noversion`)
+     * @throws Requests_Exception On missing head/body separator (`toomanyredirects`)
+     *
+     * @param string $headers Full response text including headers and body
+     * @param string $url Original request URL
+     * @param array $req_headers Original $headers array passed to {@link request()}, in case we need to follow redirects
+     * @param array $req_data Original $data array passed to {@link request()}, in case we need to follow redirects
+     * @param array $options Original $options array passed to {@link request()}, in case we need to follow redirects
+     * @return Requests_Response
+     */
+    protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
+        $return = new Requests_Response();
+        if (!$options['blocking']) {
+            return $return;
+        }
+
+        $return->raw = $headers;
+        $return->url = $url;
+
+        if (!$options['filename']) {
+            if (($pos = strpos($headers, "\r\n\r\n")) === false) {
+                // Crap!
+                throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
+            }
+
+            $headers = substr($return->raw, 0, $pos);
+            $return->body = substr($return->raw, $pos + strlen("\n\r\n\r"));
+        }
+        else {
+            $return->body = '';
+        }
+        // Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
+        $headers = str_replace("\r\n", "\n", $headers);
+        // Unfold headers (replace [CRLF] 1*( SP | HT ) with SP) as per RFC 2616 (section 2.2)
+        $headers = preg_replace('/\n[ \t]/', ' ', $headers);
+        $headers = explode("\n", $headers);
+        preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
+        if (empty($matches)) {
+            throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
+        }
+        $return->protocol_version = (float) $matches[1];
+        $return->status_code = (int) $matches[2];
+        if ($return->status_code >= 200 && $return->status_code < 300) {
+            $return->success = true;
+        }
+
+        foreach ($headers as $header) {
+            list($key, $value) = explode(':', $header, 2);
+            $value = trim($value);
+            preg_replace('#(\s+)#i', ' ', $value);
+            $return->headers[$key] = $value;
+        }
+        if (isset($return->headers['transfer-encoding'])) {
+            $return->body = self::decode_chunked($return->body);
+            unset($return->headers['transfer-encoding']);
+        }
+        if (isset($return->headers['content-encoding'])) {
+            $return->body = self::decompress($return->body);
+        }
+
+        //fsockopen and cURL compatibility
+        if (isset($return->headers['connection'])) {
+            unset($return->headers['connection']);
+        }
+
+        $options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
+
+        if ($return->is_redirect() && $options['follow_redirects'] === true) {
+            if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
+                if ($return->status_code === 303) {
+                    $options['type'] = self::GET;
+                }
+                $options['redirected']++;
+                $location = $return->headers['location'];
+                if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
+                    // relative redirect, for compatibility make it absolute
+                    $location = Requests_IRI::absolutize($url, $location);
+                    $location = $location->uri;
+                }
+
+                $hook_args = array(
+                    &$location,
+                    &$req_headers,
+                    &$req_data,
+                    &$options,
+                    $return
+                );
+                $options['hooks']->dispatch('requests.before_redirect', $hook_args);
+                $redirected = self::request($location, $req_headers, $req_data, $options['type'], $options);
+                $redirected->history[] = $return;
+                return $redirected;
+            }
+            elseif ($options['redirected'] >= $options['redirects']) {
+                throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
+            }
+        }
+
+        $return->redirects = $options['redirected'];
+
+        $options['hooks']->dispatch('requests.after_request', array(&$return, $req_headers, $req_data, $options));
+        return $return;
+    }
+
+    /**
+     * Callback for `transport.internal.parse_response`
+     *
+     * Internal use only. Converts a raw HTTP response to a Requests_Response
+     * while still executing a multiple request.
+     *
+     * @param string $response Full response text including headers and body (will be overwritten with Response instance)
+     * @param array $request Request data as passed into {@see Requests::request_multiple()}
+     * @return null `$response` is either set to a Requests_Response instance, or a Requests_Exception object
+     */
+    public static function parse_multiple(&$response, $request) {
+        try {
+            $url = $request['url'];
+            $headers = $request['headers'];
+            $data = $request['data'];
+            $options = $request['options'];
+            $response = self::parse_response($response, $url, $headers, $data, $options);
+        }
+        catch (Requests_Exception $e) {
+            $response = $e;
+        }
+    }
+
+    /**
+     * Decoded a chunked body as per RFC 2616
+     *
+     * @see https://tools.ietf.org/html/rfc2616#section-3.6.1
+     * @param string $data Chunked body
+     * @return string Decoded body
+     */
+    protected static function decode_chunked($data) {
+        if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+            return $data;
+        }
+
+
+
+        $decoded = '';
+        $encoded = $data;
+
+        while (true) {
+            $is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
+            if (!$is_chunked) {
+                // Looks like it's not chunked after all
+                return $data;
+            }
+
+            $length = hexdec(trim($matches[1]));
+            if ($length === 0) {
+                // Ignore trailer headers
+                return $decoded;
+            }
+
+            $chunk_length = strlen($matches[0]);
+            $decoded .= substr($encoded, $chunk_length, $length);
+            $encoded = substr($encoded, $chunk_length + $length + 2);
+
+            if (trim($encoded) === '0' || empty($encoded)) {
+                return $decoded;
+            }
+        }
+
+        // We'll never actually get down here
+        // @codeCoverageIgnoreStart
+    }
+    // @codeCoverageIgnoreEnd
+
+    /**
+     * Convert a key => value array to a 'key: value' array for headers
+     *
+     * @param array $array Dictionary of header values
+     * @return array List of headers
+     */
+    public static function flatten($array) {
+        $return = array();
+        foreach ($array as $key => $value) {
+            $return[] = sprintf('%s: %s', $key, $value);
+        }
+        return $return;
+    }
+
+    /**
+     * Convert a key => value array to a 'key: value' array for headers
+     *
+     * @codeCoverageIgnore
+     * @deprecated Misspelling of {@see Requests::flatten}
+     * @param array $array Dictionary of header values
+     * @return array List of headers
+     */
+    public static function flattern($array) {
+        return self::flatten($array);
+    }
+
+    /**
+     * Decompress an encoded body
+     *
+     * Implements gzip, compress and deflate. Guesses which it is by attempting
+     * to decode.
+     *
+     * @param string $data Compressed data in one of the above formats
+     * @return string Decompressed string
+     */
+    public static function decompress($data) {
+        if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
+            // Not actually compressed. Probably cURL ruining this for us.
+            return $data;
+        }
+
+        if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
+            return $decoded;
+        }
+        elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+            return $decoded;
+        }
+        elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+            return $decoded;
+        }
+        elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+            return $decoded;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Decompression of deflated string while staying compatible with the majority of servers.
+     *
+     * Certain Servers will return deflated data with headers which PHP's gzinflate()
+     * function cannot handle out of the box. The following function has been created from
+     * various snippets on the gzinflate() PHP documentation.
+     *
+     * Warning: Magic numbers within. Due to the potential different formats that the compressed
+     * data may be returned in, some "magic offsets" are needed to ensure proper decompression
+     * takes place. For a simple progmatic way to determine the magic offset in use, see:
+     * https://core.trac.wordpress.org/ticket/18273
+     *
+     * @since 2.8.1
+     * @link https://core.trac.wordpress.org/ticket/18273
+     * @link https://secure.php.net/manual/en/function.gzinflate.php#70875
+     * @link https://secure.php.net/manual/en/function.gzinflate.php#77336
+     *
+     * @param string $gzData String to decompress.
+     * @return string|bool False on failure.
+     */
+    public static function compatible_gzinflate($gzData) {
+        // Compressed data might contain a full zlib header, if so strip it for
+        // gzinflate()
+        if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
+            $i = 10;
+            $flg = ord(substr($gzData, 3, 1));
+            if ($flg > 0) {
+                if ($flg & 4) {
+                    list($xlen) = unpack('v', substr($gzData, $i, 2));
+                    $i = $i + 2 + $xlen;
+                }
+                if ($flg & 8) {
+                    $i = strpos($gzData, "\0", $i) + 1;
+                }
+                if ($flg & 16) {
+                    $i = strpos($gzData, "\0", $i) + 1;
+                }
+                if ($flg & 2) {
+                    $i = $i + 2;
+                }
+            }
+            $decompressed = self::compatible_gzinflate(substr($gzData, $i));
+            if (false !== $decompressed) {
+                return $decompressed;
+            }
+        }
+
+        // If the data is Huffman Encoded, we must first strip the leading 2
+        // byte Huffman marker for gzinflate()
+        // The response is Huffman coded by many compressors such as
+        // java.util.zip.Deflater, Ruby’s Zlib::Deflate, and .NET's
+        // System.IO.Compression.DeflateStream.
+        //
+        // See https://decompres.blogspot.com/ for a quick explanation of this
+        // data type
+        $huffman_encoded = false;
+
+        // low nibble of first byte should be 0x08
+        list(, $first_nibble)    = unpack('h', $gzData);
+
+        // First 2 bytes should be divisible by 0x1F
+        list(, $first_two_bytes) = unpack('n', $gzData);
+
+        if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
+            $huffman_encoded = true;
+        }
+
+        if ($huffman_encoded) {
+            if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+                return $decompressed;
+            }
+        }
+
+        if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
+            // ZIP file format header
+            // Offset 6: 2 bytes, General-purpose field
+            // Offset 26: 2 bytes, filename length
+            // Offset 28: 2 bytes, optional field length
+            // Offset 30: Filename field, followed by optional field, followed
+            // immediately by data
+            list(, $general_purpose_flag) = unpack('v', substr($gzData, 6, 2));
+
+            // If the file has been compressed on the fly, 0x08 bit is set of
+            // the general purpose field. We can use this to differentiate
+            // between a compressed document, and a ZIP file
+            $zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
+
+            if (!$zip_compressed_on_the_fly) {
+                // Don't attempt to decode a compressed zip file
+                return $gzData;
+            }
+
+            // Determine the first byte of data, based on the above ZIP header
+            // offsets:
+            $first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
+            if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
+                return $decompressed;
+            }
+            return false;
+        }
+
+        // Finally fall back to straight gzinflate
+        if (false !== ($decompressed = @gzinflate($gzData))) {
+            return $decompressed;
+        }
+
+        // Fallback for all above failing, not expected, but included for
+        // debugging and preventing regressions and to track stats
+        if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+            return $decompressed;
+        }
+
+        return false;
+    }
+
+    public static function match_domain($host, $reference) {
+        // Check for a direct match
+        if ($host === $reference) {
+            return true;
+        }
+
+        // Calculate the valid wildcard match if the host is not an IP address
+        // Also validates that the host has 3 parts or more, as per Firefox's
+        // ruleset.
+        $parts = explode('.', $host);
+        if (ip2long($host) === false && count($parts) >= 3) {
+            $parts[0] = '*';
+            $wildcard = implode('.', $parts);
+            if ($wildcard === $reference) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

plugin/buycourses/src/Culqi/Planes.php

Indentation +2 added lines, -2 removed lines

@@ -27,9 +27,9 @@
     public function delete($id)
     {
 
-       return $this->request("DELETE", Planes::URL_PLANES . $id . "/", $api_key = $this->culqi->api_key);
+        return $this->request("DELETE", Planes::URL_PLANES . $id . "/", $api_key = $this->culqi->api_key);
 
-   }
+    }
 
 
 

plugin/buycourses/src/Culqi/AuthBearer.php

Indentation +10 added lines, -10 removed lines

@@ -4,17 +4,17 @@
 
 class AuthBearer implements \Requests_Auth
 {
-	protected $password;
+    protected $password;
 
-	public function __construct($password) {
-		$this->password = $password;
-	}
+    public function __construct($password) {
+        $this->password = $password;
+    }
 
-	public function register(\Requests_Hooks &$hooks) {
-		$hooks->register('requests.before_request', array(&$this, 'before_request'));
-	}
+    public function register(\Requests_Hooks &$hooks) {
+        $hooks->register('requests.before_request', array(&$this, 'before_request'));
+    }
 
-	public function before_request(&$url, &$headers, &$data, &$type, &$options) {
-		$headers['Authorization: Bearer'] = $this->password;
-	}
+    public function before_request(&$url, &$headers, &$data, &$type, &$options) {
+        $headers['Authorization: Bearer'] = $this->password;
+    }
 }