evolution-cms / evolution

manager/includes/extenders/deprecated.functions.inc.php

Spacing +54 added lines, -54 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions{
 
-    function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    function dbConnect(){global $modx; $modx->db->connect(); $modx->rs = $modx->db->conn; }
+    function dbQuery($sql){global $modx; return $modx->db->query($sql); }
+    function recordCount($rs){global $modx; return $modx->db->getRecordCount($rs); }
+    function fetchRow($rs, $mode = 'assoc'){global $modx; return $modx->db->getRow($rs, $mode); }
+    function affectedRows($rs){global $modx; return $modx->db->getAffectedRows($rs); }
+    function insertId($rs){global $modx; return $modx->db->getInsertId($rs); }
+    function dbClose(){global $modx; $modx->db->disconnect(); }
 
-    function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    function makeList($array, $ulroot = 'root', $ulprefix = 'sub_', $type = '', $ordered = false, $tablevel = 0){
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
         }
         if (!empty ($type)) {
-            $typestr= " style='list-style-type: $type'";
+            $typestr = " style='list-style-type: $type'";
         } else {
-            $typestr= "";
+            $typestr = "";
         }
-        $tabs= "";
-        for ($i= 0; $i < $tablevel; $i++) {
+        $tabs = "";
+        for ($i = 0; $i < $tablevel; $i++) {
             $tabs .= "\t";
         }
-        $listhtml= $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n";
+        $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n";
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t</li>\n";
+                $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix, $type, $ordered, $tablevel + 2).$tabs."\t</li>\n";
             } else {
-                $listhtml .= $tabs . "\t<li>" . $value . "</li>\n";
+                $listhtml .= $tabs."\t<li>".$value."</li>\n";
             }
         }
-        $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n";
+        $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n";
         return $listhtml;
     }
 
 
