evolution-cms / evolution

manager/includes/functions/processors.php

Spacing +32 added lines, -32 removed lines

@@ -36,7 +36,7 @@ 
     }
 }
 
-if(!function_exists('duplicateDocument')) {
+if (!function_exists('duplicateDocument')) {
     /**
      * @param int $docid
      * @param null|int $parent
@@ -90,12 +90,12 @@ 
             $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('pagetitle', $modx->getDatabase()->getFullTableName('site_content'),
                 "pagetitle LIKE '{$pagetitle} Duplicate%'"));
             if ($count >= 1) {
-                $count = ' ' . ($count + 1);
+                $count = ' '.($count + 1);
             } else {
                 $count = '';
             }
 
-            $content['pagetitle'] = $_lang['duplicated_el_suffix'] . $count . ' ' . $content['pagetitle'];
+            $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
             $content['alias'] = null;
         } elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
             $content['alias'] = null;
@@ -153,7 +153,7 @@ 
     }
 }
 
-if(!function_exists('duplicateTVs')) {
+if (!function_exists('duplicateTVs')) {
     /**
      * Duplicate Document TVs
      *
@@ -166,8 +166,8 @@ 
 
         $tbltvc = $modx->getDatabase()->getFullTableName('site_tmplvar_contentvalues');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->getDatabase()->insert(
             array('contentid' => '', 'tmplvarid' => '', 'value' => ''), $tbltvc, // Insert into
@@ -176,7 +176,7 @@ 
     }
 }
 
-if(!function_exists('duplicateAccess')) {
+if (!function_exists('duplicateAccess')) {
     /**
      * Duplicate Document Access Permissions
      *
@@ -189,8 +189,8 @@ 
 
         $tbldg = $modx->getDatabase()->getFullTableName('document_groups');
 
-        $newid = (int)$newid;
-        $oldid = (int)$oldid;
+        $newid = (int) $newid;
+        $oldid = (int) $oldid;
 
         $modx->getDatabase()->insert(
             array('document' => '', 'document_group' => ''), $tbldg, // Insert into
@@ -199,7 +199,7 @@ 
     }
 }
 
-if(!function_exists('evalModule')) {
+if (!function_exists('evalModule')) {
     /**
      * evalModule
      *
@@ -235,17 +235,17 @@ 
             }
             if ($modx->config['error_reporting'] === '99' || 2 < $error_level) {
                 $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'],
-                    $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
+                    $_SESSION['itemname'].' - Module', $error_info['message'], $error_info['line'], $msg);
                 $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
             }
         }
         unset($modx->event->params);
 
-        return $mod . $msg;
+        return $mod.$msg;
     }
 }
 
-if(!function_exists('allChildren')) {
+if (!function_exists('allChildren')) {
     /**
      * @param int $currDocID
      * @return array
@@ -265,7 +265,7 @@ 
     }
 }
 
-if(!function_exists('jsAlert')) {
+if (!function_exists('jsAlert')) {
     /**
      * show javascript alert
      *
@@ -275,14 +275,14 @@ 
     {
         $modx = evolutionCMS();
         if ($_POST['ajax'] != 1) {
-            echo "<script>window.setTimeout(\"alert('" . addslashes($modx->getDatabase()->escape($msg)) . "')\",10);history.go(-1)</script>";
+            echo "<script>window.setTimeout(\"alert('".addslashes($modx->getDatabase()->escape($msg))."')\",10);history.go(-1)</script>";
         } else {
-            echo $msg . "\n";
+            echo $msg."\n";
         }
     }
 }
 
-if(!function_exists('login')) {
+if (!function_exists('login')) {
     /**
      * @param string $username
      * @param string $givenPassword
@@ -297,7 +297,7 @@ 
     }
 }
 
-if(!function_exists('loginV1')) {
+if (!function_exists('loginV1')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -330,7 +330,7 @@ 
     }
 }
 
-if(!function_exists('loginMD5')) {
+if (!function_exists('loginMD5')) {
     /**
      * @param int $internalKey
      * @param string $givenPassword
@@ -351,7 +351,7 @@ 
     }
 }
 
-if(!function_exists('updateNewHash')) {
+if (!function_exists('updateNewHash')) {
     /**
      * @param string $username
      * @param string $password
@@ -370,7 +370,7 @@ 
     }
 }
 
-if(!function_exists('incrementFailedLoginCount')) {
+if (!function_exists('incrementFailedLoginCount')) {
     /**
      * @param int $internalKey
      * @param int $failedlogins
@@ -397,7 +397,7 @@ 
 
         if ($failedlogins < $failed_allowed) {
             //sleep to help prevent brute force attacks
-            $sleep = (int)$failedlogins / 2;
+            $sleep = (int) $failedlogins / 2;
             if ($sleep > 5) {
                 $sleep = 5;
             }
@@ -410,7 +410,7 @@ 
     }
 }
 
-if(!function_exists('saveUserGroupAccessPermissons')) {
+if (!function_exists('saveUserGroupAccessPermissons')) {
     /**
      * saves module user group access
      */
@@ -441,7 +441,7 @@ 
     }
 }
 
-if(!function_exists('saveEventListeners')) {
+if (!function_exists('saveEventListeners')) {
 # Save Plugin Event Listeners
     function saveEventListeners($id, $sysevents, $mode)
     {
@@ -511,7 +511,7 @@ 
     }
 }
 
-if(!function_exists('getEventIdByName')) {
+if (!function_exists('getEventIdByName')) {
     /**
      * @param string $name
      * @return string|int
@@ -537,7 +537,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateAccess')) {
+if (!function_exists('saveTemplateAccess')) {
     /**
      * @param int $id
      */
@@ -576,7 +576,7 @@ 
     }
 }
 
-if(!function_exists('saveTemplateVarAccess')) {
+if (!function_exists('saveTemplateVarAccess')) {
     /**
      * @return void
      */
@@ -615,7 +615,7 @@ 
     }
 }
 
-if(!function_exists('saveDocumentAccessPermissons')) {
+if (!function_exists('saveDocumentAccessPermissons')) {
     function saveDocumentAccessPermissons()
     {
         global $id, $newid;
@@ -784,10 +784,10 @@ 
         }
 
         foreach ($defaults as $k) {
-            if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+            if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
                 unset($settings[$k]);
             }
-            unset($settings['default_' . $k]);
+            unset($settings['default_'.$k]);
         }
 
         $modx->getDatabase()->delete($tbl_user_settings, "user='{$id}'");
@@ -819,7 +819,7 @@ 
         global $id, $modx;
         $mode = $_POST['mode'];
         $modx->getManagerApi()->saveFormValues($mode);
-        $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode === $action ? "&id={$id}" : ''));
+        $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode === $action ? "&id={$id}" : ''));
     }
 }
 
