evolution-cms / evolution

manager/processors/undelete_content.processor.php

Indentation +15 added lines, -15 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
@@ -31,14 +31,14 @@ 
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->getDatabase()->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->getDatabase()->getValue($rs);
 if(!$deltime) {
-	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
+    $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
 $children = array();
@@ -46,20 +46,20 @@ 
 getChildrenForUnDelete($id);
 
 if(count($children)>0) {
-	$modx->getDatabase()->update(
-		array(
-			'deleted'   => 0,
-			'deletedby' => 0,
-			'deletedon' => 0,
-		), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
+    $modx->getDatabase()->update(
+        array(
+            'deleted'   => 0,
+            'deletedby' => 0,
+            'deletedon' => 0,
+        ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
 }
 //'undelete' the document.
 $modx->getDatabase()->update(
-	array(
-		'deleted'   => 0,
-		'deletedby' => 0,
-		'deletedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'deleted'   => 0,
+        'deletedby' => 0,
+        'deletedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 $modx->invokeEvent("OnDocFormUnDelete",
     array(

Spacing +14 added lines, -14 removed lines

@@ -1,25 +1,25 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_document')) {
+if (!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
-$content=$modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
@@ -30,14 +30,14 @@ 
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->getDatabase()->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->getDatabase()->getValue($rs);
-if(!$deltime) {
+if (!$deltime) {
 	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
@@ -45,7 +45,7 @@ 
 
 getChildrenForUnDelete($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->getDatabase()->update(
 		array(
 			'deleted'   => 0,
@@ -74,5 +74,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 header($header);

manager/processors/duplicate_tmplvars.processor.php

Indentation +26 added lines, -26 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,37 +19,37 @@ 
 
 // duplicate TV
 $newid = $modx->getDatabase()->insert(
-	array(
-		'type'=>'',
-		'name'=>'',
-		'caption'=>'',
-		'description'=>'',
-		'default_text'=>'',
-		'elements'=>'',
-		'rank'=>'',
-		'display'=>'',
-		'display_params'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_tmplvars'), // Insert into
-	"type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
+    array(
+        'type'=>'',
+        'name'=>'',
+        'caption'=>'',
+        'description'=>'',
+        'default_text'=>'',
+        'elements'=>'',
+        'rank'=>'',
+        'display'=>'',
+        'display_params'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_tmplvars'), // Insert into
+    "type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
 
 
 // duplicate TV Template Access Permissions
 $modx->getDatabase()->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
-	"'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
+    "'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
 
 // duplicate TV Access Permissions
 $modx->getDatabase()->insert(
-	array(
-		'tmplvarid'=>'',
-		'documentgroup'=>'',
-		), $modx->getFullTableName('site_tmplvar_access'), // Insert into
-	"'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'documentgroup'=>'',
+        ), $modx->getFullTableName('site_tmplvar_access'), // Insert into
+    "'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_template')) {
+if (!$modx->hasPermission('edit_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate TV
@@ -56,5 +56,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new variable
-$header="Location: index.php?r=2&a=301&id=$newid";
+$header = "Location: index.php?r=2&a=301&id=$newid";
 header($header);

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate TV
 $newid = $modx->getDatabase()->insert(

index.php

Spacing +16 added lines, -16 removed lines

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

Braces +12 added lines, -6 removed lines

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

Indentation +3 added lines, -3 removed lines

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

manager/includes/src/Legacy/Modifiers.php

Doc Comments +26 added lines, -1 removed lines

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

Braces +4 added lines, -2 removed lines

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

Spacing +45 added lines, -45 removed lines

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

manager/actions/mutate_module_resources.dynamic.php

Indentation +85 added lines, -85 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 if(!$modx->hasPermission('edit_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -26,91 +26,91 @@ 
 // check to see the  editor isn't locked
 $rs = $modx->getDatabase()->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='" . $modx->getLoginUserID() . "'");
 if($username = $modx->getDatabase()->getValue($rs)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
 }
 // end check for lock
 
 // take action
 switch($_REQUEST['op']) {
-	case 'add':
-		// convert ids to numbers
-		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
-
-		if(count($opids) > 0) {
-			// 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
-			$rt = strtolower($_REQUEST["rt"]);
-			if($rt == 'chunk') {
-				$type = 10;
-			}
-			if($rt == 'doc') {
-				$type = 20;
-			}
-			if($rt == 'plug') {
-				$type = 30;
-			}
-			if($rt == 'snip') {
-				$type = 40;
-			}
-			if($rt == 'tpl') {
-				$type = 50;
-			}
-			if($rt == 'tv') {
-				$type = 60;
-			}
-			$modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
-			foreach($opids as $opid) {
-				$modx->getDatabase()->insert(array(
-					'module' => $id,
-					'resource' => $opid,
-					'type' => $type,
-				), $tbl_site_module_depobj);
-			}
-		}
-		break;
-	case 'del':
-		// convert ids to numbers
-		$opids = array_filter(array_map('intval', $_REQUEST['depid']));
-
-		// get resources that needs to be removed
-		$ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
-		// loop through resources and look for plugins and snippets
-		$plids = array();
-		$snid = array();
-		while($row = $modx->getDatabase()->getRow($ds)) {
-			if($row['type'] == '30') {
-				$plids[$i] = $row['resource'];
-			}
-			if($row['type'] == '40') {
-				$snids[$i] = $row['resource'];
-			}
-		}
-		// get guid
-		$ds = $modx->getDatabase()->select('guid', $tbl_site_modules, "id='{$id}'");
-		$guid = $modx->getDatabase()->getValue($ds);
-		// reset moduleguid for deleted resources
-		if(($cp = count($plids)) || ($cs = count($snids))) {
-			if($cp) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
-			}
-			if($cs) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
-			}
-			// reset cache
-			$modx->clearCache('full');
-		}
-		$modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
-		break;
+    case 'add':
+        // convert ids to numbers
+        $opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
+
+        if(count($opids) > 0) {
+            // 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
+            $rt = strtolower($_REQUEST["rt"]);
+            if($rt == 'chunk') {
+                $type = 10;
+            }
+            if($rt == 'doc') {
+                $type = 20;
+            }
+            if($rt == 'plug') {
+                $type = 30;
+            }
+            if($rt == 'snip') {
+                $type = 40;
+            }
+            if($rt == 'tpl') {
+                $type = 50;
+            }
+            if($rt == 'tv') {
+                $type = 60;
+            }
+            $modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
+            foreach($opids as $opid) {
+                $modx->getDatabase()->insert(array(
+                    'module' => $id,
+                    'resource' => $opid,
+                    'type' => $type,
+                ), $tbl_site_module_depobj);
+            }
+        }
+        break;
+    case 'del':
+        // convert ids to numbers
+        $opids = array_filter(array_map('intval', $_REQUEST['depid']));
+
+        // get resources that needs to be removed
+        $ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
+        // loop through resources and look for plugins and snippets
+        $plids = array();
+        $snid = array();
+        while($row = $modx->getDatabase()->getRow($ds)) {
+            if($row['type'] == '30') {
+                $plids[$i] = $row['resource'];
+            }
+            if($row['type'] == '40') {
+                $snids[$i] = $row['resource'];
+            }
+        }
+        // get guid
+        $ds = $modx->getDatabase()->select('guid', $tbl_site_modules, "id='{$id}'");
+        $guid = $modx->getDatabase()->getValue($ds);
+        // reset moduleguid for deleted resources
+        if(($cp = count($plids)) || ($cs = count($snids))) {
+            if($cp) {
+                $modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
+            }
+            if($cs) {
+                $modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
+            }
+            // reset cache
+            $modx->clearCache('full');
+        }
+        $modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
+        break;
 }
 
 // load record
 $rs = $modx->getDatabase()->select('*', $tbl_site_modules, "id = '{$id}'");
 $content = $modx->getDatabase()->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
+    $modx->webAlertAndQuit("Module not found for id '{$id}'.");
 }
 $_SESSION['itemname'] = $content['name'];
 if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 ?>
@@ -203,7 +203,7 @@ 
 				<tr>
 					<td valign="top" align="left">
 						<?php
-						$ds = $modx->getDatabase()->select("smd.id,COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) as name,
+                        $ds = $modx->getDatabase()->select("smd.id,COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) as name,
 				CASE smd.type
 					WHEN 10 THEN 'Chunk'
 					WHEN 20 THEN 'Document'
@@ -218,17 +218,17 @@ 
 					LEFT JOIN {$tbl_site_snippets} AS ss ON ss.id = smd.resource AND smd.type = '40'
 					LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = '50'
 					LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = '60'", "smd.module={$id}", "smd.type,name");
-						$grd = new \EvolutionCMS\Support\DataGrid('', $ds, 0); // set page size to 0 t show all items
-						$grd->noRecordMsg = $_lang["no_records_found"];
-						$grd->cssClass = "grid";
-						$grd->columnHeaderClass = "gridHeader";
-						$grd->itemClass = "gridItem";
-						$grd->altItemClass = "gridAltItem";
-						$grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
-						$grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
-						$grd->fields = "name,type";
-						echo $grd->render();
-						?>
+                        $grd = new \EvolutionCMS\Support\DataGrid('', $ds, 0); // set page size to 0 t show all items
+                        $grd->noRecordMsg = $_lang["no_records_found"];
+                        $grd->cssClass = "grid";
+                        $grd->columnHeaderClass = "gridHeader";
+                        $grd->itemClass = "gridItem";
+                        $grd->altItemClass = "gridAltItem";
+                        $grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
+                        $grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
+                        $grd->fields = "name,type";
+                        echo $grd->render();
+                        ?>
 					</td>
 					<td valign="top" style="width: 150px;">
 						<a class="btn btn-block btn-danger text-left" style="margin-bottom:10px;" href="javascript:;" onclick="removeDependencies();return false;"><i class="<?php echo $_style["actions_delete"] ?>"></i> <?php echo $_lang['remove']; ?></a>

Spacing +30 added lines, -30 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if(!$modx->hasPermission('edit_module')) {
+if (!$modx->hasPermission('edit_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table names (alphabetical)
 $tbl_active_users = $modx->getFullTableName('active_users');
@@ -24,41 +24,41 @@ 
 $modx->getManagerApi()->initPageViewState();
 
 // check to see the  editor isn't locked
-$rs = $modx->getDatabase()->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->getDatabase()->getValue($rs)) {
+$rs = $modx->getDatabase()->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->getDatabase()->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
 }
 // end check for lock
 
 // take action
-switch($_REQUEST['op']) {
+switch ($_REQUEST['op']) {
 	case 'add':
 		// convert ids to numbers
 		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
 
-		if(count($opids) > 0) {
+		if (count($opids) > 0) {
 			// 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
 			$rt = strtolower($_REQUEST["rt"]);
-			if($rt == 'chunk') {
+			if ($rt == 'chunk') {
 				$type = 10;
 			}
-			if($rt == 'doc') {
+			if ($rt == 'doc') {
 				$type = 20;
 			}
-			if($rt == 'plug') {
+			if ($rt == 'plug') {
 				$type = 30;
 			}
-			if($rt == 'snip') {
+			if ($rt == 'snip') {
 				$type = 40;
 			}
-			if($rt == 'tpl') {
+			if ($rt == 'tpl') {
 				$type = 50;
 			}
-			if($rt == 'tv') {
+			if ($rt == 'tv') {
 				$type = 60;
 			}
-			$modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
-			foreach($opids as $opid) {
+			$modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (".implode(',', $opids).") AND type='{$type}'");
+			foreach ($opids as $opid) {
 				$modx->getDatabase()->insert(array(
 					'module' => $id,
 					'resource' => $opid,
@@ -72,15 +72,15 @@ 
 		$opids = array_filter(array_map('intval', $_REQUEST['depid']));
 
 		// get resources that needs to be removed
-		$ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
+		$ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (".implode(",", $opids).")");
 		// loop through resources and look for plugins and snippets
 		$plids = array();
 		$snid = array();
-		while($row = $modx->getDatabase()->getRow($ds)) {
-			if($row['type'] == '30') {
+		while ($row = $modx->getDatabase()->getRow($ds)) {
+			if ($row['type'] == '30') {
 				$plids[$i] = $row['resource'];
 			}
-			if($row['type'] == '40') {
+			if ($row['type'] == '40') {
 				$snids[$i] = $row['resource'];
 			}
 		}
@@ -88,28 +88,28 @@ 
 		$ds = $modx->getDatabase()->select('guid', $tbl_site_modules, "id='{$id}'");
 		$guid = $modx->getDatabase()->getValue($ds);
 		// reset moduleguid for deleted resources
-		if(($cp = count($plids)) || ($cs = count($snids))) {
-			if($cp) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
+		if (($cp = count($plids)) || ($cs = count($snids))) {
+			if ($cp) {
+				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $plids).") AND moduleguid='{$guid}'");
 			}
-			if($cs) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
+			if ($cs) {
+				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $snids).") AND moduleguid='{$guid}'");
 			}
 			// reset cache
 			$modx->clearCache('full');
 		}
-		$modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
+		$modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (".implode(',', $opids).")");
 		break;
 }
 
 // load record
 $rs = $modx->getDatabase()->select('*', $tbl_site_modules, "id = '{$id}'");
 $content = $modx->getDatabase()->getRow($rs);
-if(!$content) {
+if (!$content) {
 	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
 }
 $_SESSION['itemname'] = $content['name'];
-if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -188,13 +188,13 @@ 
 	<input type="hidden" name="id" value="<?php echo $content['id']; ?>" />
 
 	<h1>
-		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['module_resource_title']) ?>
+		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['module_resource_title']) ?>
 	</h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['close'] ?>
 
 	<div class="section">
-		<div class="sectionHeader"><?php echo $content["name"] . " - " . $_lang['module_resource_title']; ?></div>
+		<div class="sectionHeader"><?php echo $content["name"]." - ".$_lang['module_resource_title']; ?></div>
 		<div class="sectionBody">
 			<p><?php echo $_lang['module_resource_msg']; ?></p>
 			<br />
@@ -224,7 +224,7 @@ 
 						$grd->columnHeaderClass = "gridHeader";
 						$grd->itemClass = "gridItem";
 						$grd->altItemClass = "gridAltItem";
-						$grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
+						$grd->columns = $_lang["element_name"]." ,".$_lang["type"];
 						$grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
 						$grd->fields = "name,type";
 						echo $grd->render();

manager/actions/modules.static.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

@@ -107,22 +107,22 @@ 
     <div class="table-responsive">

         <?php

         if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

-            $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

+            $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"'.$_lang['yes'].'","-") as disabled, IF(sm.icon<>"",sm.icon,"'.$_style['icons_modules'].'") as icon

+				FROM ' . $modx->getFullTableName('site_modules').' AS sm

+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id

+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group

+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

             if ($modx->hasPermission('edit_module')) {

-                $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

+                $title = "<a href='index.php?a=108&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";

             } else if ($modx->hasPermission('exec_module')) {

-                $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

+                $title = "<a href='index.php?a=112&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";

             } else {

                 $title = '[+value+]';

             }

         } else {

             $rs = $modx->getDatabase()->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

-            $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

+            $title = "<a href='index.php?a=108&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";

         }

         $grd = new \EvolutionCMS\Support\DataGrid('', $rs, $number_of_results); // set page size to 0 t show all items

         $grd->noRecordMsg = $_lang["no_records_found"];

@@ -131,10 +131,10 @@ 
         $grd->itemClass = "tableItem";

         $grd->altItemClass = "tableAltItem";

         $grd->fields = "icon,name,description,locked,disabled";

-        $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];

+        $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["description"]." ,".$_lang["locked"]." ,".$_lang["disabled"];

         $grd->colWidths = "34,,,60,60";

         $grd->colAligns = "center,,,center,center";

-        $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

+        $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang["click_to_context"]."'><i class='[+value+]'></i></a>||template:".$title;

         if ($listmode == '1') {

             $grd->pageSize = 0;

         }

Braces +12 added lines, -12 removed lines

@@ -1,8 +1,8 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

+if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -10,10 +10,10 @@ 
 $modx->getManagerApi()->initPageViewState();

 

 // get and save search string

-if ($_REQUEST['op'] == 'reset') {

+if ($_REQUEST['op'] == 'reset') {
     $query = '';

     $_PAGE['vs']['search'] = '';

-} else {

+} else {
     $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

     $sqlQuery = $modx->getDatabase()->escape($query);

     $_PAGE['vs']['search'] = $query;

@@ -27,7 +27,7 @@ 
 // context menu

 $cm = new \EvolutionCMS\Support\ContextMenu("cntxm", 150);

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

-if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {

+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
     $cm->addSeparator();

 }

 $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));

@@ -106,21 +106,21 @@ 
 <div class="tab-page">

     <div class="table-responsive">

         <?php

-        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
             $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-            if ($modx->hasPermission('edit_module')) {

+            if ($modx->hasPermission('edit_module')) {
                 $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else if ($modx->hasPermission('exec_module')) {

+            } else if ($modx->hasPermission('exec_module')) {
                 $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else {

+            } else {
                 $title = '[+value+]';

             }

-        } else {

+        } else {
             $rs = $modx->getDatabase()->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

             $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

         }

@@ -135,10 +135,10 @@ 
         $grd->colWidths = "34,,,60,60";

         $grd->colAligns = "center,,,center,center";

         $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

-        if ($listmode == '1') {

+        if ($listmode == '1') {
             $grd->pageSize = 0;

         }

-        if ($_REQUEST['op'] == 'reset') {

+        if ($_REQUEST['op'] == 'reset') {
             $grd->pageNumber = 1;

         }

         // render grid

manager/actions/resource_selector.static.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('edit_module')) {
@@ -63,7 +63,7 @@ 
 
 }
 
-include_once MODX_MANAGER_PATH . "includes/header.inc.php";
+include_once MODX_MANAGER_PATH."includes/header.inc.php";
 ?>
 <script language="JavaScript" type="text/javascript">
     function saveSelection()
@@ -138,7 +138,7 @@ 
 </script>
 
 <h1>
-    <?= $title . " - " . $_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
+    <?= $title." - ".$_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
 </h1>
 
 <div id="actions">
@@ -183,8 +183,8 @@ 
                     $grd->columnHeaderClass = "tableHeader";
                     $grd->itemClass = "tableItem";
                     $grd->altItemClass = "tableAltItem";
-                    $grd->columns = $_lang["name"] . " ," . $_lang["description"];
-                    $grd->colTypes = "template:<input type='" . ($sm == 'm' ? 'checkbox' : 'radio') . "' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
+                    $grd->columns = $_lang["name"]." ,".$_lang["description"];
+                    $grd->colTypes = "template:<input type='".($sm == 'm' ? 'checkbox' : 'radio')."' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
                     $grd->colWidths = "45%";
                     $grd->fields = "name,description";
                     if ($_REQUEST['listmode'] == '1') {

manager/actions/web_user_management.static.php

Indentation +29 added lines, -29 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // initialize page view state - the $_PAGE object
@@ -11,12 +11,12 @@ 
 
 // get and save search string
 if($_REQUEST['op'] == 'reset') {
-	$query = '';
-	$_PAGE['vs']['search'] = '';
+    $query = '';
+    $_PAGE['vs']['search'] = '';
 } else {
-	$query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
-	$sqlQuery = $modx->getDatabase()->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->getDatabase()->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -119,29 +119,29 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
+                    $ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
 			INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
-					$grd = new \EvolutionCMS\Support\DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
-					$grd->noRecordMsg = $_lang["no_records_found"];
-					$grd->cssClass = "table data";
-					$grd->columnHeaderClass = "tableHeader";
-					$grd->itemClass = "tableItem";
-					$grd->altItemClass = "tableAltItem";
-					$grd->fields = "id,username,fullname,email,lastlogin,logincount,blocked";
-					$grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_prevlogin"] . " ," . $_lang["user_logincount"] . " ," . $_lang["user_block"];
-					$grd->colWidths = "1%,,,,1%,1%,1%";
-					$grd->colAligns = "center,,,,right' nowrap='nowrap,right,center";
-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>||template:[+fullname+]||template:[+email+]||date: " . $modx->toDateFormat('[+thislogin+]', 'formatOnly') .
-					" %H:%M";
-					if($listmode == '1') {
-						$grd->pageSize = 0;
-					}
-					if($_REQUEST['op'] == 'reset') {
-						$grd->pageNumber = 1;
-					}
-					// render grid
-					echo $grd->render();
-					?>
+                    $grd = new \EvolutionCMS\Support\DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
+                    $grd->noRecordMsg = $_lang["no_records_found"];
+                    $grd->cssClass = "table data";
+                    $grd->columnHeaderClass = "tableHeader";
+                    $grd->itemClass = "tableItem";
+                    $grd->altItemClass = "tableAltItem";
+                    $grd->fields = "id,username,fullname,email,lastlogin,logincount,blocked";
+                    $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_prevlogin"] . " ," . $_lang["user_logincount"] . " ," . $_lang["user_block"];
+                    $grd->colWidths = "1%,,,,1%,1%,1%";
+                    $grd->colAligns = "center,,,,right' nowrap='nowrap,right,center";
+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>||template:[+fullname+]||template:[+email+]||date: " . $modx->toDateFormat('[+thislogin+]', 'formatOnly') .
+                    " %H:%M";
+                    if($listmode == '1') {
+                        $grd->pageSize = 0;
+                    }
+                    if($_REQUEST['op'] == 'reset') {
+                        $grd->pageNumber = 1;
+                    }
+                    // render grid
+                    echo $grd->render();
+                    ?>
 				</div>
 			</div>
 		</div>

Spacing +9 added lines, -9 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_web_user')) {
+if (!$modx->hasPermission('edit_web_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,7 +10,7 @@ 
 $modx->getManagerApi()->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -119,8 +119,8 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
-			INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
+					$ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users")." wu 
+			INNER JOIN " . $modx->getFullTableName("web_user_attributes")." wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
 					$grd = new \EvolutionCMS\Support\DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
 					$grd->noRecordMsg = $_lang["no_records_found"];
 					$grd->cssClass = "table data";
@@ -128,15 +128,15 @@ 
 					$grd->itemClass = "tableItem";
 					$grd->altItemClass = "tableAltItem";
 					$grd->fields = "id,username,fullname,email,lastlogin,logincount,blocked";
-					$grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_prevlogin"] . " ," . $_lang["user_logincount"] . " ," . $_lang["user_block"];
+					$grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["user_full_name"]." ,".$_lang["email"]." ,".$_lang["user_prevlogin"]." ,".$_lang["user_logincount"]." ,".$_lang["user_block"];
 					$grd->colWidths = "1%,,,,1%,1%,1%";
 					$grd->colAligns = "center,,,,right' nowrap='nowrap,right,center";
-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>||template:[+fullname+]||template:[+email+]||date: " . $modx->toDateFormat('[+thislogin+]', 'formatOnly') .
+					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang["click_to_context"]."'><i class='".$_style["icons_user"]."'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='".$_lang["click_to_edit_title"]."'>[+value+]</a>||template:[+fullname+]||template:[+email+]||date: ".$modx->toDateFormat('[+thislogin+]', 'formatOnly').
 					" %H:%M";
-					if($listmode == '1') {
+					if ($listmode == '1') {
 						$grd->pageSize = 0;
 					}
-					if($_REQUEST['op'] == 'reset') {
+					if ($_REQUEST['op'] == 'reset') {
 						$grd->pageNumber = 1;
 					}
 					// render grid

manager/actions/user_management.static.php

Indentation +53 added lines, -53 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // initialize page view state - the $_PAGE object
@@ -11,12 +11,12 @@ 
 
 // get and save search string
 if($_REQUEST['op'] == 'reset') {
-	$query = '';
-	$_PAGE['vs']['search'] = '';
+    $query = '';
+    $_PAGE['vs']['search'] = '';
 } else {
-	$query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
-	$sqlQuery = $modx->getDatabase()->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->getDatabase()->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -119,54 +119,54 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$where = "";
-					if(!$modx->hasPermission('save_role')) {
-						$where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
-					}
-					if(!empty($sqlQuery)) {
-						$where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
-					}
-					$ds = $modx->getDatabase()->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users') . " AS mu 
+                    $where = "";
+                    if(!$modx->hasPermission('save_role')) {
+                        $where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
+                    }
+                    if(!empty($sqlQuery)) {
+                        $where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
+                    }
+                    $ds = $modx->getDatabase()->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users') . " AS mu 
 			INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id 
 			LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
-					$grd = new \EvolutionCMS\Support\DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
-					$grd->noRecordMsg = $_lang["no_records_found"];
-					$grd->cssClass = "table data";
-					$grd->columnHeaderClass = "tableHeader";
-					$grd->itemClass = "tableItem";
-					$grd->altItemClass = "tableAltItem";
-					$grd->fields = "id,username,fullname,role,email,thislogin,logincount,blocked";
-					$grd->columns = implode(',', array(
-						$_lang["icon"],
-						$_lang["name"],
-						$_lang["user_full_name"],
-						$_lang['role'],
-						$_lang["email"],
-						$_lang["user_prevlogin"],
-						$_lang["user_logincount"],
-						$_lang["user_block"]
-					));
-					$grd->colWidths = "1%,,,,,1%,1%,1%";
-					$grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
-					$grd->colTypes = implode('||', array(
-						'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
-						'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
-						'template:[+fullname+]',
-						'template:[+role+]',
-						'template:[+email+]',
-						'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
-						'template:[+logincount+]',
-						'template:[+blocked+]'
-					));
-					if($listmode == '1') {
-						$grd->pageSize = 0;
-					}
-					if($_REQUEST['op'] == 'reset') {
-						$grd->pageNumber = 1;
-					}
-					// render grid
-					echo $grd->render();
-					?>
+                    $grd = new \EvolutionCMS\Support\DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
+                    $grd->noRecordMsg = $_lang["no_records_found"];
+                    $grd->cssClass = "table data";
+                    $grd->columnHeaderClass = "tableHeader";
+                    $grd->itemClass = "tableItem";
+                    $grd->altItemClass = "tableAltItem";
+                    $grd->fields = "id,username,fullname,role,email,thislogin,logincount,blocked";
+                    $grd->columns = implode(',', array(
+                        $_lang["icon"],
+                        $_lang["name"],
+                        $_lang["user_full_name"],
+                        $_lang['role'],
+                        $_lang["email"],
+                        $_lang["user_prevlogin"],
+                        $_lang["user_logincount"],
+                        $_lang["user_block"]
+                    ));
+                    $grd->colWidths = "1%,,,,,1%,1%,1%";
+                    $grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
+                    $grd->colTypes = implode('||', array(
+                        'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
+                        'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
+                        'template:[+fullname+]',
+                        'template:[+role+]',
+                        'template:[+email+]',
+                        'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
+                        'template:[+logincount+]',
+                        'template:[+blocked+]'
+                    ));
+                    if($listmode == '1') {
+                        $grd->pageSize = 0;
+                    }
+                    if($_REQUEST['op'] == 'reset') {
+                        $grd->pageNumber = 1;
+                    }
+                    // render grid
+                    echo $grd->render();
+                    ?>
 				</div>
 			</div>
 		</div>

Spacing +15 added lines, -15 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_user')) {
+if (!$modx->hasPermission('edit_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,7 +10,7 @@ 
 $modx->getManagerApi()->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -120,15 +120,15 @@ 
 				<div class="table-responsive">
 					<?php
 					$where = "";
-					if(!$modx->hasPermission('save_role')) {
-						$where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
+					if (!$modx->hasPermission('save_role')) {
+						$where .= (empty($where) ? "" : " AND ")."mua.role != 1";
 					}
-					if(!empty($sqlQuery)) {
-						$where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
+					if (!empty($sqlQuery)) {
+						$where .= (empty($where) ? "" : " AND ")."((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
 					}
-					$ds = $modx->getDatabase()->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users') . " AS mu 
-			INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id 
-			LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
+					$ds = $modx->getDatabase()->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users')." AS mu 
+			INNER JOIN " . $modx->getFullTableName('user_attributes')." AS mua ON mua.internalKey=mu.id 
+			LEFT JOIN " . $modx->getFullTableName('user_roles')." AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
 					$grd = new \EvolutionCMS\Support\DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
 					$grd->noRecordMsg = $_lang["no_records_found"];
 					$grd->cssClass = "table data";
@@ -149,19 +149,19 @@ 
 					$grd->colWidths = "1%,,,,,1%,1%,1%";
 					$grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
 					$grd->colTypes = implode('||', array(
-						'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
-						'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
+						'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="'.$_lang['click_to_context'].'"><i class="'.$_style['icons_user'].'"></i></a>',
+						'template:<a href="index.php?a=12&id=[+id+]" title="'.$_lang['click_to_edit_title'].'">[+value+]</a>',
 						'template:[+fullname+]',
 						'template:[+role+]',
 						'template:[+email+]',
-						'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
+						'date: '.$modx->toDateFormat('[+thislogin+]', 'formatOnly').' %H:%M',
 						'template:[+logincount+]',
 						'template:[+blocked+]'
 					));
-					if($listmode == '1') {
+					if ($listmode == '1') {
 						$grd->pageSize = 0;
 					}
-					if($_REQUEST['op'] == 'reset') {
+					if ($_REQUEST['op'] == 'reset') {
 						$grd->pageNumber = 1;
 					}
 					// render grid