evolution-cms / evolution

manager/includes/src/Database.php

Spacing +35 added lines, -35 removed lines

@@ -33,7 +33,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -82,7 +82,7 @@ 
                         $ua = $modx->getPhpCompat()->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
                         $referer = $modx->getPhpCompat()->htmlspecialchars($_SERVER['HTTP_REFERER']);
                         $modx->sendmail(array(
-                            'subject' => 'Missing to create the database connection! from ' . $modx->getPhpCompat()->entities($modx->config['site_name']),
+                            'subject' => 'Missing to create the database connection! from '.$modx->getPhpCompat()->entities($modx->config['site_name']),
                             'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                             'type'    => 'text'
                         ));
@@ -97,8 +97,8 @@ 
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             $this->conn->set_charset($this->getConfig('charset'));
             $this->isConnected = true;
@@ -131,7 +131,7 @@ 
         if (1000 < $safeCount) {
             exit("Too many loops '{$safeCount}'");
         }
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         if (is_array($s)) {
@@ -157,7 +157,7 @@ 
     public function query($sql, $watchError = true)
     {
         $modx = evolutionCMS();
-        if ( ! ($this->conn instanceof mysqli)) {
+        if (!($this->conn instanceof mysqli)) {
             $this->connect();
         }
         $tStart = $modx->getMicroTime();
@@ -177,7 +177,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -191,24 +191,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totalTime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totalTime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries++;
@@ -315,9 +315,9 @@ 
                     if ($value === null || strtolower($value) === 'null') {
                         $f = 'NULL';
                     } else {
-                        $f = "'" . $value . "'";
+                        $f = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $f;
+                    $fields[$key] = "`{$key}` = ".$f;
                 }
                 $fields = implode(',', $fields);
             }
@@ -352,12 +352,12 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     $fromtable = $this->replaceFullTableName($fromtable);
-                    $fields = "(" . implode(",", array_keys($fields)) . ")";
+                    $fields = "(".implode(",", array_keys($fields)).")";
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -451,8 +451,8 @@ 
      */
     public function getInsertId($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -464,8 +464,8 @@ 
      */
     public function getAffectedRows($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -477,8 +477,8 @@ 
      */
     public function getLastError($conn = null)
     {
-        if (! ($conn instanceof mysqli)) {
-            $conn =& $this->conn;
+        if (!($conn instanceof mysqli)) {
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -502,7 +502,7 @@ 
     {
         $out = false;
         if ($ds instanceof mysqli_result) {
-            switch($mode){
+            switch ($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;
@@ -532,7 +532,7 @@ 
     public function getColumn($name, $dsq)
     {
         $col = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -551,7 +551,7 @@ 
     public function getColumnNames($dsq)
     {
         $names = array();
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -571,7 +571,7 @@ 
     public function getValue($dsq)
     {
         $out = false;
-        if ( ! ($dsq instanceof mysqli_result)) {
+        if (!($dsq instanceof mysqli_result)) {
             $dsq = $this->query($dsq);
         }
         if ($dsq) {
@@ -661,8 +661,8 @@ 
 
     public function getTableName($table, $escape = true)
     {
-        $out = $this->getConfig('table_prefix') . $table;
-        return $escape ? '`' . $out . '`' : $out;
+        $out = $this->getConfig('table_prefix').$table;
+        return $escape ? '`'.$out.'`' : $out;
     }
 
     /**
@@ -671,7 +671,7 @@ 
      */
     public function getFullTableName($tbl)
     {
-        return $this->getConfig('dbase') . "." . $this->getTableName($tbl);
+        return $this->getConfig('dbase').".".$this->getTableName($tbl);
     }
 
     /**
@@ -684,7 +684,7 @@ 
         $tableName = trim($tableName);
         $dbase = trim($this->getConfig('dbase'), '`');
         $prefix = $this->getConfig('table_prefix');
-        if ((bool)$force === true) {
+        if ((bool) $force === true) {
             $result = "`{$dbase}`.`{$prefix}{$tableName}`";
         } elseif (strpos($tableName, '[+prefix+]') !== false) {
             $result = preg_replace('@\[\+prefix\+\]([0-9a-zA-Z_]+)@', "`{$dbase}`.`{$prefix}$1`", $tableName);

manager/media/style/default/snippets/welcome/RecentInfo.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 $tpl = '<tr>
     <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>
     <td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]" target="main">[+pagetitle+]</a></td>
-    <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right text-nowrap">[+editedon:math("%s+[(server_offset_time)]"):dateFormat=`'.$modx->toDateFormat(0,'formatOnly').' %H:%M:%S`+]</td>
+    <td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right text-nowrap">[+editedon:math("%s+[(server_offset_time)]"):dateFormat=`'.$modx->toDateFormat(0, 'formatOnly').' %H:%M:%S`+]</td>
     <td data-toggle="collapse" data-target=".collapse[+id+]">[+username+]</td>
     <td style="text-align: right;" class="actions">[+edit_btn+][+preview_btn+][+delete_btn+][+publish_btn+][+info_btn+]</td>
 </tr>

manager/includes/src/Support/MakeTable.php

Spacing +28 added lines, -28 removed lines

@@ -132,7 +132,7 @@ 
      */
     public function setTableWidth($value)
     {
-        $this->tableWidth = (int)$value;
+        $this->tableWidth = (int) $value;
     }
 
     /**
@@ -318,8 +318,8 @@ 
     public function getColumnWidth($columnPosition)
     {
         $currentWidth = '';
-        if (is_array($this->columnWidths) && ! empty($this->columnWidths[$columnPosition])) {
-            $currentWidth = ' width="' . $this->columnWidths[$columnPosition] . '" ';
+        if (is_array($this->columnWidths) && !empty($this->columnWidths[$columnPosition])) {
+            $currentWidth = ' width="'.$this->columnWidths[$columnPosition].'" ';
         }
 
         return $currentWidth;
@@ -348,7 +348,7 @@ 
             $currentClass = $this->rowAlternateClass;
         }
 
-        return ' class="' . $currentClass . '"';
+        return ' class="'.$currentClass.'"';
     }
 
     /**
@@ -362,7 +362,7 @@ 
     {
         $cellAction = '';
         if ($this->cellAction) {
-            $cellAction = ' onClick="javascript:window.location=\'' . $this->cellAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '\'" ';
+            $cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
         }
 
         return $cellAction;
@@ -379,7 +379,7 @@ 
     {
         $cell = $value;
         if ($this->linkAction) {
-            $cell = '<a href="' . $this->linkAction . $this->actionField . '=' . urlencode($currentActionFieldValue) . '">' . $cell . '</a>';
+            $cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
         }
 
         return $cell;
@@ -408,7 +408,7 @@ 
             $end = '?';
         }
 
-        return $link . $end;
+        return $link.$end;
     }
 
     /**
@@ -430,7 +430,7 @@ 
         if (is_array($fieldsArray)) {
             $i = 0;
             foreach ($fieldsArray as $fieldName => $fieldValue) {
-                $table .= "\t<tr" . $this->determineRowClass($i) . ">\n";
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
                 $currentActionFieldValue = get_by_key($fieldValue, $this->actionField, '');
                 if (is_array($this->selectedValues)) {
                     $isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
@@ -441,15 +441,15 @@ 
                 $colPosition = 0;
                 foreach ($fieldValue as $key => $value) {
                     if (!in_array($key, $this->excludeFields)) {
-                        $table .= "\t\t<td" . $this->getCellAction($currentActionFieldValue) . ">";
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
                         $table .= $this->createCellText($currentActionFieldValue, $value);
                         $table .= "</td>\n";
                         if ($i == 0) {
                             if (empty ($header) && $this->formElementType) {
-                                $header .= "\t\t<th style=\"width:32px\" " . ($this->thClass ? 'class="' . $this->thClass . '"' : '') . ">" . ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '') . "</th>\n";
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
                             }
                             $headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
-                            $header .= "\t\t<th" . $this->getColumnWidth($colPosition) . ($this->thClass ? ' class="' . $this->thClass . '" ' : '') . ">" . $headerText . "</th>\n";
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
                         }
                         $colPosition++;
                     }
@@ -457,9 +457,9 @@ 
                 $i++;
                 $table .= "\t</tr>\n";
             }
-            $table = "\n" . '<table' . ($this->tableWidth > 0 ? ' width="' . $this->tableWidth . '"' : '') . ($this->tableClass ? ' class="' . $this->tableClass . '"' : '') . ($this->tableID ? ' id="' . $this->tableID . '"' : '') . ">\n" . ($header ? "\t<thead>\n\t<tr class=\"" . $this->rowHeaderClass . "\">\n" . $header . "\t</tr>\n\t</thead>\n" : '') . $table . "</table>\n";
+            $table = "\n".'<table'.($this->tableWidth > 0 ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
             if ($this->formElementType) {
-                $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
+                $table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
             }
             if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
                 /* commented this part because of cookie
@@ -473,7 +473,7 @@ 
 
                 $table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
                 */
-                $table .= '<div id="pagination" class="paginate">' . $_lang["pagination_table_gotopage"] . '<ul>' . $this->pageNav . '</ul></div>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
                 //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
             }
@@ -482,7 +482,7 @@ 
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
-		myform = document.getElementById("' . $this->formName . '");
+		myform = document.getElementById("' . $this->formName.'");
 		for(i=0;i<myform.length;i++) {
 			if(myform.elements[i].type==\'checkbox\') {
 				myform.elements[i].checked=(toggled?false:true);
@@ -494,9 +494,9 @@ 
             }
             if ($this->formElementType) {
                 if ($this->extra) {
-                    $table .= "\n" . $this->extra . "\n";
+                    $table .= "\n".$this->extra."\n";
                 }
-                $table .= "\n" . '</form>' . "\n";
+                $table .= "\n".'</form>'."\n";
             }
 
             return $table;
@@ -519,7 +519,7 @@ 
         $numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
         $nav = '';
         if ($numPages > 1) {
-            $currentURL = empty($qs) ? '' : '?' . $qs;
+            $currentURL = empty($qs) ? '' : '?'.$qs;
             if ($currentPage > 6) {
                 $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
             }
@@ -544,7 +544,7 @@ 
                 $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
             }
         }
-        $this->pageNav = ' ' . $nav;
+        $this->pageNav = ' '.$nav;
     }
 
     /**
@@ -560,14 +560,14 @@ 
     public function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = '')
     {
         $modx = evolutionCMS();
-        $orderBy = !empty($_GET['orderby']) ? '&orderby=' . $_GET['orderby'] : '';
-        $orderDir = !empty($_GET['orderdir']) ? '&orderdir=' . $_GET['orderdir'] : '';
+        $orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
+        $orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
         if (!empty($qs)) {
             $qs = "?$qs";
         }
         $link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'],
-            $qs . "page=$pageNum$orderBy$orderDir") : $this->prepareLink($link) . "page=$pageNum";
-        $nav = '<li' . ($currentPage ? ' class="currentPage"' : '') . '><a' . ($currentPage ? ' class="currentPage"' : '') . ' href="' . $link . '">' . $displayText . '</a></li>' . "\n";
+            $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
+        $nav = '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 
         return $nav;
     }
@@ -585,7 +585,7 @@ 
         $field = '';
         if ($this->formElementType) {
             $checked = $isChecked ? "checked " : "";
-            $field = "\t\t" . '<td><input type="' . $this->formElementType . '" name="' . ($this->formElementName ? $this->formElementName : $value) . '"  value="' . $value . '" ' . $checked . '/></td>' . "\n";
+            $field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
         }
 
         return $field;
@@ -599,7 +599,7 @@ 
     public function handlePaging()
     {
         $offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-        $limitClause = ' LIMIT ' . ($offset * MAX_DISPLAY_RECORDS_NUM) . ', ' . MAX_DISPLAY_RECORDS_NUM;
+        $limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 
         return $limitClause;
     }
@@ -614,10 +614,10 @@ 
     public function handleSorting($natural_order = false)
     {
         $orderByClause = '';
-        if ((bool)$natural_order === false) {
+        if ((bool) $natural_order === false) {
             $orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
             $orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
-            $orderByClause = !empty($orderby) ? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ' : "";
+            $orderByClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
         }
 
         return $orderByClause;
@@ -646,7 +646,7 @@ 
             }
         }
 
-        return '<a href="[~' . $modx->documentIdentifier . '~]?' . $qs . 'orderby=' . $key . $orderDir . '">' . $text . '</a>';
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
     }
 
 }

manager/actions/mutate_settings/tab7_filebrowser_settings.inc.php

Spacing +64 added lines, -64 removed lines

@@ -6,8 +6,8 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['rb_title']?><br><small>[(use_browser)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('use_browser', 1, 'id="rbRowOn"'));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"'));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('use_browser', 1, 'id="rbRowOn"')); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"')); ?>

     </td>

   </tr>

   <tr>

@@ -18,7 +18,7 @@ 
     <td colspan="2"><div class="split"></div></td>

   </tr>

   

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['which_browser_default_title']?><br><small>[(which_browser)]</small></td>

     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

@@ -27,125 +27,125 @@ 
                 $dir = str_replace('\\', '/', $dir);

                 $browser_name = substr($dir, strrpos($dir, '/') + 1);

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

-                echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

+                echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";

             }

             ?>

         </select>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['which_browser_default_msg']?></td>

   </tr>

   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_webuser_title']?><br><small>[(rb_webuser)]</small></td>

     <td>

-      <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_webuser_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_base_dir_title']?><br><small>[(rb_base_dir)]</small></td>

     <td>

         <?php echo $_lang['default']; ?> <span id="default_rb_base_dir">[(base_path)]assets/</span><br />

         <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_dir" id="rb_base_dir" value="<?php echo $rb_base_dir; ?>" /> <input type="button" onclick="reset_path('rb_base_dir');" value="<?php echo $_lang['reset']; ?>" name="reset_rb_base_dir">

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_base_dir_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_base_url_title']?><br><small>[(rb_base_url)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_url" value="<?php echo $rb_base_url; ?>" />

       </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_base_url_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

       <td nowrap class="warning"><?php echo $_lang['clean_uploaded_filename']?><br><small>[(clean_uploaded_filename)]</small></td>

       <td>

-        <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename=='1' ? 'checked="checked"' : "" ; ?> />

+        <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename == '1' ? 'checked="checked"' : ""; ?> />

         <?php echo $_lang['yes']?></label><br />

-        <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename=='0' ? 'checked="checked"' : "" ; ?> />

+        <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename == '0' ? 'checked="checked"' : ""; ?> />

         <?php echo $_lang['no']?></label>

       </td>

   </tr>

-    <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+    <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

       <td width="200">&nbsp;</td>

-      <td class="comment"><?php echo $_lang['clean_uploaded_filename_message'];?></td>

+      <td class="comment"><?php echo $_lang['clean_uploaded_filename_message']; ?></td>

     </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

   <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['settings_strip_image_paths_title']?><br><small>[(strip_image_paths)]</small></td>

     <td>

-      <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['settings_strip_image_paths_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['maxImageWidth']?><br><small>[(maxImageWidth)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageWidth" value="<?php echo $maxImageWidth; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['maxImageWidth_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['maxImageHeight']?><br><small>[(maxImageHeight)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageHeight" value="<?php echo $maxImageHeight; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['maxImageHeight_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-    <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+    <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

         <td nowrap class="warning"><?php echo $_lang['clientResize']?><br><small>[(clientResize)]</small></td>

         <td>

-            <?php echo wrap_label($_lang['yes'],form_radio('clientResize', 1, ''));?><br />

-            <?php echo wrap_label($_lang['no'], form_radio('clientResize', 0, ''));?>

+            <?php echo wrap_label($_lang['yes'], form_radio('clientResize', 1, '')); ?><br />

+            <?php echo wrap_label($_lang['no'], form_radio('clientResize', 0, '')); ?>

         </td>

     </tr>

     <tr>

@@ -155,11 +155,11 @@ 
     <tr>

         <td colspan="2"><div class="split"></div></td>

     </tr>

-    <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+    <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

         <td nowrap class="warning"><?php echo $_lang['noThumbnailsRecreation']?><br><small>[(noThumbnailsRecreation)]</small></td>

         <td>

-            <?php echo wrap_label($_lang['yes'],form_radio('noThumbnailsRecreation', 1, ''));?><br />

-            <?php echo wrap_label($_lang['no'], form_radio('noThumbnailsRecreation', 0, ''));?>

+            <?php echo wrap_label($_lang['yes'], form_radio('noThumbnailsRecreation', 1, '')); ?><br />

+            <?php echo wrap_label($_lang['no'], form_radio('noThumbnailsRecreation', 0, '')); ?>

         </td>

     </tr>

     <tr>

@@ -170,92 +170,92 @@ 
         <td colspan="2"><div class="split"></div></td>

     </tr>

 

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbWidth']?><br><small>[(thumbWidth)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbWidth" value="<?php echo $thumbWidth; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbWidth_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbHeight']?><br><small>[(thumbHeight)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbHeight" value="<?php echo $thumbHeight; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbHeight_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbsDir']?><br><small>[(thumbsDir)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="thumbsDir" value="<?php echo $thumbsDir; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbsDir_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['jpegQuality']?><br><small>[(jpegQuality)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="jpegQuality" value="<?php echo $jpegQuality; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['jpegQuality_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

        <td nowrap class="warning"><?php echo $_lang['denyZipDownload'] ?><br><small>[(denyZipDownload)]</small></td>

         <td>

-          <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload=='0' ? 'checked="checked"' : ""; ?> />

+          <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload == '0' ? 'checked="checked"' : ""; ?> />

           <?php echo $_lang['no']?></label><br />

-          <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload=='1' ? 'checked="checked"' : ""; ?> />

+          <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload == '1' ? 'checked="checked"' : ""; ?> />

           <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

         <td nowrap class="warning"><?php echo $_lang['denyExtensionRename'] ?><br><small>[(denyExtensionRename)]</small></td>

         <td>

-           <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename=='0' ? 'checked="checked"' : ""; ?> />

+           <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename == '0' ? 'checked="checked"' : ""; ?> />

            <?php echo $_lang['no']?></label><br />

-           <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename=='1' ? 'checked="checked"' : ""; ?> />

+           <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename == '1' ? 'checked="checked"' : ""; ?> />

            <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

        <td nowrap class="warning"><?php echo $_lang['showHiddenFiles'] ?><br><small>[(showHiddenFiles)]</small></td>

        <td>

-         <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles=='0' ? 'checked="checked"' : ""; ?> />

+         <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles == '0' ? 'checked="checked"' : ""; ?> />

          <?php echo $_lang['no']?></label><br />

-         <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles=='1' ? 'checked="checked"' : ""; ?> />

+         <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles == '1' ? 'checked="checked"' : ""; ?> />

          <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

   

@@ -264,7 +264,7 @@ 
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnMiscSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if (is_array($evtOut)) echo implode("", $evtOut);

         ?>

     </td>

   </tr>

manager/media/browser/mcpuk/config.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     'assetsURL'           => rtrim($modx->config['rb_base_url'], '/'),
     'dirPerms'            => intval($modx->config['new_folder_permissions'], 8),
     'filePerms'           => intval($modx->config['new_file_permissions'], 8),
-    'maxfilesize'         => (int)$modx->config['upload_maxsize'],
+    'maxfilesize'         => (int) $modx->config['upload_maxsize'],
     'noThumbnailsRecreation' => $modx->config['noThumbnailsRecreation'],
 
     'access' => array(
@@ -88,7 +88,7 @@ 
 
     // THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION CONFIGURATION
     '_check4htaccess' => false,
-    '_tinyMCEPath'    => MODX_BASE_URL . "assets/plugins/tinymce/tiny_mce",
+    '_tinyMCEPath'    => MODX_BASE_URL."assets/plugins/tinymce/tiny_mce",
 
     '_sessionVar' => &$_SESSION['KCFINDER'],
     //'_sessionLifetime' => 30,

manager/media/browser/mcpuk/core/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -26,19 +26,19 @@ 
 if (empty ($modx->config)) {
     $modx->getSettings();
 }
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
 $_GET['langCode'] = $modx_lang_attribute;
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -62,7 +62,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);

manager/media/browser/mcpuk/core/uploader.php

Spacing +41 added lines, -42 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader{
 
 /** Release version */
     const VERSION = "2.54";
@@ -72,8 +72,8 @@ 
 
 /** Next three properties are got from the current language file
   * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
@@ -104,7 +104,7 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -112,7 +112,7 @@ 
      * uploader constructor.
      * @param DocumentParser $modx
      */
-    public function __construct(DocumentParser $modx) {
+    public function __construct(DocumentParser $modx){
 
         //MODX
         try {
@@ -195,7 +195,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         )
@@ -213,7 +213,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -256,7 +256,7 @@ 
         foreach ($this->langInputNames as $key)
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -290,12 +290,12 @@ 
     /**
      * @return array|bool|int|null|string|void
      */
-    protected function getTransaliasSettings() {
+    protected function getTransaliasSettings(){
 		$modx = evolutionCMS();
 
 		// Cleaning uploaded filename?
 		$setting = $modx->getDatabase()->select('count(*)', $modx->getDatabase()->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->getDatabase()->getValue($setting)>0) {
+		if ($modx->getDatabase()->getValue($setting) > 0) {
 			// Transalias plugin active?
 			$res = $modx->getDatabase()->select('properties', $modx->getDatabase()->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
 			if ($properties = $modx->getDatabase()->getValue($res)) {
@@ -314,7 +314,7 @@ 
      * @param $filename
      * @return mixed|string
      */
-    protected function normalizeFilename($filename) {
+    protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -327,7 +327,7 @@ 
      * @param $dirname
      * @return string
      */
-    protected function normalizeDirname($dirname) {
+    protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
@@ -335,7 +335,7 @@ 
      * @param array|null $aFile
      * @return bool|mixed
      */
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -361,8 +361,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
 
         // HIDDEN FILENAMES CHECK
@@ -397,7 +396,7 @@ 
 
 
 	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
+	$actualfilesize = filesize($file['tmp_name']);
 	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
 	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
@@ -410,7 +409,7 @@ 
      * @param bool $existing
      * @return bool|string
      */
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType = true, $existing = true){
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/")
             $dir = substr($dir, 1);
@@ -441,7 +440,7 @@ 
      * @param $type
      * @return bool
      */
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -470,7 +469,7 @@ 
      * @param $path
      * @return mixed
      */
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
@@ -479,7 +478,7 @@ 
      * @param $path
      * @return string
      */
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
@@ -489,7 +488,7 @@ 
      * @param null $file
      * @return bool
      */
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -577,19 +576,19 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
 		}
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
-        $type = exif_imagetype( $file );
+        $type = exif_imagetype($file);
 
-        switch ( $type ) {
+        switch ($type) {
             case IMAGETYPE_GIF:
-                return $img->output( 'gif', $options );
+                return $img->output('gif', $options);
 
             case IMAGETYPE_PNG:
-                return $img->output( 'png', $options );
+                return $img->output('png', $options);
 
             default:
-                return $img->output( 'jpeg', array_merge( $options, array( 'quality' => $this->config['jpegQuality'] ) ) );
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
 
     }
@@ -599,7 +598,7 @@ 
      * @param bool $overwrite
      * @return bool
      */
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -607,7 +606,7 @@ 
             return true;
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
@@ -630,15 +629,15 @@ 
         if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
             return false;
 
-        if ( $this->imageDriver == 'gd' ) {
-            $width  = imagesx( $img->image );
-            $height = imagesy( $img->image );
-            $back   = image::factory( $this->imageDriver, array( $width, $height ) );
-            $tile   = image::factory( $this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png' );
+        if ($this->imageDriver == 'gd') {
+            $width  = imagesx($img->image);
+            $height = imagesy($img->image);
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
-            imagesettile( $back->image, $tile->image );
-            imagefilledrectangle( $back->image, 0, 0, $width, $height, IMG_COLOR_TILED );
-            imagecopy( $back->image, $img->image, 0, 0, 0, 0, $width, $height );
+            imagesettile($back->image, $tile->image);
+            imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
+            imagecopy($back->image, $img->image, 0, 0, 0, 0, $width, $height);
 
             $img = $back;
         }
@@ -653,7 +652,7 @@ 
     /**
      * @param $langCode
      */
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -673,7 +672,7 @@ 
      * @param array|null $data
      * @return mixed
      */
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data = null){
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data))
             foreach ($data as $key => $val)
@@ -685,7 +684,7 @@ 
      * @param $message
      * @param array|null $data
      */
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data = null){
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
             @unlink($this->file['tmp_name']);
@@ -697,7 +696,7 @@ 
      * @param $url
      * @param string $message
      */
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message = ""){
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
@@ -741,7 +740,7 @@ 
     /**
      * @return string
      */
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

manager/media/browser/mcpuk/core/browser.php

Spacing +32 added lines, -32 removed lines

@@ -42,7 +42,7 @@ 
             $this->get['dir'] = $dir;
         }
 
-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];
+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];
         if ((
                 !is_dir($thumbsDir) &&
                 !@mkdir($thumbsDir, $this->config['dirPerms'])
@@ -114,7 +114,7 @@ 
             $this->session['dir'] = $this->type;
         } else {
             $type = $this->getTypeFromPath($this->session['dir']);
-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
+            $dir = $this->config['uploadDir']."/".$this->session['dir'];
             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
                 $this->session['dir'] = $this->type;
             }
@@ -188,7 +188,7 @@ 
         }
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);
             if (!is_file($file) || !is_readable($file)) {
                 $this->sendDefaultThumb($file);
             }
@@ -227,7 +227,7 @@ 
     protected function act_chDir()
     {
         $this->postDir(); // Just for existing check
-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];
+        $this->session['dir'] = $this->type."/".$this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
 
         return json_encode(array(
@@ -292,12 +292,12 @@ 
         if (substr($newName, 0, 1) == ".") {
             $this->errorMsg("Folder name shouldn't begins with '.'");
         }
-        if (!@rename($dir, dirname($dir) . "/$newName")) {
+        if (!@rename($dir, dirname($dir)."/$newName")) {
             $this->errorMsg("Cannot rename the folder.");
         }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
         if (is_dir($thumbDir)) {
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+            @rename($thumbDir, dirname($thumbDir)."/$newName");
         }
 
         return json_encode(array('name' => $newName));
@@ -375,9 +375,9 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');
         header("Content-Transfer-Encoding:­ binary");
-        header("Content-Length: " . filesize($file));
+        header("Content-Length: ".filesize($file));
         readfile($file);
         die;
     }
@@ -434,7 +434,7 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
         if (file_exists($thumbFile)) {
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+            @rename($thumbFile, "$thumbDir/".basename($newName));
         }
 
         return true;
@@ -514,11 +514,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!@copy($path, "$dir/$base")) {
@@ -578,11 +578,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
@@ -635,7 +635,7 @@ 
             }
             $path = "{$this->config['uploadDir']}/$file";
             $base = basename($file);
-            $filepath = str_replace('/' . $base, '', $path);
+            $filepath = str_replace('/'.$base, '', $path);
             $replace = array('file' => $base);
             if (!is_file($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
@@ -681,15 +681,15 @@ 
         if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
             $this->errorMsg("Unknown error.");
         }
-        $filename = basename($dir) . ".zip";
+        $filename = basename($dir).".zip";
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -723,7 +723,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -736,8 +736,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -766,7 +766,7 @@ 
             if ($type != $this->type) {
                 continue;
             }
-            $file = $this->config['uploadDir'] . "/$file";
+            $file = $this->config['uploadDir']."/$file";
             if (!is_file($file) || !is_readable($file)) {
                 continue;
             }
@@ -774,7 +774,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -787,8 +787,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -824,7 +824,7 @@ 
             return $response;
         }
         $filename = $this->normalizeFilename($file['name']);
-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);
+        $target = "$dir/".file::getInexistantFilename($filename, $dir);
 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&
             !@rename($file['tmp_name'], $target) &&
@@ -890,7 +890,7 @@ 
                 if (is_array($size) && count($size)) {
                     $preview = true;
                     if (!$this->config['noThumbnailsRecreation']) {
-                        $thumb_file = "$thumbDir/" . basename($file);
+                        $thumb_file = "$thumbDir/".basename($file);
                         if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
                             $this->makeThumb($file);
                         }
@@ -907,7 +907,7 @@ 
             }
             $name = basename($file);
             $types = $this->config['types'];
-            $types = explode(' ', $types['images'] . ' ' . $types['image']);
+            $types = explode(' ', $types['images'].' '.$types['image']);
             if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {
                 continue;
             }
@@ -987,7 +987,7 @@ 
     {
         $dir = $this->typeDir;
         if (isset($this->post['dir'])) {
-            $dir .= "/" . $this->post['dir'];
+            $dir .= "/".$this->post['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -1004,7 +1004,7 @@ 
     {
         $dir = $this->typeDir;
         if (isset($this->get['dir'])) {
-            $dir .= "/" . $this->get['dir'];
+            $dir .= "/".$this->get['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");

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,19 +558,19 @@ 
             }
         }
         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)) {
             // check if url has /$base_url
             if (substr($url, 0, strlen(MODX_BASE_URL)) == MODX_BASE_URL) {
                 // append $site_url to make it work with Location:
-                $url = MODX_SITE_URL . substr($url, strlen(MODX_BASE_URL));
+                $url = MODX_SITE_URL.substr($url, strlen(MODX_BASE_URL));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->messageQuit('No newline allowed in redirect url.');
             }
@@ -579,7 +579,7 @@ 
             header($responseCode);
         }
 
-        if(!empty($header)) {
+        if (!empty($header)) {
             header($header);
         }
 
@@ -684,8 +684,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);
@@ -748,8 +748,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;
@@ -769,7 +769,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -914,10 +914,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];
         }
 
@@ -939,7 +939,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 */
@@ -973,7 +973,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -984,9 +984,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;
@@ -994,8 +994,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;
@@ -1143,12 +1143,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
 
@@ -1159,7 +1159,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) {
@@ -1177,7 +1177,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -1185,7 +1185,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);
@@ -1224,17 +1224,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;
         }
 
@@ -1260,7 +1260,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1282,7 +1282,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;
     }
@@ -1315,7 +1315,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'];
@@ -1397,8 +1397,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");
             }
         }
@@ -1440,16 +1440,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);
@@ -1513,8 +1513,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;
     }
@@ -1554,7 +1554,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
@@ -1584,8 +1584,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);
             }
         }
 
@@ -1752,8 +1752,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;
@@ -1806,7 +1806,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);
             }
@@ -1821,8 +1821,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;
@@ -1880,8 +1880,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;
@@ -1905,7 +1905,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);
@@ -1916,7 +1916,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);
@@ -1927,13 +1927,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);
 
@@ -2058,7 +2058,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) {
@@ -2091,8 +2091,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;
@@ -2156,7 +2156,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 {
@@ -2205,7 +2205,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>');
                 }
             }
         }
@@ -2213,7 +2213,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -2251,8 +2251,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;
             }
@@ -2263,8 +2263,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);
             }
         }
 