-    function getUserData() {
+    function getUserData(){
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,80 +45,80 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    function insideManager() {
-        $m= false;
-        if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
-            $m= true;
+    function insideManager(){
+        $m = false;
+        if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
+            $m = true;
             if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
+                $m = "interact";
             else
                 if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+                    $m = "install";
         }
         return $m;
     }
 
     // deprecated
-    function putChunk($chunkName) { // alias name >.<
+    function putChunk($chunkName){ // alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    function getDocGroups() {
+    function getDocGroups(){
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    function changePassword($o, $n) {
+    function changePassword($o, $n){
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    function userLoggedIn() {
+    function userLoggedIn(){
     	global $modx;
-        $userdetails= array ();
+        $userdetails = array();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
-            $userdetails['loggedIn']= true;
-            $userdetails['id']= $_SESSION['webInternalKey'];
-            $userdetails['username']= $_SESSION['webShortname'];
-            $userdetails['usertype']= 'web'; // added by Raymond
+            $userdetails['loggedIn'] = true;
+            $userdetails['id'] = $_SESSION['webInternalKey'];
+            $userdetails['username'] = $_SESSION['webShortname'];
+            $userdetails['usertype'] = 'web'; // added by Raymond
             return $userdetails;
         } else
             if ($modx->isBackend() && isset ($_SESSION['mgrValidated'])) {
                 // manager user
-                $userdetails['loggedIn']= true;
-                $userdetails['id']= $_SESSION['mgrInternalKey'];
-                $userdetails['username']= $_SESSION['mgrShortname'];
-                $userdetails['usertype']= 'manager'; // added by Raymond
+                $userdetails['loggedIn'] = true;
+                $userdetails['id'] = $_SESSION['mgrInternalKey'];
+                $userdetails['username'] = $_SESSION['mgrShortname'];
+                $userdetails['usertype'] = 'manager'; // added by Raymond
                 return $userdetails;
             } else {
                 return false;
             }
     }
 
-    function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    function getFormVars($method = "", $prefix = "", $trim = "", $REQUEST_METHOD){
         //  function to retrieve form results into an associative array
     	global $modx;
-        $results= array ();
-        $method= strtoupper($method);
+        $results = array();
+        $method = strtoupper($method);
         if ($method == "")
-            $method= $REQUEST_METHOD;
+            $method = $REQUEST_METHOD;
         if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
+            $method = & $_POST;
+        elseif ($method == "GET") $method = & $_GET;
         else
             return false;
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
                 if ($trim) {
-                    $pieces= explode($prefix, $key, 2);
-                    $key= $pieces[1];
-                    $results[$key]= $value;
+                    $pieces = explode($prefix, $key, 2);
+                    $key = $pieces[1];
+                    $results[$key] = $value;
                 } else
-                    $results[$key]= $value;
+                    $results[$key] = $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
+            elseif ($prefix == "") $results[$key] = $value;
         }
         return $results;
     }
@@ -129,16 +129,16 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    function webAlert($msg, $url= "") {
+    function webAlert($msg, $url = ""){
     	global $modx;
-        $msg= addslashes($modx->db->escape($msg));
+        $msg = addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
-            $act= "__WebAlert();";
-            $fnc= "function __WebAlert(){" . substr($url, 11) . "};";
+            $act = "__WebAlert();";
+            $fnc = "function __WebAlert(){".substr($url, 11)."};";
         } else {
-            $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
+            $act = ($url ? "window.location.href='".addslashes($url)."';" : "");
         }
-        $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
+        $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
         if ($modx->isFrontend())
             $modx->regClientScript($html);
         else {

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

Spacing +6 added lines, -6 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.");
 }
 
@@ -20,7 +20,7 @@ 
 </script>
 </head><body>
 ";
-if($is_error) {
+if ($is_error) {
 	$parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'>&nbsp;MODX Parse Error </h3>
 	<table border='0' cellpadding='1' cellspacing='0'>
 	<tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr>
@@ -32,14 +32,14 @@ 
 	<tr><td colspan='3'><b style='color:#003399;'>&laquo; $msg &raquo;</b></td></tr>";
 }
 
-if(!empty($query)) {
+if (!empty($query)) {
 	$parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SQL:&nbsp;<span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/>
 	&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 (
+	$errortype = array(
 		E_ERROR          => "Error",
 		E_WARNING        => "Warning",
 		E_PARSE          => "Parsing Error",
@@ -70,7 +70,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/extenders/modxmailer.class.inc.php

Spacing +19 added lines, -19 removed lines

@@ -11,9 +11,9 @@ 
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php';
 
 /**
  * Class MODxMailer
@@ -31,7 +31,7 @@ 
     public function init(\DocumentParser $modx)
     {
         $this->modx = $modx;
-        $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/';
+        $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/';
 
         switch ($modx->config['email_method']) {
             case 'smtp':
@@ -95,7 +95,7 @@ 
             mb_language($this->mb_language);
             mb_internal_encoding($modx->config['modx_charset']);
         }
-        $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php';
+        $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php';
         if (is_file($exconf)) {
             include($exconf);
         }
@@ -163,12 +163,12 @@ 
         }
 
         if ($this->modx->debug) {
-            $debug_info = 'CharSet = ' . $this->CharSet . "\n";
-            $debug_info .= 'Encoding = ' . $this->Encoding . "\n";
-            $debug_info .= 'mb_language = ' . $this->mb_language . "\n";
-            $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n";
+            $debug_info = 'CharSet = '.$this->CharSet."\n";
+            $debug_info .= 'Encoding = '.$this->Encoding."\n";
+            $debug_info .= 'mb_language = '.$this->mb_language."\n";
+            $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n";
             $debug_info .= "send_mode = {$mode}\n";
-            $debug_info .= 'Subject = ' . $this->Subject . "\n";
+            $debug_info .= 'Subject = '.$this->Subject."\n";
             $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>";
             $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information');
 
@@ -232,7 +232,7 @@ 
             ini_set('sendmail_from', $old_from);
         }
         if (!$rt) {
-            $msg = $this->Lang('instantiate') . "<br />\n";
+            $msg = $this->Lang('instantiate')."<br />\n";
             $msg .= "{$this->Subject}<br />\n";
             $msg .= "{$this->FromName}&lt;{$this->From}&gt;<br />\n";
             $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet);
@@ -251,7 +251,7 @@ 
      */
     public function SetError($msg)
     {
-        $msg .= '<pre>' . print_r(get_object_vars($this), true) . '</pre>';
+        $msg .= '<pre>'.print_r(get_object_vars($this), true).'</pre>';
         $this->modx->config['send_errormail'] = '0';
         $this->modx->logEvent(0, 3, $msg, 'phpmailer');
 
@@ -280,14 +280,14 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader(){
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody(){
         return $this->MIMEBody;
     }
 
@@ -296,7 +296,7 @@ 
      *
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = ''){
         $this->MIMEHeader = $header;
 
         return $this;
@@ -307,7 +307,7 @@ 
      *
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = ''){
         $this->MIMEBody = $body;
 
         return $this;
@@ -318,7 +318,7 @@ 
      *
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = ''){
         $this->mailHeader = $header;
 
         return $this;
@@ -327,7 +327,7 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
-        return trim($this->lastMessageID,'<>');
+    public function getMessageID(){
+        return trim($this->lastMessageID, '<>');
     }
 }

manager/includes/mutate_settings.ajax.php

Spacing +7 added lines, -7 removed lines

@@ -3,11 +3,11 @@ 
  * mutate_settings.ajax.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.");
 }
 
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -22,10 +22,10 @@ 
 $str = '';
 $emptyCache = false;
 
-switch(true){
-    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',$lang) && file_exists(dirname(__FILE__) . '/lang/'.$lang.'.inc.php')):{
-        include(dirname(__FILE__) . '/lang/'.$lang.'.inc.php');
-        $str = isset($key,$_lang,$_lang[$key]) ? $_lang[$key] : "" ;
+switch (true) {
+    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/', $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')):{
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
+        $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)):{
@@ -52,7 +52,7 @@ 
     }
 }
 
-if($emptyCache) {
+if ($emptyCache) {
 	$modx->clearCache('full');
 }
 

manager/includes/config_check.inc.php

Spacing +41 added lines, -41 removed lines

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

manager/includes/active_user_locks.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.");
 }
 
@@ -18,7 +18,7 @@ 
         var stay = document.getElementById('stay');
         // Trigger unlock
         if ((stay && stay.value !== '2') || !form_save) {
-          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType;?>&id=<?php echo $lockElementId;?>&o=' + Math.random();
+          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType; ?>&id=<?php echo $lockElementId; ?>&o=' + Math.random();
           if (navigator.sendBeacon) {
             navigator.sendBeacon(url)
           } else {

manager/includes/messageCount.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.");
 }
 

manager/includes/protect.inc.php

Spacing +12 added lines, -12 removed lines

@@ -10,13 +10,13 @@ 
     die();
 
 global $sanitize_seed;
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__),16,36);
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
 
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {
-    function modx_sanitize_gpc(& $values, $depth=0) {
-        if(200 < $depth) exit('GPC Array nested too deep!');
-        if(is_array($values)) {
+    function modx_sanitize_gpc(& $values, $depth = 0){
+        if (200 < $depth) exit('GPC Array nested too deep!');
+        if (is_array($values)) {
             $depth++;
             foreach ($values as $key => $value) {
                 if (is_array($value)) modx_sanitize_gpc($value, $depth);
@@ -29,16 +29,16 @@ 
     }
 }
 
-function getSanitizedValue($value='') {
+function getSanitizedValue($value = ''){
     global $sanitize_seed;
 
-    if(!$value) return $value;
+    if (!$value) return $value;
 
     $brackets = explode(' ', '[[ ]] [! !] [* *] [( )] {{ }} [+ +] [~ ~] [^ ^]');
-    foreach($brackets as $bracket) {
-        if(strpos($value,$bracket)===false) continue;
-        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket,0,1), substr($bracket,1,1)));
-        $value = str_replace($bracket,$sanitizedBracket,$value);
+    foreach ($brackets as $bracket) {
+        if (strpos($value, $bracket) === false) continue;
+        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket, 0, 1), substr($bracket, 1, 1)));
+        $value = str_replace($bracket, $sanitizedBracket, $value);
     }
     $value = str_ireplace('<script', 'sanitized_by_modx<s cript', $value);
     $value = preg_replace('/&#(\d+);/', 'sanitized_by_modx& #$1', $value);
@@ -46,13 +46,13 @@ 
 }
 
 modx_sanitize_gpc($_GET);
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     modx_sanitize_gpc($_POST);
 }
 modx_sanitize_gpc($_COOKIE);
 modx_sanitize_gpc($_REQUEST);
 
-foreach (array ('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
+foreach (array('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
     $_SERVER[$key] = isset ($_SERVER[$key]) ? htmlspecialchars($_SERVER[$key], ENT_QUOTES) : null;
 }
 

manager/includes/manager.lockout.inc.php

Spacing +32 added lines, -32 removed lines

@@ -1,75 +1,75 @@
 <?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'])){
+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
 
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
+    $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);
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
 
-    $modx->setPlaceholder('site_name',$site_name);
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
+    $modx->setPlaceholder('site_name', $site_name);
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
 
-    $modx->setPlaceholder('home',$_lang["home"]);
-    $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('year',date('Y'));
+    $modx->setPlaceholder('home', $_lang["home"]);
+    $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('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';
+    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';
     }
 
     $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') {
-    		$target = trim(substr($target,7));
+    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') {
-    		$target = trim(substr($target,6));
+    	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;