Inspection of "[I] #406 Ajax-API for publish/delete resources in..." - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#530)

unknown

created 2018-02-24 12:14 UTC

Status

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -235,11 +235,11 @@
 block discarded – undo
         lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>
       };
       <?php
-      $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
-      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
-      if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
-      else $modxJs = 'modx.min.js'; // For easier development
-      ?>
+        $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
+        echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
+        if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
+        else $modxJs = 'modx.min.js'; // For easier development
+        ?>
     </script>
     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/<?= $modxJs ?>?v=<?= $lastInstallTime ?>"></script>
     <?php if ($modx->config['show_picker'] != "0") { ?>

Please login to merge, or discard this patch.

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 header("X-XSS-Protection: 0");
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 }
 
 if (isset($_COOKIE['MODX_themeColor'])) {
-    $body_class .= ' ' . $_COOKIE['MODX_themeColor'];
+    $body_class .= ' '.$_COOKIE['MODX_themeColor'];
 }
 
 if (isset($modx->pluginCache['ElementsInTree'])) {
@@ -74,36 +74,36 @@  discard block
 block discarded – undo
     $user['which_browser'] = $modx->config['which_browser'];
 }
 
-$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;
+$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime;
 
 if ($modx->config['manager_theme'] == 'default') {
-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
         $minifier = new Formatter\CSSMinify();
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');
         $css = $minifier->minify();
-        file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);
+        file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css);
     }
-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
     }
 }
 
-$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));
+$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));
 
 ?>
 <!DOCTYPE html>
-<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>>
+<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>>
 <head>
     <title><?= $site_name ?>- (EVO CMS Manager)</title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" />
@@ -134,20 +134,20 @@  discard block
 block discarded – undo
         MODX_SITE_URL: '<?= MODX_SITE_URL ?>',
         MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>',
         user: {
-          role: <?= (int)$user['role'] ?>,
+          role: <?= (int) $user['role'] ?>,
           username: '<?= $user['username'] ?>'
         },
         config: {
           mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>,
-          menu_height: <?= (int)$menu_height ?>,
-          tree_width: <?= (int)$tree_width ?>,
-          tree_min_width: <?= (int)$tree_min_width ?>,
-          session_timeout: <?= (int)$modx->config['session_timeout'] ?>,
-          site_start: <?= (int)$modx->config['site_start'] ?>,
-          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>,
+          menu_height: <?= (int) $menu_height ?>,
+          tree_width: <?= (int) $tree_width ?>,
+          tree_min_width: <?= (int) $tree_min_width ?>,
+          session_timeout: <?= (int) $modx->config['session_timeout'] ?>,
+          site_start: <?= (int) $modx->config['site_start'] ?>,
+          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>,
           theme: '<?= $modx->config['manager_theme'] ?>',
           which_browser: '<?= $user['which_browser'] ?>',
-          layout: <?= (int)$manager_layout ?>,
+          layout: <?= (int) $manager_layout ?>,
           textdir: '<?= $modx_textdir ?>',
           global_tabs: <?= $modx->config['global_tabs'] ?>
 
@@ -232,12 +232,12 @@  discard block
 block discarded – undo
           delete a[b];
         },
         openedArray: [],
-        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>
+        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE)."\n" ?>
       };
       <?php
       $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
-      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
-      if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
+      echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n		modx.openedArray[", $opened).'] = 1;')."\n";
+      if (filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
       else $modxJs = 'modx.min.js'; // For easier development
       ?>
     </script>
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">
                                 <span class="username"><?= $user['username'] ?></span>
                                 <?php if ($user['photo']) { ?>
-                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>
+                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span>
                                 <?php } else { ?>
                                     <span class="icon"><?= $_style['menu_user'] ?></span>
                                 <?php } ?>
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
                                 $version = 'Evolution';
                                 ?>
                                 <?php
-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
+                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
                                 ?>
                             </ul>
                         </li>
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
     <script type="text/javascript">
 
       if (document.getElementById('treeMenu')) {
-          <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
+          <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
 
         document.getElementById('treeMenu_openelements').onclick = function(e) {
           e.preventDefault();
@@ -551,12 +551,12 @@  discard block
 block discarded – undo
           }
         };
           <?php } ?>
-          <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>
+          <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>
 
         document.getElementById('treeMenu_openimages').onclick = function(e) {
           e.preventDefault();
           if (modx.config.global_tabs && !e.shiftKey) {
-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
           } else {
             var randomNum = '<?= $_lang["files_files"] ?>';
             if (e.shiftKey) {
@@ -569,12 +569,12 @@  discard block
 block discarded – undo
           }
         };
           <?php } ?>
-          <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>
+          <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>
 
         document.getElementById('treeMenu_openfiles').onclick = function(e) {
           e.preventDefault();
           if (modx.config.global_tabs && !e.shiftKey) {
-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
           } else {
             var randomNum = '<?= $_lang["files_files"] ?>';
             if (e.shiftKey) {
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
 
 </div>
 <?php if ($modx->config['show_picker'] != "0") {
-    include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');
+    include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');
 } ?>
 </body>
 </html>

Please login to merge, or discard this patch.

Braces +35 added lines, -28 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 header("X-XSS-Protection: 0");
@@ -11,22 +11,22 @@  discard block
 block discarded – undo
 
 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';
 
-if (!isset($modx->config['manager_menu_height'])) {
+if (!isset($modx->config['manager_menu_height'])) {
     $modx->config['manager_menu_height'] = 2.2; // rem
 }
 
-if (!isset($modx->config['manager_tree_width'])) {
+if (!isset($modx->config['manager_tree_width'])) {
     $modx->config['manager_tree_width'] = 20; // rem
 }
 
-if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
+if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
     $initMainframeAction = $_SESSION['onLoginForwardToAction'];
     unset($_SESSION['onLoginForwardToAction']);
-} else {
+} else {
     $initMainframeAction = 2; // welcome.static
 }
 
-if (!isset($_SESSION['tree_show_only_folders'])) {
+if (!isset($_SESSION['tree_show_only_folders'])) {
     $_SESSION['tree_show_only_folders'] = 0;
 }
 
@@ -35,21 +35,21 @@  discard block
 block discarded – undo
 $tree_width = $modx->config['manager_tree_width'];
 $tree_min_width = 0;
 
-if (isset($_COOKIE['MODX_widthSideBar'])) {
+if (isset($_COOKIE['MODX_widthSideBar'])) {
     $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar'];
-} else {
+} else {
     $MODX_widthSideBar = $tree_width;
 }
 
-if (!$MODX_widthSideBar) {
+if (!$MODX_widthSideBar) {
     $body_class .= 'sidebar-closed';
 }
 
-if (isset($_COOKIE['MODX_themeColor'])) {
+if (isset($_COOKIE['MODX_themeColor'])) {
     $body_class .= ' ' . $_COOKIE['MODX_themeColor'];
 }
 
-if (isset($modx->pluginCache['ElementsInTree'])) {
+if (isset($modx->pluginCache['ElementsInTree'])) {
     $body_class .= ' ElementsInTree';
 }
 
@@ -65,19 +65,19 @@  discard block
 block discarded – undo
     'type8' => $_lang["lock_element_type_8"]
 );
 
-foreach ($unlockTranslations as $key => $value) {
+foreach ($unlockTranslations as $key => $value) {
     $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 }
 
 $user = $modx->getUserInfo($modx->getLoginUserID());
-if ($user['which_browser'] == 'default') {
+if ($user['which_browser'] == 'default') {
     $user['which_browser'] = $modx->config['which_browser'];
 }
 
 $css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;
 
-if ($modx->config['manager_theme'] == 'default') {
-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
+if ($modx->config['manager_theme'] == 'default') {
+    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
         $minifier = new Formatter\CSSMinify();
         $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
         $css = $minifier->minify();
         file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);
     }
-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
     }
 }
@@ -237,8 +237,12 @@  discard block
 block discarded – undo
       <?php
       $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
       echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
-      if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
-      else $modxJs = 'modx.min.js'; // For easier development
+      if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) {
+          $modxJs = 'modx.js';
+      } else {
+          $modxJs = 'modx.min.js';
+      }
+      // For easier development
       ?>
     </script>
     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/<?= $modxJs ?>?v=<?= $lastInstallTime ?>"></script>
@@ -250,7 +254,7 @@  discard block
 block discarded – undo
     <?php
     // invoke OnManagerTopPrerender event
     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);
-    if (is_array($evtOut)) {
+    if (is_array($evtOut)) {
         echo implode("\n", $evtOut);
     }
     ?>
@@ -421,9 +425,12 @@  discard block
 block discarded – undo
             <div id="evo-tab-page-home" class="evo-tab-page show">
                 <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>
             </div>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         <div id="mainloader"></div>
     </div>
     <div id="resizer"></div>
@@ -436,11 +443,11 @@  discard block
 block discarded – undo
             'tree_sortdir',
             'tree_nodename'
         );
-        foreach ($sortParams as $param) {
-            if (isset($_REQUEST[$param])) {
+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]);
                 $_SESSION[$param] = $_REQUEST[$param];
-            } else if (!isset($_SESSION[$param])) {
+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->manager->getLastUserSetting($param);
             }
         }
@@ -520,9 +527,9 @@  discard block
 block discarded – undo
     </div>
 
     <?php
-    function constructLink($action, $img, $text, $allowed)
-    {
-        if ($allowed == 1) {
+    function constructLink($action, $img, $text, $allowed)
+    {
+        if ($allowed == 1) {
             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, $action);
             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);
         }
@@ -627,7 +634,7 @@  discard block
 block discarded – undo
     ?>
 
 </div>
-<?php if ($modx->config['show_picker'] != "0") {
+<?php if ($modx->config['show_picker'] != "0") {
     include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');
 } ?>
 </body>

Please login to merge, or discard this patch.

manager/actions/welcome.static.php 3 patches

Indentation +226 added lines, -226 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
+    die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
 
 if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
-	// seems to be a new install - send the user to the configuration page
-	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
+    // seems to be a new install - send the user to the configuration page
+    exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
 }
 
 // set placeholders
@@ -17,70 +17,70 @@  discard block
 block discarded – undo
 
 // setup message info
 if($modx->hasPermission('messages')) {
-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
-	$_SESSION['nrtotalmessages'] = $nrtotalmessages;
-	$_SESSION['nrnewmessages'] = $nrnewmessages;
-
-	$msg = array();
-	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
-	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
-	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
-	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
-	$ph['MessageInfo'] = join("\n", $msg);
+    include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
+    $_SESSION['nrtotalmessages'] = $nrtotalmessages;
+    $_SESSION['nrnewmessages'] = $nrnewmessages;
+
+    $msg = array();
+    $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
+    $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
+    $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
+    $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
+    $ph['MessageInfo'] = join("\n", $msg);
 }
 
 // setup icons
 if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
-	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
-	$ph['SecurityIcon'] = wrapIcon($icon, 75);
+    $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
+    $ph['SecurityIcon'] = wrapIcon($icon, 75);
 }
 if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
-	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
-	$ph['WebUserIcon'] = wrapIcon($icon, 99);
+    $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
+    $ph['WebUserIcon'] = wrapIcon($icon, 99);
 }
 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
-	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
-	$ph['ModulesIcon'] = wrapIcon($icon, 106);
+    $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
+    $ph['ModulesIcon'] = wrapIcon($icon, 106);
 }
 if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
-	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
-	$ph['ResourcesIcon'] = wrapIcon($icon, 76);
+    $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
+    $ph['ResourcesIcon'] = wrapIcon($icon, 76);
 }
 if($modx->hasPermission('bk_manager')) {
-	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
-	$ph['BackupIcon'] = wrapIcon($icon, 93);
+    $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
+    $ph['BackupIcon'] = wrapIcon($icon, 93);
 }
 if($modx->hasPermission('help')) {
-	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
-	$ph['HelpIcon'] = wrapIcon($icon, 9);
+    $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
+    $ph['HelpIcon'] = wrapIcon($icon, 9);
 }
 // do some config checks
 if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
-	if($config_check_results != $_lang['configcheck_ok']) {
-		$ph['config_check_results'] = $config_check_results;
-		$ph['config_display'] = 'block';
-	} else {
-		$ph['config_display'] = 'none';
-	}
+    include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
+    if($config_check_results != $_lang['configcheck_ok']) {
+        $ph['config_check_results'] = $config_check_results;
+        $ph['config_display'] = 'block';
+    } else {
+        $ph['config_display'] = 'none';
+    }
 } else {
-	$ph['config_display'] = 'none';
+    $ph['config_display'] = 'none';
 }
 
 // Check logout-reminder
 if(isset($_SESSION['show_logout_reminder'])) {
-	switch($_SESSION['show_logout_reminder']['type']) {
-		case 'logout_reminder':
-			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
-			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
-			break;
-	}
-	$ph['show_logout_reminder'] = 'block';
-	unset($_SESSION['show_logout_reminder']);
+    switch($_SESSION['show_logout_reminder']['type']) {
+        case 'logout_reminder':
+            $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
+            $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
+            break;
+    }
+    $ph['show_logout_reminder'] = 'block';
+    unset($_SESSION['show_logout_reminder']);
 } else {
-	$ph['show_logout_reminder'] = 'none';
+    $ph['show_logout_reminder'] = 'none';
 }
 
 // Check multiple sessions
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
 $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
 
 $ph['UserInfo'] = $modx->parseText($tpl, array(
-	'username' => $modx->getLoginUserName(),
-	'role' => $_SESSION['mgrPermissions']['name'],
-	'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),
-	'logincount' => $_SESSION['mgrLogincount'] + 1,
-	'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)
+    'username' => $modx->getLoginUserName(),
+    'role' => $_SESSION['mgrPermissions']['name'],
+    'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),
+    'logincount' => $_SESSION['mgrLogincount'] + 1,
+    'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)
 ));
 
 $from = array();
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
 
 if($modx->db->getRecordCount($rs) < 1) {
-	$html = '<p>[%no_active_users_found%]</p>';
+    $html = '<p>[%no_active_users_found%]</p>';
 } else {
-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
-	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
-	$ph['now'] = strftime('%H:%M:%S', $now);
-	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;
-	$html = '
+    include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+    $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
+    $ph['now'] = strftime('%H:%M:%S', $now);
+    $timetocheck = ($now - (60 * 20)); //+$server_offset_time;
+    $html = '
 	<div class="card-body">
 		[%onlineusers_message%] 
 		<b>[+now+]</b>):
@@ -165,33 +165,33 @@  discard block
 block discarded – undo
 	</thead>
 	<tbody>';
 
-	$userList = array();
-	$userCount = array();
-	// Create userlist with session-count first before output
-	while($activeusers = $modx->db->getRow($rs)) {
-		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
-
-		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
-		$webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';
-		$ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];
-		$currentaction = getAction($activeusers['action'], $activeusers['id']);
-		$userList[] = array(
-			$idle,
-			'',
-			$activeusers['username'],
-			$webicon,
-			abs($activeusers['internalKey']),
-			$ip,
-			strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
-			$currentaction
-		);
-	}
-	foreach($userList as $params) {
-		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
-	}
-
-	$html .= '
+    $userList = array();
+    $userCount = array();
+    // Create userlist with session-count first before output
+    while($activeusers = $modx->db->getRow($rs)) {
+        $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
+
+        $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
+        $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';
+        $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];
+        $currentaction = getAction($activeusers['action'], $activeusers['id']);
+        $userList[] = array(
+            $idle,
+            '',
+            $activeusers['username'],
+            $webicon,
+            abs($activeusers['internalKey']),
+            $ip,
+            strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
+            $currentaction
+        );
+    }
+    foreach($userList as $params) {
+        $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
+        $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
+    }
+
+    $html .= '
 	</tbody>
 	</table>
 </div>
@@ -232,17 +232,17 @@  discard block
 block discarded – undo
 // invoke event OnManagerWelcomePrerender
 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
 if(is_array($evtOut)) {
-	$output = implode('', $evtOut);
-	$ph['OnManagerWelcomePrerender'] = $output;
+    $output = implode('', $evtOut);
+    $ph['OnManagerWelcomePrerender'] = $output;
 }
 
 $widgets['welcome'] = array(
-	'menuindex' => '10',
-	'id' => 'welcome',
-	'cols' => 'col-sm-6',
-	'icon' => 'fa-home',
-	'title' => '[%welcome_title%]',
-	'body' => '
+    'menuindex' => '10',
+    'id' => 'welcome',
+    'cols' => 'col-sm-6',
+    'icon' => 'fa-home',
+    'title' => '[%welcome_title%]',
+    'body' => '
 				<div class="wm_buttons card-body"> 
 					<!--@IF:[[#hasPermission?key=new_user]] OR [[#hasPermission?key=edit_user]]--> 
 					<span class="wm_button">
@@ -320,25 +320,25 @@  discard block
 block discarded – undo
 					</table>
 				</div>
 		',
-	'hide'=>'0'
+    'hide'=>'0'
 );
 $widgets['onlineinfo'] = array(
-	'menuindex' => '20',
-	'id' => 'onlineinfo',
-	'cols' => 'col-sm-6',
-	'icon' => 'fa-user',
-	'title' => '[%onlineusers_title%]',
-	'body' => '<div class="userstable">[+OnlineInfo+]</div>',
-	'hide'=>'0'
+    'menuindex' => '20',
+    'id' => 'onlineinfo',
+    'cols' => 'col-sm-6',
+    'icon' => 'fa-user',
+    'title' => '[%onlineusers_title%]',
+    'body' => '<div class="userstable">[+OnlineInfo+]</div>',
+    'hide'=>'0'
 );
 $widgets['recentinfo'] = array(
-	'menuindex' => '30',
-	'id' => 'modxrecent_widget',
-	'cols' => 'col-sm-12',
-	'icon' => 'fa-pencil-square-o',
-	'title' => '[%activity_title%]',
-	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',
-	'hide'=>'0'
+    'menuindex' => '30',
+    'id' => 'modxrecent_widget',
+    'cols' => 'col-sm-12',
+    'icon' => 'fa-pencil-square-o',
+    'title' => '[%activity_title%]',
+    'body' => '<div class="widget-stage">[+RecentInfo+]</div>',
+    'hide'=>'0'
 );
 if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
 // invoke OnManagerWelcomeHome event
 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
 if(is_array($sitewidgets)) {
-	$newwidgets = array();
+    $newwidgets = array();
     foreach($sitewidgets as $widget){
         $newwidgets = array_merge($newwidgets, unserialize($widget));
     }
@@ -374,21 +374,21 @@  discard block
 block discarded – undo
 }
 
 usort($widgets, function ($a, $b) {
-	return $a['menuindex'] - $b['menuindex'];
+    return $a['menuindex'] - $b['menuindex'];
 });
 
 $tpl = getTplWidget();
 $output = '';
 foreach($widgets as $widget) {
-	if ($widget['hide'] != '1'){
-		$output .= $modx->parseText($tpl, $widget);
-	}
+    if ($widget['hide'] != '1'){
+        $output .= $modx->parseText($tpl, $widget);
+    }
 }
 $ph['widgets'] = $output;
 
 // load template
 if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
+    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
 }
 
 $target = $modx->config['manager_welcome_tpl'];
@@ -396,27 +396,27 @@  discard block
 block discarded – undo
 $target = $modx->mergeSettingsContent($target);
 
 if(substr($target, 0, 1) === '@') {
-	if(substr($target, 0, 6) === '@CHUNK') {
-		$content = $modx->getChunk(trim(substr($target, 7)));
-	} elseif(substr($target, 0, 5) === '@FILE') {
-		$content = file_get_contents(trim(substr($target, 6)));
-	} else {
-		$content = '';
-	}
+    if(substr($target, 0, 6) === '@CHUNK') {
+        $content = $modx->getChunk(trim(substr($target, 7)));
+    } elseif(substr($target, 0, 5) === '@FILE') {
+        $content = file_get_contents(trim(substr($target, 6)));
+    } else {
+        $content = '';
+    }
 } else {
-	$chunk = $modx->getChunk($target);
-	if($chunk !== false && !empty($chunk)) {
-		$content = $chunk;
-	} elseif(is_file(MODX_BASE_PATH . $target)) {
-		$content = file_get_contents(MODX_BASE_PATH . $target);
-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
-	{
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
-	} else {
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
-	}
+    $chunk = $modx->getChunk($target);
+    if($chunk !== false && !empty($chunk)) {
+        $content = $chunk;
+    } elseif(is_file(MODX_BASE_PATH . $target)) {
+        $content = file_get_contents(MODX_BASE_PATH . $target);
+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
+    {
+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
+    } else {
+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
+    }
 }
 
 // merge placeholders
@@ -424,8 +424,8 @@  discard block
 block discarded – undo
 $content = $modx->mergeSettingsContent($content);
 $content = $modx->parseText($content, $ph);
 if(strpos($content, '[+') !== false) {
-	$modx->toPlaceholders($ph);
-	$content = $modx->mergePlaceholderContent($content);
+    $modx->toPlaceholders($ph);
+    $content = $modx->mergePlaceholderContent($content);
 }
 $content = $modx->parseDocumentSource($content);
 $content = $modx->parseText($content, $_lang, '[%', '%]');
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
 $content = $modx->cleanUpMODXTags($content); //cleanup
 
 if($js = $modx->getRegisteredClientScripts()) {
-	$content .= $js;
+    $content .= $js;
 }
 
 echo $content;
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>
 //</span>
 function getTplWidget() { // recent document info
-	return '
+    return '
 		<div class="[+cols+]" id="[+id+]">
 			<div class="card"[+cardAttr+]>
 				<div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div>
@@ -454,11 +454,11 @@  discard block
 block discarded – undo
 }
 
 function getRecentInfo() { // recent document info
-	global $modx;
+    global $modx;
 
-	$modx->addSnippet('recentInfoList', 'getRecentInfoList');
+    $modx->addSnippet('recentInfoList', 'getRecentInfoList');
 
-	$html = '
+    $html = '
 			<div class="table-responsive">
 				<table class="table data">
 					<thead>
@@ -476,96 +476,96 @@  discard block
 block discarded – undo
 				</table>
 			</div>
 ';
-	return $html;
+    return $html;
 }
 
 function getRecentInfoList() {
-	global $modx;
-
-	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
-
-	if($modx->db->getRecordCount($rs) < 1) {
-		return '<tr><td>[%no_activity_message%]</td></tr>';
-	}
-
-	$tpl = getRecentInfoRowTpl();
-
-	$btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';
-	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';
-
-	$output = array();
-	while($ph = $modx->db->getRow($rs)) {
-		$docid = $ph['id'];
-		$_ = $modx->getUserInfo($ph['editedby']);
-		$ph['username'] = $_['username'];
-
-		if($ph['deleted'] == 1) {
-			$ph['status'] = 'deleted text-danger';
-		} elseif($ph['published'] == 0) {
-			$ph['status'] = 'unpublished font-italic text-muted';
-		} else {
-			$ph['status'] = 'published';
-		}
-
-		if($modx->hasPermission('edit_document')) {
-			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
-		} else {
-			$ph['edit_btn'] = '';
-		}
-
-		$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';
-		$ph['preview_btn'] = str_replace(array(
-			'[+id+]',
-			'[+preview_disabled+]'
-		), array(
-			$docid,
-			$preview_disabled
-		), $btntpl['preview_btn']);
-
-		if($modx->hasPermission('delete_document')) {
-			if($ph['deleted'] == 0) {
-				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-trash fa-fw"></i></a> ';
-			} else {
-				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';
-			}
-			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);
-		} else {
-			$ph['delete_btn'] = '';
-		}
-
-		if($ph['deleted'] == 1 && $ph['published'] == 0) {
-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
-			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
-		} else {
-			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
-		}
-		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);
-
-		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
-
-		if($ph['longtitle'] == '') {
-			$ph['longtitle'] = '(<i>[%not_set%]</i>)';
-		}
-		if($ph['description'] == '') {
-			$ph['description'] = '(<i>[%not_set%]</i>)';
-		}
-		if($ph['introtext'] == '') {
-			$ph['introtext'] = '(<i>[%not_set%]</i>)';
-		}
-		if($ph['alias'] == '') {
-			$ph['alias'] = '(<i>[%not_set%]</i>)';
-		}
-
-		$output[] = $modx->parseText($tpl, $ph);
-	}
-	return join("\n", $output);
+    global $modx;
+
+    $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
+
+    if($modx->db->getRecordCount($rs) < 1) {
+        return '<tr><td>[%no_activity_message%]</td></tr>';
+    }
+
+    $tpl = getRecentInfoRowTpl();
+
+    $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';
+    $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';
+
+    $output = array();
+    while($ph = $modx->db->getRow($rs)) {
+        $docid = $ph['id'];
+        $_ = $modx->getUserInfo($ph['editedby']);
+        $ph['username'] = $_['username'];
+
+        if($ph['deleted'] == 1) {
+            $ph['status'] = 'deleted text-danger';
+        } elseif($ph['published'] == 0) {
+            $ph['status'] = 'unpublished font-italic text-muted';
+        } else {
+            $ph['status'] = 'published';
+        }
+
+        if($modx->hasPermission('edit_document')) {
+            $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
+        } else {
+            $ph['edit_btn'] = '';
+        }
+
+        $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';
+        $ph['preview_btn'] = str_replace(array(
+            '[+id+]',
+            '[+preview_disabled+]'
+        ), array(
+            $docid,
+            $preview_disabled
+        ), $btntpl['preview_btn']);
+
+        if($modx->hasPermission('delete_document')) {
+            if($ph['deleted'] == 0) {
+                $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-trash fa-fw"></i></a> ';
+            } else {
+                $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';
+            }
+            $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);
+        } else {
+            $ph['delete_btn'] = '';
+        }
+
+        if($ph['deleted'] == 1 && $ph['published'] == 0) {
+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
+        } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
+        } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
+            $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
+        } else {
+            $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
+        }
+        $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);
+
+        $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
+
+        if($ph['longtitle'] == '') {
+            $ph['longtitle'] = '(<i>[%not_set%]</i>)';
+        }
+        if($ph['description'] == '') {
+            $ph['description'] = '(<i>[%not_set%]</i>)';
+        }
+        if($ph['introtext'] == '') {
+            $ph['introtext'] = '(<i>[%not_set%]</i>)';
+        }
+        if($ph['alias'] == '') {
+            $ph['alias'] = '(<i>[%not_set%]</i>)';
+        }
+
+        $output[] = $modx->parseText($tpl, $ph);
+    }
+    return join("\n", $output);
 }
 
 function getRecentInfoRowTpl() {
-	$tpl = '
+    $tpl = '
 						<tr id="row[+id+]">
 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>
 							<td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]" target="main">[+pagetitle+]</a></td>
