evolution-cms / evolution

manager/includes/manager.lockout.inc.php

Braces +8 added lines, -13 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if($modx->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])) {
 
     $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
@@ -35,8 +35,7 @@ 
     	if(substr($target,0,6)==='@CHUNK') {
     		$target = trim(substr($target,7));
     		$lockout_tpl = $modx->getChunk($target);
-    	}
-    	elseif(substr($target,0,5)==='@FILE') {
+    	} elseif(substr($target,0,5)==='@FILE') {
     		$target = trim(substr($target,6));
     		$lockout_tpl = file_get_contents($target);
     	}
@@ -44,24 +43,20 @@ 
     	$chunk = $modx->getChunk($target);
     	if($chunk!==false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
-    	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
+    	} elseif(is_file(MODX_BASE_PATH . $target)) {
     		$target = MODX_BASE_PATH . $target;
     		$lockout_tpl = file_get_contents($target);
-    	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
-    	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
+    	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
 		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
-	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) {
+// ClipperCMS compatible
     		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
-    	}
-    	else {
+    	} else {
     		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}

manager/includes/config_check.inc.php

Indentation +16 added lines, -16 removed lines

@@ -5,14 +5,14 @@ 
 
 // PROCESSOR FIRST
 if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
-		$current = $modx->getManagerApi()->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
-			$modx->getManagerApi()->setSystemChecksum($current);
-			$modx->clearCache('full');
-			$modx->config['sys_files_checksum'] = $current;
-		};
-	}
+    if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+        $current = $modx->getManagerApi()->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(!empty($current)) {
+            $modx->getManagerApi()->setSystemChecksum($current);
+            $modx->clearCache('full');
+            $modx->config['sys_files_checksum'] = $current;
+        };
+    }
 }
 
 // NOW CHECK CONFIG
@@ -20,15 +20,15 @@ 
 
 $sysfiles_check = $modx->getManagerApi()->checkSystemChecksum();
 if ($sysfiles_check!=='0'){
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_sysfiles_mod']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
 if (is_writable("includes/config.inc.php")){
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_configinc']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_configinc']);
     }
 }
 
@@ -182,10 +182,10 @@ 
             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']);
             break;
         case $_lang['configcheck_lang_difference'] :

Braces +22 added lines, -9 removed lines

@@ -19,12 +19,12 @@ 
 $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) {
       $warningspresent = 1;
@@ -120,7 +120,8 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache()
+    {
         $modx = evolutionCMS();
         $checked= true;
         if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
@@ -159,26 +160,36 @@ 
 
 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++) {
     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"];
@@ -186,7 +197,9 @@ 
 			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'];

manager/includes/footer.inc.php

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
 if(count($SystemAlertMsgQueque) > 0) {
-	include "sysalert.display.inc.php";
+    include "sysalert.display.inc.php";
 }
 ?>
 <script type='text/javascript'>
@@ -19,17 +19,17 @@ 
 </script>
 <?php
 if(in_array($modx->getManagerApi()->action, array(
-	85,
-	27,
-	4,
-	72,
-	13,
-	11,
-	12,
-	87,
-	88
+    85,
+    27,
+    4,
+    72,
+    13,
+    11,
+    12,
+    87,
+    88
 ))) {
-	echo $modx->getManagerApi()->loadDatePicker($modx->config['mgr_date_picker_path']);
+    echo $modx->getManagerApi()->loadDatePicker($modx->config['mgr_date_picker_path']);
 }
 ?>
 </body>

manager/includes/sysalert.display.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-	/**
-	 *	System Alert Message Queue Display file
-	 *	Written By Raymond Irving, April, 2005
-	 *
-	 *	Used to display system alert messages inside the browser
-	 *
-	 */
+    /**
+     *	System Alert Message Queue Display file
+     *	Written By Raymond Irving, April, 2005
+     *
+     *	Used to display system alert messages inside the browser
+     *
+     */
 
-	require_once(dirname(__FILE__).'/protect.inc.php');
+    require_once(dirname(__FILE__).'/protect.inc.php');
 
-	$sysMsgs = "";
-	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
-		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
-	}
-	// reset message queque
-	unset($_SESSION['SystemAlertMsgQueque']);
-	$_SESSION['SystemAlertMsgQueque'] = array();
-	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
+    $sysMsgs = "";
+    $limit = count($SystemAlertMsgQueque);
+    for($i=0;$i<$limit;$i++) {
+        $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
+    }
+    // reset message queque
+    unset($_SESSION['SystemAlertMsgQueque']);
+    $_SESSION['SystemAlertMsgQueque'] = array();
+    $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+    if($sysMsgs!="") {
 ?>
 
 <?php // fetch the styles
-	echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
+    echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
 ?>
 <script type="text/javascript">
 // <![CDATA[
@@ -42,5 +42,5 @@ 
 // ]]>
 </script>
 <?php
-	}
+    }
 ?>

