enmi-conf.org: comparison wp/wp-includes/SimplePie/IRI.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 * SimplePie
 *
 * A PHP-Based RSS and Atom Feed Framework.
 * Takes the hard work out of managing a complete RSS/Atom solution.
 *
-* Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+* Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:
 *
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 * @package SimplePie
-* @version 1.3.1
+* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
-* @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
 * @author Ryan Parman
-* @author Geoffrey Sneddon
+* @author Sam Sneddon
 * @author Ryan McCue
 * @link http://simplepie.org/ SimplePie
 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
 */
 /**
 * IRI parser/serialiser/normaliser
 *
 * @package SimplePie
 * @subpackage HTTP
-* @author Geoffrey Sneddon
+* @author Sam Sneddon
 * @author Steve Minutillo
 * @author Ryan McCue
-* @copyright 2007-2012 Geoffrey Sneddon, Steve Minutillo, Ryan McCue
+* @copyright 2007-2012 Sam Sneddon, Steve Minutillo, Ryan McCue
 * @license http://www.opensource.org/licenses/bsd-license.php
 */
 class SimplePie_IRI
 {
 	/**
 		if ($return === null && isset($this->normalization[$this->scheme][$name]))
 		{
 			return $this->normalization[$this->scheme][$name];
 		}
-		else
-		{
+		return $return;
-			return $return;
-		}
 	}
 	/**
 	 * Overload __isset() to provide access via properties
 	 *
 	 * @param string $name Property name
 	 * @return bool
 	 */
 	public function __isset($name)
 	{
-		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		return method_exists($this, 'get_' . $name) || isset($this->$name);
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
 	}
 	/**
 	 * Overload __unset() to provide access via properties
 	 *
 	 * @param string $iri
 	 */
 	public function __construct($iri = null)
 	{
 		$this->set_iri($iri);
+	}
+	/**
+	 * Clean up
+	 */
+	public function __destruct() {
+	    $this->set_iri(null, true);
+	    $this->set_path(null, true);
+	    $this->set_authority(null, true);
 	}
 	/**
 	 * Create a new IRI object by resolving a relative IRI
 	 *
 					$target->ifragment = null;
 				}
 				$target->scheme_normalization();
 				return $target;
 			}
-			else
-			{
+			return false;
-				return false;
-			}
 		}
 	}
 	/**
 	 * Parse an IRI into scheme/authority/path/query/fragment segments
 			{
 				$match['fragment'] = null;
 			}
 			return $match;
 		}
-		else
-		{
+		// This can occur when a paragraph is accidentally parsed as a URI
-			// This can occur when a paragraph is accidentally parsed as a URI
+		return false;
-			return false;
-		}
 	}
 	/**
 	 * Remove dot segments from a path
 	 *
 	 *
 	 * @return bool
 	 */
 	public function is_valid()
 	{
-		$isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
+		if ($this->ipath === '') return true;
-		if ($this->ipath !== '' &&
-			(
+		$isauthority = $this->iuserinfo !== null || $this->ihost !== null ||
-				$isauthority && (
+			$this->port !== null;
-					$this->ipath[0] !== '/' ||
+		if ($isauthority && $this->ipath[0] === '/') return true;
-					substr($this->ipath, 0, 2) === '//'
-				) ||
+		if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) return false;
-				(
-					$this->scheme === null &&
+		// Relative urls cannot have a colon in the first path segment (and the
-					!$isauthority &&
+		// slashes themselves are not included so skip the first character).
-					strpos($this->ipath, ':') !== false &&
+		if (!$this->scheme && !$isauthority &&
-					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
+		    strpos($this->ipath, ':') !== false &&
-				)
+		    strpos($this->ipath, '/', 1) !== false &&
-			)
+		    strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;
-		)
-		{
-			return false;
-		}
 		return true;
 	}
 	/**
 	 * are any invalid characters).
 	 *
 	 * @param string $iri
 	 * @return bool
 	 */
-	public function set_iri($iri)
+	public function set_iri($iri, $clear_cache = false)
 	{
 		static $cache;
+		if ($clear_cache)
+		{
+			$cache = null;
+			return;
+		}
 		if (!$cache)
 		{
 			$cache = array();
 		}
 				 $this->iquery,
 				 $this->ifragment,
 				 $return) = $cache[$iri];
 			return $return;
 		}