@@ -835,7 +835,7 @@ 
         global $deltime;
 
         $rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'),
-            "parent='" . (int)$parent . "' AND deleted=1 AND deletedon='" . (int)$deltime . "'");
+            "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
         // the document has children documents, we'll need to delete those too
         while ($row = $modx->getDatabase()->getRow($rs)) {
             $children[] = $row['id'];

manager/includes/functions/nodes.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!function_exists('makeHTML')) {
+if (!function_exists('makeHTML')) {
     /**
      * @param int $indent
      * @param int $parent
@@ -37,14 +37,14 @@ 
             case 'publishedon':
             case 'pub_date':
             case 'unpub_date':
-                $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'],
-                    'sc.' . $_SESSION['tree_sortby']);
+                $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'],
+                    'sc.'.$_SESSION['tree_sortby']);
                 break;
             default:
-                $sortby = 'sc.' . $_SESSION['tree_sortby'];
+                $sortby = 'sc.'.$_SESSION['tree_sortby'];
         };
 
-        $orderby = $modx->getDatabase()->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+        $orderby = $modx->getDatabase()->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
         // Folder sorting gets special setup ;) Add menuindex and pagetitle
         if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -59,11 +59,11 @@ 
             $_SESSION['mgrDocgroups']) : '';
         $showProtected = false;
         if (isset ($modx->config['tree_show_protected'])) {
-            $showProtected = (boolean)$modx->config['tree_show_protected'];
+            $showProtected = (boolean) $modx->config['tree_show_protected'];
         }
-        $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+        $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
         if ($showProtected == false) {
-            $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+            $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
         } else {
             $access = '';
         }
@@ -100,7 +100,7 @@ 
             }
 
             $weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
-            $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+            $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
             // Prepare displaying user-locks
             $lockedByUser = '';
@@ -111,7 +111,7 @@ 
                         'element_type' => $_lang["lock_element_type_7"],
                         'lasthit_df'   => $rowLock['lasthit_df']
                     ));
-                    $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
                 } else {
                     $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                         'element_type' => $_lang["lock_element_type_7"],
@@ -119,9 +119,9 @@ 
                         'lasthit_df'   => $rowLock['lasthit_df']
                     ));
                     if ($modx->hasPermission('remove_locks')) {
-                        $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                        $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                     } else {
-                        $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                        $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                     }
                 }
             }
@@ -130,22 +130,22 @@ 
 
             $title = '';
             if (isDateNode($nodeNameSource)) {
-                $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+                $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
             }
-            $title .= $_lang['id'] . ': ' . $row['id'];
-            $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-            $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-            $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-            $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-            $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-            $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-            $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-            $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-            $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-            $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-            $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= $_lang['id'].': '.$row['id'];
+            $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+            $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+            $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+            $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+            $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+            $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+            $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+            $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+            $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+            $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
             $title = $modx->getPhpCompat()->htmlspecialchars($title);
-            $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+            $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
             $data = array(
                 'id'               => $row['id'],
@@ -229,7 +229,7 @@ 
                 }
 
                 if ($ph['contextmenu']) {
-                    $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                 }
 
                 if ($_SESSION['tree_show_only_folders']) {
@@ -287,7 +287,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -325,7 +325,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -376,7 +376,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -418,7 +418,7 @@ 
                         }
 
                         if ($ph['contextmenu']) {
-                            $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                            $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                         }
 
                         $node .= $modx->parseText($tpl, $ph);
@@ -444,7 +444,7 @@ 
     }
 }
 
-if(!function_exists('getIconInfo')) {
+if (!function_exists('getIconInfo')) {
     /**
      * @param array $_style
      * @return array
@@ -478,7 +478,7 @@ 
     }
 }
 
-if(!function_exists('getNodeTitle')) {
+if (!function_exists('getNodeTitle')) {
     /**
      * @param string $nodeNameSource
      * @param array $row
@@ -499,7 +499,7 @@ 
                         $nodetitle .= $modx->config['friendly_url_suffix'];
                     }
                 }
-                $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+                $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
                 break;
             case 'pagetitle':
                 $nodetitle = $row['pagetitle'];
@@ -533,7 +533,7 @@ 
     }
 }
 
-if(!function_exists('isDateNode')) {
+if (!function_exists('isDateNode')) {
     /**
      * @param string $nodeNameSource
      * @return bool
@@ -553,7 +553,7 @@ 
     }
 }
 
-if(!function_exists('checkIsFolder')) {
+if (!function_exists('checkIsFolder')) {
     /**
      * @param int $parent
      * @param int $isfolder
@@ -563,11 +563,11 @@ 
     {
         $modx = evolutionCMS();
 
-        return (int)$modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM ' . $modx->getDatabase()->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+        return (int) $modx->getDatabase()->getValue($modx->getDatabase()->query('SELECT count(*) FROM '.$modx->getDatabase()->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
     }
 }
 
-if(!function_exists('_htmlentities')) {
+if (!function_exists('_htmlentities')) {
     /**
      * @param mixed $array
      * @return string
@@ -583,7 +583,7 @@ 
     }
 }
 
-if(!function_exists('getTplSingleNode')) {
+if (!function_exists('getTplSingleNode')) {
     /**
      * @return string
      */
@@ -613,7 +613,7 @@ 
     }
 }
 
-if(!function_exists('getTplFolderNode')) {
+if (!function_exists('getTplFolderNode')) {
     /**
      * @return string
      */
@@ -654,7 +654,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
     }
 }
