evolution-cms / evolution

index.php

Spacing +16 added lines, -16 removed lines

@@ -44,16 +44,16 @@ 
  * Initialize Document Parsing
  * -----------------------------
  */
-if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+if (!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
 
-$base_path = str_replace('\\','/',dirname(__FILE__)) . '/';
-if(is_file($base_path . 'assets/cache/siteManager.php'))
-    include_once($base_path . 'assets/cache/siteManager.php');
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
+$base_path = str_replace('\\', '/', dirname(__FILE__)).'/';
+if (is_file($base_path.'assets/cache/siteManager.php'))
+    include_once($base_path.'assets/cache/siteManager.php');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager"))
 	define('MGR_DIR', 'manager');
-if(is_file($base_path . 'assets/cache/siteHostnames.php'))
-    include_once($base_path . 'assets/cache/siteHostnames.php');
-if(!defined('MODX_SITE_HOSTNAMES'))
+if (is_file($base_path.'assets/cache/siteHostnames.php'))
+    include_once($base_path.'assets/cache/siteHostnames.php');
+if (!defined('MODX_SITE_HOSTNAMES'))
 	define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
@@ -65,7 +65,7 @@ 
 // set some settings, and address some IE issues
 @ini_set('url_rewriter.tags', '');
 @ini_set('session.use_trans_sid', 0);
-@ini_set('session.use_only_cookies',1);
+@ini_set('session.use_only_cookies', 1);
 session_cache_limiter('');
 header('P3P: CP="NOI NID ADMa OUR IND UNI COM NAV"'); // header for weird cookie stuff. Blame IE.
 header('Cache-Control: private, must-revalidate');
@@ -77,7 +77,7 @@ 
  */
 
 define('IN_PARSER_MODE', true);
-if ( ! defined('IN_MANAGER_MODE')) {
+if (!defined('IN_MANAGER_MODE')) {
 	define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
@@ -85,8 +85,8 @@ 
 }
 
 // get the required includes
-if(! isset($database_user) || $database_user==="") {
-    $rt = @include_once(__DIR__ . '/' . MGR_DIR . '/includes/config.inc.php');
+if (!isset($database_user) || $database_user === "") {
+    $rt = @include_once(__DIR__.'/'.MGR_DIR.'/includes/config.inc.php');
     $path = 'install/src/template/not_installed.tpl';
     // Be sure config.inc.php is there and that it contains some important values
     if (!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
@@ -122,13 +122,13 @@ 
 $modx->stopOnNotice = false;
 
 // Don't show PHP errors to the public
-if(!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) {
-    @ini_set("display_errors","0");
+if (!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) {
+    @ini_set("display_errors", "0");
 }
 
-if(MODX_CLI){
+if (MODX_CLI) {
     @set_time_limit(0);
-    @ini_set('max_execution_time',0);
+    @ini_set('max_execution_time', 0);
 }
 
 // execute the parser if index.php was not included

Braces +12 added lines, -6 removed lines

@@ -44,17 +44,23 @@ 
  * Initialize Document Parsing
  * -----------------------------
  */
-if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) {
+    $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+}
 
 $base_path = str_replace('\\','/',dirname(__FILE__)) . '/';
-if(is_file($base_path . 'assets/cache/siteManager.php'))
+if(is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
+}
+if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
-if(is_file($base_path . 'assets/cache/siteHostnames.php'))
+}
+if(is_file($base_path . 'assets/cache/siteHostnames.php')) {
     include_once($base_path . 'assets/cache/siteHostnames.php');
-if(!defined('MODX_SITE_HOSTNAMES'))
+}
+if(!defined('MODX_SITE_HOSTNAMES')) {
 	define('MODX_SITE_HOSTNAMES', '');
+}
 
 // get start time
 $mstart = memory_get_usage();
@@ -126,7 +132,7 @@ 
     @ini_set("display_errors","0");
 }
 
-if(MODX_CLI){
+if(MODX_CLI) {
     @set_time_limit(0);
     @ini_set('max_execution_time',0);
 }

Indentation +3 added lines, -3 removed lines

@@ -50,11 +50,11 @@ 
 if(is_file($base_path . 'assets/cache/siteManager.php'))
     include_once($base_path . 'assets/cache/siteManager.php');
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 if(is_file($base_path . 'assets/cache/siteHostnames.php'))
     include_once($base_path . 'assets/cache/siteHostnames.php');
 if(!defined('MODX_SITE_HOSTNAMES'))
-	define('MODX_SITE_HOSTNAMES', '');
+    define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
 $mstart = memory_get_usage();
@@ -78,7 +78,7 @@ 
 
 define('IN_PARSER_MODE', true);
 if ( ! defined('IN_MANAGER_MODE')) {
-	define('IN_MANAGER_MODE', false);
+    define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
     define('MODX_API_MODE', false);

manager/includes/src/Legacy/Modifiers.php

Doc Comments +26 added lines, -1 removed lines

@@ -101,7 +101,7 @@ 
     /**
      * @param string $mode
      * @param string $modifiers
-     * @return bool|string
+     * @return false|string
      */
     public function _getDelim($mode, $modifiers)
     {
@@ -151,6 +151,13 @@ 
         }
     }
 
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     public function _getRemainModifiers($mode, $delim, $modifiers)
     {
         if ($delim) {
@@ -187,6 +194,9 @@ 
         return substr($string, strpos($string, $delim) + $len);
     }
 
+    /**
+     * @param string $modifiers
+     */
     public function splitEachModifiers($modifiers)
     {
         $modx = evolutionCMS();
@@ -259,6 +269,10 @@ 
         return $result;
     }
 
+    /**
+     * @param string $key
+     * @param string $value
+     */
     public function parsePhx($key, $value, $modifiers)
     {
         $modx = evolutionCMS();
@@ -340,6 +354,10 @@ 
         }
     }
 
+    /**
+     * @param string $cmd
+     * @param string $opt
+     */
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         $modx = evolutionCMS();
@@ -1285,6 +1303,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function includeMdfFile($cmd)
     {
         $modx = evolutionCMS();
@@ -1477,6 +1498,10 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     public function setModifiersVariable($key, $value)
     {
         if ($key != 'phx' && $key != 'dummy') {

Spacing +46 added lines, -46 removed lines

@@ -82,7 +82,7 @@ 
         }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':' . trim($modifiers, ':');
+        $modifiers = ':'.trim($modifiers, ':');
         $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
 
@@ -129,7 +129,7 @@ 
     {
         if ($delim) {
             if ($mode == '(') {
-                return substr($modifiers, 1, strpos($modifiers, $delim . ')') - 1);
+                return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
             }
 
             return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
@@ -155,7 +155,7 @@ 
     {
         if ($delim) {
             if ($mode == '(') {
-                return $this->_fetchContent($modifiers, $delim . ')');
+                return $this->_fetchContent($modifiers, $delim.')');
             } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers, 1);
@@ -217,7 +217,7 @@ 
             } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers,
                     $match)) { // :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
-                $result[] = array('cmd' => 'math', 'opt' => '%s' . $c . $match[0]);
+                $result[] = array('cmd' => 'math', 'opt' => '%s'.$c.$match[0]);
                 $cmd = '';
             } elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
@@ -332,7 +332,7 @@ 
         }
 
         $_ = explode(',',
-            $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+            $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
         if (in_array($cmd, $_)) {
             return false;
         } else {
@@ -365,7 +365,7 @@ 
             case 'eq':
             case 'is':
             case 'equals':
-                $this->condition[] = (int)($value == $opt);
+                $this->condition[] = (int) ($value == $opt);
                 break;
             case 'neq':
             case 'ne':
@@ -373,59 +373,59 @@ 
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = (int)($value != $opt);
+                $this->condition[] = (int) ($value != $opt);
                 break;
             case '%':
-                $this->condition[] = (int)($value % $opt == 0);
+                $this->condition[] = (int) ($value % $opt == 0);
                 break;
             case 'isempty':
-                $this->condition[] = (int)(empty($value));
+                $this->condition[] = (int) (empty($value));
                 break;
             case 'isntempty':
             case 'isnotempty':
-                $this->condition[] = (int)(!empty($value));
+                $this->condition[] = (int) (!empty($value));
                 break;
             case '>=':
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = (int)($value >= $opt);
+                $this->condition[] = (int) ($value >= $opt);
                 break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = (int)($value <= $opt);
+                $this->condition[] = (int) ($value <= $opt);
                 break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = (int)($value > $opt);
+                $this->condition[] = (int) ($value > $opt);
                 break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = (int)($value < $opt);
+                $this->condition[] = (int) ($value < $opt);
                 break;
             case 'find':
-                $this->condition[] = (int)(strpos($value, $opt) !== false);
+                $this->condition[] = (int) (strpos($value, $opt) !== false);
                 break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = (int)(in_array($value, $opt) !== false);
+                $this->condition[] = (int) (in_array($value, $opt) !== false);
                 break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = (int)(fnmatch($opt, $value) !== false);
+                $this->condition[] = (int) (fnmatch($opt, $value) !== false);
                 break;
             case 'is_file':
             case 'is_dir':
@@ -443,7 +443,7 @@ 
                 if (strpos($path, $modx->config['base_path']) === false) {
                     $path = ltrim($path, '/');
                 }
-                $this->condition[] = (int)($cmd($path) !== false);
+                $this->condition[] = (int) ($cmd($path) !== false);
                 break;
             case 'is_image':
                 if (!$opt) {
@@ -456,13 +456,13 @@ 
                     break;
                 }
                 $_ = getimagesize($path);
-                $this->condition[] = (int)($_[0]);
+                $this->condition[] = (int) ($_[0]);
                 break;
             case 'regex':
             case 'preg':
             case 'preg_match':
             case 'isinrole':
-                $this->condition[] = (int)(preg_match($opt, $value));
+                $this->condition[] = (int) (preg_match($opt, $value));
                 break;
             case 'ir':
             case 'memberof':
@@ -479,7 +479,7 @@ 
             case 'show':
             case 'this':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)(eval("return ({$conditional});"));
+                $isvalid = (int) (eval("return ({$conditional});"));
                 if ($isvalid) {
                     return $this->srcValue;
                 }
@@ -487,7 +487,7 @@ 
                 return null;
             case 'then':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $isvalid = (int) eval("return ({$conditional});");
                 if ($isvalid) {
                     return $opt;
                 }
@@ -495,7 +495,7 @@ 
                 return null;
             case 'else':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $isvalid = (int) eval("return ({$conditional});");
                 if (!$isvalid) {
                     return $opt;
                 }
@@ -654,7 +654,7 @@ 
                 return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
-                $wrapat = (int)$opt > 0 ? (int)$opt : 70;
+                $wrapat = (int) $opt > 0 ? (int) $opt : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
                     return $this->includeMdfFile('wordwrap');
                 } else {
@@ -686,7 +686,7 @@ 
                 if (strpos($opt, ',') !== false) {
                     list($b, $e) = explode(',', $opt, 2);
 
-                    return $this->substr($value, $b, (int)$e);
+                    return $this->substr($value, $b, (int) $e);
                 } else {
                     return $this->substr($value, $opt);
                 }
@@ -705,9 +705,9 @@ 
                     $str = '';
                 }
                 if (preg_match('/^[1-9][0-9]*$/', $len)) {
-                    return $this->substr($value, 0, $len) . $str;
+                    return $this->substr($value, 0, $len).$str;
                 } elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
-                    return $str . $this->substr($value, $len);
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -772,7 +772,7 @@ 
             case 'concatenate':
             case '.':
                 if ($value !== '') {
-                    return $value . $opt;
+                    return $value.$opt;
                 }
                 break;
             case 'sprintf':
@@ -790,7 +790,7 @@ 
             case 'money_format':
                 setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
                 if ($value !== '') {
-                    return money_format($opt, (double)$value);
+                    return money_format($opt, (double) $value);
                 }
                 break;
             case 'tobool':
@@ -865,7 +865,7 @@ 
                 return strtotime($value);
             #####  mathematical function
             case 'toint':
-                return (int)$value;
+                return (int) $value;
             case 'tofloat':
                 return floatval($value);
             case 'round':
@@ -883,7 +883,7 @@ 
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
+                $value = (int) $value;
                 if (empty($value)) {
                     $value = '0';
                 }
@@ -1026,7 +1026,7 @@ 
                 $where = implode(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach ((array)$children as $child) {
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
 
@@ -1130,7 +1130,7 @@ 
                     $opt .= '/';
                 }
 
-                $filename = MODX_BASE_PATH . $opt . $filename;
+                $filename = MODX_BASE_PATH.$opt.$filename;
 
                 if (is_file($filename)) {
                     clearstatcache();
@@ -1194,7 +1194,7 @@ 
                 }
                 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(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
@@ -1292,7 +1292,7 @@ 
         $value = $this->value;
         $opt = $this->opt;
 
-        return include(MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php");
+        return include(MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php");
     }
 
     public function getValueFromElement($key, $value, $cmd, $opt)
@@ -1308,13 +1308,13 @@ 
                 $row = $modx->getDatabase()->getRow($result);
                 $php = $row['snippet'];
             } elseif ($total == 0) {
-                $assets_path = MODX_BASE_PATH . 'assets/';
-                if (is_file($assets_path . "modifiers/mdf_{$cmd}.inc.php")) {
-                    $modifiers_path = $assets_path . "modifiers/mdf_{$cmd}.inc.php";
-                } elseif (is_file($assets_path . "plugins/phx/modifiers/{$cmd}.phx.php")) {
-                    $modifiers_path = $assets_path . "plugins/phx/modifiers/{$cmd}.phx.php";
-                } elseif (is_file(MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php")) {
-                    $modifiers_path = MODX_MANAGER_PATH . "includes/extenders/modifiers/mdf_{$cmd}.inc.php";
+                $assets_path = MODX_BASE_PATH.'assets/';
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) {
+                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
+                } elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) {
+                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
+                } elseif (is_file(MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                    $modifiers_path = MODX_MANAGER_PATH."includes/extenders/modifiers/mdf_{$cmd}.inc.php";
                 } else {
                     $modifiers_path = false;
                 }
@@ -1332,7 +1332,7 @@ 
                         $php = substr($php, 0, -2);
                     }
                     if ($this->elmName !== '') {
-                        $modx->snippetCache[$this->elmName . 'Props'] = '';
+                        $modx->snippetCache[$this->elmName.'Props'] = '';
                     }
                 } else {
                     $php = false;
@@ -1369,7 +1369,7 @@ 
             $custom = eval($php);
             $msg = ob_get_contents();
             if ($value === $this->bt) {
-                $value = $msg . $custom;
+                $value = $msg.$custom;
             }
             ob_end_clean();
         } elseif ($html !== false && isset($value) && $value !== '') {
@@ -1543,7 +1543,7 @@ 
     public function ucfirst($str)
     {
         if (function_exists('mb_strtoupper')) {
-            return mb_strtoupper($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str));
+            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         }
 
         return ucfirst($str);
@@ -1552,7 +1552,7 @@ 
     public function lcfirst($str)
     {
         if (function_exists('mb_strtolower')) {
-            return mb_strtolower($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str));
+            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         }
 
         return lcfirst($str);

Braces +4 added lines, -2 removed lines

@@ -199,7 +199,8 @@ 
             $c = substr($modifiers, 0, 1);
             $modifiers = substr($modifiers, 1);
 
-            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
                 if ($c === '(') {
@@ -215,7 +216,8 @@ 
                 $result[] = array('cmd' => trim($match[1]), 'opt' => $opt, 'debuginfo' => $debuginfo);
                 $cmd = '';
             } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers,
-                    $match)) { // :+3, :-3, :*3 ...
+                    $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
                 $result[] = array('cmd' => 'math', 'opt' => '%s' . $c . $match[0]);
                 $cmd = '';