From 1d427aa214b431a0d31da55ae996bb9a33da8ae8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 30 Apr 2017 00:21:02 -0400
Subject: [PATCH] Standards: Remove EOF closing PHP tags

---
 include/Contact.php               |  1 -
 include/Emailer.php               |  1 -
 include/Probe.php                 |  1 -
 include/auth_ejabberd.php         |  1 -
 include/create_shadowentry.php    |  1 -
 include/dbclean.php               |  1 -
 include/dbm.php                   |  1 -
 include/diaspora.php              |  1 -
 include/feed.php                  |  1 -
 include/files.php                 |  1 -
 include/html2bbcode.php           |  1 -
 include/html2plain.php            |  1 -
 include/msgclean.php              |  3 +--
 include/ostatus.php               |  1 -
 include/pidfile.php               |  1 -
 include/plaintext.php             |  1 -
 include/poller.php                |  1 -
 include/post_update.php           |  2 --
 include/quoteconvert.php          |  1 -
 include/remove_contact.php        |  1 -
 include/socgraph.php              |  1 -
 include/spool_post.php            |  1 -
 include/tags.php                  |  1 -
 include/threads.php               |  1 -
 mod/nodeinfo.php                  |  2 --
 mod/pubsubhubbub.php              |  2 --
 object/BaseObject.php             |  3 +--
 object/Conversation.php           |  1 -
 object/Item.php                   | 14 +++++------
 tests/xss_filter_test.php         | 39 +++++++++++++++----------------
 util/createdoxygen.php            |  1 -
 util/daemon.php                   |  1 -
 view/theme/duepuntozero/style.php |  4 +---
 33 files changed, 28 insertions(+), 66 deletions(-)

diff --git a/include/Contact.php b/include/Contact.php
index d635ee8725..d8971abc35 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -854,4 +854,3 @@ function account_type($contact) {
 
 	return $account_type;
 }
-?>
diff --git a/include/Emailer.php b/include/Emailer.php
index b0cdc3fe63..9df6ac36c9 100644
--- a/include/Emailer.php
+++ b/include/Emailer.php
@@ -81,4 +81,3 @@ class Emailer {
 		return $res;
 	}
 }
-?>
diff --git a/include/Probe.php b/include/Probe.php
index c9c0530f08..8914529867 100644
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -1220,4 +1220,3 @@ class Probe {
 		return $data;
 	}
 }
-?>
diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index a528f86c34..0b0f263ea5 100755
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -334,4 +334,3 @@ class exAuth {
 			fclose($this->rLogFile);
 	}
 }
-?>
diff --git a/include/create_shadowentry.php b/include/create_shadowentry.php
index 98db23f9ef..29222de5e7 100644
--- a/include/create_shadowentry.php
+++ b/include/create_shadowentry.php
@@ -17,4 +17,3 @@ function create_shadowentry_run($argv, $argc) {
 
 	add_shadow_entry($message_id);
 }
-?>
diff --git a/include/dbclean.php b/include/dbclean.php
index 64ceb51d37..6643a6314e 100644
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -149,4 +149,3 @@ function remove_orphans($stage = 0) {
 	}
 
 }
-?>
diff --git a/include/dbm.php b/include/dbm.php
index 3430577da6..db50dae89c 100644
--- a/include/dbm.php
+++ b/include/dbm.php
@@ -110,4 +110,3 @@ class dbm {
 		return date('Y-m-d H:i:s', $timestamp);
 	}
 }
-?>
diff --git a/include/diaspora.php b/include/diaspora.php
index 21081dd6a7..3f70d5b4b9 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -3745,4 +3745,3 @@ class Diaspora {
 		return true;
 	}
 }
-?>
diff --git a/include/feed.php b/include/feed.php
index 32044e663e..cfef6d4ad0 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -366,4 +366,3 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		return array("header" => $author, "items" => $items);
 	}
 }
-?>
diff --git a/include/files.php b/include/files.php
index c20a6d832d..0ac0078c85 100644
--- a/include/files.php
+++ b/include/files.php
@@ -47,4 +47,3 @@ function update_files_for_items() {
 		create_files_from_item($message["id"]);
 	}
 }
-?>
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index c14629b895..1deab95195 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -325,4 +325,3 @@ function html2bbcode($message)
 
 	return $message;
 }
-?>
diff --git a/include/html2plain.php b/include/html2plain.php
index dc2cb137c4..ed338ce710 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -233,4 +233,3 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
 	return(trim($message));
 }