@@ -2355,7 +2355,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);
         }
@@ -2604,7 +2604,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);
@@ -2630,7 +2630,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);
     }
 
     /**
@@ -2662,7 +2662,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2699,7 +2699,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'];
@@ -2710,7 +2710,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2722,7 +2722,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]];
@@ -2738,7 +2738,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2759,7 +2759,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);
@@ -2771,7 +2771,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']);
@@ -2789,7 +2789,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);
                         }
@@ -2848,7 +2848,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) {
@@ -2884,9 +2884,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(
@@ -2932,7 +2932,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
@@ -2974,7 +2974,7 @@ 
      */
     public function executeParser()
     {
-        if(MODX_CLI) {
+        if (MODX_CLI) {
             throw new \RuntimeException('Call DocumentParser::executeParser on CLI mode');
         }
 
@@ -3020,7 +3020,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 {
@@ -3081,7 +3081,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';
@@ -3138,7 +3138,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'];
     }
@@ -3288,7 +3288,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;
                 }
@@ -3339,15 +3339,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'];
                 }
@@ -3379,7 +3379,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}";
                     }
@@ -3416,7 +3416,7 @@ 
                 $fnc = 'history.back(-1);';
                 break;
             default:
-                $fnc = "window.location.href='" . addslashes($url) . "';";
+                $fnc = "window.location.href='".addslashes($url)."';";
         }
 
         echo "<html><head>