@@ -589,16 +589,16 @@  discard block
 block discarded – undo
 								</div>
 							</td>
 						</tr>';
-	return $tpl;
+    return $tpl;
 }
 
 // setup icons
 function wrapIcon($i, $action) {
-	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
+    return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
 }
 
 function getStartUpScript() {
-	$script = '
+    $script = '
         <script type="text/javascript">
         function hideConfigCheckWarning(key) {
         	var xhr = new XMLHttpRequest();
@@ -622,5 +622,5 @@  discard block
 block discarded – undo
 		})(jQuery);        
         </script>
 ';
-	return $script;
+    return $script;
 }

Please login to merge, or discard this patch.

Spacing +65 added lines, -65 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
 
-if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
+if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
 	// seems to be a new install - send the user to the configuration page
 	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
 }
@@ -16,50 +16,50 @@  discard block
 block discarded – undo
 $_SESSION['nrnewmessages'] = 0;
 
 // setup message info
-if($modx->hasPermission('messages')) {
-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
+if ($modx->hasPermission('messages')) {
+	include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');
 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;
 	$_SESSION['nrnewmessages'] = $nrnewmessages;
 
 	$msg = array();
 	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';
 	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';
 	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
 	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
 	$ph['MessageInfo'] = join("\n", $msg);
 }
 
 // setup icons
-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
+if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
 	$ph['SecurityIcon'] = wrapIcon($icon, 75);
 }
-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
+if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
 	$ph['WebUserIcon'] = wrapIcon($icon, 99);
 }
-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
 	$ph['ModulesIcon'] = wrapIcon($icon, 106);
 }
-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
 	$ph['ResourcesIcon'] = wrapIcon($icon, 76);
 }
