Inspection of "remove @IF tags" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 8dee05 )

by Dmytro

created 2018-11-09 14:05 UTC

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

@@ -1,23 +1,23 @@  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('delete_role')) {
+if (!$modx->hasPermission('delete_role')) {
 	$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"]);
 }
 
-if($id==1){
+if ($id == 1) {
 	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
 }
 
 $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$id}'");
-$count=$modx->getDatabase()->getValue($rs);
-if($count>0){
+$count = $modx->getDatabase()->getValue($rs);
+if ($count > 0) {
 	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
 }
 
@@ -28,5 +28,5 @@  discard block
 block discarded – undo
 // delete the attributes
 $modx->getDatabase()->delete($modx->getDatabase()->getFullTableName('user_roles'), "id='{$id}'");
 
-$header="Location: index.php?a=86";
+$header = "Location: index.php?a=86";
 header($header);

Please login to merge, or discard this patch.

manager/processors/empty_table.processor.php 1 patch

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

@@ -1,12 +1,12 @@
 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('settings')) {
+if (!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->getDatabase()->truncate($modx->getDatabase()->getFullTableName('manager_log'));
 
-$header="Location: index.php?a=13";
+$header = "Location: index.php?a=13";
 header($header);

Please login to merge, or discard this patch.

manager/processors/undelete_content.processor.php 1 patch

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

@@ -1,25 +1,25 @@  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('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->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->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 @@  discard block
 block discarded – undo
 $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->getDatabase()->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 @@  discard block
 block discarded – undo
 
 getChildrenForUnDelete($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->getDatabase()->update(
 		array(
 			'deleted'   => 0,
@@ -74,5 +74,5 @@  discard block
 block discarded – undo
 $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);

Please login to merge, or discard this patch.

manager/actions/web_user_management.static.php 1 patch

Spacing +9 added lines, -9 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->getManagerApi()->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
 			<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->getDatabase()->getFullTableName("web_users") . " wu 
-			INNER JOIN " . $modx->getDatabase()->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->getDatabase()->getFullTableName("web_users")." wu 
+			INNER JOIN " . $modx->getDatabase()->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 @@  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.

manager/actions/modules.static.php 1 patch

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

@@ -1,5 +1,5 @@  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('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
@@ -107,22 +107,22 @@  discard block
 block discarded – undo
     <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->getDatabase()->getFullTableName('site_modules') . ' AS sm
-				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
-				LEFT JOIN ' . $modx->getDatabase()->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->getDatabase()->getFullTableName('site_modules').' AS sm
+				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
+				LEFT JOIN ' . $modx->getDatabase()->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->getDatabase()->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 @@  discard block
 block discarded – undo
         $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;
         }

Please login to merge, or discard this patch.

manager/actions/user_management.static.php 1 patch

Spacing +15 added lines, -15 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->getManagerApi()->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -120,15 +120,15 @@  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->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->getDatabase()->getFullTableName('manager_users') . " AS mu 
-			INNER JOIN " . $modx->getDatabase()->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id 
-			LEFT JOIN " . $modx->getDatabase()->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->getDatabase()->getFullTableName('manager_users')." AS mu 
+			INNER JOIN " . $modx->getDatabase()->getFullTableName('user_attributes')." AS mua ON mua.internalKey=mu.id 
+			LEFT JOIN " . $modx->getDatabase()->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 @@  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/logging.static.php 1 patch

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

@@ -1,5 +1,5 @@  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('logs')) {
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');
                             foreach ($logs_user as $row) {
                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';
-                                echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";
+                                echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n";
                             }
                             ?>
                         </select>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
                                     continue;
                                 }
                                 $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';
-                                echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n";
+                                echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n";
                             }
                             ?>
                         </select>
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');
                             foreach ($logs_items as $row) {
                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';
-                                echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";
+                                echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n";
                             }
                             ?>
                         </select>
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');
                             foreach ($logs_names as $row) {
                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';
-                                echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";
+                                echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n";
                             }
                             ?>
                         </select>
@@ -139,26 +139,26 @@  discard block
 block discarded – undo
     // get the selections the user made.
     $sqladd = array();
     if ($_REQUEST['searchuser'] != 0) {
-        $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";
+        $sqladd[] = "internalKey='".(int) $_REQUEST['searchuser']."'";
     }
     if ($_REQUEST['action'] != 0) {
-        $sqladd[] = "action=" . (int)$_REQUEST['action'];
+        $sqladd[] = "action=".(int) $_REQUEST['action'];
     }
     if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
-        $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";
+        $sqladd[] = "itemid='".$_REQUEST['itemid']."'";
     }
     if ($_REQUEST['itemname'] != '0') {
-        $sqladd[] = "itemname='" . $modx->getDatabase()->escape($_REQUEST['itemname']) . "'";
+        $sqladd[] = "itemname='".$modx->getDatabase()->escape($_REQUEST['itemname'])."'";
     }
     if ($_REQUEST['message'] != "") {
-        $sqladd[] = "message LIKE '%" . $modx->getDatabase()->escape($_REQUEST['message']) . "%'";
+        $sqladd[] = "message LIKE '%".$modx->getDatabase()->escape($_REQUEST['message'])."%'";
     }
     // date stuff
     if ($_REQUEST['datefrom'] != "") {
-        $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);
+        $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']);
     }
     if ($_REQUEST['dateto'] != "") {
-        $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);
+        $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']);
     }
 
     // If current position is not set, set it to zero
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
     // Number of result to display on the page, will be in the LIMIT of the sql query also
     $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;
 
-    $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
+    $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
 
     // build the sql
     $limit = $num_rows = $modx->getDatabase()->getValue($modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
     $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
 
 if ($limit < 1) {
-    echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';
+    echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>';
 } else {
-    echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';
+    echo '<p>'.$_lang["mgrlog_sortinst"].'</p>';
 
     // New instance of the Paging class, you can modify the color and the width of the html table
     $p = new EvolutionCMS\Support\Paginate($num_rows, $int_cur_position, $int_num_result, $extargv);
@@ -192,11 +192,11 @@  discard block
 block discarded – undo
     $current_row = $int_cur_position / $int_num_result;
 
     // Display the result as you like...
-    print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower'];
-    print " " . $_lang["paging_to"] . " " . $array_paging['upper'];
-    print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";
-    $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");
-    $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");
+    print "<p>".$_lang["paging_showing"]." ".$array_paging['lower'];
+    print " ".$_lang["paging_to"]." ".$array_paging['upper'];
+    print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";
+    $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " ");
+    $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " ");
     $pagesfound = sizeof($array_row_paging);
     if ($pagesfound > 6) {
         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";
     } else {
         for ($i = 0; $i < $pagesfound; $i++) {
-            $paging .= $array_row_paging[$i] . "&nbsp;";
+            $paging .= $array_row_paging[$i]."&nbsp;";
         }
     }
-    $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " ";
-    $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " ";
+    $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." ";
+    $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." ";
     // The above exemple print somethings like:
     // Results 1 to 20 of 597  <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
     // Of course you can now play with array_row_paging in order to print
@@ -246,16 +246,16 @@  discard block
 block discarded – undo
                     if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
                         $item = '<div style="text-align:center;">-</div>';
                     } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
