Inspection of "Merge pull request #712 from bossloper/patch-71" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( aa0149...6d767d )

by Maxim

created 2018-06-06 20:39 UTC

Status

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 
 // 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->db->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->db->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -120,55 +120,55 @@  discard block
 block discarded – undo
 			<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->db->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->db->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');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-					$grd = new 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();
-					?>
+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    $grd = new 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>

Please login to merge, or discard this patch.

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 $modx->manager->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 
 // context menu
-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";
 $cm = new ContextMenu("cntxm", 150);
 $cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0));
 $cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0));
@@ -121,16 +121,16 @@  discard block
 block discarded – undo
 				<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->db->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');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+					$ds = $modx->db->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');
+					include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 					$grd = new 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";
@@ -151,19 +151,19 @@  discard block
 block discarded – undo
 					$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

Please login to merge, or discard this patch.

manager/actions/web_user_management.static.php 2 patches

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 
 // 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->db->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->db->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -120,30 +120,30 @@  discard block
 block discarded – undo
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->db->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->db->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');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-					$grd = new 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();
-					?>
+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    $grd = new 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>

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 $modx->manager->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 
 // context menu
-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";
 $cm = new ContextMenu("cntxm", 150);
 $cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0));
 $cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0));
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->db->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');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+					$ds = $modx->db->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');
+					include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 					$grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
 					$grd->noRecordMsg = $_lang["no_records_found"];
 					$grd->cssClass = "table data";
@@ -130,15 +130,15 @@  discard block
 block discarded – undo
 					$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

Please login to merge, or discard this patch.

		@@ -1,9 +1,9 @@ discard block
		block discarded – undo
