evolution-cms / evolution

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

Braces +66 added lines, -35 removed lines

@@ -1,16 +1,32 @@ 
 <?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>";
@@ -37,7 +53,8 @@ 
     }
 
 
-    function getUserData() {
+    function getUserData()
+    {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,35 +62,42 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    function insideManager() {
+    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";
-            else
-                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') {
+                            $m= "interact";
+            } else
+                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') {
+                                    $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 ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
@@ -96,18 +120,22 @@ 
             }
     }
 
-    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);
-        if ($method == "")
-            $method= $REQUEST_METHOD;
-        if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
-        else
-            return false;
+        if ($method == "") {
+                    $method= $REQUEST_METHOD;
+        }
+        if ($method == "POST") {
+                    $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)) {
@@ -115,10 +143,12 @@ 
                     $pieces= explode($prefix, $key, 2);
                     $key= $pieces[1];
                     $results[$key]= $value;
-                } else
-                    $results[$key]= $value;
+                } else {
+                                    $results[$key]= $value;
+                }
+            } elseif ($prefix == "") {
+                $results[$key]= $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
         }
         return $results;
     }
@@ -129,7 +159,8 @@ 
      * @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));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
@@ -139,9 +170,9 @@ 
             $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
         }
         $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
-        if ($modx->isFrontend())
-            $modx->regClientScript($html);
-        else {
+        if ($modx->isFrontend()) {
+                    $modx->regClientScript($html);
+        } else {
             echo $html;
         }
     }

manager/includes/extenders/modxmailer.class.inc.php

Braces +12 added lines, -6 removed lines

@@ -280,14 +280,16 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader()
+    {
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody()
+    {
         return $this->MIMEBody;
     }
 
@@ -296,7 +298,8 @@ 
      *
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = '')
+    {
         $this->MIMEHeader = $header;
 
         return $this;
@@ -307,7 +310,8 @@ 
      *
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = '')
+    {
         $this->MIMEBody = $body;
 
         return $this;
@@ -318,7 +322,8 @@ 
      *
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = '')
+    {
         $this->mailHeader = $header;
 
         return $this;
@@ -327,7 +332,8 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
+    public function getMessageID()
+    {
         return trim($this->lastMessageID,'<>');
     }
 }

manager/includes/mutate_settings.ajax.php

Braces +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $str = '';
 $emptyCache = false;
 
-switch(true){
+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] : "" ;

manager/includes/config_check.inc.php

Braces +22 added lines, -9 removed lines

@@ -19,12 +19,12 @@ 
 $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) {
       $warningspresent = 1;
@@ -117,7 +117,8 @@ 
 }
 
 if (!function_exists('checkSiteCache')) {
-    function checkSiteCache() {
+    function checkSiteCache()
+    {
         global $modx;
         $checked= true;
         if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
@@ -156,26 +157,36 @@ 
 
 if ($warningspresent==1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if(!isset($modx->config['send_errormail'])) {
+    $modx->config['send_errormail']='3';
+}
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
 for ($i=0;$i<count($warnings);$i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            }
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            }
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            }
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            }
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
@@ -183,7 +194,9 @@ 
 			if($modx->hasPermission('settings')) {
 				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".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'];

manager/includes/manager.lockout.inc.php

Braces +8 added lines, -13 removed lines

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

manager/includes/settings.inc.php

Braces +6 added lines, -3 removed lines

@@ -5,8 +5,9 @@ 
 
 // get the settings from the database.
 $settings = array();
-if ($modx && count($modx->config)>0) $settings = $modx->config;
-else{
+if ($modx && count($modx->config)>0) {
+    $settings = $modx->config;
+} else {
 	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
 	while ($row = $modx->db->getRow($rs)) {
 		$settings[$row['setting_name']] = $row['setting_value'];
@@ -16,4 +17,6 @@ 
 extract($settings, EXTR_OVERWRITE);
 
 // setup default site id - new installation should generate a unique id for the site.
-if(!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";
+if(!isset($site_id)) {
+    $site_id = "MzGeQ2faT4Dw06+U49x3";
+}

manager/includes/secure_mgr_documents.inc.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  *
  */
 
-function secureMgrDocument($docid='') {
+function secureMgrDocument($docid='')
+{
 	global $modx;
 
 	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));

manager/includes/header.inc.php

Braces +8 added lines, -8 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.");

 }

 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';

@@ -9,21 +9,21 @@ 
 $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';

 }

 

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

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

 }

 

 $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')) {

+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';

         $minifier = new Formatter\CSSMinify();

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

@@ -40,7 +40,7 @@ 
         $css = $minifier->minify();

         file_put_contents(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')) {

+    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;

     }

 }

@@ -363,7 +363,7 @@ 
         stopWorker();

 

           <?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/secure_web_documents.inc.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  *
  */
 
-function secureWebDocument($docid='') {
+function secureWebDocument($docid='')
+{
 	global $modx;
 
 	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));