evolution-cms / evolution

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->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if($modx->getManagerApi()->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/config_check.inc.php

Braces +22 added lines, -9 removed lines

@@ -19,12 +19,12 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->getManagerApi()->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;
@@ -120,7 +120,8 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache()
+    {
         $modx = evolutionCMS();
         $checked= true;
         if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
@@ -159,26 +160,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"];
@@ -186,7 +197,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]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            }
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];

manager/includes/src/Legacy/mgrResources.php

Braces +23 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -21,7 +22,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,7 +32,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
         global $_lang;
         $this->types['site_templates']    = array(
             'title'=>$_lang["manage_templates"],
@@ -68,7 +71,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
         foreach($this->types as $resourceTable=>$type) {
             if($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -81,11 +85,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p) {
+                    if($modx->hasPermission($p)) return true;
+        }
 
         return false;
     }
@@ -95,7 +101,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -112,8 +119,9 @@ 
             $tvsql    = 'site_tmplvars.caption, ';
             $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
             $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        } else {
+            $sttfield = '';
         }
-        else $sttfield = '';
 
         $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -126,7 +134,9 @@ 
         );
         $limit = $modx->getDatabase()->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if($limit < 1) {
+            return false;
+        }
 
         $result = array();
         while ($row = $modx->getDatabase()->getRow($rs)) {
@@ -138,7 +148,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
         foreach($this->items as $type=>$items) {
             foreach((array)$items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
@@ -154,7 +165,7 @@ 
 
         // Now sort by name
         foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

manager/includes/src/Legacy/Modifiers.php

Braces +541 added lines, -281 removed lines

@@ -3,7 +3,8 @@ 
 use EvolutionCMS\Interfaces\ModifiersInterface;
 use DataGrid;
 
-class Modifiers implements ModifiersInterface{
+class Modifiers implements ModifiersInterface
+{
     /**
      * @var array
      */
@@ -61,7 +62,9 @@ 
     public function __construct()
     {
         $modx = evolutionCMS();
-        if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']);
+        if (function_exists('mb_internal_encoding')) {
+            mb_internal_encoding($modx->config['modx_charset']);
+        }
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
 
@@ -74,7 +77,9 @@ 
     public function phxFilter($key,$value,$modifiers)
     {
         $modx = evolutionCMS();
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if(substr($modifiers,0,3)!=='id(') {
+            $value = $this->parseDocumentSource($value);
+        }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
         $modifiers = ':'.trim($modifiers,':');
@@ -97,13 +102,18 @@ 
      * @param string $modifiers
      * @return bool|string
      */
-    public function _getDelim($mode,$modifiers) {
+    public function _getDelim($mode,$modifiers)
+    {
         $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+        if(!in_array($c, array('"', "'", '`')) ) {
+            return false;
+        }
 
         $modifiers = substr($modifiers,1);
         $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        if(strpos($modifiers, $closure)===false) {
+            return false;
+        }
 
         return  $c;
     }
@@ -114,52 +124,65 @@ 
      * @param string $modifiers
      * @return bool|string
      */
-    public function _getOpt($mode,$delim,$modifiers) {
+    public function _getOpt($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            if($mode=='(') {
+                return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            }
 
             return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
-        }
-        else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+        } else {
+            if($mode=='(') {
+                return substr($modifiers,0,strpos($modifiers, ')') );
+            }
 
             $chars = str_split($modifiers);
             $opt='';
             foreach($chars as $c) {
-                if($c==':' || $c==')') break;
+                if($c==':' || $c==')') {
+                    break;
+                }
                 $opt .=$c;
             }
             return $opt;
         }
     }
-    public function _getRemainModifiers($mode,$delim,$modifiers) {
+    public function _getRemainModifiers($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
-            else {
+            if($mode=='(') {
+                            return $this->_fetchContent($modifiers, $delim . ')');
+            } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers,1);
                 return $this->_fetchContent($modifiers, $delim);
             }
-        }
-        else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+        } else {
+            if($mode=='(') {
+                return $this->_fetchContent($modifiers, ')');
+            }
             $chars = str_split($modifiers);
             foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+                if($c==':') {
+                    return $modifiers;
+                } else {
+                    $modifiers = substr($modifiers,1);
+                }
             }
             return $modifiers;
         }
     }
 
-    public function _fetchContent($string,$delim) {
+    public function _fetchContent($string,$delim)
+    {
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
         return substr($string,strpos($string, $delim)+$len);
     }
 
-    public function splitEachModifiers($modifiers) {
+    public function splitEachModifiers($modifiers)
+    {
         $modx = evolutionCMS();
 
         $cmd = '';
@@ -170,11 +193,15 @@ 
             $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==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if($c==='(') {
+                    $modifiers = substr($modifiers,strlen($match[1])+1);
+                } else {
+                    $modifiers = substr($modifiers,strlen($match[1]));
+                }
 
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -182,13 +209,12 @@ 
 
                 $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 ...
+            } 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]);
                 $cmd = '';
-            }
-            elseif($c==='(' || $c==='=') {
+            } elseif($c==='(' || $c==='=') {
                 $modifiers = $m1 = trim($modifiers);
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -198,29 +224,29 @@ 
                 $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
 
                 $cmd = '';
-            }
-            elseif($c==':') {
+            } elseif($c==':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if($cmd!=='') {
+                    $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                }
 
                 $cmd = '';
-            }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            } elseif(trim($modifiers)=='' && trim($cmd)!=='') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
                 $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
 
                 break;
-            }
-            else {
+            } else {
                 $cmd .= $c;
             }
         }
 