@@ -3448,9 +3448,9 @@ 
         $state = 0;
         $pms = $_SESSION['mgrPermissions'];
         if ($pms) {
-            $state = ((bool)$pms[$pm] === true);
+            $state = ((bool) $pms[$pm] === true);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3463,8 +3463,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;
         }
@@ -3514,7 +3514,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3531,7 +3531,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(
@@ -3554,7 +3554,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}");
 
@@ -3567,7 +3567,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'));
@@ -3651,8 +3651,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;
         }
@@ -3673,8 +3673,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;
         }
@@ -3741,8 +3741,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) {
@@ -3764,8 +3764,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'
                 ));
             }
@@ -3814,7 +3814,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;
         }
@@ -3855,8 +3855,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();
@@ -3900,7 +3900,7 @@ 
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3925,14 +3925,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);
@@ -3962,14 +3962,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);
@@ -4004,16 +4004,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()) {
@@ -4021,7 +4021,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');
@@ -4073,10 +4073,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}'" : '';
@@ -4087,13 +4087,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);
 
@@ -4198,12 +4198,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);
 
@@ -4250,7 +4250,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;
             }
@@ -4277,7 +4277,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);
@@ -4289,10 +4289,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;
@@ -4300,7 +4300,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) {
@@ -4369,7 +4369,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4377,7 +4377,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}";
@@ -4396,7 +4396,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
@@ -4405,9 +4405,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(
@@ -4431,21 +4431,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'] = '';
                     }