-?>
diff --git a/include/msgclean.php b/include/msgclean.php
index 3b5ed5487d..50eb46368f 100644
--- a/include/msgclean.php
+++ b/include/msgclean.php
@@ -187,7 +187,7 @@ function removelinebreak($message)
 				(substr(trim($nextline), 0, 7) == 'http://') or
 				(substr(trim($nextline), 0, 8) == 'https://'));
 
-		if (!$specialchars) 
+		if (!$specialchars)
 			$specialchars = ((substr(rtrim($line), -1) == '-') or
 					(substr(rtrim($line), -1) == '=') or
 					(substr(rtrim($line), -1) == '*') or
@@ -222,4 +222,3 @@ function removelinebreak($message)
 	return(implode("\n", $lines));
 
 }
-?>
diff --git a/include/ostatus.php b/include/ostatus.php
index d582acfee6..82595529d2 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -2297,4 +2297,3 @@ class ostatus {
 		return(trim($doc->saveXML()));
 	}
 }
-?>
diff --git a/include/pidfile.php b/include/pidfile.php
index 3093e149ae..dda6b3e9c1 100644
--- a/include/pidfile.php
+++ b/include/pidfile.php
@@ -38,4 +38,3 @@ class pidfile {
 			return(posix_kill(file_get_contents($this->_file), SIGTERM));
 	}
 }
-?>
diff --git a/include/plaintext.php b/include/plaintext.php
index aa644ee2be..215d9f3db7 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -432,4 +432,3 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2
 
 	return($post);
 }
-?>
diff --git a/include/poller.php b/include/poller.php
index f0192f0f03..cd56528c9d 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -689,4 +689,3 @@ if (array_search(__file__,get_included_files())===0){
 
 	killme();
 }
-?>
diff --git a/include/post_update.php b/include/post_update.php
index f9649961d9..9d18b27b4f 100644
--- a/include/post_update.php
+++ b/include/post_update.php
@@ -258,5 +258,3 @@ function post_update_1206() {
 	logger("Done", LOGGER_DEBUG);
 	return true;
 }
-
-?>
diff --git a/include/quoteconvert.php b/include/quoteconvert.php
index 2a6d28370a..4473fa99be 100644
--- a/include/quoteconvert.php
+++ b/include/quoteconvert.php
@@ -129,4 +129,3 @@ function removetofu($message)
 
 	return($message);
 }
-?>
diff --git a/include/remove_contact.php b/include/remove_contact.php
index bb110a284b..bd736e5484 100644
--- a/include/remove_contact.php
+++ b/include/remove_contact.php
@@ -22,4 +22,3 @@ function remove_contact_run($argv, $argc) {
 	// Now we delete all the depending table entries
 	dba::delete('contact', array('id' => $id));
 }
-?>
diff --git a/include/socgraph.php b/include/socgraph.php
index c8a2fdaf1d..820232b12a 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -2346,4 +2346,3 @@ function poco_serverlist() {
 	}
 	return $r;
 }
-?>
diff --git a/include/spool_post.php b/include/spool_post.php
index f64b39e4b6..b3fd5c6b0b 100644
--- a/include/spool_post.php
+++ b/include/spool_post.php
@@ -55,4 +55,3 @@ function spool_post_run($argv, $argc) {
 		}
 	}
 }
-?>
diff --git a/include/tags.php b/include/tags.php
index 9a52097cc4..6067f3f4b9 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -148,4 +148,3 @@ function update_items() {
 
 	dba::close($messages);
 }
-?>
diff --git a/include/threads.php b/include/threads.php
index 9e0982836e..66622e8746 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -296,4 +296,3 @@ function update_shadow_copy() {
 
 	dba::close($messages);
 }
-?>
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index fb3fc6ae24..5d8e8f2a20 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -252,5 +252,3 @@ function nodeinfo_cron() {
         logger('cron_end');
 	Config::set('nodeinfo', 'last_calucation', time());
 }
-
-?>
diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index c6f961e6b6..da2f947489 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -160,5 +160,3 @@ function pubsubhubbub_init(App $a) {
 
 	killme();
 }
-
-?>
diff --git a/object/BaseObject.php b/object/BaseObject.php
index 2666dc1de5..15c7d8dc65 100644
--- a/object/BaseObject.php
+++ b/object/BaseObject.php
@@ -14,7 +14,7 @@ class BaseObject {
 
 	/**
 	 * Get the app
-	 * 
+	 *
 	 * Same as get_app from boot.php
 	 */
 	public function get_app() {
@@ -33,4 +33,3 @@ class BaseObject {
 		self::$app = $app;
 	}
 }
-?>
diff --git a/object/Conversation.php b/object/Conversation.php
index eb5b3b9b48..f03b3b1c1b 100644
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -164,4 +164,3 @@ class Conversation extends BaseObject {
 		return false;
 	}
 }