-                        $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';
+                        $item = '<a href="index.php?a=3&amp;id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>';
                     } else {
                         $item = $logentry['itemname'];
                     }
                     //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'
-                    $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true';
+                    $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true';
                     ?>
                     <tr>
-                        <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td>
-                        <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td>
+                        <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td>
+                        <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td>
                         <td class="text-xs-right"><?= $logentry['itemid'] ?></td>
                         <td><?= $item ?></td>
                         <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td>

Please login to merge, or discard this patch.

manager/includes/user_settings.inc.php 1 patch

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

@@ -14,7 +14,7 @@
 block discarded – undo
 if (!empty($user_id)) {
     // Raymond: grab the user settings from the database.
     $rs = $modx->getDatabase()->select('setting_name, setting_value', $modx->getDatabase()->getFullTableName('user_settings'),
-        "user=" . $modx->getLoginUserID());
+        "user=".$modx->getLoginUserID());
 
     $which_browser_default = $which_browser;
     while ($row = $modx->getDatabase()->getRow($rs)) {

Please login to merge, or discard this patch.

manager/includes/secure_mgr_documents.inc.php 1 patch

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

@@ -20,14 +20,14 @@
 block discarded – undo
         ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
     $rs = $modx->getDatabase()->select(
         'DISTINCT sc.id',
-        $modx->getDatabase()->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getDatabase()->getFullTableName("membergroup_access") . " mga ON mga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "mga.id>0"
+        $modx->getDatabase()->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getDatabase()->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
     );
     $ids = $modx->getDatabase()->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->getDatabase()->update('privatemgr = 1', $modx->getDatabase()->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ 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	5	if (!$modx->hasPermission('logs')) {
		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28	$logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');
29	29	foreach ($logs_user as $row) {
30	30	$selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';
31		- echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";
	31	+ echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n";
32	32	}
33	33	?>
34	34	</select>
		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	continue;
50	50	}
51	51	$selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';
52		- echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n";
	52	+ echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n";
53	53	}
54	54	?>
55	55	</select>
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	$logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');
66	66	foreach ($logs_items as $row) {
67	67	$selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';
68		- echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";
	68	+ echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n";
69	69	}
70	70	?>
71	71	</select>
		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81	$logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');
82	82	foreach ($logs_names as $row) {
83	83	$selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';
84		- echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";
	84	+ echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n";
85	85	}
86	86	?>
87	87	</select>
		@@ -139,26 +139,26 @@ discard block
		block discarded – undo
139	139	// get the selections the user made.
140	140	$sqladd = array();
141	141	if ($_REQUEST['searchuser'] != 0) {
142		- $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";
	142	+ $sqladd[] = "internalKey='".(int) $_REQUEST['searchuser']."'";
143	143	}
144	144	if ($_REQUEST['action'] != 0) {
145		- $sqladd[] = "action=" . (int)$_REQUEST['action'];
	145	+ $sqladd[] = "action=".(int) $_REQUEST['action'];
146	146	}
147	147	if ($_REQUEST['itemid'] != 0 \|\| $_REQUEST['itemid'] == "-") {
148		- $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";
	148	+ $sqladd[] = "itemid='".$_REQUEST['itemid']."'";
149	149	}
150	150	if ($_REQUEST['itemname'] != '0') {
151		- $sqladd[] = "itemname='" . $modx->getDatabase()->escape($_REQUEST['itemname']) . "'";
	151	+ $sqladd[] = "itemname='".$modx->getDatabase()->escape($_REQUEST['itemname'])."'";
152	152	}
153	153	if ($_REQUEST['message'] != "") {
154		- $sqladd[] = "message LIKE '%" . $modx->getDatabase()->escape($_REQUEST['message']) . "%'";
	154	+ $sqladd[] = "message LIKE '%".$modx->getDatabase()->escape($_REQUEST['message'])."%'";
155	155	}
156	156	// date stuff
157	157	if ($_REQUEST['datefrom'] != "") {
158		- $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);
	158	+ $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']);
159	159	}
160	160	if ($_REQUEST['dateto'] != "") {
161		- $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);
	161	+ $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']);
