Browse Source

Standards: Remove EOF closing PHP tags

tags/3.5.2
Hypolite Petovan 2 years ago
parent
commit
1d427aa214

+ 0
- 1
include/Contact.php View File

@@ -854,4 +854,3 @@ function account_type($contact) {
854 854
 
855 855
 	return $account_type;
856 856
 }
857
-?>

+ 0
- 1
include/Emailer.php View File

@@ -81,4 +81,3 @@ class Emailer {
81 81
 		return $res;
82 82
 	}
83 83
 }
84
-?>

+ 0
- 1
include/Probe.php View File

@@ -1220,4 +1220,3 @@ class Probe {
1220 1220
 		return $data;
1221 1221
 	}
1222 1222
 }
1223
-?>

+ 0
- 1
include/auth_ejabberd.php View File

@@ -334,4 +334,3 @@ class exAuth {
334 334
 			fclose($this->rLogFile);
335 335
 	}
336 336
 }
337
-?>

+ 0
- 1
include/create_shadowentry.php View File

@@ -17,4 +17,3 @@ function create_shadowentry_run($argv, $argc) {
17 17
 
18 18
 	add_shadow_entry($message_id);
19 19
 }
20
-?>

+ 0
- 1
include/dbclean.php View File

@@ -149,4 +149,3 @@ function remove_orphans($stage = 0) {
149 149
 	}
150 150
 
151 151
 }
152
-?>

+ 0
- 1
include/dbm.php View File

@@ -110,4 +110,3 @@ class dbm {
110 110
 		return date('Y-m-d H:i:s', $timestamp);
111 111
 	}
112 112
 }
113
-?>

+ 0
- 1
include/diaspora.php View File

@@ -3745,4 +3745,3 @@ class Diaspora {
3745 3745
 		return true;
3746 3746
 	}
3747 3747
 }
3748
-?>

+ 0
- 1
include/feed.php View File

@@ -366,4 +366,3 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
366 366
 		return array("header" => $author, "items" => $items);
367 367
 	}
368 368
 }
369
-?>

+ 0
- 1
include/files.php View File

@@ -47,4 +47,3 @@ function update_files_for_items() {
47 47
 		create_files_from_item($message["id"]);
48 48
 	}
49 49
 }
50
-?>

+ 0
- 1
include/html2bbcode.php View File

@@ -325,4 +325,3 @@ function html2bbcode($message)
325 325
 
326 326
 	return $message;
327 327
 }
328
-?>

+ 0
- 1
include/html2plain.php View File

@@ -233,4 +233,3 @@ function html2plain($html, $wraplength = 75, $compact = false)
233 233
 
234 234
 	return(trim($message));
235 235
 }
236
-?>

+ 1
- 2
include/msgclean.php View File

@@ -187,7 +187,7 @@ function removelinebreak($message)
187 187
 				(substr(trim($nextline), 0, 7) == 'http://') or
188 188
 				(substr(trim($nextline), 0, 8) == 'https://'));
189 189
 
190
-		if (!$specialchars) 
190
+		if (!$specialchars)
191 191
 			$specialchars = ((substr(rtrim($line), -1) == '-') or
192 192
 					(substr(rtrim($line), -1) == '=') or
193 193
 					(substr(rtrim($line), -1) == '*') or
@@ -222,4 +222,3 @@ function removelinebreak($message)
222 222
 	return(implode("\n", $lines));
223 223
 
224 224
 }
225
-?>

+ 0
- 1
include/ostatus.php View File

@@ -2297,4 +2297,3 @@ class ostatus {
2297 2297
 		return(trim($doc->saveXML()));
2298 2298
 	}
2299 2299
 }
2300
-?>

+ 0
- 1
include/pidfile.php View File

@@ -38,4 +38,3 @@ class pidfile {
38 38
 			return(posix_kill(file_get_contents($this->_file), SIGTERM));
39 39
 	}
40 40
 }
41
-?>

+ 0
- 1
include/plaintext.php View File

@@ -432,4 +432,3 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2
432 432
 
