evolution-cms / evolution

manager/includes/extenders/message.quit.inc.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
  * Message Quit Template
  *
  */
-if ((! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE!="true") {
+if ((!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) && IN_PARSER_MODE != "true") {
     die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
 }
 
@@ -37,7 +37,7 @@ 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>";
 }
 
-if ($text!='') {
+if ($text != '') {
     $errortype = array(
         E_ERROR          => "Error",
         E_WARNING        => "Warning",
@@ -59,7 +59,7 @@ 
     $parsedMessageString .= "</tr>";
 
     $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Error type/ Nr.: </td>";
-    $parsedMessageString .= "<td colspan='2'>" . $errortype[$nr] . " - $nr</b></td><td>&nbsp;</td>";
+    $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td>&nbsp;</td>";
     $parsedMessageString .= "</tr>";
 
     $parsedMessageString .= "<tr><td>&nbsp;&nbsp;File: </td>";
@@ -69,7 +69,7 @@ 
     $parsedMessageString .= "<tr><td>&nbsp;&nbsp;Line: </td>";
     $parsedMessageString .= "<td colspan='2'>$line</td><td>&nbsp;</td>";
     $parsedMessageString .= "</tr>";
-    if ($source!='') {
+    if ($source != '') {
         $parsedMessageString .= "<tr><td valign='top'>&nbsp;&nbsp;Line $line source: </td>";
         $parsedMessageString .= "<td colspan='2'>$source</td><td>&nbsp;</td>";
         $parsedMessageString .= "</tr>";

manager/includes/tmplvars.format.inc.php

Spacing +27 added lines, -27 removed lines

@@ -21,7 +21,7 @@ 
     $o = '';
 
     // process any TV commands in value
-    $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+    $docid = (int) $docid > 0 ? (int) $docid : $modx->documentIdentifier;
     $value = ProcessTVCommand($value, $name, $docid);
 
     $params = array();
@@ -60,12 +60,12 @@ 
                         $attr['align'] = $params['align'];
                     }
                     foreach ($attr as $k => $v) {
-                        $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                        $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                     }
-                    $attributes .= ' ' . $params['attrib'];
+                    $attributes .= ' '.$params['attrib'];
 
                     // Output the image with attributes
-                    $o .= '<img' . rtrim($attributes) . ' />';
+                    $o .= '<img'.rtrim($attributes).' />';
                 }
             }
             break;
@@ -131,12 +131,12 @@ 
                         'target' => $params['target'],
                     );
                     foreach ($attr as $k => $v) {
-                        $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                        $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                     }
-                    $attributes .= ' ' . $params['attrib']; // add extra
+                    $attributes .= ' '.$params['attrib']; // add extra
 
                     // Output the link
-                    $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+                    $o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
                 }
             }
             break;
@@ -162,12 +162,12 @@ 
                     'style' => $params['style'],
                 );
                 foreach ($attr as $k => $v) {
-                    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
                 }
-                $attributes .= ' ' . $params['attrib']; // add extra
+                $attributes .= ' '.$params['attrib']; // add extra
 
                 // Output the HTML Tag
-                $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+                $o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
             }
             break;
 
@@ -176,7 +176,7 @@ 
             $w = $params['w'] ? $params['w'] : '100%';
             $h = $params['h'] ? $params['h'] : '400px';
             $richtexteditor = $params['edt'] ? $params['edt'] : "";
-            $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+            $o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
             $o .= $modx->htmlspecialchars($value);
             $o .= '</textarea></div>';
             $replace_richtext = array($id);
@@ -203,7 +203,7 @@ 
 
         case "viewport":
             $value = parseInput($value);
-            $id = '_' . time();
+            $id = '_'.time();
             if (!$params['vpid']) {
                 $params['vpid'] = $id;
             }
@@ -217,37 +217,37 @@ 
                 $h = "100%";
             }
             if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-                $autoMode = "3";  //both