162	162	}
163	163
164	164	// If current position is not set, set it to zero
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	// Number of result to display on the page, will be in the LIMIT of the sql query also
172	172	$int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;
173	173
174		- $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
	174	+ $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
175	175
176	176	// build the sql
177	177	$limit = $num_rows = $modx->getDatabase()->getValue($modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
		@@ -179,9 +179,9 @@ discard block
		block discarded – undo
179	179	$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
180	180
181	181	if ($limit < 1) {
182		- echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';
	182	+ echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>';
183	183	} else {
184		- echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';
	184	+ echo '<p>'.$_lang["mgrlog_sortinst"].'</p>';
185	185
186	186	// New instance of the Paging class, you can modify the color and the width of the html table
187	187	$p = new EvolutionCMS\Support\Paginate($num_rows, $int_cur_position, $int_num_result, $extargv);
		@@ -192,11 +192,11 @@ discard block
		block discarded – undo
192	192	$current_row = $int_cur_position / $int_num_result;
193	193
194	194	// Display the result as you like...
195		- print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower'];
196		- print " " . $_lang["paging_to"] . " " . $array_paging['upper'];
197		- print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";
198		- $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");
199		- $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");
	195	+ print "<p>".$_lang["paging_showing"]." ".$array_paging['lower'];
	196	+ print " ".$_lang["paging_to"]." ".$array_paging['upper'];
	197	+ print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";
	198	+ $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " ");
	199	+ $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " ");
