Completed
Push — develop ( cb7ecf...5e631f )
by Dmytro
17s
created
manager/processors/delete_htmlsnippet.processor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('delete_snippet')) {
5
+if (!$modx->hasPermission('delete_snippet')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
@@ -34,5 +34,5 @@  discard block
 block discarded – undo
34 34
 $modx->clearCache('full');
35 35
 
36 36
 // finished emptying cache - redirect
37
-$header="Location: index.php?a=76&r=2";
37
+$header = "Location: index.php?a=76&r=2";
38 38
 header($header);
Please login to merge, or discard this patch.
manager/processors/optimize_table.processor.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!($modx->hasPermission('settings') && ($modx->hasPermission('logs')||$modx->hasPermission('bk_manager')))) {
5
+if (!($modx->hasPermission('settings') && ($modx->hasPermission('logs') || $modx->hasPermission('bk_manager')))) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
@@ -32,6 +32,6 @@  discard block
 block discarded – undo
32 32
 	$modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
33 33
 }
34 34
 
35
-$mode = (int)$_REQUEST['mode'];
36
-$header="Location: index.php?a={$mode}&s=4";
35
+$mode = (int) $_REQUEST['mode'];
36
+$header = "Location: index.php?a={$mode}&s=4";
37 37
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_web_user.processor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('delete_web_user')) {
5
+if (!$modx->hasPermission('delete_web_user')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
@@ -43,5 +43,5 @@  discard block
 block discarded – undo
43 43
 		"id"	=> $id
44 44
 	));
45 45
 