-		else
-		{
+		$parsed = $this->parse_iri((string) $iri);
-			$parsed = $this->parse_iri((string) $iri);
+		if (!$parsed)
-			if (!$parsed)
+		{
-			{
+			return false;
-				return false;
+		}
-			}
+		$return = $this->set_scheme($parsed['scheme'])
-			$return = $this->set_scheme($parsed['scheme'])
+			&& $this->set_authority($parsed['authority'])
-				&& $this->set_authority($parsed['authority'])
+			&& $this->set_path($parsed['path'])
-				&& $this->set_path($parsed['path'])
+			&& $this->set_query($parsed['query'])
-				&& $this->set_query($parsed['query'])
+			&& $this->set_fragment($parsed['fragment']);
-				&& $this->set_fragment($parsed['fragment']);
+		$cache[$iri] = array($this->scheme,
-			$cache[$iri] = array($this->scheme,
+							 $this->iuserinfo,
-								 $this->iuserinfo,
+							 $this->ihost,
-								 $this->ihost,
+							 $this->port,
-								 $this->port,
+							 $this->ipath,
-								 $this->ipath,
+							 $this->iquery,
-								 $this->iquery,
+							 $this->ifragment,
-								 $this->ifragment,
+							 $return);
-								 $return);
+		return $return;
-			return $return;
-		}
 	}
 	/**
 	 * Set the scheme. Returns true on success, false on failure (if there are
 	 * any invalid characters).
 	 * any invalid characters).
 	 *
 	 * @param string $authority
 	 * @return bool
 	 */
-	public function set_authority($authority)
+	public function set_authority($authority, $clear_cache = false)
 	{
 		static $cache;
+		if ($clear_cache)
+		{
+			$cache = null;
+			return;
+		}
 		if (!$cache)
 			$cache = array();
 		if ($authority === null)
 		{
 				 $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
 		{
-			$remaining = $authority;
+			$iuserinfo = null;
-			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
+		}
-			{
+		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)
-				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
+		{
-				$remaining = substr($remaining, $iuserinfo_end + 1);
+			if (($port = substr($remaining, $port_start + 1)) === false)
-			}
-			else
-			{
-				$iuserinfo = null;
-			}
-			if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)
-			{
-				if (($port = substr($remaining, $port_start + 1)) === false)
-				{
-					$port = null;
-				}
-				$remaining = substr($remaining, 0, $port_start);
-			}
-			else
 			{
 				$port = null;
 			}
+			$remaining = substr($remaining, 0, $port_start);
-			$return = $this->set_userinfo($iuserinfo) &&
+		}
-					  $this->set_host($remaining) &&
+		else
-					  $this->set_port($port);
+		{
+			$port = null;
-			$cache[$authority] = array($this->iuserinfo,
+		}
-									   $this->ihost,
-									   $this->port,
+		$return = $this->set_userinfo($iuserinfo) &&
-									   $return);
+				  $this->set_host($remaining) &&
+				  $this->set_port($port);
-			return $return;
-		}
+		$cache[$authority] = array($this->iuserinfo,
+								   $this->ihost,
+								   $this->port,
+								   $return);
+		return $return;
 	}
 	/**
 	 * Set the iuserinfo.
 	 *
 		{
 			$this->port = (int) $port;
 			$this->scheme_normalization();
 			return true;
 		}
-		else
-		{
+		$this->port = null;
-			$this->port = null;
+		return false;
-			return false;
-		}
 	}
 	/**
 	 * Set the ipath.
 	 *
 	 * @param string $ipath
 	 * @return bool
 	 */
-	public function set_path($ipath)
+	public function set_path($ipath, $clear_cache = false)
 	{
 		static $cache;
+		if ($clear_cache)
+		{
+			$cache = null;
+			return;
+		}
 		if (!$cache)
 		{
 			$cache = array();
 		}
 		}
 		if ($this->ipath !== '')
 		{
 			$iri .= $this->ipath;
 		}
-		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
 		{
 			$iri .= $this->normalization[$this->scheme]['ipath'];
 		}
 		if ($this->iquery !== null)
 		{
 			}
 			if ($this->ihost !== null)
 			{
 				$iauthority .= $this->ihost;
 			}
-			if ($this->port !== null)
+if ($this->port !== null && $this->port !== 0)
 			{
 				$iauthority .= ':' . $this->port;
 			}
 			return $iauthority;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the complete authority
 	 *
 	protected function get_authority()
 	{
 		$iauthority = $this->get_iauthority();
 		if (is_string($iauthority))
 			return $this->to_uri($iauthority);
-		else
-			return $iauthority;
+		return $iauthority;
 	}
 }

changeset 16	a86126ab1dd4
parent 0	d970ebf37754