200	200	$pagesfound = sizeof($array_row_paging);
201	201	if ($pagesfound > 6) {
202	202	$paging .= $array_row_paging[$current_row - 2]; // ." ";
		@@ -206,11 +206,11 @@ discard block
		block discarded – undo
206	206	$paging .= $array_row_paging[$current_row + 2]; // ." ";
207	207	} else {
208	208	for ($i = 0; $i < $pagesfound; $i++) {
209		- $paging .= $array_row_paging[$i] . " ";
	209	+ $paging .= $array_row_paging[$i]." ";
210	210	}
211	211	}
212		- $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " ";
213		- $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " ";
	212	+ $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." ";
	213	+ $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." ";
214	214	// The above exemple print somethings like:
215	215	// Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
216	216	// Of course you can now play with array_row_paging in order to print
		@@ -246,16 +246,16 @@ discard block
		block discarded – undo
246	246	if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
247	247	$item = '<div style="text-align:center;">-</div>';
248	248	} elseif ($logentry['action'] == 3 \|\| $logentry['action'] == 27 \|\| $logentry['action'] == 5) {
249		- $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';
	249	+ $item = '<a href="index.php?a=3&id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>';
250	250	} else {
251	251	$item = $logentry['itemname'];
252	252	}
253	253	//index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'
254		- $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true';
	254	+ $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true';
255	255	?>
256	256	<tr>
257		- <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td>
258		- <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td>
	257	+ <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td>
	258	+ <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td>
