ntwb / wordpress

src/wp-includes/SimplePie/Copyright.php

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 		if ($this->url !== null)
 		{
 			return $this->url;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -120,8 +119,7 @@ 
 		if ($this->label !== null)
 		{
 			return $this->label;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/File.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * 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
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * 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-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * 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
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * 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-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Used for fetching remote files and reading local files

Spacing +12 added lines, -12 removed lines

@@ -82,11 +82,11 @@ 
 				$useragent = ini_get('user_agent');
 				$this->useragent = $useragent;
 			}
-			if (!is_array($headers))
+			if ( ! is_array($headers))
 			{
 				$headers = array();
 			}
-			if (!$force_fsockopen && function_exists('curl_exec'))
+			if ( ! $force_fsockopen && function_exists('curl_exec'))
 			{
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
 				$fp = curl_init();
@@ -107,7 +107,7 @@ 
 				curl_setopt($fp, CURLOPT_REFERER, $url);
 				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
 				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
-				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
+				if ( ! ini_get('open_basedir') && ! ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
 				{
 					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
 					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
@@ -121,7 +121,7 @@ 
 				}
 				if (curl_errno($fp))
 				{
-					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+					$this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp);
 					$this->success = false;
 				}
 				else
@@ -155,14 +155,14 @@ 
 					$socket_host = "ssl://$url_parts[host]";
 					$url_parts['port'] = 443;
 				}
-				if (!isset($url_parts['port']))
+				if ( ! isset($url_parts['port']))
 				{
 					$url_parts['port'] = 80;
 				}
 				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
-				if (!$fp)
+				if ( ! $fp)
 				{
-					$this->error = 'fsockopen error: ' . $errstr;
+					$this->error = 'fsockopen error: '.$errstr;
 					$this->success = false;
 				}
 				else
@@ -193,7 +193,7 @@ 
 
 					if (isset($url_parts['user']) && isset($url_parts['pass']))
 					{
-						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+						$out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n";
 					}
 					foreach ($headers as $key => $value)
 					{
@@ -205,12 +205,12 @@ 
 					$info = stream_get_meta_data($fp);
 
 					$this->headers = '';
-					while (!$info['eof'] && !$info['timed_out'])
+					while ( ! $info['eof'] && ! $info['timed_out'])
 					{
 						$this->headers .= fread($fp, 1160);
 						$info = stream_get_meta_data($fp);
 					}
-					if (!$info['timed_out'])
+					if ( ! $info['timed_out'])
 					{
 						$parser = new SimplePie_HTTP_Parser($this->headers);
 						if ($parser->parse())
@@ -232,7 +232,7 @@ 
 									case 'gzip':
 									case 'x-gzip':
 										$decoder = new SimplePie_gzdecode($this->body);
-										if (!$decoder->parse())
+										if ( ! $decoder->parse())
 										{
 											$this->error = 'Unable to decode HTTP "gzip" stream';
 											$this->success = false;
@@ -282,7 +282,7 @@ 
 		else
 		{
 			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
-			if (!$this->body = file_get_contents($url))
+			if ( ! $this->body = file_get_contents($url))
 			{
 				$this->error = 'file_get_contents could not read the file';
 				$this->success = false;

Braces +11 added lines, -22 removed lines

@@ -123,8 +123,7 @@ 
 				{
 					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
 					$this->success = false;
-				}
-				else
+				} else
 				{
 					$info = curl_getinfo($fp);
 					curl_close($fp);
@@ -144,8 +143,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
@@ -164,8 +162,7 @@ 
 				{
 					$this->error = 'fsockopen error: ' . $errstr;
 					$this->success = false;
-				}
-				else
+				} else
 				{
 					stream_set_timeout($fp, $timeout);
 					if (isset($url_parts['path']))
@@ -173,13 +170,11 @@ 
 						if (isset($url_parts['query']))
 						{
 							$get = "$url_parts[path]?$url_parts[query]";
-						}
-						else
+						} else
 						{
 							$get = $url_parts['path'];
 						}
-					}
-					else
+					} else
 					{
 						$get = '/';
 					}
@@ -236,8 +231,7 @@ 
 										{
 											$this->error = 'Unable to decode HTTP "gzip" stream';
 											$this->success = false;
-										}
-										else
+										} else
 										{
 											$this->body = $decoder->data;
 										}
@@ -247,16 +241,13 @@ 
 										if (($decompressed = gzinflate($this->body)) !== false)
 										{
 											$this->body = $decompressed;
-										}
-										else if (($decompressed = gzuncompress($this->body)) !== false)
+										} else if (($decompressed = gzuncompress($this->body)) !== false)
 										{
 											$this->body = $decompressed;
-										}
-										else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
+										} else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
 										{
 											$this->body = $decompressed;
-										}
-										else
+										} else
 										{
 											$this->error = 'Unable to decode HTTP "deflate" stream';
 											$this->success = false;
@@ -269,8 +260,7 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						$this->error = 'fsocket timed out';
 						$this->success = false;
@@ -278,8 +268,7 @@ 
 					fclose($fp);
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
 			if (!$this->body = file_get_contents($url))

src/wp-includes/SimplePie/Credit.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * 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
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * 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-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * 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
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * 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-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * Handles `<media:credit>` as defined in Media RSS

Braces +3 added lines, -6 removed lines

@@ -112,8 +112,7 @@ 
 		if ($this->role !== null)
 		{
 			return $this->role;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -129,8 +128,7 @@ 
 		if ($this->scheme !== null)
 		{
 			return $this->scheme;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -146,8 +144,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Rating.php

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 		if ($this->scheme !== null)
 		{
 			return $this->scheme;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -120,8 +119,7 @@ 
 		if ($this->value !== null)
 		{
 			return $this->value;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Exception.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * 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
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * 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.4-dev
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * 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
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * 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.4-dev
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 /**
  * General SimplePie exception class

src/wp-includes/SimplePie/Caption.php

Braces +5 added lines, -10 removed lines

@@ -131,8 +131,7 @@ 
 		if ($this->endTime !== null)
 		{
 			return $this->endTime;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -149,8 +148,7 @@ 
 		if ($this->lang !== null)
 		{
 			return $this->lang;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -166,8 +164,7 @@ 
 		if ($this->startTime !== null)
 		{
 			return $this->startTime;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -183,8 +180,7 @@ 
 		if ($this->text !== null)
 		{
 			return $this->text;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -200,8 +196,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/gzdecode.php

Braces +7 added lines, -14 removed lines

@@ -261,8 +261,7 @@ 
 					// Set the extra field to the given data
 					$this->extra_field = substr($this->compressed_data, $this->position, $len);
 					$this->position += $len;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -281,8 +280,7 @@ 
 					// Set the original filename to the given string
 					$this->filename = substr($this->compressed_data, $this->position, $len);
 					$this->position += $len + 1;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -301,8 +299,7 @@ 
 					// Set the original comment to the given string
 					$this->comment = substr($this->compressed_data, $this->position, $len);
 					$this->position += $len + 1;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -322,13 +319,11 @@ 
 					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
 					{
 						$this->position += 2;
-					}
-					else
+					} else
 					{
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -338,8 +333,7 @@ 
 			if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
 			{
 				return false;
-			}
-			else
+			} else
 			{
 				$this->position = $this->compressed_size - 8;
 			}
@@ -362,8 +356,7 @@ 
 
 			// Wow, against all odds, we've actually got a valid gzip string
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

src/wp-includes/SimplePie/Content/Type/Sniffer.php

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * 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
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * 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-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * 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
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * 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-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	{
 		if (isset($this->file->headers['content-type']))
 		{
-			if (!isset($this->file->headers['content-encoding'])
+			if ( ! isset($this->file->headers['content-encoding'])
 				&& ($this->file->headers['content-type'] === 'text/plain'
 					|| $this->file->headers['content-type'] === 'text/plain; charset=ISO-8859-1'
 					|| $this->file->headers['content-type'] === 'text/plain; charset=iso-8859-1'

Braces +30 added lines, -60 removed lines

@@ -97,8 +97,7 @@ 
 			if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
 			{
 				$official = substr($this->file->headers['content-type'], 0, $pos);
-			}
-			else
+			} else
 			{
 				$official = $this->file->headers['content-type'];
 			}
@@ -108,34 +107,28 @@ 
 				|| $official === 'application/unknown')
 			{
 				return $this->unknown();
-			}
-			elseif (substr($official, -4) === '+xml'
+			} elseif (substr($official, -4) === '+xml'
 				|| $official === 'text/xml'
 				|| $official === 'application/xml')
 			{
 				return $official;
-			}
-			elseif (substr($official, 0, 6) === 'image/')
+			} elseif (substr($official, 0, 6) === 'image/')
 			{
 				if ($return = $this->image())
 				{
 					return $return;
-				}
-				else
+				} else
 				{
 					return $official;
 				}
-			}
-			elseif ($official === 'text/html')
+			} elseif ($official === 'text/html')
 			{
 				return $this->feed_or_html();
-			}
-			else
+			} else
 			{
 				return $official;
 			}
-		}
-		else
+		} else
 		{
 			return $this->unknown();
 		}
@@ -154,12 +147,10 @@ 
 			|| substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
 		{
 			return 'text/plain';
-		}
-		elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
+		} elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
 		{
 			return 'application/octect-stream';
-		}
-		else
+		} else
 		{
 			return 'text/plain';
 		}
@@ -178,37 +169,29 @@ 
 			|| strtolower(substr($this->file->body, $ws, 7)) === '<script')
 		{
 			return 'text/html';
-		}
-		elseif (substr($this->file->body, 0, 5) === '%PDF-')
+		} elseif (substr($this->file->body, 0, 5) === '%PDF-')
 		{
 			return 'application/pdf';
-		}
-		elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
+		} elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
 		{
 			return 'application/postscript';
-		}
-		elseif (substr($this->file->body, 0, 6) === 'GIF87a'
+		} elseif (substr($this->file->body, 0, 6) === 'GIF87a'
 			|| substr($this->file->body, 0, 6) === 'GIF89a')
 		{
 			return 'image/gif';
-		}
-		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		} elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
 		{
 			return 'image/png';
-		}
-		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		} elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
 		{
 			return 'image/jpeg';
-		}
-		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		} elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
 		{
 			return 'image/bmp';
-		}
-		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		} elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
 		{
 			return 'image/vnd.microsoft.icon';
-		}
-		else
+		} else
 		{
 			return $this->text_or_binary();
 		}
@@ -225,24 +208,19 @@ 
 			|| substr($this->file->body, 0, 6) === 'GIF89a')
 		{
 			return 'image/gif';
-		}
-		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		} elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
 		{
 			return 'image/png';
-		}
-		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		} elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
 		{
 			return 'image/jpeg';
-		}
-		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		} elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
 		{
 			return 'image/bmp';
-		}
-		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		} elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
 		{
 			return 'image/vnd.microsoft.icon';
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -283,44 +261,36 @@ 
 				if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
 				{
 					$pos += 3;
-				}
-				else
+				} else
 				{
 					return 'text/html';
 				}
-			}
-			elseif (substr($this->file->body, $pos, 1) === '!')
+			} elseif (substr($this->file->body, $pos, 1) === '!')
 			{
 				if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
 				{
 					$pos++;
-				}
-				else
+				} else
 				{
 					return 'text/html';
 				}
-			}
-			elseif (substr($this->file->body, $pos, 1) === '?')
+			} elseif (substr($this->file->body, $pos, 1) === '?')
 			{
 				if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
 				{
 					$pos += 2;
-				}
-				else
+				} else
 				{
 					return 'text/html';
 				}
-			}
-			elseif (substr($this->file->body, $pos, 3) === 'rss'
+			} elseif (substr($this->file->body, $pos, 3) === 'rss'
 				|| substr($this->file->body, $pos, 7) === 'rdf:RDF')
 			{
 				return 'application/rss+xml';
-			}
-			elseif (substr($this->file->body, $pos, 4) === 'feed')
+			} elseif (substr($this->file->body, $pos, 4) === 'feed')
 			{
 				return 'application/atom+xml';
-			}
-			else
+			} else
 			{
 				return 'text/html';
 			}

src/wp-includes/SimplePie/XML/Declaration/Parser.php

Braces +14 added lines, -28 removed lines

@@ -136,8 +136,7 @@ 
 		if ($this->state === 'emit')
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			$this->version = '';
 			$this->encoding = '';
@@ -194,8 +193,7 @@ 
 		if ($this->skip_whitespace())
 		{
 			$this->state = 'version_name';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -208,8 +206,7 @@ 
 			$this->position += 7;
 			$this->skip_whitespace();
 			$this->state = 'version_equals';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -222,8 +219,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'version_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -237,13 +233,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = 'encoding_name';
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -256,8 +250,7 @@ 
 			$this->position += 8;
 			$this->skip_whitespace();
 			$this->state = 'encoding_equals';
-		}
-		else
+		} else
 		{
 			$this->state = 'standalone_name';
 		}
@@ -270,8 +263,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'encoding_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -285,13 +277,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = 'standalone_name';
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -304,8 +294,7 @@ 
 			$this->position += 10;
 			$this->skip_whitespace();
 			$this->state = 'standalone_equals';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -318,8 +307,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'standalone_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -348,13 +336,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = false;
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}