46
-$header="Location: index.php?a=99";
46
+$header = "Location: index.php?a=99";
47 47
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_category.processor.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 if (!$modx->hasPermission('save_plugin') && !$modx->hasPermission('save_snippet') && !$modx->hasPermission('save_template') && !$modx->hasPermission('save_module')) {
6 6
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['catId'])? (int)$_GET['catId'] : 0;
10
-if ($id==0) {
9
+$id = isset($_GET['catId']) ? (int) $_GET['catId'] : 0;
10
+if ($id == 0) {
11 11
     $modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
@@ -19,5 +19,5 @@  discard block
 block discarded – undo
19 19
 deleteCategory($id);
20 20
 
21 21
 // finished emptying cache - redirect
22
-$header="Location: index.php?a=76";
22
+$header = "Location: index.php?a=76";
23 23
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_user.processor.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('delete_user')) {
5
+if (!$modx->hasPermission('delete_user')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
14 14
 // delete the user, but first check if we are deleting our own record
15
-if($id==$modx->getLoginUserID()) {
15
+if ($id == $modx->getLoginUserID()) {
16 16
 	$modx->webAlertAndQuit("You can't delete yourself!");
17 17
 }
18 18
 
@@ -50,5 +50,5 @@  discard block
 block discarded – undo
50 50
 		"id"	=> $id
51 51
 	));
52 52
 
53
-$header="Location: index.php?a=75";
53
+$header = "Location: index.php?a=75";
54 54
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_module.processor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('delete_module')) {
5
+if (!$modx->hasPermission('delete_module')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
@@ -40,5 +40,5 @@  discard block
 block discarded – undo
40 40
 $modx->clearCache('full');
41 41
 
42 42
 // finished emptying cache - redirect
43
-$header="Location: index.php?a=106&r=2";
43
+$header = "Location: index.php?a=106&r=2";
44 44
 header($header);
Please login to merge, or discard this patch.
manager/processors/delete_snippet.processor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('delete_snippet')) {
5
+if (!$modx->hasPermission('delete_snippet')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
@@ -34,5 +34,5 @@  discard block
 block discarded – undo
34 34
 $modx->clearCache('full');
35 35
 
36 36
 // finished emptying cache - redirect
37
-$header="Location: index.php?a=76&r=2";
37
+$header = "Location: index.php?a=76&r=2";
38 38
 header($header);
Please login to merge, or discard this patch.
manager/includes/charsets.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -65,26 +65,26 @@
 block discarded – undo
65 65
 $_['macintosh']         = 'Western European (Mac) - macintosh';
66 66
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
67 67
 
68
-if($modx_charset     == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
69
-elseif($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
70
-elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
71
-elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
72
-elseif($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
73
-elseif($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
74
-elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
75
-elseif($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
76
-elseif($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
77
-elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
78
-elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
79
-elseif($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
80
-elseif($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
81
-elseif($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
82
-elseif($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
68
+if ($modx_charset == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
69
+elseif ($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
70
+elseif ($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
71
+elseif ($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
72
+elseif ($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
73
+elseif ($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
74
+elseif ($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
75
+elseif ($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
76
+elseif ($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
77
+elseif ($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
78
+elseif ($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
79
+elseif ($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
80
+elseif ($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
81
+elseif ($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
82
+elseif ($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
83 83
 
84 84
 $tpl = '<option value="%s" %s>%s</option>';
85 85
 $options = array();
86
-foreach($_ as $value=>$label) {
87
-    $selected = $value===$modx_charset ? 'selected' : '';
86
+foreach ($_ as $value=>$label) {
87
+    $selected = $value === $modx_charset ? 'selected' : '';
88 88
     $options[] = sprintf($tpl, $value, $selected, $label);
89 89
 }
90 90
 echo implode("\n", $options);
Please login to merge, or discard this patch.
manager/media/rss/rss_parse.inc 1 patch
Spacing   +118 added lines, -118 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 define('RSS', 'RSS');
24 24
 define('ATOM', 'Atom');
25 25
 
26
-require_once (MAGPIE_DIR . 'rss_utils.inc');
26
+require_once (MAGPIE_DIR.'rss_utils.inc');
27 27
 
28 28
 /**
29 29
 * Hybrid parser, and object, takes RSS as a string and returns a simple object.
@@ -31,19 +31,19 @@  discard block
 block discarded – undo
31 31
 * see: rss_fetch.inc for a simpler interface with integrated caching support
32 32
 *
33 33
 */
34
-class MagpieRSS {
34
+class MagpieRSS{
35 35
     var $parser;
36 36
 
37
-    var $current_item   = array();  // item currently being parsed
38
-    var $items          = array();  // collection of parsed items
39
-    var $channel        = array();  // hash of channel fields
37
+    var $current_item   = array(); // item currently being parsed
38
+    var $items          = array(); // collection of parsed items
39
+    var $channel        = array(); // hash of channel fields
40 40
     var $textinput      = array();
41 41
     var $image          = array();
42 42
     var $feed_type;
43 43
     var $feed_version;
44
-    var $encoding       = '';       // output encoding of parsed rss
44
+    var $encoding       = ''; // output encoding of parsed rss
45 45
 
46
-    var $_source_encoding = '';     // only set if we have to parse xml prolog
46
+    var $_source_encoding = ''; // only set if we have to parse xml prolog
47 47
 
48 48
     var $ERROR = "";
49 49
     var $WARNING = "";
@@ -91,15 +91,15 @@  discard block
 block discarded – undo
91 91
      *                                  source encoding. (caveat emptor)
92 92
      *
93 93
      */
94
-    function __construct($source, $output_encoding='ISO-8859-1',
95
-                        $input_encoding=null, $detect_encoding=true)
94
+    function __construct($source, $output_encoding = 'ISO-8859-1',
95
+                        $input_encoding = null, $detect_encoding = true)
96 96
     {
97 97
         # if PHP xml isn't compiled in, die
98 98
         #
99 99
         if (!function_exists('xml_parser_create')) {
100
-            $this->error( "Failed to load PHP's XML Extension. " .
100
+            $this->error("Failed to load PHP's XML Extension. ".
101 101
                           "http://www.php.net/manual/en/ref.xml.php",
102
-                           E_USER_ERROR );
102
+                           E_USER_ERROR);
103 103
         }
104 104
 
105 105
         list($parser, $source) = $this->create_parser($source,
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
 
108 108
 
109 109
         if (!is_resource($parser)) {
110
-            $this->error( "Failed to create an instance of PHP's XML parser. " .
110
+            $this->error("Failed to create an instance of PHP's XML parser. ".
111 111
                           "http://www.php.net/manual/en/ref.xml.php",
112
-                          E_USER_ERROR );
112
+                          E_USER_ERROR);
113 113
         }
114 114
 
115 115
 
@@ -118,57 +118,57 @@  discard block
 block discarded – undo
118 118
         # pass in parser, and a reference to this object
119 119
         # setup handlers
120 120
         #
121
-        xml_set_object( $this->parser, $this );
121
+        xml_set_object($this->parser, $this);
122 122
         xml_set_element_handler($this->parser,
123
-                'feed_start_element', 'feed_end_element' );
123
+                'feed_start_element', 'feed_end_element');
124 124
 
125
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' );
125
+        xml_set_character_data_handler($this->parser, 'feed_cdata');
126 126
 
127
-        $status = xml_parse( $this->parser, $source );
127
+        $status = xml_parse($this->parser, $source);
128 128
 
129
-        if (! $status ) {
130
-            $errorcode = xml_get_error_code( $this->parser );
131
-            if ( $errorcode != XML_ERROR_NONE ) {
132
-                $xml_error = xml_error_string( $errorcode );
129
+        if (!$status) {
130
+            $errorcode = xml_get_error_code($this->parser);
131
+            if ($errorcode != XML_ERROR_NONE) {
132
+                $xml_error = xml_error_string($errorcode);
133 133
                 $error_line = xml_get_current_line_number($this->parser);
134 134
                 $error_col = xml_get_current_column_number($this->parser);
135 135
                 $errormsg = "$xml_error at line $error_line, column $error_col";
136 136
 
137
-                $this->error( $errormsg );
137
+                $this->error($errormsg);
138 138
             }
139 139
         }
140 140
 
141
-        xml_parser_free( $this->parser );
141
+        xml_parser_free($this->parser);
142 142
 
143 143
         $this->normalize();
144 144
     }
145 145
 
146
-    function feed_start_element($p, $element, &$attrs) {
146
+    function feed_start_element($p, $element, &$attrs){
147 147
         $el = $element = strtolower($element);
148 148
         $attrs = array_change_key_case($attrs, CASE_LOWER);
149 149
 
150 150
         // check for a namespace, and split if found
151 151
         $ns = false;
152
-        if ( strpos( $element, ':' ) ) {
153
-            list($ns, $el) = explode( ':', $element, 2);
152
+        if (strpos($element, ':')) {
153
+            list($ns, $el) = explode(':', $element, 2);
154 154
         }
155
-        if ( $ns and $ns != 'rdf' ) {
155
+        if ($ns and $ns != 'rdf') {
156 156
             $this->current_namespace = $ns;
157 157
         }
158 158
 
159 159
         # if feed type isn't set, then this is first element of feed
160 160
         # identify feed from root element
161 161
         #
162
-        if (!isset($this->feed_type) ) {
163
-            if ( $el == 'rdf' ) {
162
+        if (!isset($this->feed_type)) {
163
+            if ($el == 'rdf') {
164 164
                 $this->feed_type = RSS;
165 165
                 $this->feed_version = '1.0';
166 166
             }
167
-            elseif ( $el == 'rss' ) {
167
+            elseif ($el == 'rss') {
168 168
                 $this->feed_type = RSS;
169 169
                 $this->feed_version = $attrs['version'];
170 170
             }
171
-            elseif ( $el == 'feed' ) {
171
+            elseif ($el == 'feed') {
172 172
                 $this->feed_type = ATOM;
173 173
                 $this->feed_version = $attrs['version'];
174 174
                 $this->inchannel = true;
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
176 176
             return;
177 177
         }
178 178
 
179
-        if ( $el == 'channel' )
179
+        if ($el == 'channel')
180 180
         {
181 181
             $this->inchannel = true;
182 182
         }
183
-        elseif ($el == 'item' or $el == 'entry' )
183
+        elseif ($el == 'item' or $el == 'entry')
184 184
         {
185 185
             $this->initem = true;
186
-            if ( isset($attrs['rdf:about']) ) {
186
+            if (isset($attrs['rdf:about'])) {
187 187
                 $this->current_item['about'] = $attrs['rdf:about'];
188 188
             }
189 189
         }
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
         }
208 208
 
209 209
         # handle atom content constructs
210
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
210
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
211 211
         {
212 212
             // avoid clashing w/ RSS mod_content
213
-            if ($el == 'content' ) {
213
+            if ($el == 'content') {
214 214
                 $el = 'atom_content';
215 215
             }
216 216
 
@@ -220,31 +220,31 @@  discard block
 block discarded – undo
220 220
         }
221 221
 
222 222
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
223
-        elseif ($this->feed_type == ATOM and $this->incontent )
223
+        elseif ($this->feed_type == ATOM and $this->incontent)
224 224
         {
225 225
             // if tags are inlined, then flatten
226 226
             $attrs_str = implode(' ',
227 227
                     array_map('map_attrs',
228 228
                     array_keys($attrs),
229
-                    array_values($attrs) ) );
229
+                    array_values($attrs)));
230 230
 
231
-            $this->append_content( "<$element $attrs_str>"  );
231
+            $this->append_content("<$element $attrs_str>");
232 232
 
233
-            array_unshift( $this->stack, $el );
233
+            array_unshift($this->stack, $el);
234 234
         }
235 235
 
236 236
         // Atom support many links per containging element.
237 237
         // Magpie treats link elements of type rel='alternate'
238 238
         // as being equivalent to RSS's simple link element.
239 239
         //
240
-        elseif ($this->feed_type == ATOM and $el == 'link' )
240
+        elseif ($this->feed_type == ATOM and $el == 'link')
241 241
         {
242
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
242
+            if (isset($attrs['rel']) and $attrs['rel'] == 'alternate')
243 243
             {
244 244
                 $link_el = 'link';
245 245
             }
246 246
             else {
247
-                $link_el = 'link_' . $attrs['rel'];
247
+                $link_el = 'link_'.$attrs['rel'];
248 248
             }
249 249
 
250 250
             $this->append($link_el, $attrs['href']);
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
257 257
 
258 258
 
259 259
 
260
-    function feed_cdata ($p, $text) {
260
+    function feed_cdata($p, $text){
261 261
         if ($this->feed_type == ATOM and $this->incontent)
262 262
         {
263
-            $this->append_content( $text );
263
+            $this->append_content($text);
264 264
         }
265 265
         else {
266 266
             $current_el = implode('_', array_reverse($this->stack));
@@ -268,35 +268,35 @@  discard block
 block discarded – undo
268 268
         }
269 269
     }
270 270
 
271
-    function feed_end_element ($p, $el) {
271
+    function feed_end_element($p, $el){
272 272
         $el = strtolower($el);
273 273
 
274
-        if ( $el == 'item' or $el == 'entry' )
274
+        if ($el == 'item' or $el == 'entry')
275 275
         {
276 276
             $this->items[] = $this->current_item;
277 277
             $this->current_item = array();
278 278
             $this->initem = false;
279 279
         }
280
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
280
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput')
281 281
         {
282 282
             $this->intextinput = false;
283 283
         }
284
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
284
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image')
285 285
         {
286 286
             $this->inimage = false;
287 287
         }
288
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
288
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
289 289
         {
290 290
             $this->incontent = false;
291 291
         }
292
-        elseif ($el == 'channel' or $el == 'feed' )
292
+        elseif ($el == 'channel' or $el == 'feed')
293 293
         {
294 294
             $this->inchannel = false;
295 295
         }
296
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
296
+        elseif ($this->feed_type == ATOM and $this->incontent) {
297 297
             // balance tags properly
298 298
             // note:  i don't think this is actually neccessary
299
-            if ( $this->stack[0] == $el )
299
+            if ($this->stack[0] == $el)
300 300
             {
301 301
                 $this->append_content("</$el>");
302 302
             }
@@ -304,91 +304,91 @@  discard block
 block discarded – undo
304 304
                 $this->append_content("<$el />");
305 305
             }
306 306
 
307
-            array_shift( $this->stack );
307
+            array_shift($this->stack);
308 308
         }
309 309
         else {
310
-            array_shift( $this->stack );
310
+            array_shift($this->stack);
311 311
         }
312 312
 
313 313
         $this->current_namespace = false;
314 314
     }
315 315
 
316
-    function concat (&$str1, $str2="") {
317
-        if (!isset($str1) ) {
318
-            $str1="";
316
+    function concat(&$str1, $str2 = ""){
317
+        if (!isset($str1)) {
318
+            $str1 = "";
319 319
         }
320 320
         $str1 .= $str2;
321 321
     }
322 322
 
323 323
 
324 324
 
325
-    function append_content($text) {
326
-        if ( $this->initem ) {
327
-            $this->concat( $this->current_item[ $this->incontent ], $text );
325
+    function append_content($text){
326
+        if ($this->initem) {
327
+            $this->concat($this->current_item[$this->incontent], $text);
328 328
         }
329
-        elseif ( $this->inchannel ) {
330
-            $this->concat( $this->channel[ $this->incontent ], $text );
329
+        elseif ($this->inchannel) {
330
+            $this->concat($this->channel[$this->incontent], $text);
331 331
         }
332 332
     }
333 333
 
334 334
     // smart append - field and namespace aware
335
-    function append($el, $text) {
335
+    function append($el, $text){
336 336
         if (!$el) {
337 337
             return;
338 338
         }
339
-        if ( $this->current_namespace )
339
+        if ($this->current_namespace)
340 340
         {
341
-            if ( $this->initem ) {
341
+            if ($this->initem) {
342 342
                 $this->concat(
343
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
343
+                    $this->current_item[$this->current_namespace][$el], $text);
344 344
             }
345 345
             elseif ($this->inchannel) {
346 346
                 $this->concat(
347
-                    $this->channel[ $this->current_namespace][ $el ], $text );
347
+                    $this->channel[$this->current_namespace][$el], $text );
348 348
             }
349 349
             elseif ($this->intextinput) {
350 350
                 $this->concat(
351
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
351
+                    $this->textinput[$this->current_namespace][$el], $text );
352 352
             }
353 353
             elseif ($this->inimage) {
354 354
                 $this->concat(
355
-                    $this->image[ $this->current_namespace ][ $el ], $text );
355
+                    $this->image[$this->current_namespace][$el], $text );
356 356
             }
357 357
         }
358 358
         else {
359
-            if ( $this->initem ) {
359
+            if ($this->initem) {
360 360
                 $this->concat(
361
-                    $this->current_item[ $el ], $text);
361
+                    $this->current_item[$el], $text);
362 362
             }
363 363
             elseif ($this->intextinput) {
364 364
                 $this->concat(
365
-                    $this->textinput[ $el ], $text );
365
+                    $this->textinput[$el], $text );
366 366
             }
367 367
             elseif ($this->inimage) {
368 368
                 $this->concat(
369
-                    $this->image[ $el ], $text );
369
+                    $this->image[$el], $text );
370 370
             }
371 371
             elseif ($this->inchannel) {
372 372
                 $this->concat(
373
-                    $this->channel[ $el ], $text );
373
+                    $this->channel[$el], $text );
374 374
             }
375 375
 
376 376
         }
377 377
     }
378 378
 
379
-    function normalize () {
379
+    function normalize(){
380 380
         // if atom populate rss fields
381
-        if ( $this->is_atom() ) {
381
+        if ($this->is_atom()) {
382 382
             $this->channel['description'] = $this->channel['tagline'];
383
-            for ( $i = 0; $i < count($this->items); $i++) {
383
+            for ($i = 0; $i < count($this->items); $i++) {
384 384
                 $item = $this->items[$i];
385
-                if ( isset($item['summary']) )
385
+                if (isset($item['summary']))
386 386
                     $item['description'] = $item['summary'];
387
-                if ( isset($item['atom_content']))
387
+                if (isset($item['atom_content']))
388 388
                     $item['content']['encoded'] = $item['atom_content'];
389 389
 
390
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
391
-                if ( $atom_date ) {
390
+                $atom_date = (isset($item['issued'])) ? $item['issued'] : $item['modified'];
391
+                if ($atom_date) {
392 392
                     $epoch = @parse_w3cdtf($atom_date);
393 393
                     if ($epoch and $epoch > 0) {
394 394
                         $item['date_timestamp'] = $epoch;
@@ -398,22 +398,22 @@  discard block
 block discarded – undo
398 398
                 $this->items[$i] = $item;
399 399
             }
400 400
         }
401
-        elseif ( $this->is_rss() ) {
401
+        elseif ($this->is_rss()) {
402 402
             $this->channel['tagline'] = $this->channel['description'];
403
-            for ( $i = 0; $i < count($this->items); $i++) {
403
+            for ($i = 0; $i < count($this->items); $i++) {
404 404
                 $item = $this->items[$i];
405
-                if ( isset($item['description']))
405
+                if (isset($item['description']))
406 406
                     $item['summary'] = $item['description'];
407
-                if ( isset($item['content']['encoded'] ) )
407
+                if (isset($item['content']['encoded']))
408 408
                     $item['atom_content'] = $item['content']['encoded'];
409 409
 
410
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
410
+                if ($this->is_rss() == '1.0' and isset($item['dc']['date'])) {
411 411
                     $epoch = @parse_w3cdtf($item['dc']['date']);
412 412
                     if ($epoch and $epoch > 0) {
413 413
                         $item['date_timestamp'] = $epoch;
414 414
                     }
415 415
                 }
416
-                elseif ( isset($item['pubdate']) ) {
416
+                elseif (isset($item['pubdate'])) {
417 417
                     $epoch = @strtotime($item['pubdate']);
418 418
                     if ($epoch > 0) {
419 419
                         $item['date_timestamp'] = $epoch;
@@ -426,8 +426,8 @@  discard block
 block discarded – undo
426 426
     }
427 427
 
428 428
 
429
-    function is_rss () {
430
-        if ( $this->feed_type == RSS ) {
429
+    function is_rss(){
430
+        if ($this->feed_type == RSS) {
431 431
             return $this->feed_version;
432 432
         }
433 433
         else {
@@ -435,8 +435,8 @@  discard block
 block discarded – undo
435 435
         }
436 436
     }
437 437
 
438
-    function is_atom() {
439
-        if ( $this->feed_type == ATOM ) {
438
+    function is_atom(){
439
+        if ($this->feed_type == ATOM) {
440 440
             return $this->feed_version;
441 441
         }
442 442
         else {
@@ -448,8 +448,8 @@  discard block
 block discarded – undo
448 448
     * return XML parser, and possibly re-encoded source
449 449
     *
450 450
     */
451
-    function create_parser($source, $out_enc, $in_enc, $detect) {
452
-        if ( substr(phpversion(),0,1) == 5) {
451
+    function create_parser($source, $out_enc, $in_enc, $detect){
452
+        if (substr(phpversion(), 0, 1) == 5) {
453 453
             $parser = $this->php5_create_parser($in_enc, $detect);
454 454
         }
455 455
         else {
@@ -472,9 +472,9 @@  discard block
 block discarded – undo
472 472
     * All hail libxml2!
473 473
     *
474 474
     */
475
-    function php5_create_parser($in_enc, $detect) {
475
+    function php5_create_parser($in_enc, $detect){
476 476
         // by default php5 does a fine job of detecting input encodings
477
-        if(!$detect && $in_enc) {
477
+        if (!$detect && $in_enc) {
478 478
             return xml_parser_create($in_enc);
479 479
         }
480 480
         else {
@@ -497,8 +497,8 @@  discard block
 block discarded – undo
497 497
     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
498 498
     *
499 499
     */
500
-    function php4_create_parser($source, $in_enc, $detect) {
501
-        if ( !$detect ) {
500
+    function php4_create_parser($source, $in_enc, $detect){
501
+        if (!$detect) {
502 502
             return array(xml_parser_create($in_enc), $source);
503 503
         }
504 504
 
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
522 522
         // cast the XML to a known encoding
523 523
         // @see http://php.net/iconv
524 524
 
525
-        if (function_exists('iconv'))  {
526
-            $encoded_source = iconv($in_enc,'UTF-8', $source);
525
+        if (function_exists('iconv')) {
526
+            $encoded_source = iconv($in_enc, 'UTF-8', $source);
527 527
             if ($encoded_source) {
528 528
                 return array(xml_parser_create('UTF-8'), $encoded_source);
529 529
             }
@@ -531,24 +531,24 @@  discard block
 block discarded – undo
531 531
 
532 532
         // iconv didn't work, try mb_convert_encoding
533 533
         // @see http://php.net/mbstring
534
-        if(function_exists('mb_convert_encoding')) {
535
-            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
534
+        if (function_exists('mb_convert_encoding')) {
535
+            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc);
536 536
             if ($encoded_source) {
537 537
                 return array(xml_parser_create('UTF-8'), $encoded_source);
538 538
             }
539 539
         }
540 540
 
541 541
         // else
542
-        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
542
+        $this->error("Feed is in an unsupported character encoding. ($in_enc) ".
543 543
                      "You may see strange artifacts, and mangled characters.",
544 544
                      E_USER_NOTICE);
545 545
 
546 546
         return array(xml_parser_create(), $source);
547 547
     }
548 548
 
549
-    function known_encoding($enc) {
549
+    function known_encoding($enc){
550 550
         $enc = strtoupper($enc);
551
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
551
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
552 552
             return $enc;
553 553
         }
554 554
         else {
@@ -556,20 +556,20 @@  discard block
 block discarded – undo
556 556
         }
557 557
     }
558 558
 
559
-    function error ($errormsg, $lvl=E_USER_WARNING) {
559
+    function error($errormsg, $lvl = E_USER_WARNING){
560 560
         // append PHP's error message if track_errors enabled
561
-        if ( isset($php_errormsg) ) {
561
+        if (isset($php_errormsg)) {
562 562
             $errormsg .= " ($php_errormsg)";
563 563
         }
564
-        if ( MAGPIE_DEBUG ) {
565
-            trigger_error( $errormsg, $lvl);
564
+        if (MAGPIE_DEBUG) {
565
+            trigger_error($errormsg, $lvl);
566 566
         }
567 567
         else {
568
-            error_log( $errormsg, 0);
568
+            error_log($errormsg, 0);
569 569
         }
570 570
 
571
-        $notices = E_USER_NOTICE|E_NOTICE;
572
-        if ( $lvl&$notices ) {
571
+        $notices = E_USER_NOTICE | E_NOTICE;
572
+        if ($lvl & $notices) {
573 573
             $this->WARNING = $errormsg;
574 574
         } else {
575 575
             $this->ERROR = $errormsg;
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
 
580 580
 } // end class RSS
581 581
 
582
-function map_attrs($k, $v) {
582
+function map_attrs($k, $v){
583 583
     return "$k=\"$v\"";
584 584
 }
585 585
 
@@ -591,19 +591,19 @@  discard block
 block discarded – undo
591 591
 	define('CASE_LOWER', 0);
592 592
 
593 593
 
594
-	function array_change_key_case($array, $case=CASE_LOWER) {
594
+	function array_change_key_case($array, $case = CASE_LOWER){
595 595
         $output = array();
596
-        switch($case){
596
+        switch ($case) {
597 597
            case CASE_LOWER:
598
-               $cmd='strtolower';
598
+               $cmd = 'strtolower';
599 599
                break;
600 600
            case CASE_UPPER:
601
-               $cmd='strtoupper';
601
+               $cmd = 'strtoupper';
602 602
                break;
603 603
            default:
604 604
                $cmd = '';
605 605
         }
606
-        foreach($array as $key=>$value) {
606
+        foreach ($array as $key=>$value) {
607 607
             $output[empty($cmd) ? $key : $cmd($key)] = $value;
608 608
         }
609 609
         return $output;
Please login to merge, or discard this patch.