-if(!function_exists('getTplFolderNodeNotChildren')) {
+if (!function_exists('getTplFolderNodeNotChildren')) {
     /**
      * @return string
      */

manager/includes/secure_web_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
     $rs = $modx->getDatabase()->select(
         'DISTINCT sc.id',
-        $modx->getDatabase()->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0"
+        $modx->getDatabase()->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
     );
     $ids = $modx->getDatabase()->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->getDatabase()->update('privateweb = 1', $modx->getDatabase()->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/accesscontrol.inc.php

Spacing +36 added lines, -36 removed lines

@@ -18,13 +18,13 @@ 
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-    include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+    include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
     if (isset($installStartTime)) {
         if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
             unset($installStartTime);
-            @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-            unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+            @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+            unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
         } else {
             if ($_SERVER['REQUEST_METHOD'] != 'POST') {
                 if (isset($_COOKIE[session_name()])) {
@@ -50,7 +50,7 @@ 
                         //						setcookie(session_name(), '', 0, MODX_BASE_URL);
                     }
                     header('HTTP/1.0 307 Redirect');
-                    header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+                    header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
                 }
             }
         }
@@ -62,7 +62,7 @@ 
         // establish fallback to English default
         include_once "lang/english.inc.php";
         // include localized overrides
-        include_once "lang/" . $manager_language . ".inc.php";
+        include_once "lang/".$manager_language.".inc.php";
     } else {
         include_once "lang/english.inc.php";
     }
@@ -70,7 +70,7 @@ 
     $modx->setPlaceholder('modx_charset', $modx_manager_charset);
     $modx->setPlaceholder('theme', $manager_theme);
     $modx->setPlaceholder('favicon',
-        (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+        (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
     // invoke OnManagerLoginFormPrerender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -81,25 +81,25 @@ 
     $modx->setPlaceholder('manager_path', MGR_DIR);
     $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
     $modx->setPlaceholder('login_message', $_lang["login_message"]);
-    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
     $modx->setPlaceholder('year', date('Y'));
 
     // set login logo image
-    if ( !empty($modx->config['login_logo']) ) {
-        $modx->setPlaceholder('login_logo', MODX_SITE_URL . $modx->config['login_logo']);
+    if (!empty($modx->config['login_logo'])) {
+        $modx->setPlaceholder('login_logo', MODX_SITE_URL.$modx->config['login_logo']);
     } else {
-        $modx->setPlaceholder('login_logo', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-logo.png');
+        $modx->setPlaceholder('login_logo', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-logo.png');
     }
 
     // set login background image
-    if ( !empty($modx->config['login_bg']) ) {
-        $modx->setPlaceholder('login_bg', MODX_SITE_URL . $modx->config['login_bg']);
+    if (!empty($modx->config['login_bg'])) {
+        $modx->setPlaceholder('login_bg', MODX_SITE_URL.$modx->config['login_bg']);
     } else {
-        $modx->setPlaceholder('login_bg', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-background.jpg');
+        $modx->setPlaceholder('login_bg', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-background.jpg');
     }
 
     // set form position css class
-    $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']);
+    $modx->setPlaceholder('login_form_position_class', 'loginbox-'.$modx->config['login_form_position']);
 
     switch ($modx->config['manager_theme_mode']) {
       case '1':
@@ -124,11 +124,11 @@ 
         switch ($installGoingOn) {
             case 1 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
             case 2 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
         }
     }
@@ -136,9 +136,9 @@ 
     if ($modx->config['use_captcha'] == 1) {
         $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
         $modx->setPlaceholder('captcha_image',
-            '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'captcha.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
+            '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'captcha.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
         $modx->setPlaceholder('captcha_input',
-            '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+            '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
     }
 
     // login info
@@ -156,7 +156,7 @@ 
 
     // invoke OnManagerLoginFormRender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
     $modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
     // load template
@@ -174,29 +174,29 @@ 
             $login_tpl = file_get_contents($target);
         }
     } else {
-        $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-        if (is_file($theme_path . 'style.php')) {
-            include($theme_path . 'style.php');
+        $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+        if (is_file($theme_path.'style.php')) {
+            include($theme_path.'style.php');
         }
         $chunk = $modx->getChunk($target);
         if ($chunk !== false && !empty($chunk)) {
             $login_tpl = $chunk;
-        } elseif (is_file(MODX_BASE_PATH . $target)) {
-            $target = MODX_BASE_PATH . $target;
+        } elseif (is_file(MODX_BASE_PATH.$target)) {
+            $target = MODX_BASE_PATH.$target;
             $login_tpl = file_get_contents($target);
         } elseif (is_file($target)) {
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'login.tpl')) {
-            $target = $theme_path . 'login.tpl';
+        } elseif (is_file($theme_path.'login.tpl')) {
+            $target = $theme_path.'login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
-            $target = $theme_path . 'templates/actions/login.tpl';
+        } elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+            $target = $theme_path.'templates/actions/login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-            $target = $theme_path . 'html/login.html';
+        } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+            $target = $theme_path.'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {
-            $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+            $target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
             $login_tpl = file_get_contents($target);
         }
     }
@@ -216,17 +216,17 @@ 
     $modx->updateValidatedUserSession();
 
     // Update last action in table active_users
-    $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
+    $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
     $lasthittime = time();
-    $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1;
+    $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
     if ($action !== 1) {
-        if ((int)$itemid <= 0) {
+        if ((int) $itemid <= 0) {
             $itemid = null;
         }
         $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)",
             $modx->getDatabase()->getFullTableName('active_users') // Table
-            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action,
+            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action,
             $itemid == null ? var_export(null, true) : $itemid);
         $modx->getDatabase()->query($sql);
     }

manager/includes/config_check.inc.php

Spacing +41 added lines, -41 removed lines

@@ -1,13 +1,13 @@ 
 <?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.");
 }
 
 // PROCESSOR FIRST
-if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+if ($_SESSION['mgrRole'] == 1) {
+	if ($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
 		$current = $modx->getManagerApi()->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
+		if (!empty($current)) {
 			$modx->getManagerApi()->setSystemChecksum($current);
 			$modx->clearCache('full');
 			$modx->config['sys_files_checksum'] = $current;
@@ -19,14 +19,14 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->getManagerApi()->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check !== '0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
-    if(@fileperms('includes/config.inc.php') & 0x0002) {
+    if (@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_configinc']);
     }
@@ -42,8 +42,8 @@ 
     $warnings[] = array($_lang['configcheck_php_gdzip']);
 }
 
-if(!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
+if (!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
         if ($modx->getDatabase()->getValue($modx->getDatabase()->select('COUNT(setting_value)', $modx->getDatabase()->getFullTableName('system_settings'), "setting_name='validate_referer' AND setting_value='0'"))) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_validate_referer']);
@@ -52,11 +52,11 @@ 
 }
 
 // check for Template Switcher plugin
-if(!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
+if (!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
         $rs = $modx->getDatabase()->select('name, disabled', $modx->getDatabase()->getFullTableName('site_plugins'), "name IN ('TemplateSwitcher', 'Template Switcher', 'templateswitcher', 'template_switcher', 'template switcher') OR plugincode LIKE '%TemplateSwitcher%'");
         $row = $modx->getDatabase()->getRow($rs);
-        if($row && $row['disabled'] == 0) {
+        if ($row && $row['disabled'] == 0) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_templateswitcher_present']);
             $tplName = $row['name'];
@@ -120,36 +120,36 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache(){
         $modx = evolutionCMS();
-        $checked= true;
-        if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
-            $checked= @include_once ($modx->config['base_path'] . 'assets/cache/siteCache.idx.php');
+        $checked = true;
+        if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) {
+            $checked = @include_once ($modx->config['base_path'].'assets/cache/siteCache.idx.php');
         }
         return $checked;
     }
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/cache/")) {
+if (!is_writable(MODX_BASE_PATH."assets/cache/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_cache']);
 }
 
 if (!checkSiteCache()) {
     $warningspresent = 1;
-    $warnings[]= array($lang['configcheck_sitecache_integrity']);
+    $warnings[] = array($lang['configcheck_sitecache_integrity']);
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/images/")) {
+if (!is_writable(MODX_BASE_PATH."assets/images/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_images']);
 }
 
-if(strpos($modx->config['rb_base_dir'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_rb_base_dir']);
 }
-if(strpos($modx->config['filemanager_path'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_filemanager_path']);
 }
@@ -157,36 +157,36 @@ 
 // clear file info cache
 clearstatcache();
 
-if ($warningspresent==1) {
+if ($warningspresent == 1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if (!isset($modx->config['send_errormail'])) $modx->config['send_errormail'] = '3';
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
-for ($i=0;$i<count($warnings);$i++) {
+for ($i = 0; $i < count($warnings); $i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+			$warnings[$i][2] = '<ul><li>'.implode('</li><li>', $sysfiles_check).'</li></ul>';
+			if ($modx->hasPermission('settings')) {
+				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\''.$_lang["reset_sysfiles_checksum_alert"].'\')">'.$_lang["reset_sysfiles_checksum_button"].'</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
@@ -208,18 +208,18 @@ 
             break;
         case $_lang['configcheck_validate_referer'] :
             $msg = $_lang['configcheck_validate_referer_msg'];
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
             $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_templateswitcher_present'] :
             $msg = $_lang["configcheck_templateswitcher_present_msg"];
-            if(isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
+            if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"];
             }
-            if(isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
+            if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"];
             }
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
             $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_rb_base_dir'] :
@@ -232,7 +232,7 @@ 
             $warnings[$i][1] = $_lang['configcheck_default_msg'];
     }
 
-    $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
+    $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : "";
     $config_check_results .= "
             <fieldset>
             <p><strong>".$_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p>
@@ -241,11 +241,11 @@ 
             ".(isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')."
             </fieldset>
 ";
-        if ($i!=count($warnings)-1) {
+        if ($i != count($warnings) - 1) {
             $config_check_results .= "<br />";
         }
     }
-    $_SESSION["mgrConfigCheck"]=true;
+    $_SESSION["mgrConfigCheck"] = true;
 } else {
     $config_check_results = $_lang['configcheck_ok'];
 }

manager/includes/mutate_settings.ajax.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -23,13 +23,13 @@ 
 
 switch (true) {
     case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',
-            $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): {
-        include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php');
+            $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): {
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
         $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)): {
-        $sql = "REPLACE INTO " . $modx->getDatabase()->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');";
+        $sql = "REPLACE INTO ".$modx->getDatabase()->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');";
         $str = "true";
         $modx->getDatabase()->query($sql);
         $emptyCache = true;

manager/includes/extenders/modifiers/mdf_memberof.inc.php

Spacing +9 added lines, -9 removed lines

@@ -2,29 +2,29 @@
 $userID = abs($modx->getLoginUserID('web'));
 $modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
 
-$groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
+$groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if (!is_array($groupNames)) return 0;
 
 // Creates an array with all webgroups the user id is in
 if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID];
 else {
     $from = sprintf(
-        $modx->getDatabase()->getFullTableName('webgroup_names') .
-        " wgn INNER JOIN " .
-        $modx->getDatabase()->getFullTableName('web_groups') .
+        $modx->getDatabase()->getFullTableName('webgroup_names').
+        " wgn INNER JOIN ".
+        $modx->getDatabase()->getFullTableName('web_groups').
         " wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",
 
         $userID
     );
-    $rs = $modx->getDatabase()->select('wgn.name',$from);
-    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name',$rs);
+    $rs = $modx->getDatabase()->select('wgn.name', $from);
+    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name', $rs);
 }
 
 // Check if a supplied group matches a webgroup from the array we just created
-foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
+foreach ($groupNames as $k=>$v) {
+    if (in_array(trim($v), $grpNames)) return 1;
 }
 
 // If we get here the above logic did not find a match, so return false

manager/includes/categories.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     $newCat = $modx->getDatabase()->escape($newCat);
     $cats = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('categories'), "category='{$newCat}'");
     if ($cat = $modx->getDatabase()->getValue($cats)) {
-        return (int)$cat;
+        return (int) $cat;
     }
 
     return 0;

manager/includes/src/Core.php

Spacing +274 added lines, -274 removed lines

@@ -172,7 +172,7 @@ 
         if (empty($services)) {
             $services   = include EVO_SERVICES_FILE;
         }
-        $this->services     =  $services;
+        $this->services = $services;
 
         $this->initialize();
     }
@@ -236,7 +236,7 @@ 
 
     private function checkServiceAlias($name){
         foreach ($this->providerAliases as $alias => $interface) {
-            if($name === $interface) {
+            if ($name === $interface) {
                 return $alias;
             }
         }
@@ -415,8 +415,8 @@ 
         if (isset($this->providerAliases[$name])) {
             if ($this->getConfig('error_reporting', 0) > 1) {
                 trigger_error(
-                    'Property $' . $name . ' is deprecated and should no longer be used. ' .
-                    'Alternative ->getService(' . $this->providerAliases[$name] . '::class)',
+                    'Property $'.$name.' is deprecated and should no longer be used. '.
+                    'Alternative ->getService('.$this->providerAliases[$name].'::class)',
                     E_USER_DEPRECATED
                 );
             }
@@ -452,12 +452,12 @@ 
             $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);
         }
@@ -474,7 +474,7 @@ 
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof Interfaces\DatabaseInterface) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
         return $flag;
     }
@@ -505,7 +505,7 @@ 
             }
             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)) {
@@ -523,7 +523,7 @@ 
     public function getMicroTime()
     {
         list ($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -547,7 +547,7 @@ 
             // 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) {
@@ -558,9 +558,9 @@ 
             }
         }
         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)) {
@@ -568,10 +568,10 @@ 
             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.');
             }
@@ -580,7 +580,7 @@ 
             header($responseCode);
         }
 
-        if(!empty($header)) {
+        if (!empty($header)) {
             header($header);
         }
 
@@ -685,8 +685,8 @@ 
 
     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);
@@ -749,8 +749,8 @@ 
                 $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;
@@ -770,7 +770,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -915,10 +915,10 @@ 
         $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];
         }
 
@@ -940,7 +940,7 @@ 
         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 */
@@ -974,7 +974,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -985,9 +985,9 @@ 
         $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;
@@ -995,8 +995,8 @@ 
                 $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;
@@ -1144,12 +1144,12 @@ 
         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
 
@@ -1160,7 +1160,7 @@ 
         // 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) {
@@ -1178,7 +1178,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -1186,7 +1186,7 @@ 
 
         $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);
@@ -1225,17 +1225,17 @@ 
                 $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;
         }
 
@@ -1261,7 +1261,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1283,7 +1283,7 @@ 
         $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;
     }
@@ -1316,7 +1316,7 @@ 
     {
         $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'];
@@ -1398,8 +1398,8 @@ 
                 }
 
                 $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");
             }
         }
@@ -1441,16 +1441,16 @@ 
             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);
@@ -1514,8 +1514,8 @@ 
                 }
             }
         }
-        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;
     }
@@ -1555,7 +1555,7 @@ 
         }
 
         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