433 433
 	return($post);
434 434
 }
435
-?>

+ 0
- 1
include/poller.php View File

@@ -689,4 +689,3 @@ if (array_search(__file__,get_included_files())===0){
689 689
 
690 690
 	killme();
691 691
 }
692
-?>

+ 0
- 2
include/post_update.php View File

@@ -258,5 +258,3 @@ function post_update_1206() {
258 258
 	logger("Done", LOGGER_DEBUG);
259 259
 	return true;
260 260
 }
261
-
262
-?>

+ 0
- 1
include/quoteconvert.php View File

@@ -129,4 +129,3 @@ function removetofu($message)
129 129
 
130 130
 	return($message);
131 131
 }
132
-?>

+ 0
- 1
include/remove_contact.php View File

@@ -22,4 +22,3 @@ function remove_contact_run($argv, $argc) {
22 22
 	// Now we delete all the depending table entries
23 23
 	dba::delete('contact', array('id' => $id));
24 24
 }
25
-?>

+ 0
- 1
include/socgraph.php View File

@@ -2346,4 +2346,3 @@ function poco_serverlist() {
2346 2346
 	}
2347 2347
 	return $r;
2348 2348
 }
2349
-?>

+ 0
- 1
include/spool_post.php View File

@@ -55,4 +55,3 @@ function spool_post_run($argv, $argc) {
55 55
 		}
56 56
 	}
57 57
 }
58
-?>

+ 0
- 1
include/tags.php View File

@@ -148,4 +148,3 @@ function update_items() {
148 148
 
149 149
 	dba::close($messages);
150 150
 }
151
-?>

+ 0
- 1
include/threads.php View File

@@ -296,4 +296,3 @@ function update_shadow_copy() {
296 296
 
297 297
 	dba::close($messages);
298 298
 }
299
-?>

+ 0
- 2
mod/nodeinfo.php View File

@@ -252,5 +252,3 @@ function nodeinfo_cron() {
252 252
         logger('cron_end');
253 253
 	Config::set('nodeinfo', 'last_calucation', time());
254 254
 }
255
-
256
-?>

+ 0
- 2
mod/pubsubhubbub.php View File

@@ -160,5 +160,3 @@ function pubsubhubbub_init(App $a) {
160 160
 
161 161
 	killme();
162 162
 }
163
-
164
-?>

+ 1
- 2
object/BaseObject.php View File

@@ -14,7 +14,7 @@ class BaseObject {
14 14
 
15 15
 	/**
16 16
 	 * Get the app
17
-	 * 
17
+	 *
18 18
 	 * Same as get_app from boot.php
19 19
 	 */
20 20
 	public function get_app() {
@@ -33,4 +33,3 @@ class BaseObject {
33 33
 		self::$app = $app;
34 34
 	}
35 35
 }
36
-?>

+ 0
- 1
object/Conversation.php View File

@@ -164,4 +164,3 @@ class Conversation extends BaseObject {
164 164
 		return false;
165 165
 	}
166 166
 }
167
-?>

+ 6
- 8
object/Item.php View File

@@ -112,7 +112,7 @@ class Item extends BaseObject {
112 112
 
113 113
 		$conv = $this->get_conversation();
114 114
 
115
-		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
115
+		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
116 116
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
117 117
 			? t('Private Message')
118 118
 			: false);