+                $autoMode = "3"; //both
             } elseif ($params['awidth'] == 'Yes') {
                 $autoMode = "1"; //width only
             } elseif ($params['aheight'] == 'Yes') {
-                $autoMode = "2";    //height only
+                $autoMode = "2"; //height only
             }
 
-            $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+            $modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
                 'name' => 'viewport',
                 'version' => '0',
                 'plaintext' => false
             ));
-            $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
+            $o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
             if ($params['class']) {
-                $o .= " class='" . $params['class'] . "' ";
+                $o .= " class='".$params['class']."' ";
             }
             if ($params['style']) {
-                $o .= " style='" . $params['style'] . "' ";
+                $o .= " style='".$params['style']."' ";
             }
             if ($params['attrib']) {
-                $o .= $params['attrib'] . " ";
+                $o .= $params['attrib']." ";
             }
-            $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-            $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-            $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+            $o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+            $o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+            $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
             $o .= ">";
             $o .= $eTag;
             break;
 
         case "datagrid":
-            include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+            include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
             $grd = new DataGrid('', $value);
 
             $grd->noRecordMsg = $params['egmsg'];
@@ -294,16 +294,16 @@ 
             $o = '';
             /* If we are loading a file */
             if (substr($params['output'], 0, 5) == "@FILE") {
-                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
+                $file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
                 if (!file_exists($file_name)) {
-                    $widget_output = $file_name . ' does not exist';
+                    $widget_output = $file_name.' does not exist';
                 } else {
                     $widget_output = file_get_contents($file_name);
                 }
             } elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
-                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
+                $file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
                 if (!file_exists($file_name)) {
-                    $widget_output = $file_name . ' does not exist';
+                    $widget_output = $file_name.' does not exist';
                 } else {
                     /* The included file needs to set $widget_output. Can be string, array, object */
                     include $file_name;

Braces +2 added lines, -1 removed lines

@@ -363,7 +363,8 @@
  * @return array|string
  */
 function parseInput($src, $delim = "||", $type = "string", $columns = true)
-{ // type can be: string, array
+{
+// type can be: string, array
     $modx = evolutionCMS();
     if ($modx->db->isResult($src)) {
         // must be a recordset

manager/includes/header.inc.php

Spacing +23 added lines, -23 removed lines

@@ -20,37 +20,37 @@ 
 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

 if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

-    $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

+    $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];

 } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];

 }

 

-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;

 

 if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')

+        && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {

+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');

-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');

+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');

         $css = $minifier->minify();

         file_put_contents(

-            MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',

+            MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',

             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {

+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;

     }

 }

 

@@ -65,7 +65,7 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>

     <link rel="stylesheet" type="text/css" href="<?= $css ?>"/>

     <script type="text/javascript" src="media/script/tabpane.js"></script>

-    <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

+    <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>

     <?php if ($modx->config['show_picker'] != "0") {

     ?>

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"

@@ -82,7 +82,7 @@ 
     } ?>

 

     <!-- OnManagerMainFrameHeaderHTMLBlock -->

-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>

+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>

 

     <script type="text/javascript">

       if (!evo) {

@@ -112,7 +112,7 @@ 
     <script>

         <?php

         if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

-            echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

+            echo 'doRefresh('.$_REQUEST['r'].");\n";

         }

         ?>

     </script>

Braces +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />

     Please use the EVO Content Manager instead of accessing this file directly.");

 }

@@ -10,26 +10,26 @@ 
 $modx_textdir = isset($modx_textdir) ? $modx_textdir : null;

 $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';

 $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr';