@@ -1585,8 +1585,8 @@ 
 
             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);
             }
         }
 
@@ -1753,8 +1753,8 @@ 
             $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;
@@ -1807,7 +1807,7 @@ 
             }
 
             $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);
             }
@@ -1822,8 +1822,8 @@ 
             $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;
@@ -1881,8 +1881,8 @@ 
             $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;
@@ -1906,7 +1906,7 @@ 
             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);
@@ -1917,7 +1917,7 @@ 
             }
             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);
@@ -1928,13 +1928,13 @@ 
             }
             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);
 
@@ -2059,7 +2059,7 @@ 
         $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) {
@@ -2092,8 +2092,8 @@ 
             $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;
@@ -2157,7 +2157,7 @@ 
                 $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 {
@@ -2206,7 +2206,7 @@ 
                 $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>');
                 }
             }
         }
@@ -2214,7 +2214,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -2252,8 +2252,8 @@ 
                 }
                 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;
             }
@@ -2264,8 +2264,8 @@ 
 
             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);
             }
         }
 
@@ -2356,7 +2356,7 @@ 
             $eventtime = sprintf('%2.2f ms', $eventtime * 1000);
             $code = str_replace("\t", '  ', $this->getPhpCompat()->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->getPhpCompat()->htmlspecialchars($piece));
