From ea79a0e033e40057279a7f464c9464145eedc932 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 26 Apr 2017 20:24:18 +0300 Subject: [PATCH] remove some redundant php closing tags --- api/index.php | 2 +- classes/api.php | 4 +--- classes/auth/base.php | 2 -- classes/backend.php | 3 +-- classes/db.php | 3 +-- classes/db/mysqli.php | 1 - classes/db/pdo.php | 3 +-- classes/db/pgsql.php | 3 +-- classes/db/prefs.php | 3 +-- classes/db/stmt.php | 3 +-- classes/dbupdater.php | 2 +- classes/dlg.php | 3 +-- classes/feedenclosure.php | 2 +- classes/feeditem.php | 2 +- classes/feeditem/atom.php | 3 +-- classes/feeditem/common.php | 3 +-- classes/feeditem/rss.php | 3 +-- classes/feedparser.php | 2 +- classes/handler.php | 3 +-- classes/handler/protected.php | 1 - classes/iauthmodule.php | 1 - classes/idb.php | 1 - classes/ihandler.php | 1 - classes/logger.php | 3 +-- classes/logger/sql.php | 3 +-- classes/logger/syslog.php | 3 +-- classes/opml.php | 1 - classes/plugin.php | 3 +-- classes/pluginhandler.php | 2 -- classes/pluginhost.php | 3 +-- classes/pref/feeds.php | 3 +-- classes/pref/filters.php | 3 +-- classes/pref/labels.php | 4 +--- classes/pref/prefs.php | 3 +-- classes/pref/system.php | 1 - classes/pref/users.php | 4 +--- classes/rpc.php | 3 +-- classes/ttrssmailer.php | 4 +--- include/autoload.php | 3 +-- include/ccache.php | 2 +- include/colors.php | 2 +- include/crypt.php | 3 +-- include/db-prefs.php | 3 +-- include/db.php | 2 -- include/digest.php | 2 +- include/errorhandler.php | 2 +- include/feedbrowser.php | 1 - include/functions2.php | 2 +- include/labels.php | 2 -- include/rssfuncs.php | 2 +- include/sessions.php | 1 - include/version.php | 1 - 52 files changed, 38 insertions(+), 87 deletions(-) diff --git a/api/index.php b/api/index.php index d451a3ac..ed3c0394 100644 --- a/api/index.php +++ b/api/index.php @@ -87,4 +87,4 @@ header("Api-Content-Length: " . ob_get_length()); ob_end_flush(); -?> + diff --git a/classes/api.php b/classes/api.php index 895ea526..8ffe68cc 100644 --- a/classes/api.php +++ b/classes/api.php @@ -887,6 +887,4 @@ class API extends Handler { } -} - -?> +} \ No newline at end of file diff --git a/classes/auth/base.php b/classes/auth/base.php index 26b6e4ab..30443121 100644 --- a/classes/auth/base.php +++ b/classes/auth/base.php @@ -63,5 +63,3 @@ class Auth_Base { } } - -?> diff --git a/classes/backend.php b/classes/backend.php index 7737df0f..75fb4c86 100644 --- a/classes/backend.php +++ b/classes/backend.php @@ -115,5 +115,4 @@ class Backend extends Handler { __('Close this window').""; */ } -} -?> +} \ No newline at end of file diff --git a/classes/db.php b/classes/db.php index e8cb2dea..3b71f3c8 100644 --- a/classes/db.php +++ b/classes/db.php @@ -97,5 +97,4 @@ class Db implements IDb { function last_query_error() { return $this->adapter->last_query_error(); } -} -?> +} \ No newline at end of file diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php index 5a3afdda..deb29f26 100644 --- a/classes/db/mysqli.php +++ b/classes/db/mysqli.php @@ -83,4 +83,3 @@ class Db_Mysqli implements IDb { } } -?> diff --git a/classes/db/pdo.php b/classes/db/pdo.php index 3aeebbe6..d3070fac 100644 --- a/classes/db/pdo.php +++ b/classes/db/pdo.php @@ -97,5 +97,4 @@ class Db_PDO implements IDb { return true; } -} -?> +} \ No newline at end of file diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index e8697aba..98fab6be 100644 --- a/classes/db/pgsql.php +++ b/classes/db/pgsql.php @@ -88,5 +88,4 @@ class Db_Pgsql implements IDb { return true; } -} -?> +} \ No newline at end of file diff --git a/classes/db/prefs.php b/classes/db/prefs.php index 0d4ebc2d..a2662949 100644 --- a/classes/db/prefs.php +++ b/classes/db/prefs.php @@ -183,5 +183,4 @@ class Db_Prefs { } } -} -?> +} \ No newline at end of file diff --git a/classes/db/stmt.php b/classes/db/stmt.php index 4d3596ef..7d6bbb30 100644 --- a/classes/db/stmt.php +++ b/classes/db/stmt.php @@ -28,5 +28,4 @@ class Db_Stmt { function fetch() { return $this->stmt->fetch(); } -} -?> +} \ No newline at end of file diff --git a/classes/dbupdater.php b/classes/dbupdater.php index f9ef4f3b..cb1eecf4 100644 --- a/classes/dbupdater.php +++ b/classes/dbupdater.php @@ -72,4 +72,4 @@ class DbUpdater { } } -} ?> +} \ No newline at end of file diff --git a/classes/dlg.php b/classes/dlg.php index 60c5265b..53fa6028 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -190,5 +190,4 @@ class Dlg extends Handler_Protected { //return; } -} -?> +} \ No newline at end of file diff --git a/classes/feedenclosure.php b/classes/feedenclosure.php index 64f1a061..2435f685 100644 --- a/classes/feedenclosure.php +++ b/classes/feedenclosure.php @@ -7,4 +7,4 @@ class FeedEnclosure { public $height; public $width; } -?> + diff --git a/classes/feeditem.php b/classes/feeditem.php index e64a13fd..594f5698 100644 --- a/classes/feeditem.php +++ b/classes/feeditem.php @@ -12,4 +12,4 @@ abstract class FeedItem { abstract function get_enclosures(); abstract function get_author(); } -?> + diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php index e132789b..76d85b2a 100644 --- a/classes/feeditem/atom.php +++ b/classes/feeditem/atom.php @@ -197,5 +197,4 @@ class FeedItem_Atom extends FeedItem_Common { return $encs; } -} -?> +} \ No newline at end of file diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php index 070692d7..40251480 100644 --- a/classes/feeditem/common.php +++ b/classes/feeditem/common.php @@ -82,5 +82,4 @@ abstract class FeedItem_Common extends FeedItem { } } -} -?> +} \ No newline at end of file diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php index 080e4083..a3fa7e63 100644 --- a/classes/feeditem/rss.php +++ b/classes/feeditem/rss.php @@ -189,5 +189,4 @@ class FeedItem_RSS extends FeedItem_Common { return $encs; } -} -?> +} \ No newline at end of file diff --git a/classes/feedparser.php b/classes/feedparser.php index 36ad17f3..860ebd73 100644 --- a/classes/feedparser.php +++ b/classes/feedparser.php @@ -283,4 +283,4 @@ class FeedParser { return $rv; } -} ?> +} \ No newline at end of file diff --git a/classes/handler.php b/classes/handler.php index b2093204..16c20960 100644 --- a/classes/handler.php +++ b/classes/handler.php @@ -20,5 +20,4 @@ class Handler implements IHandler { return true; } -} -?> +} \ No newline at end of file diff --git a/classes/handler/protected.php b/classes/handler/protected.php index 4ce86534..765b1748 100644 --- a/classes/handler/protected.php +++ b/classes/handler/protected.php @@ -5,4 +5,3 @@ class Handler_Protected extends Handler { return parent::before($method) && $_SESSION['uid']; } } -?> diff --git a/classes/iauthmodule.php b/classes/iauthmodule.php index d47dbacf..9ec67407 100644 --- a/classes/iauthmodule.php +++ b/classes/iauthmodule.php @@ -2,4 +2,3 @@ interface IAuthModule { function authenticate($login, $password); } -?> diff --git a/classes/idb.php b/classes/idb.php index dd1eba14..37fd6990 100644 --- a/classes/idb.php +++ b/classes/idb.php @@ -11,4 +11,3 @@ interface IDb { function last_error(); function last_query_error(); } -?> diff --git a/classes/ihandler.php b/classes/ihandler.php index e3c8a535..01c9e310 100644 --- a/classes/ihandler.php +++ b/classes/ihandler.php @@ -4,4 +4,3 @@ interface IHandler { function before($method); function after(); } -?> diff --git a/classes/logger.php b/classes/logger.php index 4a9c1df8..0c486e58 100644 --- a/classes/logger.php +++ b/classes/logger.php @@ -61,5 +61,4 @@ class Logger { return self::$instance; } -} -?> +} \ No newline at end of file diff --git a/classes/logger/sql.php b/classes/logger/sql.php index 96263a97..bd192ae7 100644 --- a/classes/logger/sql.php +++ b/classes/logger/sql.php @@ -23,5 +23,4 @@ class Logger_SQL { return false; } -} -?> +} \ No newline at end of file diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php index 04416060..ac9980f6 100644 --- a/classes/logger/syslog.php +++ b/classes/logger/syslog.php @@ -30,5 +30,4 @@ class Logger_Syslog { } -} -?> +} \ No newline at end of file diff --git a/classes/opml.php b/classes/opml.php index 0ad5ddf3..937a1b9a 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -515,4 +515,3 @@ class Opml extends Handler_Protected { } -?> diff --git a/classes/plugin.php b/classes/plugin.php index 5041de0c..5939d51c 100644 --- a/classes/plugin.php +++ b/classes/plugin.php @@ -40,5 +40,4 @@ class Plugin { function api_version() { return Plugin::API_VERSION_COMPAT; } -} -?> +} \ No newline at end of file diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php index 5ca5c17d..1c9e7aef 100644 --- a/classes/pluginhandler.php +++ b/classes/pluginhandler.php @@ -18,5 +18,3 @@ class PluginHandler extends Handler_Protected { } } } - -?> diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 48ef43e0..047f50b5 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -434,5 +434,4 @@ class PluginHost { function get_filter_actions() { return $this->plugin_actions; } -} -?> +} \ No newline at end of file diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 12619858..47c474a0 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1976,5 +1976,4 @@ class Pref_Feeds extends Handler_Protected { print (int) $this->dbh->fetch_result($result, 0, "num_inactive"); } -} -?> +} \ No newline at end of file diff --git a/classes/pref/filters.php b/classes/pref/filters.php index f3836d8e..5e128409 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -1192,5 +1192,4 @@ class Pref_Filters extends Handler_Protected { $this->dbh->query("COMMIT"); } -} -?> +} \ No newline at end of file diff --git a/classes/pref/labels.php b/classes/pref/labels.php index b127ce95..26fbb02b 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -311,6 +311,4 @@ class Pref_Labels extends Handler_Protected { print ""; #container } -} - -?> +} \ No newline at end of file diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 5ec7079d..0e58a34e 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -1120,5 +1120,4 @@ class Pref_Prefs extends Handler_Protected { return ""; } -} -?> +} \ No newline at end of file diff --git a/classes/pref/system.php b/classes/pref/system.php index 6586d6c6..56c0fec9 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -87,4 +87,3 @@ class Pref_System extends Handler_Protected { } } -?> diff --git a/classes/pref/users.php b/classes/pref/users.php index 215f0564..a937a240 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -453,6 +453,4 @@ class Pref_Users extends Handler_Protected { print ""; #container } - - } -?> + } \ No newline at end of file diff --git a/classes/rpc.php b/classes/rpc.php index 008ed876..1e844a6f 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -664,5 +664,4 @@ class RPC extends Handler_Protected { } } -} -?> +} \ No newline at end of file diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php index 4029bbbd..cd10b7cb 100644 --- a/classes/ttrssmailer.php +++ b/classes/ttrssmailer.php @@ -60,6 +60,4 @@ class ttrssMailer extends PHPMailer { $rc=$this->send(); return $rc; } -} - -?> +} \ No newline at end of file diff --git a/include/autoload.php b/include/autoload.php index 505b4447..28a2effd 100644 --- a/include/autoload.php +++ b/include/autoload.php @@ -10,5 +10,4 @@ require $file; } - } -?> + } \ No newline at end of file diff --git a/include/ccache.php b/include/ccache.php index b938b866..45cd4ce6 100644 --- a/include/ccache.php +++ b/include/ccache.php @@ -222,4 +222,4 @@ } } */ -?> + diff --git a/include/colors.php b/include/colors.php index 491d38c1..c441f7cb 100644 --- a/include/colors.php +++ b/include/colors.php @@ -348,4 +348,4 @@ function hsl2rgb($arr) { } return ''; } -?> + diff --git a/include/crypt.php b/include/crypt.php index 217ad3b0..3e26dfd5 100644 --- a/include/crypt.php +++ b/include/crypt.php @@ -17,5 +17,4 @@ } return false; - } -?> + } \ No newline at end of file diff --git a/include/db-prefs.php b/include/db-prefs.php index d122f3ba..91235b47 100644 --- a/include/db-prefs.php +++ b/include/db-prefs.php @@ -7,5 +7,4 @@ function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) { return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags); - } -?> + } \ No newline at end of file diff --git a/include/db.php b/include/db.php index f45f0727..c02e90ef 100644 --- a/include/db.php +++ b/include/db.php @@ -36,5 +36,3 @@ function db_last_query_error() { function db_quote($str){ return Db::get()->quote($str); } - -?> diff --git a/include/digest.php b/include/digest.php index 71ee6d20..ff5d77f1 100644 --- a/include/digest.php +++ b/include/digest.php @@ -189,4 +189,4 @@ return array($tmp, $headlines_count, $affected_ids, $tmp_t); } -?> + diff --git a/include/errorhandler.php b/include/errorhandler.php index bb2fbaee..95c9edc6 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -71,4 +71,4 @@ function ttrss_fatal_handler() { register_shutdown_function('ttrss_fatal_handler'); set_error_handler('ttrss_error_handler'); -?> + diff --git a/include/feedbrowser.php b/include/feedbrowser.php index ec4efe15..b70e47fd 100644 --- a/include/feedbrowser.php +++ b/include/feedbrowser.php @@ -110,4 +110,3 @@ return $rv; } -?> diff --git a/include/functions2.php b/include/functions2.php index f9ee8245..97077e9d 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -2530,4 +2530,4 @@ return ""; } } -?> + diff --git a/include/labels.php b/include/labels.php index 4149864b..9e2674b9 100644 --- a/include/labels.php +++ b/include/labels.php @@ -197,5 +197,3 @@ return $result; } - -?> diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 645d06f8..ff46ac8a 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -1531,4 +1531,4 @@ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", ""); } -?> + diff --git a/include/sessions.php b/include/sessions.php index e955c70b..d0532a01 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -140,4 +140,3 @@ @session_start(); } } -?> diff --git a/include/version.php b/include/version.php index 21dce316..02bc7f3b 100644 --- a/include/version.php +++ b/include/version.php @@ -39,4 +39,3 @@ } define('VERSION', get_version()); -?> -- 2.39.2