-        if(empty($result)) return array();
+        if(empty($result)) {
+            return array();
+        }
 
-        foreach($result as $i=>$a)
-        {
+        foreach($result as $i=>$a) {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
             $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
         }
@@ -233,22 +259,23 @@ 
         $modx = evolutionCMS();
         $lastKey = '';
         $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        if(isset($this->tmpCache[$cacheKey])) {
+            return $this->tmpCache[$cacheKey];
+        }
+        if(empty($modifiers)) {
+            return '';
+        }
 
-        foreach($modifiers as $m)
-        {
+        foreach($modifiers as $m) {
             $lastKey = strtolower($m['cmd']);
         }
         $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
-        {
+        if(in_array($lastKey,$_)) {
             $modifiers[] = array('cmd'=>'then','opt'=>'1');
             $modifiers[] = array('cmd'=>'else','opt'=>'0');
         }
 
-        foreach($modifiers as $i=>$a)
-        {
+        foreach($modifiers as $i=>$a) {
             $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
@@ -260,25 +287,32 @@ 
     {
         $modx = evolutionCMS();
 
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if($key==='documentObject') {
+            $value = $modx->documentIdentifier;
+        }
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
-        {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+        if(preg_match('@^[1-9][/0-9]*$@',$cmd)) {
+            if(strpos($cmd,'/')!==false) {
+                            $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            }
             $opt = $cmd;
             $cmd = 'id';
         }
 
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
-        else                                           $this->elmName = '';
+        if(isset($modx->snippetCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } elseif(isset($modx->chunkCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } else {
+            $this->elmName = '';
+        }
 
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
-            $value = $this->getValueFromElement($key, $value, $cmd, $opt);
-        else
-            $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        if($this->elmName!=='') {
+                    $value = $this->getValueFromElement($key, $value, $cmd, $opt);
+        } else {
+                    $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        }
 
         $value = str_replace('[+key+]', $key, $value);
 
@@ -287,29 +321,37 @@ 
 
     public function isEmpty($cmd,$value)
     {
-        if($value!=='') return false;
+        if($value!=='') {
+            return false;
+        }
 
         $_ = explode(',', $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                  return true;
+        if(in_array($cmd,$_)) {
+            return false;
+        } else {
+            return true;
+        }
     }
 
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         $modx = evolutionCMS();
 
-        if($this->isEmpty($cmd,$value)) return '';
+        if($this->isEmpty($cmd,$value)) {
+            return '';
+        }
 
         $this->key = $key;
         $this->value  = $value;
         $this->opt    = $opt;
 
-        switch ($cmd)
-        {
+        switch ($cmd) {
             #####  Conditional Modifiers
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if(!$opt) {
+                    return $value;
+                }
                 return $opt;
             case '=':
             case 'eq':
@@ -370,14 +412,24 @@ 
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
+                if(strpos($path,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core path');
+                }
+                if(strpos($path,$modx->config['base_path'])===false) {
+                    $path = ltrim($path,'/');
+                }
                 $this->condition[] = (int)($cmd($path)!==false);break;
             case 'is_image':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
                 if(!is_file($path)) {$this->condition[]='0';break;}
                 $_ = getimagesize($path);
                 $this->condition[] = (int)($_[0]);break;
@@ -400,17 +452,23 @@ 
             case 'this':
                 $conditional = implode(' ',$this->condition);
                 $isvalid = (int)(eval("return ({$conditional});"));
-                if ($isvalid) return $this->srcValue;
+                if ($isvalid) {
+                    return $this->srcValue;
+                }
                 return NULL;
             case 'then':
                 $conditional = implode(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");
-                if ($isvalid)  return $opt;
+                if ($isvalid) {
+                    return $opt;
+                }
                 return null;
             case 'else':
                 $conditional = implode(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");
-                if (!$isvalid) return $opt;
+                if (!$isvalid) {
+                    return $opt;
+                }
                 break;
             case 'select':
             case 'switch':
@@ -421,8 +479,11 @@ 
                     $mi = explode('=',$raw[$m],2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
-                else                    return '';
+                if(isset($map[$value])) {
+                    return $map[$value];
+                } else {
+                    return '';
+                }
             ##### End of Conditional Modifiers
 
             #####  Encode / Decode / Hash / Escape
@@ -448,24 +509,25 @@ 
             case 'spam_protect':
                 return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if($opt==='') {
+                    $opt = ' ';
+                }
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
                 return str_replace(array("\n","\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
-                {
+                if($opt!=='') {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
-                    {
+                    foreach(explode(',',$opt) as $v) {
                         $v = trim($v,'</> ');
                         $param[] = "<{$v}>";
                     }
                     $params = implode(',',$param);
+                } else {
+                    $params = '';
                 }
-                else $params = '';
                 if(!strpos($params,'<br>')===false) {
                     $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
                     $value = preg_replace('@<br[ /]*>@',"\n",$value);
@@ -476,8 +538,11 @@ 
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
-                else               $opt = false;
+                if($opt!=='false') {
+                    $opt = true;
+                } else {
+                    $opt = false;
+                }
                 return base64_decode($value,$opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
@@ -503,16 +568,19 @@ 
                 return $this->strtoupper($value);
             case 'capitalize':
                 $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
-                {
+                foreach($_ as $i=>$v) {
                     $_[$i] = ucfirst($v);
                 }
                 return implode(' ',$_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
+                if(empty($opt)) {
+                    $opt='VKas';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
+                if(empty($opt)) {
+                    $opt='VKAS';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
@@ -537,13 +605,18 @@ 
                 $value = preg_replace('/\r/', '', $value);
                 return count(preg_split('/\n+/',$value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
+                if($opt!=0&&empty($opt)) {
+                    return $value;
+                }
                 return $this->strpos($value,$opt);
             case 'wordwrap':
                 // default: 70
                 $wrapat = (int)$opt > 0 ? (int)$opt : 70;
-                if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+                    return $this->includeMdfFile('wordwrap');
+                } else {
+                    return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                }
             case 'wrap_text':
                 $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
                 if($modx->config['manager_language']==='japanese-utf8') {
@@ -559,30 +632,36 @@ 
                         $value = $this->substr($value,$width);
                     }
                     return implode("\n",$chunk);
+                } else {
+                                    return wordwrap($value,$width,"\n",true);
                 }
-                else
-                    return wordwrap($value,$width,"\n",true);
             case 'substr':
-                if(empty($opt)) break;
+                if(empty($opt)) {
+                    break;
+                }
                 if(strpos($opt,',')!==false) {
                     list($b,$e) = explode(',',$opt,2);
                     return $this->substr($value,$b,(int)$e);
+                } else {
+                    return $this->substr($value,$opt);
                 }
-                else return $this->substr($value,$opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
-                else {
+                if(strpos($opt,'+')!==false) {
+                                    list($len,$str) = explode('+',$opt,2);
+                } else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
+                if($len==='') {
+                    $len = 100;
+                }
+                if(abs($len) > $this->strlen($value)) {
+                    $str ='';
+                }
                 if(preg_match('/^[1-9][0-9]*$/',$len)) {
                     return $this->substr($value,0,$len) . $str;
-                }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
+                } elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
                     return $str . $this->substr($value,$len);
                 }
                 break;
@@ -592,18 +671,30 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
-                else break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
+                if    (substr_count($opt, ',') ==1) {
+                    $delim = ',';
+                } elseif(substr_count($opt, '|') ==1) {
+                    $delim = '|';
+                } elseif(substr_count($opt, '=>')==1) {
+                    $delim = '=>';
+                } elseif(substr_count($opt, '/') ==1) {
+                    $delim = '/';
+                } else {
+                    break;
+                }
                 list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                if($value!=='') {
+                    return str_replace($s,$r,$value);
+                }
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if($value!=='') {
+                    return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                }
                 break;
             case 'eachtpl':
                 $value = explode('||',$value);
@@ -614,59 +705,83 @@ 
                 return implode("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
-                else                            $delim = ',';
+                if(strpos($value,'||')!==false) {
+                    $delim = '||';
+                } else {
+                    $delim = ',';
+                }
                 return $cmd(explode($delim,$value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
                 list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if($value!=='') {
+                    return preg_replace($s,$r,$value);
+                }
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if($value!=='') {
+                    return $value . $opt;
+                }
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if($value!=='') {
+                    return sprintf($opt,$value);
+                }
                 break;
             case 'number_format':
-                if($opt=='') $opt = 0;
+                if($opt=='') {
+                    $opt = 0;
+                }
                 return number_format($value,$opt);
             case 'money_format':
                 setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                if($value!=='') return money_format($opt,(double)$value);
+                if($value!=='') {
+                    return money_format($opt,(double)$value);
+                }
                 break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if($value!=='') {
+                    return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                }
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
-                if (version_compare(PHP_VERSION, '5.3.0', '<'))
-                    return nl2br($value);
-                if($opt!=='')
-                {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                                    return nl2br($value);
+                }
+                if($opt!=='') {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
-                    else               $opt = true;
+                    if($opt==='false') {
+                        $opt = false;
+                    } elseif($opt==='0') {
+                        $opt = false;
+                    } else {
+                        $opt = true;
+                    }
+                } elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') {
+                                    $opt = false;
+                } else {
+                    $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                    $opt = false;
-                else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
-                    return $cmd($value);
-                else return $cmd($value,$opt);
+                if($opt==='') {
+                                    return $cmd($value);
+                } else {
+                    return $cmd($value,$opt);
+                }
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -677,15 +792,24 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
-                else
-                    return date($opt,0+$value);
+                if(empty($opt)) {
+                    $opt = $modx->toDateFormat(null, 'formatOnly');
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
+                if(strpos($opt,'%')!==false) {
+                                    return strftime($opt,0+$value);
+                } else {
+                                    return date($opt,0+$value);
+                }
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
+                if(empty($opt)) {
+                    $opt = '%H:%M';
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
                 return strftime($opt,0+$value);
             case 'strtotime':
                 return strtotime($value);
@@ -695,7 +819,9 @@ 
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
+                if(!$opt) {
+                    $opt = 0;
+                }
                 return $cmd($value,$opt);
             case 'max':
             case 'min':
@@ -707,28 +833,42 @@ 
             case 'math':
             case 'calc':
                 $value = (int)$value;
-                if(empty($value)) $value = '0';
+                if(empty($value)) {
+                    $value = '0';
+                }
                 $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
                 $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
+                if(strpos($filter,'?')===false) {
+                    $filter = "?{$filter}";
+                }
                 $filter = str_replace('?',$value,$filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
+                if($value=='') {
+                    return 0;
+                }
                 $value = explode(',',$value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
-                else $delim = ',';
+                if(strpos($value,"\n")!==false) {
+                    $delim="\n";
+                } else {
+                    $delim = ',';
+                }
                 $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
-                else      $opt = constant($opt);
+                if(!$opt) {
+                    $opt = SORT_REGULAR;
+                } else {
+                    $opt = constant($opt);
+                }
                 $cmd($swap,$opt);
                 return implode($delim,$swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if($opt) {
+                    return $this->getDocumentObject($opt,$key);
+                }
                 break;
             case 'type':
             case 'contenttype':
@@ -765,7 +905,9 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
+                if($cmd==='contenttype') {
+                    $cmd = 'contentType';
+                }
                 return $this->getDocumentObject($value,$cmd);
             case 'title':
                 $pagetitle = $this->getDocumentObject($value,'pagetitle');
@@ -780,13 +922,20 @@ 
                 $templateName = $modx->getDatabase()->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
+                if(!$opt) {
+                    $opt = 'content';
+                }
                 return $modx->getField($opt,$value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if($value=='') {
+                    $value = 0;
+                }
+                // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
+                if($opt=='') {
+                    $opt = 'page';
+                }
                 $_ = explode(',',$opt);
                 $where = array();
                 foreach($_ as $opt) {
@@ -802,29 +951,43 @@ 
                 $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'];
                 }
                 return implode(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if(!is_numeric($value)) {
+                    return $value;
+                }
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
+                if(!is_numeric($value)) {
+                    return $value;
+                }
+                if(!$opt) {
+                    $opt = 'full';
+                }
                 return $modx->makeUrl($value,'','',$opt);
 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if(!is_file($value)) {
+                    return '';
+                }
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if(!$_[0]) {
+                    return '';
+                }
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
-                else                  $info['aspect'] = 'square';
+                if    ($_[0] > $_[1]) {
+                    $info['aspect'] = 'landscape';
+                } elseif($_[0] < $_[1]) {
+                    $info['aspect'] = 'portrait';
+                } else {
+                    $info['aspect'] = 'square';
+                }
                 switch($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
@@ -843,33 +1006,47 @@ 
 
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if(!is_file($value)) {
+                    return $value;
+                }
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
+                if(strpos($value,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core file');
+                }
                 $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if($ext==='.php') {
+                    exit('Can not read php file');
+                }
+                if($ext==='.cgi') {
+                    exit('Can not read cgi file');
+                }
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if($value == '') {
+                    return '';
+                }
                 $filename = $value;
 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
+                if(strpos($filename,$site_url) === 0) {
+                                    $filename = substr($filename,0,strlen($site_url));
+                }
                 $filename = trim($filename,'/');
 
                 $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                if($opt!=='') {
+                    $opt .= '/';
+                }
 
                 $filename = MODX_BASE_PATH.$opt.$filename;
 
-                if(is_file($filename)){
+                if(is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
+                } else {
+                    return '';
                 }
-                else return '';
             #####  User info
             case 'username':
             case 'fullname':
@@ -897,32 +1074,47 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions
             case 'ifempty':
             case '_default':
             case 'default':
-                if (empty($value)) return $opt; break;
+                if (empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'ifnotempty':
-                if (!empty($value)) return $opt; break;
+                if (!empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'datagrid':
                 include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
                 $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
-                else $_ = $pos;
+                if($pos) {
+                    $_ = substr($value,0,$pos);
+                } else {
+                    $_ = $pos;
+                }
                 $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if(strpos($opt,',')===false) {
+                    $opt = 'odd,even';
+                }
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
@@ -931,7 +1123,9 @@ 
             case 'takeval':
                 $arr = explode(",",$opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if(!is_numeric($idx)) {
+                    return $value;
+                }
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -939,14 +1133,18 @@ 
                 return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if(empty($opt)) {
+                    $opt = 'border:none;width:500px;height:350px;';
+                }
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
                 return $modx->parseText($tpl,$ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
+                if(empty($opt)) {
+                    $opt = 560;
+                }
                 $h = round($opt*0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
                 return sprintf($tpl,$opt,$h,$value);
@@ -979,7 +1177,8 @@ 
         return $value;
     }
 
-    public function includeMdfFile($cmd) {
+    public function includeMdfFile($cmd)
+    {
         $modx = evolutionCMS();
         $key = $this->key;
         $value  = $this->value;
@@ -990,55 +1189,65 @@ 
     public function getValueFromElement($key, $value, $cmd, $opt)
     {
         $modx = evolutionCMS();
-        if( isset($modx->snippetCache[$this->elmName]) )
-        {
+        if( isset($modx->snippetCache[$this->elmName]) ) {
             $php = $modx->snippetCache[$this->elmName];
-        }
-        else
-        {
+        } else {
             $esc_elmName = $modx->getDatabase()->escape($this->elmName);
             $result = $modx->getDatabase()->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
             $total = $modx->getDatabase()->getRecordCount($result);
-            if($total == 1)
-            {
+            if($total == 1) {
                 $row = $modx->getDatabase()->getRow($result);
                 $php = $row['snippet'];
-            }
-            elseif($total == 0)
-            {
+            } 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_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
-                else $modifiers_path = false;
+                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_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
+                } else {
+                    $modifiers_path = false;
+                }
 
                 if($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
-                        $modx->snippetCache[$this->elmName.'Props'] = '';
-                }
-                else
-                    $php = false;
+                    if(substr($php,0,5)==='<?php') {
+                        $php = substr($php,6);
+                    }
+                    if(substr($php,0,2)==='<?') {
+                        $php = substr($php,3);
+                    }
+                    if(substr($php,-2)==='?>') {
+                        $php = substr($php,0,-2);
+                    }
+                    if($this->elmName!=='') {
+                                            $modx->snippetCache[$this->elmName.'Props'] = '';
+                    }
+                } else {
+                                    $php = false;
+                }
+            } else {
+                $php = false;
+            }
+            if($this->elmName!=='') {
+                $modx->snippetCache[$this->elmName]= $php;
             }
-            else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
         }
-        if($php==='') $php=false;
+        if($php==='') {
+            $php=false;
+        }
 
-        if($php===false) $html = $modx->getChunk($this->elmName);
-        else             $html = false;
+        if($php===false) {
+            $html = $modx->getChunk($this->elmName);
+        } else {
+            $html = false;
+        }
 
         $self = '[+output+]';
 
-        if($php !== false)
-        {
+        if($php !== false) {
             ob_start();
             $options = $opt;
             $output = $value;
@@ -1050,19 +1259,19 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if($value===$this->bt) {
+                $value = $msg . $custom;
+            }
             ob_end_clean();
-        }
-        elseif($html!==false && isset($value) && $value!=='')
-        {
+        } elseif($html!==false && isset($value) && $value!=='') {
             $html = str_replace(array($self,'[+value+]'), $value, $html);
             $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+        } else {
+            return false;
         }
-        else return false;
 
         if($php===false && $html===false && $value!==''
-            && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
-        {
+            && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false)) {
             $value = str_replace(array('[+value+]',$self),$value,$cmd);
         }
         return $value;
@@ -1072,23 +1281,39 @@ 
     {
         $modx = evolutionCMS();
 
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if(strpos($content,'[')===false && strpos($content,'{')===false) {
+            return $content;
+        }
 
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        if(!$modx->maxParserPasses) {
+            $modx->maxParserPasses = 10;
+        }
         $bt='';
         $i=0;
-        while($bt!==$content)
-        {
+        while($bt!==$content) {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
-
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if(strpos($content,'[*')!==false && $modx->documentIdentifier) {
+                            $content = $modx->mergeDocumentContent($content);
+            }
+            if(strpos($content,'[(')!==false) {
+                $content = $modx->mergeSettingsContent($content);
+            }
+            if(strpos($content,'{{')!==false) {
+                $content = $modx->mergeChunkContent($content);
+            }
+            if(strpos($content,'[!')!==false) {
+                $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
+            }
+            if(strpos($content,'[[')!==false) {
+                $content = $modx->evalSnippets($content);
+            }
+
+            if($content===$bt) {
+                break;
+            }
+            if($modx->maxParserPasses < $i) {
+                break;
+            }
             $i++;
         }
         return $content;
@@ -1099,103 +1324,138 @@ 
         $modx = evolutionCMS();
 
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
-        else $method = 'alias';
+        if(empty($target)) {
+            $target = $modx->config['site_start'];
+        }
+        if(preg_match('@^[1-9][0-9]*$@',$target)) {
+            $method='id';
+        } else {
+            $method = 'alias';
+        }
 
-        if(!isset($this->documentObject[$target]))
-        {
+        if(!isset($this->documentObject[$target])) {
             $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
         }
 
-        if($this->documentObject[$target]['publishedon']==='0')
-            return '';
-        elseif(isset($this->documentObject[$target][$field]))
-        {
-            if(is_array($this->documentObject[$target][$field]))
-            {
+        if($this->documentObject[$target]['publishedon']==='0') {
+                    return '';
+        } elseif(isset($this->documentObject[$target][$field])) {
+            if(is_array($this->documentObject[$target][$field])) {
                 $a = $modx->getTemplateVarOutput($field,$target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
+        } else {
+            $this->documentObject[$target][$field] = false;
         }
-        else $this->documentObject[$target][$field] = false;
 
         return $this->documentObject[$target][$field];
     }
 
-    public function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    public function setPlaceholders($value = '', $key = '', $path = '')
+    {
+        if($path!=='') {
+            $key = "{$path}.{$key}";
+        }
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
             }
+        } else {
+            $this->setModifiersVariable($key, $value);
         }
-        else $this->setModifiersVariable($key, $value);
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
-    public function setModifiersVariable($key, $value) {
-        if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
+    public function setModifiersVariable($key, $value)
+    {
+        if ($key != 'phx' && $key != 'dummy') {
+            $this->placeholders[$key] = $value;
+        }
     }
 
     //mbstring
-    public function substr($str, $s, $l = null) {
+    public function substr($str, $s, $l = null)
+    {
         $modx = evolutionCMS();
-        if(is_null($l)) $l = $this->strlen($str);
-        if (function_exists('mb_substr'))
-        {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+        if(is_null($l)) {
+            $l = $this->strlen($str);
+        }
+        if (function_exists('mb_substr')) {
+            if(strpos($str,"\r")!==false) {
+                            $str = str_replace(array("\r\n","\r"), "\n", $str);
+            }
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack,$needle,$offset=0) {
+    public function strpos($haystack,$needle,$offset=0)
+    {
         $modx = evolutionCMS();
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        if (function_exists('mb_strpos')) {
+            return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        }
         return strpos($haystack,$needle,$offset);
     }
-    public function strlen($str) {
+    public function strlen($str)
+    {
         $modx = evolutionCMS();
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) {
+            return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        }
         return strlen($str);
     }
-    public function strtolower($str) {
-        if (function_exists('mb_strtolower')) return mb_strtolower($str);
+    public function strtolower($str)
+    {
+        if (function_exists('mb_strtolower')) {
+            return mb_strtolower($str);
+        }
         return strtolower($str);
     }
-    public function strtoupper($str) {
-        if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
+    public function strtoupper($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+            return mb_strtoupper($str);
+        }
         return strtoupper($str);
     }
-    public function ucfirst($str) {
-        if (function_exists('mb_strtoupper'))
-            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    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 ucfirst($str);
     }
-    public function lcfirst($str) {
-        if (function_exists('mb_strtolower'))
-            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    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 lcfirst($str);
     }
-    public function ucwords($str) {
-        if (function_exists('mb_convert_case'))
-            return mb_convert_case($str, MB_CASE_TITLE);
+    public function ucwords($str)
+    {
+        if (function_exists('mb_convert_case')) {
+                    return mb_convert_case($str, MB_CASE_TITLE);
+        }
         return ucwords($str);
     }
-    public function strrev($str) {
+    public function strrev($str)
+    {
         preg_match_all('/./us', $str, $ar);
         return implode(array_reverse($ar[0]));
     }
-    public function str_shuffle($str) {
+    public function str_shuffle($str)
+    {
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return implode($ar[0]);
     }
-    public function str_word_count($str) {
+    public function str_word_count($str)
+    {
         return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
     }
-    public function strip_tags($value,$params='') {
+    public function strip_tags($value,$params='')
+    {
         $modx = evolutionCMS();
 
         if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {

manager/includes/src/Exceptions/ServiceNotFoundException.php

Braces +3 added lines, -1 removed lines

@@ -2,4 +2,6 @@
 
 use Exception;
 
-class ServiceNotFoundException extends Exception{}
+class ServiceNotFoundException extends Exception
+{
+}

manager/includes/src/Exceptions/ContainerException.php

Braces +3 added lines, -1 removed lines

@@ -2,4 +2,6 @@
 
 use Exception;
 
-class ContainerException extends Exception{}
+class ContainerException extends Exception
+{
+}

manager/includes/src/Core.php

Braces +62 added lines, -31 removed lines

@@ -282,7 +282,8 @@ 
         return $service;
     }
 
-    private function checkServiceAlias($name){
+    private function checkServiceAlias($name)
+    {
         foreach ($this->providerAliases as $alias => $interface) {
             if($name === $interface) {
                 return $alias;
@@ -962,13 +963,15 @@ 
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -976,7 +979,8 @@ 
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -1006,13 +1010,14 @@ 
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -1021,7 +1026,7 @@ 
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1348,7 +1353,8 @@ 
         $where = "pub_date <= {$timeNow} AND pub_date!=0 AND published=0";
         $result_pub = $this->getDatabase()->select( 'id', '[+prefix+]site_content',  $where);
         $this->getDatabase()->update($field, '[+prefix+]site_content', $where);
-        if ($this->getDatabase()->getRecordCount($result_pub) >= 1) { //Event unPublished doc
+        if ($this->getDatabase()->getRecordCount($result_pub) >= 1) {
+//Event unPublished doc
             while ($row_pub = $this->getDatabase()->getRow($result_pub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_pub['id']
@@ -1361,7 +1367,8 @@ 
         $where = "unpub_date <= {$timeNow} AND unpub_date!=0 AND published=1";
         $result_unpub = $this->getDatabase()->select( 'id', '[+prefix+]site_content',  $where);
         $this->getDatabase()->update($field, '[+prefix+]site_content', $where);
-        if ($this->getDatabase()->getRecordCount($result_unpub) >= 1) { //Event unPublished doc
+        if ($this->getDatabase()->getRecordCount($result_unpub) >= 1) {
+//Event unPublished doc
             while ($row_unpub = $this->getDatabase()->getRow($result_unpub)) {
                 $this->invokeEvent("OnDocUnPublished", array(
                     "docid" => $row_unpub['id']
@@ -1448,10 +1455,18 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if($left==='{{' && strpos($content,';}}')!==false) {
+            $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
+        }
+        if($left==='{{' && strpos($content,'{{}}')!==false) {
+            $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]]')!==false) {
+            $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]')!==false) {
+            $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        }
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
@@ -1504,7 +1519,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1522,7 +1538,9 @@ 
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1562,7 +1580,10 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if(strpos($key,'[+')!==false) {
+                continue;
+            }
+            // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -2288,7 +2309,8 @@ 
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2693,7 +2715,8 @@ 
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2726,7 +2749,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -4509,7 +4532,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->getDatabase()->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->getDatabase()->query($sql);
             if ($this->getDatabase()->getRecordCount($result) == 1) {
@@ -5010,7 +5034,7 @@ 
             $result = $this->getDatabase()->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5485,12 +5509,16 @@ 
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5502,7 +5530,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5522,7 +5551,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5647,7 +5677,8 @@ 
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5793,8 +5824,7 @@ 
                     }
                 }
             }
-        }
-        elseif(\is_array($propertyString)) {
+        } elseif(\is_array($propertyString)) {
             $property = $propertyString;
         }
         if (!empty($elementName) && !empty($elementType)) {
@@ -6241,7 +6271,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6650,7 +6681,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {

manager/includes/src/Interfaces/ManagerApiInterface.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php namespace EvolutionCMS\Interfaces;
 
-interface ManagerApiInterface{}
+interface ManagerApiInterface
+{
+}

manager/includes/src/Interfaces/ServiceProviderInterface.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php namespace EvolutionCMS\Interfaces;
 
-interface ServiceProviderInterface{}
+interface ServiceProviderInterface
+{
+}