1	1	<?php
2	2	if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3		- die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
	3	+ die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5	if(!$modx->hasPermission('edit_user')) {
6		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	// initialize page view state - the $_PAGE object
		@@ -11,12 +11,12 @@ discard block
		block discarded – undo
11	11
12	12	// get and save search string
13	13	if($_REQUEST['op'] == 'reset') {
14		- $query = '';
15		- $_PAGE['vs']['search'] = '';
	14	+ $query = '';
	15	+ $_PAGE['vs']['search'] = '';
16	16	} else {
17		- $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
18		- $sqlQuery = $modx->db->escape($query);
19		- $_PAGE['vs']['search'] = $query;
	17	+ $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
	18	+ $sqlQuery = $modx->db->escape($query);
	19	+ $_PAGE['vs']['search'] = $query;
20	20	}
21	21
22	22	// get & save listmode
		@@ -120,55 +120,55 @@ discard block
		block discarded – undo
120	120	<div class="row">
121	121	<div class="table-responsive">
122	122	<?php
123		- $where = "";
124		- if(!$modx->hasPermission('save_role')) {
125		- $where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
126		- }
127		- if(!empty($sqlQuery)) {
128		- $where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
129		- }
130		- $ds = $modx->db->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
	123	+ $where = "";
	124	+ if(!$modx->hasPermission('save_role')) {
	125	+ $where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
	126	+ }
	127	+ if(!empty($sqlQuery)) {
	128	+ $where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
	129	+ }
	130	+ $ds = $modx->db->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
131	131	INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id
132	132	LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
133		- include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
134		- $grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
135		- $grd->noRecordMsg = $_lang["no_records_found"];
136		- $grd->cssClass = "table data";
137		- $grd->columnHeaderClass = "tableHeader";
138		- $grd->itemClass = "tableItem";
139		- $grd->altItemClass = "tableAltItem";
140		- $grd->fields = "id,username,fullname,role,email,thislogin,logincount,blocked";
141		- $grd->columns = implode(',', array(
142		- $_lang["icon"],
143		- $_lang["name"],
144		- $_lang["user_full_name"],
145		- $_lang['role'],
146		- $_lang["email"],
147		- $_lang["user_prevlogin"],
148		- $_lang["user_logincount"],
149		- $_lang["user_block"]
150		- ));
151		- $grd->colWidths = "1%,,,,,1%,1%,1%";
152		- $grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
153		- $grd->colTypes = implode('\|\|', array(
154		- 'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
155		- 'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
156		- 'template:[+fullname+]',
157		- 'template:[+role+]',
158		- 'template:[+email+]',
159		- 'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
160		- 'template:[+logincount+]',
161		- 'template:[+blocked+]'
162		- ));
163		- if($listmode == '1') {
164		- $grd->pageSize = 0;
165		- }
166		- if($_REQUEST['op'] == 'reset') {
167		- $grd->pageNumber = 1;
168		- }
169		- // render grid
170		- echo $grd->render();
171		- ?>
	133	+ include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
	134	+ $grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
	135	+ $grd->noRecordMsg = $_lang["no_records_found"];
	136	+ $grd->cssClass = "table data";
	137	+ $grd->columnHeaderClass = "tableHeader";
	138	+ $grd->itemClass = "tableItem";
	139	+ $grd->altItemClass = "tableAltItem";
	140	+ $grd->fields = "id,username,fullname,role,email,thislogin,logincount,blocked";
	141	+ $grd->columns = implode(',', array(
	142	+ $_lang["icon"],
	143	+ $_lang["name"],
	144	+ $_lang["user_full_name"],
	145	+ $_lang['role'],
	146	+ $_lang["email"],
	147	+ $_lang["user_prevlogin"],
	148	+ $_lang["user_logincount"],
	149	+ $_lang["user_block"]
	150	+ ));
	151	+ $grd->colWidths = "1%,,,,,1%,1%,1%";
	152	+ $grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
	153	+ $grd->colTypes = implode('\|\|', array(
	154	+ 'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
	155	+ 'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
	156	+ 'template:[+fullname+]',
	157	+ 'template:[+role+]',
	158	+ 'template:[+email+]',
	159	+ 'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
	160	+ 'template:[+logincount+]',
	161	+ 'template:[+blocked+]'
	162	+ ));
	163	+ if($listmode == '1') {
	164	+ $grd->pageSize = 0;
	165	+ }
	166	+ if($_REQUEST['op'] == 'reset') {
	167	+ $grd->pageNumber = 1;
	168	+ }
	169	+ // render grid
	170	+ echo $grd->render();
	171	+ ?>
172	172	</div>
173	173	</div>
174	174	</div>

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-if(!$modx->hasPermission('edit_user')) {
	5	+if (!$modx->hasPermission('edit_user')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	$modx->manager->initPageViewState();
11	11
12	12	// get and save search string
13		-if($_REQUEST['op'] == 'reset') {
	13	+if ($_REQUEST['op'] == 'reset') {
14	14	$query = '';
15	15	$_PAGE['vs']['search'] = '';
16	16	} else {
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25
26	26
27	27	// context menu
28		-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
	28	+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";
29	29	$cm = new ContextMenu("cntxm", 150);
30	30	$cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0));
31	31	$cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0));
		@@ -121,16 +121,16 @@ discard block
		block discarded – undo
121	121	<div class="table-responsive">
122	122	<?php
123	123	$where = "";
124		- if(!$modx->hasPermission('save_role')) {
125		- $where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
	124	+ if (!$modx->hasPermission('save_role')) {
	125	+ $where .= (empty($where) ? "" : " AND ")."mua.role != 1";
126	126	}
127		- if(!empty($sqlQuery)) {
128		- $where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
	127	+ if (!empty($sqlQuery)) {
	128	+ $where .= (empty($where) ? "" : " AND ")."((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
129	129	}
130		- $ds = $modx->db->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
131		- INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id
132		- LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
133		- include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
	130	+ $ds = $modx->db->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
	131	+ INNER JOIN " . $modx->getFullTableName('user_attributes')." AS mua ON mua.internalKey=mu.id
	132	+ LEFT JOIN " . $modx->getFullTableName('user_roles')." AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
	133	+ include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
134	134	$grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
135	135	$grd->noRecordMsg = $_lang["no_records_found"];
136	136	$grd->cssClass = "table data";
		@@ -151,19 +151,19 @@ discard block
		block discarded – undo
151	151	$grd->colWidths = "1%,,,,,1%,1%,1%";
152	152	$grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
153	153	$grd->colTypes = implode('\|\|', array(
154		- 'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
155		- 'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
	154	+ 'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="'.$_lang['click_to_context'].'"><i class="'.$_style['icons_user'].'"></i></a>',
	155	+ 'template:<a href="index.php?a=12&id=[+id+]" title="'.$_lang['click_to_edit_title'].'">[+value+]</a>',
156	156	'template:[+fullname+]',
157	157	'template:[+role+]',
158	158	'template:[+email+]',
159		- 'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
	159	+ 'date: '.$modx->toDateFormat('[+thislogin+]', 'formatOnly').' %H:%M',
160	160	'template:[+logincount+]',
161	161	'template:[+blocked+]'
162	162	));
163		- if($listmode == '1') {
	163	+ if ($listmode == '1') {
164	164	$grd->pageSize = 0;
165	165	}
166		- if($_REQUEST['op'] == 'reset') {
	166	+ if ($_REQUEST['op'] == 'reset') {
167	167	$grd->pageNumber = 1;
168	168	}
169	169	// render grid

evolution-cms / evolution

Push — develop ( aa0149...6d767d )

Status

Category

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch