@@ -1,19 +1,22 @@ discard block |
||
1 | 1 | <?php |
2 | -if( ! function_exists('f_owc')){ |
|
2 | +if( ! function_exists('f_owc')) { |
|
3 | 3 | /** |
4 | 4 | * @param $path |
5 | 5 | * @param $data |
6 | 6 | * @param null|int $mode |
7 | 7 | */ |
8 | - function f_owc($path, $data, $mode = null){ |
|
8 | + function f_owc($path, $data, $mode = null) |
|
9 | + { |
|
9 | 10 | try { |
10 | 11 | // make an attempt to create the file |
11 | 12 | $hnd = fopen($path, 'w'); |
12 | 13 | fwrite($hnd, $data); |
13 | 14 | fclose($hnd); |
14 | 15 | |
15 | - if(null !== $mode) chmod($path, $mode); |
|
16 | - }catch(Exception $e){ |
|
16 | + if(null !== $mode) { |
|
17 | + chmod($path, $mode); |
|
18 | + } |
|
19 | + } catch(Exception $e) { |
|
17 | 20 | // Nothing, this is NOT normal |
18 | 21 | unset($e); |
19 | 22 | } |
@@ -21,7 +24,9 @@ discard block |
||
21 | 24 | } |
22 | 25 | |
23 | 26 | $installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
24 | -if( ! isset($_lang)) $_lang = array(); |
|
27 | +if( ! isset($_lang)) { |
|
28 | + $_lang = array(); |
|
29 | +} |
|
25 | 30 | |
26 | 31 | echo '<div class="stepcontainer"> |
27 | 32 | <ul class="progressbar"> |
@@ -57,7 +62,7 @@ discard block |
||
57 | 62 | // check if iconv is available |
58 | 63 | echo '<p>' . $_lang['checking_iconv']; |
59 | 64 | $iconv = (int) function_exists('iconv'); |
60 | -if ($iconv == '0'){ |
|
65 | +if ($iconv == '0') { |
|
61 | 66 | echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>'; |
62 | 67 | $errors++; |
63 | 68 | } else { |
@@ -119,7 +124,7 @@ discard block |
||
119 | 124 | |
120 | 125 | // File Browser directories exists? |
121 | 126 | echo '<p>'.$_lang['checking_if_images_exist']; |
122 | -switch(true){ |
|
127 | +switch(true) { |
|
123 | 128 | case !file_exists("../assets/images"): |
124 | 129 | case !file_exists("../assets/files"): |
125 | 130 | case !file_exists("../assets/backup"): |
@@ -134,7 +139,7 @@ discard block |
||
134 | 139 | |
135 | 140 | // File Browser directories writable? |
136 | 141 | echo '<p>'.$_lang['checking_if_images_writable']; |
137 | -switch(true){ |
|
142 | +switch(true) { |
|
138 | 143 | case !is_writable("../assets/images"): |
139 | 144 | case !is_writable("../assets/files"): |
140 | 145 | case !is_writable("../assets/backup"): |
@@ -268,7 +273,7 @@ discard block |
||
268 | 273 | if ($conn) { |
269 | 274 | echo '<p>'. $_lang['checking_mysql_strict_mode']; |
270 | 275 | $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode"); |
271 | - if (mysqli_num_rows($mysqlmode) > 0){ |
|
276 | + if (mysqli_num_rows($mysqlmode) > 0) { |
|
272 | 277 | $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM); |
273 | 278 | //$modes = array("STRICT_TRANS_TABLES"); // for testing |
274 | 279 | // print_r($modes); |
@@ -305,9 +310,9 @@ discard block |
||
305 | 310 | echo '<p>'; |
306 | 311 | echo $_lang['setup_cannot_continue'] . ' '; |
307 | 312 | |
308 | - if($errors > 1){ |
|
313 | + if($errors > 1) { |
|
309 | 314 | echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural']; |
310 | - }else{ |
|
315 | + } else { |
|
311 | 316 | echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']; |
312 | 317 | } |
313 | 318 | |
@@ -343,23 +348,35 @@ discard block |
||
343 | 348 | <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" /> |
344 | 349 | <?php |
345 | 350 | $templates = isset ($_POST['template']) ? $_POST['template'] : array (); |
346 | - foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />'; |
|
351 | + foreach ($templates as $i => $template) { |
|
352 | + echo '<input type="hidden" name="template[]" value="'.$template.'" />'; |
|
353 | + } |
|
347 | 354 | |
348 | 355 | $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array (); |
349 | - foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />'; |
|
356 | + foreach ($tvs as $i => $tv) { |
|
357 | + echo '<input type="hidden" name="tv[]" value="'.$tv.'" />'; |
|
358 | + } |
|
350 | 359 | |
351 | 360 | $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array (); |
352 | - foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />'; |
|
361 | + foreach ($chunks as $i => $chunk) { |
|
362 | + echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />'; |
|
363 | + } |
|
353 | 364 | |
354 | 365 | $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array (); |
355 | - foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />'; |
|
366 | + foreach ($snippets as $i => $snippet) { |
|
367 | + echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />'; |
|
368 | + } |
|
356 | 369 | |
357 | 370 | $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array (); |
358 | - foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />'; |
|
371 | + foreach ($plugins as $i => $plugin) { |
|
372 | + echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />'; |
|
373 | + } |
|
359 | 374 | |
360 | 375 | $modules = isset ($_POST['module']) ? $_POST['module'] : array (); |
361 | - foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />'; |
|
362 | -?> |
|
376 | + foreach ($modules as $i => $module) { |
|
377 | + echo '<input type="hidden" name="module[]" value="'.$module.'" />'; |
|
378 | + } |
|
379 | + ?> |
|
363 | 380 | </div> |
364 | 381 | |
365 | 382 | <h2><?php echo $_lang['agree_to_terms'];?></h2> |
@@ -1,20 +1,22 @@ |
||
1 | 1 | <?php |
2 | 2 | // Determine upgradeability |
3 | 3 | $upgradeable = 0; |
4 | -if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity |
|
4 | +if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { |
|
5 | +// Include the file so we can test its validity |
|
5 | 6 | include $base_path . MGR_DIR . '/includes/config.inc.php'; |
6 | 7 | // We need to have all connection settings - tho prefix may be empty so we have to ignore it |
7 | 8 | if (isset($dbase)) { |
8 | - if (!$conn = @mysqli_connect($database_server, $database_user, $database_password)) |
|
9 | - $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2; |
|
10 | - elseif (!@mysqli_select_db($conn, trim($dbase, '`'))) |
|
11 | - $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2; |
|
12 | - else |
|
13 | - $upgradeable = 1; |
|
9 | + if (!$conn = @mysqli_connect($database_server, $database_user, $database_password)) { |
|
10 | + $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2; |
|
11 | + } elseif (!@mysqli_select_db($conn, trim($dbase, '`'))) { |
|
12 | + $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2; |
|
13 | + } else { |
|
14 | + $upgradeable = 1; |
|
15 | + } |
|
16 | + } else { |
|
17 | + $upgradeable = 2; |
|
18 | + } |
|
14 | 19 | } |
15 | - else |
|
16 | - $upgradeable = 2; |
|
17 | -} |
|
18 | 20 | |
19 | 21 | $ph['moduleName'] = $moduleName; |
20 | 22 | $ph['displayNew'] = ($upgradeable!=0) ? 'display:none;' : ''; |
@@ -1,16 +1,18 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | $installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
3 | 3 | |
4 | -switch($installMode){ |
|
4 | +switch($installMode) { |
|
5 | 5 | case 0: |
6 | 6 | case 2: |
7 | 7 | $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci'; |
8 | 8 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
9 | 9 | $_POST['database_connection_charset'] = $database_charset; |
10 | - if(empty($_SESSION['databaseloginpassword'])) |
|
11 | - $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
|
12 | - if(empty($_SESSION['databaseloginname'])) |
|
13 | - $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
|
10 | + if(empty($_SESSION['databaseloginpassword'])) { |
|
11 | + $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
|
12 | + } |
|
13 | + if(empty($_SESSION['databaseloginname'])) { |
|
14 | + $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
|
15 | + } |
|
14 | 16 | break; |
15 | 17 | case 1: |
16 | 18 | include $base_path . MGR_DIR . '/includes/config.inc.php'; |
@@ -24,7 +26,9 @@ discard block |
||
24 | 26 | } |
25 | 27 | } |
26 | 28 | } |
27 | - if (empty ($database_collation)) $database_collation = 'utf8_general_ci'; |
|
29 | + if (empty ($database_collation)) { |
|
30 | + $database_collation = 'utf8_general_ci'; |
|
31 | + } |
|
28 | 32 | |
29 | 33 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
30 | 34 | if (!isset ($database_connection_charset) || empty ($database_connection_charset)) { |
@@ -33,7 +37,9 @@ discard block |
||
33 | 37 | |
34 | 38 | if (!isset ($database_connection_method) || empty ($database_connection_method)) { |
35 | 39 | $database_connection_method = 'SET CHARACTER SET'; |
36 | - if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset); |
|
40 | + if (function_exists('mysqli_set_charset')) { |
|
41 | + mysqli_set_charset($conn, $database_connection_charset); |
|
42 | + } |
|
37 | 43 | } |
38 | 44 | if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) { |
39 | 45 | $database_connection_method = 'SET NAMES'; |
@@ -9,21 +9,24 @@ |
||
9 | 9 | $table_prefix= substr(md5(time()), rand(0, 27), rand(3, 5))."_"; |
10 | 10 | } else { |
11 | 11 | $database_name = ''; |
12 | - if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0; |
|
13 | - else { |
|
12 | + if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { |
|
13 | + $upgradeable = 0; |
|
14 | + } else { |
|
14 | 15 | // Include the file so we can test its validity |
15 | 16 | include($base_path.MGR_DIR.'/includes/config.inc.php'); |
16 | 17 | // We need to have all connection settings - but prefix may be empty so we have to ignore it |
17 | 18 | if ($dbase) { |
18 | 19 | $database_name = trim($dbase, '`'); |
19 | - if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) |
|
20 | - $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
21 | - elseif (! mysqli_select_db($conn, trim($dbase, '`'))) |
|
22 | - $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
23 | - else |
|
24 | - $upgradeable = 1; |
|
20 | + if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) { |
|
21 | + $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
22 | + } elseif (! mysqli_select_db($conn, trim($dbase, '`'))) { |
|
23 | + $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
24 | + } else { |
|
25 | + $upgradeable = 1; |
|
26 | + } |
|
27 | + } else { |
|
28 | + $upgradable= 2; |
|
25 | 29 | } |
26 | - else $upgradable= 2; |
|
27 | 30 | } |
28 | 31 | } |
29 | 32 |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | /** |
84 | 84 | * Sets the class attribute of the main HTML TABLE. |
85 | 85 | * |
86 | - * @param $value A class for the main HTML TABLE. |
|
86 | + * @param string $value A class for the main HTML TABLE. |
|
87 | 87 | */ |
88 | 88 | function setTableClass($value) { |
89 | 89 | $this->tableClass= $value; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * Sets the class attribute of regular table rows. |
130 | 130 | * |
131 | - * @param $value A class for regular table rows. |
|
131 | + * @param string $value A class for regular table rows. |
|
132 | 132 | */ |
133 | 133 | function setRowRegularClass($value) { |
134 | 134 | $this->rowRegularClass= $value; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | /** |
138 | 138 | * Sets the class attribute of alternate table rows. |
139 | 139 | * |
140 | - * @param $value A class for alternate table rows. |
|
140 | + * @param string $value A class for alternate table rows. |
|
141 | 141 | */ |
142 | 142 | function setRowAlternateClass($value) { |
143 | 143 | $this->rowAlternateClass= $value; |
@@ -213,6 +213,7 @@ discard block |
||
213 | 213 | * |
214 | 214 | * @param $value An Array of column widths in the order of the keys in the |
215 | 215 | * source table array. |
216 | + * @param string[] $widthArray |
|
216 | 217 | */ |
217 | 218 | function setColumnWidths($widthArray) { |
218 | 219 | $this->columnWidths= $widthArray; |
@@ -240,7 +241,7 @@ discard block |
||
240 | 241 | /** |
241 | 242 | * Retrieves the width of a specific table column by index position. |
242 | 243 | * |
243 | - * @param $columnPosition The index of the column to get the width for. |
|
244 | + * @param integer $columnPosition The index of the column to get the width for. |
|
244 | 245 | */ |
245 | 246 | function getColumnWidth($columnPosition) { |
246 | 247 | $currentWidth= ''; |
@@ -254,6 +255,7 @@ discard block |
||
254 | 255 | * Determines what class the current row should have applied. |
255 | 256 | * |
256 | 257 | * @param $value The position of the current row being rendered. |
258 | + * @param integer $position |
|
257 | 259 | */ |
258 | 260 | function determineRowClass($position) { |
259 | 261 | switch ($this->rowAlternatingScheme) { |
@@ -8,7 +8,8 @@ discard block |
||
8 | 8 | * |
9 | 9 | * @author Jason Coward <[email protected]> (MODX) |
10 | 10 | */ |
11 | -class MakeTable { |
|
11 | +class MakeTable |
|
12 | +{ |
|
12 | 13 | var $actionField; |
13 | 14 | var $cellAction; |
14 | 15 | var $linkAction; |
@@ -31,7 +32,8 @@ discard block |
||
31 | 32 | var $columnWidths; |
32 | 33 | var $selectedValues; |
33 | 34 | |
34 | - function __construct() { |
|
35 | + function __construct() |
|
36 | + { |
|
35 | 37 | $this->fieldHeaders= array(); |
36 | 38 | $this->excludeFields= array(); |
37 | 39 | $this->actionField= ''; |
@@ -58,7 +60,8 @@ discard block |
||
58 | 60 | * |
59 | 61 | * @param $value A URL to execute when table cells are clicked. |
60 | 62 | */ |
61 | - function setCellAction($value) { |
|
63 | + function setCellAction($value) |
|
64 | + { |
|
62 | 65 | $this->cellAction= $this->prepareLink($value); |
63 | 66 | } |
64 | 67 | |
@@ -67,7 +70,8 @@ discard block |
||
67 | 70 | * |
68 | 71 | * @param $value A URL to execute when text within table cells are clicked. |
69 | 72 | */ |
70 | - function setLinkAction($value) { |
|
73 | + function setLinkAction($value) |
|
74 | + { |
|
71 | 75 | $this->linkAction= $this->prepareLink($value); |
72 | 76 | } |
73 | 77 | |
@@ -76,7 +80,8 @@ discard block |
||
76 | 80 | * |
77 | 81 | * @param $value A valid width attribute for the HTML TABLE tag |
78 | 82 | */ |
79 | - function setTableWidth($value) { |
|
83 | + function setTableWidth($value) |
|
84 | + { |
|
80 | 85 | $this->tableWidth= $value; |
81 | 86 | } |
82 | 87 | |
@@ -85,7 +90,8 @@ discard block |
||
85 | 90 | * |
86 | 91 | * @param $value A class for the main HTML TABLE. |
87 | 92 | */ |
88 | - function setTableClass($value) { |
|
93 | + function setTableClass($value) |
|
94 | + { |
|
89 | 95 | $this->tableClass= $value; |
90 | 96 | } |
91 | 97 | |
@@ -94,7 +100,8 @@ discard block |
||
94 | 100 | * |
95 | 101 | * @param $value A class for the main HTML TABLE. |
96 | 102 | */ |
97 | - function setTableID($value) { |
|
103 | + function setTableID($value) |
|
104 | + { |
|
98 | 105 | $this->tableID= $value; |
99 | 106 | } |
100 | 107 | |
@@ -103,7 +110,8 @@ discard block |
||
103 | 110 | * |
104 | 111 | * @param $value A class for the table header row. |
105 | 112 | */ |
106 | - function setRowHeaderClass($value) { |
|
113 | + function setRowHeaderClass($value) |
|
114 | + { |
|
107 | 115 | $this->rowHeaderClass= $value; |
108 | 116 | } |
109 | 117 | |
@@ -112,7 +120,8 @@ discard block |
||
112 | 120 | * |
113 | 121 | * @param $value A class for the table header row. |
114 | 122 | */ |
115 | - function setThHeaderClass($value) { |
|
123 | + function setThHeaderClass($value) |
|
124 | + { |
|
116 | 125 | $this->thClass= $value; |
117 | 126 | } |
118 | 127 | |
@@ -121,7 +130,8 @@ discard block |
||
121 | 130 | * |
122 | 131 | * @param $value A class for the column header row. |
123 | 132 | */ |
124 | - function setColumnHeaderClass($value) { |
|
133 | + function setColumnHeaderClass($value) |
|
134 | + { |
|
125 | 135 | $this->columnHeaderClass= $value; |
126 | 136 | } |
127 | 137 | |
@@ -130,7 +140,8 @@ discard block |
||
130 | 140 | * |
131 | 141 | * @param $value A class for regular table rows. |
132 | 142 | */ |
133 | - function setRowRegularClass($value) { |
|
143 | + function setRowRegularClass($value) |
|
144 | + { |
|
134 | 145 | $this->rowRegularClass= $value; |
135 | 146 | } |
136 | 147 | |
@@ -139,7 +150,8 @@ discard block |
||
139 | 150 | * |
140 | 151 | * @param $value A class for alternate table rows. |
141 | 152 | */ |
142 | - function setRowAlternateClass($value) { |
|
153 | + function setRowAlternateClass($value) |
|
154 | + { |
|
143 | 155 | $this->rowAlternateClass= $value; |
144 | 156 | } |
145 | 157 | |
@@ -148,7 +160,8 @@ discard block |
||
148 | 160 | * |
149 | 161 | * @param $value Indicates the INPUT form element type attribute. |
150 | 162 | */ |
151 | - function setFormElementType($value) { |
|
163 | + function setFormElementType($value) |
|
164 | + { |
|
152 | 165 | $this->formElementType= $value; |
153 | 166 | } |
154 | 167 | |
@@ -157,7 +170,8 @@ discard block |
||
157 | 170 | * |
158 | 171 | * @param $value Indicates the INPUT form element name attribute. |
159 | 172 | */ |
160 | - function setFormElementName($value) { |
|
173 | + function setFormElementName($value) |
|
174 | + { |
|
161 | 175 | $this->formElementName= $value; |
162 | 176 | } |
163 | 177 | |
@@ -167,7 +181,8 @@ discard block |
||
167 | 181 | * |
168 | 182 | * @param $value Indicates the FORM name attribute. |
169 | 183 | */ |
170 | - function setFormName($value) { |
|
184 | + function setFormName($value) |
|
185 | + { |
|
171 | 186 | $this->formName= $value; |
172 | 187 | } |
173 | 188 | |
@@ -176,7 +191,8 @@ discard block |
||
176 | 191 | * |
177 | 192 | * @param $value Indicates the FORM action attribute. |
178 | 193 | */ |
179 | - function setFormAction($value) { |
|
194 | + function setFormAction($value) |
|
195 | + { |
|
180 | 196 | $this->formAction= $value; |
181 | 197 | } |
182 | 198 | |
@@ -185,7 +201,8 @@ discard block |
||
185 | 201 | * |
186 | 202 | * @param $value An Array of field keys to exclude from the table. |
187 | 203 | */ |
188 | - function setExcludeFields($value) { |
|
204 | + function setExcludeFields($value) |
|
205 | + { |
|
189 | 206 | $this->excludeFields= $value; |
190 | 207 | } |
191 | 208 | |
@@ -194,7 +211,8 @@ discard block |
||
194 | 211 | * |
195 | 212 | * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme. |
196 | 213 | */ |
197 | - function setRowAlternatingScheme($value) { |
|
214 | + function setRowAlternatingScheme($value) |
|
215 | + { |
|
198 | 216 | $this->rowAlternatingScheme= $value; |
199 | 217 | } |
200 | 218 | |
@@ -204,7 +222,8 @@ discard block |
||
204 | 222 | * |
205 | 223 | * @param $value The key of the field to add as a query string parameter. |
206 | 224 | */ |
207 | - function setActionFieldName($value) { |
|
225 | + function setActionFieldName($value) |
|
226 | + { |
|
208 | 227 | $this->actionField= $value; |
209 | 228 | } |
210 | 229 | |
@@ -214,7 +233,8 @@ discard block |
||
214 | 233 | * @param $value An Array of column widths in the order of the keys in the |
215 | 234 | * source table array. |
216 | 235 | */ |
217 | - function setColumnWidths($widthArray) { |
|
236 | + function setColumnWidths($widthArray) |
|
237 | + { |
|
218 | 238 | $this->columnWidths= $widthArray; |
219 | 239 | } |
220 | 240 | |
@@ -223,7 +243,8 @@ discard block |
||
223 | 243 | * |
224 | 244 | * @param $value Indicates the INPUT form element type attribute. |
225 | 245 | */ |
226 | - function setSelectedValues($valueArray) { |
|
246 | + function setSelectedValues($valueArray) |
|
247 | + { |
|
227 | 248 | $this->selectedValues= $valueArray; |
228 | 249 | } |
229 | 250 | |
@@ -233,7 +254,8 @@ discard block |
||
233 | 254 | * |
234 | 255 | * @param $value A string of additional content. |
235 | 256 | */ |
236 | - function setExtra($value) { |
|
257 | + function setExtra($value) |
|
258 | + { |
|
237 | 259 | $this->extra= $value; |
238 | 260 | } |
239 | 261 | |
@@ -242,7 +264,8 @@ discard block |
||
242 | 264 | * |
243 | 265 | * @param $columnPosition The index of the column to get the width for. |
244 | 266 | */ |
245 | - function getColumnWidth($columnPosition) { |
|
267 | + function getColumnWidth($columnPosition) |
|
268 | + { |
|
246 | 269 | $currentWidth= ''; |
247 | 270 | if (is_array($this->columnWidths)) { |
248 | 271 | $currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : ''; |
@@ -255,7 +278,8 @@ discard block |
||
255 | 278 | * |
256 | 279 | * @param $value The position of the current row being rendered. |
257 | 280 | */ |
258 | - function determineRowClass($position) { |
|
281 | + function determineRowClass($position) |
|
282 | + { |
|
259 | 283 | switch ($this->rowAlternatingScheme) { |
260 | 284 | case 'ODD' : |
261 | 285 | $modRemainder= 1; |
@@ -278,7 +302,8 @@ discard block |
||
278 | 302 | * |
279 | 303 | * @param $value Indicates the INPUT form element type attribute. |
280 | 304 | */ |
281 | - function getCellAction($currentActionFieldValue) { |
|
305 | + function getCellAction($currentActionFieldValue) |
|
306 | + { |
|
282 | 307 | if ($this->cellAction) { |
283 | 308 | $cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" '; |
284 | 309 | } |
@@ -291,7 +316,8 @@ discard block |
||
291 | 316 | * @param $currentActionFieldValue The value to be applied to the link action. |
292 | 317 | * @param $value The value of the cell. |
293 | 318 | */ |
294 | - function createCellText($currentActionFieldValue, $value) { |
|
319 | + function createCellText($currentActionFieldValue, $value) |
|
320 | + { |
|
295 | 321 | $cell .= $value; |
296 | 322 | if ($this->linkAction) { |
297 | 323 | $cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>'; |
@@ -303,7 +329,8 @@ discard block |
||
303 | 329 | * Sets an option to generate a check all link when checkbox is indicated |
304 | 330 | * as the table formElementType. |
305 | 331 | */ |
306 | - function setAllOption() { |
|
332 | + function setAllOption() |
|
333 | + { |
|
307 | 334 | $this->allOption= 1; |
308 | 335 | } |
309 | 336 | |
@@ -312,7 +339,8 @@ discard block |
||
312 | 339 | * |
313 | 340 | * @param $value Indicates the INPUT form element type attribute. |
314 | 341 | */ |
315 | - function prepareLink($link) { |
|
342 | + function prepareLink($link) |
|
343 | + { |
|
316 | 344 | if (strstr($link, '?')) { |
317 | 345 | $end= '&'; |
318 | 346 | } else { |
@@ -331,7 +359,8 @@ discard block |
||
331 | 359 | * the $fieldsArray where the values represent the alt heading content |
332 | 360 | * for each column. |
333 | 361 | */ |
334 | - function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") { |
|
362 | + function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") |
|
363 | + { |
|
335 | 364 | global $_lang; |
336 | 365 | if (is_array($fieldsArray)) { |
337 | 366 | $i= 0; |
@@ -367,7 +396,8 @@ discard block |
||
367 | 396 | if ($this->formElementType) { |
368 | 397 | $table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table; |
369 | 398 | } |
370 | - if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists. |
|
399 | + if (strlen($this->pageNav) > 1) { |
|
400 | +//changed to display the pagination if exists. |
|
371 | 401 | /* commented this part because of cookie |
372 | 402 | $table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">'; |
373 | 403 | $pageSizes= array (10, 25, 50, 100, 250); |
@@ -414,7 +444,8 @@ discard block |
||
414 | 444 | * @param $numRecords The number of records to show per page. |
415 | 445 | * @param $qs An optional query string to be appended to the paging links |
416 | 446 | */ |
417 | - function createPagingNavigation($numRecords, $qs='') { |
|
447 | + function createPagingNavigation($numRecords, $qs='') |
|
448 | + { |
|
418 | 449 | global $_lang; |
419 | 450 | $currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1); |
420 | 451 | $numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM); |
@@ -429,10 +460,11 @@ discard block |
||
429 | 460 | $offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0); |
430 | 461 | $i= 1; |
431 | 462 | while ($i < 10 && ($currentPage + $offset <= $numPages)) { |
432 | - if ($currentPage == $currentPage + $offset) |
|
433 | - $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true); |
|
434 | - else |
|
435 | - $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset); |
|
463 | + if ($currentPage == $currentPage + $offset) { |
|
464 | + $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true); |
|
465 | + } else { |
|
466 | + $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset); |
|
467 | + } |
|
436 | 468 | $i ++; |
437 | 469 | $offset ++; |
438 | 470 | } |
@@ -455,11 +487,14 @@ discard block |
||
455 | 487 | * @param $currentPage Indicates if the link is to the current page. |
456 | 488 | * @param $qs And optional query string to be appended to the link. |
457 | 489 | */ |
458 | - function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') { |
|
490 | + function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') |
|
491 | + { |
|
459 | 492 | global $modx; |
460 | 493 | $orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: ''; |
461 | 494 | $orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: ''; |
462 | - if (!empty($qs)) $qs= "?$qs"; |
|
495 | + if (!empty($qs)) { |
|
496 | + $qs= "?$qs"; |
|
497 | + } |
|
463 | 498 | $link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum"; |
464 | 499 | $nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n"; |
465 | 500 | return $nav; |
@@ -472,7 +507,8 @@ discard block |
||
472 | 507 | * @param $isChecked Indicates if the checked attribute should apply to the |
473 | 508 | * element. |
474 | 509 | */ |
475 | - function addFormField($value, $isChecked) { |
|
510 | + function addFormField($value, $isChecked) |
|
511 | + { |
|
476 | 512 | if ($this->formElementType) { |
477 | 513 | $checked= $isChecked? "checked ": ""; |
478 | 514 | $field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'" value="'.$value.'" '.$checked.'/></td>'."\n"; |
@@ -484,7 +520,8 @@ discard block |
||
484 | 520 | * Generates the proper LIMIT clause for queries to retrieve paged results in |
485 | 521 | * a MakeTable $fieldsArray. |
486 | 522 | */ |
487 | - function handlePaging() { |
|
523 | + function handlePaging() |
|
524 | + { |
|
488 | 525 | $offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0; |
489 | 526 | $limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM; |
490 | 527 | return $limitClause; |
@@ -496,7 +533,8 @@ discard block |
||
496 | 533 | * |
497 | 534 | * @param $natural_order If true, the results are returned in natural order. |
498 | 535 | */ |
499 | - function handleSorting($natural_order=false) { |
|
536 | + function handleSorting($natural_order=false) |
|
537 | + { |
|
500 | 538 | $orderByClause= ''; |
501 | 539 | if (!$natural_order) { |
502 | 540 | $orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id"; |
@@ -514,7 +552,8 @@ discard block |
||
514 | 552 | * @param $text The text for the link (e.g. table column header). |
515 | 553 | * @param $qs An optional query string to append to the order by link. |
516 | 554 | */ |
517 | - function prepareOrderByLink($key, $text, $qs='') { |
|
555 | + function prepareOrderByLink($key, $text, $qs='') |
|
556 | + { |
|
518 | 557 | global $modx; |
519 | 558 | if (!empty($_GET['orderdir'])) { |
520 | 559 | $orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc'; |
@@ -522,7 +561,9 @@ discard block |
||
522 | 561 | $orderDir= '&orderdir=asc'; |
523 | 562 | } |
524 | 563 | if (!empty($qs)) { |
525 | - if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&'; |
|
564 | + if (!strrpos($qs, '&')==strlen($qs)-1) { |
|
565 | + $qs.= '&'; |
|
566 | + } |
|
526 | 567 | } |
527 | 568 | return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>'; |
528 | 569 | } |
@@ -48,6 +48,9 @@ discard block |
||
48 | 48 | Input: url from wich the rss file was fetched |
49 | 49 | Output: true on sucess |
50 | 50 | \*=======================================================================*/ |
51 | + /** |
|
52 | + * @param string $url |
|
53 | + */ |
|
51 | 54 | function set ($url, $rss) { |
52 | 55 | $this->ERROR = ""; |
53 | 56 | $cache_file = $this->file_name( $url ); |
@@ -74,6 +77,9 @@ discard block |
||
74 | 77 | Input: url from wich the rss file was fetched |
75 | 78 | Output: cached object on HIT, false on MISS |
76 | 79 | \*=======================================================================*/ |
80 | + /** |
|
81 | + * @param string $url |
|
82 | + */ |
|
77 | 83 | function get ($url) { |
78 | 84 | $this->ERROR = ""; |
79 | 85 | $cache_file = $this->file_name( $url ); |
@@ -110,6 +116,9 @@ discard block |
||
110 | 116 | Input: url from wich the rss file was fetched |
111 | 117 | Output: cached object on HIT, false on MISS |
112 | 118 | \*=======================================================================*/ |
119 | + /** |
|
120 | + * @param string $url |
|
121 | + */ |
|
113 | 122 | function check_cache ( $url ) { |
114 | 123 | $this->ERROR = ""; |
115 | 124 | $filename = $this->file_name( $url ); |
@@ -156,6 +165,9 @@ discard block |
||
156 | 165 | /*=======================================================================*\ |
157 | 166 | Function: unserialize |
158 | 167 | \*=======================================================================*/ |
168 | + /** |
|
169 | + * @param string $data |
|
170 | + */ |
|
159 | 171 | function unserialize ( $data ) { |
160 | 172 | return unserialize( $data ); |
161 | 173 | } |
@@ -16,12 +16,14 @@ discard block |
||
16 | 16 | * |
17 | 17 | */ |
18 | 18 | |
19 | -class RSSCache { |
|
19 | +class RSSCache |
|
20 | +{ |
|
20 | 21 | var $BASE_CACHE = './cache'; // where the cache files are stored |
21 | 22 | var $MAX_AGE = 3600; // when are files stale, default one hour |
22 | 23 | var $ERROR = ""; // accumulate error messages |
23 | 24 | |
24 | - function __construct($base='', $age='') { |
|
25 | + function __construct($base='', $age='') |
|
26 | + { |
|
25 | 27 | if ( $base ) { |
26 | 28 | $this->BASE_CACHE = $base; |
27 | 29 | } |
@@ -48,7 +50,8 @@ discard block |
||
48 | 50 | Input: url from wich the rss file was fetched |
49 | 51 | Output: true on sucess |
50 | 52 | \*=======================================================================*/ |
51 | - function set ($url, $rss) { |
|
53 | + function set ($url, $rss) |
|
54 | + { |
|
52 | 55 | $this->ERROR = ""; |
53 | 56 | $cache_file = $this->file_name( $url ); |
54 | 57 | $fp = @fopen( $cache_file, 'w' ); |
@@ -74,7 +77,8 @@ discard block |
||
74 | 77 | Input: url from wich the rss file was fetched |
75 | 78 | Output: cached object on HIT, false on MISS |
76 | 79 | \*=======================================================================*/ |
77 | - function get ($url) { |
|
80 | + function get ($url) |
|
81 | + { |
|
78 | 82 | $this->ERROR = ""; |
79 | 83 | $cache_file = $this->file_name( $url ); |
80 | 84 | |
@@ -110,7 +114,8 @@ discard block |
||
110 | 114 | Input: url from wich the rss file was fetched |
111 | 115 | Output: cached object on HIT, false on MISS |
112 | 116 | \*=======================================================================*/ |
113 | - function check_cache ( $url ) { |
|
117 | + function check_cache ( $url ) |
|
118 | + { |
|
114 | 119 | $this->ERROR = ""; |
115 | 120 | $filename = $this->file_name( $url ); |
116 | 121 | |
@@ -122,26 +127,24 @@ discard block |
||
122 | 127 | if ( $this->MAX_AGE > $age ) { |
123 | 128 | // object exists and is current |
124 | 129 | return 'HIT'; |
125 | - } |
|
126 | - else { |
|
130 | + } else { |
|
127 | 131 | // object exists but is old |
128 | 132 | return 'STALE'; |
129 | 133 | } |
130 | - } |
|
131 | - else { |
|
134 | + } else { |
|
132 | 135 | // object does not exist |
133 | 136 | return 'MISS'; |
134 | 137 | } |
135 | 138 | } |
136 | 139 | |
137 | - function cache_age( $cache_key ) { |
|
140 | + function cache_age( $cache_key ) |
|
141 | + { |
|
138 | 142 | $filename = $this->file_name( $url ); |
139 | 143 | if ( file_exists( $filename ) ) { |
140 | 144 | $mtime = filemtime( $filename ); |
141 | 145 | $age = time() - $mtime; |
142 | 146 | return $age; |
143 | - } |
|
144 | - else { |
|
147 | + } else { |
|
145 | 148 | return -1; |
146 | 149 | } |
147 | 150 | } |
@@ -149,14 +152,16 @@ discard block |
||
149 | 152 | /*=======================================================================*\ |
150 | 153 | Function: serialize |
151 | 154 | \*=======================================================================*/ |
152 | - function serialize ( $rss ) { |
|
155 | + function serialize ( $rss ) |
|
156 | + { |
|
153 | 157 | return serialize( $rss ); |
154 | 158 | } |
155 | 159 | |
156 | 160 | /*=======================================================================*\ |
157 | 161 | Function: unserialize |
158 | 162 | \*=======================================================================*/ |
159 | - function unserialize ( $data ) { |
|
163 | + function unserialize ( $data ) |
|
164 | + { |
|
160 | 165 | return unserialize( $data ); |
161 | 166 | } |
162 | 167 | |
@@ -166,7 +171,8 @@ discard block |
||
166 | 171 | Input: url from wich the rss file was fetched |
167 | 172 | Output: a file name |
168 | 173 | \*=======================================================================*/ |
169 | - function file_name ($url) { |
|
174 | + function file_name ($url) |
|
175 | + { |
|
170 | 176 | $filename = md5( $url ); |
171 | 177 | return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) ); |
172 | 178 | } |
@@ -175,7 +181,8 @@ discard block |
||
175 | 181 | Function: error |
176 | 182 | Purpose: register error |
177 | 183 | \*=======================================================================*/ |
178 | - function error ($errormsg, $lvl=E_USER_WARNING) { |
|
184 | + function error ($errormsg, $lvl=E_USER_WARNING) |
|
185 | + { |
|
179 | 186 | // append PHP's error message if track_errors enabled |
180 | 187 | if ( isset($php_errormsg) ) { |
181 | 188 | $errormsg .= " ($php_errormsg)"; |
@@ -183,13 +190,13 @@ discard block |
||
183 | 190 | $this->ERROR = $errormsg; |
184 | 191 | if ( MAGPIE_DEBUG ) { |
185 | 192 | trigger_error( $errormsg, $lvl); |
186 | - } |
|
187 | - else { |
|
193 | + } else { |
|
188 | 194 | error_log( $errormsg, 0); |
189 | 195 | } |
190 | 196 | } |
191 | 197 | |
192 | - function debug ($debugmsg, $lvl=E_USER_NOTICE) { |
|
198 | + function debug ($debugmsg, $lvl=E_USER_NOTICE) |
|
199 | + { |
|
193 | 200 | if ( MAGPIE_DEBUG ) { |
194 | 201 | $this->error("MagpieRSS [debug] $debugmsg", $lvl); |
195 | 202 | } |
@@ -447,6 +447,10 @@ discard block |
||
447 | 447 | /** |
448 | 448 | * return XML parser, and possibly re-encoded source |
449 | 449 | * |
450 | + * @param string $source |
|
451 | + * @param string $out_enc |
|
452 | + * @param string|null $in_enc |
|
453 | + * @param boolean $detect |
|
450 | 454 | */ |
451 | 455 | function create_parser($source, $out_enc, $in_enc, $detect) { |
452 | 456 | if ( substr(phpversion(),0,1) == 5) { |
@@ -556,6 +560,9 @@ discard block |
||
556 | 560 | } |
557 | 561 | } |
558 | 562 | |
563 | + /** |
|
564 | + * @param integer $lvl |
|
565 | + */ |
|
559 | 566 | function error ($errormsg, $lvl=E_USER_WARNING) { |
560 | 567 | // append PHP's error message if track_errors enabled |
561 | 568 | if ( isset($php_errormsg) ) { |
@@ -591,6 +598,9 @@ discard block |
||
591 | 598 | define("CASE_LOWER",0); |
592 | 599 | |
593 | 600 | |
601 | + /** |
|
602 | + * @param integer $case |
|
603 | + */ |
|
594 | 604 | function array_change_key_case($array,$case=CASE_LOWER) { |
595 | 605 | if ($case=CASE_LOWER) $cmd=strtolower; |
596 | 606 | elseif ($case=CASE_UPPER) $cmd=strtoupper; |
@@ -31,7 +31,8 @@ discard block |
||
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 | 36 | var $parser; |
36 | 37 | |
37 | 38 | var $current_item = array(); // item currently being parsed |
@@ -143,7 +144,8 @@ discard block |
||
143 | 144 | $this->normalize(); |
144 | 145 | } |
145 | 146 | |
146 | - function feed_start_element($p, $element, &$attrs) { |
|
147 | + function feed_start_element($p, $element, &$attrs) |
|
148 | + { |
|
147 | 149 | $el = $element = strtolower($element); |
148 | 150 | $attrs = array_change_key_case($attrs, CASE_LOWER); |
149 | 151 | |
@@ -163,12 +165,10 @@ discard block |
||
163 | 165 | if ( $el == 'rdf' ) { |
164 | 166 | $this->feed_type = RSS; |
165 | 167 | $this->feed_version = '1.0'; |
166 | - } |
|
167 | - elseif ( $el == 'rss' ) { |
|
168 | + } elseif ( $el == 'rss' ) { |
|
168 | 169 | $this->feed_type = RSS; |
169 | 170 | $this->feed_version = $attrs['version']; |
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,12 +176,9 @@ discard block |
||
176 | 176 | return; |
177 | 177 | } |
178 | 178 | |
179 | - if ( $el == 'channel' ) |
|
180 | - { |
|
179 | + if ( $el == 'channel' ) { |
|
181 | 180 | $this->inchannel = true; |
182 | - } |
|
183 | - elseif ($el == 'item' or $el == 'entry' ) |
|
184 | - { |
|
181 | + } elseif ($el == 'item' or $el == 'entry' ) { |
|
185 | 182 | $this->initem = true; |
186 | 183 | if ( isset($attrs['rdf:about']) ) { |
187 | 184 | $this->current_item['about'] = $attrs['rdf:about']; |
@@ -193,22 +190,17 @@ discard block |
||
193 | 190 | elseif ( |
194 | 191 | $this->feed_type == RSS and |
195 | 192 | $this->current_namespace == '' and |
196 | - $el == 'textinput' ) |
|
197 | - { |
|
193 | + $el == 'textinput' ) { |
|
198 | 194 | $this->intextinput = true; |
199 | - } |
|
200 | - |
|
201 | - elseif ( |
|
195 | + } elseif ( |
|
202 | 196 | $this->feed_type == RSS and |
203 | 197 | $this->current_namespace == '' and |
204 | - $el == 'image' ) |
|
205 | - { |
|
198 | + $el == 'image' ) { |
|
206 | 199 | $this->inimage = true; |
207 | 200 | } |
208 | 201 | |
209 | 202 | # handle atom content constructs |
210 | - elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) |
|
211 | - { |
|
203 | + elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) { |
|
212 | 204 | // avoid clashing w/ RSS mod_content |
213 | 205 | if ($el == 'content' ) { |
214 | 206 | $el = 'atom_content'; |
@@ -220,8 +212,7 @@ discard block |
||
220 | 212 | } |
221 | 213 | |
222 | 214 | // 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 ) |
|
224 | - { |
|
215 | + elseif ($this->feed_type == ATOM and $this->incontent ) { |
|
225 | 216 | // if tags are inlined, then flatten |
226 | 217 | $attrs_str = join(' ', |
227 | 218 | array_map('map_attrs', |
@@ -237,13 +228,10 @@ discard block |
||
237 | 228 | // Magpie treats link elements of type rel='alternate' |
238 | 229 | // as being equivalent to RSS's simple link element. |
239 | 230 | // |
240 | - elseif ($this->feed_type == ATOM and $el == 'link' ) |
|
241 | - { |
|
242 | - if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) |
|
243 | - { |
|
231 | + elseif ($this->feed_type == ATOM and $el == 'link' ) { |
|
232 | + if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) { |
|
244 | 233 | $link_el = 'link'; |
245 | - } |
|
246 | - else { |
|
234 | + } else { |
|
247 | 235 | $link_el = 'link_' . $attrs['rel']; |
248 | 236 | } |
249 | 237 | |
@@ -257,63 +245,51 @@ discard block |
||
257 | 245 | |
258 | 246 | |
259 | 247 | |
260 | - function feed_cdata ($p, $text) { |
|
261 | - if ($this->feed_type == ATOM and $this->incontent) |
|
262 | - { |
|
248 | + function feed_cdata ($p, $text) |
|
249 | + { |
|
250 | + if ($this->feed_type == ATOM and $this->incontent) { |
|
263 | 251 | $this->append_content( $text ); |
264 | - } |
|
265 | - else { |
|
252 | + } else { |
|
266 | 253 | $current_el = join('_', array_reverse($this->stack)); |
267 | 254 | $this->append($current_el, $text); |
268 | 255 | } |
269 | 256 | } |
270 | 257 | |
271 | - function feed_end_element ($p, $el) { |
|
258 | + function feed_end_element ($p, $el) |
|
259 | + { |
|
272 | 260 | $el = strtolower($el); |
273 | 261 | |
274 | - if ( $el == 'item' or $el == 'entry' ) |
|
275 | - { |
|
262 | + if ( $el == 'item' or $el == 'entry' ) { |
|
276 | 263 | $this->items[] = $this->current_item; |
277 | 264 | $this->current_item = array(); |
278 | 265 | $this->initem = false; |
279 | - } |
|
280 | - elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) |
|
281 | - { |
|
266 | + } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) { |
|
282 | 267 | $this->intextinput = false; |
283 | - } |
|
284 | - elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) |
|
285 | - { |
|
268 | + } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) { |
|
286 | 269 | $this->inimage = false; |
287 | - } |
|
288 | - elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) |
|
289 | - { |
|
270 | + } elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) { |
|
290 | 271 | $this->incontent = false; |
291 | - } |
|
292 | - elseif ($el == 'channel' or $el == 'feed' ) |
|
293 | - { |
|
272 | + } elseif ($el == 'channel' or $el == 'feed' ) { |
|
294 | 273 | $this->inchannel = false; |
295 | - } |
|
296 | - elseif ($this->feed_type == ATOM and $this->incontent ) { |
|
274 | + } elseif ($this->feed_type == ATOM and $this->incontent ) { |
|
297 | 275 | // balance tags properly |
298 | 276 | // note: i don't think this is actually neccessary |
299 | - if ( $this->stack[0] == $el ) |
|
300 | - { |
|
277 | + if ( $this->stack[0] == $el ) { |
|
301 | 278 | $this->append_content("</$el>"); |
302 | - } |
|
303 | - else { |
|
279 | + } else { |
|
304 | 280 | $this->append_content("<$el />"); |
305 | 281 | } |
306 | 282 | |
307 | 283 | array_shift( $this->stack ); |
308 | - } |
|
309 | - else { |
|
284 | + } else { |
|
310 | 285 | array_shift( $this->stack ); |
311 | 286 | } |
312 | 287 | |
313 | 288 | $this->current_namespace = false; |
314 | 289 | } |
315 | 290 | |
316 | - function concat (&$str1, $str2="") { |
|
291 | + function concat (&$str1, $str2="") |
|
292 | + { |
|
317 | 293 | if (!isset($str1) ) { |
318 | 294 | $str1=""; |
319 | 295 | } |
@@ -322,53 +298,46 @@ discard block |
||
322 | 298 | |
323 | 299 | |
324 | 300 | |
325 | - function append_content($text) { |
|
301 | + function append_content($text) |
|
302 | + { |
|
326 | 303 | if ( $this->initem ) { |
327 | 304 | $this->concat( $this->current_item[ $this->incontent ], $text ); |
328 | - } |
|
329 | - elseif ( $this->inchannel ) { |
|
305 | + } elseif ( $this->inchannel ) { |
|
330 | 306 | $this->concat( $this->channel[ $this->incontent ], $text ); |
331 | 307 | } |
332 | 308 | } |
333 | 309 | |
334 | 310 | // smart append - field and namespace aware |
335 | - function append($el, $text) { |
|
311 | + function append($el, $text) |
|
312 | + { |
|
336 | 313 | if (!$el) { |
337 | 314 | return; |
338 | 315 | } |
339 | - if ( $this->current_namespace ) |
|
340 | - { |
|
316 | + if ( $this->current_namespace ) { |
|
341 | 317 | if ( $this->initem ) { |
342 | 318 | $this->concat( |
343 | 319 | $this->current_item[ $this->current_namespace ][ $el ], $text); |
344 | - } |
|
345 | - elseif ($this->inchannel) { |
|
320 | + } elseif ($this->inchannel) { |
|
346 | 321 | $this->concat( |
347 | 322 | $this->channel[ $this->current_namespace][ $el ], $text ); |
348 | - } |
|
349 | - elseif ($this->intextinput) { |
|
323 | + } elseif ($this->intextinput) { |
|
350 | 324 | $this->concat( |
351 | 325 | $this->textinput[ $this->current_namespace][ $el ], $text ); |
352 | - } |
|
353 | - elseif ($this->inimage) { |
|
326 | + } elseif ($this->inimage) { |
|
354 | 327 | $this->concat( |
355 | 328 | $this->image[ $this->current_namespace ][ $el ], $text ); |
356 | 329 | } |
357 | - } |
|
358 | - else { |
|
330 | + } else { |
|
359 | 331 | if ( $this->initem ) { |
360 | 332 | $this->concat( |
361 | 333 | $this->current_item[ $el ], $text); |
362 | - } |
|
363 | - elseif ($this->intextinput) { |
|
334 | + } elseif ($this->intextinput) { |
|
364 | 335 | $this->concat( |
365 | 336 | $this->textinput[ $el ], $text ); |
366 | - } |
|
367 | - elseif ($this->inimage) { |
|
337 | + } elseif ($this->inimage) { |
|
368 | 338 | $this->concat( |
369 | 339 | $this->image[ $el ], $text ); |
370 | - } |
|
371 | - elseif ($this->inchannel) { |
|
340 | + } elseif ($this->inchannel) { |
|
372 | 341 | $this->concat( |
373 | 342 | $this->channel[ $el ], $text ); |
374 | 343 | } |
@@ -376,16 +345,19 @@ discard block |
||
376 | 345 | } |
377 | 346 | } |
378 | 347 | |
379 | - function normalize () { |
|
348 | + function normalize () |
|
349 | + { |
|
380 | 350 | // if atom populate rss fields |
381 | 351 | if ( $this->is_atom() ) { |
382 | 352 | $this->channel['description'] = $this->channel['tagline']; |
383 | 353 | for ( $i = 0; $i < count($this->items); $i++) { |
384 | 354 | $item = $this->items[$i]; |
385 | - if ( isset($item['summary']) ) |
|
386 | - $item['description'] = $item['summary']; |
|
387 | - if ( isset($item['atom_content'])) |
|
388 | - $item['content']['encoded'] = $item['atom_content']; |
|
355 | + if ( isset($item['summary']) ) { |
|
356 | + $item['description'] = $item['summary']; |
|
357 | + } |
|
358 | + if ( isset($item['atom_content'])) { |
|
359 | + $item['content']['encoded'] = $item['atom_content']; |
|
360 | + } |
|
389 | 361 | |
390 | 362 | $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified']; |
391 | 363 | if ( $atom_date ) { |
@@ -397,23 +369,23 @@ discard block |
||
397 | 369 | |
398 | 370 | $this->items[$i] = $item; |
399 | 371 | } |
400 | - } |
|
401 | - elseif ( $this->is_rss() ) { |
|
372 | + } elseif ( $this->is_rss() ) { |
|
402 | 373 | $this->channel['tagline'] = $this->channel['description']; |
403 | 374 | for ( $i = 0; $i < count($this->items); $i++) { |
404 | 375 | $item = $this->items[$i]; |
405 | - if ( isset($item['description'])) |
|
406 | - $item['summary'] = $item['description']; |
|
407 | - if ( isset($item['content']['encoded'] ) ) |
|
408 | - $item['atom_content'] = $item['content']['encoded']; |
|
376 | + if ( isset($item['description'])) { |
|
377 | + $item['summary'] = $item['description']; |
|
378 | + } |
|
379 | + if ( isset($item['content']['encoded'] ) ) { |
|
380 | + $item['atom_content'] = $item['content']['encoded']; |
|
381 | + } |
|
409 | 382 | |
410 | 383 | if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) { |
411 | 384 | $epoch = @parse_w3cdtf($item['dc']['date']); |
412 | 385 | if ($epoch and $epoch > 0) { |
413 | 386 | $item['date_timestamp'] = $epoch; |
414 | 387 | } |
415 | - } |
|
416 | - elseif ( isset($item['pubdate']) ) { |
|
388 | + } elseif ( isset($item['pubdate']) ) { |
|
417 | 389 | $epoch = @strtotime($item['pubdate']); |
418 | 390 | if ($epoch > 0) { |
419 | 391 | $item['date_timestamp'] = $epoch; |
@@ -426,20 +398,20 @@ discard block |
||
426 | 398 | } |
427 | 399 | |
428 | 400 | |
429 | - function is_rss () { |
|
401 | + function is_rss () |
|
402 | + { |
|
430 | 403 | if ( $this->feed_type == RSS ) { |
431 | 404 | return $this->feed_version; |
432 | - } |
|
433 | - else { |
|
405 | + } else { |
|
434 | 406 | return false; |
435 | 407 | } |
436 | 408 | } |
437 | 409 | |
438 | - function is_atom() { |
|
410 | + function is_atom() |
|
411 | + { |
|
439 | 412 | if ( $this->feed_type == ATOM ) { |
440 | 413 | return $this->feed_version; |
441 | - } |
|
442 | - else { |
|
414 | + } else { |
|
443 | 415 | return false; |
444 | 416 | } |
445 | 417 | } |
@@ -448,11 +420,11 @@ discard block |
||
448 | 420 | * return XML parser, and possibly re-encoded source |
449 | 421 | * |
450 | 422 | */ |
451 | - function create_parser($source, $out_enc, $in_enc, $detect) { |
|
423 | + function create_parser($source, $out_enc, $in_enc, $detect) |
|
424 | + { |
|
452 | 425 | if ( substr(phpversion(),0,1) == 5) { |
453 | 426 | $parser = $this->php5_create_parser($in_enc, $detect); |
454 | - } |
|
455 | - else { |
|
427 | + } else { |
|
456 | 428 | list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect); |
457 | 429 | } |
458 | 430 | if ($out_enc) { |
@@ -472,12 +444,12 @@ discard block |
||
472 | 444 | * All hail libxml2! |
473 | 445 | * |
474 | 446 | */ |
475 | - function php5_create_parser($in_enc, $detect) { |
|
447 | + function php5_create_parser($in_enc, $detect) |
|
448 | + { |
|
476 | 449 | // by default php5 does a fine job of detecting input encodings |
477 | 450 | if(!$detect && $in_enc) { |
478 | 451 | return xml_parser_create($in_enc); |
479 | - } |
|
480 | - else { |
|
452 | + } else { |
|
481 | 453 | return xml_parser_create(''); |
482 | 454 | } |
483 | 455 | } |
@@ -497,7 +469,8 @@ discard block |
||
497 | 469 | * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss |
498 | 470 | * |
499 | 471 | */ |
500 | - function php4_create_parser($source, $in_enc, $detect) { |
|
472 | + function php4_create_parser($source, $in_enc, $detect) |
|
473 | + { |
|
501 | 474 | if ( !$detect ) { |
502 | 475 | return array(xml_parser_create($in_enc), $source); |
503 | 476 | } |
@@ -506,8 +479,7 @@ discard block |
||
506 | 479 | if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) { |
507 | 480 | $in_enc = strtoupper($m[1]); |
508 | 481 | $this->source_encoding = $in_enc; |
509 | - } |
|
510 | - else { |
|
482 | + } else { |
|
511 | 483 | $in_enc = 'UTF-8'; |
512 | 484 | } |
513 | 485 | } |
@@ -522,7 +494,7 @@ discard block |
||
522 | 494 | // cast the XML to a known encoding |
523 | 495 | // @see http://php.net/iconv |
524 | 496 | |
525 | - if (function_exists('iconv')) { |
|
497 | + if (function_exists('iconv')) { |
|
526 | 498 | $encoded_source = iconv($in_enc,'UTF-8', $source); |
527 | 499 | if ($encoded_source) { |
528 | 500 | return array(xml_parser_create('UTF-8'), $encoded_source); |
@@ -546,25 +518,25 @@ discard block |
||
546 | 518 | return array(xml_parser_create(), $source); |
547 | 519 | } |
548 | 520 | |
549 | - function known_encoding($enc) { |
|
521 | + function known_encoding($enc) |
|
522 | + { |
|
550 | 523 | $enc = strtoupper($enc); |
551 | 524 | if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) { |
552 | 525 | return $enc; |
553 | - } |
|
554 | - else { |
|
526 | + } else { |
|
555 | 527 | return false; |
556 | 528 | } |
557 | 529 | } |
558 | 530 | |
559 | - function error ($errormsg, $lvl=E_USER_WARNING) { |
|
531 | + function error ($errormsg, $lvl=E_USER_WARNING) |
|
532 | + { |
|
560 | 533 | // append PHP's error message if track_errors enabled |
561 | 534 | if ( isset($php_errormsg) ) { |
562 | 535 | $errormsg .= " ($php_errormsg)"; |
563 | 536 | } |
564 | 537 | if ( MAGPIE_DEBUG ) { |
565 | 538 | trigger_error( $errormsg, $lvl); |
566 | - } |
|
567 | - else { |
|
539 | + } else { |
|
568 | 540 | error_log( $errormsg, 0); |
569 | 541 | } |
570 | 542 | |
@@ -579,7 +551,8 @@ discard block |
||
579 | 551 | |
580 | 552 | } // end class RSS |
581 | 553 | |
582 | -function map_attrs($k, $v) { |
|
554 | +function map_attrs($k, $v) |
|
555 | +{ |
|
583 | 556 | return "$k=\"$v\""; |
584 | 557 | } |
585 | 558 | |
@@ -591,9 +564,13 @@ discard block |
||
591 | 564 | define("CASE_LOWER",0); |
592 | 565 | |
593 | 566 | |
594 | - function array_change_key_case($array,$case=CASE_LOWER) { |
|
595 | - if ($case=CASE_LOWER) $cmd=strtolower; |
|
596 | - elseif ($case=CASE_UPPER) $cmd=strtoupper; |
|
567 | + function array_change_key_case($array,$case=CASE_LOWER) |
|
568 | + { |
|
569 | + if ($case=CASE_LOWER) { |
|
570 | + $cmd=strtolower; |
|
571 | + } elseif ($case=CASE_UPPER) { |
|
572 | + $cmd=strtoupper; |
|
573 | + } |
|
597 | 574 | foreach($array as $key=>$value) { |
598 | 575 | $output[$cmd($key)]=$value; |
599 | 576 | } |
@@ -43,7 +43,8 @@ discard block |
||
43 | 43 | ## see sample.php for test and usage |
44 | 44 | ## sample URL: http://www.program-ruti.org/veriword/ |
45 | 45 | #### |
46 | -class VeriWord { |
|
46 | +class VeriWord |
|
47 | +{ |
|
47 | 48 | |
48 | 49 | /* path to font directory*/ |
49 | 50 | var $dir_font = "ttf/"; |
@@ -53,7 +54,8 @@ discard block |
||
53 | 54 | var $im_width = 0; |
54 | 55 | var $im_height = 0; |
55 | 56 | |
56 | - function __construct($w=200, $h=80) { |
|
57 | + function __construct($w=200, $h=80) |
|
58 | + { |
|
57 | 59 | /* create session to set word for verification */ |
58 | 60 | startCMSSession(); |
59 | 61 | $this->set_veriword(); |
@@ -62,21 +64,24 @@ discard block |
||
62 | 64 | $this->im_height = $h; |
63 | 65 | } |
64 | 66 | |
65 | - function set_veriword() { |
|
67 | + function set_veriword() |
|
68 | + { |
|
66 | 69 | /* create session variable for verification, |
67 | 70 | you may change the session variable name */ |
68 | 71 | $this->word = $this->pick_word(); |
69 | 72 | $_SESSION['veriword'] = $this->word; |
70 | 73 | } |
71 | 74 | |
72 | - function output_image() { |
|
75 | + function output_image() |
|
76 | + { |
|
73 | 77 | /* output the image as jpeg */ |
74 | 78 | $this->draw_image(); |
75 | 79 | header("Content-type: image/jpeg"); |
76 | 80 | imagejpeg($this->im); |
77 | 81 | } |
78 | 82 | |
79 | - function pick_word() { |
|
83 | + function pick_word() |
|
84 | + { |
|
80 | 85 | global $modx; |
81 | 86 | // set default words |
82 | 87 | $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote"; |
@@ -87,7 +92,8 @@ discard block |
||
87 | 92 | return (string) $arr_words[array_rand($arr_words)].rand(10,999); |
88 | 93 | } |
89 | 94 | |
90 | - function draw_text() { |
|
95 | + function draw_text() |
|
96 | + { |
|
91 | 97 | $dir = dir($this->dir_font); |
92 | 98 | $fontstmp = array(); |
93 | 99 | while (false !== ($file = $dir->read())) { |
@@ -143,7 +149,8 @@ discard block |
||
143 | 149 | } |
144 | 150 | |
145 | 151 | |
146 | - function draw_image() { |
|
152 | + function draw_image() |
|
153 | + { |
|
147 | 154 | |
148 | 155 | /* pick one background image randomly from image directory */ |
149 | 156 | $img_file = $this->dir_noise."noise".rand(1,4).".jpg"; |
@@ -174,7 +181,8 @@ discard block |
||
174 | 181 | return $this->im; |
175 | 182 | } |
176 | 183 | |
177 | - function destroy_image() { |
|
184 | + function destroy_image() |
|
185 | + { |
|
178 | 186 | |
179 | 187 | imagedestroy($this->im); |
180 | 188 |
@@ -3,7 +3,9 @@ |
||
3 | 3 | * Message Quit Template |
4 | 4 | * |
5 | 5 | */ |
6 | -if(IN_MANAGER_MODE!="true" && IN_PARSER_MODE!="true") die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited."); |
|
6 | +if(IN_MANAGER_MODE!="true" && IN_PARSER_MODE!="true") { |
|
7 | + die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited."); |
|
8 | +} |
|
7 | 9 | |
8 | 10 | $parsedMessageString = " |
9 | 11 | <html><head><title>EVO Content Manager $version » $release_date</title> |