259	259	<td class="text-xs-right"><?= $logentry['itemid'] ?></td>
260	260	<td><?= $item ?></td>
261	261	<td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td>

		@@ -1,23 +1,23 @@ 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('delete_role')) {
	5	+if (!$modx->hasPermission('delete_role')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10		-if($id==0) {
	9	+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14		-if($id==1){
	14	+if ($id == 1) {
15	15	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
16	16	}
17	17
18	18	$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$id}'");
19		-$count=$modx->getDatabase()->getValue($rs);
20		-if($count>0){
	19	+$count = $modx->getDatabase()->getValue($rs);
	20	+if ($count > 0) {
21	21	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
22	22	}
23	23
		@@ -28,5 +28,5 @@ discard block
		block discarded – undo
28	28	// delete the attributes
29	29	$modx->getDatabase()->delete($modx->getDatabase()->getFullTableName('user_roles'), "id='{$id}'");
30	30
31		-$header="Location: index.php?a=86";
	31	+$header = "Location: index.php?a=86";
32	32	header($header);

		@@ -1,12 +1,12 @@
		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('settings')) {
	5	+if (!$modx->hasPermission('settings')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9	9	$modx->getDatabase()->truncate($modx->getDatabase()->getFullTableName('manager_log'));
10	10
11		-$header="Location: index.php?a=13";
	11	+$header = "Location: index.php?a=13";
12	12	header($header);

		@@ -1,25 +1,25 @@ 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('delete_document')) {
	5	+if (!$modx->hasPermission('delete_document')) {
6	6	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7	7	}
8	8
9		-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
10		-if($id==0) {
	9	+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
	10	+if ($id == 0) {
11	11	$modx->webAlertAndQuit($_lang["error_no_id"]);
12	12	}
13	13
14	14	/********** webber ******/
15		-$content=$modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
16		-$pid=($content['parent']==0?$id:$content['parent']);
	15	+$content = $modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
	16	+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
17	17
18	18	/************ webber ***********/
19		-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
20		-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
21		-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
22		-$add_path=$sd.$sb.$pg;
	19	+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
	20	+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
	21	+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
	22	+$add_path = $sd.$sb.$pg;
23	23
24	24	/***********************************/
25	25
		@@ -30,14 +30,14 @@ discard block
		block discarded – undo
30	30	$udperms->document = $id;
31	31	$udperms->role = $_SESSION['mgrRole'];
32	32
33		-if(!$udperms->checkPermissions()) {
	33	+if (!$udperms->checkPermissions()) {
34	34	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
35	35	}
36	36
37	37	// get the timestamp on which the document was deleted.
38	38	$rs = $modx->getDatabase()->select('deletedon', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
39	39	$deltime = $modx->getDatabase()->getValue($rs);
40		-if(!$deltime) {
	40	+if (!$deltime) {
41	41	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
42	42	}
43	43
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45
46	46	getChildrenForUnDelete($id);
47	47
48		-if(count($children)>0) {
	48	+if (count($children) > 0) {
49	49	$modx->getDatabase()->update(
50	50	array(
51	51	'deleted' => 0,
		@@ -74,5 +74,5 @@ discard block
		block discarded – undo
74	74	$modx->clearCache('full');
75	75
76	76	// finished emptying cache - redirect
77		-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
	77	+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
78	78	header($header);

		@@ -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_web_user')) {
	5	+if (!$modx->hasPermission('edit_web_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->getManagerApi()->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 {
		@@ -119,8 +119,8 @@ discard block
		block discarded – undo
119	119	<div class="row">
120	120	<div class="table-responsive">
121	121	<?php
122		- $ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getDatabase()->getFullTableName("web_users") . " wu
123		- INNER JOIN " . $modx->getDatabase()->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');
	122	+ $ds = $modx->getDatabase()->select("wu.id, wu.username, wua.fullname, wua.email, wua.lastlogin, wua.logincount, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getDatabase()->getFullTableName("web_users")." wu
	123	+ INNER JOIN " . $modx->getDatabase()->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');
124	124	$grd = new \EvolutionCMS\Support\DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
125	125	$grd->noRecordMsg = $_lang["no_records_found"];
126	126	$grd->cssClass = "table data";
		@@ -128,15 +128,15 @@ discard block
		block discarded – undo
128	128	$grd->itemClass = "tableItem";
129	129	$grd->altItemClass = "tableAltItem";
130	130	$grd->fields = "id,username,fullname,email,lastlogin,logincount,blocked";
131		- $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_prevlogin"] . " ," . $_lang["user_logincount"] . " ," . $_lang["user_block"];
	131	+ $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["user_full_name"]." ,".$_lang["email"]." ,".$_lang["user_prevlogin"]." ,".$_lang["user_logincount"]." ,".$_lang["user_block"];
132	132	$grd->colWidths = "1%,,,,1%,1%,1%";
133	133	$grd->colAligns = "center,,,,right' nowrap='nowrap,right,center";
134		- $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') .
	134	+ $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').
135	135	" %H:%M";
136		- if($listmode == '1') {
	136	+ if ($listmode == '1') {
137	137	$grd->pageSize = 0;
138	138	}
139		- if($_REQUEST['op'] == 'reset') {
	139	+ if ($_REQUEST['op'] == 'reset') {
140	140	$grd->pageNumber = 1;
141	141	}
142	142	// render grid

		@@ -14,7 +14,7 @@
		block discarded – undo
14	14	if (!empty($user_id)) {
15	15	// Raymond: grab the user settings from the database.
16	16	$rs = $modx->getDatabase()->select('setting_name, setting_value', $modx->getDatabase()->getFullTableName('user_settings'),
17		- "user=" . $modx->getLoginUserID());
	17	+ "user=".$modx->getLoginUserID());
18	18
19	19	$which_browser_default = $which_browser;
20	20	while ($row = $modx->getDatabase()->getRow($rs)) {

		@@ -20,14 +20,14 @@
		block discarded – undo
20	20	($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
21	21	$rs = $modx->getDatabase()->select(
22	22	'DISTINCT sc.id',
23		- $modx->getDatabase()->getFullTableName("site_content") . " sc
24		- LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups") . " dg ON dg.document = sc.id
25		- LEFT JOIN " . $modx->getDatabase()->getFullTableName("membergroup_access") . " mga ON mga.documentgroup = dg.document_group",
26		- ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "mga.id>0"
	23	+ $modx->getDatabase()->getFullTableName("site_content")." sc
	24	+ LEFT JOIN " . $modx->getDatabase()->getFullTableName("document_groups")." dg ON dg.document = sc.id
	25	+ LEFT JOIN " . $modx->getDatabase()->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
	26	+ ($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
27	27	);
28	28	$ids = $modx->getDatabase()->getColumn("id", $rs);
29	29	if (count($ids) > 0) {
30	30	$modx->getDatabase()->update('privatemgr = 1', $modx->getDatabase()->getFullTableName("site_content"),
31		- "id IN (" . implode(", ", $ids) . ")");
	31	+ "id IN (".implode(", ", $ids).")");
32	32	}
33	33	}

evolution-cms / evolution

Push — develop ( 8dee05 )

Category

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

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

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

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

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

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

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

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

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