evolution-cms / evolution

core/factory/actionlist.php

Spacing +14 added lines, -14 removed lines

@@ -2,7 +2,7 @@ 
 return [
     '1'   => 'Loading a frame(set)', //ok
     '2'   => 'Viewing dashboard', //ok
-    '3'   => 'Viewing data for resource',  //ok
+    '3'   => 'Viewing data for resource', //ok
     '4'   => 'Creating a resource', //ok == 27, 72, 85, 4
     '5'   => 'Saving resource', //ok
     '6'   => 'Deleting resource', //ok
@@ -32,9 +32,9 @@ 
     '30'  => 'Saving settings', //ok
     '31'  => 'Using file manager', //ok
     '32'  => 'Saving user', //ok
-    '33'  => 'Deleting user',//ok
+    '33'  => 'Deleting user', //ok
     '34'  => 'Saving new password', //ok
-    '35'  => 'Editing role',//ok == 38
+    '35'  => 'Editing role', //ok == 38
     '36'  => 'Saving role', //ok
     '37'  => 'Deleting role', //ok
     '38'  => 'Creating new role', //ok == 35
@@ -67,7 +67,7 @@ 
     '66'  => 'Sending a message', //ok
     '67'  => 'Removing locks', //ok
     '68'  => 'Viewing site logging', //not found
-    '69'  => 'Viewing online visitors',//not found
+    '69'  => 'Viewing online visitors', //not found
     '70'  => 'Viewing site schedule', //ok
     '71'  => 'Searching', //ok
     '72'  => 'Adding a weblink', //ok  27, 72, 85, 4
@@ -84,16 +84,16 @@ 
     '85'  => 'Create Folder', //ok 27, 72, 85, 4
     '86'  => 'Role management', //ok
     '87'  => 'Create new web user', //ok 87, 88
-    '88'  => 'Editing web user',//ok 87, 88
+    '88'  => 'Editing web user', //ok 87, 88
     '89'  => 'Saving web user', //ok
     '90'  => 'Deleting web user', //ok
     '91'  => 'Editing Web Access Permissions', //ok
-    '92'  => 'Editing Access Permissions',  // ok access groups processor
+    '92'  => 'Editing Access Permissions', // ok access groups processor
     '93'  => 'Backup Manager', //ok
     '94'  => 'Duplicate resource', //ok
     '95'  => 'Importing resources from HTML', //ok
     '96'  => 'Duplicate Template', //ok
-    '97'  => 'Duplicate Chunk (HTML Snippet)',//ok
+    '97'  => 'Duplicate Chunk (HTML Snippet)', //ok
     '98'  => 'Duplicate Snippet', //ok
     '99'  => 'Manage Web Users', //ok
     '100' => 'Previewing resource', //ok change the plugin priority
@@ -109,19 +109,19 @@ 
     '110' => 'Delete module', //ok
     '111' => 'Duplicate module', //ok
     '112' => 'Execute module', //ok
-    '113' => 'Manage module dependencies',//ok
+    '113' => 'Manage module dependencies', //ok
     '114' => 'View event log', //ok
     '115' => 'View event log details', //ok
     '116' => 'Delete event log', //ok
-    '117' => 'Editing tv rank',  //ok
+    '117' => 'Editing tv rank', //ok
     '118' => 'Call settings ajax include', //ok
-    '119' => 'Login Fail (Temporary Block)',//ok  get the purge processor
+    '119' => 'Login Fail (Temporary Block)', //ok  get the purge processor
 
     '300' => 'Create Template Variable', //ok 300,301
-    '301' => 'Edit Template Variable',//ok 300,301
-    '302' => 'Save Template Variable',//ok
-    '303' => 'Delete Template Variable',//ok
-    '304' => 'Duplicate Template Variable',//ok
+    '301' => 'Edit Template Variable', //ok 300,301
+    '302' => 'Save Template Variable', //ok
+    '303' => 'Delete Template Variable', //ok
+    '304' => 'Duplicate Template Variable', //ok
 
     '200' => 'Viewing phpInfo()', //ok
     '501' => 'Delete category', //ok

core/modifiers/mdf_getimage.inc.php

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
 <?php
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
-preg_match_all($pattern , $value , $images);
-if($opt==='')
+preg_match_all($pattern, $value, $images);
+if ($opt === '')
 {
-    if($images[1][0])  return $images[1][0];
+    if ($images[1][0])  return $images[1][0];
     else               return '';
 }
 else
 {
-    foreach($images[0] as $i=>$image)
+    foreach ($images[0] as $i=>$image)
     {
-        if(strpos($image,$opt)!==false) return $images[1][$i];
+        if (strpos($image, $opt) !== false) return $images[1][$i];
     }
 }
 

Braces +11 added lines, -10 removed lines

@@ -1,16 +1,17 @@
 <?php
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
 preg_match_all($pattern , $value , $images);
-if($opt==='')
-{
-    if($images[1][0])  return $images[1][0];
-    else               return '';
-}
-else
-{
-    foreach($images[0] as $i=>$image)
-    {
-        if(strpos($image,$opt)!==false) return $images[1][$i];
+if($opt==='') {
+    if($images[1][0]) {
+        return $images[1][0];
+    } else {
+        return '';
+    }
+    } else {
+    foreach($images[0] as $i=>$image) {
+        if(strpos($image,$opt)!==false) {
+            return $images[1][$i];
+        }
     }
 }
 

core/modifiers/mdf_addbreak.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
 <?php
 $text = $modx->getModifiers()->parseDocumentSource($value);
-$text = str_replace(array("\r\n","\r"),"\n",$text);
+$text = str_replace(array("\r\n", "\r"), "\n", $text);
 
 $blockElms  = 'br,table,tbody,tr,td,th,thead,tfoot,caption,colgroup,div';
 $blockElms .= ',dl,dd,dt,ul,ol,li,pre,select,option,form,map,area,blockquote';
 $blockElms .= ',address,math,style,input,p,h1,h2,h3,h4,h5,h6,hr,object,param,embed';
 $blockElms .= ',noframes,noscript,section,article,aside,hgroup,footer,address,code';
 $blockElms = explode(',', $blockElms);
-$lines = explode("\n",$text);
+$lines = explode("\n", $text);
 $c = count($lines);
-foreach($lines as $i=>$line)
+foreach ($lines as $i=>$line)
 {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
+    if ($i === $c - 1) break;
+    foreach ($blockElms as $block)
     {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line))
             continue 2;
     }
     $lines[$i] = "{$line}<br />";

Braces +8 added lines, -7 removed lines

@@ -9,14 +9,15 @@
 $blockElms = explode(',', $blockElms);
 $lines = explode("\n",$text);
 $c = count($lines);
-foreach($lines as $i=>$line)
-{
+foreach($lines as $i=>$line) {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
-    {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
-            continue 2;
+    if($i===$c-1) {
+        break;
+    }
+    foreach($blockElms as $block) {
+        if(preg_match("@</?{$block}" . '[^>]*>$@',$line)) {
+                    continue 2;
+        }
     }
     $lines[$i] = "{$line}<br />";
 }

core/modifiers/mdf_memberof.inc.php

Spacing +9 added lines, -9 removed lines

@@ -2,29 +2,29 @@
 $userID = abs($modx->getLoginUserID('web'));
 $modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
 
-$groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
+$groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if (!is_array($groupNames)) return 0;
 
 // Creates an array with all webgroups the user id is in
 if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID];
 else {
     $from = sprintf(
-        $modx->getDatabase()->getFullTableName('webgroup_names') .
-        " wgn INNER JOIN " .
-        $modx->getDatabase()->getFullTableName('web_groups') .
+        $modx->getDatabase()->getFullTableName('webgroup_names').
+        " wgn INNER JOIN ".
+        $modx->getDatabase()->getFullTableName('web_groups').
         " wg ON wg.webgroup=wgn.id AND wg.webuser='%s'",
 
         $userID
     );
-    $rs = $modx->getDatabase()->select('wgn.name',$from);
-    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name',$rs);
+    $rs = $modx->getDatabase()->select('wgn.name', $from);
+    $modx->getModifiers()->cache['mo'][$userID] = $grpNames = $modx->getDatabase()->getColumn('name', $rs);
 }
 
 // Check if a supplied group matches a webgroup from the array we just created
-foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
+foreach ($groupNames as $k=>$v) {
+    if (in_array(trim($v), $grpNames)) return 1;
 }
 
 // If we get here the above logic did not find a match, so return false

Braces +10 added lines, -5 removed lines

@@ -5,11 +5,14 @@ 
 $groupNames = ($this->strlen($opt) > 0 ) ? explode(',',$opt) : array();
 
 // if $groupNames is not an array return false
-if(!is_array($groupNames)) return 0;
+if(!is_array($groupNames)) {
+    return 0;
+}
 
 // Creates an array with all webgroups the user id is in
-if (isset($modx->getModifiers()->cache['mo'][$userID])) $grpNames = $modx->getModifiers()->cache['mo'][$userID];
-else {
+if (isset($modx->getModifiers()->cache['mo'][$userID])) {
+    $grpNames = $modx->getModifiers()->cache['mo'][$userID];
+} else {
     $from = sprintf(
         $modx->getDatabase()->getFullTableName('webgroup_names') .
         " wgn INNER JOIN " .
@@ -24,8 +27,10 @@ 
 
 // Check if a supplied group matches a webgroup from the array we just created
 foreach($groupNames as $k=>$v) {
-    if(in_array(trim($v),$grpNames)) return 1;
-}
+    if(in_array(trim($v),$grpNames)) {
+        return 1;
+    }
+    }
 
 // If we get here the above logic did not find a match, so return false
 return 0;

core/modifiers/mdf_moduser.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$userid = (int)$value;
+$userid = (int) $value;
 if (!isset($modx->getModifiers()->cache['ui'][$userid])) {
     if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
     else             $user = $modx->getUserInfo($userid);

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = (int)$value;
 if (!isset($modx->getModifiers()->cache['ui'][$userid])) {
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
-    else             $user = $modx->getUserInfo($userid);
+    if ($userid < 0) {
+        $user = $modx->getWebUserInfo(abs($userid));
+    } else {
+        $user = $modx->getUserInfo($userid);
+    }
     $modx->getModifiers()->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->getModifiers()->cache['ui'][$userid];

core/modifiers/mdf_wordwrap.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-return preg_replace_callback("~(\b\w+\b)~",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$value);
+return preg_replace_callback("~(\b\w+\b)~", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$value);

core/modifiers/mdf_summary.inc.php

Spacing +19 added lines, -19 removed lines

@@ -1,43 +1,43 @@
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if (strpos($opt, ',')) list($limit, $delim) = explode(',', $opt);
+elseif (preg_match('/^[1-9][0-9]*$/', $opt)) {$limit = $opt; $delim = ''; }
+else {$limit = 124; $delim = ''; }
 
-if($delim==='') $delim = $modx->getConfig('manager_language') === 'japanese-utf8' ? '。' : '.';
-$limit = (int)$limit;
+if ($delim === '') $delim = $modx->getConfig('manager_language') === 'japanese-utf8' ? '。' : '.';
+$limit = (int) $limit;
 
 $content = $modx->getModifiers()->parseDocumentSource($value);
 
 $content = strip_tags($content);
 
-$content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
-    $content = preg_replace('/\s+/',' ',$content);
+$content = str_replace(array("\r\n", "\r", "\n", "\t", '&nbsp;'), ' ', $content);
+if (preg_match('/\s+/', $content))
+    $content = preg_replace('/\s+/', ' ', $content);
 $content = trim($content);
 
 $pos = $modx->getModifiers()->strpos($content, $delim);
 
-if($pos!==false && $pos<$limit) {
+if ($pos !== false && $pos < $limit) {
     $_ = explode($delim, $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) break;
+    foreach ($_ as $v) {
+        if ($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) break;
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
+    if ($text) $content = $text;
 }
 
-if($limit<$modx->getModifiers()->strlen($content) && strpos($content,' ')!==false) {
+if ($limit < $modx->getModifiers()->strlen($content) && strpos($content, ' ') !== false) {
     $_ = explode(' ', $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.' ')) break;
-        $text .= $v . ' ';
+    foreach ($_ as $v) {
+        if ($limit <= $modx->getModifiers()->strlen($text.$v.' ')) break;
+        $text .= $v.' ';
     }
-    if($text!=='') $content = $text;
+    if ($text !== '') $content = $text;
 }
 
-if($limit < $modx->getModifiers()->strlen($content)) $content = $modx->getModifiers()->substr($content, 0, $limit);
-if($modx->getModifiers()->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if ($limit < $modx->getModifiers()->strlen($content)) $content = $modx->getModifiers()->substr($content, 0, $limit);
+if ($modx->getModifiers()->substr($content, -1) == $delim) $content = rtrim($content, $delim).$delim;
 
 return $content;

Braces +28 added lines, -13 removed lines

@@ -1,9 +1,11 @@ 
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if(strpos($opt,',')) {
+    list($limit,$delim) = explode(',', $opt);
+} elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';} else {$limit=124;$delim='';}
 
-if($delim==='') $delim = $modx->getConfig('manager_language') === 'japanese-utf8' ? '。' : '.';
+if($delim==='') {
+    $delim = $modx->getConfig('manager_language') === 'japanese-utf8' ? '。' : '.';
+}
 $limit = (int)$limit;
 
 $content = $modx->getModifiers()->parseDocumentSource($value);
@@ -11,8 +13,9 @@ 
 $content = strip_tags($content);
 
 $content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
+if(preg_match('/\s+/',$content)) {
     $content = preg_replace('/\s+/',' ',$content);
+}
 $content = trim($content);
 
 $pos = $modx->getModifiers()->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->getModifiers()->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->getModifiers()->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->getModifiers()->strlen($text.$v.' ')) break;
+        if($limit <= $modx->getModifiers()->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->getModifiers()->strlen($content)) $content = $modx->getModifiers()->substr($content, 0, $limit);
-if($modx->getModifiers()->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->getModifiers()->strlen($content)) {
+    $content = $modx->getModifiers()->substr($content, 0, $limit);
+}
+if($modx->getModifiers()->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

core/config/logging.php

Spacing +2 added lines, -2 removed lines

@@ -40,13 +40,13 @@
 
         'single' => [
             'driver' => 'single',
-            'path' => EVO_STORAGE_PATH . 'logs/laravel.log',
+            'path' => EVO_STORAGE_PATH.'logs/laravel.log',
             'level' => 'debug',
         ],
 
         'daily' => [
             'driver' => 'daily',
-            'path' => EVO_STORAGE_PATH . 'logs/laravel.log',
+            'path' => EVO_STORAGE_PATH.'logs/laravel.log',
             'level' => 'debug',
             'days' => 7,
         ],

core/config/view.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 return [
     'paths' => [
-        MODX_BASE_PATH . 'views/'
+        MODX_BASE_PATH.'views/'
     ],
-    'compiled' => EVO_STORAGE_PATH . 'blade/',
+    'compiled' => EVO_STORAGE_PATH.'blade/',
 ];