-            $print_r_params = str_replace("\t", '  ', $this->getPhpCompat()->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+            $print_r_params = str_replace("\t", '  ', $this->getPhpCompat()->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);
         }
@@ -2605,7 +2605,7 @@ 
             );
             $count = $this->getDatabase()->getRecordCount($rs);
             if (1 < $count) {
-                exit('Error $modx->_getSnippetObject()' . $snip_name);
+                exit('Error $modx->_getSnippetObject()'.$snip_name);
             }
             if ($count) {
                 $row = $this->getDatabase()->getRow($rs);
@@ -2631,7 +2631,7 @@ 
     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);
     }
 
     /**
@@ -2663,7 +2663,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2700,7 +2700,7 @@ 
                 preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match);
                 $ids = implode(',', array_unique($match['1']));
                 if ($ids) {
-                    $res = $this->getDatabase()->select("id,alias,isfolder,parent,alias_visible", $this->getDatabase()->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'");
+                    $res = $this->getDatabase()->select("id,alias,isfolder,parent,alias_visible", $this->getDatabase()->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'");
                     while ($row = $this->getDatabase()->getRow($res)) {
                         if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) {
                             $parent = $row['parent'];
@@ -2711,7 +2711,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2723,7 +2723,7 @@ 
             $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]];
@@ -2739,7 +2739,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2760,7 +2760,7 @@ 
         $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);
@@ -2772,7 +2772,7 @@ 
             $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'];
         $url_query_string = explode('?', $_SERVER['REQUEST_URI']);
@@ -2790,7 +2790,7 @@ 
                 }
                 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);
                         }
@@ -2849,7 +2849,7 @@ 
                 $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->getDatabase()->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->getDatabase()->getRecordCount($rs) < 1) {
@@ -2885,9 +2885,9 @@ 
             }
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
-                $rs = $this->getDatabase()->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getDatabase()->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
+                $rs = $this->getDatabase()->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getDatabase()->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->getDatabase()->getRow($rs)) {
                     $tmplvars[$row['name']] = array(
@@ -2933,7 +2933,7 @@ 
                 $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
@@ -2975,7 +2975,7 @@ 
      */
     public function executeParser()
     {
-        if(MODX_CLI) {
+        if (MODX_CLI) {
             throw new \RuntimeException('Call DocumentParser::executeParser on CLI mode');
         }
 
@@ -3021,7 +3021,7 @@ 
 
             // 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 {
@@ -3082,7 +3082,7 @@ 
                 } else {
                     $docAlias = $this->getDatabase()->escape($this->documentIdentifier);
                     $rs = $this->getDatabase()->select('id', $this->getDatabase()->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->getDatabase()->getValue($rs);
+                    $this->documentIdentifier = (int) $this->getDatabase()->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -3139,7 +3139,7 @@ 
                 $_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'];
     }
@@ -3289,7 +3289,7 @@ 
         while ($id && $height--) {
             $thisid = $id;
             if ($this->config['aliaslistingfolder'] == 1) {
-                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->getDatabase()->getValue("SELECT `parent` FROM " . $this->getDatabase()->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1");
+                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->getDatabase()->getValue("SELECT `parent` FROM ".$this->getDatabase()->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1");
                 if (!$id || $id == '0') {
                     break;
                 }
@@ -3340,15 +3340,15 @@ 
 
         if ($this->config['aliaslistingfolder'] == 1) {
 
-            $res = $this->getDatabase()->select("id,alias,isfolder,parent", $this->getDatabase()->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+            $res = $this->getDatabase()->select("id,alias,isfolder,parent", $this->getDatabase()->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->getDatabase()->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'];
                 }
@@ -3380,7 +3380,7 @@ 
                 $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}";
                     }
@@ -3417,7 +3417,7 @@ 
                 $fnc = 'history.back(-1);';
                 break;
             default:
-                $fnc = "window.location.href='" . addslashes($url) . "';";
+                $fnc = "window.location.href='".addslashes($url)."';";
         }
 
         echo "<html><head>
@@ -3449,9 +3449,9 @@ 
         $state = 0;
         $pms = $_SESSION['mgrPermissions'];
         if ($pms) {
-            $state = ((bool)$pms[$pm] === true);
+            $state = ((bool) $pms[$pm] === true);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3464,8 +3464,8 @@ 
      */
     public function elementIsLocked($type, $id, $includeThisUser = false)
     {
-        $id = (int)$id;
-        $type = (int)$type;
+        $id = (int) $id;
+        $type = (int) $type;
         if (!$type || !$id) {
             return null;
         }
@@ -3515,7 +3515,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3532,7 +3532,7 @@ 
             $this->lockedElements = array();
             $this->cleanupExpiredLocks();
 
-            $rs = $this->getDatabase()->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getDatabase()->getFullTableName('active_user_locks') . " ul
+            $rs = $this->getDatabase()->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getDatabase()->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getDatabase()->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->getDatabase()->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3555,7 +3555,7 @@ 
     public function cleanupExpiredLocks()
     {
         // Clean-up active_user_sessions first
-        $timeout = (int)$this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
+        $timeout = (int) $this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
         $validSessionTimeLimit = $this->time - $timeout;
         $this->getDatabase()->delete($this->getDatabase()->getFullTableName('active_user_sessions'), "lasthit < {$validSessionTimeLimit}");
 
@@ -3568,7 +3568,7 @@ 
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->getDatabase()->delete($this->getDatabase()->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})");
         } else {
             $this->getDatabase()->delete($this->getDatabase()->getFullTableName('active_user_locks'));
@@ -3652,8 +3652,8 @@ 
     public function lockElement($type, $id)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id || !$userId) {
             return false;
         }
@@ -3674,8 +3674,8 @@ 
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id) {
             return false;
         }
@@ -3742,8 +3742,8 @@ 
         }
 
         $usertype = $this->isFrontend() ? 1 : 0;
-        $evtid = (int)$evtid;
-        $type = (int)$type;
+        $evtid = (int) $evtid;
+        $type = (int) $type;
 
         // Types: 1 = information, 2 = warning, 3 = error
         if ($type < 1) {
@@ -3765,8 +3765,8 @@ 
         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'
                 ));
             }
@@ -3815,7 +3815,7 @@ 
             $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;
         }
@@ -3856,8 +3856,8 @@ 
             $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->getMail()->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->getMail()->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
         return $this->getMail()->send();
@@ -3901,7 +3901,7 @@ 
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3926,14 +3926,14 @@ 
         $tblsc = $this->getDatabase()->getFullTableName("site_content");
         $tbldg = $this->getDatabase()->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->getDatabase()->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->getDatabase()->makeArray($result);
@@ -3963,14 +3963,14 @@ 
         $tbldg = $this->getDatabase()->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->getDatabase()->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->getDatabase()->makeArray($result);
@@ -4005,16 +4005,16 @@ 
             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()) {
@@ -4022,7 +4022,7 @@ 
         }
 
         // 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->getDatabase()->getFullTableName('site_content');
         $tbldg = $this->getDatabase()->getFullTableName('document_groups');