-if (!isset($modx->config['mgr_jquery_path'])) {

+if (!isset($modx->config['mgr_jquery_path'])) {
     $modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js';

 }

-if (!isset($modx->config['mgr_date_picker_path'])) {

+if (!isset($modx->config['mgr_date_picker_path'])) {
     $modx->config['mgr_date_picker_path'] = 'media/script/air-datepicker/datepicker.inc.php';

 }

 

 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

+if ($modx->config['manager_theme'] == 'default') {
     if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

         $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

@@ -49,7 +49,7 @@ 
             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

@@ -66,7 +66,7 @@ 
     <link rel="stylesheet" type="text/css" href="<?= $css ?>"/>

     <script type="text/javascript" src="media/script/tabpane.js"></script>

     <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

-    <?php if ($modx->config['show_picker'] != "0") {

+    <?php if ($modx->config['show_picker'] != "0") {
     ?>

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"

                 type="text/javascript"></script>

@@ -74,7 +74,7 @@ 
 } ?>

     <?php

     $aArr = array('2');

-    if (!in_array($_REQUEST['a'], $aArr)) {

+    if (!in_array($_REQUEST['a'], $aArr)) {
         ?>

         <script src="media/script/mootools/mootools.js" type="text/javascript"></script>

         <script src="media/script/mootools/moodx.js" type="text/javascript"></script>

@@ -111,7 +111,7 @@ 
     <script src="media/script/main.js"></script>

     <script>

         <?php

-        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

+        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
             echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

         }

         ?>

manager/includes/log.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -36,16 +36,16 @@ 
         $action = "",
         $itemid = "",
         $itemname = ""
-    ) {
+    ){
         $modx = evolutionCMS();
         $this->entry['msg'] = $msg; // writes testmessage to the object
-        $this->entry['action'] = empty($action) ? $modx->manager->action : $action;    // writes the action to the object
+        $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object
 
         // User Credentials
         $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey;
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
-        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
+        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object
         if ($this->entry['itemId'] == 0) {
             $this->entry['itemId'] = "-";
         } // to stop items having id 0
@@ -96,10 +96,10 @@ 
             
         $insert_id = $modx->db->insert($fields, $tbl_manager_log);
         if (!$insert_id) {
-            $modx->messageQuit("Logging error: couldn't save log to table! Error code: " . $modx->db->getLastError());
+            $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError());
         } else {
-            $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000;
-            $trim = (isset($modx->config['manager_log_trim'])) ? (int)$modx->config['manager_log_trim'] : 100;
+            $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000;
+            $trim = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100;
             if (($insert_id % $trim) === 0) {
                 $modx->rotate_log('manager_log', $limit, $trim);
             }
@@ -109,7 +109,7 @@ 
     private function getUserIP()
     {
         if (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) && !empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-            if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',')>0) {
+            if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',') > 0) {
                 $addr = explode(",", $_SERVER['HTTP_X_FORWARDED_FOR']);
                 return trim($addr[0]);
             } else {

manager/includes/debug.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // show debug information
-if (isset($enable_debug) && $enable_debug==true) {
+if (isset($enable_debug) && $enable_debug == true) {
     ?>
 	<script language="javascript">
 	//document.onload = removeDebug();

manager/includes/veriword.php

Spacing +13 added lines, -13 removed lines

@@ -53,11 +53,11 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80)
+    public function __construct($w = 200, $h = 80)
     {
         /* create session to set word for verification */
         $this->set_veriword();
-        $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
+        $this->dir_font = dirname(__FILE__).'/'.$this->dir_font;
         $this->im_width         = $w;
         $this->im_height        = $h;
     }
@@ -82,12 +82,12 @@ 
     {
         $modx = evolutionCMS();
         // set default words
-        $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
+        $words = "MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
 
         /* pick one randomly for text verification */
-        return (string) $arr_words[array_rand($arr_words)] . rand(10, 999);
+        return (string) $arr_words[array_rand($arr_words)].rand(10, 999);
     }
 
     public function draw_text()
@@ -96,7 +96,7 @@ 
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
             if (substr($file, -4) == '.ttf') {
-                $fontstmp[] = $this->dir_font . $file;
+                $fontstmp[] = $this->dir_font.$file;
             }
         }
         $dir->close();
@@ -108,20 +108,20 @@ 
         $text_size  = 30;
         /* calculate text width and height */
         $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* adjust text size */
-        $text_size  = round((20 * $this->im_width)/$text_width);
+        $text_size  = round((20 * $this->im_width) / $text_width);
 
         /* recalculate text width and height */
         $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* calculate center position of text */
-        $text_x         = ($this->im_width - $text_width)/2;
-        $text_y         = ($this->im_height - $text_height)/2;
+        $text_x         = ($this->im_width - $text_width) / 2;
+        $text_y         = ($this->im_height - $text_height) / 2;
 
         /* create canvas for text drawing */
         $im_text        = imagecreate($this->im_width, $this->im_height);
@@ -150,7 +150,7 @@ 
     {
 
         /* pick one background image randomly from image directory */
-        $img_file       = $this->dir_noise . "noise" . rand(1, 4) . ".jpg";
+        $img_file       = $this->dir_noise."noise".rand(1, 4).".jpg";
 
         /* create "noise" background image from your image stock*/
         $noise_img      = @imagecreatefromjpeg($img_file);

manager/includes/actionlist.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -139,7 +139,7 @@ 
  * @param string $itemid
  * @return string
  */
-function getAction($actionId, $itemid='')
+function getAction($actionId, $itemid = '')
 {
     global $action_list;
 

manager/includes/footer.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 global $SystemAlertMsgQueque;

manager/includes/manager.lockout.inc.php

Spacing +20 added lines, -20 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if ($modx->manager->action!='8' && isset($_SESSION['mgrValidated'])) {
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
-    $logouturl = MODX_MANAGER_URL . 'index.php?a=8';
+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
+    $logouturl = MODX_MANAGER_URL.'index.php?a=8';
 
     $modx->setPlaceholder('modx_charset', $modx_manager_charset);
     $modx->setPlaceholder('theme', $manager_theme);
@@ -18,51 +18,51 @@ 
     $modx->setPlaceholder('homeurl', $homeurl);
     $modx->setPlaceholder('logout', $_lang["logout"]);
     $modx->setPlaceholder('logouturl', $logouturl);
-    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
     $modx->setPlaceholder('year', date('Y'));
 
     // load template
     if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+        $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
     $target = $modx->mergeSettingsContent($target);
 
-    if (substr($target, 0, 1)==='@') {
-        if (substr($target, 0, 6)==='@CHUNK') {
+    if (substr($target, 0, 1) === '@') {
+        if (substr($target, 0, 6) === '@CHUNK') {
             $target = trim(substr($target, 7));
             $lockout_tpl = $modx->getChunk($target);
-        } elseif (substr($target, 0, 5)==='@FILE') {
+        } elseif (substr($target, 0, 5) === '@FILE') {
             $target = trim(substr($target, 6));
             $lockout_tpl = file_get_contents($target);
         }
     } else {
         $chunk = $modx->getChunk($target);
-        if ($chunk!==false && !empty($chunk)) {
+        if ($chunk !== false && !empty($chunk)) {
             $lockout_tpl = $chunk;
-        } elseif (is_file(MODX_BASE_PATH . $target)) {
-            $target = MODX_BASE_PATH . $target;
+        } elseif (is_file(MODX_BASE_PATH.$target)) {
+            $target = MODX_BASE_PATH.$target;
             $lockout_tpl = file_get_contents($target);
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+        } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
+            $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
             $lockout_tpl = file_get_contents($target);
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+        } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
+            $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-            $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+        } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
+            $target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
             $lockout_tpl = file_get_contents($target);
         } else {
-            $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+            $target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
             $lockout_tpl = file_get_contents($target);
         }
     }
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
-    $regx = strpos($lockout_tpl, '[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
 
     echo $lockout_tpl;

Braces +2 added lines, -1 removed lines

@@ -51,7 +51,8 @@
         } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
             $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
+        } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) {
+// ClipperCMS compatible
             $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
             $lockout_tpl = file_get_contents($target);
         } else {