enmi-conf.org: comparison wp/wp-includes/SimplePie/Enclosure.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
 */
 	{
 		if ($this->bitrate !== null)
 		{
 			return $this->bitrate;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single caption
 	 *
 		$captions = $this->get_captions();
 		if (isset($captions[$key]))
 		{
 			return $captions[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all captions
 	 *
 	{
 		if ($this->captions !== null)
 		{
 			return $this->captions;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single category
 	 *
 		$categories = $this->get_categories();
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all categories
 	 *
 	{
 		if ($this->categories !== null)
 		{
 			return $this->categories;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the number of audio channels
 	 *
 	{
 		if ($this->channels !== null)
 		{
 			return $this->channels;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the copyright information
 	 *
 	{
 		if ($this->copyright !== null)
 		{
 			return $this->copyright;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single credit
 	 *
 		$credits = $this->get_credits();
 		if (isset($credits[$key]))
 		{
 			return $credits[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all credits
 	 *
 	{
 		if ($this->credits !== null)
 		{
 			return $this->credits;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the description of the enclosure
 	 *
 	{
 		if ($this->description !== null)
 		{
 			return $this->description;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the duration of the enclosure
 	 *
-	 * @param string $convert Convert seconds into hh:mm:ss
+	 * @param bool $convert Convert seconds into hh:mm:ss
 	 * @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found)
 	 */
 	public function get_duration($convert = false)
 	{
 		if ($this->duration !== null)
 			if ($convert)
 			{
 				$time = SimplePie_Misc::time_hms($this->duration);
 				return $time;
 			}
-			else
-			{
+			return $this->duration;
-				return $this->duration;
+		}
-			}
-		}
+		return null;
-		else
-		{
-			return null;
-		}
 	}
 	/**
 	 * Get the expression
 	 *
 	{
 		if ($this->expression !== null)
 		{
 			return $this->expression;
 		}
-		else
-		{
+		return 'full';
-			return 'full';
-		}
 	}
 	/**
 	 * Get the file extension
 	 *
 	{
 		if ($this->framerate !== null)
 		{
 			return $this->framerate;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the preferred handler
 	 *
 		$hashes = $this->get_hashes();
 		if (isset($hashes[$key]))
 		{
 			return $hashes[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all credits
 	 *
 	{
 		if ($this->hashes !== null)
 		{
 			return $this->hashes;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the height
 	 *
 	{
 		if ($this->height !== null)
 		{
 			return $this->height;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the language
 	 *
 	{
 		if ($this->lang !== null)
 		{
 			return $this->lang;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single keyword
 	 *
 		$keywords = $this->get_keywords();
 		if (isset($keywords[$key]))
 		{
 			return $keywords[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all keywords
 	 *
 	{
 		if ($this->keywords !== null)
 		{
 			return $this->keywords;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get length
 	 *
 	{
 		if ($this->length !== null)
 		{
 			return $this->length;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the URL
 	 *
 	{
 		if ($this->link !== null)
 		{
 			return urldecode($this->link);
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the medium
 	 *
 	{
 		if ($this->medium !== null)
 		{
 			return $this->medium;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the player URL
 	 *
 	{
 		if ($this->player !== null)
 		{
 			return $this->player;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single rating
 	 *
 		$ratings = $this->get_ratings();
 		if (isset($ratings[$key]))
 		{
 			return $ratings[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all ratings
 	 *
 	{
 		if ($this->ratings !== null)
 		{
 			return $this->ratings;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single restriction
 	 *
 		$restrictions = $this->get_restrictions();
 		if (isset($restrictions[$key]))
 		{
 			return $restrictions[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all restrictions
 	 *
 	{
 		if ($this->restrictions !== null)
 		{
 			return $this->restrictions;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the sampling rate (in kHz)
 	 *
 	{
 		if ($this->samplingrate !== null)
 		{
 			return $this->samplingrate;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the file size (in MiB)
 	 *
 		$length = $this->get_length();
 		if ($length !== null)
 		{
 			return round($length/1048576, 2);
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get a single thumbnail
 	 *
 		$thumbnails = $this->get_thumbnails();
 		if (isset($thumbnails[$key]))
 		{
 			return $thumbnails[$key];
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get all thumbnails
 	 *
 	{
 		if ($this->thumbnails !== null)
 		{
 			return $this->thumbnails;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the title
 	 *
 	{
 		if ($this->title !== null)
 		{
 			return $this->title;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get mimetype of the enclosure
 	 *
 	{
 		if ($this->type !== null)
 		{
 			return $this->type;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Get the width
 	 *
 	{
 		if ($this->width !== null)
 		{
 			return $this->width;
 		}
-		else
-		{
+		return null;
-			return null;
-		}
 	}
 	/**
 	 * Embed the enclosure using `<embed>`
 	 *
 	 * - `bgcolor` (string): The background color for the media, if not
 	 *    already transparent. Defaults to `#ffffff`.
 	 * - `height` (integer): The height of the embedded media. Accepts any
 	 *    numeric pixel value (such as `360`) or `auto`. Defaults to `auto`,
 	 *    and it is recommended that you use this default.
-	 * - `loop` (boolean): Do you want the media to loop when its done?
+	 * - `loop` (boolean): Do you want the media to loop when it's done?
 	 *    Defaults to `false`.
 	 * - `mediaplayer` (string): The location of the included
 	 *    `mediaplayer.swf` file. This allows for the playback of Flash Video
 	 *    (`.flv`) files, and is the default handler for non-Odeo MP3's.
 	 *    Defaults to blank.
 			}
 			elseif (in_array($type, $types_mp3))
 			{
 				return 'mp3';
 			}
-			else
-			{
+			return null;
-				return null;
+		}
-			}
-		}
+		return $type;
-		else
-		{
-			return $type;
-		}
 	}
 }

changeset 16	a86126ab1dd4
parent 0	d970ebf37754
child 19	3d72ae0968f4