@@ -4074,10 +4074,10 @@ 
             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}'" : '';
@@ -4088,13 +4088,13 @@ 
                 $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->getDatabase()->getFullTableName('site_content');
             $tbldg = $this->getDatabase()->getFullTableName('document_groups');
 
             $result = $this->getDatabase()->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->getDatabase()->makeArray($result);
 
@@ -4199,12 +4199,12 @@ 
             $tbldg = $this->getDatabase()->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->getDatabase()->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->getDatabase()->getRow($result);
 
@@ -4251,7 +4251,7 @@ 
     {
         if ($this->currentSnippet) {
             $tbl = $this->getDatabase()->getFullTableName("site_snippets");
-            $rs = $this->getDatabase()->select('id', $tbl, "name='" . $this->getDatabase()->escape($this->currentSnippet) . "'", '', 1);
+            $rs = $this->getDatabase()->select('id', $tbl, "name='".$this->getDatabase()->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->getDatabase()->getValue($rs)) {
                 return $snippetId;
             }
@@ -4278,7 +4278,7 @@ 
      */
     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);
@@ -4290,10 +4290,10 @@ 
             $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;
@@ -4301,7 +4301,7 @@ 
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -4370,7 +4370,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4378,7 +4378,7 @@ 
 
                 }
 
-                $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}";
@@ -4397,7 +4397,7 @@ 
             }
 
             //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
