Standards: Remove EOF closing PHP tags

diff --git a/include/Contact.php b/include/Contact.php
index d635ee872558c649ce49970e97bf11db9f7795f4..d8971abc35d5493cc9892ed33c08424ec58e941f 100644 (file)
--- 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 b0cdc3fe63b556ad6dc0a67a61efd427b0b4622b..9df6ac36c9dab238b3b2d61eb17ddb9b4eef3474 100644 (file)
--- 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 c9c0530f08da9a90cc0323aebba92e4f47e34b5e..89145298675aa2d833d6f8c16620fc0325ff16ec 100644 (file)
--- 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 a528f86c34bdc1914afda0d61ce3dc197523a621..0b0f263ea54e5dac5fc777dabc359a5c494aa5b0 100755 (executable)
--- 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 98db23f9effb1cd14aad0263d6e63941e359b07c..29222de5e76cf8b497f9236721136f7956072c4f 100644 (file)
--- 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 64ceb51d37bc58060c29f53b06ad1b9457e86345..6643a6314e44dd5504777eaed3f89f6ed8a43b1f 100644 (file)
--- 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 3430577da6a05665b0e93445f0b973c9745e216f..db50dae89c95eefe8796aeb4ddd835491278b75e 100644 (file)
--- 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 21081dd6a7250d7e4891984c47889ad633e4b065..3f70d5b4b9156fdbcbe65469669947649be1994c 100644 (file)
--- 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 32044e663e7113f8eda3834ef986579de5378df9..cfef6d4ad03deb12b562840dfec395a827601eb9 100644 (file)
--- 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 c20a6d832d6898b3356eef1f705cc27a77d392ca..0ac0078c859272b99f0db46b26d8c04866cd9193 100644 (file)
--- 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 c14629b895ed52bff01ab0f8b5788fdf55bdd736..1deab951958ac3a6750ac956a2289af6be3581e5 100644 (file)
--- 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 dc2cb137c49358e986f513860c5dda7d8f2b049e..ed338ce71002672c6fbf217941e98eba125efc96 100644 (file)
--- 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 3b5ed5487de87d1837cba6c4c7db3259b572244f..50eb46368fd56730b711ae66e206f62f9a2a5dd6 100644 (file)
--- 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 d582acfee67d6b9f6a4bf26c240add4331f304a7..82595529d2bc1f93cfea4dbbfb169abb04340f8f 100644 (file)
--- 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 3093e149aeb869acc2c35ca0a49e9087642e7cb6..dda6b3e9c130827c3469e5ef650bd15177bdb7bf 100644 (file)
--- 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 aa644ee2bea71a8d47f49fae3b7434c9ad57bf3d..215d9f3db726a2e722a2da8f67400462c61fd08c 100644 (file)
--- 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 f0192f0f0385dc243dbeeb2f6711e2c6d57e16bb..cd56528c9d45be828555e70448e74f995c22e0b7 100644 (file)
--- 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 f9649961d9ca0d087d6b9a8eeea1dde591ac7305..9d18b27b4f3c16a8d42ea52372e1eecf33eb2c40 100644 (file)
--- 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 2a6d28370a3910cbb4a34fc470526fb48a20eb16..4473fa99befbdd659af74d789df48109d7518d3a 100644 (file)
--- 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 bb110a284b9283123ec0c2f78c090aff87d8a673..bd736e548447eb98f6238a72925b53b98b739bc8 100644 (file)
--- 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 c8a2fdaf1d055653f204636dfaf921ffb2e46333..820232b12a39fbc6ba87d8580d4e5127f93cdc2c 100644 (file)
--- 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 f64b39e4b687bda0e0b42434ed88c2872367c463..b3fd5c6b0b1e5de407ad2c0fb2f5fdc1daa05c96 100644 (file)
--- 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 9a52097cc448a68ef3ad313706b8401a12347b3e..6067f3f4b93c58b2c41308412fbf18b4f9a264c2 100644 (file)
--- 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 9e0982836e240338b1866f3b7e2b7fc26d7e15be..66622e8746c6c40cefee9fe732d1857a22f480f2 100644 (file)
--- 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 fb3fc6ae24a63c2ca1696c7b89210100ec4fa6e2..5d8e8f2a20f434f0bb74e7f0b49431da206aba8e 100644 (file)
--- 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 c6f961e6b6966cc6feffe2921ad56c47561ea4c4..da2f94748943887d7fe3c3dc8a710ac0ce820209 100644 (file)
--- 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 2666dc1de572816a01ec53d4522288392e8c5424..15c7d8dc652dbd0bcc05dcce1ac2ad5db6cc123b 100644 (file)
--- 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 eb5b3b9b486985fe67bc0c8958cb3f33912293c8..f03b3b1c1bc00cfbada58c7f0a93495d3394bd78 100644 (file)
--- 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 b693520b93d8cb2e932af589a6b5da94cb51a46a..0042e070a9da9b3bc73b02606f68328e880c44a2 100644 (file)
--- 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 3fb6ac3109daf150c071d7d767b4ecd72a8be5a8..5bc8e0ad3f068e0b4b8fae1d23bf31cfbee736b4 100644 (file)
--- 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);
        }
-       
-       /**\r
-        * xmlify and put in a document\r
-        */\r
-       public function testXmlifyDocument() {\r
-               $tag="<tag>I want to break</tag>";\r
+
+       /**
+        * xmlify and put in a document
+        */
+       public function testXmlifyDocument() {
+               $tag="<tag>I want to break</tag>";
                $xml=xmlify($tag);
-               $text='<text>'.$xml.'</text>'; \r
-               
-               $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)),\r
+               $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); \r
+
+               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 163c94bb97a2fd91550a1b22fb38b17014cb3fde..798c81474f013062a2fef8cbde2f8d98e12867c3 100644 (file)
--- 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 266ddcd754f2ac499a88618d93ee267136a98861..4accef3960a390dad4b8c79323e38be99671934b 100644 (file)
--- 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 89f44d9c0454b3e6c7e05d6b5c86bb4c9c44f705..1095dfcc5d83ab1a57d17d9e3d32bedc048c539c 100644 (file)
--- 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;
-
-?>