evolution-cms /
evolution
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if(!function_exists('makeHTML')) { |
|
| 3 | +if (!function_exists('makeHTML')) { |
|
| 4 | 4 | /** |
| 5 | 5 | * @param int $indent |
| 6 | 6 | * @param int $parent |
@@ -37,14 +37,14 @@ discard block |
||
| 37 | 37 | case 'publishedon': |
| 38 | 38 | case 'pub_date': |
| 39 | 39 | case 'unpub_date': |
| 40 | - $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], |
|
| 41 | - 'sc.' . $_SESSION['tree_sortby']); |
|
| 40 | + $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], |
|
| 41 | + 'sc.'.$_SESSION['tree_sortby']); |
|
| 42 | 42 | break; |
| 43 | 43 | default: |
| 44 | - $sortby = 'sc.' . $_SESSION['tree_sortby']; |
|
| 44 | + $sortby = 'sc.'.$_SESSION['tree_sortby']; |
|
| 45 | 45 | }; |
| 46 | 46 | |
| 47 | - $orderby = $modx->getDatabase()->escape($sortby . ' ' . $_SESSION['tree_sortdir']); |
|
| 47 | + $orderby = $modx->getDatabase()->escape($sortby.' '.$_SESSION['tree_sortdir']); |
|
| 48 | 48 | |
| 49 | 49 | // Folder sorting gets special setup ;) Add menuindex and pagetitle |
| 50 | 50 | if ($_SESSION['tree_sortby'] == 'isfolder') { |
@@ -59,11 +59,11 @@ discard block |
||
| 59 | 59 | $_SESSION['mgrDocgroups']) : ''; |
| 60 | 60 | $showProtected = false; |
| 61 | 61 | if (isset ($modx->config['tree_show_protected'])) { |
| 62 | - $showProtected = (boolean)$modx->config['tree_show_protected']; |
|
| 62 | + $showProtected = (boolean) $modx->config['tree_show_protected']; |
|
| 63 | 63 | } |
| 64 | - $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0'; |
|
| 64 | + $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0'; |
|
| 65 | 65 | if ($showProtected == false) { |
| 66 | - $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 66 | + $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 67 | 67 | } else { |
| 68 | 68 | $access = ''; |
| 69 | 69 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : ''; |
| 103 | - $pageIdDisplay = '<small>(' . ($modx_textdir ? '‏' : '') . $row['id'] . ')</small>'; |
|
| 103 | + $pageIdDisplay = '<small>('.($modx_textdir ? '‏' : '').$row['id'].')</small>'; |
|
| 104 | 104 | |
| 105 | 105 | // Prepare displaying user-locks |
| 106 | 106 | $lockedByUser = ''; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | 'element_type' => $_lang["lock_element_type_7"], |
| 112 | 112 | 'lasthit_df' => $rowLock['lasthit_df'] |
| 113 | 113 | )); |
| 114 | - $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>'; |
|
| 114 | + $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>'; |
|
| 115 | 115 | } else { |
| 116 | 116 | $title = $modx->parseText($_lang["lock_element_locked_by"], array( |
| 117 | 117 | 'element_type' => $_lang["lock_element_type_7"], |
@@ -119,9 +119,9 @@ discard block |
||
| 119 | 119 | 'lasthit_df' => $rowLock['lasthit_df'] |
| 120 | 120 | )); |
| 121 | 121 | if ($modx->hasPermission('remove_locks')) { |
| 122 | - $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>'; |
|
| 122 | + $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>'; |
|
| 123 | 123 | } else { |
| 124 | - $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>'; |
|
| 124 | + $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>'; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -130,22 +130,22 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | $title = ''; |
| 132 | 132 | if (isDateNode($nodeNameSource)) { |
| 133 | - $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]'; |
|
| 133 | + $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]'; |
|
| 134 | 134 | } |
| 135 | - $title .= $_lang['id'] . ': ' . $row['id']; |
|
| 136 | - $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle']; |
|
| 137 | - $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex']; |
|
| 138 | - $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-'); |
|
| 139 | - $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename']; |
|
| 140 | - $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']); |
|
| 141 | - $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']); |
|
| 142 | - $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']); |
|
| 143 | - $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']); |
|
| 144 | - $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 145 | - $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 146 | - $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 135 | + $title .= $_lang['id'].': '.$row['id']; |
|
| 136 | + $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle']; |
|
| 137 | + $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex']; |
|
| 138 | + $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-'); |
|
| 139 | + $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename']; |
|
| 140 | + $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']); |
|
| 141 | + $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']); |
|
| 142 | + $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']); |
|
| 143 | + $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']); |
|
| 144 | + $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 145 | + $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 146 | + $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']); |
|
| 147 | 147 | $title = $modx->getPhpCompat()->htmlspecialchars($title); |
| 148 | - $title = str_replace('[+lf+]', ' ', $title); // replace line-breaks with empty space as fall-back |
|
| 148 | + $title = str_replace('[+lf+]', ' ', $title); // replace line-breaks with empty space as fall-back |
|
| 149 | 149 | |
| 150 | 150 | $data = array( |
| 151 | 151 | 'id' => $row['id'], |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if ($ph['contextmenu']) { |
| 232 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 232 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | if ($_SESSION['tree_show_only_folders']) { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | if ($ph['contextmenu']) { |
| 290 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 290 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | $node .= $modx->parseText($tpl, $ph); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | if ($ph['contextmenu']) { |
| 328 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 328 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | $node .= $modx->parseText($tpl, $ph); |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | if ($ph['contextmenu']) { |
| 379 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 379 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | $node .= $modx->parseText($tpl, $ph); |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | if ($ph['contextmenu']) { |
| 421 | - $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"'; |
|
| 421 | + $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"'; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | $node .= $modx->parseText($tpl, $ph); |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | } |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | -if(!function_exists('getIconInfo')) { |
|
| 447 | +if (!function_exists('getIconInfo')) { |
|
| 448 | 448 | /** |
| 449 | 449 | * @param array $_style |
| 450 | 450 | * @return array |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | -if(!function_exists('getNodeTitle')) { |
|
| 481 | +if (!function_exists('getNodeTitle')) { |
|
| 482 | 482 | /** |
| 483 | 483 | * @param string $nodeNameSource |
| 484 | 484 | * @param array $row |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | $nodetitle .= $modx->config['friendly_url_suffix']; |
| 500 | 500 | } |
| 501 | 501 | } |
| 502 | - $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle; |
|
| 502 | + $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle; |
|
| 503 | 503 | break; |
| 504 | 504 | case 'pagetitle': |
| 505 | 505 | $nodetitle = $row['pagetitle']; |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | -if(!function_exists('isDateNode')) { |
|
| 536 | +if (!function_exists('isDateNode')) { |
|
| 537 | 537 | /** |
| 538 | 538 | * @param string $nodeNameSource |
| 539 | 539 | * @return bool |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | } |
| 554 | 554 | } |
| 555 | 555 | |
| 556 | -if(!function_exists('checkIsFolder')) { |
|
| 556 | +if (!function_exists('checkIsFolder')) { |
|
| 557 | 557 | /** |
| 558 | 558 | * @param int $parent |
| 559 | 559 | * @param int $isfolder |
@@ -563,11 +563,11 @@ discard block |
||
| 563 | 563 | { |
| 564 | 564 | $modx = evolutionCMS(); |
| 565 | 565 | |
| 566 | - return (int)$modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM ' . $modx->getDatabase()->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' ')); |
|
| 566 | + return (int) $modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM '.$modx->getDatabase()->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' ')); |
|
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | -if(!function_exists('_htmlentities')) { |
|
| 570 | +if (!function_exists('_htmlentities')) { |
|
| 571 | 571 | /** |
| 572 | 572 | * @param mixed $array |
| 573 | 573 | * @return string |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | } |
| 584 | 584 | } |
| 585 | 585 | |
| 586 | -if(!function_exists('getTplSingleNode')) { |
|
| 586 | +if (!function_exists('getTplSingleNode')) { |
|
| 587 | 587 | /** |
| 588 | 588 | * @return string |
| 589 | 589 | */ |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | -if(!function_exists('getTplFolderNode')) { |
|
| 616 | +if (!function_exists('getTplFolderNode')) { |
|
| 617 | 617 | /** |
| 618 | 618 | * @return string |
| 619 | 619 | */ |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>'; |
| 655 | 655 | } |
| 656 | 656 | } |
| 657 | -if(!function_exists('getTplFolderNodeNotChildren')) { |
|
| 657 | +if (!function_exists('getTplFolderNodeNotChildren')) { |
|
| 658 | 658 | /** |
| 659 | 659 | * @return string |
| 660 | 660 | */ |
@@ -20,14 +20,14 @@ |
||
| 20 | 20 | ($docid > 0 ? "id='$docid'" : "privateweb = 1")); |
| 21 | 21 | $rs = $modx->getDatabase()->select( |
| 22 | 22 | 'DISTINCT sc.id', |
| 23 | - $modx->getDatabase()->getFullTableName("site_content") . " sc |
|
| 24 | - LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups") . " dg ON dg.document = sc.id |
|
| 25 | - LEFT JOIN " . $modx->getDatabase()->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group", |
|
| 26 | - ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0" |
|
| 23 | + $modx->getDatabase()->getFullTableName("site_content")." sc |
|
| 24 | + LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups")." dg ON dg.document = sc.id |
|
| 25 | + LEFT JOIN " . $modx->getDatabase()->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group", |
|
| 26 | + ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0" |
|
| 27 | 27 | ); |
| 28 | 28 | $ids = $modx->getDatabase()->getColumn("id", $rs); |
| 29 | 29 | if (count($ids) > 0) { |
| 30 | 30 | $modx->getDatabase()->update('privateweb = 1', $modx->getDatabase()->getFullTableName("site_content"), |
| 31 | - "id IN (" . implode(", ", $ids) . ")"); |
|
| 31 | + "id IN (".implode(", ", $ids).")"); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -18,13 +18,13 @@ discard block |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | // andrazk 20070416 - if installer is running, destroy active sessions |
| 21 | -if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) { |
|
| 22 | - include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php'); |
|
| 21 | +if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) { |
|
| 22 | + include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php'); |
|
| 23 | 23 | if (isset($installStartTime)) { |
| 24 | 24 | if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard |
| 25 | 25 | unset($installStartTime); |
| 26 | - @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755); |
|
| 27 | - unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php'); |
|
| 26 | + @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755); |
|
| 27 | + unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php'); |
|
| 28 | 28 | } else { |
| 29 | 29 | if ($_SERVER['REQUEST_METHOD'] != 'POST') { |
| 30 | 30 | if (isset($_COOKIE[session_name()])) { |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | // setcookie(session_name(), '', 0, MODX_BASE_URL); |
| 51 | 51 | } |
| 52 | 52 | header('HTTP/1.0 307 Redirect'); |
| 53 | - header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2'); |
|
| 53 | + header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2'); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | // establish fallback to English default |
| 63 | 63 | include_once "lang/english.inc.php"; |
| 64 | 64 | // include localized overrides |
| 65 | - include_once "lang/" . $manager_language . ".inc.php"; |
|
| 65 | + include_once "lang/".$manager_language.".inc.php"; |
|
| 66 | 66 | } else { |
| 67 | 67 | include_once "lang/english.inc.php"; |
| 68 | 68 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $modx->setPlaceholder('modx_charset', $modx_manager_charset); |
| 71 | 71 | $modx->setPlaceholder('theme', $manager_theme); |
| 72 | 72 | $modx->setPlaceholder('favicon', |
| 73 | - (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico')); |
|
| 73 | + (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico')); |
|
| 74 | 74 | |
| 75 | 75 | // invoke OnManagerLoginFormPrerender event |
| 76 | 76 | $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender'); |
@@ -81,25 +81,25 @@ discard block |
||
| 81 | 81 | $modx->setPlaceholder('manager_path', MGR_DIR); |
| 82 | 82 | $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]); |
| 83 | 83 | $modx->setPlaceholder('login_message', $_lang["login_message"]); |
| 84 | - $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/'); |
|
| 84 | + $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/'); |
|
| 85 | 85 | $modx->setPlaceholder('year', date('Y')); |
| 86 | 86 | |
| 87 | 87 | // set login logo image |
| 88 | - if ( !empty($modx->config['login_logo']) ) { |
|
| 89 | - $modx->setPlaceholder('login_logo', MODX_SITE_URL . $modx->config['login_logo']); |
|
| 88 | + if (!empty($modx->config['login_logo'])) { |
|
| 89 | + $modx->setPlaceholder('login_logo', MODX_SITE_URL.$modx->config['login_logo']); |
|
| 90 | 90 | } else { |
| 91 | - $modx->setPlaceholder('login_logo', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-logo.png'); |
|
| 91 | + $modx->setPlaceholder('login_logo', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-logo.png'); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // set login background image |
| 95 | - if ( !empty($modx->config['login_bg']) ) { |
|
| 96 | - $modx->setPlaceholder('login_bg', MODX_SITE_URL . $modx->config['login_bg']); |
|
| 95 | + if (!empty($modx->config['login_bg'])) { |
|
| 96 | + $modx->setPlaceholder('login_bg', MODX_SITE_URL.$modx->config['login_bg']); |
|
| 97 | 97 | } else { |
| 98 | - $modx->setPlaceholder('login_bg', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-background.jpg'); |
|
| 98 | + $modx->setPlaceholder('login_bg', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-background.jpg'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // set form position css class |
| 102 | - $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']); |
|
| 102 | + $modx->setPlaceholder('login_form_position_class', 'loginbox-'.$modx->config['login_form_position']); |
|
| 103 | 103 | |
| 104 | 104 | switch ($modx->config['manager_theme_mode']) { |
| 105 | 105 | case '1': |
@@ -124,11 +124,11 @@ discard block |
||
| 124 | 124 | switch ($installGoingOn) { |
| 125 | 125 | case 1 : |
| 126 | 126 | $modx->setPlaceholder('login_message', |
| 127 | - "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>"); |
|
| 127 | + "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>"); |
|
| 128 | 128 | break; |
| 129 | 129 | case 2 : |
| 130 | 130 | $modx->setPlaceholder('login_message', |
| 131 | - "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>"); |
|
| 131 | + "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>"); |
|
| 132 | 132 | break; |
| 133 | 133 | } |
| 134 | 134 | } |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | if ($modx->config['use_captcha'] == 1) { |
| 137 | 137 | $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]); |
| 138 | 138 | $modx->setPlaceholder('captcha_image', |
| 139 | - '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'captcha.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>'); |
|
| 139 | + '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'captcha.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>'); |
|
| 140 | 140 | $modx->setPlaceholder('captcha_input', |
| 141 | - '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />'); |
|
| 141 | + '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />'); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | // login info |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | // invoke OnManagerLoginFormRender event |
| 158 | 158 | $evtOut = $modx->invokeEvent('OnManagerLoginFormRender'); |
| 159 | - $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : ''; |
|
| 159 | + $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : ''; |
|
| 160 | 160 | $modx->setPlaceholder('OnManagerLoginFormRender', $html); |
| 161 | 161 | |
| 162 | 162 | // load template |
@@ -174,29 +174,29 @@ discard block |
||
| 174 | 174 | $login_tpl = file_get_contents($target); |
| 175 | 175 | } |
| 176 | 176 | } else { |
| 177 | - $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/'; |
|
| 178 | - if (is_file($theme_path . 'style.php')) { |
|
| 179 | - include($theme_path . 'style.php'); |
|
| 177 | + $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/'; |
|
| 178 | + if (is_file($theme_path.'style.php')) { |
|
| 179 | + include($theme_path.'style.php'); |
|
| 180 | 180 | } |
| 181 | 181 | $chunk = $modx->getChunk($target); |
| 182 | 182 | if ($chunk !== false && !empty($chunk)) { |
| 183 | 183 | $login_tpl = $chunk; |
| 184 | - } elseif (is_file(MODX_BASE_PATH . $target)) { |
|
| 185 | - $target = MODX_BASE_PATH . $target; |
|
| 184 | + } elseif (is_file(MODX_BASE_PATH.$target)) { |
|
| 185 | + $target = MODX_BASE_PATH.$target; |
|
| 186 | 186 | $login_tpl = file_get_contents($target); |
| 187 | 187 | } elseif (is_file($target)) { |
| 188 | 188 | $login_tpl = file_get_contents($target); |
| 189 | - } elseif (is_file($theme_path . 'login.tpl')) { |
|
| 190 | - $target = $theme_path . 'login.tpl'; |
|
| 189 | + } elseif (is_file($theme_path.'login.tpl')) { |
|
| 190 | + $target = $theme_path.'login.tpl'; |
|
| 191 | 191 | $login_tpl = file_get_contents($target); |
| 192 | - } elseif (is_file($theme_path . 'templates/actions/login.tpl')) { |
|
| 193 | - $target = $theme_path . 'templates/actions/login.tpl'; |
|
| 192 | + } elseif (is_file($theme_path.'templates/actions/login.tpl')) { |
|
| 193 | + $target = $theme_path.'templates/actions/login.tpl'; |
|
| 194 | 194 | $login_tpl = file_get_contents($target); |
| 195 | - } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible |
|
| 196 | - $target = $theme_path . 'html/login.html'; |
|
| 195 | + } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible |
|
| 196 | + $target = $theme_path.'html/login.html'; |
|
| 197 | 197 | $login_tpl = file_get_contents($target); |
| 198 | 198 | } else { |
| 199 | - $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl'; |
|
| 199 | + $target = MODX_MANAGER_PATH.'media/style/common/login.tpl'; |
|
| 200 | 200 | $login_tpl = file_get_contents($target); |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -216,17 +216,17 @@ discard block |
||
| 216 | 216 | $modx->updateValidatedUserSession(); |
| 217 | 217 | |
| 218 | 218 | // Update last action in table active_users |
| 219 | - $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
|
| 219 | + $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : ''; |
|
| 220 | 220 | $lasthittime = time(); |
| 221 | - $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1; |
|
| 221 | + $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1; |
|
| 222 | 222 | |
| 223 | 223 | if ($action !== 1) { |
| 224 | - if ((int)$itemid <= 0) { |
|
| 224 | + if ((int) $itemid <= 0) { |
|
| 225 | 225 | $itemid = null; |
| 226 | 226 | } |
| 227 | 227 | $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", |
| 228 | 228 | $modx->getDatabase()->getFullTableName('active_users') // Table |
| 229 | - , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action, |
|
| 229 | + , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action, |
|
| 230 | 230 | $itemid == null ? var_export(null, true) : $itemid); |
| 231 | 231 | $modx->getDatabase()->query($sql); |
| 232 | 232 | } |
@@ -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 | 5 | |
| 6 | 6 | // PROCESSOR FIRST |
| 7 | -if($_SESSION['mgrRole'] == 1) { |
|
| 8 | - if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) { |
|
| 7 | +if ($_SESSION['mgrRole'] == 1) { |
|
| 8 | + if ($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) { |
|
| 9 | 9 | $current = $modx->getManagerApi()->getSystemChecksum($modx->config['check_files_onlogin']); |
| 10 | - if(!empty($current)) { |
|
| 10 | + if (!empty($current)) { |
|
| 11 | 11 | $modx->getManagerApi()->setSystemChecksum($current); |
| 12 | 12 | $modx->clearCache('full'); |
| 13 | 13 | $modx->config['sys_files_checksum'] = $current; |
@@ -19,14 +19,14 @@ discard block |
||
| 19 | 19 | $warningspresent = 0; |
| 20 | 20 | |
| 21 | 21 | $sysfiles_check = $modx->getManagerApi()->checkSystemChecksum(); |
| 22 | -if ($sysfiles_check!=='0'){ |
|
| 22 | +if ($sysfiles_check !== '0') { |
|
| 23 | 23 | $warningspresent = 1; |
| 24 | 24 | $warnings[] = array($_lang['configcheck_sysfiles_mod']); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -if (is_writable("includes/config.inc.php")){ |
|
| 27 | +if (is_writable("includes/config.inc.php")) { |
|
| 28 | 28 | // Warn if world writable |
| 29 | - if(@fileperms('includes/config.inc.php') & 0x0002) { |
|
| 29 | + if (@fileperms('includes/config.inc.php') & 0x0002) { |
|
| 30 | 30 | $warningspresent = 1; |
| 31 | 31 | $warnings[] = array($_lang['configcheck_configinc']); |
| 32 | 32 | } |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | $warnings[] = array($_lang['configcheck_php_gdzip']); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | -if(!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') { |
|
| 46 | - if(isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') { |
|
| 45 | +if (!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') { |
|
| 46 | + if (isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') { |
|
| 47 | 47 | if ($modx->getDatabase()->getValue($modx->getDatabase()->select('COUNT(setting_value)', $modx->getDatabase()->getFullTableName('system_settings'), "setting_name='validate_referer' AND setting_value='0'"))) { |
| 48 | 48 | $warningspresent = 1; |
| 49 | 49 | $warnings[] = array($_lang['configcheck_validate_referer']); |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | // check for Template Switcher plugin |
| 55 | -if(!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') { |
|
| 56 | - if(isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') { |
|
| 55 | +if (!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') { |
|
| 56 | + if (isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') { |
|
| 57 | 57 | $rs = $modx->getDatabase()->select('name, disabled', $modx->getDatabase()->getFullTableName('site_plugins'), "name IN ('TemplateSwitcher', 'Template Switcher', 'templateswitcher', 'template_switcher', 'template switcher') OR plugincode LIKE '%TemplateSwitcher%'"); |
| 58 | 58 | $row = $modx->getDatabase()->getRow($rs); |
| 59 | - if($row && $row['disabled'] == 0) { |
|
| 59 | + if ($row && $row['disabled'] == 0) { |
|
| 60 | 60 | $warningspresent = 1; |
| 61 | 61 | $warnings[] = array($_lang['configcheck_templateswitcher_present']); |
| 62 | 62 | $tplName = $row['name']; |
@@ -120,36 +120,36 @@ discard block |
||
| 120 | 120 | /** |
| 121 | 121 | * @return bool |
| 122 | 122 | */ |
| 123 | - function checkSiteCache() { |
|
| 123 | + function checkSiteCache(){ |
|
| 124 | 124 | $modx = evolutionCMS(); |
| 125 | - $checked= true; |
|
| 126 | - if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) { |
|
| 127 | - $checked= @include_once ($modx->config['base_path'] . 'assets/cache/siteCache.idx.php'); |
|
| 125 | + $checked = true; |
|
| 126 | + if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) { |
|
| 127 | + $checked = @include_once ($modx->config['base_path'].'assets/cache/siteCache.idx.php'); |
|
| 128 | 128 | } |
| 129 | 129 | return $checked; |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | -if (!is_writable(MODX_BASE_PATH . "assets/cache/")) { |
|
| 133 | +if (!is_writable(MODX_BASE_PATH."assets/cache/")) { |
|
| 134 | 134 | $warningspresent = 1; |
| 135 | 135 | $warnings[] = array($_lang['configcheck_cache']); |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | if (!checkSiteCache()) { |
| 139 | 139 | $warningspresent = 1; |
| 140 | - $warnings[]= array($lang['configcheck_sitecache_integrity']); |
|
| 140 | + $warnings[] = array($lang['configcheck_sitecache_integrity']); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | -if (!is_writable(MODX_BASE_PATH . "assets/images/")) { |
|
| 143 | +if (!is_writable(MODX_BASE_PATH."assets/images/")) { |
|
| 144 | 144 | $warningspresent = 1; |
| 145 | 145 | $warnings[] = array($_lang['configcheck_images']); |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | -if(strpos($modx->config['rb_base_dir'],MODX_BASE_PATH)!==0) { |
|
| 148 | +if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) { |
|
| 149 | 149 | $warningspresent = 1; |
| 150 | 150 | $warnings[] = array($_lang['configcheck_rb_base_dir']); |
| 151 | 151 | } |
| 152 | -if(strpos($modx->config['filemanager_path'],MODX_BASE_PATH)!==0) { |
|
| 152 | +if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) { |
|
| 153 | 153 | $warningspresent = 1; |
| 154 | 154 | $warnings[] = array($_lang['configcheck_filemanager_path']); |
| 155 | 155 | } |
@@ -157,36 +157,36 @@ discard block |
||
| 157 | 157 | // clear file info cache |
| 158 | 158 | clearstatcache(); |
| 159 | 159 | |
| 160 | -if ($warningspresent==1) { |
|
| 160 | +if ($warningspresent == 1) { |
|
| 161 | 161 | |
| 162 | -if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3'; |
|
| 162 | +if (!isset($modx->config['send_errormail'])) $modx->config['send_errormail'] = '3'; |
|
| 163 | 163 | $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>"; |
| 164 | 164 | |
| 165 | -for ($i=0;$i<count($warnings);$i++) { |
|
| 165 | +for ($i = 0; $i < count($warnings); $i++) { |
|
| 166 | 166 | switch ($warnings[$i][0]) { |
| 167 | 167 | case $_lang['configcheck_configinc']; |
| 168 | 168 | $warnings[$i][1] = $_lang['configcheck_configinc_msg']; |
| 169 | - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']); |
|
| 169 | + if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']); |
|
| 170 | 170 | break; |
| 171 | 171 | case $_lang['configcheck_installer'] : |
| 172 | 172 | $warnings[$i][1] = $_lang['configcheck_installer_msg']; |
| 173 | - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']); |
|
| 173 | + if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']); |
|
| 174 | 174 | break; |
| 175 | 175 | case $_lang['configcheck_cache'] : |
| 176 | 176 | $warnings[$i][1] = $_lang['configcheck_cache_msg']; |
| 177 | - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']); |
|
| 177 | + if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']); |
|
| 178 | 178 | break; |
| 179 | 179 | case $_lang['configcheck_images'] : |
| 180 | 180 | $warnings[$i][1] = $_lang['configcheck_images_msg']; |
| 181 | - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']); |
|
| 181 | + if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']); |
|
| 182 | 182 | break; |
| 183 | 183 | case $_lang['configcheck_sysfiles_mod']: |
| 184 | 184 | $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"]; |
| 185 | - $warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>'; |
|
| 186 | - if($modx->hasPermission('settings')) { |
|
| 187 | - $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>'; |
|
| 185 | + $warnings[$i][2] = '<ul><li>'.implode('</li><li>', $sysfiles_check).'</li></ul>'; |
|
| 186 | + if ($modx->hasPermission('settings')) { |
|
| 187 | + $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\''.$_lang["reset_sysfiles_checksum_alert"].'\')">'.$_lang["reset_sysfiles_checksum_button"].'</a></li></ul>'; |
|
| 188 | 188 | } |
| 189 | - if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']); |
|
| 189 | + if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']); |
|
| 190 | 190 | break; |
| 191 | 191 | case $_lang['configcheck_lang_difference'] : |
| 192 | 192 | $warnings[$i][1] = $_lang['configcheck_lang_difference_msg']; |
@@ -208,18 +208,18 @@ discard block |
||
| 208 | 208 | break; |
| 209 | 209 | case $_lang['configcheck_validate_referer'] : |
| 210 | 210 | $msg = $_lang['configcheck_validate_referer_msg']; |
| 211 | - $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer'); |
|
| 211 | + $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer'); |
|
| 212 | 212 | $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n"; |
| 213 | 213 | break; |
| 214 | 214 | case $_lang['configcheck_templateswitcher_present'] : |
| 215 | 215 | $msg = $_lang["configcheck_templateswitcher_present_msg"]; |
| 216 | - if(isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') { |
|
| 217 | - $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"]; |
|
| 216 | + if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') { |
|
| 217 | + $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"]; |
|
| 218 | 218 | } |
| 219 | - if(isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') { |
|
| 220 | - $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"]; |
|
| 219 | + if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') { |
|
| 220 | + $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"]; |
|
| 221 | 221 | } |
| 222 | - $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present'); |
|
| 222 | + $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present'); |
|
| 223 | 223 | $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n"; |
| 224 | 224 | break; |
| 225 | 225 | case $_lang['configcheck_rb_base_dir'] : |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | $warnings[$i][1] = $_lang['configcheck_default_msg']; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ; |
|
| 235 | + $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : ""; |
|
| 236 | 236 | $config_check_results .= " |
| 237 | 237 | <fieldset> |
| 238 | 238 | <p><strong>".$_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p> |
@@ -241,11 +241,11 @@ discard block |
||
| 241 | 241 | ".(isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')." |
| 242 | 242 | </fieldset> |
| 243 | 243 | "; |
| 244 | - if ($i!=count($warnings)-1) { |
|
| 244 | + if ($i != count($warnings) - 1) { |
|
| 245 | 245 | $config_check_results .= "<br />"; |
| 246 | 246 | } |
| 247 | 247 | } |
| 248 | - $_SESSION["mgrConfigCheck"]=true; |
|
| 248 | + $_SESSION["mgrConfigCheck"] = true; |
|
| 249 | 249 | } else { |
| 250 | 250 | $config_check_results = $_lang['configcheck_ok']; |
| 251 | 251 | } |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -require_once(dirname(__FILE__) . '/protect.inc.php'); |
|
| 9 | +require_once(dirname(__FILE__).'/protect.inc.php'); |
|
| 10 | 10 | |
| 11 | 11 | $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']); |
| 12 | 12 | $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']); |
@@ -23,13 +23,13 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | switch (true) { |
| 25 | 25 | case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/', |
| 26 | - $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): { |
|
| 27 | - include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php'); |
|
| 26 | + $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): { |
|
| 27 | + include(dirname(__FILE__).'/lang/'.$lang.'.inc.php'); |
|
| 28 | 28 | $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : ""; |
| 29 | 29 | break; |
| 30 | 30 | } |
| 31 | 31 | case ($action == 'setsetting' && !empty($key) && !empty($value)): { |
| 32 | - $sql = "REPLACE INTO " . $modx->getDatabase()->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');"; |
|
| 32 | + $sql = "REPLACE INTO ".$modx->getDatabase()->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');"; |
|
| 33 | 33 | $str = "true"; |
| 34 | 34 | $modx->getDatabase()->query($sql); |
| 35 | 35 | $emptyCache = true; |
@@ -2,29 +2,29 @@ |
||
| 2 | 2 | $userID = abs($modx->getLoginUserID('web')); |
| 3 | 3 | $modx->qs_hash = md5($modx->qs_hash."^{$userID}^"); |
| 4 | 4 | |
| 5 | -$groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array(); |
|
| 5 | +$groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array(); |
|
| 6 | 6 | |
| 7 | 7 | // if $groupNames is not an array return false |
| 8 | -if(!is_array($groupNames)) return 0; |
|
| 8 | +if (!is_array($groupNames)) return 0; |
|
| 9 | 9 | |
| 10 | 10 | // Creates an array with all webgroups the user id is in |
| 11 | 11 | if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID]; |
| 12 | 12 | else { |
| 13 | 13 | $from = sprintf( |
| 14 | - $modx->getDatabase()->getFullTableName('webgroup_names') . |
|
| 15 | - " wgn INNER JOIN " . |
|
| 16 | - $modx->getDatabase()->getFullTableName('web_groups') . |
|
| 14 | + $modx->getDatabase()->getFullTableName('webgroup_names'). |
|
| 15 | + " wgn INNER JOIN ". |
|
| 16 | + $modx->getDatabase()->getFullTableName('web_groups'). |
|
| 17 | 17 | " wg ON wg.webgroup=wgn.id AND wg.webuser='%s'", |
| 18 | 18 | |
| 19 | 19 | $userID |
| 20 | 20 | ); |
| 21 | - $rs = $modx->getDatabase()->select('wgn.name',$from); |
|
| 22 | - $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name',$rs); |
|
| 21 | + $rs = $modx->getDatabase()->select('wgn.name', $from); |
|
| 22 | + $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name', $rs); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | // Check if a supplied group matches a webgroup from the array we just created |
| 26 | -foreach($groupNames as $k=>$v) { |
|
| 27 | - if(in_array(trim($v),$grpNames)) return 1; |
|
| 26 | +foreach ($groupNames as $k=>$v) { |
|
| 27 | + if (in_array(trim($v), $grpNames)) return 1; |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // If we get here the above logic did not find a match, so return false |
@@ -5,11 +5,14 @@ discard block |
||
| 5 | 5 | $groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array(); |
| 6 | 6 | |
| 7 | 7 | // if $groupNames is not an array return false |
| 8 | -if(!is_array($groupNames)) return 0; |
|
| 8 | +if(!is_array($groupNames)) { |
|
| 9 | + return 0; |
|
| 10 | +} |
|
| 9 | 11 | |
| 10 | 12 | // Creates an array with all webgroups the user id is in |
| 11 | -if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID]; |
|
| 12 | -else { |
|
| 13 | +if (isset($modx->getModifiers()->cache['mo'][$userID])) { |
|
| 14 | + $grpNames = $modx->getModifiers()->cache['mo'][$userID]; |
|
| 15 | +} else { |
|
| 13 | 16 | $from = sprintf( |
| 14 | 17 | $modx->getDatabase()->getFullTableName('webgroup_names') . |
| 15 | 18 | " wgn INNER JOIN " . |
@@ -24,8 +27,10 @@ discard block |
||
| 24 | 27 | |
| 25 | 28 | // Check if a supplied group matches a webgroup from the array we just created |
| 26 | 29 | foreach($groupNames as $k=>$v) { |
| 27 | - if(in_array(trim($v),$grpNames)) return 1; |
|
| 28 | -} |
|
| 30 | + if(in_array(trim($v),$grpNames)) { |
|
| 31 | + return 1; |
|
| 32 | + } |
|
| 33 | + } |
|
| 29 | 34 | |
| 30 | 35 | // If we get here the above logic did not find a match, so return false |
| 31 | 36 | return 0; |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | $newCat = $modx->getDatabase()->escape($newCat); |
| 35 | 35 | $cats = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('categories'), "category='{$newCat}'"); |
| 36 | 36 | if ($cat = $modx->getDatabase()->getValue($cats)) { |
| 37 | - return (int)$cat; |
|
| 37 | + return (int) $cat; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | return 0; |