@@ -4406,9 +4406,9 @@ 
         }
 
         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(
@@ -4432,21 +4432,21 @@ 
         if (isset($this->aliasListing[$id])) {
             $out = $this->aliasListing[$id];
         } else {
-            $q = $this->getDatabase()->query("SELECT id,alias,isfolder,parent FROM " . $this->getDatabase()->getFullTableName("site_content") . " WHERE id=" . (int)$id);
+            $q = $this->getDatabase()->query("SELECT id,alias,isfolder,parent FROM ".$this->getDatabase()->getFullTableName("site_content")." WHERE id=".(int) $id);
             if ($this->getDatabase()->getRecordCount($q) == '1') {
                 $q = $this->getDatabase()->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'] = '';
                     }
@@ -4484,7 +4484,7 @@ 
         $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 : '';
@@ -4506,18 +4506,18 @@ 
     {
         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->getDatabase()->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getDatabase()->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->getDatabase()->escape($snippetName) . "'  AND ss.disabled=0;";
+            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getDatabase()->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getDatabase()->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->getDatabase()->escape($snippetName)."'  AND ss.disabled=0;";
             $result = $this->getDatabase()->query($sql);
             if ($this->getDatabase()->getRecordCount($result) == 1) {
                 $row = $this->getDatabase()->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
@@ -4621,8 +4621,8 @@ 
             }
             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);
             }
         }
 
@@ -4671,7 +4671,7 @@ 
             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);
@@ -4704,7 +4704,7 @@ 
         if ($mode !== 'formatOnly' && empty($timestamp)) {
             return '-';
         }
-        $timestamp = (int)$timestamp;
+        $timestamp = (int) $timestamp;
 
         switch ($this->config['datetime_format']) {
             case 'YYYY/mm/dd':
@@ -4724,7 +4724,7 @@ 
         }
 
         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') {
@@ -4778,7 +4778,7 @@ 
             $S = 0;
         }
         $timeStamp = mktime($H, $M, $S, $m, $d, $Y);
-        $timeStamp = (int)$timeStamp;
+        $timeStamp = (int) $timeStamp;
         return $timeStamp;
     }
 
@@ -4820,7 +4820,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = implode(',', $_);
@@ -4829,12 +4829,12 @@ 
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.implode(',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 ('" . implode("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".implode("','", $tvidnames)."')";
             }
 
             $this->getUserDocGroups();
@@ -4846,10 +4846,10 @@ 
                 $rs = $this->getDatabase()->select(
                     "{$fields}, IF(tvc.value!='',tvc.value,tv.default_text) as value ",
 
-                    $this->getDatabase()->getFullTableName("site_tmplvars") .
-                    " tv INNER JOIN " . $this->getDatabase()->getFullTableName("site_tmplvar_templates") .
-                    " tvtpl ON tvtpl.tmplvarid = tv.id LEFT JOIN " .
-                    $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues") .
+                    $this->getDatabase()->getFullTableName("site_tmplvars").
+                    " tv INNER JOIN ".$this->getDatabase()->getFullTableName("site_tmplvar_templates").
+                    " tvtpl ON tvtpl.tmplvarid = tv.id LEFT JOIN ".
+                    $this->getDatabase()->getFullTableName("site_tmplvar_contentvalues").
                     " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid='{$docid}'",
 
                     "{$query} AND tvtpl.templateid = '{$doc['template']}'",
@@ -4987,7 +4987,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -5005,23 +5005,23 @@ 
             }
 
             // 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->getDatabase()->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getDatabase()->getFullTableName('site_tmplvars') . " tv
-                    INNER JOIN " . $this->getDatabase()->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-                    LEFT JOIN " . $this->getDatabase()->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->getDatabase()->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getDatabase()->getFullTableName('site_tmplvars')." tv
+                    INNER JOIN " . $this->getDatabase()->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id
+                    LEFT JOIN " . $this->getDatabase()->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->getDatabase()->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if (is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5059,13 +5059,13 @@ 
      */
     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();
             $vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames);
 
-            $docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier;
+            $docid = (int) $docid > 0 ? (int) $docid : $this->documentIdentifier;
             // remove sort for speed
             $result = $this->getTemplateVars($vars, '*', $docid, $published, '', '');
 
@@ -5175,7 +5175,7 @@ 
     public function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -5227,8 +5227,8 @@ 
         $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) {
@@ -5256,8 +5256,8 @@ 
         $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) {
@@ -5302,8 +5302,8 @@ 
             return $this->tmpCache[__FUNCTION__][$uid];
         }
 
-        $from = $this->getDatabase()->getFullTableName('manager_users') . ' mu INNER JOIN ' .
-            $this->getDatabase()->getFullTableName('user_attributes'). ' mua ON mua.internalkey=mu.id';
+        $from = $this->getDatabase()->getFullTableName('manager_users').' mu INNER JOIN '.
+            $this->getDatabase()->getFullTableName('user_attributes').' mua ON mua.internalkey=mu.id';
         $where = sprintf("mu.id='%s'", $this->getDatabase()->escape($uid));
         $rs = $this->getDatabase()->select('mu.username, mu.password, mua.*', $from, $where, '', 1);
 
