From fbe855abb678a9ed13754eefa66f8034754f79ae Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 27 Jan 2016 10:34:38 +0100 Subject: [PATCH] src: whitespace sweep ;) --- Makefile | 2 +- src/opnsense/contrib/simplepie/LICENSE.txt | 30 +++++++++---------- src/opnsense/contrib/simplepie/autoloader.php | 18 +++++------ .../contrib/simplepie/build/charset.php | 14 ++++----- .../contrib/simplepie/build/compile.php | 2 +- .../contrib/simplepie/build/header.txt | 16 +++++----- .../COMPATIBILITY README.txt | 4 +-- .../sp_compatibility_test.php | 8 ++--- src/opnsense/contrib/simplepie/composer.json | 2 +- src/opnsense/contrib/simplepie/idn/ReadMe.txt | 2 +- .../simplepie/idn/idna_convert.class.php | 2 +- .../contrib/simplepie/library/SimplePie.php | 16 +++++----- .../simplepie/library/SimplePie/Author.php | 17 +++++------ .../simplepie/library/SimplePie/Cache.php | 16 +++++----- .../library/SimplePie/Cache/Base.php | 16 +++++----- .../simplepie/library/SimplePie/Cache/DB.php | 16 +++++----- .../library/SimplePie/Cache/File.php | 16 +++++----- .../library/SimplePie/Cache/Memcache.php | 16 +++++----- .../library/SimplePie/Cache/MySQL.php | 16 +++++----- .../simplepie/library/SimplePie/Caption.php | 17 +++++------ .../simplepie/library/SimplePie/Category.php | 17 +++++------ .../SimplePie/Content/Type/Sniffer.php | 17 +++++------ .../simplepie/library/SimplePie/Copyright.php | 17 +++++------ .../simplepie/library/SimplePie/Core.php | 18 +++++------ .../simplepie/library/SimplePie/Credit.php | 17 +++++------ .../SimplePie/Decode/HTML/Entities.php | 19 ++++++------ .../simplepie/library/SimplePie/Enclosure.php | 17 +++++------ .../simplepie/library/SimplePie/Exception.php | 18 +++++------ .../simplepie/library/SimplePie/File.php | 16 +++++----- .../library/SimplePie/HTTP/Parser.php | 16 +++++----- .../simplepie/library/SimplePie/IRI.php | 16 +++++----- .../simplepie/library/SimplePie/Item.php | 17 +++++------ .../simplepie/library/SimplePie/Locator.php | 17 +++++------ .../simplepie/library/SimplePie/Misc.php | 19 ++++++------ .../simplepie/library/SimplePie/Net/IPv6.php | 16 +++++----- .../library/SimplePie/Parse/Date.php | 17 +++++------ .../simplepie/library/SimplePie/Parser.php | 16 +++++----- .../simplepie/library/SimplePie/Rating.php | 16 +++++----- .../simplepie/library/SimplePie/Registry.php | 18 +++++------ .../library/SimplePie/Restriction.php | 16 +++++----- .../simplepie/library/SimplePie/Sanitize.php | 16 +++++----- .../simplepie/library/SimplePie/Source.php | 17 +++++------ .../SimplePie/XML/Declaration/Parser.php | 16 +++++----- .../simplepie/library/SimplePie/gzdecode.php | 16 +++++----- 44 files changed, 319 insertions(+), 332 deletions(-) diff --git a/Makefile b/Makefile index 0fa3b2346..c61cd88e6 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,7 @@ lint: force sweep: force find ${.CURDIR}/src ! -name "*.min.*" ! -name "*.svg" \ - ! -name "*.map" -type f -print0 | \ + ! -name "*.map" ! -name "*.ser" -type f -print0 | \ xargs -0 -n1 scripts/cleanfile find ${.CURDIR}/lang -type f -print0 | \ xargs -0 -n1 scripts/cleanfile diff --git a/src/opnsense/contrib/simplepie/LICENSE.txt b/src/opnsense/contrib/simplepie/LICENSE.txt index a822a4bd9..48f11bffe 100755 --- a/src/opnsense/contrib/simplepie/LICENSE.txt +++ b/src/opnsense/contrib/simplepie/LICENSE.txt @@ -1,26 +1,26 @@ Copyright (c) 2004-2007, Ryan Parman and Geoffrey Sneddon. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are +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 + * 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 + * 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 + * 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. \ No newline at end of file +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. diff --git a/src/opnsense/contrib/simplepie/autoloader.php b/src/opnsense/contrib/simplepie/autoloader.php index c16a8f8b5..bd57d150c 100755 --- a/src/opnsense/contrib/simplepie/autoloader.php +++ b/src/opnsense/contrib/simplepie/autoloader.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -83,4 +83,4 @@ class SimplePie_Autoloader $filename = $this->path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; include $filename; } -} \ No newline at end of file +} diff --git a/src/opnsense/contrib/simplepie/build/charset.php b/src/opnsense/contrib/simplepie/build/charset.php index ff4588d89..f91cb4c35 100755 --- a/src/opnsense/contrib/simplepie/build/charset.php +++ b/src/opnsense/contrib/simplepie/build/charset.php @@ -18,7 +18,7 @@ function build_character_set_list() { $data = explode("\n", $file->body); unset($file); - + foreach ($data as $line) { // New character set @@ -34,7 +34,7 @@ function build_character_set_list() $charsets[$preferred] = array_unique($aliases); natsort($charsets[$preferred]); } - + $aliases = array($match[1]); $preferred = $match[1]; } @@ -51,7 +51,7 @@ function build_character_set_list() } } } - + // Compatibility replacements // From http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#misinterpreted-for-compatibility $compat = array( @@ -66,7 +66,7 @@ function build_character_set_list() 'TIS-620' => 'windows-874', //'US-ASCII' => 'windows-1252', ); - + foreach ($compat as $real => $replace) { if (isset($charsets[$real]) && isset($charsets[$replace])) @@ -87,10 +87,10 @@ function build_character_set_list() $charsets[$replace] = array_unique($charsets[$replace]); natsort($charsets[$replace]); } - + // Sort it uksort($charsets, 'strnatcasecmp'); - + // Check that nothing matches more than one $all = call_user_func_array('array_merge', $charsets); $all_count = array_count_values($all); @@ -105,7 +105,7 @@ function build_character_set_list() } } } - + // And we're done! return $charsets; } diff --git a/src/opnsense/contrib/simplepie/build/compile.php b/src/opnsense/contrib/simplepie/build/compile.php index 34a29d4c7..affad3760 100755 --- a/src/opnsense/contrib/simplepie/build/compile.php +++ b/src/opnsense/contrib/simplepie/build/compile.php @@ -66,4 +66,4 @@ $compiled = str_replace( ); // Finally, save -file_put_contents(COMPILED, $compiled); \ No newline at end of file +file_put_contents(COMPILED, $compiled); diff --git a/src/opnsense/contrib/simplepie/build/header.txt b/src/opnsense/contrib/simplepie/build/header.txt index 9446b5ce5..87e57354f 100755 --- a/src/opnsense/contrib/simplepie/build/header.txt +++ b/src/opnsense/contrib/simplepie/build/header.txt @@ -14,16 +14,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt b/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt index 5b2498992..174bbc14d 100755 --- a/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt +++ b/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt @@ -1,7 +1,7 @@ SIMPLEPIE COMPATIBILITY TEST 1) Upload sp_compatibility_test.php to the web-accessible root of your website. -For example, if your website is www.example.com, upload it so that you can get +For example, if your website is www.example.com, upload it so that you can get to it at www.example.com/sp_compatibility_test.php -2) Open your web browser and go to the page you just uploaded. \ No newline at end of file +2) Open your web browser and go to the page you just uploaded. diff --git a/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php b/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php index 10ad60bb5..bda8602b6 100755 --- a/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php +++ b/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php @@ -140,7 +140,7 @@ table#chart tr.enabled td { /* Leave this alone */ } -table#chart tr.disabled td, +table#chart tr.disabled td, table#chart tr.disabled td a { color:#999; font-style:italic; @@ -269,13 +269,13 @@ function fnLoadPngs() {
  • cURL: The cURL extension is not available. SimplePie will use fsockopen() instead.
    • - +
  • Zlib: You have Zlib enabled. This allows SimplePie to support GZIP-encoded feeds. No problems here.
  • Zlib: The Zlib extension is not available. SimplePie will ignore any GZIP-encoding, and instead handle feeds as uncompressed text.
    • - +
  • mbstring and iconv: You have both mbstring and iconv installed! This will allow SimplePie to handle the greatest number of languages. Check the Supported Character Encodings chart to see what's supported on your webhost.
    • @@ -326,4 +326,4 @@ function fnLoadPngs() { - \ No newline at end of file + diff --git a/src/opnsense/contrib/simplepie/composer.json b/src/opnsense/contrib/simplepie/composer.json index 4da6b1ab8..dc8b995ee 100755 --- a/src/opnsense/contrib/simplepie/composer.json +++ b/src/opnsense/contrib/simplepie/composer.json @@ -31,4 +31,4 @@ "SimplePie": "library" } } -} \ No newline at end of file +} diff --git a/src/opnsense/contrib/simplepie/idn/ReadMe.txt b/src/opnsense/contrib/simplepie/idn/ReadMe.txt index 7ca8c7e6d..04984c2cf 100755 --- a/src/opnsense/contrib/simplepie/idn/ReadMe.txt +++ b/src/opnsense/contrib/simplepie/idn/ReadMe.txt @@ -120,4 +120,4 @@ under the email address above. The team of phlyLabs http://phlylabs.de -mailto:phlymail@phlylabs.de \ No newline at end of file +mailto:phlymail@phlylabs.de diff --git a/src/opnsense/contrib/simplepie/idn/idna_convert.class.php b/src/opnsense/contrib/simplepie/idn/idna_convert.class.php index ed2bae26d..cce1b6150 100755 --- a/src/opnsense/contrib/simplepie/idn/idna_convert.class.php +++ b/src/opnsense/contrib/simplepie/idn/idna_convert.class.php @@ -966,4 +966,4 @@ class Net_IDNA_php4 extends idna_convert } } -?> \ No newline at end of file +?> diff --git a/src/opnsense/contrib/simplepie/library/SimplePie.php b/src/opnsense/contrib/simplepie/library/SimplePie.php index b33c635f1..64c595169 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Author.php b/src/opnsense/contrib/simplepie/library/SimplePie/Author.php index bbf3812ff..f150ac0cc 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Author.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Author.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -154,4 +154,3 @@ class SimplePie_Author } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache.php b/src/opnsense/contrib/simplepie/library/SimplePie/Cache.php index 75586d749..94dbf4c63 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Cache.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Cache.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php index 937e34631..0b7794aa3 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Base.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php index ac509ae08..995fd3332 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/DB.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php index 5797b3aed..64e2e79b8 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/File.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php index fd4478060..97e0454d9 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/Memcache.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php index d53ebc117..51bd04432 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Cache/MySQL.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Caption.php b/src/opnsense/contrib/simplepie/library/SimplePie/Caption.php index 52922c5d9..7ced829cf 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Caption.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Caption.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -207,4 +207,3 @@ class SimplePie_Caption } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Category.php b/src/opnsense/contrib/simplepie/library/SimplePie/Category.php index ad0407b4e..a9354dffa 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Category.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Category.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -154,4 +154,3 @@ class SimplePie_Category } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php b/src/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php index 20d053dca..485a29591 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Content/Type/Sniffer.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -329,4 +329,3 @@ class SimplePie_Content_Type_Sniffer return 'text/html'; } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Copyright.php b/src/opnsense/contrib/simplepie/library/SimplePie/Copyright.php index 57c535a64..2c25ff88f 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Copyright.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Copyright.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -127,4 +127,3 @@ class SimplePie_Copyright } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Core.php b/src/opnsense/contrib/simplepie/library/SimplePie/Core.php index 46d996628..8be8429fd 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Core.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Core.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -54,4 +54,4 @@ class SimplePie_Core extends SimplePie { -} \ No newline at end of file +} diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Credit.php b/src/opnsense/contrib/simplepie/library/SimplePie/Credit.php index d3a3442ad..999adf3bf 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Credit.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Credit.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -153,4 +153,3 @@ class SimplePie_Credit } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php b/src/opnsense/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php index 069e8d8e5..96864578a 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Decode/HTML/Entities.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -607,11 +607,10 @@ class SimplePie_Decode_HTML_Entities if ($match !== null) { - $this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1); + $this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1); $this->position += strlen($entities[$match]) - strlen($consumed) - 1; } break; } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php b/src/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php index 55674379c..0cf09bd59 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Enclosure.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -1377,4 +1377,3 @@ class SimplePie_Enclosure } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Exception.php b/src/opnsense/contrib/simplepie/library/SimplePie/Exception.php index 73e104d69..681b38539 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Exception.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Exception.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -49,4 +49,4 @@ */ class SimplePie_Exception extends Exception { -} \ No newline at end of file +} diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/File.php b/src/opnsense/contrib/simplepie/library/SimplePie/File.php index b7d1a2ac9..8ed2f4c59 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/File.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/File.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php b/src/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php index bff2222b2..f7d37fa7b 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/HTTP/Parser.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/IRI.php b/src/opnsense/contrib/simplepie/library/SimplePie/IRI.php index d3198c04f..acc2c8550 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/IRI.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/IRI.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Item.php b/src/opnsense/contrib/simplepie/library/SimplePie/Item.php index a77574b37..3d8c15658 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Item.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Item.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -2961,4 +2961,3 @@ class SimplePie_Item } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Locator.php b/src/opnsense/contrib/simplepie/library/SimplePie/Locator.php index 57e910c22..d4b9c6547 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Locator.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Locator.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -369,4 +369,3 @@ class SimplePie_Locator return null; } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Misc.php b/src/opnsense/contrib/simplepie/library/SimplePie/Misc.php index 5d7367f64..2714acfa4 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Misc.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Misc.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -316,7 +316,7 @@ class SimplePie_Misc elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output))) { return $return; - } + } // This is last, as behaviour of this varies with OS userland and PHP version elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output))) { @@ -2244,4 +2244,3 @@ function embed_wmedia(width, height, link) { // No-op } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Net/IPv6.php b/src/opnsense/contrib/simplepie/library/SimplePie/Net/IPv6.php index da80d8aca..7430c6f23 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Net/IPv6.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Net/IPv6.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Parse/Date.php b/src/opnsense/contrib/simplepie/library/SimplePie/Parse/Date.php index d51f500d3..266313866 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Parse/Date.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Parse/Date.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -980,4 +980,3 @@ class SimplePie_Parse_Date } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Parser.php b/src/opnsense/contrib/simplepie/library/SimplePie/Parser.php index d698552ca..a177ef209 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Parser.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Parser.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Rating.php b/src/opnsense/contrib/simplepie/library/SimplePie/Rating.php index 8689e5dfb..64c032ee1 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Rating.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Rating.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Registry.php b/src/opnsense/contrib/simplepie/library/SimplePie/Registry.php index 1072cdebb..80caa9de2 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Registry.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Registry.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -222,4 +222,4 @@ class SimplePie_Registry $result = call_user_func_array(array($class, $method), $parameters); return $result; } -} \ No newline at end of file +} diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Restriction.php b/src/opnsense/contrib/simplepie/library/SimplePie/Restriction.php index 4ba371bfb..b61204aab 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Restriction.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Restriction.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php b/src/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php index 6810cc49f..df621cc08 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Sanitize.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/Source.php b/src/opnsense/contrib/simplepie/library/SimplePie/Source.php index 51d8e6c25..90f6e92a9 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/Source.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/Source.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 @@ -608,4 +608,3 @@ class SimplePie_Source } } } - diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php b/src/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php index aec19f10a..f02969337 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/XML/Declaration/Parser.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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 diff --git a/src/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php b/src/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php index 52e024ea9..5afdb9b63 100755 --- a/src/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php +++ b/src/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php @@ -11,16 +11,16 @@ * 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 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. + * * 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. + * * 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