-if($modx->hasPermission('bk_manager')) {
+if ($modx->hasPermission('bk_manager')) {
 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
 	$ph['BackupIcon'] = wrapIcon($icon, 93);
 }
-if($modx->hasPermission('help')) {
+if ($modx->hasPermission('help')) {
 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
 	$ph['HelpIcon'] = wrapIcon($icon, 9);
 }
 // do some config checks
-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
-	if($config_check_results != $_lang['configcheck_ok']) {
+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
+	include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');
+	if ($config_check_results != $_lang['configcheck_ok']) {
 		$ph['config_check_results'] = $config_check_results;
 		$ph['config_display'] = 'block';
 	} else {
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
 }
 
 // Check logout-reminder
-if(isset($_SESSION['show_logout_reminder'])) {
-	switch($_SESSION['show_logout_reminder']['type']) {
+if (isset($_SESSION['show_logout_reminder'])) {
+	switch ($_SESSION['show_logout_reminder']['type']) {
 		case 'logout_reminder':
 			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
 			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 	</tr>
 </table>';
 
-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';
 
 $ph['UserInfo'] = $modx->parseText($tpl, array(
 	'username' => $modx->getLoginUserName(),
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
 
-if($modx->db->getRecordCount($rs) < 1) {
+if ($modx->db->getRecordCount($rs) < 1) {
 	$html = '<p>[%no_active_users_found%]</p>';
 } else {
-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+	include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
 	$ph['now'] = strftime('%H:%M:%S', $now);
 	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
 	$userList = array();
 	$userCount = array();
 	// Create userlist with session-count first before output
-	while($activeusers = $modx->db->getRow($rs)) {
+	while ($activeusers = $modx->db->getRow($rs)) {
 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
 
 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
 			$currentaction
 		);
 	}
-	foreach($userList as $params) {
+	foreach ($userList as $params) {
 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
+		$html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
 	}
 
 	$html .= '
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
 $ph['OnlineInfo'] = $html;
 
 // include rss feeds for important forum topics
-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');
+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');
 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];
 $ph['modx_news_content'] = $feedData['modx_news_content'];
 
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
 
 // invoke event OnManagerWelcomePrerender
 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
-if(is_array($evtOut)) {
+if (is_array($evtOut)) {
 	$output = implode('', $evtOut);
 	$ph['OnManagerWelcomePrerender'] = $output;
 }
@@ -365,57 +365,57 @@  discard block
 block discarded – undo
 
 // invoke OnManagerWelcomeHome event
 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
-if(is_array($sitewidgets)) {
+if (is_array($sitewidgets)) {
 	$newwidgets = array();
-    foreach($sitewidgets as $widget){
+    foreach ($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));
     }
     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
 }
 
-usort($widgets, function ($a, $b) {
+usort($widgets, function($a, $b){
 	return $a['menuindex'] - $b['menuindex'];
 });
 
 $tpl = getTplWidget();
 $output = '';
-foreach($widgets as $widget) {
-	if ($widget['hide'] != '1'){
+foreach ($widgets as $widget) {
+	if ($widget['hide'] != '1') {
 		$output .= $modx->parseText($tpl, $widget);
 	}
 }
 $ph['widgets'] = $output;
 
 // load template
-if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
+if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
+	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';
 }
 
 $target = $modx->config['manager_welcome_tpl'];
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
 $target = $modx->mergeSettingsContent($target);
 
-if(substr($target, 0, 1) === '@') {
-	if(substr($target, 0, 6) === '@CHUNK') {
+if (substr($target, 0, 1) === '@') {
+	if (substr($target, 0, 6) === '@CHUNK') {
 		$content = $modx->getChunk(trim(substr($target, 7)));
-	} elseif(substr($target, 0, 5) === '@FILE') {
+	} elseif (substr($target, 0, 5) === '@FILE') {
 		$content = file_get_contents(trim(substr($target, 6)));
 	} else {
 		$content = '';
 	}
 } else {
 	$chunk = $modx->getChunk($target);
-	if($chunk !== false && !empty($chunk)) {
+	if ($chunk !== false && !empty($chunk)) {
 		$content = $chunk;
-	} elseif(is_file(MODX_BASE_PATH . $target)) {
-		$content = file_get_contents(MODX_BASE_PATH . $target);
-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
+	} elseif (is_file(MODX_BASE_PATH.$target)) {
+		$content = file_get_contents(MODX_BASE_PATH.$target);
+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {
+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');
+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible
 	{
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');
 	} else {
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');
 	}
 }
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
 $content = $modx->mergeConditionalTagsContent($content);
 $content = $modx->mergeSettingsContent($content);
 $content = $modx->parseText($content, $ph);
-if(strpos($content, '[+') !== false) {
+if (strpos($content, '[+') !== false) {
 	$modx->toPlaceholders($ph);
 	$content = $modx->mergePlaceholderContent($content);
 }
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
 $content = $modx->parseText($content, $_style, '[&', '&]');
 $content = $modx->cleanUpMODXTags($content); //cleanup
 
-if($js = $modx->getRegisteredClientScripts()) {
+if ($js = $modx->getRegisteredClientScripts()) {
 	$content .= $js;
 }
 
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>
 //</span>
-function getTplWidget() { // recent document info
+function getTplWidget(){ // recent document info
 	return '
 		<div class="[+cols+]" id="[+id+]">
 			<div class="card"[+cardAttr+]>
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
 ';
 }
 
-function getRecentInfo() { // recent document info
+function getRecentInfo(){ // recent document info
 	global $modx;
 
 	$modx->addSnippet('recentInfoList', 'getRecentInfoList');
@@ -479,12 +479,12 @@  discard block
 block discarded – undo
 	return $html;
 }
 
-function getRecentInfoList() {
+function getRecentInfoList(){
 	global $modx;
 
 	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
 
-	if($modx->db->getRecordCount($rs) < 1) {
+	if ($modx->db->getRecordCount($rs) < 1) {
 		return '<tr><td>[%no_activity_message%]</td></tr>';
 	}
 
@@ -494,20 +494,20 @@  discard block
 block discarded – undo
 	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';
 
 	$output = array();
-	while($ph = $modx->db->getRow($rs)) {
+	while ($ph = $modx->db->getRow($rs)) {
 		$docid = $ph['id'];
 		$_ = $modx->getUserInfo($ph['editedby']);
 		$ph['username'] = $_['username'];
 
-		if($ph['deleted'] == 1) {
+		if ($ph['deleted'] == 1) {
 			$ph['status'] = 'deleted text-danger';
-		} elseif($ph['published'] == 0) {
+		} elseif ($ph['published'] == 0) {
 			$ph['status'] = 'unpublished font-italic text-muted';
 		} else {
 			$ph['status'] = 'published';
 		}
 
-		if($modx->hasPermission('edit_document')) {
+		if ($modx->hasPermission('edit_document')) {
 			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
 		} else {
 			$ph['edit_btn'] = '';
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
 			$preview_disabled
 		), $btntpl['preview_btn']);
 
-		if($modx->hasPermission('delete_document')) {
-			if($ph['deleted'] == 0) {
+		if ($modx->hasPermission('delete_document')) {
+			if ($ph['deleted'] == 0) {
 				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-trash fa-fw"></i></a> ';
 			} else {
 				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';
@@ -533,11 +533,11 @@  discard block
 block discarded – undo
 			$ph['delete_btn'] = '';
 		}
 
-		if($ph['deleted'] == 1 && $ph['published'] == 0) {
+		if ($ph['deleted'] == 1 && $ph['published'] == 0) {
 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
+		} elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {
 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
+		} elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {
 			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
 		} else {
 			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
@@ -546,16 +546,16 @@  discard block
 block discarded – undo
 
 		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
 
-		if($ph['longtitle'] == '') {
+		if ($ph['longtitle'] == '') {
 			$ph['longtitle'] = '(<i>[%not_set%]</i>)';
 		}
-		if($ph['description'] == '') {
+		if ($ph['description'] == '') {
 			$ph['description'] = '(<i>[%not_set%]</i>)';
 		}
-		if($ph['introtext'] == '') {
+		if ($ph['introtext'] == '') {
 			$ph['introtext'] = '(<i>[%not_set%]</i>)';
 		}
-		if($ph['alias'] == '') {
+		if ($ph['alias'] == '') {
 			$ph['alias'] = '(<i>[%not_set%]</i>)';
 		}
 
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
 	return join("\n", $output);
 }
 
-function getRecentInfoRowTpl() {
+function getRecentInfoRowTpl(){
 	$tpl = '
 						<tr id="row[+id+]">
 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>
@@ -593,11 +593,11 @@  discard block
 block discarded – undo
 }
 
 // setup icons
-function wrapIcon($i, $action) {
+function wrapIcon($i, $action){
 	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
 }
 
-function getStartUpScript() {
+function getStartUpScript(){
 	$script = '
         <script type="text/javascript">
         function hideConfigCheckWarning(key) {

Please login to merge, or discard this patch.

Braces +77 added lines, -67 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
 
-if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
+if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
 	// seems to be a new install - send the user to the configuration page
 	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
 }
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
 $_SESSION['nrnewmessages'] = 0;
 
 // setup message info
-if($modx->hasPermission('messages')) {
+if($modx->hasPermission('messages')) {
 	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;
 	$_SESSION['nrnewmessages'] = $nrnewmessages;
@@ -32,46 +32,46 @@  discard block
 block discarded – undo
 }
 
 // setup icons
-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
+if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
 	$ph['SecurityIcon'] = wrapIcon($icon, 75);
 }
-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
+if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
 	$ph['WebUserIcon'] = wrapIcon($icon, 99);
 }
-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
 	$ph['ModulesIcon'] = wrapIcon($icon, 106);
 }
-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
+if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
 	$ph['ResourcesIcon'] = wrapIcon($icon, 76);
 }
-if($modx->hasPermission('bk_manager')) {
+if($modx->hasPermission('bk_manager')) {
 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
 	$ph['BackupIcon'] = wrapIcon($icon, 93);
 }
-if($modx->hasPermission('help')) {
+if($modx->hasPermission('help')) {
 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
 	$ph['HelpIcon'] = wrapIcon($icon, 9);
 }
 // do some config checks
-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
+if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
 	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
-	if($config_check_results != $_lang['configcheck_ok']) {
+	if($config_check_results != $_lang['configcheck_ok']) {
 		$ph['config_check_results'] = $config_check_results;
 		$ph['config_display'] = 'block';
-	} else {
+	} else {
 		$ph['config_display'] = 'none';
 	}
-} else {
+} else {
 	$ph['config_display'] = 'none';
 }
 
 // Check logout-reminder
-if(isset($_SESSION['show_logout_reminder'])) {
-	switch($_SESSION['show_logout_reminder']['type']) {
+if(isset($_SESSION['show_logout_reminder'])) {
+	switch($_SESSION['show_logout_reminder']['type']) {
 		case 'logout_reminder':
 			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
 			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 	}
 	$ph['show_logout_reminder'] = 'block';
 	unset($_SESSION['show_logout_reminder']);
-} else {
+} else {
 	$ph['show_logout_reminder'] = 'none';
 }
 
@@ -140,9 +140,9 @@  discard block
 block discarded – undo
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
 
-if($modx->db->getRecordCount($rs) < 1) {
+if($modx->db->getRecordCount($rs) < 1) {
 	$html = '<p>[%no_active_users_found%]</p>';
-} else {
+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
 	$ph['now'] = strftime('%H:%M:%S', $now);
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
 	$userList = array();
 	$userCount = array();
 	// Create userlist with session-count first before output
-	while($activeusers = $modx->db->getRow($rs)) {
+	while($activeusers = $modx->db->getRow($rs)) {
 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
 
 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
 			$currentaction
 		);
 	}
-	foreach($userList as $params) {
+	foreach($userList as $params) {
 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
 		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
 	}
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
 
 // invoke event OnManagerWelcomePrerender
 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
-if(is_array($evtOut)) {
+if(is_array($evtOut)) {
 	$output = implode('', $evtOut);
 	$ph['OnManagerWelcomePrerender'] = $output;
 }
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
 	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',
 	'hide'=>'0'
 );
-if ($modx->config['rss_url_news']) {
+if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(
         'menuindex' => '40',
         'id' => 'news',
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
         'hide'=>'0'
     );
 }
-if ($modx->config['rss_url_security']) {
+if ($modx->config['rss_url_security']) {
     $widgets['security'] = array(
         'menuindex' => '50',
         'id' => 'security',
@@ -365,29 +365,29 @@  discard block
 block discarded – undo
 
 // invoke OnManagerWelcomeHome event
 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
-if(is_array($sitewidgets)) {
+if(is_array($sitewidgets)) {
 	$newwidgets = array();
-    foreach($sitewidgets as $widget){
+    foreach($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));
     }
     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
 }
 
-usort($widgets, function ($a, $b) {
+usort($widgets, function ($a, $b){
 	return $a['menuindex'] - $b['menuindex'];
 });
 
 $tpl = getTplWidget();
 $output = '';
-foreach($widgets as $widget) {
-	if ($widget['hide'] != '1'){
+foreach($widgets as $widget) {
+	if ($widget['hide'] != '1') {
 		$output .= $modx->parseText($tpl, $widget);
 	}
 }
 $ph['widgets'] = $output;
 
 // load template
-if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
+if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
 	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
 }
 
@@ -395,26 +395,28 @@  discard block
 block discarded – undo
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
 $target = $modx->mergeSettingsContent($target);
 
-if(substr($target, 0, 1) === '@') {
-	if(substr($target, 0, 6) === '@CHUNK') {
+if(substr($target, 0, 1) === '@') {
+	if(substr($target, 0, 6) === '@CHUNK') {
 		$content = $modx->getChunk(trim(substr($target, 7)));
-	} elseif(substr($target, 0, 5) === '@FILE') {
+	} elseif(substr($target, 0, 5) === '@FILE') {
 		$content = file_get_contents(trim(substr($target, 6)));
-	} else {
+	} else {
 		$content = '';
 	}
-} else {
+} else {
 	$chunk = $modx->getChunk($target);
-	if($chunk !== false && !empty($chunk)) {
+	if($chunk !== false && !empty($chunk)) {
 		$content = $chunk;
-	} elseif(is_file(MODX_BASE_PATH . $target)) {
+	} elseif(is_file(MODX_BASE_PATH . $target)) {
 		$content = file_get_contents(MODX_BASE_PATH . $target);
-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
 		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) {
+	    // ClipperCMS compatible
 	{
-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
-	} else {
+		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
+	}
+	} else {
 		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
 	}
 }
@@ -423,7 +425,7 @@  discard block
 block discarded – undo
 $content = $modx->mergeConditionalTagsContent($content);
 $content = $modx->mergeSettingsContent($content);
 $content = $modx->parseText($content, $ph);
-if(strpos($content, '[+') !== false) {
+if(strpos($content, '[+') !== false) {
 	$modx->toPlaceholders($ph);
 	$content = $modx->mergePlaceholderContent($content);
 }
@@ -432,7 +434,7 @@  discard block
 block discarded – undo
 $content = $modx->parseText($content, $_style, '[&', '&]');
 $content = $modx->cleanUpMODXTags($content); //cleanup
 
-if($js = $modx->getRegisteredClientScripts()) {
+if($js = $modx->getRegisteredClientScripts()) {
 	$content .= $js;
 }
 
@@ -442,7 +444,9 @@  discard block
 block discarded – undo
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>
 //</span>
-function getTplWidget() { // recent document info
+function getTplWidget()
+{
+// recent document info
 	return '
 		<div class="[+cols+]" id="[+id+]">
 			<div class="card"[+cardAttr+]>
@@ -453,7 +457,9 @@  discard block
 block discarded – undo
 ';
 }
 
-function getRecentInfo() { // recent document info
+function getRecentInfo()
+{
+// recent document info
 	global $modx;
 
 	$modx->addSnippet('recentInfoList', 'getRecentInfoList');
@@ -479,12 +485,13 @@  discard block
 block discarded – undo
 	return $html;
 }
 
-function getRecentInfoList() {
+function getRecentInfoList()
+{
 	global $modx;
 
 	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
 
-	if($modx->db->getRecordCount($rs) < 1) {
+	if($modx->db->getRecordCount($rs) < 1) {
 		return '<tr><td>[%no_activity_message%]</td></tr>';
 	}
 
@@ -494,22 +501,22 @@  discard block
 block discarded – undo
 	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';
 
 	$output = array();
-	while($ph = $modx->db->getRow($rs)) {
+	while($ph = $modx->db->getRow($rs)) {
 		$docid = $ph['id'];
 		$_ = $modx->getUserInfo($ph['editedby']);
 		$ph['username'] = $_['username'];
 
-		if($ph['deleted'] == 1) {
+		if($ph['deleted'] == 1) {
 			$ph['status'] = 'deleted text-danger';
-		} elseif($ph['published'] == 0) {
+		} elseif($ph['published'] == 0) {
 			$ph['status'] = 'unpublished font-italic text-muted';
-		} else {
+		} else {
 			$ph['status'] = 'published';
 		}
 
-		if($modx->hasPermission('edit_document')) {
+		if($modx->hasPermission('edit_document')) {
 			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
-		} else {
+		} else {
 			$ph['edit_btn'] = '';
 		}
 
@@ -522,40 +529,40 @@  discard block
 block discarded – undo
 			$preview_disabled
 		), $btntpl['preview_btn']);
 
-		if($modx->hasPermission('delete_document')) {
-			if($ph['deleted'] == 0) {
+		if($modx->hasPermission('delete_document')) {
+			if($ph['deleted'] == 0) {
 				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-trash fa-fw"></i></a> ';
-			} else {
+			} else {
 				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';
 			}
 			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);
-		} else {
+		} else {
 			$ph['delete_btn'] = '';
 		}
 
-		if($ph['deleted'] == 1 && $ph['published'] == 0) {
+		if($ph['deleted'] == 1 && $ph['published'] == 0) {
 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
+		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
+		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
 			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
-		} else {
+		} else {
 			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
 		}
 		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);
 
 		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
 
-		if($ph['longtitle'] == '') {
+		if($ph['longtitle'] == '') {
 			$ph['longtitle'] = '(<i>[%not_set%]</i>)';
 		}
-		if($ph['description'] == '') {
+		if($ph['description'] == '') {
 			$ph['description'] = '(<i>[%not_set%]</i>)';
 		}
-		if($ph['introtext'] == '') {
+		if($ph['introtext'] == '') {
 			$ph['introtext'] = '(<i>[%not_set%]</i>)';
 		}
-		if($ph['alias'] == '') {
+		if($ph['alias'] == '') {
 			$ph['alias'] = '(<i>[%not_set%]</i>)';
 		}
 
@@ -564,7 +571,8 @@  discard block
 block discarded – undo
 	return join("\n", $output);
 }
 
-function getRecentInfoRowTpl() {
+function getRecentInfoRowTpl()
+{
 	$tpl = '
 						<tr id="row[+id+]">
 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>
@@ -593,11 +601,13 @@  discard block
 block discarded – undo
 }
 
 // setup icons
-function wrapIcon($i, $action) {
+function wrapIcon($i, $action)
+{
 	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
 }
 
-function getStartUpScript() {
+function getStartUpScript()
+{
 	$script = '
         <script type="text/javascript">
         function hideConfigCheckWarning(key) {

Please login to merge, or discard this patch.

manager/includes/document.parser.class.inc.php 2 patches

Spacing +256 added lines, -256 removed lines patch added patch discarded remove patch

@@ -202,7 +202,7 @@  discard block
 block discarded – undo
      */
     function __call($method_name, $arguments)
     {
-        include_once(MODX_MANAGER_PATH . 'includes/extenders/deprecated.functions.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/extenders/deprecated.functions.inc.php');
         if (method_exists($this->old, $method_name)) {
             $error_type = 1;
         } else {
@@ -220,12 +220,12 @@  discard block
 block discarded – undo
             $info = debug_backtrace();
             $m[] = $msg;
             if (!empty($this->currentSnippet)) {
-                $m[] = 'Snippet - ' . $this->currentSnippet;
+                $m[] = 'Snippet - '.$this->currentSnippet;
             } elseif (!empty($this->event->activePlugin)) {
-                $m[] = 'Plugin - ' . $this->event->activePlugin;
+                $m[] = 'Plugin - '.$this->event->activePlugin;
             }
             $m[] = $this->decoded_request_uri;
-            $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')';
+            $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')';
             $msg = implode('<br />', $m);
             $this->logEvent(0, $error_type, $msg, $title);
         }
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof DBAPI) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
         return $flag;
     }
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
         }
         if (!$out && $flag) {
             $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname)));
-            $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php";
+            $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php";
             $out = is_file($filename) ? include $filename : false;
         }
         if ($out && !in_array($extname, $this->extensions)) {
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
     public function getMicroTime()
     {
         list ($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
             // append the redirect count string to the url
             $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0;
             if ($currentNumberOfRedirects > 3) {
-                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>' . $url . '</i></p>');
+                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>'.$url.'</i></p>');
             } else {
                 $currentNumberOfRedirects += 1;
                 if (strpos($url, "?") > 0) {
@@ -321,9 +321,9 @@  discard block
 block discarded – undo
             }
         }
         if ($type == 'REDIRECT_REFRESH') {
-            $header = 'Refresh: 0;URL=' . $url;
+            $header = 'Refresh: 0;URL='.$url;
         } elseif ($type == 'REDIRECT_META') {
-            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />';
+            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />';
             echo $header;
             exit;
         } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) {
@@ -331,10 +331,10 @@  discard block
 block discarded – undo
             global $base_url, $site_url;
             if (substr($url, 0, strlen($base_url)) == $base_url) {
                 // append $site_url to make it work with Location:
-                $url = $site_url . substr($url, strlen($base_url));
+                $url = $site_url.substr($url, strlen($base_url));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->messageQuit('No newline allowed in redirect url.');
             }
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
             header($responseCode);
         }
 
-        if(!empty($header)) {
+        if (!empty($header)) {
             header($header);
         }
 
@@ -447,8 +447,8 @@  discard block
 block discarded – undo
 
     private function recoverySiteCache()
     {
-        $site_cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
-        $site_cache_path = $site_cache_dir . 'siteCache.idx.php';
+        $site_cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
+        $site_cache_path = $site_cache_dir.'siteCache.idx.php';
 
         if (is_file($site_cache_path)) {
             include($site_cache_path);
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
             return;
         }
 
-        include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+        include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
         $cache = new synccache();
         $cache->setCachepath($site_cache_dir);
         $cache->setReport(false);
@@ -508,8 +508,8 @@  discard block
 block discarded – undo
                 $this->invokeEvent("OnBeforeManagerPageInit");
             }
 
-            if (isset ($_SESSION[$usrType . 'UsrConfigSet'])) {
-                $usrSettings = &$_SESSION[$usrType . 'UsrConfigSet'];
+            if (isset ($_SESSION[$usrType.'UsrConfigSet'])) {
+                $usrSettings = &$_SESSION[$usrType.'UsrConfigSet'];
             } else {
                 if ($usrType == 'web') {
                     $from = $tbl_web_user_settings;
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -674,10 +674,10 @@  discard block
 block discarded – undo
         $suf = $this->config['friendly_url_suffix'];
         $pre = preg_quote($pre, '/');
         $suf = preg_quote($suf, '/');
-        if ($pre && preg_match('@^' . $pre . '(.*)$@', $q, $_)) {
+        if ($pre && preg_match('@^'.$pre.'(.*)$@', $q, $_)) {
             $q = $_[1];
         }
-        if ($suf && preg_match('@(.*)' . $suf . '$@', $q, $_)) {
+        if ($suf && preg_match('@(.*)'.$suf.'$@', $q, $_)) {
             $q = $_[1];
         }
 
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
         if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
-                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
+                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir.'/'.$q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
                 } else { /* not a valid id in terms of virtualDir, treat as alias */
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -744,9 +744,9 @@  discard block
 block discarded – undo
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if (!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -754,8 +754,8 @@  discard block
 block discarded – undo
                 $hash .= '_'.md5(http_build_query($params));
             }
         }
-        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params));
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -897,12 +897,12 @@  discard block
 block discarded – undo
         if ($js = $this->getRegisteredClientStartupScripts()) {
             // change to just before closing </head>
             // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent);
-            $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput);
         }
 
         // Insert jscripts & html block into template - template must have a </body> tag
         if ($js = $this->getRegisteredClientScripts()) {
-            $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput);
         }
         // End fix by sirlancelot
 
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
         // send out content-type and content-disposition headers
         if (IN_PARSER_MODE == "true") {
             $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html";
-            header('Content-Type: ' . $type . '; charset=' . $this->config['modx_charset']);
+            header('Content-Type: '.$type.'; charset='.$this->config['modx_charset']);
             //            if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error)
             //                header('HTTP/1.0 404 Not Found');
             if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) {
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -939,7 +939,7 @@  discard block
 block discarded – undo
 
         $stats = $this->getTimerStats($this->tstart);
 
-        $out =& $this->documentOutput;
+        $out = & $this->documentOutput;
         $out = str_replace("[^q^]", $stats['queries'], $out);
         $out = str_replace("[^qt^]", $stats['queryTime'], $out);
         $out = str_replace("[^p^]", $stats['phpTime'], $out);
@@ -978,17 +978,17 @@  discard block
 block discarded – undo
                 $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms", $tt) . ")</legend>{$sc}</fieldset><br />";
+            echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms", $tt).")</legend>{$sc}</fieldset><br />";
             echo $this->snippetsCode;
         }
         if ($this->dumpPlugins) {
             $ps = "";
             $tt = 0;
             foreach ($this->pluginsTime as $s => $t) {
-                $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>";
+                $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>";
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms", $tt * 1000) . ")</legend>{$ps}</fieldset><br />";
+            echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms", $tt * 1000).")</legend>{$ps}</fieldset><br />";
             echo $this->pluginsCode;
         }
 
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1036,7 +1036,7 @@  discard block
 block discarded – undo
         $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']);
         $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache";
         $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0;
-        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb";
+        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb";
 
         return $stats;
     }
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
     {
         $cacheRefreshTime = 0;
         $recent_update = 0;
-        @include(MODX_BASE_PATH . $this->getCacheFolder() . 'sitePublishing.idx.php');
+        @include(MODX_BASE_PATH.$this->getCacheFolder().'sitePublishing.idx.php');
         $this->recentUpdate = $recent_update;
 
         $timeNow = $_SERVER['REQUEST_TIME'] + $this->config['server_offset_time'];
@@ -1123,8 +1123,8 @@  discard block
 block discarded – undo
                 }
 
                 $docObjSerial = serialize($this->documentObject);
-                $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent;
-                $page_cache_path = MODX_BASE_PATH . $this->getHashFile($this->cacheKey);
+                $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent;
+                $page_cache_path = MODX_BASE_PATH.$this->getHashFile($this->cacheKey);
                 file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent");
             }
         }
@@ -1166,16 +1166,16 @@  discard block
 block discarded – undo
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if ($left === '{{' && strpos($content, ';}}') !== false)  $content = str_replace(';}}', sprintf(';}%s}', $spacer), $content);
+        if ($left === '{{' && strpos($content, '{{}}') !== false) $content = str_replace('{{}}', sprintf('{%$1s{}%$1s}', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]]') !== false) $content = str_replace(']]]]', sprintf(']]%s]]', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]') !== false)  $content = str_replace(']]]', sprintf(']%s]]', $spacer), $content);
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
 
         if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) {
-            $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3);
+            $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3);
         }
 
         $lp = explode($left, $content);
@@ -1239,8 +1239,8 @@  discard block
 block discarded – undo
                 }
             }
         }
-        foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+        foreach ($tags as $i=>$tag) {
+            if (strpos($tag, $spacer) !== false) $tags[$i] = str_replace($spacer, '', $tag);
         }
         return $tags;
     }
@@ -1280,7 +1280,7 @@  discard block
 block discarded – undo
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if (strpos($key, '[+') !== false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -1300,8 +1300,8 @@  discard block
 block discarded – undo
             }
 
             if (is_array($value)) {
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.format.inc.php');
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                 $value = getTVDisplayFormat($value[0], $value[1], $value[2], $value[3], $value[4]);
             }
 
@@ -1312,8 +1312,8 @@  discard block
 block discarded – undo
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1480,8 +1480,8 @@  discard block
 block discarded – undo
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1534,7 +1534,7 @@  discard block
 block discarded – undo
             }
 
             $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags
-            $value = $this->mergePlaceholderContent($value, $params);  // parse page global placeholers
+            $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers
             if ($this->config['enable_at_syntax']) {
                 $value = $this->mergeConditionalTagsContent($value);
             }
@@ -1549,8 +1549,8 @@  discard block
 block discarded – undo
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1608,8 +1608,8 @@  discard block
 block discarded – undo
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1633,7 +1633,7 @@  discard block
 block discarded – undo
             return $content;
         }
 
-        $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#';
+        $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#';
         $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), $content);
 
         $pieces = explode('<@IF:', $content);
@@ -1644,7 +1644,7 @@  discard block
 block discarded – undo
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
         $pieces = explode('<@ELSEIF:', $content);
@@ -1655,13 +1655,13 @@  discard block
 block discarded – undo
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
 
         $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content);
         ob_start();
-        $content = eval('?>' . $content);
+        $content = eval('?>'.$content);
         $content = ob_get_clean();
         $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'), $content);
 
@@ -1786,7 +1786,7 @@  discard block
 block discarded – undo
         $matches = $this->getTagsFromContent($content, $left, $right);
         if (!empty($matches)) {
             foreach ($matches[0] as $i => $v) {
-                $addBreakMatches[$i] = $v . "\n";
+                $addBreakMatches[$i] = $v."\n";
             }
             $content = str_replace($addBreakMatches, '', $content);
             if (strpos($content, $left) !== false) {
@@ -1819,8 +1819,8 @@  discard block
 block discarded – undo
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $v, $content);
-            } elseif($this->debug) {
-                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1884,7 +1884,7 @@  discard block
 block discarded – undo
                 $msg = ($msg === false) ? 'ob_get_contents() error' : $msg;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Plugin', $error_info['message'], $error_info['line'], $msg);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>' . $msg . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>'.$msg.'</p>');
                 }
             }
         } else {
@@ -1930,7 +1930,7 @@  discard block
 block discarded – undo
                 $echo = ($echo === false) ? 'ob_get_contents() error' : $echo;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Snippet', $error_info['message'], $error_info['line'], $echo);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>' . $echo . $return . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>'.$echo.$return.'</p>');
                 }
             }
         }
@@ -1938,7 +1938,7 @@  discard block
 block discarded – undo
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1976,8 +1976,8 @@  discard block
 block discarded – undo
                 }
                 if (strpos($content, $s) !== false) {
                     $content = str_replace($s, $value, $content);
-                } elseif($this->debug) {
-                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                } elseif ($this->debug) {
+                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2);
                 }
                 continue;
             }
@@ -1988,8 +1988,8 @@  discard block
 block discarded – undo
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -2081,7 +2081,7 @@  discard block
 block discarded – undo
             $eventtime = sprintf('%2.2f ms', $eventtime * 1000);
             $code = str_replace("\t", '  ', $this->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->htmlspecialchars($piece));
-            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = '.print_r($params, true)));
             $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>', $snippetObject['name'], $eventtime, $piece, $print_r_params, $code);
             $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime);
         }
@@ -2325,7 +2325,7 @@  discard block
 block discarded – undo
             $rs = $this->db->select('name,snippet,properties', '[+prefix+]site_snippets', $where);
             $count = $this->db->getRecordCount($rs);
             if (1 < $count) {
-                exit('Error $modx->_getSnippetObject()' . $snip_name);
+                exit('Error $modx->_getSnippetObject()'.$snip_name);
             }
             if ($count) {
                 $row = $this->db->getRow($rs);
@@ -2351,7 +2351,7 @@  discard block
 block discarded – undo
     public function toAlias($text)
     {
         $suff = $this->config['friendly_url_suffix'];
-        return str_replace(array('.xml' . $suff, '.rss' . $suff, '.js' . $suff, '.css' . $suff, '.txt' . $suff, '.json' . $suff, '.pdf' . $suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
+        return str_replace(array('.xml'.$suff, '.rss'.$suff, '.js'.$suff, '.css'.$suff, '.txt'.$suff, '.json'.$suff, '.pdf'.$suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
     }
 
     /**
@@ -2383,7 +2383,7 @@  discard block
 block discarded – undo
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2420,7 +2420,7 @@  discard block
 block discarded – undo
                 preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match);
                 $ids = implode(',', array_unique($match['1']));
                 if ($ids) {
-                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'");
+                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'");
                     while ($row = $this->db->getRow($res)) {
                         if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) {
                             $parent = $row['parent'];
@@ -2431,7 +2431,7 @@  discard block
 block discarded – undo
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2443,7 +2443,7 @@  discard block
 block discarded – undo
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -2459,7 +2459,7 @@  discard block
 block discarded – undo
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2480,7 +2480,7 @@  discard block
 block discarded – undo
         $scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
         $len_base_url = strlen($this->config['base_url']);
 
-        $url_path = $q;//LANG
+        $url_path = $q; //LANG
 
         if (substr($url_path, 0, $len_base_url) === $this->config['base_url']) {
             $url_path = substr($url_path, $len_base_url);
@@ -2492,7 +2492,7 @@  discard block
 block discarded – undo
             $strictURL = substr($strictURL, $len_base_url);
         }
         $http_host = $_SERVER['HTTP_HOST'];
-        $requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG
+        $requestedURL = "{$scheme}://{$http_host}".'/'.$q; //LANG
 
         $site_url = $this->config['site_url'];
 
@@ -2508,7 +2508,7 @@  discard block
 block discarded – undo
                 }
                 if ($this->config['base_url'] != $_SERVER['REQUEST_URI']) {
                     if (empty($_POST)) {
-                        if (($this->config['base_url'] . '?' . $qstring) != $_SERVER['REQUEST_URI']) {
+                        if (($this->config['base_url'].'?'.$qstring) != $_SERVER['REQUEST_URI']) {
                             $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently');
                             exit(0);
                         }
@@ -2571,7 +2571,7 @@  discard block
 block discarded – undo
                 $docgrp = implode(",", $docgrp);
             }
             // get document
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $rs = $this->db->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->db->getRecordCount($rs) < 1) {
@@ -2607,9 +2607,9 @@  discard block
 block discarded – undo
             }
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
-                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
+                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->db->getRow($rs)) {
                     $tmplvars[$row['name']] = array(
@@ -2655,7 +2655,7 @@  discard block
 block discarded – undo
                 $st = md5($source);
             }
             if ($this->dumpSnippets == 1) {
-                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
+                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
             }
 
             // invoke OnParseDocument event
@@ -2741,7 +2741,7 @@  discard block
 block discarded – undo
 
             // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
             if ($this->config['use_alias_path'] == 1) {
-                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir . '/' : '') . $this->documentIdentifier;
+                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir.'/' : '').$this->documentIdentifier;
                 if (isset($this->documentListing[$alias])) {
                     $this->documentIdentifier = $this->documentListing[$alias];
                 } else {
@@ -2802,7 +2802,7 @@  discard block
 block discarded – undo
                 } else {
                     $docAlias = $this->db->escape($this->documentIdentifier);
                     $rs = $this->db->select('id', $this->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->db->getValue($rs);
+                    $this->documentIdentifier = (int) $this->db->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -2855,7 +2855,7 @@  discard block
 block discarded – undo
                 $_REQUEST[$n] = $_GET[$n] = $v;
             }
         }
-        $_SERVER['PHP_SELF'] = $this->config['base_url'] . $qp['path'];
+        $_SERVER['PHP_SELF'] = $this->config['base_url'].$qp['path'];
         $this->q = $qp['path'];
         return $qp['path'];
     }
@@ -2949,7 +2949,7 @@  discard block
 block discarded – undo
             $this->sendErrorPage();
         } else {
             // Inculde the necessary files to check document permissions
-            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
             $udperms = new udperms();
             $udperms->user = $this->getLoginUserID();
             $udperms->document = $this->documentIdentifier;
@@ -3003,7 +3003,7 @@  discard block
 block discarded – undo
         while ($id && $height--) {
             $thisid = $id;
             if ($this->config['aliaslistingfolder'] == 1) {
-                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM " . $this->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1");
+                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM ".$this->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1");
                 if (!$id || $id == '0') {
                     break;
                 }
@@ -3054,15 +3054,15 @@  discard block
 block discarded – undo
 
         if ($this->config['aliaslistingfolder'] == 1) {
 
-            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->db->getRow($res)) {
                 $pAlias = '';
                 if (isset($this->aliasListing[$row['parent']])) {
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'] . '/' : '';
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'] . '/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'].'/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'].'/' : '';
                 };
-                $children[$pAlias . $row['alias']] = $row['id'];
+                $children[$pAlias.$row['alias']] = $row['id'];
                 if ($row['isfolder'] == 1) {
                     $idx[] = $row['id'];
                 }
@@ -3094,7 +3094,7 @@  discard block
 block discarded – undo
                 $depth--;
 
                 foreach ($documentMap_cache[$id] as $childId) {
-                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '') . $this->aliasListing[$childId]['alias'];
+                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '').$this->aliasListing[$childId]['alias'];
                     if (!strlen($pkey)) {
                         $pkey = "{$childId}";
                     }
@@ -3120,11 +3120,11 @@  discard block
 block discarded – undo
     public function webAlertAndQuit($msg, $url = "")
     {
         global $modx_manager_charset;
-        if($this->ajaxMode === true) $this->jsonResponse(array('error'=>$msg));
+        if ($this->ajaxMode === true) $this->jsonResponse(array('error'=>$msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $fnc = substr($url, 11);
         } elseif ($url) {
-            $fnc = "window.location.href='" . addslashes($url) . "';";
+            $fnc = "window.location.href='".addslashes($url)."';";
         } else {
             $fnc = "history.back(-1);";
         }
@@ -3133,7 +3133,7 @@  discard block
 block discarded – undo
             <meta http-equiv=\"Content-Type\" content=\"text/html; charset={$modx_manager_charset};\">
             <script>
                 function __alertQuit() {
-                    alert('" . addslashes($msg) . "');
+                    alert('".addslashes($msg)."');
                     {$fnc}
                 }
                 window.setTimeout('__alertQuit();',100);
@@ -3157,7 +3157,7 @@  discard block
 block discarded – undo
         if ($pms) {
             $state = ($pms[$pm] == 1);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3238,7 +3238,7 @@  discard block
 block discarded – undo
             $this->lockedElements = array();
             $this->cleanupExpiredLocks();
 
-            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul
+            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->db->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3274,7 +3274,7 @@  discard block
 block discarded – undo
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->db->delete($this->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})");
         } else {
             $this->db->delete($this->getFullTableName('active_user_locks'));
@@ -3471,8 +3471,8 @@  discard block
 block discarded – undo
         if (isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') {
             if ($this->config['send_errormail'] <= $type) {
                 $this->sendmail(array(
-                    'subject' => 'MODX System Error on ' . $this->config['site_name'],
-                    'body' => 'Source: ' . $source . ' - The details of the error could be seen in the MODX system events log.',
+                    'subject' => 'MODX System Error on '.$this->config['site_name'],
+                    'body' => 'Source: '.$source.' - The details of the error could be seen in the MODX system events log.',
                     'type' => 'text'
                 ));
             }
@@ -3520,7 +3520,7 @@  discard block
 block discarded – undo
             $p['fromname'] = $userinfo['username'];
         }
         if ($msg === '' && !isset($p['body'])) {
-            $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER'];
+            $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER'];
         } elseif (is_string($msg) && 0 < strlen($msg)) {
             $p['body'] = $msg;
         }
@@ -3560,8 +3560,8 @@  discard block
 block discarded – undo
             $files = array();
         }
         foreach ($files as $f) {
-            if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
-                $this->mail->AddAttachment(MODX_BASE_PATH . $f);
+            if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) {
+                $this->mail->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
         $rs = $this->mail->send();
@@ -3606,7 +3606,7 @@  discard block
 block discarded – undo
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3631,14 +3631,14 @@  discard block
 block discarded – undo
         $tblsc = $this->getFullTableName("site_content");
         $tbldg = $this->getFullTableName("document_groups");
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3668,14 +3668,14 @@  discard block
 block discarded – undo
         $tbldg = $this->getFullTableName("document_groups");
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3710,16 +3710,16 @@  discard block
 block discarded – undo
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        $published = ($published !== 'all') ? 'AND sc.published = ' . $published : '';
-        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : '';
+        $published = ($published !== 'all') ? 'AND sc.published = '.$published : '';
+        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : '';
 
         if ($where != '') {
-            $where = 'AND ' . $where;
+            $where = 'AND '.$where;
         }
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
 
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
@@ -3727,7 +3727,7 @@  discard block
 block discarded – undo
         }
 
         // build query
-        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
         $tblsc = $this->getFullTableName('site_content');
         $tbldg = $this->getFullTableName('document_groups');
@@ -3779,10 +3779,10 @@  discard block
 block discarded – undo
             return false;
         } else {
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
             if ($where != '') {
-                $where = 'AND ' . $where;
+                $where = 'AND '.$where;
             }
 
             $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : '';
@@ -3793,13 +3793,13 @@  discard block
 block discarded – undo
                 $docgrp = implode(',', $docgrp);
             }
 
-            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
             $tblsc = $this->getFullTableName('site_content');
             $tbldg = $this->getFullTableName('document_groups');
 
             $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
-                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
+                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',', $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->db->makeArray($result);
 
@@ -3904,12 +3904,12 @@  discard block
 block discarded – undo
             $tbldg = $this->getFullTableName("document_groups");
             $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : "";
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
             // get document groups for current user
             if ($docgrp = $this->getUserDocGroups()) {
                 $docgrp = implode(",", $docgrp);
             }
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $result = $this->db->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->db->getRow($result);
 
@@ -3956,7 +3956,7 @@  discard block
 block discarded – undo
     {
         if ($this->currentSnippet) {
             $tbl = $this->getFullTableName("site_snippets");
-            $rs = $this->db->select('id', $tbl, "name='" . $this->db->escape($this->currentSnippet) . "'", '', 1);
+            $rs = $this->db->select('id', $tbl, "name='".$this->db->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->db->getValue($rs)) {
                 return $snippetId;
             }
@@ -3983,23 +3983,23 @@  discard block
 block discarded – undo
      */
     public function clearCache($type = '', $report = false)
     {
-        $cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
+        $cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
         if (is_array($type)) {
             foreach ($type as $_) {
                 $this->clearCache($_, $report);
             }
         } elseif ($type == 'full') {
-            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
             $sync = new synccache();
             $sync->setCachepath($cache_dir);
             $sync->setReport($report);
             $sync->emptyCache();
         } elseif (preg_match('@^[1-9][0-9]*$@', $type)) {
             $key = ($this->config['cache_type'] == 2) ? $this->makePageCacheKey($type) : $type;
-            $file_name = "docid_" . $key . "_*.pageCache.php";
-            $cache_path = $cache_dir . $file_name;
+            $file_name = "docid_".$key."_*.pageCache.php";
+            $cache_path = $cache_dir.$file_name;
             $files = glob($cache_path);
-            $files[] = $cache_dir . "docid_" . $key . ".pageCache.php";
+            $files[] = $cache_dir."docid_".$key.".pageCache.php";
             foreach ($files as $file) {
                 if (!is_file($file)) {
                     continue;
@@ -4007,7 +4007,7 @@  discard block
 block discarded – undo
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -4076,7 +4076,7 @@  discard block
 block discarded – undo
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4084,7 +4084,7 @@  discard block
 block discarded – undo
 
                 }
 
-                $alias = $alPath . $f_url_prefix . $alias . $f_url_suffix;
+                $alias = $alPath.$f_url_prefix.$alias.$f_url_suffix;
                 $url = "{$alias}{$args}";
             } else {
                 $url = "index.php?id={$id}{$args}";
@@ -4103,7 +4103,7 @@  discard block
 block discarded – undo
             }
 
             //TODO: check to make sure that $site_url incudes the url :port (e.g. :8080)
-            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme . '://' . $_SERVER['HTTP_HOST'] . $host;
+            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme.'://'.$_SERVER['HTTP_HOST'].$host;
         }
 
         //fix strictUrl by Bumkaka
@@ -4112,9 +4112,9 @@  discard block
 block discarded – undo
         }
 
         if ($this->config['xhtml_urls']) {
-            $url = preg_replace("/&(?!amp;)/", "&amp;", $host . $virtualDir . $url);
+            $url = preg_replace("/&(?!amp;)/", "&amp;", $host.$virtualDir.$url);
         } else {
-            $url = $host . $virtualDir . $url;
+            $url = $host.$virtualDir.$url;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -4138,21 +4138,21 @@  discard block
 block discarded – undo
         if (isset($this->aliasListing[$id])) {
             $out = $this->aliasListing[$id];
         } else {
-            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM " . $this->getFullTableName("site_content") . " WHERE id=" . (int)$id);
+            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM ".$this->getFullTableName("site_content")." WHERE id=".(int) $id);
             if ($this->db->getRecordCount($q) == '1') {
                 $q = $this->db->getRow($q);
                 $this->aliasListing[$id] = array(
-                    'id' => (int)$q['id'],
+                    'id' => (int) $q['id'],
                     'alias' => $q['alias'] == '' ? $q['id'] : $q['alias'],
-                    'parent' => (int)$q['parent'],
-                    'isfolder' => (int)$q['isfolder'],
+                    'parent' => (int) $q['parent'],
+                    'isfolder' => (int) $q['isfolder'],
                 );
                 if ($this->aliasListing[$id]['parent'] > 0) {
                     //fix alias_path_usage
                     if ($this->config['use_alias_path'] == '1') {
                         //&& $tmp['path'] != '' - fix error slash with epty path
                         $tmp = $this->getAliasListing($this->aliasListing[$id]['parent']);
-                        $this->aliasListing[$id]['path'] = $tmp['path'] . ($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '') . $tmp['alias'] : '');
+                        $this->aliasListing[$id]['path'] = $tmp['path'].($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '').$tmp['alias'] : '');
                     } else {
                         $this->aliasListing[$id]['path'] = '';
                     }
@@ -4193,7 +4193,7 @@  discard block
 block discarded – undo
         $out = array();
         if (empty($this->version) || !is_array($this->version)) {
             //include for compatibility modx version < 1.0.10
-            include MODX_MANAGER_PATH . "includes/version.inc.php";
+            include MODX_MANAGER_PATH."includes/version.inc.php";
             $this->version = array();
             $this->version['version'] = isset($modx_version) ? $modx_version : '';
             $this->version['branch'] = isset($modx_branch) ? $modx_branch : '';
@@ -4215,18 +4215,18 @@  discard block
 block discarded – undo
     {
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
-            $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
+            $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : '';
         } else { // not in cache so let's check the db
-            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
+            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->db->escape($snippetName)."'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
                 $row = $this->db->getRow($result);
                 $snippet = $this->snippetCache[$snippetName] = $row['snippet'];
                 $mergedProperties = array_merge($this->parseProperties($row['properties']), $this->parseProperties($row['sharedproperties']));
-                $properties = $this->snippetCache[$snippetName . "Props"] = json_encode($mergedProperties);
+                $properties = $this->snippetCache[$snippetName."Props"] = json_encode($mergedProperties);
             } else {
                 $snippet = $this->snippetCache[$snippetName] = "return false;";
-                $properties = $this->snippetCache[$snippetName . "Props"] = '';
+                $properties = $this->snippetCache[$snippetName."Props"] = '';
             }
         }
         // load default params/properties
@@ -4329,8 +4329,8 @@  discard block
 block discarded – undo
             }
             if (strpos($tpl, $s) !== false) {
                 $tpl = str_replace($s, $value, $tpl);
-            } elseif($this->debug) {
-                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -4379,7 +4379,7 @@  discard block
 block discarded – undo
             case 'CODE':
                 break;
             case 'FILE':
-                $template = file_get_contents(MODX_BASE_PATH . $template);
+                $template = file_get_contents(MODX_BASE_PATH.$template);
                 break;
             case 'CHUNK':
                 $template = $this->getChunk($template);
@@ -4432,7 +4432,7 @@  discard block
 block discarded – undo
         }
 
         if (empty($mode)) {
-            $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp);
+            $strTime = strftime($dateFormat." %H:%M:%S", $timestamp);
         } elseif ($mode == 'dateOnly') {
             $strTime = strftime($dateFormat, $timestamp);
         } elseif ($mode == 'formatOnly') {
@@ -4528,7 +4528,7 @@  discard block
 block discarded – undo
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = join(',', $_);
@@ -4537,12 +4537,12 @@  discard block
 block discarded – undo
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . join(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.join(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
             }
             if ($tvidnames == "*") {
                 $query = "tv.id<>0";
             } else {
-                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . join("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".join("','", $tvidnames)."')";
             }
 
             $this->getUserDocGroups();
@@ -4686,7 +4686,7 @@  discard block
 block discarded – undo
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4704,23 +4704,23 @@  discard block
 block discarded – undo
             }
 
             // get user defined template variables
-            $fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = ($fields == '') ? 'tv.*' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
 
             if ($idnames == '*') {
                 $query = 'tv.id<>0';
             } else {
-                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')";
+                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')";
             }
 
-            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars') . " tv
-                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
+            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars')." tv
+                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id
+                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if (is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -4758,7 +4758,7 @@  discard block
 block discarded – undo
      */
     public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
     {
-        if (is_array($idnames) && empty($idnames) ) {
+        if (is_array($idnames) && empty($idnames)) {
             return false;
         } else {
             $output = array();
@@ -4771,9 +4771,9 @@  discard block
 block discarded – undo
             if ($result == false) {
                 return false;
             } else {
-                $baspath = MODX_MANAGER_PATH . 'includes';
-                include_once $baspath . '/tmplvars.format.inc.php';
-                include_once $baspath . '/tmplvars.commands.inc.php';
+                $baspath = MODX_MANAGER_PATH.'includes';
+                include_once $baspath.'/tmplvars.format.inc.php';
+                include_once $baspath.'/tmplvars.commands.inc.php';
 
                 for ($i = 0; $i < count($result); $i++) {
                     $row = $result[$i];
@@ -4798,7 +4798,7 @@  discard block
 block discarded – undo
      */
     public function getFullTableName($tbl)
     {
-        return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`";
+        return $this->db->config['dbase'].".`".$this->db->config['table_prefix'].$tbl."`";
     }
 
     /**
@@ -4877,7 +4877,7 @@  discard block
 block discarded – undo
     public function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -4929,8 +4929,8 @@  discard block
 block discarded – undo
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'InternalKey'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'InternalKey'];
             }
         } else {
             switch (true) {
@@ -4958,8 +4958,8 @@  discard block
 block discarded – undo
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'Shortname'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'Shortname'];
             }
         } else {
             switch (true) {
@@ -5030,8 +5030,8 @@  discard block
 block discarded – undo
      */
     public function getWebUserInfo($uid)
     {
-        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users") . " wu
-                INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
+        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users")." wu
+                INNER JOIN " . $this->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
         if ($row = $this->db->getRow($rs)) {
             if (!isset($row['usertype']) or !$row["usertype"]) {
                 $row["usertype"] = "web";
@@ -5067,7 +5067,7 @@  discard block
 block discarded – undo
         } else if (is_array($dg)) {
             // resolve ids to names
             $dgn = array();
-            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
+            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")");
             while ($row = $this->db->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
@@ -5095,7 +5095,7 @@  discard block
 block discarded – undo
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getFullTableName("web_users");
-            $ds = $this->db->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->db->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->db->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -5105,7 +5105,7 @@  discard block
 block discarded – undo
                     } else {
                         $this->db->update(array(
                             'password' => $this->db->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -5136,8 +5136,8 @@  discard block
 block discarded – undo
         // check cache
         $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false;
         if (!is_array($grpNames)) {
-            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names") . " wgn
-                    INNER JOIN " . $this->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'");
+            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names")." wgn
+                    INNER JOIN " . $this->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'");
             $grpNames = $this->db->getColumn("name", $rs);
             // save to cache
             $_SESSION['webUserGroupNames'] = $grpNames;
@@ -5170,7 +5170,7 @@  discard block
 block discarded – undo
         if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) {
             $this->sjscripts[$nextpos] = $src;
         } else {
-            $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>';
+            $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>';
         }
     }
 
@@ -5249,7 +5249,7 @@  discard block
 block discarded – undo
         }
 
         if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) {
-            $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>';
+            $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>';
         }
         if ($startup) {
             $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1;
@@ -5395,7 +5395,7 @@  discard block
 block discarded – undo
                 $eventtime = $this->getMicroTime() - $eventtime;
                 $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000);
                 foreach ($parameter as $k => $v) {
-                    $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>';
+                    $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>';
                 }
                 $this->pluginsCode .= '</fieldset><br />';
                 $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime;
@@ -5423,13 +5423,13 @@  discard block
 block discarded – undo
         $plugin = array();
         if (isset ($this->pluginCache[$pluginName])) {
             $pluginCode = $this->pluginCache[$pluginName];
-            $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
+            $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : '';
         } else {
             $pluginName = $this->db->escape($pluginName);
             $result = $this->db->select('name, plugincode, properties', $this->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->db->getRow($result)) {
                 $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode'];
-                $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties'];
+                $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties'];
             } else {
                 $pluginCode = $this->pluginCache[$pluginName] = "return false;";
                 $pluginProperties = '';
@@ -5536,7 +5536,7 @@  discard block
 block discarded – undo
     public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -5703,8 +5703,8 @@  discard block
 block discarded – undo
         $ph = array('site_url' => MODX_SITE_URL);
         $regexUrl = "/((http|https|ftp|ftps)\:\/\/[^\/]+(\/[^\s]+[^,.?!:;\s])?)/";
         $regexEmail = '#([0-9a-z]([-_.]?[0-9a-z])*@[0-9a-z]([-.]?[0-9a-z])*\\.[a-wyz][a-z](fo|g|l|m|mes|o|op|pa|ro|seum|t|u|v|z)?)#i';
-        $emailSubject = isset($parsed['name']) ? '?subject=' . $parsed['name'] : '';
-        $emailSubject .= isset($parsed['version']) ? ' v' . $parsed['version'] : '';
+        $emailSubject = isset($parsed['name']) ? '?subject='.$parsed['name'] : '';
+        $emailSubject .= isset($parsed['version']) ? ' v'.$parsed['version'] : '';
         foreach ($parsed as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $key2 => $val2) {
@@ -5713,7 +5713,7 @@  discard block
 block discarded – undo
                         $val2 = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val2);
                     }
                     if (preg_match($regexEmail, $val2, $url)) {
-                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val2);
+                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val2);
                     }
                     $parsed[$key][$key2] = $val2;
                 }
@@ -5723,7 +5723,7 @@  discard block
 block discarded – undo
                     $val = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val);
                 }
                 if (preg_match($regexEmail, $val, $url)) {
-                    $val = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val);
+                    $val = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val);
                 }
                 $parsed[$key] = $val;
             }
@@ -5737,32 +5737,32 @@  discard block
 block discarded – undo
         );
 
         $nl = "\n";
-        $list = isset($parsed['logo']) ? '<img src="' . $this->config['base_url'] . ltrim($parsed['logo'], "/") . '" style="float:right;max-width:100px;height:auto;" />' . $nl : '';
-        $list .= '<p>' . $nl;
-        $list .= isset($parsed['name']) ? '<strong>' . $parsed['name'] . '</strong><br/>' . $nl : '';
-        $list .= isset($parsed['description']) ? $parsed['description'] . $nl : '';
-        $list .= '</p><br/>' . $nl;
-        $list .= isset($parsed['version']) ? '<p><strong>' . $_lang['version'] . ':</strong> ' . $parsed['version'] . '</p>' . $nl : '';
-        $list .= isset($parsed['license']) ? '<p><strong>' . $_lang['license'] . ':</strong> ' . $parsed['license'] . '</p>' . $nl : '';
-        $list .= isset($parsed['lastupdate']) ? '<p><strong>' . $_lang['last_update'] . ':</strong> ' . $parsed['lastupdate'] . '</p>' . $nl : '';
-        $list .= '<br/>' . $nl;
+        $list = isset($parsed['logo']) ? '<img src="'.$this->config['base_url'].ltrim($parsed['logo'], "/").'" style="float:right;max-width:100px;height:auto;" />'.$nl : '';
+        $list .= '<p>'.$nl;
+        $list .= isset($parsed['name']) ? '<strong>'.$parsed['name'].'</strong><br/>'.$nl : '';
+        $list .= isset($parsed['description']) ? $parsed['description'].$nl : '';
+        $list .= '</p><br/>'.$nl;
+        $list .= isset($parsed['version']) ? '<p><strong>'.$_lang['version'].':</strong> '.$parsed['version'].'</p>'.$nl : '';
+        $list .= isset($parsed['license']) ? '<p><strong>'.$_lang['license'].':</strong> '.$parsed['license'].'</p>'.$nl : '';
+        $list .= isset($parsed['lastupdate']) ? '<p><strong>'.$_lang['last_update'].':</strong> '.$parsed['lastupdate'].'</p>'.$nl : '';
+        $list .= '<br/>'.$nl;
         $first = true;
         foreach ($arrayParams as $param => $label) {
             if (isset($parsed[$param])) {
                 if ($first) {
-                    $list .= '<p><strong>' . $_lang['references'] . '</strong></p>' . $nl;
-                    $list .= '<ul class="docBlockList">' . $nl;
+                    $list .= '<p><strong>'.$_lang['references'].'</strong></p>'.$nl;
+                    $list .= '<ul class="docBlockList">'.$nl;
                     $first = false;
                 }
-                $list .= '    <li><strong>' . $label . '</strong>' . $nl;
-                $list .= '        <ul>' . $nl;
+                $list .= '    <li><strong>'.$label.'</strong>'.$nl;
+                $list .= '        <ul>'.$nl;
                 foreach ($parsed[$param] as $val) {
-                    $list .= '            <li>' . $val . '</li>' . $nl;
+                    $list .= '            <li>'.$val.'</li>'.$nl;
                 }
-                $list .= '        </ul></li>' . $nl;
+                $list .= '        </ul></li>'.$nl;
             }
         }
-        $list .= !$first ? '</ul>' . $nl : '';
+        $list .= !$first ? '</ul>'.$nl : '';
 
         return $list;
     }
@@ -5838,7 +5838,7 @@  discard block
 block discarded – undo
      */
     public function addSnippet($name, $phpCode)
     {
-        $this->snippetCache['#' . $name] = $phpCode;
+        $this->snippetCache['#'.$name] = $phpCode;
     }
 
     /**
@@ -5847,7 +5847,7 @@  discard block
 block discarded – undo
      */
     public function addChunk($name, $text)
     {
-        $this->chunkCache['#' . $name] = $text;
+        $this->chunkCache['#'.$name] = $text;
     }
 
     /**
@@ -5883,7 +5883,7 @@  discard block
 block discarded – undo
         }
 
         if (!$isSafe) {
-            $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true);
+            $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true);
             $title = sprintf('Unknown eval was executed (%s)', $this->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->messageQuit($title, '', true, '', '', 'Parser', $msg);
             return;
@@ -5897,7 +5897,7 @@  discard block
 block discarded – undo
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5915,8 +5915,8 @@  discard block
 block discarded – undo
 
         $safe = explode(',', $safe_functions);
 
-        $phpcode = rtrim($phpcode, ';') . ';';
-        $tokens = token_get_all('<?php ' . $phpcode);
+        $phpcode = rtrim($phpcode, ';').';';
+        $tokens = token_get_all('<?php '.$phpcode);
         foreach ($tokens as $i => $token) {
             if (!is_array($token)) {
                 continue;
@@ -5952,7 +5952,7 @@  discard block
 block discarded – undo
     public function atBindFileContent($str = '')
     {
 
-        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'] . 'files/', '');
+        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'].'files/', '');
 
         if (stripos($str, '@FILE') !== 0) {
             return $str;
@@ -5975,7 +5975,7 @@  discard block
 block discarded – undo
         $errorMsg = sprintf("Could not retrieve string '%s'.", $str);
 
         foreach ($search_path as $path) {
-            $file_path = MODX_BASE_PATH . $path . $str;
+            $file_path = MODX_BASE_PATH.$path.$str;
             if (strpos($file_path, MODX_MANAGER_PATH) === 0) {
                 return $errorMsg;
             } elseif (is_file($file_path)) {
@@ -5989,7 +5989,7 @@  discard block
 block discarded – undo
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6102,22 +6102,22 @@  discard block
 block discarded – undo
 
         $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
         $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
-        $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI'];
+        $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI'];
         $request_uri = $this->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']);
         $ua = $this->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']);
         $referer = $this->htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, $this->config['modx_charset']);
         if ($is_error) {
             $str = '<h2 style="color:red">&laquo; Evo Parse Error &raquo;</h2>';
             if ($msg != 'PHP Parse Error') {
-                $str .= '<h3 style="color:red">' . $msg . '</h3>';
+                $str .= '<h3 style="color:red">'.$msg.'</h3>';
             }
         } else {
             $str = '<h2 style="color:#003399">&laquo; Evo Debug/ stop message &raquo;</h2>';
-            $str .= '<h3 style="color:#003399">' . $msg . '</h3>';
+            $str .= '<h3 style="color:#003399">'.$msg.'</h3>';
         }
 
         if (!empty ($query)) {
-            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">' . $query . '</span></div>';
+            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">'.$query.'</span></div>';
         }
 
         $errortype = array(
@@ -6140,13 +6140,13 @@  discard block
 block discarded – undo
 
         if (!empty($nr) || !empty($file)) {
             if ($text != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</div>';
             }
             if ($output != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</div>';
             }
             if ($nr !== '') {
-                $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]");
+                $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]");
             }
             if ($file) {
                 $table[] = array('File', $file);
@@ -6166,7 +6166,7 @@  discard block
 block discarded – undo
         }
 
         if (!empty($this->event->activePlugin)) {
-            $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')');
+            $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')');
         }
 
         $str .= $MakeTable->create($table, array('Error information', ''));
@@ -6176,17 +6176,17 @@  discard block
 block discarded – undo
         $table[] = array('REQUEST_URI', $request_uri);
 
         if ($this->manager->action) {
-            include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+            include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
             global $action_list;
             $actionName = (isset($action_list[$this->manager->action])) ? " - {$action_list[$this->manager->action]}" : '';
 
-            $table[] = array('Manager action', $this->manager->action . $actionName);
+            $table[] = array('Manager action', $this->manager->action.$actionName);
         }
 
         if (preg_match('@^[0-9]+@', $this->documentIdentifier)) {
             $resource = $this->getDocumentObject('id', $this->documentIdentifier);
             $url = $this->makeUrl($this->documentIdentifier, '', '', 'full');
-            $table[] = array('Resource', '[' . $this->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>');
+            $table[] = array('Resource', '['.$this->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>');
         }
         $table[] = array('Referer', $referer);
         $table[] = array('User Agent', $ua);
@@ -6207,7 +6207,7 @@  discard block
 block discarded – undo
 
         $mem = memory_get_peak_usage(true);
         $total_mem = $mem - $this->mstart;
-        $total_mem = ($total_mem / 1024 / 1024) . ' mb';
+        $total_mem = ($total_mem / 1024 / 1024).' mb';
 
         $queryTime = $this->queryTime;
         $phpTime = $totalTime - $queryTime;
@@ -6228,18 +6228,18 @@  discard block
 block discarded – undo
         $str .= $this->get_backtrace(debug_backtrace());
         // Log error
         if (!empty($this->currentSnippet)) {
-            $source = 'Snippet - ' . $this->currentSnippet;
+            $source = 'Snippet - '.$this->currentSnippet;
         } elseif (!empty($this->event->activePlugin)) {
-            $source = 'Plugin - ' . $this->event->activePlugin;
+            $source = 'Plugin - '.$this->event->activePlugin;
         } elseif ($source !== '') {
-            $source = 'Parser - ' . $source;
+            $source = 'Parser - '.$source;
         } elseif ($query !== '') {
             $source = 'SQL Query';
         } else {
             $source = 'Parser';
         }
         if ($msg) {
-            $source .= ' / ' . $msg;
+            $source .= ' / '.$msg;
         }
         if (isset($actionName) && !empty($actionName)) {
             $source .= $actionName;
@@ -6271,12 +6271,12 @@  discard block
 block discarded – undo
 
         // Display error
         if (isset($_SESSION['mgrValidated'])) {
-            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' &raquo; ' . $release_date . '</title>
+            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' &raquo; '.$release_date.'</title>
                  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'] . 'media/style/' . $this->config['manager_theme'] . '/style.css" />
+                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'].'media/style/'.$this->config['manager_theme'].'/style.css" />
                  <style type="text/css">body { padding:10px; } td {font:inherit;}</style>
                  </head><body>
-                 ' . $str . '</body></html>';
+                 ' . $str.'</body></html>';
 
         } else {
             echo 'Error';
@@ -6314,7 +6314,7 @@  discard block
 block discarded – undo
             switch ($val['type']) {
                 case '->':
                 case '::':
-                    $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function'];
+                    $functionName = $val['function'] = $val['class'].$val['type'].$val['function'];
                     break;
                 default:
                     $functionName = $val['function'];
@@ -6324,7 +6324,7 @@  discard block
 block discarded – undo
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) {
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {
@@ -6336,7 +6336,7 @@  discard block
 block discarded – undo
                         break;
                     }
                     case is_scalar($arg): {
-                        $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'");
+                        $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->htmlspecialchars(str_replace("'", "\\'", $arg))."'");
                         break;
                     }
                     case is_bool($arg): {
@@ -6344,23 +6344,23 @@  discard block
 block discarded – undo
                         break;
                     }
                     case is_array($arg): {
-                        $out = 'array $var' . $tmp;
+                        $out = 'array $var'.$tmp;
                         break;
                     }
                     case is_object($arg): {
-                        $out = get_class($arg) . ' $var' . $tmp;
+                        $out = get_class($arg).' $var'.$tmp;
                         break;
                     }
                     default: {
-                        $out = '$var' . $tmp;
+                        $out = '$var'.$tmp;
                     }
                 }
                 $tmp++;
                 return $out;
             }, $args);
             $line = array(
-                "<strong>" . $functionName . "</strong>(" . $args . ")",
-                $path . " on line " . $val['line']
+                "<strong>".$functionName."</strong>(".$args.")",
+                $path." on line ".$val['line']
             );
             $table[] = array(implode("<br />", $line));
         }
@@ -6401,7 +6401,7 @@  discard block
 block discarded – undo
             $alias = strip_tags($alias); // strip HTML
             $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters
             $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash
-            $alias = preg_replace('/-+/', '-', $alias);  // convert multiple dashes to one
+            $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one
             $alias = trim($alias, '-'); // trim excess
             return $alias;
         }
@@ -6417,7 +6417,7 @@  discard block
 block discarded – undo
         $precisions = count($sizes) - 1;
         foreach ($sizes as $unit => $bytes) {
             if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions) . ' ' . $unit;
+                return number_format($size / $bytes, $precisions).' '.$unit;
             }
             $precisions--;
         }
@@ -6521,10 +6521,10 @@  discard block
 block discarded – undo
 
         if (strpos($str, MODX_MANAGER_PATH) === 0) {
             return false;
-        } elseif (is_file(MODX_BASE_PATH . $str)) {
-            $file_path = MODX_BASE_PATH . $str;
-        } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) {
-            $file_path = MODX_BASE_PATH . $tpl_dir . $str;
+        } elseif (is_file(MODX_BASE_PATH.$str)) {
+            $file_path = MODX_BASE_PATH.$str;
+        } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) {
+            $file_path = MODX_BASE_PATH.$tpl_dir.$str;
         } else {
             return false;
         }
@@ -6565,7 +6565,7 @@  discard block
 block discarded – undo
      *
      * @param boolean $state State of ajaxMode
      */
-    function setAjaxMode($state) {
+    function setAjaxMode($state){
         $this->ajaxMode = $state === true ? true : false;
     }
 
@@ -6574,7 +6574,7 @@  discard block
 block discarded – undo
      *
      * @param array $array Array to convert
      */
-    function jsonResponse($array) {
+    function jsonResponse($array){
         header('content-type: application/json');
         exit(json_encode($array, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE));
     }
@@ -6669,7 +6669,7 @@  discard block
 block discarded – undo
             $title = 'no title';
         }
         if (is_array($msg)) {
-            $msg = '<pre>' . print_r($msg, true) . '</pre>';
+            $msg = '<pre>'.print_r($msg, true).'</pre>';
         } elseif ($msg === '') {
             $msg = $_SERVER['REQUEST_URI'];
         }
@@ -6714,7 +6714,7 @@  discard block
 block discarded – undo
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

Please login to merge, or discard this patch.

Braces +62 added lines, -29 removed lines patch added patch discarded remove patch

@@ -696,13 +696,15 @@  discard block
 block discarded – undo
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -710,7 +712,8 @@  discard block
 block discarded – undo
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -740,13 +743,14 @@  discard block
 block discarded – undo
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -755,7 +759,7 @@  discard block
 block discarded – undo
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1166,10 +1170,18 @@  discard block
 block discarded – undo
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if($left==='{{' && strpos($content,';}}')!==false) {
+            $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
+        }
+        if($left==='{{' && strpos($content,'{{}}')!==false) {
+            $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]]')!==false) {
+            $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]')!==false) {
+            $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        }
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
@@ -1222,7 +1234,8 @@  discard block
 block discarded – undo
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1240,7 +1253,9 @@  discard block
 block discarded – undo
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1280,7 +1295,10 @@  discard block
 block discarded – undo
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if(strpos($key,'[+')!==false) {
+                continue;
+            }
+            // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -2005,7 +2023,8 @@  discard block
 block discarded – undo
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2410,7 +2429,8 @@  discard block
 block discarded – undo
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2443,7 +2463,7 @@  discard block
 block discarded – undo
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -3120,7 +3140,9 @@  discard block
 block discarded – undo
     public function webAlertAndQuit($msg, $url = "")
     {
         global $modx_manager_charset;
-        if($this->ajaxMode === true) $this->jsonResponse(array('error'=>$msg));
+        if($this->ajaxMode === true) {
+            $this->jsonResponse(array('error'=>$msg));
+        }
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $fnc = substr($url, 11);
         } elseif ($url) {
@@ -4216,7 +4238,8 @@  discard block
 block discarded – undo
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
@@ -4720,7 +4743,7 @@  discard block
 block discarded – undo
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5199,12 +5222,16 @@  discard block
 block discarded – undo
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5216,7 +5243,8 @@  discard block
 block discarded – undo
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5236,7 +5264,8 @@  discard block
 block discarded – undo
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5360,7 +5389,8 @@  discard block
 block discarded – undo
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5908,7 +5938,8 @@  discard block
 block discarded – undo
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6324,7 +6355,7 @@  discard block
 block discarded – undo
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {
@@ -6565,7 +6596,8 @@  discard block
 block discarded – undo
      *
      * @param boolean $state State of ajaxMode
      */
-    function setAjaxMode($state) {
+    function setAjaxMode($state)
+    {
         $this->ajaxMode = $state === true ? true : false;
     }
 
@@ -6574,7 +6606,8 @@  discard block
 block discarded – undo
      *
      * @param array $array Array to convert
      */
-    function jsonResponse($array) {
+    function jsonResponse($array)
+    {
         header('content-type: application/json');
         exit(json_encode($array, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE));
     }

Please login to merge, or discard this patch.

manager/processors/delete_content.processor.php 2 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -124,6 +124,6 @@
 block discarded – undo
 
 // finished emptying cache - redirect
 if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
-	header($header);
+    $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+    header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -1,25 +1,25 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('delete_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-if ($id==0) {
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
+if ($id == 0) {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /*******ищем родителя чтобы к нему вернуться********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************ а заодно и путь возврата (сам путь внизу файла) **********/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /*****************************/
 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 $children = array();
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
@@ -48,17 +48,17 @@  discard block
 block discarded – undo
 
     $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent={$parent} AND deleted=0");
         // the document has children documents, we'll need to delete those too
-        while ($childid=$modx->db->getValue($rs)) {
-            if ($childid==$site_start) {
+        while ($childid = $modx->db->getValue($rs)) {
+            if ($childid == $site_start) {
                 $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.");
             }
-            if ($childid==$site_unavailable_page) {
+            if ($childid == $site_unavailable_page) {
                 $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.");
             }
-            if ($childid==$error_page) {
+            if ($childid == $error_page) {
                 $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.");
             }
-            if ($childid==$unauthorized_page) {
+            if ($childid == $unauthorized_page) {
                 $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.");
             }
             $children[] = $childid;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
                             "children"=>$children
                         ));
 
-if (count($children)>0) {
+if (count($children) > 0) {
     $modx->db->update(
         array(
             'deleted'   => 1,
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
         ), $modx->getFullTableName('site_content'), "id IN (".implode(", ", $children).")");
 }
 
-if ($site_start==$id) {
+if ($site_start == $id) {
     $modx->webAlertAndQuit("Document is 'Site start' and cannot be deleted!");
 }
 
-if ($site_unavailable_page==$id) {
+if ($site_unavailable_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unavailable page' and cannot be deleted!");
 }
 
-if ($error_page==$id) {
+if ($error_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site error page' and cannot be deleted!");
 }
 
-if ($unauthorized_page==$id) {
+if ($unauthorized_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unauthorized page' and cannot be deleted!");
 }
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+if ($modx->ajaxMode !== true) {
+	$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 	header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

manager/processors/undelete_content.processor.php 2 patches

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -3,12 +3,12 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
@@ -32,50 +32,50 @@  discard block
 block discarded – undo
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
 if(!$deltime) {
-	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
+    $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
 $children = array();
 
 function getChildren($parent) {
 
-	global $modx;
-	global $children;
-	global $deltime;
-
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='{$parent}' AND deleted=1 AND deletedon='{$deltime}'");
-		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
-			$children[] = $row['id'];
-			getChildren($row['id']);
-			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
-		}
+    global $modx;
+    global $children;
+    global $deltime;
+
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='{$parent}' AND deleted=1 AND deletedon='{$deltime}'");
+        // the document has children documents, we'll need to delete those too
+        while ($row=$modx->db->getRow($rs)) {
+            $children[] = $row['id'];
+            getChildren($row['id']);
+            //echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
+        }
 }
 
 getChildren($id);
 
 if(count($children)>0) {
-	$modx->db->update(
-		array(
-			'deleted'   => 0,
-			'deletedby' => 0,
-			'deletedon' => 0,
-		), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
+    $modx->db->update(
+        array(
+            'deleted'   => 0,
+            'deletedby' => 0,
+            'deletedon' => 0,
+        ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
 }
 //'undelete' the document.
 $modx->db->update(
-	array(
-		'deleted'   => 0,
-		'deletedby' => 0,
-		'deletedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'deleted'   => 0,
+        'deletedby' => 0,
+        'deletedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 $modx->invokeEvent("OnDocFormUnDelete",
     array(
@@ -91,6 +91,6 @@  discard block
 block discarded – undo
 
 // finished emptying cache - redirect
 if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
-	header($header);
+    $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+    header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -1,50 +1,50 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_document')) {
+if (!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
-if(!$deltime) {
+if (!$deltime) {
 	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
 $children = array();
 
-function getChildren($parent) {
+function getChildren($parent){
 
 	global $modx;
 	global $children;
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
 
 	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='{$parent}' AND deleted=1 AND deletedon='{$deltime}'");
 		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
+		while ($row = $modx->db->getRow($rs)) {
 			$children[] = $row['id'];
 			getChildren($row['id']);
 			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
 getChildren($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->db->update(
 		array(
 			'deleted'   => 0,
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+if ($modx->ajaxMode !== true) {
+	$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 	header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

manager/processors/publish_content.processor.php 2 patches

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -3,12 +3,12 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
@@ -33,20 +33,20 @@  discard block
 block discarded – undo
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // update the document
 $modx->db->update(
-	array(
-		'published'   => 1,
-		'pub_date'    => 0,
-		'unpub_date'  => 0,
-		'editedby'    => $modx->getLoginUserID(),
-		'editedon'    => time(),
-		'publishedby' => $modx->getLoginUserID(),
-		'publishedon' => time(),
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'published'   => 1,
+        'pub_date'    => 0,
+        'unpub_date'  => 0,
+        'editedby'    => $modx->getLoginUserID(),
+        'editedon'    => time(),
+        'publishedby' => $modx->getLoginUserID(),
+        'publishedon' => time(),
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
 $modx->invokeEvent("OnDocPublished",array("docid"=>$id));
@@ -58,6 +58,6 @@  discard block
 block discarded – undo
 $modx->clearCache('full');
 
 if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
-	header($header);
+    $header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
+    header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -1,38 +1,38 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
+if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 	), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
-$modx->invokeEvent("OnDocPublished",array("docid"=>$id));
+$modx->invokeEvent("OnDocPublished", array("docid"=>$id));
 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['pagetitle'];
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 // empty cache
 $modx->clearCache('full');
 
-if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
+if ($modx->ajaxMode !== true) {
+	$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 	header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

manager/processors/unpublish_content.processor.php 2 patches

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -3,12 +3,12 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
@@ -33,20 +33,20 @@  discard block
 block discarded – undo
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // update the document
 $modx->db->update(
-	array(
-		'published'   => 0,
-		'pub_date'    => 0,
-		'unpub_date'  => 0,
-		'editedby'    => $modx->getLoginUserID(),
-		'editedon'    => time(),
-		'publishedby' => 0,
-		'publishedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'published'   => 0,
+        'pub_date'    => 0,
+        'unpub_date'  => 0,
+        'editedby'    => $modx->getLoginUserID(),
+        'editedon'    => time(),
+        'publishedby' => 0,
+        'publishedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocUnPublished  event
 $modx->invokeEvent("OnDocUnPublished",array("docid"=>$id));
@@ -58,6 +58,6 @@  discard block
 block discarded – undo
 $modx->clearCache('full');
 
 if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
-	header($header);
+    $header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
+    header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -1,38 +1,38 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
+if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 	), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocUnPublished  event
-$modx->invokeEvent("OnDocUnPublished",array("docid"=>$id));
+$modx->invokeEvent("OnDocUnPublished", array("docid"=>$id));
 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['pagetitle'];
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 // empty cache
 $modx->clearCache('full');
 
-if($modx->ajaxMode !== true) {
-	$header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
+if ($modx->ajaxMode !== true) {
+	$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 	header($header);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

manager/media/style/default/ajax.php 3 patches

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -616,36 +616,36 @@
 block discarded – undo
         }
         
         /* Ajax-Button Actions */
-	    case 'publish.res': {
-		    $published = getDocumentTv('published');
-		    $state = $published == 0 ? 1 : 0;
-		    if($state) {
-			    require_once('../../../processors/publish_content.processor.php');
-		    } else {
-			    require_once('../../../processors/unpublish_content.processor.php');
-		    }
-		    $json['result'] = $state == 1 ? 'publish' : 'unpublish';
-			break;
-		}
-	    case 'delete.res': {
-		    $deleted = getDocumentTv('deleted');
-		    $state = $deleted == 0 ? 1 : 0;
-		    if($state) {
-			    require_once('../../../processors/delete_content.processor.php');
-		    } else {
-			    require_once('../../../processors/undelete_content.processor.php');
-		    }
-		    $json['result'] = $state == 1 ? 'delete' : 'undelete';
-			break;
-		}
+        case 'publish.res': {
+            $published = getDocumentTv('published');
+            $state = $published == 0 ? 1 : 0;
+            if($state) {
+                require_once('../../../processors/publish_content.processor.php');
+            } else {
+                require_once('../../../processors/unpublish_content.processor.php');
+            }
+            $json['result'] = $state == 1 ? 'publish' : 'unpublish';
+            break;
+        }
+        case 'delete.res': {
+            $deleted = getDocumentTv('deleted');
+            $state = $deleted == 0 ? 1 : 0;
+            if($state) {
+                require_once('../../../processors/delete_content.processor.php');
+            } else {
+                require_once('../../../processors/undelete_content.processor.php');
+            }
+            $json['result'] = $state == 1 ? 'delete' : 'undelete';
+            break;
+        }
     }
     if(!empty($json)) $modx->jsonResponse($json);
 }
 
 function getDocumentTv($tv) {
-	global $modx, $_lang;
-	$modx->setAjaxMode(true);
-	$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-	if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
-	return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
+    global $modx, $_lang;
+    $modx->setAjaxMode(true);
+    $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
+    if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
+    return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +105 added lines, -105 removed lines patch added patch discarded remove patch

@@ -20,11 +20,11 @@  discard block
 block discarded – undo
 extract($modx->config, EXTR_OVERWRITE); // For correct function of native processors
 
 $_lang = array();
-include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';
+include_once MODX_MANAGER_PATH.'/includes/lang/english.inc.php';
 if ($modx->config['manager_language'] != 'english') {
-    include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';
+    include_once MODX_MANAGER_PATH.'/includes/lang/'.$modx->config['manager_language'].'.inc.php';
 }
-include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';
+include_once MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/style.php';
 
 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';
 $frame = isset($_REQUEST['f']) ? $_REQUEST['f'] : '';
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 
             switch ($frame) {
                 case 'nodes':
-                    include_once MODX_MANAGER_PATH . '/frames/nodes.php';
+                    include_once MODX_MANAGER_PATH.'/frames/nodes.php';
 
                     break;
             }
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
                 $sql = '';
                 $a = '';
                 $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : '';
-                $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';
-                $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;
+                $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->db->escape($filter).'%"' : '';
+                $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;
 
                 switch ($elements) {
                     case 'element_templates':
                         $a = 16;
-                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';
+                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->db->escape($filter).'%"' : '';
                         $sql = $modx->db->query('SELECT t1.*, t1.templatename AS name
-                        FROM ' . $modx->getFullTableName('site_templates') . ' AS t1
-                        ' . $sqlLike . '
+                        FROM ' . $modx->getFullTableName('site_templates').' AS t1
+                        ' . $sqlLike.'
                         ORDER BY t1.templatename ASC
                         ' . $sqlLimit);
 
                         if ($modx->hasPermission('new_template')) {
-                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';
+                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>';
                         }
 
                         break;
@@ -83,15 +83,15 @@  discard block
 block discarded – undo
                     case 'element_tplvars':
                         $a = 301;
                         $sql = $modx->db->query('SELECT t1.*, IF(t2.templateid,0,1) AS disabled
-                        FROM ' . $modx->getFullTableName('site_tmplvars') . ' AS t1
-                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid
-                        ' . $sqlLike . '
+                        FROM ' . $modx->getFullTableName('site_tmplvars').' AS t1
+                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid
+                        ' . $sqlLike.'
                         GROUP BY t1.id
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
                         if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';
+                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>';
                         }
 
                         break;
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
                     case 'element_htmlsnippets':
                         $a = 78;
                         $sql = $modx->db->query('SELECT t1.*
-                        FROM ' . $modx->getFullTableName('site_htmlsnippets') . ' AS t1
-                        ' . $sqlLike . '
+                        FROM ' . $modx->getFullTableName('site_htmlsnippets').' AS t1
+                        ' . $sqlLike.'
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
                         if ($modx->hasPermission('new_chunk')) {
-                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';
+                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>';
                         }
 
                         break;
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
                     case 'element_snippets':
                         $a = 22;
                         $sql = $modx->db->query('SELECT t1.*
-                        FROM ' . $modx->getFullTableName('site_snippets') . ' AS t1
-                        ' . $sqlLike . '
+                        FROM ' . $modx->getFullTableName('site_snippets').' AS t1
+                        ' . $sqlLike.'
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
                         if ($modx->hasPermission('new_snippet')) {
-                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';
+                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>';
                         }
 
                         break;
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
                     case 'element_plugins':
                         $a = 102;
                         $sql = $modx->db->query('SELECT t1.*
-                        FROM ' . $modx->getFullTableName('site_plugins') . ' AS t1
-                        ' . $sqlLike . '
+                        FROM ' . $modx->getFullTableName('site_plugins').' AS t1
+                        ' . $sqlLike.'
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
                         if ($modx->hasPermission('new_plugin')) {
-                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';
+                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>';
                         }
 
                         break;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
                             continue;
                         }
 
-                        $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";
+                        $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'."\n";
                     }
                 }
 
@@ -169,18 +169,18 @@  discard block
 block discarded – undo
             $output = '';
             $items = '';
             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';
-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : '';
-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;
+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : '';
+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;
 
             $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked
-				FROM ' . $modx->getFullTableName('manager_users') . ' AS t1
-				LEFT JOIN ' . $modx->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey
-				' . $sqlLike . '
+				FROM ' . $modx->getFullTableName('manager_users').' AS t1
+				LEFT JOIN ' . $modx->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey
+				' . $sqlLike.'
 				ORDER BY t1.username ASC
 				' . $sqlLimit);
 
             if ($modx->hasPermission('new_user')) {
-                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';
+                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>';
             }
 
             if ($count = $modx->db->getRecordCount($sql)) {
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
                 }
                 while ($row = $modx->db->getRow($sql)) {
-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';
                 }
             }
 
@@ -208,18 +208,18 @@  discard block
 block discarded – undo
             $output = '';
             $items = '';
             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';
-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : '';
-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;
+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : '';
+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;
 
             $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked
-				FROM ' . $modx->getFullTableName('web_users') . ' AS t1
-				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey
-				' . $sqlLike . '
+				FROM ' . $modx->getFullTableName('web_users').' AS t1
+				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey
+				' . $sqlLike.'
 				ORDER BY t1.username ASC
 				' . $sqlLimit);
 
             if ($modx->hasPermission('new_web_user')) {
-                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';
+                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>';
             }
 
             if ($count = $modx->db->getRecordCount($sql)) {
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
                 }
                 while ($row = $modx->db->getRow($sql)) {
-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';
                 }
             }
 
@@ -253,35 +253,35 @@  discard block
 block discarded – undo
                     case 'SnippetNoCache': {
 
                         $sql = $modx->db->query('SELECT *
-						FROM ' . $modx->getFullTableName('site_snippets') . '
-						WHERE name="' . $name . '"
+						FROM ' . $modx->getFullTableName('site_snippets').'
+						WHERE name="' . $name.'"
 						LIMIT 1');
 
                         if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']
+                                    'innerHTML' => '<i class="fa fa-code"></i> '.$row['name']
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
-                                    'url' => "index.php?a=22&id=" . $row['id']
+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],
+                                    'url' => "index.php?a=22&id=".$row['id']
                                 )
                             );
                             if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']
                                 );
                             }
                         } else {
                             $contextmenu = array(
                                 'header' => array(
-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . $name
+                                    'innerHTML' => '<i class="fa fa-code"></i> '.$name
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],
-                                    'url' => "index.php?a=23&itemname=" . $name
+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],
+                                    'url' => "index.php?a=23&itemname=".$name
                                 )
                             );
                         }
@@ -291,35 +291,35 @@  discard block
 block discarded – undo
                     case 'Chunk' : {
 
                         $sql = $modx->db->query('SELECT *
-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '
-						WHERE name="' . $name . '"
+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'
+						WHERE name="' . $name.'"
 						LIMIT 1');
 
                         if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name']
+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.$row['name']
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
-                                    'url' => "index.php?a=78&id=" . $row['id']
+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],
+                                    'url' => "index.php?a=78&id=".$row['id']
                                 )
                             );
                             if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']
                                 );
                             }
                         } else {
                             $contextmenu = array(
                                 'header' => array(
-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name
+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.$name
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],
-                                    'url' => "index.php?a=77&itemname=" . $name
+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],
+                                    'url' => "index.php?a=77&itemname=".$name
                                 )
                             );
                         }
@@ -328,8 +328,8 @@  discard block
 block discarded – undo
                     }
                     case 'AttributeValue': {
                         $sql = $modx->db->query('SELECT *
-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '
-						WHERE name="' . $name . '"
+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'
+						WHERE name="' . $name.'"
 						LIMIT 1');
 
                         if ($modx->db->getRecordCount($sql)) {
@@ -339,52 +339,52 @@  discard block
 block discarded – undo
                                     'innerText' => $row['name']
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
-                                    'url' => "index.php?a=78&id=" . $row['id']
+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],
+                                    'url' => "index.php?a=78&id=".$row['id']
                                 )
                             );
                             if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']
                                 );
                             }
                         } else {
 
                             $sql = $modx->db->query('SELECT *
-							FROM ' . $modx->getFullTableName('site_snippets') . '
-							WHERE name="' . $name . '"
+							FROM ' . $modx->getFullTableName('site_snippets').'
+							WHERE name="' . $name.'"
 							LIMIT 1');
 
                             if ($modx->db->getRecordCount($sql)) {
                                 $row = $modx->db->getRow($sql);
                                 $contextmenu = array(
                                     'header' => array(
-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']
+                                        'innerHTML' => '<i class="fa fa-code"></i> '.$row['name']
                                     ),
                                     'item' => array(
-                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
-                                        'url' => "index.php?a=22&id=" . $row['id']
+                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],
+                                        'url' => "index.php?a=22&id=".$row['id']
                                     )
                                 );
                                 if (!empty($row['description'])) {
                                     $contextmenu['seperator'] = '';
                                     $contextmenu['description'] = array(
-                                        'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
+                                        'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']
                                     );
                                 }
                             } else {
                                 $contextmenu = array(
                                     'header' => array(
-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . $name
+                                        'innerHTML' => '<i class="fa fa-code"></i> '.$name
                                     ),
                                     'item' => array(
-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],
-                                        'url' => "index.php?a=77&itemname=" . $name
+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],
+                                        'url' => "index.php?a=77&itemname=".$name
                                     ),
                                     'item2' => array(
-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],
-                                        'url' => "index.php?a=23&itemname=" . $name
+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],
+                                        'url' => "index.php?a=23&itemname=".$name
                                     )
                                 );
                             }
@@ -440,35 +440,35 @@  discard block
 block discarded – undo
                         }
 
                         $sql = $modx->db->query('SELECT *
-						FROM ' . $modx->getFullTableName('site_tmplvars') . '
-						WHERE name="' . $name . '"
+						FROM ' . $modx->getFullTableName('site_tmplvars').'
+						WHERE name="' . $name.'"
 						LIMIT 1');
 
                         if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name']
+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.$row['name']
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
-                                    'url' => "index.php?a=301&id=" . $row['id']
+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],
+                                    'url' => "index.php?a=301&id=".$row['id']
                                 )
                             );
                             if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']
                                 );
                             }
                         } else {
                             $contextmenu = array(
                                 'header' => array(
-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name
+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.$name
                                 ),
                                 'item' => array(
-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'],
-                                    'url' => "index.php?a=300&itemname=" . $name
+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'],
+                                    'url' => "index.php?a=300&itemname=".$name
                                 )
                             );
                         }
@@ -485,15 +485,15 @@  discard block
 block discarded – undo
 
         case 'movedocument' : {
             if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
-                $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
-                $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;
+                $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
+                $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0;
                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;
 
                 // set parent
                 if ($id && $parent >= 0) {
 
                     // find older parent
-                    $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
+                    $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id='.$id));
 
                     $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [
                         'id_document' => $id,
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
                     if (empty($json['errors'])) {
                         // check privileges user for move docs
                         if (!empty($modx->config['tree_show_protected']) && $role != 1) {
-                            $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
+                            $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')');
                             if ($modx->db->getRecordCount($sql)) {
                                 $document_groups = array();
                                 while ($row = $modx->db->getRow($sql)) {
@@ -539,22 +539,22 @@  discard block
 block discarded – undo
                             // set new parent
                             $modx->db->update(array(
                                 'parent' => $parent
-                            ), $modx->getFullTableName('site_content'), 'id=' . $id);
+                            ), $modx->getFullTableName('site_content'), 'id='.$id);
                             // set parent isfolder = 1
                             $modx->db->update(array(
                                 'isfolder' => 1
-                            ), $modx->getFullTableName('site_content'), 'id=' . $parent);
+                            ), $modx->getFullTableName('site_content'), 'id='.$parent);
 
                             if ($parent != $parentOld) {
                                 // check children docs and set parent isfolder
-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent='.$parentOld))) {
                                     $modx->db->update(array(
                                         'isfolder' => 1
-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);
                                 } else {
                                     $modx->db->update(array(
                                         'isfolder' => 0
-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);
                                 }
                             }
 
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
                             if (!empty($menuindex)) {
                                 $menuindex = explode(',', $menuindex);
                                 foreach ($menuindex as $key => $value) {
-                                    $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
+                                    $modx->db->query('UPDATE '.$modx->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value);
                                 }
                             } else {
                                 // TODO: max(*) menuindex
@@ -590,19 +590,19 @@  discard block
 block discarded – undo
         }
 
         case 'getLockedElements': {
-            $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0;
-            $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+            $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0;
+            $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
             $output = !!$modx->elementIsLocked($type, $id, true);
 
             if (!$output) {
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
-                $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
+                $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : '';
                 $sql = '
-                    SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked
-                    FROM ' . $modx->getFullTableName('site_content') . ' AS sc 
-                    LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
-                    WHERE sc.id=' . $id . ' GROUP BY sc.id';
+                    SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked
+                    FROM ' . $modx->getFullTableName('site_content').' AS sc 
+                    LEFT JOIN ' . $modx->getFullTableName('document_groups').' dg ON dg.document=sc.id
+                    WHERE sc.id=' . $id.' GROUP BY sc.id';
                 $sql = $modx->db->query($sql);
                 if ($modx->db->getRecordCount($sql)) {
                     $row = $modx->db->getRow($sql);
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
 	    case 'publish.res': {
 		    $published = getDocumentTv('published');
 		    $state = $published == 0 ? 1 : 0;
-		    if($state) {
+		    if ($state) {
 			    require_once('../../../processors/publish_content.processor.php');
 		    } else {
 			    require_once('../../../processors/unpublish_content.processor.php');
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
 	    case 'delete.res': {
 		    $deleted = getDocumentTv('deleted');
 		    $state = $deleted == 0 ? 1 : 0;
-		    if($state) {
+		    if ($state) {
 			    require_once('../../../processors/delete_content.processor.php');
 		    } else {
 			    require_once('../../../processors/undelete_content.processor.php');
@@ -639,13 +639,13 @@  discard block
 block discarded – undo
 			break;
 		}
     }
-    if(!empty($json)) $modx->jsonResponse($json);
+    if (!empty($json)) $modx->jsonResponse($json);
 }
 
-function getDocumentTv($tv) {
+function getDocumentTv($tv){
 	global $modx, $_lang;
 	$modx->setAjaxMode(true);
-	$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-	if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
-	return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
+	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
+	if ($id == 0) $modx->webAlertAndQuit($_lang["error_no_id"]);
+	return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id='.$id));
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +86 added lines, -81 removed lines patch added patch discarded remove patch

@@ -7,11 +7,11 @@  discard block
 block discarded – undo
 
 $modx->db->connect();
 
-if (empty ($modx->config)) {
+if (empty ($modx->config)) {
     $modx->getSettings();
 }
 
-if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
+if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
     $modx->sendErrorPage();
 }
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
 $_lang = array();
 include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';
-if ($modx->config['manager_language'] != 'english') {
+if ($modx->config['manager_language'] != 'english') {
     include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';
 }
 include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
 
 $json = array();
 
-if (isset($action)) {
-    switch ($action) {
+if (isset($action)) {
+    switch ($action) {
 
         case '1': {
 
-            switch ($frame) {
+            switch ($frame) {
                 case 'nodes':
                     include_once MODX_MANAGER_PATH . '/frames/nodes.php';
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 
             $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';
 
-            if ($elements) {
+            if ($elements) {
                 $output = '';
                 $items = '';
                 $sql = '';
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
                 $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';
                 $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;
 
-                switch ($elements) {
+                switch ($elements) {
                     case 'element_templates':
                         $a = 16;
                         $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
                         ORDER BY t1.templatename ASC
                         ' . $sqlLimit);
 
-                        if ($modx->hasPermission('new_template')) {
+                        if ($modx->hasPermission('new_template')) {
                             $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';
                         }
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
-                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
+                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
                             $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';
                         }
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
-                        if ($modx->hasPermission('new_chunk')) {
+                        if ($modx->hasPermission('new_chunk')) {
                             $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';
                         }
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
-                        if ($modx->hasPermission('new_snippet')) {
+                        if ($modx->hasPermission('new_snippet')) {
                             $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';
                         }
 
@@ -132,19 +132,19 @@  discard block
 block discarded – undo
                         ORDER BY t1.name ASC
                         ' . $sqlLimit);
 
-                        if ($modx->hasPermission('new_plugin')) {
+                        if ($modx->hasPermission('new_plugin')) {
                             $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';
                         }
 
                         break;
                 }
 
-                if ($count = $modx->db->getRecordCount($sql)) {
-                    if ($count == $limit) {
+                if ($count = $modx->db->getRecordCount($sql)) {
+                    if ($count == $limit) {
                         $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
                     }
-                    while ($row = $modx->db->getRow($sql)) {
-                        if (($row['disabled'] || $row['locked']) && $role != 1) {
+                    while ($row = $modx->db->getRow($sql)) {
+                        if (($row['disabled'] || $row['locked']) && $role != 1) {
                             continue;
                         }
 
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
                     }
                 }
 
-                if (isset($_REQUEST['filter'])) {
+                if (isset($_REQUEST['filter'])) {
                     $output = $items;
-                } else {
+                } else {
                     $output .= $items;
                 }
 
@@ -179,22 +179,22 @@  discard block
 block discarded – undo
 				ORDER BY t1.username ASC
 				' . $sqlLimit);
 
-            if ($modx->hasPermission('new_user')) {
+            if ($modx->hasPermission('new_user')) {
                 $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';
             }
 
-            if ($count = $modx->db->getRecordCount($sql)) {
-                if ($count == $limit) {
+            if ($count = $modx->db->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
                 }
-                while ($row = $modx->db->getRow($sql)) {
+                while ($row = $modx->db->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
                 }
             }
 
-            if (isset($_REQUEST['filter'])) {
+            if (isset($_REQUEST['filter'])) {
                 $output = $items;
-            } else {
+            } else {
                 $output .= $items;
             }
 
@@ -218,22 +218,22 @@  discard block
 block discarded – undo
 				ORDER BY t1.username ASC
 				' . $sqlLimit);
 
-            if ($modx->hasPermission('new_web_user')) {
+            if ($modx->hasPermission('new_web_user')) {
                 $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';
             }
 
-            if ($count = $modx->db->getRecordCount($sql)) {
-                if ($count == $limit) {
+            if ($count = $modx->db->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
                 }
-                while ($row = $modx->db->getRow($sql)) {
+                while ($row = $modx->db->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
                 }
             }
 
-            if (isset($_REQUEST['filter'])) {
+            if (isset($_REQUEST['filter'])) {
                 $output = $items;
-            } else {
+            } else {
                 $output .= $items;
             }
 
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
             $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->db->escape($_REQUEST['type']) : false;
             $contextmenu = '';
 
-            if ($role && $name && $type) {
-                switch ($type) {
+            if ($role && $name && $type) {
+                switch ($type) {
                     case 'Snippet':
                     case 'SnippetNoCache': {
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
 						WHERE name="' . $name . '"
 						LIMIT 1');
 
-                        if ($modx->db->getRecordCount($sql)) {
+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
@@ -268,13 +268,13 @@  discard block
 block discarded – undo
                                     'url' => "index.php?a=22&id=" . $row['id']
                                 )
                             );
-                            if (!empty($row['description'])) {
+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
                                 );
                             }
-                        } else {
+                        } else {
                             $contextmenu = array(
                                 'header' => array(
                                     'innerHTML' => '<i class="fa fa-code"></i> ' . $name
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
 						WHERE name="' . $name . '"
 						LIMIT 1');
 
-                        if ($modx->db->getRecordCount($sql)) {
+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
@@ -306,13 +306,13 @@  discard block
 block discarded – undo
                                     'url' => "index.php?a=78&id=" . $row['id']
                                 )
                             );
-                            if (!empty($row['description'])) {
+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
                                 );
                             }
-                        } else {
+                        } else {
                             $contextmenu = array(
                                 'header' => array(
                                     'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
 						WHERE name="' . $name . '"
 						LIMIT 1');
 
-                        if ($modx->db->getRecordCount($sql)) {
+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
@@ -343,20 +343,20 @@  discard block
 block discarded – undo
                                     'url' => "index.php?a=78&id=" . $row['id']
                                 )
                             );
-                            if (!empty($row['description'])) {
+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
                                 );
                             }
-                        } else {
+                        } else {
 
                             $sql = $modx->db->query('SELECT *
 							FROM ' . $modx->getFullTableName('site_snippets') . '
 							WHERE name="' . $name . '"
 							LIMIT 1');
 
-                            if ($modx->db->getRecordCount($sql)) {
+                            if ($modx->db->getRecordCount($sql)) {
                                 $row = $modx->db->getRow($sql);
                                 $contextmenu = array(
                                     'header' => array(
@@ -367,13 +367,13 @@  discard block
 block discarded – undo
                                         'url' => "index.php?a=22&id=" . $row['id']
                                     )
                                 );
-                                if (!empty($row['description'])) {
+                                if (!empty($row['description'])) {
                                     $contextmenu['seperator'] = '';
                                     $contextmenu['description'] = array(
                                         'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
                                     );
                                 }
-                            } else {
+                            } else {
                                 $contextmenu = array(
                                     'header' => array(
                                         'innerHTML' => '<i class="fa fa-code"></i> ' . $name
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
                             'alias_visible'
                         );
 
-                        if (in_array($name, $default_field)) {
+                        if (in_array($name, $default_field)) {
                             return;
                         }
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
 						WHERE name="' . $name . '"
 						LIMIT 1');
 
-                        if ($modx->db->getRecordCount($sql)) {
+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);
                             $contextmenu = array(
                                 'header' => array(
@@ -455,13 +455,13 @@  discard block
 block discarded – undo
                                     'url' => "index.php?a=301&id=" . $row['id']
                                 )
                             );
-                            if (!empty($row['description'])) {
+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';
                                 $contextmenu['description'] = array(
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
                                 );
                             }
-                        } else {
+                        } else {
                             $contextmenu = array(
                                 'header' => array(
                                     'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name
@@ -484,13 +484,13 @@  discard block
 block discarded – undo
         }
 
         case 'movedocument' : {
-            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
+            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                 $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
                 $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;
                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;
 
                 // set parent
-                if ($id && $parent >= 0) {
+                if ($id && $parent >= 0) {
 
                     // find older parent
                     $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
@@ -501,31 +501,31 @@  discard block
 block discarded – undo
                         'new_parent'  => $parent,
                     ]);
 
-                    if (is_array($eventOut) && count($eventOut) > 0) {
+                    if (is_array($eventOut) && count($eventOut) > 0) {
                         $eventParent = array_pop($eventOut);
 
-                        if ($eventParent == $parentOld) {
+                        if ($eventParent == $parentOld) {
                             $json['errors'] = $_lang['error_movedocument2'];
-                        } else {
+                        } else {
                             $parent = $eventParent;
                         }
                     }
 
-                    if (empty($json['errors'])) {
+                    if (empty($json['errors'])) {
                         // check privileges user for move docs
-                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
+                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
                             $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
-                            if ($modx->db->getRecordCount($sql)) {
+                            if ($modx->db->getRecordCount($sql)) {
                                 $document_groups = array();
-                                while ($row = $modx->db->getRow($sql)) {
+                                while ($row = $modx->db->getRow($sql)) {
                                     $document_groups[$row['document']]['groups'][] = $row['document_group'];
                                 }
-                                foreach ($document_groups as $key => $value) {
-                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
+                                foreach ($document_groups as $key => $value) {
+                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
                                         $json['errors'] = $_lang["error_no_privileges"];
                                     }
                                 }
-                                if ($json['errors']) {
+                                if ($json['errors']) {
                                     header('content-type: application/json');
                                     echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE);
                                     break;
@@ -533,9 +533,9 @@  discard block
 block discarded – undo
                             }
                         }
 
-                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
+                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
                             $json['errors'] = $_lang["error_no_privileges"];
-                        } else {
+                        } else {
                             // set new parent
                             $modx->db->update(array(
                                 'parent' => $parent
@@ -545,13 +545,13 @@  discard block
 block discarded – undo
                                 'isfolder' => 1
                             ), $modx->getFullTableName('site_content'), 'id=' . $parent);
 
-                            if ($parent != $parentOld) {
+                            if ($parent != $parentOld) {
                                 // check children docs and set parent isfolder
-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
                                     $modx->db->update(array(
                                         'isfolder' => 1
                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
-                                } else {
+                                } else {
                                     $modx->db->update(array(
                                         'isfolder' => 0
                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
@@ -559,16 +559,16 @@  discard block
 block discarded – undo
                             }
 
                             // set menuindex
-                            if (!empty($menuindex)) {
+                            if (!empty($menuindex)) {
                                 $menuindex = explode(',', $menuindex);
-                                foreach ($menuindex as $key => $value) {
+                                foreach ($menuindex as $key => $value) {
                                     $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
                                 }
-                            } else {
+                            } else {
                                 // TODO: max(*) menuindex
                             }
 
-                            if (!$json['errors']) {
+                            if (!$json['errors']) {
                                 $json['success'] = $_lang["actioncomplete"];
 
                                 $modx->invokeEvent('onAfterMoveDocument', [
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
                         }
                     }
                 }
-            } else {
+            } else {
                 $json['errors'] = $_lang["error_no_privileges"];
             }
 
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
 
             $output = !!$modx->elementIsLocked($type, $id, true);
 
-            if (!$output) {
+            if (!$output) {
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
                 $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
                 $sql = '
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
                     LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
                     WHERE sc.id=' . $id . ' GROUP BY sc.id';
                 $sql = $modx->db->query($sql);
-                if ($modx->db->getRecordCount($sql)) {
+                if ($modx->db->getRecordCount($sql)) {
                     $row = $modx->db->getRow($sql);
                     $output = !!$row['locked'];
                 }
@@ -619,9 +619,9 @@  discard block
 block discarded – undo
 	    case 'publish.res': {
 		    $published = getDocumentTv('published');
 		    $state = $published == 0 ? 1 : 0;
-		    if($state) {
+		    if($state) {
 			    require_once('../../../processors/publish_content.processor.php');
-		    } else {
+		    } else {
 			    require_once('../../../processors/unpublish_content.processor.php');
 		    }
 		    $json['result'] = $state == 1 ? 'publish' : 'unpublish';
@@ -630,22 +630,27 @@  discard block
 block discarded – undo
 	    case 'delete.res': {
 		    $deleted = getDocumentTv('deleted');
 		    $state = $deleted == 0 ? 1 : 0;
-		    if($state) {
+		    if($state) {
 			    require_once('../../../processors/delete_content.processor.php');
-		    } else {
+		    } else {
 			    require_once('../../../processors/undelete_content.processor.php');
 		    }
 		    $json['result'] = $state == 1 ? 'delete' : 'undelete';
 			break;
 		}
     }
-    if(!empty($json)) $modx->jsonResponse($json);
-}
+    if(!empty($json)) {
+        $modx->jsonResponse($json);
+    }
+    }
 
-function getDocumentTv($tv) {
+function getDocumentTv($tv)
+{
 	global $modx, $_lang;
 	$modx->setAjaxMode(true);
 	$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-	if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
+	if($id==0) {
+	    $modx->webAlertAndQuit($_lang["error_no_id"]);
+	}
 	return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -235,11 +235,11 @@
		block discarded – undo
235	235	lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE) . "\n" ?>
236	236	};
237	237	<?php
238		- $opened = array_filter(array_map('intval', explode('\|', $_SESSION['openedArray'])));
239		- echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n";
240		- if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
241		- else $modxJs = 'modx.min.js'; // For easier development
242		- ?>
	238	+ $opened = array_filter(array_map('intval', explode('\|', $_SESSION['openedArray'])));
	239	+ echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n";
	240	+ if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
	241	+ else $modxJs = 'modx.min.js'; // For easier development
	242	+ ?>
243	243	</script>
244	244	<script src="media/style/<?= $modx->config['manager_theme'] ?>/js/<?= $modxJs ?>?v=<?= $lastInstallTime ?>"></script>
245	245	<?php if ($modx->config['show_picker'] != "0") { ?>

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5	header("X-XSS-Protection: 0");
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	}
47	47
48	48	if (isset($_COOKIE['MODX_themeColor'])) {
49		- $body_class .= ' ' . $_COOKIE['MODX_themeColor'];
	49	+ $body_class .= ' '.$_COOKIE['MODX_themeColor'];
50	50	}
51	51
52	52	if (isset($modx->pluginCache['ElementsInTree'])) {
		@@ -74,36 +74,36 @@ discard block
		block discarded – undo
74	74	$user['which_browser'] = $modx->config['which_browser'];
75	75	}
76	76
77		-$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;
	77	+$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime;
78	78
79	79	if ($modx->config['manager_theme'] == 'default') {
80		- if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
81		- require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
	80	+ if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
	81	+ require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
82	82	$minifier = new Formatter\CSSMinify();
83		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');
84		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');
85		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');
86		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');
87		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');
88		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');
89		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');
90		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');
91		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');
92		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');
93		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');
	83	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');
	84	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');
	85	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');
	86	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');
	87	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');
	88	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');
	89	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');
	90	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');
	91	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');
	92	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');
	93	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');
94	94	$css = $minifier->minify();
95		- file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);
	95	+ file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css);
96	96	}
97		- if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
98		- $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
	97	+ if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
	98	+ $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
99	99	}
100	100	}
101	101
102		-$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 \|\| $modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_plugin')));
	102	+$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 \|\| $modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_plugin')));
103	103
104	104	?>
105	105	<!DOCTYPE html>
106		-<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>>
	106	+<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>>
107	107	<head>
108	108	<title><?= $site_name ?>- (EVO CMS Manager)</title>
109	109	<meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" />
		@@ -134,20 +134,20 @@ discard block
		block discarded – undo
134	134	MODX_SITE_URL: '<?= MODX_SITE_URL ?>',
135	135	MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>',
136	136	user: {
137		- role: <?= (int)$user['role'] ?>,
	137	+ role: <?= (int) $user['role'] ?>,
138	138	username: '<?= $user['username'] ?>'
139	139	},
140	140	config: {
141	141	mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>,
142		- menu_height: <?= (int)$menu_height ?>,
143		- tree_width: <?= (int)$tree_width ?>,
144		- tree_min_width: <?= (int)$tree_min_width ?>,
145		- session_timeout: <?= (int)$modx->config['session_timeout'] ?>,
146		- site_start: <?= (int)$modx->config['site_start'] ?>,
147		- tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>,
	142	+ menu_height: <?= (int) $menu_height ?>,
	143	+ tree_width: <?= (int) $tree_width ?>,
	144	+ tree_min_width: <?= (int) $tree_min_width ?>,
	145	+ session_timeout: <?= (int) $modx->config['session_timeout'] ?>,
	146	+ site_start: <?= (int) $modx->config['site_start'] ?>,
	147	+ tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>,
148	148	theme: '<?= $modx->config['manager_theme'] ?>',
149	149	which_browser: '<?= $user['which_browser'] ?>',
150		- layout: <?= (int)$manager_layout ?>,
	150	+ layout: <?= (int) $manager_layout ?>,
151	151	textdir: '<?= $modx_textdir ?>',
152	152	global_tabs: <?= $modx->config['global_tabs'] ?>
153	153
		@@ -232,12 +232,12 @@ discard block
		block discarded – undo
232	232	delete a[b];
233	233	},
234	234	openedArray: [],
235		- lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE) . "\n" ?>
	235	+ lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE)."\n" ?>
236	236	};
237	237	<?php
238	238	$opened = array_filter(array_map('intval', explode('\|', $_SESSION['openedArray'])));
239		- echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n";
240		- if(filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
	239	+ echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n modx.openedArray[", $opened).'] = 1;')."\n";
	240	+ if (filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.js') > filemtime(MODX_MANAGER_PATH.'media/style/'.$modx->config["manager_theme"].'/js/modx.min.js')) $modxJs = 'modx.js';
241	241	else $modxJs = 'modx.min.js'; // For easier development
242	242	?>
243	243	</script>
		@@ -367,7 +367,7 @@ discard block
		block discarded – undo
367	367	<a href="javascript:;" class="dropdown-toggle" onclick="return false;">
368	368	<span class="username"><?= $user['username'] ?></span>
369	369	<?php if ($user['photo']) { ?>
370		- <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>
	370	+ <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span>
371	371	<?php } else { ?>
372	372	<span class="icon"><?= $_style['menu_user'] ?></span>
373	373	<?php } ?>
		@@ -394,7 +394,7 @@ discard block
		block discarded – undo
394	394	$version = 'Evolution';
395	395	?>
396	396	<?php
397		- echo sprintf('<li><span class="dropdown-item" title="%s – %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
	397	+ echo sprintf('<li><span class="dropdown-item" title="%s – %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
398	398	?>
399	399	</ul>
400	400	</li>
		@@ -533,7 +533,7 @@ discard block
		block discarded – undo
533	533	<script type="text/javascript">
534	534
535	535	if (document.getElementById('treeMenu')) {
536		- <?php if($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin')) { ?>
	536	+ <?php if ($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin')) { ?>
537	537
538	538	document.getElementById('treeMenu_openelements').onclick = function(e) {
539	539	e.preventDefault();
		@@ -551,12 +551,12 @@ discard block
		block discarded – undo
551	551	}
552	552	};
553	553	<?php } ?>
554		- <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>
	554	+ <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>
555	555
556	556	document.getElementById('treeMenu_openimages').onclick = function(e) {
557	557	e.preventDefault();
558	558	if (modx.config.global_tabs && !e.shiftKey) {
559		- modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
	559	+ modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
560	560	} else {
561	561	var randomNum = '<?= $_lang["files_files"] ?>';
562	562	if (e.shiftKey) {
		@@ -569,12 +569,12 @@ discard block
		block discarded – undo
569	569	}
570	570	};
571	571	<?php } ?>
572		- <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>
	572	+ <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>
573	573
574	574	document.getElementById('treeMenu_openfiles').onclick = function(e) {
575	575	e.preventDefault();
576	576	if (modx.config.global_tabs && !e.shiftKey) {
577		- modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
	577	+ modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
578	578	} else {
579	579	var randomNum = '<?= $_lang["files_files"] ?>';
580	580	if (e.shiftKey) {
		@@ -628,7 +628,7 @@ discard block
		block discarded – undo
628	628
629	629	</div>
630	630	<?php if ($modx->config['show_picker'] != "0") {
631		- include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');
	631	+ include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');
632	632	} ?>
633	633	</body>
634	634	</html>

		@@ -1,11 +1,11 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
4	4	}
5	5
6	6	unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
7	7
8		-if($modx->hasPermission('settings') && (!isset($settings_version) \|\| $settings_version != $modx->getVersionData('version'))) {
	8	+if ($modx->hasPermission('settings') && (!isset($settings_version) \|\| $settings_version != $modx->getVersionData('version'))) {
9	9	// seems to be a new install - send the user to the configuration page
10	10	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
11	11	}
		@@ -16,50 +16,50 @@ discard block
		block discarded – undo
16	16	$_SESSION['nrnewmessages'] = 0;
17	17
18	18	// setup message info
19		-if($modx->hasPermission('messages')) {
20		- include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
	19	+if ($modx->hasPermission('messages')) {
	20	+ include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');
21	21	$_SESSION['nrtotalmessages'] = $nrtotalmessages;
22	22	$_SESSION['nrnewmessages'] = $nrnewmessages;
23	23
24	24	$msg = array();
25	25	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
26		- $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
	26	+ $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';
27	27	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
28		- $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
	28	+ $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';
29	29	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
30	30	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
31	31	$ph['MessageInfo'] = join("\n", $msg);
32	32	}
33	33
34	34	// setup icons
35		-if($modx->hasPermission('new_user') \|\| $modx->hasPermission('edit_user')) {
	35	+if ($modx->hasPermission('new_user') \|\| $modx->hasPermission('edit_user')) {
36	36	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
37	37	$ph['SecurityIcon'] = wrapIcon($icon, 75);
38	38	}
39		-if($modx->hasPermission('new_web_user') \|\| $modx->hasPermission('edit_web_user')) {
	39	+if ($modx->hasPermission('new_web_user') \|\| $modx->hasPermission('edit_web_user')) {
40	40	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
41	41	$ph['WebUserIcon'] = wrapIcon($icon, 99);
42	42	}
43		-if($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module')) {
	43	+if ($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module')) {
44	44	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
45	45	$ph['ModulesIcon'] = wrapIcon($icon, 106);
46	46	}
47		-if($modx->hasPermission('new_template') \|\| $modx->hasPermission('edit_template') \|\| $modx->hasPermission('new_snippet') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('new_plugin') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('manage_metatags')) {
	47	+if ($modx->hasPermission('new_template') \|\| $modx->hasPermission('edit_template') \|\| $modx->hasPermission('new_snippet') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('new_plugin') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('manage_metatags')) {
48	48	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
49	49	$ph['ResourcesIcon'] = wrapIcon($icon, 76);
50	50	}
51		-if($modx->hasPermission('bk_manager')) {
	51	+if ($modx->hasPermission('bk_manager')) {
52	52	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
53	53	$ph['BackupIcon'] = wrapIcon($icon, 93);
54	54	}
55		-if($modx->hasPermission('help')) {
	55	+if ($modx->hasPermission('help')) {
56	56	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
57	57	$ph['HelpIcon'] = wrapIcon($icon, 9);
58	58	}
59	59	// do some config checks
60		-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) \|\| $modx->config['warning_visibility'] == 1) {
61		- include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
62		- if($config_check_results != $_lang['configcheck_ok']) {
	60	+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) \|\| $modx->config['warning_visibility'] == 1) {
	61	+ include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');
	62	+ if ($config_check_results != $_lang['configcheck_ok']) {
63	63	$ph['config_check_results'] = $config_check_results;
64	64	$ph['config_display'] = 'block';
65	65	} else {
		@@ -70,8 +70,8 @@ discard block
		block discarded – undo
70	70	}
71	71
72	72	// Check logout-reminder
73		-if(isset($_SESSION['show_logout_reminder'])) {
74		- switch($_SESSION['show_logout_reminder']['type']) {
	73	+if (isset($_SESSION['show_logout_reminder'])) {
	74	+ switch ($_SESSION['show_logout_reminder']['type']) {
75	75	case 'logout_reminder':
76	76	$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
77	77	$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	</tr>
126	126	</table>';
127	127
128		-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
	128	+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';
129	129
130	130	$ph['UserInfo'] = $modx->parseText($tpl, array(
131	131	'username' => $modx->getLoginUserName(),
		@@ -140,10 +140,10 @@ discard block
		block discarded – undo
140	140	$from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";
141	141	$rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
142	142
143		-if($modx->db->getRecordCount($rs) < 1) {
	143	+if ($modx->db->getRecordCount($rs) < 1) {
144	144	$html = '<p>[%no_active_users_found%]</p>';
145	145	} else {
146		- include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
	146	+ include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
147	147	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
148	148	$ph['now'] = strftime('%H:%M:%S', $now);
149	149	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;
		@@ -168,7 +168,7 @@ discard block
		block discarded – undo
168	168	$userList = array();
169	169	$userCount = array();
170	170	// Create userlist with session-count first before output
171		- while($activeusers = $modx->db->getRow($rs)) {
	171	+ while ($activeusers = $modx->db->getRow($rs)) {
172	172	$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
173	173
174	174	$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
		@@ -186,9 +186,9 @@ discard block
		block discarded – undo
186	186	$currentaction
187	187	);
188	188	}
189		- foreach($userList as $params) {
	189	+ foreach ($userList as $params) {
190	190	$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
191		- $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
	191	+ $html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);
192	192	}
193	193
194	194	$html .= '
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	$ph['OnlineInfo'] = $html;
201	201
202	202	// include rss feeds for important forum topics
203		-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');
	203	+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');
204	204	$ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];
205	205	$ph['modx_news_content'] = $feedData['modx_news_content'];
206	206
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231
232	232	// invoke event OnManagerWelcomePrerender
233	233	$evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
234		-if(is_array($evtOut)) {
	234	+if (is_array($evtOut)) {
235	235	$output = implode('', $evtOut);
236	236	$ph['OnManagerWelcomePrerender'] = $output;
237	237	}
		@@ -365,57 +365,57 @@ discard block
		block discarded – undo
365	365
366	366	// invoke OnManagerWelcomeHome event
367	367	$sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
368		-if(is_array($sitewidgets)) {
	368	+if (is_array($sitewidgets)) {
369	369	$newwidgets = array();
370		- foreach($sitewidgets as $widget){
	370	+ foreach ($sitewidgets as $widget) {
371	371	$newwidgets = array_merge($newwidgets, unserialize($widget));
372	372	}
373	373	$widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
374	374	}
375	375
376		-usort($widgets, function ($a, $b) {
	376	+usort($widgets, function($a, $b){
377	377	return $a['menuindex'] - $b['menuindex'];
378	378	});
379	379
380	380	$tpl = getTplWidget();
381	381	$output = '';
382		-foreach($widgets as $widget) {
383		- if ($widget['hide'] != '1'){
	382	+foreach ($widgets as $widget) {
	383	+ if ($widget['hide'] != '1') {
384	384	$output .= $modx->parseText($tpl, $widget);
385	385	}
386	386	}
387	387	$ph['widgets'] = $output;
388	388
389	389	// load template
390		-if(!isset($modx->config['manager_welcome_tpl']) \|\| empty($modx->config['manager_welcome_tpl'])) {
391		- $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
	390	+if (!isset($modx->config['manager_welcome_tpl']) \|\| empty($modx->config['manager_welcome_tpl'])) {
	391	+ $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';
392	392	}
393	393
394	394	$target = $modx->config['manager_welcome_tpl'];
395	395	$target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
396	396	$target = $modx->mergeSettingsContent($target);
397	397
398		-if(substr($target, 0, 1) === '@') {
399		- if(substr($target, 0, 6) === '@CHUNK') {
	398	+if (substr($target, 0, 1) === '@') {
	399	+ if (substr($target, 0, 6) === '@CHUNK') {
400	400	$content = $modx->getChunk(trim(substr($target, 7)));
401		- } elseif(substr($target, 0, 5) === '@FILE') {
	401	+ } elseif (substr($target, 0, 5) === '@FILE') {
402	402	$content = file_get_contents(trim(substr($target, 6)));
403	403	} else {
404	404	$content = '';
405	405	}
406	406	} else {
407	407	$chunk = $modx->getChunk($target);
408		- if($chunk !== false && !empty($chunk)) {
	408	+ if ($chunk !== false && !empty($chunk)) {
409	409	$content = $chunk;
410		- } elseif(is_file(MODX_BASE_PATH . $target)) {
411		- $content = file_get_contents(MODX_BASE_PATH . $target);
412		- } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
413		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
414		- } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
	410	+ } elseif (is_file(MODX_BASE_PATH.$target)) {
	411	+ $content = file_get_contents(MODX_BASE_PATH.$target);
	412	+ } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {
	413	+ $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');
	414	+ } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible
415	415	{
416		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
	416	+ $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');
417	417	} else {
418		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
	418	+ $content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');
419	419	}
420	420	}
421	421
		@@ -423,7 +423,7 @@ discard block
		block discarded – undo
423	423	$content = $modx->mergeConditionalTagsContent($content);
424	424	$content = $modx->mergeSettingsContent($content);
425	425	$content = $modx->parseText($content, $ph);
426		-if(strpos($content, '[+') !== false) {
	426	+if (strpos($content, '[+') !== false) {
427	427	$modx->toPlaceholders($ph);
428	428	$content = $modx->mergePlaceholderContent($content);
429	429	}
		@@ -432,7 +432,7 @@ discard block
		block discarded – undo
432	432	$content = $modx->parseText($content, $_style, '[&', '&]');
433	433	$content = $modx->cleanUpMODXTags($content); //cleanup
434	434
435		-if($js = $modx->getRegisteredClientScripts()) {
	435	+if ($js = $modx->getRegisteredClientScripts()) {
436	436	$content .= $js;
437	437	}
438	438
		@@ -442,7 +442,7 @@ discard block
		block discarded – undo
442	442	// <a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>
443	443	// <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>
444	444	//</span>
445		-function getTplWidget() { // recent document info
	445	+function getTplWidget(){ // recent document info
446	446	return '
447	447	<div class="[+cols+]" id="[+id+]">
448	448	<div class="card"[+cardAttr+]>
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453	';
454	454	}
455	455
456		-function getRecentInfo() { // recent document info
	456	+function getRecentInfo(){ // recent document info
457	457	global $modx;
458	458
459	459	$modx->addSnippet('recentInfoList', 'getRecentInfoList');
		@@ -479,12 +479,12 @@ discard block
		block discarded – undo
479	479	return $html;
480	480	}
481	481
482		-function getRecentInfoList() {
	482	+function getRecentInfoList(){
483	483	global $modx;
484	484
485	485	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);
486	486
487		- if($modx->db->getRecordCount($rs) < 1) {
	487	+ if ($modx->db->getRecordCount($rs) < 1) {
488	488	return '<tr><td>[%no_activity_message%]</td></tr>';
489	489	}
490	490
		@@ -494,20 +494,20 @@ discard block
		block discarded – undo
494	494	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';
495	495
496	496	$output = array();
497		- while($ph = $modx->db->getRow($rs)) {
	497	+ while ($ph = $modx->db->getRow($rs)) {
498	498	$docid = $ph['id'];
499	499	$_ = $modx->getUserInfo($ph['editedby']);
500	500	$ph['username'] = $_['username'];
501	501
502		- if($ph['deleted'] == 1) {
	502	+ if ($ph['deleted'] == 1) {
503	503	$ph['status'] = 'deleted text-danger';
504		- } elseif($ph['published'] == 0) {
	504	+ } elseif ($ph['published'] == 0) {
505	505	$ph['status'] = 'unpublished font-italic text-muted';
506	506	} else {
507	507	$ph['status'] = 'published';
508	508	}
509	509
510		- if($modx->hasPermission('edit_document')) {
	510	+ if ($modx->hasPermission('edit_document')) {
511	511	$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);
512	512	} else {
513	513	$ph['edit_btn'] = '';
		@@ -522,8 +522,8 @@ discard block
		block discarded – undo
522	522	$preview_disabled
523	523	), $btntpl['preview_btn']);
524	524
525		- if($modx->hasPermission('delete_document')) {
526		- if($ph['deleted'] == 0) {
	525	+ if ($modx->hasPermission('delete_document')) {
	526	+ if ($ph['deleted'] == 0) {
527	527	$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-trash fa-fw"></i></a> ';
528	528	} else {
529	529	$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&id=[+id+]" target="main" data-ajaxaction="delete.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';
		@@ -533,11 +533,11 @@ discard block
		block discarded – undo
533	533	$ph['delete_btn'] = '';
534	534	}
535	535
536		- if($ph['deleted'] == 1 && $ph['published'] == 0) {
	536	+ if ($ph['deleted'] == 1 && $ph['published'] == 0) {
537	537	$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
538		- } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
	538	+ } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {
539	539	$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
540		- } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
	540	+ } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {
541	541	$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-up fa-fw"></i></a> ';
542	542	} else {
543	543	$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&id=[+id+]" target="main" data-ajaxaction="publish.res" data-id="[+id+]" data-element="row[+id+]"><i class="fa fa-arrow-down fa-fw"></i></a> ';
		@@ -546,16 +546,16 @@ discard block
		block discarded – undo
546	546
547	547	$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');
548	548
549		- if($ph['longtitle'] == '') {
	549	+ if ($ph['longtitle'] == '') {
550	550	$ph['longtitle'] = '(<i>[%not_set%]</i>)';
551	551	}
552		- if($ph['description'] == '') {
	552	+ if ($ph['description'] == '') {
553	553	$ph['description'] = '(<i>[%not_set%]</i>)';
554	554	}
555		- if($ph['introtext'] == '') {
	555	+ if ($ph['introtext'] == '') {
556	556	$ph['introtext'] = '(<i>[%not_set%]</i>)';
557	557	}
558		- if($ph['alias'] == '') {
	558	+ if ($ph['alias'] == '') {
559	559	$ph['alias'] = '(<i>[%not_set%]</i>)';
560	560	}
561	561
		@@ -564,7 +564,7 @@ discard block
		block discarded – undo
564	564	return join("\n", $output);
565	565	}
566	566
567		-function getRecentInfoRowTpl() {
	567	+function getRecentInfoRowTpl(){
568	568	$tpl = '
569	569	<tr id="row[+id+]">
570	570	<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>
		@@ -593,11 +593,11 @@ discard block
		block discarded – undo
593	593	}
594	594
595	595	// setup icons
596		-function wrapIcon($i, $action) {
	596	+function wrapIcon($i, $action){
597	597	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);
598	598	}
599	599
600		-function getStartUpScript() {
	600	+function getStartUpScript(){
601	601	$script = '
602	602	<script type="text/javascript">
603	603	function hideConfigCheckWarning(key) {

		@@ -696,13 +696,15 @@ discard block
		block discarded – undo
696	696	$this->virtualDir = '';
697	697	}
698	698
699		- if (preg_match('@^[1-9][0-9]$@', $q) && !isset($this->documentListing[$q])) { / we got an ID returned, check to make sure it's not an alias */
	699	+ if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
	700	+/* we got an ID returned, check to make sure it's not an alias */
700	701	/* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
701	702	if ($this->config['use_alias_path'] == 1) {
702	703	if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) \|\| ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) \|\| ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
703	704	$this->documentMethod = 'id';
704	705	return $q;
705		- } else { /* not a valid id in terms of virtualDir, treat as alias */
	706	+ } else {
	707	+/* not a valid id in terms of virtualDir, treat as alias */
706	708	$this->documentMethod = 'alias';
707	709	return $q;
708	710	}
		@@ -710,7 +712,8 @@ discard block
		block discarded – undo
710	712	$this->documentMethod = 'id';
711	713	return $q;
712	714	}
713		- } else { /* we didn't get an ID back, so instead we assume it's an alias */
	715	+ } else {
	716	+/* we didn't get an ID back, so instead we assume it's an alias */
714	717	if ($this->config['friendly_alias_urls'] != 1) {
715	718	$q = $qOrig;
716	719	}
		@@ -740,13 +743,14 @@ discard block
		block discarded – undo
740	743	* @param $id
741	744	* @return array\|mixed\|null\|string
742	745	*/
743		- public function makePageCacheKey($id){
	746	+ public function makePageCacheKey($id)
	747	+ {
744	748	$hash = $id;
745	749	$tmp = null;
746	750	$params = array();
747		- if(!empty($this->systemCacheKey)){
	751	+ if(!empty($this->systemCacheKey)) {
748	752	$hash = $this->systemCacheKey;
749		- }else {
	753	+ } else {
750	754	if (!empty($_GET)) {
751	755	// Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
752	756	$params = $_GET;
		@@ -755,7 +759,7 @@ discard block
		block discarded – undo
755	759	}
756	760	}
757	761	$evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
758		- if (is_array($evtOut) && count($evtOut) > 0){
	762	+ if (is_array($evtOut) && count($evtOut) > 0) {
759	763	$tmp = array_pop($evtOut);
760	764	}
761	765	return empty($tmp) ? $hash : $tmp;
		@@ -1166,10 +1170,18 @@ discard block
		block discarded – undo
1166	1170	return array();
1167	1171	}
1168	1172	$spacer = md5('<<<EVO>>>');
1169		- if($left==='{{' && strpos($content,';}}')!==false) $content = str_replace(';}}', sprintf(';}%s}', $spacer),$content);
1170		- if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
1171		- if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]', $spacer),$content);
1172		- if($left==='[[' && strpos($content,']]]')!==false) $content = str_replace(']]]', sprintf(']%s]]', $spacer),$content);
	1173	+ if($left==='{{' && strpos($content,';}}')!==false) {
	1174	+ $content = str_replace(';}}', sprintf(';}%s}', $spacer),$content);
	1175	+ }
	1176	+ if($left==='{{' && strpos($content,'{{}}')!==false) {
	1177	+ $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
	1178	+ }
	1179	+ if($left==='[[' && strpos($content,']]]]')!==false) {
	1180	+ $content = str_replace(']]]]',sprintf(']]%s]]', $spacer),$content);
	1181	+ }
	1182	+ if($left==='[[' && strpos($content,']]]')!==false) {
	1183	+ $content = str_replace(']]]', sprintf(']%s]]', $spacer),$content);
	1184	+ }
1173	1185
1174	1186	$pos['<![CDATA['] = strpos($content, '<![CDATA[');
1175	1187	$pos[']]>'] = strpos($content, ']]>');
		@@ -1222,7 +1234,8 @@ discard block
		block discarded – undo
1222	1234	}
1223	1235	}
1224	1236
1225		- if (!in_array($fetch, $tags)) { // Avoid double Matches
	1237	+ if (!in_array($fetch, $tags)) {
	1238	+// Avoid double Matches
1226	1239	$tags[] = $fetch; // Fetch
1227	1240	};
1228	1241	$fetch = ''; // and reset
		@@ -1240,7 +1253,9 @@ discard block
		block discarded – undo
1240	1253	}
1241	1254	}
1242	1255	foreach($tags as $i=>$tag) {
1243		- if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
	1256	+ if(strpos($tag,$spacer)!==false) {
	1257	+ $tags[$i] = str_replace($spacer, '', $tag);
	1258	+ }
1244	1259	}
1245	1260	return $tags;
1246	1261	}
		@@ -1280,7 +1295,10 @@ discard block
		block discarded – undo
1280	1295	}
1281	1296
1282	1297	foreach ($matches[1] as $i => $key) {
1283		- if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [tv_name_[+param+]] as content
	1298	+ if(strpos($key,'[+')!==false) {
	1299	+ continue;
	1300	+ }
	1301	+ // Allow chunk {{chunk?&param=`xxx`}} with [tv_name_[+param+]] as content
1284	1302	if (substr($key, 0, 1) == '#') {
1285	1303	$key = substr($key, 1);
1286	1304	} // remove # for QuickEdit format
		@@ -2005,7 +2023,8 @@ discard block
		block discarded – undo
2005	2023	* @return mixed\|string
2006	2024	*/
2007	2025	public function _getSGVar($value)
2008		- { // Get super globals
	2026	+ {
	2027	+// Get super globals
2009	2028	$key = $value;
2010	2029	$_ = $this->config['enable_filter'];
2011	2030	$this->config['enable_filter'] = 1;
		@@ -2410,7 +2429,8 @@ discard block
		block discarded – undo
2410	2429	if ($this->config['friendly_urls'] == 1) {
2411	2430	$aliases = array();
2412	2431	if (is_array($this->documentListing)) {
2413		- foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
	2432	+ foreach ($this->documentListing as $path => $docid) {
	2433	+// This is big Loop on large site!
2414	2434	$aliases[$docid] = $path;
2415	2435	$isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
2416	2436	}
		@@ -2443,7 +2463,7 @@ discard block
		block discarded – undo
2443	2463	$isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
2444	2464	$pref = $this->config['friendly_url_prefix'];
2445	2465	$suff = $this->config['friendly_url_suffix'];
2446		- $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
	2466	+ $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
2447	2467	global $modx;
2448	2468	$thealias = $aliases[$m[1]];
2449	2469	$thefolder = $isfolder[$m[1]];
		@@ -3120,7 +3140,9 @@ discard block
		block discarded – undo
3120	3140	public function webAlertAndQuit($msg, $url = "")
3121	3141	{
3122	3142	global $modx_manager_charset;
3123		- if($this->ajaxMode === true) $this->jsonResponse(array('error'=>$msg));
	3143	+ if($this->ajaxMode === true) {
	3144	+ $this->jsonResponse(array('error'=>$msg));
	3145	+ }
3124	3146	if (substr(strtolower($url), 0, 11) == "javascript:") {
3125	3147	$fnc = substr($url, 11);
3126	3148	} elseif ($url) {
		@@ -4216,7 +4238,8 @@ discard block
		block discarded – undo
4216	4238	if (isset ($this->snippetCache[$snippetName])) {
4217	4239	$snippet = $this->snippetCache[$snippetName];
4218	4240	$properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
4219		- } else { // not in cache so let's check the db
	4241	+ } else {
	4242	+// not in cache so let's check the db
4220	4243	$sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "' AND ss.disabled=0;";
4221	4244	$result = $this->db->query($sql);
4222	4245	if ($this->db->getRecordCount($result) == 1) {
		@@ -4720,7 +4743,7 @@ discard block
		block discarded – undo
4720	4743	$result = $this->db->makeArray($rs);
4721	4744
4722	4745	// get default/built-in template variables
4723		- if(is_array($docRow)){
	4746	+ if(is_array($docRow)) {
4724	4747	ksort($docRow);
4725	4748
4726	4749	foreach ($docRow as $key => $value) {
		@@ -5199,12 +5222,16 @@ discard block
		block discarded – undo
5199	5222	return '';
5200	5223	} // nothing to register
5201	5224	if (!is_array($options)) {
5202		- if (is_bool($options)) // backward compatibility with old plaintext parameter
	5225	+ if (is_bool($options)) {
	5226	+ // backward compatibility with old plaintext parameter
5203	5227	{
5204	5228	$options = array('plaintext' => $options);
5205		- } elseif (is_string($options)) // Also allow script name as 2nd param
	5229	+ }
	5230	+ } elseif (is_string($options)) {
	5231	+ // Also allow script name as 2nd param
5206	5232	{
5207	5233	$options = array('name' => $options);
	5234	+ }
5208	5235	} else {
5209	5236	$options = array();
5210	5237	}
		@@ -5216,7 +5243,8 @@ discard block
		block discarded – undo
5216	5243	unset($overwritepos); // probably unnecessary--just making sure
5217	5244
5218	5245	$useThisVer = true;
5219		- if (isset($this->loadedjscripts[$key])) { // a matching script was found
	5246	+ if (isset($this->loadedjscripts[$key])) {
	5247	+// a matching script was found
5220	5248	// if existing script is a startup script, make sure the candidate is also a startup script
5221	5249	if ($this->loadedjscripts[$key]['startup']) {
5222	5250	$startup = true;
		@@ -5236,7 +5264,8 @@ discard block
		block discarded – undo
5236	5264	// overwrite the old script (the position may be important for dependent scripts)
5237	5265	$overwritepos = $this->loadedjscripts[$key]['pos'];
5238	5266	}
5239		- } else { // Use the original version
	5267	+ } else {
	5268	+// Use the original version
5240	5269	if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
5241	5270	// need to move the exisiting script to the head
5242	5271	$version = $this->loadedjscripts[$key][$version];
		@@ -5360,7 +5389,8 @@ discard block
		block discarded – undo
5360	5389	}
5361	5390
5362	5391	$results = null;
5363		- foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
	5392	+ foreach ($this->pluginEvent[$evtName] as $pluginName) {
	5393	+// start for loop
5364	5394	if ($this->dumpPlugins) {
5365	5395	$eventtime = $this->getMicroTime();
5366	5396	}
		@@ -5908,7 +5938,8 @@ discard block
		block discarded – undo
5908	5938	* @return bool
5909	5939	*/
5910	5940	public function isSafeCode($phpcode = '', $safe_functions = '')
5911		- { // return true or false
	5941	+ {
	5942	+// return true or false
5912	5943	if ($safe_functions == '') {
5913	5944	return false;
5914	5945	}
		@@ -6324,7 +6355,7 @@ discard block
		block discarded – undo
6324	6355	$args = array_pad(array(), $_, '$var');
6325	6356	$args = implode(", ", $args);
6326	6357	$modx = &$this;
6327		- $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
	6358	+ $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
6328	6359	$arg = $val['args'][$tmp - 1];
6329	6360	switch (true) {
6330	6361	case is_null($arg): {
		@@ -6565,7 +6596,8 @@ discard block
		block discarded – undo
6565	6596	*
6566	6597	* @param boolean $state State of ajaxMode
6567	6598	*/
6568		- function setAjaxMode($state) {
	6599	+ function setAjaxMode($state)
	6600	+ {
6569	6601	$this->ajaxMode = $state === true ? true : false;
6570	6602	}
6571	6603
		@@ -6574,7 +6606,8 @@ discard block
		block discarded – undo
6574	6606	*
6575	6607	* @param array $array Array to convert
6576	6608	*/
6577		- function jsonResponse($array) {
	6609	+ function jsonResponse($array)
	6610	+ {
6578	6611	header('content-type: application/json');
6579	6612	exit(json_encode($array, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE));
6580	6613	}

		@@ -124,6 +124,6 @@
		block discarded – undo
124	124
125	125	// finished emptying cache - redirect
126	126	if($modx->ajaxMode !== true) {
127		- $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
128		- header($header);
	127	+ $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
	128	+ header($header);
129	129	}
130	130	\ No newline at end of file

		@@ -1,25 +1,25 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5	if (!$modx->hasPermission('delete_document')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
10		-if ($id==0) {
	9	+$id = isset($_REQUEST['id']) ? intval($_REQUEST['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
		block discarded – undo
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;
		@@ -48,17 +48,17 @@ discard block
		block discarded – undo
48	48
49	49	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent={$parent} AND deleted=0");
50	50	// the document has children documents, we'll need to delete those too
51		- while ($childid=$modx->db->getValue($rs)) {
52		- if ($childid==$site_start) {
	51	+ while ($childid = $modx->db->getValue($rs)) {
	52	+ if ($childid == $site_start) {
53	53	$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.");
54	54	}
55		- if ($childid==$site_unavailable_page) {
	55	+ if ($childid == $site_unavailable_page) {
56	56	$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.");
57	57	}
58		- if ($childid==$error_page) {
	58	+ if ($childid == $error_page) {
59	59	$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.");
60	60	}
61		- if ($childid==$unauthorized_page) {
	61	+ if ($childid == $unauthorized_page) {
62	62	$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.");
63	63	}
64	64	$children[] = $childid;
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	"children"=>$children
77	77	));
78	78
79		-if (count($children)>0) {
	79	+if (count($children) > 0) {
80	80	$modx->db->update(
81	81	array(
82	82	'deleted' => 1,
		@@ -85,19 +85,19 @@ discard block
		block discarded – undo
85	85	), $modx->getFullTableName('site_content'), "id IN (".implode(", ", $children).")");
86	86	}
87	87
88		-if ($site_start==$id) {
	88	+if ($site_start == $id) {
89	89	$modx->webAlertAndQuit("Document is 'Site start' and cannot be deleted!");
90	90	}
91	91
92		-if ($site_unavailable_page==$id) {
	92	+if ($site_unavailable_page == $id) {
93	93	$modx->webAlertAndQuit("Document is used as the 'Site unavailable page' and cannot be deleted!");
94	94	}
95	95
96		-if ($error_page==$id) {
	96	+if ($error_page == $id) {
97	97	$modx->webAlertAndQuit("Document is used as the 'Site error page' and cannot be deleted!");
98	98	}
99	99
100		-if ($unauthorized_page==$id) {
	100	+if ($unauthorized_page == $id) {
101	101	$modx->webAlertAndQuit("Document is used as the 'Site unauthorized page' and cannot be deleted!");
102	102	}
103	103
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$modx->clearCache('full');
124	124
125	125	// finished emptying cache - redirect
126		-if($modx->ajaxMode !== true) {
127		- $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
	126	+if ($modx->ajaxMode !== true) {
	127	+ $header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
128	128	header($header);
129	129	}
130	130	\ No newline at end of file

		@@ -3,12 +3,12 @@ discard block
		block discarded – undo
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		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
10	10	if($id==0) {
11		- $modx->webAlertAndQuit($_lang["error_no_id"]);
	11	+ $modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	/********** webber ******/
		@@ -32,50 +32,50 @@ discard block
		block discarded – undo
32	32	$udperms->role = $_SESSION['mgrRole'];
33	33
34	34	if(!$udperms->checkPermissions()) {
35		- $modx->webAlertAndQuit($_lang["access_permission_denied"]);
	35	+ $modx->webAlertAndQuit($_lang["access_permission_denied"]);
36	36	}
37	37
38	38	// get the timestamp on which the document was deleted.
39	39	$rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
40	40	$deltime = $modx->db->getValue($rs);
41	41	if(!$deltime) {
42		- $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
	42	+ $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
43	43	}
44	44
45	45	$children = array();
46	46
47	47	function getChildren($parent) {
48	48
49		- global $modx;
50		- global $children;
51		- global $deltime;
52		-
53		- $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='{$parent}' AND deleted=1 AND deletedon='{$deltime}'");
54		- // the document has children documents, we'll need to delete those too
55		- while ($row=$modx->db->getRow($rs)) {
56		- $children[] = $row['id'];
57		- getChildren($row['id']);
58		- //echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
59		- }
	49	+ global $modx;
	50	+ global $children;
	51	+ global $deltime;
	52	+
	53	+ $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='{$parent}' AND deleted=1 AND deletedon='{$deltime}'");
	54	+ // the document has children documents, we'll need to delete those too
	55	+ while ($row=$modx->db->getRow($rs)) {
	56	+ $children[] = $row['id'];
	57	+ getChildren($row['id']);
	58	+ //echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
	59	+ }
60	60	}
61	61
62	62	getChildren($id);
63	63
64	64	if(count($children)>0) {
65		- $modx->db->update(
66		- array(
67		- 'deleted' => 0,
68		- 'deletedby' => 0,
69		- 'deletedon' => 0,
70		- ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
	65	+ $modx->db->update(
	66	+ array(
	67	+ 'deleted' => 0,
	68	+ 'deletedby' => 0,
	69	+ 'deletedon' => 0,
	70	+ ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
71	71	}
72	72	//'undelete' the document.
73	73	$modx->db->update(
74		- array(
75		- 'deleted' => 0,
76		- 'deletedby' => 0,
77		- 'deletedon' => 0,
78		- ), $modx->getFullTableName('site_content'), "id='{$id}'");
	74	+ array(
	75	+ 'deleted' => 0,
	76	+ 'deletedby' => 0,
	77	+ 'deletedon' => 0,
	78	+ ), $modx->getFullTableName('site_content'), "id='{$id}'");
79	79
80	80	$modx->invokeEvent("OnDocFormUnDelete",
81	81	array(
		@@ -91,6 +91,6 @@ discard block
		block discarded – undo
91	91
92	92	// finished emptying cache - redirect
93	93	if($modx->ajaxMode !== true) {
94		- $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
95		- header($header);
	94	+ $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
	95	+ header($header);
96	96	}
97	97	\ No newline at end of file

		@@ -1,50 +1,50 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('delete_document')) {
	5	+if (!$modx->hasPermission('delete_document')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
10		-if($id==0) {
	9	+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	/********** webber ******/
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	/************ webber ***********/
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
26	26
27	27	// check permissions on the document
28		-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
	28	+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
29	29	$udperms = new udperms();
30	30	$udperms->user = $modx->getLoginUserID();
31	31	$udperms->document = $id;
32	32	$udperms->role = $_SESSION['mgrRole'];
33	33
34		-if(!$udperms->checkPermissions()) {
	34	+if (!$udperms->checkPermissions()) {
35	35	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
36	36	}
37	37
38	38	// get the timestamp on which the document was deleted.
39	39	$rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
40	40	$deltime = $modx->db->getValue($rs);
41		-if(!$deltime) {
	41	+if (!$deltime) {
42	42	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
43	43	}
44	44
45	45	$children = array();
46	46
47		-function getChildren($parent) {
	47	+function getChildren($parent){
48	48
49	49	global $modx;
50	50	global $children;
		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52
53	53	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='{$parent}' AND deleted=1 AND deletedon='{$deltime}'");
54	54	// the document has children documents, we'll need to delete those too
55		- while ($row=$modx->db->getRow($rs)) {
	55	+ while ($row = $modx->db->getRow($rs)) {
56	56	$children[] = $row['id'];
57	57	getChildren($row['id']);
58	58	//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62	getChildren($id);
63	63
64		-if(count($children)>0) {
	64	+if (count($children) > 0) {
65	65	$modx->db->update(
66	66	array(
67	67	'deleted' => 0,
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	$modx->clearCache('full');
91	91
92	92	// finished emptying cache - redirect
93		-if($modx->ajaxMode !== true) {
94		- $header="Location: index.php?a=3&id=$pid&r=1".$add_path;
	93	+if ($modx->ajaxMode !== true) {
	94	+ $header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
95	95	header($header);
96	96	}
97	97	\ No newline at end of file

		@@ -1,38 +1,38 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('save_document')\|\|!$modx->hasPermission('publish_document')) {
	5	+if (!$modx->hasPermission('save_document') \|\| !$modx->hasPermission('publish_document')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
10		-if($id==0) {
	9	+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	/**********webber ******/
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	/************ webber ***********/
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
26	26
27	27
28	28	// check permissions on the document
29		-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
	29	+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
30	30	$udperms = new udperms();
31	31	$udperms->user = $modx->getLoginUserID();
32	32	$udperms->document = $id;
33	33	$udperms->role = $_SESSION['mgrRole'];
34	34
35		-if(!$udperms->checkPermissions()) {
	35	+if (!$udperms->checkPermissions()) {
36	36	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
37	37	}
38	38
		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	), $modx->getFullTableName('site_content'), "id='{$id}'");
50	50
51	51	// invoke OnDocPublished event
52		-$modx->invokeEvent("OnDocPublished",array("docid"=>$id));
	52	+$modx->invokeEvent("OnDocPublished", array("docid"=>$id));
53	53
54	54	// Set the item name for logger
55	55	$_SESSION['itemname'] = $content['pagetitle'];
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	// empty cache
58	58	$modx->clearCache('full');
59	59
60		-if($modx->ajaxMode !== true) {
61		- $header="Location: index.php?a=3&id=$pid&r=1" . $add_path;
	60	+if ($modx->ajaxMode !== true) {
	61	+ $header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
62	62	header($header);
63	63	}
64	64	\ No newline at end of file

		@@ -616,36 +616,36 @@
		block discarded – undo
616	616	}
617	617
618	618	/* Ajax-Button Actions */
619		- case 'publish.res': {
620		- $published = getDocumentTv('published');
621		- $state = $published == 0 ? 1 : 0;
622		- if($state) {
623		- require_once('../../../processors/publish_content.processor.php');
624		- } else {
625		- require_once('../../../processors/unpublish_content.processor.php');
626		- }
627		- $json['result'] = $state == 1 ? 'publish' : 'unpublish';
628		- break;
629		- }
630		- case 'delete.res': {
631		- $deleted = getDocumentTv('deleted');
632		- $state = $deleted == 0 ? 1 : 0;
633		- if($state) {
634		- require_once('../../../processors/delete_content.processor.php');
635		- } else {
636		- require_once('../../../processors/undelete_content.processor.php');
637		- }
638		- $json['result'] = $state == 1 ? 'delete' : 'undelete';
639		- break;
640		- }
	619	+ case 'publish.res': {
	620	+ $published = getDocumentTv('published');
	621	+ $state = $published == 0 ? 1 : 0;
	622	+ if($state) {
	623	+ require_once('../../../processors/publish_content.processor.php');
	624	+ } else {
	625	+ require_once('../../../processors/unpublish_content.processor.php');
	626	+ }
	627	+ $json['result'] = $state == 1 ? 'publish' : 'unpublish';
	628	+ break;
	629	+ }
	630	+ case 'delete.res': {
	631	+ $deleted = getDocumentTv('deleted');
	632	+ $state = $deleted == 0 ? 1 : 0;
	633	+ if($state) {
	634	+ require_once('../../../processors/delete_content.processor.php');
	635	+ } else {
	636	+ require_once('../../../processors/undelete_content.processor.php');
	637	+ }
	638	+ $json['result'] = $state == 1 ? 'delete' : 'undelete';
	639	+ break;
	640	+ }
641	641	}
642	642	if(!empty($json)) $modx->jsonResponse($json);
643	643	}
644	644
645	645	function getDocumentTv($tv) {
646		- global $modx, $_lang;
647		- $modx->setAjaxMode(true);
648		- $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
649		- if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
650		- return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
	646	+ global $modx, $_lang;
	647	+ $modx->setAjaxMode(true);
	648	+ $id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
	649	+ if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
	650	+ return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
651	651	}
652	652	\ No newline at end of file

		@@ -7,11 +7,11 @@ discard block
		block discarded – undo
7	7
8	8	$modx->db->connect();
9	9
10		-if (empty ($modx->config)) {
	10	+if (empty ($modx->config)) {
11	11	$modx->getSettings();
12	12	}
13	13
14		-if (!isset($_SESSION['mgrValidated']) \|\| !isset($_SERVER['HTTP_X_REQUESTED_WITH']) \|\| (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') \|\| ($_SERVER['REQUEST_METHOD'] != 'POST')) {
	14	+if (!isset($_SESSION['mgrValidated']) \|\| !isset($_SERVER['HTTP_X_REQUESTED_WITH']) \|\| (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') \|\| ($_SERVER['REQUEST_METHOD'] != 'POST')) {
15	15	$modx->sendErrorPage();
16	16	}
17	17
		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21
22	22	$_lang = array();
23	23	include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';
24		-if ($modx->config['manager_language'] != 'english') {
	24	+if ($modx->config['manager_language'] != 'english') {
25	25	include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';
26	26	}
27	27	include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';
		@@ -36,12 +36,12 @@ discard block
		block discarded – undo
36	36
37	37	$json = array();
38	38
39		-if (isset($action)) {
40		- switch ($action) {
	39	+if (isset($action)) {
	40	+ switch ($action) {
41	41
42	42	case '1': {
43	43
44		- switch ($frame) {
	44	+ switch ($frame) {
45	45	case 'nodes':
46	46	include_once MODX_MANAGER_PATH . '/frames/nodes.php';
47	47
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55
56	56	$elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';
57	57
58		- if ($elements) {
	58	+ if ($elements) {
59	59	$output = '';
60	60	$items = '';
61	61	$sql = '';
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	$sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';
65	65	$sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;
66	66
67		- switch ($elements) {
	67	+ switch ($elements) {
68	68	case 'element_templates':
69	69	$a = 16;
70	70	$sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	ORDER BY t1.templatename ASC
75	75	' . $sqlLimit);
76	76
77		- if ($modx->hasPermission('new_template')) {
	77	+ if ($modx->hasPermission('new_template')) {
78	78	$output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';
79	79	}
80	80
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	ORDER BY t1.name ASC
91	91	' . $sqlLimit);
92	92
93		- if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
	93	+ if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
94	94	$output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';
95	95	}
96	96
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	ORDER BY t1.name ASC
105	105	' . $sqlLimit);
106	106
107		- if ($modx->hasPermission('new_chunk')) {
	107	+ if ($modx->hasPermission('new_chunk')) {
108	108	$output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';
109	109	}
110	110
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	ORDER BY t1.name ASC
119	119	' . $sqlLimit);
120	120
121		- if ($modx->hasPermission('new_snippet')) {
	121	+ if ($modx->hasPermission('new_snippet')) {
122	122	$output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';
123	123	}
124	124
		@@ -132,19 +132,19 @@ discard block
		block discarded – undo
132	132	ORDER BY t1.name ASC
133	133	' . $sqlLimit);
134	134
135		- if ($modx->hasPermission('new_plugin')) {
	135	+ if ($modx->hasPermission('new_plugin')) {
136	136	$output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';
137	137	}
138	138
139	139	break;
140	140	}
141	141
142		- if ($count = $modx->db->getRecordCount($sql)) {
143		- if ($count == $limit) {
	142	+ if ($count = $modx->db->getRecordCount($sql)) {
	143	+ if ($count == $limit) {
144	144	$output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
145	145	}
146		- while ($row = $modx->db->getRow($sql)) {
147		- if (($row['disabled'] \|\| $row['locked']) && $role != 1) {
	146	+ while ($row = $modx->db->getRow($sql)) {
	147	+ if (($row['disabled'] \|\| $row['locked']) && $role != 1) {
148	148	continue;
149	149	}
150	150
		@@ -152,9 +152,9 @@ discard block
		block discarded – undo
152	152	}
153	153	}
154	154
155		- if (isset($_REQUEST['filter'])) {
	155	+ if (isset($_REQUEST['filter'])) {
156	156	$output = $items;
157		- } else {
	157	+ } else {
158	158	$output .= $items;
159	159	}
160	160
		@@ -179,22 +179,22 @@ discard block
		block discarded – undo
179	179	ORDER BY t1.username ASC
180	180	' . $sqlLimit);
181	181
182		- if ($modx->hasPermission('new_user')) {
	182	+ if ($modx->hasPermission('new_user')) {
183	183	$output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';
184	184	}
185	185
186		- if ($count = $modx->db->getRecordCount($sql)) {
187		- if ($count == $limit) {
	186	+ if ($count = $modx->db->getRecordCount($sql)) {
	187	+ if ($count == $limit) {
188	188	$output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
189	189	}
190		- while ($row = $modx->db->getRow($sql)) {
	190	+ while ($row = $modx->db->getRow($sql)) {
191	191	$items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
192	192	}
193	193	}
194	194
195		- if (isset($_REQUEST['filter'])) {
	195	+ if (isset($_REQUEST['filter'])) {
196	196	$output = $items;
197		- } else {
	197	+ } else {
198	198	$output .= $items;
199	199	}
200	200
		@@ -218,22 +218,22 @@ discard block
		block discarded – undo
218	218	ORDER BY t1.username ASC
219	219	' . $sqlLimit);
220	220
221		- if ($modx->hasPermission('new_web_user')) {
	221	+ if ($modx->hasPermission('new_web_user')) {
222	222	$output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';
223	223	}
224	224
225		- if ($count = $modx->db->getRecordCount($sql)) {
226		- if ($count == $limit) {
	225	+ if ($count = $modx->db->getRecordCount($sql)) {
	226	+ if ($count == $limit) {
227	227	$output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
228	228	}
229		- while ($row = $modx->db->getRow($sql)) {
	229	+ while ($row = $modx->db->getRow($sql)) {
230	230	$items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
231	231	}
232	232	}
233	233
234		- if (isset($_REQUEST['filter'])) {
	234	+ if (isset($_REQUEST['filter'])) {
235	235	$output = $items;
236		- } else {
	236	+ } else {
237	237	$output .= $items;
238	238	}
239	239
		@@ -247,8 +247,8 @@ discard block
		block discarded – undo
247	247	$type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->db->escape($_REQUEST['type']) : false;
248	248	$contextmenu = '';
249	249
250		- if ($role && $name && $type) {
251		- switch ($type) {
	250	+ if ($role && $name && $type) {
	251	+ switch ($type) {
252	252	case 'Snippet':
253	253	case 'SnippetNoCache': {
254	254
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	WHERE name="' . $name . '"
258	258	LIMIT 1');
259	259
260		- if ($modx->db->getRecordCount($sql)) {
	260	+ if ($modx->db->getRecordCount($sql)) {
261	261	$row = $modx->db->getRow($sql);
262	262	$contextmenu = array(
263	263	'header' => array(
		@@ -268,13 +268,13 @@ discard block
		block discarded – undo
268	268	'url' => "index.php?a=22&id=" . $row['id']
269	269	)
270	270	);
271		- if (!empty($row['description'])) {
	271	+ if (!empty($row['description'])) {
272	272	$contextmenu['seperator'] = '';
273	273	$contextmenu['description'] = array(
274	274	'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
275	275	);
276	276	}
277		- } else {
	277	+ } else {
278	278	$contextmenu = array(
279	279	'header' => array(
280	280	'innerHTML' => '<i class="fa fa-code"></i> ' . $name
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	WHERE name="' . $name . '"
296	296	LIMIT 1');
297	297
298		- if ($modx->db->getRecordCount($sql)) {
	298	+ if ($modx->db->getRecordCount($sql)) {
299	299	$row = $modx->db->getRow($sql);
300	300	$contextmenu = array(
301	301	'header' => array(
		@@ -306,13 +306,13 @@ discard block
		block discarded – undo
306	306	'url' => "index.php?a=78&id=" . $row['id']
307	307	)
308	308	);
309		- if (!empty($row['description'])) {
	309	+ if (!empty($row['description'])) {
310	310	$contextmenu['seperator'] = '';
311	311	$contextmenu['description'] = array(
312	312	'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
313	313	);
314	314	}
315		- } else {
	315	+ } else {
316	316	$contextmenu = array(
317	317	'header' => array(
318	318	'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name
		@@ -332,7 +332,7 @@ discard block
		block discarded – undo
332	332	WHERE name="' . $name . '"
333	333	LIMIT 1');
334	334
335		- if ($modx->db->getRecordCount($sql)) {
	335	+ if ($modx->db->getRecordCount($sql)) {
336	336	$row = $modx->db->getRow($sql);
337	337	$contextmenu = array(
338	338	'header' => array(
		@@ -343,20 +343,20 @@ discard block
		block discarded – undo
343	343	'url' => "index.php?a=78&id=" . $row['id']
344	344	)
345	345	);
346		- if (!empty($row['description'])) {
	346	+ if (!empty($row['description'])) {
347	347	$contextmenu['seperator'] = '';
348	348	$contextmenu['description'] = array(
349	349	'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
350	350	);
351	351	}
352		- } else {
	352	+ } else {
353	353
354	354	$sql = $modx->db->query('SELECT *
355	355	FROM ' . $modx->getFullTableName('site_snippets') . '
356	356	WHERE name="' . $name . '"
357	357	LIMIT 1');
358	358
359		- if ($modx->db->getRecordCount($sql)) {
	359	+ if ($modx->db->getRecordCount($sql)) {
360	360	$row = $modx->db->getRow($sql);
361	361	$contextmenu = array(
362	362	'header' => array(
		@@ -367,13 +367,13 @@ discard block
		block discarded – undo
367	367	'url' => "index.php?a=22&id=" . $row['id']
368	368	)
369	369	);
370		- if (!empty($row['description'])) {
	370	+ if (!empty($row['description'])) {
371	371	$contextmenu['seperator'] = '';
372	372	$contextmenu['description'] = array(
373	373	'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
374	374	);
375	375	}
376		- } else {
	376	+ } else {
377	377	$contextmenu = array(
378	378	'header' => array(
379	379	'innerHTML' => '<i class="fa fa-code"></i> ' . $name
		@@ -435,7 +435,7 @@ discard block
		block discarded – undo
435	435	'alias_visible'
436	436	);
437	437
438		- if (in_array($name, $default_field)) {
	438	+ if (in_array($name, $default_field)) {
439	439	return;
440	440	}
441	441
		@@ -444,7 +444,7 @@ discard block
		block discarded – undo
444	444	WHERE name="' . $name . '"
445	445	LIMIT 1');
446	446
447		- if ($modx->db->getRecordCount($sql)) {
	447	+ if ($modx->db->getRecordCount($sql)) {
448	448	$row = $modx->db->getRow($sql);
449	449	$contextmenu = array(
450	450	'header' => array(
		@@ -455,13 +455,13 @@ discard block
		block discarded – undo
455	455	'url' => "index.php?a=301&id=" . $row['id']
456	456	)
457	457	);
458		- if (!empty($row['description'])) {
	458	+ if (!empty($row['description'])) {
459	459	$contextmenu['seperator'] = '';
460	460	$contextmenu['description'] = array(
461	461	'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
462	462	);
463	463	}
464		- } else {
	464	+ } else {
465	465	$contextmenu = array(
466	466	'header' => array(
467	467	'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name
		@@ -484,13 +484,13 @@ discard block
		block discarded – undo
484	484	}
485	485
486	486	case 'movedocument' : {
487		- if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
	487	+ if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
488	488	$id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
489	489	$parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;
490	490	$menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;
491	491
492	492	// set parent
493		- if ($id && $parent >= 0) {
	493	+ if ($id && $parent >= 0) {
494	494
495	495	// find older parent
496	496	$parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
		@@ -501,31 +501,31 @@ discard block
		block discarded – undo
501	501	'new_parent' => $parent,
502	502	]);
503	503
504		- if (is_array($eventOut) && count($eventOut) > 0) {
	504	+ if (is_array($eventOut) && count($eventOut) > 0) {
505	505	$eventParent = array_pop($eventOut);
506	506
507		- if ($eventParent == $parentOld) {
	507	+ if ($eventParent == $parentOld) {
508	508	$json['errors'] = $_lang['error_movedocument2'];
509		- } else {
	509	+ } else {
510	510	$parent = $eventParent;
511	511	}
512	512	}
513	513
514		- if (empty($json['errors'])) {
	514	+ if (empty($json['errors'])) {
515	515	// check privileges user for move docs
516		- if (!empty($modx->config['tree_show_protected']) && $role != 1) {
	516	+ if (!empty($modx->config['tree_show_protected']) && $role != 1) {
517	517	$sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
518		- if ($modx->db->getRecordCount($sql)) {
	518	+ if ($modx->db->getRecordCount($sql)) {
519	519	$document_groups = array();
520		- while ($row = $modx->db->getRow($sql)) {
	520	+ while ($row = $modx->db->getRow($sql)) {
521	521	$document_groups[$row['document']]['groups'][] = $row['document_group'];
522	522	}
523		- foreach ($document_groups as $key => $value) {
524		- if (($key == $parent \|\| $key == $parentOld \|\| $key == $id) && !in_array($role, $value['groups'])) {
	523	+ foreach ($document_groups as $key => $value) {
	524	+ if (($key == $parent \|\| $key == $parentOld \|\| $key == $id) && !in_array($role, $value['groups'])) {
525	525	$json['errors'] = $_lang["error_no_privileges"];
526	526	}
527	527	}
528		- if ($json['errors']) {
	528	+ if ($json['errors']) {
529	529	header('content-type: application/json');
530	530	echo json_encode($json, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE);
531	531	break;
		@@ -533,9 +533,9 @@ discard block
		block discarded – undo
533	533	}
534	534	}
535	535
536		- if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
	536	+ if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
537	537	$json['errors'] = $_lang["error_no_privileges"];
538		- } else {
	538	+ } else {
539	539	// set new parent
540	540	$modx->db->update(array(
541	541	'parent' => $parent
		@@ -545,13 +545,13 @@ discard block
		block discarded – undo
545	545	'isfolder' => 1
546	546	), $modx->getFullTableName('site_content'), 'id=' . $parent);
547	547
548		- if ($parent != $parentOld) {
	548	+ if ($parent != $parentOld) {
549	549	// check children docs and set parent isfolder
550		- if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
	550	+ if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
551	551	$modx->db->update(array(
552	552	'isfolder' => 1
553	553	), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
554		- } else {
	554	+ } else {
555	555	$modx->db->update(array(
556	556	'isfolder' => 0
557	557	), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
		@@ -559,16 +559,16 @@ discard block
		block discarded – undo
559	559	}
560	560
561	561	// set menuindex
562		- if (!empty($menuindex)) {
	562	+ if (!empty($menuindex)) {
563	563	$menuindex = explode(',', $menuindex);
564		- foreach ($menuindex as $key => $value) {
	564	+ foreach ($menuindex as $key => $value) {
565	565	$modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
566	566	}
567		- } else {
	567	+ } else {
568	568	// TODO: max(*) menuindex
569	569	}
570	570
571		- if (!$json['errors']) {
	571	+ if (!$json['errors']) {
572	572	$json['success'] = $_lang["actioncomplete"];
573	573
574	574	$modx->invokeEvent('onAfterMoveDocument', [
		@@ -580,7 +580,7 @@ discard block
		block discarded – undo
580	580	}
581	581	}
582	582	}
583		- } else {
	583	+ } else {
584	584	$json['errors'] = $_lang["error_no_privileges"];
585	585	}
586	586
		@@ -595,7 +595,7 @@ discard block
		block discarded – undo
595	595
596	596	$output = !!$modx->elementIsLocked($type, $id, true);
597	597
598		- if (!$output) {
	598	+ if (!$output) {
599	599	$docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
600	600	$docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
601	601	$sql = '
		@@ -604,7 +604,7 @@ discard block
		block discarded – undo
604	604	LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
605	605	WHERE sc.id=' . $id . ' GROUP BY sc.id';
606	606	$sql = $modx->db->query($sql);
607		- if ($modx->db->getRecordCount($sql)) {
	607	+ if ($modx->db->getRecordCount($sql)) {
608	608	$row = $modx->db->getRow($sql);
609	609	$output = !!$row['locked'];
610	610	}
		@@ -619,9 +619,9 @@ discard block
		block discarded – undo
619	619	case 'publish.res': {
620	620	$published = getDocumentTv('published');
621	621	$state = $published == 0 ? 1 : 0;
622		- if($state) {
	622	+ if($state) {
623	623	require_once('../../../processors/publish_content.processor.php');
624		- } else {
	624	+ } else {
625	625	require_once('../../../processors/unpublish_content.processor.php');
626	626	}
627	627	$json['result'] = $state == 1 ? 'publish' : 'unpublish';
		@@ -630,22 +630,27 @@ discard block
		block discarded – undo
630	630	case 'delete.res': {
631	631	$deleted = getDocumentTv('deleted');
632	632	$state = $deleted == 0 ? 1 : 0;
633		- if($state) {
	633	+ if($state) {
634	634	require_once('../../../processors/delete_content.processor.php');
635		- } else {
	635	+ } else {
636	636	require_once('../../../processors/undelete_content.processor.php');
637	637	}
638	638	$json['result'] = $state == 1 ? 'delete' : 'undelete';
639	639	break;
640	640	}
641	641	}
642		- if(!empty($json)) $modx->jsonResponse($json);
643		-}
	642	+ if(!empty($json)) {
	643	+ $modx->jsonResponse($json);
	644	+ }
	645	+ }
644	646
645		-function getDocumentTv($tv) {
	647	+function getDocumentTv($tv)
	648	+{
646	649	global $modx, $_lang;
647	650	$modx->setAjaxMode(true);
648	651	$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
649		- if($id==0) $modx->webAlertAndQuit($_lang["error_no_id"]);
	652	+ if($id==0) {
	653	+ $modx->webAlertAndQuit($_lang["error_no_id"]);
	654	+ }
650	655	return $modx->db->getValue($modx->db->select($tv, $modx->getFullTableName('site_content'), 'id=' . $id));
651	656	}
652	657	\ No newline at end of file

evolution-cms / evolution

Pull Request — develop (#530)

Status

Category

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

Braces +35 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +226 added lines, -226 removed lines patch added patch discarded remove patch

Spacing +65 added lines, -65 removed lines patch added patch discarded remove patch

Braces +77 added lines, -67 removed lines patch added patch discarded remove patch

Spacing +256 added lines, -256 removed lines patch added patch discarded remove patch

Braces +62 added lines, -29 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +105 added lines, -105 removed lines patch added patch discarded remove patch

Braces +86 added lines, -81 removed lines patch added patch discarded remove patch