@@ -34,7 +34,7 @@ |
||
34 | 34 | $newCat = $modx->db->escape($newCat); |
35 | 35 | $cats = $modx->db->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'"); |
36 | 36 | if ($cat = $modx->db->getValue($cats)) { |
37 | - return (int)$cat; |
|
37 | + return (int) $cat; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | return 0; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | if (isset($this->aliases[$id])) { |
95 | 95 | if ($this->aliasVisible[$id] == 1) { |
96 | 96 | if ($path != '') { |
97 | - $path = $this->aliases[$id] . '/' . $path; |
|
97 | + $path = $this->aliases[$id].'/'.$path; |
|
98 | 98 | } else { |
99 | 99 | $path = $this->aliases[$id]; |
100 | 100 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $modx->messageQuit("Cache path not set."); |
119 | 119 | } |
120 | 120 | |
121 | - $files = glob(realpath($this->cachePath) . '/*.pageCache.php'); |
|
121 | + $files = glob(realpath($this->cachePath).'/*.pageCache.php'); |
|
122 | 122 | $filesincache = count($files); |
123 | 123 | $deletedfiles = array(); |
124 | 124 | while ($file = array_shift($files)) { |
@@ -151,9 +151,9 @@ discard block |
||
151 | 151 | if (isset($opcache)) { |
152 | 152 | echo '<p>Opcache empty.</p>'; |
153 | 153 | } |
154 | - echo '<p>' . $_lang['cache_files_deleted'] . '</p><ul>'; |
|
154 | + echo '<p>'.$_lang['cache_files_deleted'].'</p><ul>'; |
|
155 | 155 | foreach ($deletedfiles as $deletedfile) { |
156 | - echo '<li>' . $deletedfile . '</li>'; |
|
156 | + echo '<li>'.$deletedfile.'</li>'; |
|
157 | 157 | } |
158 | 158 | echo '</ul>'; |
159 | 159 | } |
@@ -172,11 +172,11 @@ discard block |
||
172 | 172 | |
173 | 173 | |
174 | 174 | // write the file |
175 | - $content = '<?php' . "\n"; |
|
176 | - $content .= '$recent_update=\'' . $this->request_time . '\';' . "\n"; |
|
177 | - $content .= '$cacheRefreshTime=\'' . $cacheRefreshTime . '\';' . "\n"; |
|
175 | + $content = '<?php'."\n"; |
|
176 | + $content .= '$recent_update=\''.$this->request_time.'\';'."\n"; |
|
177 | + $content .= '$cacheRefreshTime=\''.$cacheRefreshTime.'\';'."\n"; |
|
178 | 178 | |
179 | - $filename = $this->cachePath . '/sitePublishing.idx.php'; |
|
179 | + $filename = $this->cachePath.'/sitePublishing.idx.php'; |
|
180 | 180 | if (!$handle = fopen($filename, 'w')) { |
181 | 181 | exit("Cannot open file ({$filename}"); |
182 | 182 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $timesArr = array(); |
201 | 201 | |
202 | 202 | $result = $modx->db->select('MIN(pub_date) AS minpub', '[+prefix+]site_content', |
203 | - 'pub_date>' . $this->request_time); |
|
203 | + 'pub_date>'.$this->request_time); |
|
204 | 204 | if (!$result) { |
205 | 205 | echo "Couldn't determine next publish event!"; |
206 | 206 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | } |
212 | 212 | |
213 | 213 | $result = $modx->db->select('MIN(unpub_date) AS minunpub', '[+prefix+]site_content', |
214 | - 'unpub_date>' . $this->request_time); |
|
214 | + 'unpub_date>'.$this->request_time); |
|
215 | 215 | if (!$result) { |
216 | 216 | echo "Couldn't determine next unpublish event!"; |
217 | 217 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $config = array(); |
251 | 251 | $content .= '$c=&$this->config;'; |
252 | 252 | while (list($key, $value) = $modx->db->getRow($rs, 'num')) { |
253 | - $content .= '$c[\'' . $key . '\']="' . $this->escapeDoubleQuotes($value) . '";'; |
|
253 | + $content .= '$c[\''.$key.'\']="'.$this->escapeDoubleQuotes($value).'";'; |
|
254 | 254 | $config[$key] = $value; |
255 | 255 | } |
256 | 256 | |
@@ -288,23 +288,23 @@ discard block |
||
288 | 288 | $docid = $doc['id']; |
289 | 289 | if ($use_alias_path) { |
290 | 290 | $tmpPath = $this->getParents($doc['parent']); |
291 | - $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '') . $doc['alias']; |
|
291 | + $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '').$doc['alias']; |
|
292 | 292 | $key = $alias; |
293 | 293 | } else { |
294 | 294 | $key = $doc['alias']; |
295 | 295 | } |
296 | 296 | |
297 | 297 | $doc['path'] = $tmpPath; |
298 | - $content .= '$a[' . $docid . ']=array(\'id\'=>' . $docid . ',\'alias\'=>\'' . $doc['alias'] . '\',\'path\'=>\'' . $doc['path'] . '\',\'parent\'=>' . $doc['parent'] . ',\'isfolder\'=>' . $doc['isfolder'] . ',\'alias_visible\'=>' . $doc['alias_visible'] . ');'; |
|
299 | - $content .= '$d[\'' . $key . '\']=' . $docid . ';'; |
|
300 | - $content .= '$m[]=array(' . $doc['parent'] . '=>' . $docid . ');'; |
|
298 | + $content .= '$a['.$docid.']=array(\'id\'=>'.$docid.',\'alias\'=>\''.$doc['alias'].'\',\'path\'=>\''.$doc['path'].'\',\'parent\'=>'.$doc['parent'].',\'isfolder\'=>'.$doc['isfolder'].',\'alias_visible\'=>'.$doc['alias_visible'].');'; |
|
299 | + $content .= '$d[\''.$key.'\']='.$docid.';'; |
|
300 | + $content .= '$m[]=array('.$doc['parent'].'=>'.$docid.');'; |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | // get content types |
304 | 304 | $rs = $modx->db->select('id, contentType', '[+prefix+]site_content', "contentType!='text/html'"); |
305 | 305 | $content .= '$c=&$this->contentTypes;'; |
306 | 306 | while ($doc = $modx->db->getRow($rs)) { |
307 | - $content .= '$c[\'' . $doc['id'] . '\']=\'' . $doc['contentType'] . '\';'; |
|
307 | + $content .= '$c[\''.$doc['id'].'\']=\''.$doc['contentType'].'\';'; |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | // WRITE Chunks to cache file |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | if ($modx->config['minifyphp_incache']) { |
315 | 315 | $doc['snippet'] = $this->php_strip_whitespace($doc['snippet']); |
316 | 316 | } |
317 | - $content .= '$c[\'' . $doc['name'] . '\']=\'' . ($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])) . '\';'; |
|
317 | + $content .= '$c[\''.$doc['name'].'\']=\''.($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])).'\';'; |
|
318 | 318 | } |
319 | 319 | |
320 | 320 | // WRITE snippets to cache file |
@@ -325,18 +325,18 @@ discard block |
||
325 | 325 | while ($row = $modx->db->getRow($rs)) { |
326 | 326 | $key = $row['name']; |
327 | 327 | if ($row['disabled']) { |
328 | - $content .= '$s[\'' . $key . '\']=\'return false;\';'; |
|
328 | + $content .= '$s[\''.$key.'\']=\'return false;\';'; |
|
329 | 329 | } else { |
330 | 330 | $value = trim($row['snippet']); |
331 | 331 | if ($modx->config['minifyphp_incache']) { |
332 | 332 | $value = $this->php_strip_whitespace($value); |
333 | 333 | } |
334 | - $content .= '$s[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';'; |
|
334 | + $content .= '$s[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';'; |
|
335 | 335 | $properties = $modx->parseProperties($row['properties']); |
336 | 336 | $sharedproperties = $modx->parseProperties($row['sharedproperties']); |
337 | 337 | $properties = array_merge($sharedproperties, $properties); |
338 | 338 | if (0 < count($properties)) { |
339 | - $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';'; |
|
339 | + $content .= '$s[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';'; |
|
340 | 340 | } |
341 | 341 | } |
342 | 342 | } |
@@ -354,13 +354,13 @@ discard block |
||
354 | 354 | if ($modx->config['minifyphp_incache']) { |
355 | 355 | $value = $this->php_strip_whitespace($value); |
356 | 356 | } |
357 | - $content .= '$p[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';'; |
|
357 | + $content .= '$p[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';'; |
|
358 | 358 | if ($row['properties'] != '' || $row['sharedproperties'] != '') { |
359 | 359 | $properties = $modx->parseProperties($row['properties']); |
360 | 360 | $sharedproperties = $modx->parseProperties($row['sharedproperties']); |
361 | 361 | $properties = array_merge($sharedproperties, $properties); |
362 | 362 | if (0 < count($properties)) { |
363 | - $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';'; |
|
363 | + $content .= '$p[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';'; |
|
364 | 364 | } |
365 | 365 | } |
366 | 366 | } |
@@ -383,14 +383,14 @@ discard block |
||
383 | 383 | } |
384 | 384 | foreach ($events as $evtname => $pluginnames) { |
385 | 385 | $events[$evtname] = $pluginnames; |
386 | - $content .= '$e[\'' . $evtname . '\']=array(\'' . implode('\',\'', |
|
387 | - $this->escapeSingleQuotes($pluginnames)) . '\');'; |
|
386 | + $content .= '$e[\''.$evtname.'\']=array(\''.implode('\',\'', |
|
387 | + $this->escapeSingleQuotes($pluginnames)).'\');'; |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | $content .= "\n"; |
391 | 391 | |
392 | 392 | // close and write the file |
393 | - $filename = $this->cachePath . 'siteCache.idx.php'; |
|
393 | + $filename = $this->cachePath.'siteCache.idx.php'; |
|
394 | 394 | |
395 | 395 | // invoke OnBeforeCacheUpdate event |
396 | 396 | if ($modx) { |
@@ -401,8 +401,8 @@ discard block |
||
401 | 401 | exit("Cannot write main MODX cache file! Make sure the assets/cache directory is writable!"); |
402 | 402 | } |
403 | 403 | |
404 | - if (!is_file($this->cachePath . '/.htaccess')) { |
|
405 | - file_put_contents($this->cachePath . '/.htaccess', "order deny,allow\ndeny from all\n"); |
|
404 | + if (!is_file($this->cachePath.'/.htaccess')) { |
|
405 | + file_put_contents($this->cachePath.'/.htaccess', "order deny,allow\ndeny from all\n"); |
|
406 | 406 | } |
407 | 407 | |
408 | 408 | // invoke OnCacheUpdate event |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | |
425 | 425 | $source = trim($source); |
426 | 426 | if (substr($source, 0, 5) !== '<?php') { |
427 | - $source = '<?php ' . $source; |
|
427 | + $source = '<?php '.$source; |
|
428 | 428 | } |
429 | 429 | |
430 | 430 | $tokens = token_get_all($source); |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | } |
483 | 483 | } |
484 | 484 | $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'), |
485 | - array('', ' ', "\n" . '<!--', '-->' . "\n", '-->' . "\n" . '<!--'), $_); |
|
485 | + array('', ' ', "\n".'<!--', '-->'."\n", '-->'."\n".'<!--'), $_); |
|
486 | 486 | $source = trim($source); |
487 | 487 | |
488 | 488 | return $source; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $role = $this->role; |
37 | 37 | |
38 | 38 | if ($role == 1) { |
39 | - return true; // administrator - grant all document permissions |
|
39 | + return true; // administrator - grant all document permissions |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) { |
@@ -63,14 +63,14 @@ discard block |
||
63 | 63 | are private to the manager users will not be private to web users if the |
64 | 64 | document group is not assigned to a web user group and visa versa. |
65 | 65 | */ |
66 | - $permissionsok = false; // set permissions to false |
|
66 | + $permissionsok = false; // set permissions to false |
|
67 | 67 | |
68 | 68 | $rs = $modx->db->select( |
69 | 69 | 'count(DISTINCT sc.id)', |
70 | 70 | "{$tblsc} AS sc |
71 | 71 | LEFT JOIN {$tbldg} AS dg on dg.document = sc.id |
72 | 72 | LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group", |
73 | - "sc.id='{$this->document}' AND (" . (empty($docgrp) ? '' : "dg.document_group = " . $docgrp . " ||") . " sc.privatemgr = 0)" |
|
73 | + "sc.id='{$this->document}' AND (".(empty($docgrp) ? '' : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)" |
|
74 | 74 | ); |
75 | 75 | $limit = $modx->db->getValue($rs); |
76 | 76 | if ($limit == 1) { |
@@ -1,13 +1,13 @@ discard block |
||
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('new_module')) { |
|
5 | +if (!$modx->hasPermission('new_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 | |
@@ -17,17 +17,17 @@ discard block |
||
17 | 17 | * @return string |
18 | 18 | */ |
19 | 19 | function createGUID(){ |
20 | - srand((double)microtime()*1000000); |
|
21 | - $r = rand() ; |
|
22 | - $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1); |
|
23 | - $m = md5 ($u); |
|
20 | + srand((double) microtime() * 1000000); |
|
21 | + $r = rand(); |
|
22 | + $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1); |
|
23 | + $m = md5($u); |
|
24 | 24 | return $m; |
25 | 25 | } |
26 | 26 | |
27 | 27 | // count duplicates |
28 | 28 | $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'")); |
29 | 29 | $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'")); |
30 | -if($count>=1) $count = ' '.($count+1); |
|
30 | +if ($count >= 1) $count = ' '.($count + 1); |
|
31 | 31 | else $count = ''; |
32 | 32 | |
33 | 33 | // duplicate module |
@@ -72,5 +72,5 @@ discard block |
||
72 | 72 | $_SESSION['itemname'] = $name; |
73 | 73 | |
74 | 74 | // finish duplicating - redirect to new module |
75 | -$header="Location: index.php?r=2&a=108&id=$newid"; |
|
75 | +$header = "Location: index.php?r=2&a=108&id=$newid"; |
|
76 | 76 | header($header); |
@@ -1,25 +1,25 @@ discard block |
||
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('delete_document')) { |
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 | /*******ищем родителя чтобы к нему вернуться********/ |
15 | -$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'")); |
|
16 | -$pid=($content['parent']==0?$id:$content['parent']); |
|
15 | +$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'")); |
|
16 | +$pid = ($content['parent'] == 0 ? $id : $content['parent']); |
|
17 | 17 | |
18 | 18 | /************ а заодно и путь возврата (сам путь внизу файла) **********/ |
19 | -$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC'; |
|
20 | -$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon'; |
|
21 | -$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:''; |
|
22 | -$add_path=$sd.$sb.$pg; |
|
19 | +$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC'; |
|
20 | +$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon'; |
|
21 | +$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : ''; |
|
22 | +$add_path = $sd.$sb.$pg; |
|
23 | 23 | |
24 | 24 | /*****************************/ |
25 | 25 | |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $children = array(); |
28 | 28 | |
29 | 29 | // check permissions on the document |
30 | -include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
30 | +include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php"; |
|
31 | 31 | $udperms = new udperms(); |
32 | 32 | $udperms->user = $modx->getLoginUserID(); |
33 | 33 | $udperms->document = $id; |
@@ -52,17 +52,17 @@ discard block |
||
52 | 52 | $parent = $modx->db->escape($parent); |
53 | 53 | $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent={$parent} AND deleted=0"); |
54 | 54 | // the document has children documents, we'll need to delete those too |
55 | - while ($childid=$modx->db->getValue($rs)) { |
|
56 | - if ($childid==$site_start) { |
|
55 | + while ($childid = $modx->db->getValue($rs)) { |
|
56 | + if ($childid == $site_start) { |
|
57 | 57 | $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site start' document, and cannot be deleted. Please assign another document as your 'Site start' document and try again."); |
58 | 58 | } |
59 | - if ($childid==$site_unavailable_page) { |
|
59 | + if ($childid == $site_unavailable_page) { |
|
60 | 60 | $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site unavailable page' document, and cannot be deleted. Please assign another document as your 'Site unavailable page' document and try again."); |
61 | 61 | } |
62 | - if ($childid==$error_page) { |
|
62 | + if ($childid == $error_page) { |
|
63 | 63 | $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site error page' document, and cannot be deleted. Please assign another document as your 'Site error page' document and try again."); |
64 | 64 | } |
65 | - if ($childid==$unauthorized_page) { |
|
65 | + if ($childid == $unauthorized_page) { |
|
66 | 66 | $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site unauthorized page' document, and cannot be deleted. Please assign another document as your 'Site unauthorized page' document and try again."); |
67 | 67 | } |
68 | 68 | $children[] = $childid; |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | "children"=>$children |
81 | 81 | )); |
82 | 82 | |
83 | -if (count($children)>0) { |
|
83 | +if (count($children) > 0) { |
|
84 | 84 | $modx->db->update( |
85 | 85 | array( |
86 | 86 | 'deleted' => 1, |
@@ -89,19 +89,19 @@ discard block |
||
89 | 89 | ), $modx->getFullTableName('site_content'), "id IN (".implode(", ", $children).")"); |
90 | 90 | } |
91 | 91 | |
92 | -if ($site_start==$id) { |
|
92 | +if ($site_start == $id) { |
|
93 | 93 | $modx->webAlertAndQuit("Document is 'Site start' and cannot be deleted!"); |
94 | 94 | } |
95 | 95 | |
96 | -if ($site_unavailable_page==$id) { |
|
96 | +if ($site_unavailable_page == $id) { |
|
97 | 97 | $modx->webAlertAndQuit("Document is used as the 'Site unavailable page' and cannot be deleted!"); |
98 | 98 | } |
99 | 99 | |
100 | -if ($error_page==$id) { |
|
100 | +if ($error_page == $id) { |
|
101 | 101 | $modx->webAlertAndQuit("Document is used as the 'Site error page' and cannot be deleted!"); |
102 | 102 | } |
103 | 103 | |
104 | -if ($unauthorized_page==$id) { |
|
104 | +if ($unauthorized_page == $id) { |
|
105 | 105 | $modx->webAlertAndQuit("Document is used as the 'Site unauthorized page' and cannot be deleted!"); |
106 | 106 | } |
107 | 107 | |
@@ -127,5 +127,5 @@ discard block |
||
127 | 127 | $modx->clearCache('full'); |
128 | 128 | |
129 | 129 | // finished emptying cache - redirect |
130 | -$header="Location: index.php?a=3&id=$pid&r=1".$add_path; |
|
130 | +$header = "Location: index.php?a=3&id=$pid&r=1".$add_path; |
|
131 | 131 | header($header); |
@@ -12,15 +12,15 @@ discard block |
||
12 | 12 | * |
13 | 13 | */ |
14 | 14 | |
15 | -$msg =''; |
|
15 | +$msg = ''; |
|
16 | 16 | $pth = dirname(dirname(dirname(__FILE__)))."/install/"; |
17 | -$pth = str_replace("\\","/",$pth); |
|
18 | -if(isset($_GET["rminstall"])) { |
|
19 | - if(is_dir($pth)) { |
|
20 | - if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder"; |
|
17 | +$pth = str_replace("\\", "/", $pth); |
|
18 | +if (isset($_GET["rminstall"])) { |
|
19 | + if (is_dir($pth)) { |
|
20 | + if (!rmdirRecursive($pth)) $msg = "An error occured while attempting to remove the install folder"; |
|
21 | 21 | } |
22 | 22 | } |
23 | -if($msg) echo "<script>alert('".addslashes($msg)."');</script>"; |
|
23 | +if ($msg) echo "<script>alert('".addslashes($msg)."');</script>"; |
|
24 | 24 | echo "<script>window.location='../index.php?a=2';</script>"; |
25 | 25 | |
26 | 26 | /** |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | * @param bool $followLinks |
31 | 31 | * @return bool |
32 | 32 | */ |
33 | -function rmdirRecursive($path, $followLinks=false) { |
|
34 | - $dir = opendir($path) ; |
|
33 | +function rmdirRecursive($path, $followLinks = false){ |
|
34 | + $dir = opendir($path); |
|
35 | 35 | while ($entry = readdir($dir)) { |
36 | 36 | if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) { |
37 | - @unlink( "$path/$entry" ); |
|
37 | + @unlink("$path/$entry"); |
|
38 | 38 | } |
39 | - elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') { |
|
39 | + elseif (is_dir("$path/$entry") && $entry != '.' && $entry != '..') { |
|
40 | 40 | rmdirRecursive("$path/$entry"); // recursive |
41 | 41 | } |
42 | 42 | } |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | foreach ($_ as $collation=>$selected) { |
51 | 51 | $collation = htmlentities($collation); |
52 | 52 | // if(substr($collation,0,4)!=='utf8') continue; |
53 | - if (strpos($collation, 'sjis')===0) { |
|
53 | + if (strpos($collation, 'sjis') === 0) { |
|
54 | 54 | continue; |
55 | 55 | } |
56 | - if ($collation=='recommend') { |
|
56 | + if ($collation == 'recommend') { |
|
57 | 57 | $output .= '<optgroup label="recommend">'; |
58 | - } elseif ($collation=='unrecommend') { |
|
58 | + } elseif ($collation == 'unrecommend') { |
|
59 | 59 | $output .= '</optgroup><optgroup label="unrecommend">'; |
60 | 60 | } else { |
61 | 61 | $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation); |
@@ -67,18 +67,18 @@ discard block |
||
67 | 67 | echo $output; |
68 | 68 | exit; |
69 | 69 | |
70 | -function sortItem($array=array(), $order='utf8mb4,utf8') |
|
70 | +function sortItem($array = array(), $order = 'utf8mb4,utf8') |
|
71 | 71 | { |
72 | 72 | $rs = array('recommend'=>''); |
73 | 73 | $order = explode(',', $order); |
74 | 74 | foreach ($order as $v) { |
75 | 75 | foreach ($array as $name=>$sel) { |
76 | - if (strpos($name, $v)!==false) { |
|
76 | + if (strpos($name, $v) !== false) { |
|
77 | 77 | $rs[$name] = $array[$name]; |
78 | 78 | unset($array[$name]); |
79 | 79 | } |
80 | 80 | } |
81 | 81 | } |
82 | - $rs['unrecommend']=''; |
|
82 | + $rs['unrecommend'] = ''; |
|
83 | 83 | return $rs + $array; |
84 | 84 | } |
@@ -50,16 +50,16 @@ discard block |
||
50 | 50 | include_once($autoloader); |
51 | 51 | } |
52 | 52 | |
53 | -if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true); |
|
53 | +if (!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true); |
|
54 | 54 | |
55 | -$base_path = str_replace('\\','/',dirname(__FILE__)) . '/'; |
|
56 | -if(is_file($base_path . 'assets/cache/siteManager.php')) |
|
57 | - include_once($base_path . 'assets/cache/siteManager.php'); |
|
58 | -if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) |
|
55 | +$base_path = str_replace('\\', '/', dirname(__FILE__)).'/'; |
|
56 | +if (is_file($base_path.'assets/cache/siteManager.php')) |
|
57 | + include_once($base_path.'assets/cache/siteManager.php'); |
|
58 | +if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) |
|
59 | 59 | define('MGR_DIR', 'manager'); |
60 | -if(is_file($base_path . 'assets/cache/siteHostnames.php')) |
|
61 | - include_once($base_path . 'assets/cache/siteHostnames.php'); |
|
62 | -if(!defined('MODX_SITE_HOSTNAMES')) |
|
60 | +if (is_file($base_path.'assets/cache/siteHostnames.php')) |
|
61 | + include_once($base_path.'assets/cache/siteHostnames.php'); |
|
62 | +if (!defined('MODX_SITE_HOSTNAMES')) |
|
63 | 63 | define('MODX_SITE_HOSTNAMES', ''); |
64 | 64 | |
65 | 65 | // get start time |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | // set some settings, and address some IE issues |
72 | 72 | @ini_set('url_rewriter.tags', ''); |
73 | 73 | @ini_set('session.use_trans_sid', 0); |
74 | -@ini_set('session.use_only_cookies',1); |
|
74 | +@ini_set('session.use_only_cookies', 1); |
|
75 | 75 | session_cache_limiter(''); |
76 | 76 | header('P3P: CP="NOI NID ADMa OUR IND UNI COM NAV"'); // header for weird cookie stuff. Blame IE. |
77 | 77 | header('Cache-Control: private, must-revalidate'); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | |
85 | 85 | define('IN_PARSER_MODE', true); |
86 | -if ( ! defined('IN_MANAGER_MODE')) { |
|
86 | +if (!defined('IN_MANAGER_MODE')) { |
|
87 | 87 | define('IN_MANAGER_MODE', false); |
88 | 88 | } |
89 | 89 | if (!defined('MODX_API_MODE')) { |
@@ -91,10 +91,10 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | // get the required includes |
94 | -if(!isset($database_user) || $database_user=="") { |
|
94 | +if (!isset($database_user) || $database_user == "") { |
|
95 | 95 | $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php'); |
96 | 96 | // Be sure config.inc.php is there and that it contains some important values |
97 | - if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) { |
|
97 | + if (!$rt || !$database_type || !$database_server || !$database_user || !$dbase) { |
|
98 | 98 | readfile('install/not_installed.tpl'); |
99 | 99 | exit; |
100 | 100 | } |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | $modx->stopOnNotice = false; |
126 | 126 | |
127 | 127 | // Don't show PHP errors to the public |
128 | -if(!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) { |
|
129 | - @ini_set("display_errors","0"); |
|
128 | +if (!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) { |
|
129 | + @ini_set("display_errors", "0"); |
|
130 | 130 | } |
131 | 131 | |
132 | -if(MODX_CLI){ |
|
132 | +if (MODX_CLI) { |
|
133 | 133 | @set_time_limit(0); |
134 | - @ini_set('max_execution_time',0); |
|
134 | + @ini_set('max_execution_time', 0); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | // execute the parser if index.php was not included |
@@ -18,9 +18,9 @@ |
||
18 | 18 | exit('send some data'); |
19 | 19 | } //?? |
20 | 20 | |
21 | -$indent = (int)$_REQUEST['indent']; |
|
22 | -$parent = (int)$_REQUEST['parent']; |
|
23 | -$expandAll = (int)$_REQUEST['expandAll']; |
|
21 | +$indent = (int) $_REQUEST['indent']; |
|
22 | +$parent = (int) $_REQUEST['parent']; |
|
23 | +$expandAll = (int) $_REQUEST['expandAll']; |
|
24 | 24 | $output = ''; |
25 | 25 | $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : ''; |
26 | 26 |