@@ -21,8 +21,8 @@ |
||
21 | 21 | |
22 | 22 | $this->RSSFeed->enable_cache(false); |
23 | 23 | |
24 | - $this->RSSFeed->init(); |
|
25 | - $this->RSSFeed->handle_content_type(); |
|
24 | + $this->RSSFeed->init(); |
|
25 | + $this->RSSFeed->handle_content_type(); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | public function indexAction() |
@@ -25,21 +25,21 @@ |
||
25 | 25 | |
26 | 26 | // ...in NEWS |
27 | 27 | if ($is_dev = (strpos($version, 'dev') === false)) { |
28 | - $date = date('Y-m-d'); |
|
29 | - $news_c = str_replace( |
|
30 | - $l = "$version, unknown release date", |
|
31 | - "$version, released $date", |
|
32 | - file_get_contents('NEWS'), |
|
33 | - $c |
|
34 | - ); |
|
35 | - if (!$c) { |
|
36 | - echo 'Could not update NEWS, missing ' . $l . PHP_EOL; |
|
37 | - exit; |
|
38 | - } elseif ($c > 1) { |
|
39 | - echo 'More than one release declaration in NEWS replaced' . PHP_EOL; |
|
40 | - exit; |
|
41 | - } |
|
42 | - file_put_contents('NEWS', $news_c); |
|
28 | + $date = date('Y-m-d'); |
|
29 | + $news_c = str_replace( |
|
30 | + $l = "$version, unknown release date", |
|
31 | + "$version, released $date", |
|
32 | + file_get_contents('NEWS'), |
|
33 | + $c |
|
34 | + ); |
|
35 | + if (!$c) { |
|
36 | + echo 'Could not update NEWS, missing ' . $l . PHP_EOL; |
|
37 | + exit; |
|
38 | + } elseif ($c > 1) { |
|
39 | + echo 'More than one release declaration in NEWS replaced' . PHP_EOL; |
|
40 | + exit; |
|
41 | + } |
|
42 | + file_put_contents('NEWS', $news_c); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | // ...in Doxyfile |
@@ -131,10 +131,10 @@ discard block |
||
131 | 131 | $phorum_sig = ''; |
132 | 132 | if(isset($row["user"]["signature"]) |
133 | 133 | && isset($row['meta']['show_signature']) && $row['meta']['show_signature']==1){ |
134 | - $phorum_sig=trim($row["user"]["signature"]); |
|
135 | - if(!empty($phorum_sig)){ |
|
136 | - $phorum_sig="\n\n$phorum_sig"; |
|
137 | - } |
|
134 | + $phorum_sig=trim($row["user"]["signature"]); |
|
135 | + if(!empty($phorum_sig)){ |
|
136 | + $phorum_sig="\n\n$phorum_sig"; |
|
137 | + } |
|
138 | 138 | } |
139 | 139 | return $phorum_sig; |
140 | 140 | } |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | if (!empty($GLOBALS['PHORUM']['mod_htmlpurifier']['wysiwyg'])) { |
262 | 262 | $i = $GLOBALS['PHORUM']['DATA']['MODE']; |
263 | 263 | if ($i == 'quote' || $i == 'edit' || $i == 'moderation') { |
264 | - ?> |
|
264 | + ?> |
|
265 | 265 | <div> |
266 | 266 | <p> |
267 | 267 | <strong>Notice:</strong> HTML has been scrubbed for your safety. |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | // default HTML Purifier configuration settings |
6 | 6 | $config->set('HTML.Allowed', |
7 | - // alphabetically sorted |
|
7 | + // alphabetically sorted |
|
8 | 8 | 'a[href|title] |
9 | 9 | abbr[title] |
10 | 10 | acronym[title] |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $config->set('Core.AggressivelyFixLt', true); |
52 | 52 | $config->set('Core.Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll change this eventually |
53 | 53 | if (strtolower($GLOBALS['PHORUM']['DATA']['CHARSET']) !== 'utf-8') { |
54 | - $config->set('Core.EscapeNonASCIICharacters', true); |
|
54 | + $config->set('Core.EscapeNonASCIICharacters', true); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | // vim: et sw=4 sts=4 |
@@ -782,8 +782,8 @@ |
||
782 | 782 | */ |
783 | 783 | public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) |
784 | 784 | { |
785 | - $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def); |
|
786 | - $this->loadArray($ret); |
|
785 | + $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def); |
|
786 | + $this->loadArray($ret); |
|
787 | 787 | } |
788 | 788 | |
789 | 789 | /** |
@@ -139,7 +139,7 @@ |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | $mState = 0; // cached expected number of octets after the current octet |
142 | - // until the beginning of the next UTF8 character sequence |
|
142 | + // until the beginning of the next UTF8 character sequence |
|
143 | 143 | $mUcs4 = 0; // cached Unicode character |
144 | 144 | $mBytes = 1; // cached expected number of octets in the current sequence |
145 | 145 |
@@ -32,8 +32,8 @@ |
||
32 | 32 | public function generateKey($config) |
33 | 33 | { |
34 | 34 | return $config->version . ',' . // possibly replace with function calls |
35 | - $config->getBatchSerial($this->type) . ',' . |
|
36 | - $config->get($this->type . '.DefinitionRev'); |
|
35 | + $config->getBatchSerial($this->type) . ',' . |
|
36 | + $config->get($this->type . '.DefinitionRev'); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -103,9 +103,9 @@ |
||
103 | 103 | $parent_def = $definition->info_parent_def; |
104 | 104 | $stack = array( |
105 | 105 | array($top_node, |
106 | - $parent_def->descendants_are_inline, |
|
107 | - $parent_def->excludes, // exclusions |
|
108 | - 0) |
|
106 | + $parent_def->descendants_are_inline, |
|
107 | + $parent_def->excludes, // exclusions |
|
108 | + 0) |
|
109 | 109 | ); |
110 | 110 | |
111 | 111 | while (!empty($stack)) { |
@@ -151,8 +151,8 @@ |
||
151 | 151 | |
152 | 152 | // isset is in loop because $tokens size changes during loop exec |
153 | 153 | for (;; |
154 | - // only increment if we don't need to reprocess |
|
155 | - $reprocess ? $reprocess = false : $token = $zipper->next($token)) { |
|
154 | + // only increment if we don't need to reprocess |
|
155 | + $reprocess ? $reprocess = false : $token = $zipper->next($token)) { |
|
156 | 156 | |
157 | 157 | // check for a rewind |
158 | 158 | if (is_int($i)) { |