-?>
diff --git a/object/Item.php b/object/Item.php
index b693520b93..0042e070a9 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -112,7 +112,7 @@ class Item extends BaseObject {
 
 		$conv = $this->get_conversation();
 
-		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
 			: false);
@@ -754,20 +754,20 @@ class Item extends BaseObject {
 					if ((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
 
 						// The author url doesn't match the owner (typically the contact)
-						// and also doesn't match the contact alias. 
-						// The name match is a hack to catch several weird cases where URLs are 
+						// and also doesn't match the contact alias.
+						// The name match is a hack to catch several weird cases where URLs are
 						// all over the park. It can be tricked, but this prevents you from
 						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-						// well that it's the same Bob Smith. 
+						// well that it's the same Bob Smith.
 
-						// But it could be somebody else with the same name. It just isn't highly likely. 
+						// But it could be somebody else with the same name. It just isn't highly likely.
 
 
 						$this->owner_photo = $this->get_data_value('owner-avatar');
 						$this->owner_name = $this->get_data_value('owner-name');
 						$this->wall_to_wall = true;
 						// If it is our contact, use a friendly redirect link
-						if ((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
+						if ((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url')))
 							&& ($this->get_data_value('network') === NETWORK_DFRN)) {
 							$this->owner_url = $this->get_redirect_url();
 						} else {
@@ -807,5 +807,3 @@ class Item extends BaseObject {
 	}
 
 }
-/// @TODO These are discouraged and should be removed:
-?>
diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
index 3fb6ac3109..5bc8e0ad3f 100644
--- a/tests/xss_filter_test.php
+++ b/tests/xss_filter_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * tests several functions which are used to prevent xss attacks
- * 
+ *
  * @package test.util
  */
 
@@ -27,31 +27,31 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 	 */
 	public function testXmlify() {
 		$text="<tag>I want to break\n this!11!<?hard?></tag>";
-		$xml=xmlify($text); 
+		$xml=xmlify($text);
 		$retext=unxmlify($text);
 
 		$this->assertEquals($text, $retext);
 	}
-	
-	/**
-	 * xmlify and put in a document
-	 */
-	public function testXmlifyDocument() {
-		$tag="<tag>I want to break</tag>";
+
+	/**
+	 * xmlify and put in a document
+	 */
+	public function testXmlifyDocument() {
+		$tag="<tag>I want to break</tag>";
 		$xml=xmlify($tag);
-		$text='<text>'.$xml.'</text>'; 
-		
-		$xml_parser=xml_parser_create(); 
+		$text='<text>'.$xml.'</text>';
+
+		$xml_parser=xml_parser_create();
 		//should be possible to parse it
-		$values=array(); $index=array(); 
-		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); 
-		
-		$this->assertEquals(array('TEXT'=>array(0)), 
-				$index); 
-		$this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
+		$values=array(); $index=array();
+		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
+
+		$this->assertEquals(array('TEXT'=>array(0)),
+				$index);
+		$this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
 				$values);
-		
-		xml_parser_free($xml_parser); 
+
+		xml_parser_free($xml_parser);
 	}
 
 	/**
@@ -68,4 +68,3 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 	//get_mentions
 	//get_contact_block, bis Zeile 538
 }
-?>
diff --git a/util/createdoxygen.php b/util/createdoxygen.php
index 163c94bb97..798c81474f 100644
--- a/util/createdoxygen.php
+++ b/util/createdoxygen.php
@@ -91,4 +91,3 @@ function add_documentation($line) {
 
 	return $block;
 }
-?>
diff --git a/util/daemon.php b/util/daemon.php
index 266ddcd754..4accef3960 100644
--- a/util/daemon.php
+++ b/util/daemon.php
@@ -98,4 +98,3 @@ while (true) {
 	// Now sleep for 5 minutes
 	sleep(300);
 }
-?>
diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index 89f44d9c04..1095dfcc5d 100644
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -6,7 +6,7 @@ $uid = get_theme_uid();
 
 $s_colorset = get_config('duepuntozero','colorset');
 $colorset = get_pconfig( $uid, 'duepuntozero', 'colorset');
-if (!x($colorset)) 
+if (!x($colorset))
     $colorset = $s_colorset;
 
 if ($colorset) {
@@ -25,5 +25,3 @@ if ($colorset) {
 }
 
 echo $setcss;
-
-?>