@@ -4483,7 +4483,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 : '';
@@ -4505,18 +4505,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
@@ -4620,8 +4620,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, '', '');
 
@@ -5174,7 +5174,7 @@ 
      */
     public function getCachePath()
     {
-        return MODX_BASE_URL . $this->getCacheFolder();
+        return MODX_BASE_URL.$this->getCacheFolder();
     }
 
     /**
@@ -5225,8 +5225,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) {
@@ -5254,8 +5254,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) {
@@ -5300,8 +5300,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);
 
@@ -5327,8 +5327,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";
@@ -5364,7 +5364,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'];
             }
@@ -5392,7 +5392,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) {
@@ -5402,7 +5402,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"],
@@ -5433,8 +5433,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;
@@ -5467,7 +5467,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.'" ' : '').'/>';
         }
     }
 
@@ -5546,7 +5546,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;
@@ -5693,7 +5693,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;
@@ -5721,13 +5721,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 = '';
@@ -5751,7 +5751,7 @@ 
     {
         $property = array();
 
-        if(\is_scalar($propertyString)) {
+        if (\is_scalar($propertyString)) {
             $propertyString = trim($propertyString);
             $propertyString = str_replace('{}', '', $propertyString);
             $propertyString = str_replace('} {', ',', $propertyString);
@@ -5805,7 +5805,7 @@ 
                 }
             }
         }
-        elseif(\is_array($propertyString)) {
+        elseif (\is_array($propertyString)) {
             $property = $propertyString;
         }
         if (!empty($elementName) && !empty($elementType)) {
@@ -5836,7 +5836,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) {
@@ -6003,8 +6003,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) {
@@ -6013,7 +6013,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;
                 }
@@ -6023,7 +6023,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;
             }
@@ -6037,32 +6037,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;
     }
@@ -6137,8 +6137,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;
     }
 
     /**
@@ -6146,7 +6146,7 @@ 
      */
     public function addChunk($name, $text, $namespace = '#')
     {
-        $this->chunkCache[$namespace . $name] = $text;
+        $this->chunkCache[$namespace.$name] = $text;
     }
 
     /**
@@ -6156,7 +6156,7 @@ 
     {
         $out = array();
 
-        if (! is_dir($scanPath) || empty($ext)) {
+        if (!is_dir($scanPath) || empty($ext)) {
             return $out;
         }
         $iterator = new \RecursiveIteratorIterator(
@@ -6168,22 +6168,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;
@@ -6227,7 +6227,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;
@@ -6241,7 +6241,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->getPhpCompat()->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -6259,8 +6259,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;
@@ -6296,7 +6296,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;
@@ -6319,7 +6319,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)) {
@@ -6333,7 +6333,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6442,22 +6442,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(
@@ -6480,13 +6480,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);
@@ -6506,7 +6506,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', ''));
@@ -6516,17 +6516,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);
@@ -6547,7 +6547,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;
@@ -6568,18 +6568,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;
@@ -6612,12 +6612,12 @@ 
         ob_get_clean();
         // 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';
@@ -6652,7 +6652,7 @@ 
             switch (get_by_key($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'];
@@ -6662,7 +6662,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): {
@@ -6674,7 +6674,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): {
@@ -6682,23 +6682,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));
         }
@@ -6739,7 +6739,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;
         }
@@ -6755,7 +6755,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--;
         }
@@ -6859,10 +6859,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;
         }
@@ -6986,7 +6986,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'];
         }