@@ -754,20 +754,20 @@ class Item extends BaseObject {
754 754
 					if ((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
755 755
 
756 756
 						// The author url doesn't match the owner (typically the contact)
757
-						// and also doesn't match the contact alias. 
758
-						// The name match is a hack to catch several weird cases where URLs are 
757
+						// and also doesn't match the contact alias.
758
+						// The name match is a hack to catch several weird cases where URLs are
759 759
 						// all over the park. It can be tricked, but this prevents you from
760 760
 						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
761
-						// well that it's the same Bob Smith. 
761
+						// well that it's the same Bob Smith.
762 762
 
763
-						// But it could be somebody else with the same name. It just isn't highly likely. 
763
+						// But it could be somebody else with the same name. It just isn't highly likely.
764 764
 
765 765
 
766 766
 						$this->owner_photo = $this->get_data_value('owner-avatar');
767 767
 						$this->owner_name = $this->get_data_value('owner-name');
768 768
 						$this->wall_to_wall = true;
769 769
 						// If it is our contact, use a friendly redirect link
770
-						if ((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
770
+						if ((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url')))
771 771
 							&& ($this->get_data_value('network') === NETWORK_DFRN)) {
772 772
 							$this->owner_url = $this->get_redirect_url();
773 773
 						} else {
@@ -807,5 +807,3 @@ class Item extends BaseObject {
807 807
 	}
808 808
 
809 809
 }
810
-/// @TODO These are discouraged and should be removed:
811
-?>

+ 19
- 20
tests/xss_filter_test.php View File

@@ -1,7 +1,7 @@
1 1
 <?php
2 2
 /**
3 3
  * tests several functions which are used to prevent xss attacks
4
- * 
4
+ *
5 5
  * @package test.util
6 6
  */
7 7
 
@@ -27,31 +27,31 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
27 27
 	 */
28 28
 	public function testXmlify() {
29 29
 		$text="<tag>I want to break\n this!11!<?hard?></tag>";
30
-		$xml=xmlify($text); 
30
+		$xml=xmlify($text);
31 31
 		$retext=unxmlify($text);
32 32
 
33 33
 		$this->assertEquals($text, $retext);
34 34
 	}
35
-	
36
-	/**
37
-	 * xmlify and put in a document
38
-	 */
39
-	public function testXmlifyDocument() {
40
-		$tag="<tag>I want to break</tag>";
35
+
36
+	/**
37
+	 * xmlify and put in a document
38
+	 */
39
+	public function testXmlifyDocument() {
40
+		$tag="<tag>I want to break</tag>";
41 41
 		$xml=xmlify($tag);
42
-		$text='<text>'.$xml.'</text>'; 
43
-		
44
-		$xml_parser=xml_parser_create(); 
42
+		$text='<text>'.$xml.'</text>';
43
+
44
+		$xml_parser=xml_parser_create();
45 45
 		//should be possible to parse it
46
-		$values=array(); $index=array(); 
47
-		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); 
48
-		
49
-		$this->assertEquals(array('TEXT'=>array(0)), 
50
-				$index); 
51
-		$this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
46
+		$values=array(); $index=array();
47
+		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
48
+
49
+		$this->assertEquals(array('TEXT'=>array(0)),
50
+				$index);
51
+		$this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
52 52
 				$values);
53
-		
54
-		xml_parser_free($xml_parser); 
53
+
54
+		xml_parser_free($xml_parser);
55 55
 	}
56 56
 
57 57
 	/**
@@ -68,4 +68,3 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
68 68
 	//get_mentions
69 69
 	//get_contact_block, bis Zeile 538
70 70
 }
71
-?>

+ 0
- 1
util/createdoxygen.php View File

@@ -91,4 +91,3 @@ function add_documentation($line) {
91 91
 
92 92
 	return $block;
93 93
 }
94
-?>

+ 0
- 1
util/daemon.php View File

@@ -98,4 +98,3 @@ while (true) {
98 98
 	// Now sleep for 5 minutes
99 99
 	sleep(300);
100 100
 }
101
-?>

+ 1
- 3
view/theme/duepuntozero/style.php View File

@@ -6,7 +6,7 @@ $uid = get_theme_uid();
6 6
 
7 7
 $s_colorset = get_config('duepuntozero','colorset');
8 8
 $colorset = get_pconfig( $uid, 'duepuntozero', 'colorset');
9
-if (!x($colorset)) 
9
+if (!x($colorset))
10 10
     $colorset = $s_colorset;
11 11
 
12 12
 if ($colorset) {
@@ -25,5 +25,3 @@ if ($colorset) {
25 25
 }
26 26
 
27 27
 echo $setcss;
28
-
29
-?>

Loading…
Cancel
Save