manager/includes/src/Legacy/mgrResources.php

Braces +23 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -21,7 +22,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,7 +32,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
         global $_lang;
         $this->types['site_templates']    = array(
             'title'=>$_lang["manage_templates"],
@@ -68,7 +71,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
         foreach($this->types as $resourceTable=>$type) {
             if($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -81,11 +85,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p) {
+                    if($modx->hasPermission($p)) return true;
+        }
 
         return false;
     }
@@ -95,7 +101,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -112,8 +119,9 @@ 
             $tvsql    = 'site_tmplvars.caption, ';
             $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
             $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        } else {
+            $sttfield = '';
         }
-        else $sttfield = '';
 
         $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -126,7 +134,9 @@ 
         );
         $limit = $modx->getDatabase()->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if($limit < 1) {
+            return false;
+        }
 
         $result = array();
         while ($row = $modx->getDatabase()->getRow($rs)) {
@@ -138,7 +148,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
         foreach($this->items as $type=>$items) {
             foreach((array)$items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
@@ -154,7 +165,7 @@ 
 
         // Now sort by name
         foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

manager/includes/src/Legacy/DeprecatedCore.php

Indentation +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@
 class DeprecatedCore implements DeprecatedCoreInterface
 {
     /**
-    * @deprecated
-    *
-    * return @void
-    */
+     * @deprecated
+     *
+     * return @void
+     */
     public function dbConnect()
     {
         $modx = evolutionCMS();

manager/includes/src/Exceptions/ServiceNotFoundException.php

Braces +3 added lines, -1 removed lines

@@ -2,4 +2,6 @@
 
 use Exception;
 
-class ServiceNotFoundException extends Exception{}
+class ServiceNotFoundException extends Exception
+{
+}

manager/includes/src/Exceptions/ContainerException.php

Braces +3 added lines, -1 removed lines

@@ -2,4 +2,6 @@
 
 use Exception;
 
-class ContainerException extends Exception{}
+class ContainerException extends Exception
+{
+}

manager/includes/src/Core.php

Braces +62 added lines, -31 removed lines

@@ -282,7 +282,8 @@ 
         return $service;
     }
 
-    private function checkServiceAlias($name){
+    private function checkServiceAlias($name)
+    {
         foreach ($this->providerAliases as $alias => $interface) {
             if($name === $interface) {
                 return $alias;
@@ -962,13 +963,15 @@ 
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -976,7 +979,8 @@ 
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -1006,13 +1010,14 @@ 
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -1021,7 +1026,7 @@ 
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1348,7 +1353,8 @@ 
         $where = "pub_date <= {$timeNow} AND pub_date!=0 AND published=0";
         $result_pub = $this->getDatabase()->select( 'id', '[+prefix+]site_content',  $where);
         $this->getDatabase()->update($field, '[+prefix+]site_content', $where);
-        if ($this->getDatabase()->getRecordCount($result_pub) >= 1) { //Event unPublished doc
+        if ($this->getDatabase()->getRecordCount($result_pub) >= 1) {
+//Event unPublished doc
             while ($row_pub = $this->getDatabase()->getRow($result_pub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_pub['id']
@@ -1361,7 +1367,8 @@ 
         $where = "unpub_date <= {$timeNow} AND unpub_date!=0 AND published=1";
         $result_unpub = $this->getDatabase()->select( 'id', '[+prefix+]site_content',  $where);
         $this->getDatabase()->update($field, '[+prefix+]site_content', $where);
-        if ($this->getDatabase()->getRecordCount($result_unpub) >= 1) { //Event unPublished doc
+        if ($this->getDatabase()->getRecordCount($result_unpub) >= 1) {
+//Event unPublished doc
             while ($row_unpub = $this->getDatabase()->getRow($result_unpub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_unpub['id']
@@ -1448,10 +1455,18 @@ 
             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, ']]>');
@@ -1504,7 +1519,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1522,7 +1538,9 @@ 
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1562,7 +1580,10 @@ 
         }
 
         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
@@ -2288,7 +2309,8 @@ 
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2693,7 +2715,8 @@ 
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2726,7 +2749,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]];
@@ -4509,7 +4532,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->getDatabase()->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->getDatabase()->query($sql);
             if ($this->getDatabase()->getRecordCount($result) == 1) {
@@ -5010,7 +5034,7 @@ 
             $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) {
@@ -5485,12 +5509,16 @@ 
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5502,7 +5530,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5522,7 +5551,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5647,7 +5677,8 @@ 
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5793,8 +5824,7 @@ 
                     }
                 }
             }
-        }
-        elseif(\is_array($propertyString)) {
+        } elseif(\is_array($propertyString)) {
             $property = $propertyString;
         }
         if (!empty($elementName) && !empty($elementType)) {
@@ -6241,7 +6271,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6650,7 +6681,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): {