@@ -5329,8 +5329,8 @@ 
      */
     public function getWebUserInfo($uid)
     {
-        $rs = $this->getDatabase()->select('wu.username, wu.password, wua.*', $this->getDatabase()->getFullTableName("web_users") . " wu
-                INNER JOIN " . $this->getDatabase()->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
+        $rs = $this->getDatabase()->select('wu.username, wu.password, wua.*', $this->getDatabase()->getFullTableName("web_users")." wu
+                INNER JOIN " . $this->getDatabase()->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
         if ($row = $this->getDatabase()->getRow($rs)) {
             if (!isset($row['usertype']) or !$row["usertype"]) {
                 $row["usertype"] = "web";
@@ -5366,7 +5366,7 @@ 
         } else if (is_array($dg)) {
             // resolve ids to names
             $dgn = array();
-            $ds = $this->getDatabase()->select('name', $this->getDatabase()->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
+            $ds = $this->getDatabase()->select('name', $this->getDatabase()->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")");
             while ($row = $this->getDatabase()->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
@@ -5394,7 +5394,7 @@ 
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getDatabase()->getFullTableName("web_users");
-            $ds = $this->getDatabase()->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->getDatabase()->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->getDatabase()->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -5404,7 +5404,7 @@ 
                     } else {
                         $this->getDatabase()->update(array(
                             'password' => $this->getDatabase()->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -5435,8 +5435,8 @@ 
         // check cache
         $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false;
         if (!is_array($grpNames)) {
-            $rs = $this->getDatabase()->select('wgn.name', $this->getDatabase()->getFullTableName("webgroup_names") . " wgn
-                    INNER JOIN " . $this->getDatabase()->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'");
+            $rs = $this->getDatabase()->select('wgn.name', $this->getDatabase()->getFullTableName("webgroup_names")." wgn
+                    INNER JOIN " . $this->getDatabase()->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'");
             $grpNames = $this->getDatabase()->getColumn("name", $rs);
             // save to cache
             $_SESSION['webUserGroupNames'] = $grpNames;
@@ -5469,7 +5469,7 @@ 
         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.'" ' : '').'/>';
         }
     }
 
@@ -5548,7 +5548,7 @@ 
         }
 
         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;
@@ -5695,7 +5695,7 @@ 
                 $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;
@@ -5723,13 +5723,13 @@ 
         $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->getDatabase()->escape($pluginName);
             $result = $this->getDatabase()->select('name, plugincode, properties', $this->getDatabase()->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->getDatabase()->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 = '';
@@ -5753,7 +5753,7 @@ 
     {
         $property = array();
 
-        if(\is_scalar($propertyString)) {
+        if (\is_scalar($propertyString)) {
             $propertyString = trim($propertyString);
             $propertyString = str_replace('{}', '', $propertyString);
             $propertyString = str_replace('} {', ',', $propertyString);
@@ -5807,7 +5807,7 @@ 
                 }
             }
         }
-        elseif(\is_array($propertyString)) {
+        elseif (\is_array($propertyString)) {
             $property = $propertyString;
         }
         if (!empty($elementName) && !empty($elementType)) {
@@ -5838,7 +5838,7 @@ 
     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) {
@@ -6005,8 +6005,8 @@ 
         $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) {
@@ -6015,7 +6015,7 @@ 
                         $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;
                 }
@@ -6025,7 +6025,7 @@ 
                     $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;
             }
@@ -6039,32 +6039,32 @@ 
         );
 
         $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;
     }
@@ -6139,8 +6139,8 @@ 
      */
     public function addSnippet($name, $phpCode, $namespace = '#', array $defaultParams = array())
     {
-        $this->snippetCache[$namespace . $name] = $phpCode;
-        $this->snippetCache[$namespace . $name . 'Props'] = $defaultParams;
+        $this->snippetCache[$namespace.$name] = $phpCode;
+        $this->snippetCache[$namespace.$name.'Props'] = $defaultParams;
     }
 
     /**
@@ -6148,7 +6148,7 @@ 
      */
     public function addChunk($name, $text, $namespace = '#')
     {
-        $this->chunkCache[$namespace . $name] = $text;
+        $this->chunkCache[$namespace.$name] = $text;
     }
 
     /**
@@ -6158,7 +6158,7 @@ 
     {
         $out = array();
 
-        if (! is_dir($scanPath) || empty($ext)) {
+        if (!is_dir($scanPath) || empty($ext)) {
             return $out;
         }
         $iterator = new \RecursiveIteratorIterator(
@@ -6170,22 +6170,22 @@ 
              * @var \SplFileInfo $item
              */
             if ($item->isFile() && $item->isReadable() && \in_array($item->getExtension(), $ext)) {
-                $name = $item->getBasename('.' . $item->getExtension());
+                $name = $item->getBasename('.'.$item->getExtension());
                 $path = ltrim(str_replace(
                     array(rtrim($scanPath, '//'), '/'),
                     array('', '\\'),
-                    $item->getPath() . '/'
+                    $item->getPath().'/'
                 ), '\\');
 
                 if (!empty($path)) {
-                    $name = $path . $name;
+                    $name = $path.$name;
                 }
                 switch ($type) {
                     case 'chunk':
                         $out[$name] = file_get_contents($item->getRealPath());
                         break;
                     case 'snippet':
-                        $out[$name] = "return require '" . $item->getRealPath() . "';";
+                        $out[$name] = "return require '".$item->getRealPath()."';";
                         break;
                     default:
                         throw new \Exception;
@@ -6229,7 +6229,7 @@ 
         }
 
         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->getPhpCompat()->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->messageQuit($title, '', true, '', '', 'Parser', $msg);
             return;
@@ -6243,7 +6243,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->getPhpCompat()->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -6261,8 +6261,8 @@ 
 
         $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;
@@ -6298,7 +6298,7 @@ 
     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;
@@ -6321,7 +6321,7 @@ 
         $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)) {
@@ -6335,7 +6335,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6444,22 +6444,22 @@ 
 
         $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->getPhpCompat()->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']);
         $ua = $this->getPhpCompat()->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']);
         $referer = $this->getPhpCompat()->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(
@@ -6482,13 +6482,13 @@ 
 
         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);
@@ -6508,7 +6508,7 @@ 
         }
 
         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', ''));
@@ -6518,17 +6518,17 @@ 
         $table[] = array('REQUEST_URI', $request_uri);
 
         if ($this->getManagerApi()->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->getManagerApi()->action])) ? " - {$action_list[$this->getManagerApi()->action]}" : '';
 
-            $table[] = array('Manager action', $this->getManagerApi()->action . $actionName);
+            $table[] = array('Manager action', $this->getManagerApi()->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);
@@ -6549,7 +6549,7 @@ 
 
         $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;
@@ -6570,18 +6570,18 @@ 
         $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;
@@ -6613,12 +6613,12 @@ 
 
         // 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';
@@ -6653,7 +6653,7 @@ 
             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'];
@@ -6663,7 +6663,7 @@ 
             $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): {
@@ -6675,7 +6675,7 @@ 
                         break;
                     }
                     case is_scalar($arg): {
-                        $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->getPhpCompat()->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'");
+                        $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->getPhpCompat()->htmlspecialchars(str_replace("'", "\\'", $arg))."'");
                         break;
                     }
                     case is_bool($arg): {
@@ -6683,23 +6683,23 @@ 
                         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));
         }
@@ -6740,7 +6740,7 @@ 
             $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;
         }
@@ -6756,7 +6756,7 @@ 
         $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--;
         }
@@ -6860,10 +6860,10 @@ 
 
         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;
         }
@@ -6987,7 +6987,7 @@ 
             $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'];
         }