evolution-cms / evolution

manager/actions/mutate_categories.dynamic.php

Indentation +18 added lines, -18 removed lines

@@ -4,24 +4,24 @@ 
 }
 
 if(!$modx->hasPermission('category_manager')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $_module_params = array(
-	'module_version'   => '1.0.0',
-	'module_params'    => '',
-	'module_id'        => $_GET['id'],
-	'package_name'     => 'Module_Categories_Manager',
-	'native_language'  => 'de',
-	'name'             => 'Categories Manager',
-	'dirname'          => $site_manager_url,
-	'url'              => 'index.php?a=120&id=' . $_GET['id'],
-	'path'             => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR,
-	'inc_dir'          => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR,
-	'languages_dir'    => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR,
-	'views_dir'        => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR,
-	'request_key'      => 'module_categories_manager',
-	'messages'         => array()
+    'module_version'   => '1.0.0',
+    'module_params'    => '',
+    'module_id'        => $_GET['id'],
+    'package_name'     => 'Module_Categories_Manager',
+    'native_language'  => 'de',
+    'name'             => 'Categories Manager',
+    'dirname'          => $site_manager_url,
+    'url'              => 'index.php?a=120&id=' . $_GET['id'],
+    'path'             => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR,
+    'inc_dir'          => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR,
+    'languages_dir'    => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR,
+    'views_dir'        => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR,
+    'request_key'      => 'module_categories_manager',
+    'messages'         => array()
 );
 
 require_once $_module_params['inc_dir'] . 'Module_Categories_Manager.php';
@@ -30,7 +30,7 @@ 
 // assign module_params to internal params
 foreach( $_module_params as $param => $value )
 {
-	$cm->set( $param, $value );
+    $cm->set( $param, $value );
 }
 
 // catch the request actions
@@ -38,8 +38,8 @@ 
 
 if( !$categories = $cm->getCategories() )
 {
-	setcookie('webfxtab_manage-categories-pane', 0 );
-	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
+    setcookie('webfxtab_manage-categories-pane', 0 );
+    $cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
 }
 
 $cm->renderView('main', $categories );

Spacing +15 added lines, -15 removed lines

@@ -1,9 +1,9 @@ 
 <?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('category_manager')) {
+if (!$modx->hasPermission('category_manager')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -15,32 +15,32 @@ 
 	'native_language'  => 'de',
 	'name'             => 'Categories Manager',
 	'dirname'          => $site_manager_url,
-	'url'              => 'index.php?a=120&amp;id=' . $_GET['id'],
-	'path'             => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR,
-	'inc_dir'          => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR,
-	'languages_dir'    => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR,
-	'views_dir'        => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR,
+	'url'              => 'index.php?a=120&amp;id='.$_GET['id'],
+	'path'             => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR,
+	'inc_dir'          => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'inc'.DIRECTORY_SEPARATOR,
+	'languages_dir'    => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR,
+	'views_dir'        => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'skin'.DIRECTORY_SEPARATOR,
 	'request_key'      => 'module_categories_manager',
 	'messages'         => array()
 );
 
-require_once $_module_params['inc_dir'] . 'Module_Categories_Manager.php';
+require_once $_module_params['inc_dir'].'Module_Categories_Manager.php';
 $cm = new Module_Categories_Manager();
 
 // assign module_params to internal params
-foreach( $_module_params as $param => $value )
+foreach ($_module_params as $param => $value)
 {
-	$cm->set( $param, $value );
+	$cm->set($param, $value);
 }
 
 // catch the request actions
-include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
+include_once $cm->get('inc_dir').'request_trigger.inc.php';
 
-if( !$categories = $cm->getCategories() )
+if (!$categories = $cm->getCategories())
 {
-	setcookie('webfxtab_manage-categories-pane', 0 );
-	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
+	setcookie('webfxtab_manage-categories-pane', 0);
+	$cm->addMessage($cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global');
 }
 
-$cm->renderView('main', $categories );
+$cm->renderView('main', $categories);
 return;

Braces +2 added lines, -4 removed lines

@@ -28,16 +28,14 @@
 $cm = new Module_Categories_Manager();
 
 // assign module_params to internal params
-foreach( $_module_params as $param => $value )
-{
+foreach( $_module_params as $param => $value ) {
 	$cm->set( $param, $value );
 }
 
 // catch the request actions
 include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
 
-if( !$categories = $cm->getCategories() )
-{
+if( !$categories = $cm->getCategories() ) {
 	setcookie('webfxtab_manage-categories-pane', 0 );
 	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
 }

manager/actions/user_management.static.php

Indentation +54 added lines, -54 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->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 @@ 
 			<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, ELT(mua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin", $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, ELT(mua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin", $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,gender,blocked,thislogin";
-					$grd->columns = implode(',', array(
-						$_lang["icon"],
-						$_lang["name"],
-						$_lang["user_full_name"],
-						$_lang['role'],
-						$_lang["email"],
-						$_lang["user_gender"],
-						$_lang["user_block"],
-						$_lang["login_button"]
-					));
-					$grd->colWidths = "1%,,,,,,1%,1%";
-					$grd->colAligns = "center,,,,,center,center,right' nowrap='nowrap";
-					$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+]',
-						'template:[+gender+]',
-						'template:[+blocked+]',
-						'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, $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,gender,blocked,thislogin";
+                    $grd->columns = implode(',', array(
+                        $_lang["icon"],
+                        $_lang["name"],
+                        $_lang["user_full_name"],
+                        $_lang['role'],
+                        $_lang["email"],
+                        $_lang["user_gender"],
+                        $_lang["user_block"],
+                        $_lang["login_button"]
+                    ));
+                    $grd->colWidths = "1%,,,,,,1%,1%";
+                    $grd->colAligns = "center,,,,,center,center,right' nowrap='nowrap";
+                    $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+]',
+                        'template:[+gender+]',
+                        'template:[+blocked+]',
+                        '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 +17 added lines, -17 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->manager->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -25,7 +25,7 @@ 
 
 
 // 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 @@ 
 				<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, ELT(mua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin", $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, ELT(mua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin", $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 @@ 
 					$grd->colWidths = "1%,,,,,,1%,1%";
 					$grd->colAligns = "center,,,,,center,center,right' nowrap='nowrap";
 					$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+]',
 						'template:[+gender+]',
 						'template:[+blocked+]',
-						'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M'
+						'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/document_data.static.php

Indentation +151 added lines, -151 removed lines

@@ -1,16 +1,16 @@ 
 <?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(isset($_REQUEST['id'])) {
-	$id = (int) $_REQUEST['id'];
+    $id = (int) $_REQUEST['id'];
 } else {
-	$id = 0;
+    $id = 0;
 }
 
 if(isset($_GET['opened'])) {
-	$_SESSION['openedArray'] = $_GET['opened'];
+    $_SESSION['openedArray'] = $_GET['opened'];
 }
 
 $url = $modx->config['site_url'];
@@ -23,17 +23,17 @@ 
 
 // Get access permissions
 if($_SESSION['mgrDocgroups']) {
-	$docgrp = implode(",", $_SESSION['mgrDocgroups']);
+    $docgrp = implode(",", $_SESSION['mgrDocgroups']);
 }
 $access = "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0" . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
 
 //
 if($_SESSION['tree_show_only_folders']) {
-	$parent = $id ? ($modx->db->getValue("SELECT parent FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1")) : 0;
-	$isfolder = $modx->db->getValue("SELECT isfolder FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1");
-	if(!$isfolder && $parent != 0) {
-		$id = $_REQUEST['id'] = $parent;
-	}
+    $parent = $id ? ($modx->db->getValue("SELECT parent FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1")) : 0;
+    $isfolder = $modx->db->getValue("SELECT isfolder FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1");
+    if(!$isfolder && $parent != 0) {
+        $id = $_REQUEST['id'] = $parent;
+    }
 }
 
 // Get the document content
@@ -41,7 +41,7 @@ 
 		LEFT JOIN {$tbl_document_groups} AS dg ON dg.document = sc.id", "sc.id ='{$id}' AND ({$access})");
 $content = $modx->db->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 /**
@@ -85,134 +85,134 @@ 
 $filter_sort = '';
 $filter_dir = '';
 if($numRecords > 0) {
-	$filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&dir=' . $dir . '&sort=\'+this.options[this.selectedIndex].value">' . '<option value="createdon"' . (($sort == 'createdon') ? ' selected' : '') . '>' . $_lang['createdon'] . '</option>' . '<option value="pub_date"' . (($sort == 'pub_date') ? ' selected' : '') . '>' . $_lang["page_data_publishdate"] . '</option>' . '<option value="pagetitle"' . (($sort == 'pagetitle') ? ' selected' : '') . '>' . $_lang['pagetitle'] . '</option>' . '<option value="menuindex"' . (($sort == 'menuindex') ? ' selected' : '') . '>' . $_lang['resource_opt_menu_index'] . '</option>' . //********  resource_opt_is_published - //
-		'<option value="published"' . (($sort == 'published') ? ' selected' : '') . '>' . $_lang['resource_opt_is_published'] . '</option>' . //********//
-		'</select>';
-	$filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&sort=' . $sort . '&dir=\'+this.options[this.selectedIndex].value">' . '<option value="DESC"' . (($dir == 'DESC') ? ' selected' : '') . '>' . $_lang['sort_desc'] . '</option>' . '<option value="ASC"' . (($dir == 'ASC') ? ' selected' : '') . '>' . $_lang['sort_asc'] . '</option>' . '</select>';
-	$resource = $modx->db->makeArray($rs);
-
-	// CSS style for table
-	//	$tableClass = 'grid';
-	//	$rowHeaderClass = 'gridHeader';
-	//	$rowRegularClass = 'gridItem';
-	//	$rowAlternateClass = 'gridAltItem';
-	$tableClass = 'table data nowrap';
-	$columnHeaderClass = array(
-		'text-center',
-		'text-left',
-		'text-center',
-		'text-center',
-		'text-center',
-		'text-center'
-	);
-
-
-	$modx->table->setTableClass($tableClass);
-	$modx->table->setColumnHeaderClass($columnHeaderClass);
-	//	$modx->table->setRowHeaderClass($rowHeaderClass);
-	//	$modx->table->setRowRegularClass($rowRegularClass);
-	//	$modx->table->setRowAlternateClass($rowAlternateClass);
-
-	// Table header
-	$listTableHeader = array(
-		'docid' => $_lang['id'],
-		'title' => $_lang['resource_title'],
-		'createdon' => $_lang['createdon'],
-		'pub_date' => $_lang['page_data_publishdate'],
-		'status' => $_lang['page_data_status'],
-		'edit' => $_lang['mgrlog_action'],
-	);
-	$tbWidth = array(
-		'1%',
-		'',
-		'1%',
-		'1%',
-		'1%',
-		'1%'
-	);
-	$modx->table->setColumnWidths($tbWidth);
-
-	$sd = isset($_REQUEST['dir']) ? '&amp;dir=' . $_REQUEST['dir'] : '&amp;dir=DESC';
-	$sb = isset($_REQUEST['sort']) ? '&amp;sort=' . $_REQUEST['sort'] : '&amp;sort=createdon';
-	$pg = isset($_REQUEST['page']) ? '&amp;page=' . (int) $_REQUEST['page'] : '';
-	$add_path = $sd . $sb . $pg;
-
-	$icons = array(
-		'text/html' => $_style['tree_page_html'],
-		'text/plain' => $_style['tree_page'],
-		'text/xml' => $_style['tree_page_xml'],
-		'text/css' => $_style['tree_page_css'],
-		'text/javascript' => $_style['tree_page_js'],
-		'application/rss+xml' => $_style['tree_page_rss'],
-		'application/pdf' => $_style['tree_page_pdf'],
-		'application/vnd.ms-word' => $_style['tree_page_word'],
-		'application/vnd.ms-excel' => $_style['tree_page_excel'],
-		'image/gif' => $_style['tree_page_gif'],
-		'image/jpg' => $_style['tree_page_jpg'],
-		'image/png' => $_style['tree_page_png']
-	);
-
-	$listDocs = array();
-	foreach($resource as $k => $children) {
-
-		switch($children['id']) {
-			case $modx->config['site_start']            :
-				$icon = $_style['tree_page_home'];
-				break;
-			case $modx->config['error_page']            :
-				$icon = $_style['tree_page_404'];
-				break;
-			case $modx->config['site_unavailable_page'] :
-				$icon = $_style['tree_page_hourglass'];
-				break;
-			case $modx->config['unauthorized_page']     :
-				$icon = $_style['tree_page_info'];
-				break;
-			default:
-				if($children['isfolder']) {
-					$icon = $_style['tree_folder_new'];
-				} else {
-					if(isset($icons[$children['contentType']])) {
-						$icon = $icons[$children['contentType']];
-					} else {
-						$icon = $_style['tree_page'];
-					}
-				}
-		}
-
-		$private = ($children['privateweb'] || $children['privatemgr'] ? ' private' : '');
-
-		// дописываем в заголовок класс для неопубликованных плюс по всем ссылкам обратный путь
-		// для сохранения сортировки
-		$class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish'));
-		//$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary');
-		//$class .= ($children['isfolder'] ? ' font-weight-bold' : '');
-		if($modx->hasPermission('edit_document')) {
-			$title = '<span class="doc-item' . $private . '">' . $icon . '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '">' . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></a></span>';
-		} else {
-			$title = '<span class="doc-item' . $private . '">' . $icon . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></span>';
-		}
-
-		$icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["publish_resource"] . '"><i class="' . $_style["icons_publish_document"] . '"></i></a>' : '<a href="index.php?a=62&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["unpublish_resource"] . '"><i class="' . $_style["icons_unpublish_resource"] . '" ></i></a>';
-
-		$icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\'' . $_lang["confirm_delete_resource"] . '\')" href="index.php?a=6&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['delete_resource'] . '"><i class="' . $_style["icons_delete_resource"] . '"></i></a>' : '<a onclick="return confirm(\'' . $_lang["confirm_undelete"] . '\')" href="index.php?a=63&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['undelete_resource'] . '"><i class="' . $_style["icons_undelete_resource"] . '"></i></a>';
-
-		$listDocs[] = array(
-			'docid' => '<div class="text-right">' . $children['id'] . '</div>',
-			'title' => $title,
-			'createdon' => '<div class="text-right">' . ($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')) . '</div>',
-			'pub_date' => '<div class="text-right">' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '') . '</div>',
-			'status' => '<div class="text-nowrap">' . ($children['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publishedDoc">' . $_lang['page_data_published'] . '</span>') . '</div>',
-			'edit' => '<div class="actions text-center text-nowrap">' . ($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['edit'] . '"><i class="' . $_style["icons_edit_resource"] . '"></i></a><a href="index.php?a=51&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['move'] . '"><i 
+    $filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&dir=' . $dir . '&sort=\'+this.options[this.selectedIndex].value">' . '<option value="createdon"' . (($sort == 'createdon') ? ' selected' : '') . '>' . $_lang['createdon'] . '</option>' . '<option value="pub_date"' . (($sort == 'pub_date') ? ' selected' : '') . '>' . $_lang["page_data_publishdate"] . '</option>' . '<option value="pagetitle"' . (($sort == 'pagetitle') ? ' selected' : '') . '>' . $_lang['pagetitle'] . '</option>' . '<option value="menuindex"' . (($sort == 'menuindex') ? ' selected' : '') . '>' . $_lang['resource_opt_menu_index'] . '</option>' . //********  resource_opt_is_published - //
+        '<option value="published"' . (($sort == 'published') ? ' selected' : '') . '>' . $_lang['resource_opt_is_published'] . '</option>' . //********//
+        '</select>';
+    $filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&sort=' . $sort . '&dir=\'+this.options[this.selectedIndex].value">' . '<option value="DESC"' . (($dir == 'DESC') ? ' selected' : '') . '>' . $_lang['sort_desc'] . '</option>' . '<option value="ASC"' . (($dir == 'ASC') ? ' selected' : '') . '>' . $_lang['sort_asc'] . '</option>' . '</select>';
+    $resource = $modx->db->makeArray($rs);
+
+    // CSS style for table
+    //	$tableClass = 'grid';
+    //	$rowHeaderClass = 'gridHeader';
+    //	$rowRegularClass = 'gridItem';
+    //	$rowAlternateClass = 'gridAltItem';
+    $tableClass = 'table data nowrap';
+    $columnHeaderClass = array(
+        'text-center',
+        'text-left',
+        'text-center',
+        'text-center',
+        'text-center',
+        'text-center'
+    );
+
+
+    $modx->table->setTableClass($tableClass);
+    $modx->table->setColumnHeaderClass($columnHeaderClass);
+    //	$modx->table->setRowHeaderClass($rowHeaderClass);
+    //	$modx->table->setRowRegularClass($rowRegularClass);
+    //	$modx->table->setRowAlternateClass($rowAlternateClass);
+
+    // Table header
+    $listTableHeader = array(
+        'docid' => $_lang['id'],
+        'title' => $_lang['resource_title'],
+        'createdon' => $_lang['createdon'],
+        'pub_date' => $_lang['page_data_publishdate'],
+        'status' => $_lang['page_data_status'],
+        'edit' => $_lang['mgrlog_action'],
+    );
+    $tbWidth = array(
+        '1%',
+        '',
+        '1%',
+        '1%',
+        '1%',
+        '1%'
+    );
+    $modx->table->setColumnWidths($tbWidth);
+
+    $sd = isset($_REQUEST['dir']) ? '&amp;dir=' . $_REQUEST['dir'] : '&amp;dir=DESC';
+    $sb = isset($_REQUEST['sort']) ? '&amp;sort=' . $_REQUEST['sort'] : '&amp;sort=createdon';
+    $pg = isset($_REQUEST['page']) ? '&amp;page=' . (int) $_REQUEST['page'] : '';
+    $add_path = $sd . $sb . $pg;
+
+    $icons = array(
+        'text/html' => $_style['tree_page_html'],
+        'text/plain' => $_style['tree_page'],
+        'text/xml' => $_style['tree_page_xml'],
+        'text/css' => $_style['tree_page_css'],
+        'text/javascript' => $_style['tree_page_js'],
+        'application/rss+xml' => $_style['tree_page_rss'],
+        'application/pdf' => $_style['tree_page_pdf'],
+        'application/vnd.ms-word' => $_style['tree_page_word'],
+        'application/vnd.ms-excel' => $_style['tree_page_excel'],
+        'image/gif' => $_style['tree_page_gif'],
+        'image/jpg' => $_style['tree_page_jpg'],
+        'image/png' => $_style['tree_page_png']
+    );
+
+    $listDocs = array();
+    foreach($resource as $k => $children) {
+
+        switch($children['id']) {
+            case $modx->config['site_start']            :
+                $icon = $_style['tree_page_home'];
+                break;
+            case $modx->config['error_page']            :
+                $icon = $_style['tree_page_404'];
+                break;
+            case $modx->config['site_unavailable_page'] :
+                $icon = $_style['tree_page_hourglass'];
+                break;
+            case $modx->config['unauthorized_page']     :
+                $icon = $_style['tree_page_info'];
+                break;
+            default:
+                if($children['isfolder']) {
+                    $icon = $_style['tree_folder_new'];
+                } else {
+                    if(isset($icons[$children['contentType']])) {
+                        $icon = $icons[$children['contentType']];
+                    } else {
+                        $icon = $_style['tree_page'];
+                    }
+                }
+        }
+
+        $private = ($children['privateweb'] || $children['privatemgr'] ? ' private' : '');
+
+        // дописываем в заголовок класс для неопубликованных плюс по всем ссылкам обратный путь
+        // для сохранения сортировки
+        $class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish'));
+        //$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary');
+        //$class .= ($children['isfolder'] ? ' font-weight-bold' : '');
+        if($modx->hasPermission('edit_document')) {
+            $title = '<span class="doc-item' . $private . '">' . $icon . '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '">' . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></a></span>';
+        } else {
+            $title = '<span class="doc-item' . $private . '">' . $icon . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></span>';
+        }
+
+        $icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["publish_resource"] . '"><i class="' . $_style["icons_publish_document"] . '"></i></a>' : '<a href="index.php?a=62&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["unpublish_resource"] . '"><i class="' . $_style["icons_unpublish_resource"] . '" ></i></a>';
+
+        $icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\'' . $_lang["confirm_delete_resource"] . '\')" href="index.php?a=6&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['delete_resource'] . '"><i class="' . $_style["icons_delete_resource"] . '"></i></a>' : '<a onclick="return confirm(\'' . $_lang["confirm_undelete"] . '\')" href="index.php?a=63&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['undelete_resource'] . '"><i class="' . $_style["icons_undelete_resource"] . '"></i></a>';
+
+        $listDocs[] = array(
+            'docid' => '<div class="text-right">' . $children['id'] . '</div>',
+            'title' => $title,
+            'createdon' => '<div class="text-right">' . ($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')) . '</div>',
+            'pub_date' => '<div class="text-right">' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '') . '</div>',
+            'status' => '<div class="text-nowrap">' . ($children['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publishedDoc">' . $_lang['page_data_published'] . '</span>') . '</div>',
+            'edit' => '<div class="actions text-center text-nowrap">' . ($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['edit'] . '"><i class="' . $_style["icons_edit_resource"] . '"></i></a><a href="index.php?a=51&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['move'] . '"><i 
 				class="' . $_style["icons_move_document"] . '"></i></a>' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '</div>'
-		);
-	}
+        );
+    }
 
-	$modx->table->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort);
-	$children_output = $modx->table->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id=' . $content['id']);
+    $modx->table->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort);
+    $children_output = $modx->table->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id=' . $content['id']);
 } else {
-	// No Child documents
-	$children_output = '<div class="container"><p>' . $_lang['resources_in_container_no'] . '</p></div>';
+    // No Child documents
+    $children_output = '<div class="container"><p>' . $_lang['resources_in_container_no'] . '</p></div>';
 }
 ?>
 	<script type="text/javascript">
@@ -413,20 +413,20 @@ 
 				<h2 class="tab"><?= $_lang['page_data_source'] ?></h2>
 				<script type="text/javascript">docSettings.addTabPage(document.getElementById("tabSource"));</script>
 				<?php
-				$buffer = "";
-				$filename = $modx->config['base_path'] . "assets/cache/docid_" . $id . ".pageCache.php";
-				$handle = @fopen($filename, "r");
-				if(!$handle) {
-					$buffer = '<div class="container container-body">' . $_lang['page_data_notcached'] . '</div>';
-				} else {
-					while(!feof($handle)) {
-						$buffer .= fgets($handle, 4096);
-					}
-					fclose($handle);
-					$buffer = '<div class="navbar navbar-editor">' . $_lang['page_data_cached'] . '</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">' . $modx->htmlspecialchars($buffer) . "</textarea></div>\n";
-				}
-				echo $buffer;
-				?>
+                $buffer = "";
+                $filename = $modx->config['base_path'] . "assets/cache/docid_" . $id . ".pageCache.php";
+                $handle = @fopen($filename, "r");
+                if(!$handle) {
+                    $buffer = '<div class="container container-body">' . $_lang['page_data_notcached'] . '</div>';
+                } else {
+                    while(!feof($handle)) {
+                        $buffer .= fgets($handle, 4096);
+                    }
+                    fclose($handle);
+                    $buffer = '<div class="navbar navbar-editor">' . $_lang['page_data_cached'] . '</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">' . $modx->htmlspecialchars($buffer) . "</textarea></div>\n";
+                }
+                echo $buffer;
+                ?>
 			</div><!-- end tab-page -->
 		<?php } ?>
 
@@ -434,7 +434,7 @@ 
 
 <?php
 if(isset($_GET['tab']) && is_numeric($_GET['tab'])) {
-	echo '<script type="text/javascript"> docSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+    echo '<script type="text/javascript"> docSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
 }
 ?>
 

Spacing +61 added lines, -61 removed lines

@@ -1,15 +1,15 @@ 
 <?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(isset($_REQUEST['id'])) {
+if (isset($_REQUEST['id'])) {
 	$id = (int) $_REQUEST['id'];
 } else {
 	$id = 0;
 }
 
-if(isset($_GET['opened'])) {
+if (isset($_GET['opened'])) {
 	$_SESSION['openedArray'] = $_GET['opened'];
 }
 
@@ -22,16 +22,16 @@ 
 $tbl_site_templates = $modx->getFullTableName('site_templates');
 
 // Get access permissions
-if($_SESSION['mgrDocgroups']) {
+if ($_SESSION['mgrDocgroups']) {
 	$docgrp = implode(",", $_SESSION['mgrDocgroups']);
 }
-$access = "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0" . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+$access = "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0".(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
 
 //
-if($_SESSION['tree_show_only_folders']) {
-	$parent = $id ? ($modx->db->getValue("SELECT parent FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1")) : 0;
-	$isfolder = $modx->db->getValue("SELECT isfolder FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1");
-	if(!$isfolder && $parent != 0) {
+if ($_SESSION['tree_show_only_folders']) {
+	$parent = $id ? ($modx->db->getValue("SELECT parent FROM ".$tbl_site_content." WHERE id=$id LIMIT 1")) : 0;
+	$isfolder = $modx->db->getValue("SELECT isfolder FROM ".$tbl_site_content." WHERE id=$id LIMIT 1");
+	if (!$isfolder && $parent != 0) {
 		$id = $_REQUEST['id'] = $parent;
 	}
 }
@@ -40,7 +40,7 @@ 
 $rs = $modx->db->select('DISTINCT sc.*', "{$tbl_site_content} AS sc
 		LEFT JOIN {$tbl_document_groups} AS dg ON dg.document = sc.id", "sc.id ='{$id}' AND ({$access})");
 $content = $modx->db->getRow($rs);
-if(!$content) {
+if (!$content) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -84,11 +84,11 @@ 
 );
 $filter_sort = '';
 $filter_dir = '';
-if($numRecords > 0) {
-	$filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&dir=' . $dir . '&sort=\'+this.options[this.selectedIndex].value">' . '<option value="createdon"' . (($sort == 'createdon') ? ' selected' : '') . '>' . $_lang['createdon'] . '</option>' . '<option value="pub_date"' . (($sort == 'pub_date') ? ' selected' : '') . '>' . $_lang["page_data_publishdate"] . '</option>' . '<option value="pagetitle"' . (($sort == 'pagetitle') ? ' selected' : '') . '>' . $_lang['pagetitle'] . '</option>' . '<option value="menuindex"' . (($sort == 'menuindex') ? ' selected' : '') . '>' . $_lang['resource_opt_menu_index'] . '</option>' . //********  resource_opt_is_published - //
-		'<option value="published"' . (($sort == 'published') ? ' selected' : '') . '>' . $_lang['resource_opt_is_published'] . '</option>' . //********//
+if ($numRecords > 0) {
+	$filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&dir='.$dir.'&sort=\'+this.options[this.selectedIndex].value">'.'<option value="createdon"'.(($sort == 'createdon') ? ' selected' : '').'>'.$_lang['createdon'].'</option>'.'<option value="pub_date"'.(($sort == 'pub_date') ? ' selected' : '').'>'.$_lang["page_data_publishdate"].'</option>'.'<option value="pagetitle"'.(($sort == 'pagetitle') ? ' selected' : '').'>'.$_lang['pagetitle'].'</option>'.'<option value="menuindex"'.(($sort == 'menuindex') ? ' selected' : '').'>'.$_lang['resource_opt_menu_index'].'</option>'.//********  resource_opt_is_published - //
+		'<option value="published"'.(($sort == 'published') ? ' selected' : '').'>'.$_lang['resource_opt_is_published'].'</option>'.//********//
 		'</select>';
-	$filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&sort=' . $sort . '&dir=\'+this.options[this.selectedIndex].value">' . '<option value="DESC"' . (($dir == 'DESC') ? ' selected' : '') . '>' . $_lang['sort_desc'] . '</option>' . '<option value="ASC"' . (($dir == 'ASC') ? ' selected' : '') . '>' . $_lang['sort_asc'] . '</option>' . '</select>';
+	$filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&sort='.$sort.'&dir=\'+this.options[this.selectedIndex].value">'.'<option value="DESC"'.(($dir == 'DESC') ? ' selected' : '').'>'.$_lang['sort_desc'].'</option>'.'<option value="ASC"'.(($dir == 'ASC') ? ' selected' : '').'>'.$_lang['sort_asc'].'</option>'.'</select>';
 	$resource = $modx->db->makeArray($rs);
 
 	// CSS style for table
@@ -132,10 +132,10 @@ 
 	);
 	$modx->table->setColumnWidths($tbWidth);
 
-	$sd = isset($_REQUEST['dir']) ? '&amp;dir=' . $_REQUEST['dir'] : '&amp;dir=DESC';
-	$sb = isset($_REQUEST['sort']) ? '&amp;sort=' . $_REQUEST['sort'] : '&amp;sort=createdon';
-	$pg = isset($_REQUEST['page']) ? '&amp;page=' . (int) $_REQUEST['page'] : '';
-	$add_path = $sd . $sb . $pg;
+	$sd = isset($_REQUEST['dir']) ? '&amp;dir='.$_REQUEST['dir'] : '&amp;dir=DESC';
+	$sb = isset($_REQUEST['sort']) ? '&amp;sort='.$_REQUEST['sort'] : '&amp;sort=createdon';
+	$pg = isset($_REQUEST['page']) ? '&amp;page='.(int) $_REQUEST['page'] : '';
+	$add_path = $sd.$sb.$pg;
 
 	$icons = array(
 		'text/html' => $_style['tree_page_html'],
@@ -153,9 +153,9 @@ 
 	);
 
 	$listDocs = array();
-	foreach($resource as $k => $children) {
+	foreach ($resource as $k => $children) {
 
-		switch($children['id']) {
+		switch ($children['id']) {
 			case $modx->config['site_start']            :
 				$icon = $_style['tree_page_home'];
 				break;
@@ -169,10 +169,10 @@ 
 				$icon = $_style['tree_page_info'];
 				break;
 			default:
-				if($children['isfolder']) {
+				if ($children['isfolder']) {
 					$icon = $_style['tree_folder_new'];
 				} else {
-					if(isset($icons[$children['contentType']])) {
+					if (isset($icons[$children['contentType']])) {
 						$icon = $icons[$children['contentType']];
 					} else {
 						$icon = $_style['tree_page'];
@@ -187,32 +187,32 @@ 
 		$class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish'));
 		//$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary');
 		//$class .= ($children['isfolder'] ? ' font-weight-bold' : '');
-		if($modx->hasPermission('edit_document')) {
-			$title = '<span class="doc-item' . $private . '">' . $icon . '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '">' . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></a></span>';
+		if ($modx->hasPermission('edit_document')) {
+			$title = '<span class="doc-item'.$private.'">'.$icon.'<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'">'.'<span class="'.$class.'">'.$children['pagetitle'].'</span></a></span>';
 		} else {
-			$title = '<span class="doc-item' . $private . '">' . $icon . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></span>';
+			$title = '<span class="doc-item'.$private.'">'.$icon.'<span class="'.$class.'">'.$children['pagetitle'].'</span></span>';
 		}
 
-		$icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["publish_resource"] . '"><i class="' . $_style["icons_publish_document"] . '"></i></a>' : '<a href="index.php?a=62&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang["unpublish_resource"] . '"><i class="' . $_style["icons_unpublish_resource"] . '" ></i></a>';
+		$icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&amp;id='.$children['id'].$add_path.'" title="'.$_lang["publish_resource"].'"><i class="'.$_style["icons_publish_document"].'"></i></a>' : '<a href="index.php?a=62&amp;id='.$children['id'].$add_path.'" title="'.$_lang["unpublish_resource"].'"><i class="'.$_style["icons_unpublish_resource"].'" ></i></a>';
 
-		$icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\'' . $_lang["confirm_delete_resource"] . '\')" href="index.php?a=6&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['delete_resource'] . '"><i class="' . $_style["icons_delete_resource"] . '"></i></a>' : '<a onclick="return confirm(\'' . $_lang["confirm_undelete"] . '\')" href="index.php?a=63&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['undelete_resource'] . '"><i class="' . $_style["icons_undelete_resource"] . '"></i></a>';
+		$icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\''.$_lang["confirm_delete_resource"].'\')" href="index.php?a=6&amp;id='.$children['id'].$add_path.'" title="'.$_lang['delete_resource'].'"><i class="'.$_style["icons_delete_resource"].'"></i></a>' : '<a onclick="return confirm(\''.$_lang["confirm_undelete"].'\')" href="index.php?a=63&amp;id='.$children['id'].$add_path.'" title="'.$_lang['undelete_resource'].'"><i class="'.$_style["icons_undelete_resource"].'"></i></a>';
 
 		$listDocs[] = array(
-			'docid' => '<div class="text-right">' . $children['id'] . '</div>',
+			'docid' => '<div class="text-right">'.$children['id'].'</div>',
 			'title' => $title,
-			'createdon' => '<div class="text-right">' . ($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')) . '</div>',
-			'pub_date' => '<div class="text-right">' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '') . '</div>',
-			'status' => '<div class="text-nowrap">' . ($children['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publishedDoc">' . $_lang['page_data_published'] . '</span>') . '</div>',
-			'edit' => '<div class="actions text-center text-nowrap">' . ($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['edit'] . '"><i class="' . $_style["icons_edit_resource"] . '"></i></a><a href="index.php?a=51&amp;id=' . $children['id'] . $add_path . '" title="' . $_lang['move'] . '"><i 
-				class="' . $_style["icons_move_document"] . '"></i></a>' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '</div>'
+			'createdon' => '<div class="text-right">'.($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')).'</div>',
+			'pub_date' => '<div class="text-right">'.($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '').'</div>',
+			'status' => '<div class="text-nowrap">'.($children['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publishedDoc">'.$_lang['page_data_published'].'</span>').'</div>',
+			'edit' => '<div class="actions text-center text-nowrap">'.($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&amp;id='.$children['id'].$add_path.'" title="'.$_lang['edit'].'"><i class="'.$_style["icons_edit_resource"].'"></i></a><a href="index.php?a=51&amp;id='.$children['id'].$add_path.'" title="'.$_lang['move'].'"><i 
+				class="' . $_style["icons_move_document"].'"></i></a>'.$icon_pub_unpub : '').($modx->hasPermission('delete_document') ? $icon_del_undel : '').'</div>'
 		);
 	}
 
-	$modx->table->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort);
-	$children_output = $modx->table->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id=' . $content['id']);
+	$modx->table->createPagingNavigation($numRecords, 'a=3&id='.$content['id'].'&dir='.$dir.'&sort='.$sort);
+	$children_output = $modx->table->create($listDocs, $listTableHeader, 'index.php?a=3&amp;id='.$content['id']);
 } else {
 	// No Child documents
-	$children_output = '<div class="container"><p>' . $_lang['resources_in_container_no'] . '</p></div>';
+	$children_output = '<div class="container"><p>'.$_lang['resources_in_container_no'].'</p></div>';
 }
 ?>
 	<script type="text/javascript">
@@ -238,7 +238,7 @@ 
 			},
 			cancel: function() {
 				documentDirty = false;
-				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
+				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
 			},
 			move: function() {
 				document.location.href = "index.php?id=<?= $_REQUEST['id'] ?>&a=51";
@@ -249,7 +249,7 @@ 
 				}
 			},
 			view: function() {
-				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin');
+				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin');
 			}
 		};
 
@@ -257,7 +257,7 @@ 
 	<script type="text/javascript" src="media/script/tablesort.js"></script>
 
 	<h1>
-		<i class="fa fa-info"></i><?= iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . ' <small>(' . $_REQUEST['id'] . ')</small>' ?>
+		<i class="fa fa-info"></i><?= iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').' <small>('.$_REQUEST['id'].')</small>' ?>
 	</h1>
 
 <?= $_style['actionbuttons']['static']['document'] ?>
@@ -284,16 +284,16 @@ 
 					<tr>
 						<td width="200" valign="top"><?= $_lang['long_title'] ?>:</td>
 						<td>
-							<small><?= $content['longtitle'] != '' ? $content['longtitle'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></small>
+							<small><?= $content['longtitle'] != '' ? $content['longtitle'] : "(<i>".$_lang['not_set']."</i>)" ?></small>
 						</td>
 					</tr>
 					<tr>
 						<td valign="top"><?= $_lang['resource_description'] ?>:</td>
-						<td><?= $content['description'] != '' ? $content['description'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
+						<td><?= $content['description'] != '' ? $content['description'] : "(<i>".$_lang['not_set']."</i>)" ?></td>
 					</tr>
 					<tr>
 						<td valign="top"><?= $_lang['resource_summary'] ?>:</td>
-						<td><?= $content['introtext'] != '' ? $content['introtext'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
+						<td><?= $content['introtext'] != '' ? $content['introtext'] : "(<i>".$_lang['not_set']."</i>)" ?></td>
 					</tr>
 					<tr>
 						<td valign="top"><?= $_lang['type'] ?>:</td>
@@ -301,7 +301,7 @@ 
 					</tr>
 					<tr>
 						<td valign="top"><?= $_lang['resource_alias'] ?>:</td>
-						<td><?= $content['alias'] != '' ? $content['alias'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td>
+						<td><?= $content['alias'] != '' ? $content['alias'] : "(<i>".$_lang['not_set']."</i>)" ?></td>
 					</tr>
 					<tr>
 						<td colspan="2">&nbsp;</td>
@@ -314,7 +314,7 @@ 
 						<td><?= $modx->toDateFormat($content['createdon'] + $server_offset_time) ?> (<b><?= $createdbyname ?></b>)
 						</td>
 					</tr>
-					<?php if($editedbyname != '') { ?>
+					<?php if ($editedbyname != '') { ?>
 						<tr>
 							<td><?= $_lang['page_data_edited'] ?>:</td>
 							<td><?= $modx->toDateFormat($content['editedon'] + $server_offset_time) ?> (<b><?= $editedbyname ?></b>)
@@ -329,15 +329,15 @@ 
 					</tr>
 					<tr>
 						<td><?= $_lang['page_data_status'] ?>:</td>
-						<td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publisheddoc">' . $_lang['page_data_published'] . '</span>' ?></td>
+						<td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publisheddoc">'.$_lang['page_data_published'].'</span>' ?></td>
 					</tr>
 					<tr>
 						<td><?= $_lang['page_data_publishdate'] ?>:</td>
-						<td><?= $content['pub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['pub_date']) ?></td>
+						<td><?= $content['pub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['pub_date']) ?></td>
 					</tr>
 					<tr>
 						<td><?= $_lang['page_data_unpublishdate'] ?>:</td>
-						<td><?= $content['unpub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td>
+						<td><?= $content['unpub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td>
 					</tr>
 					<tr>
 						<td><?= $_lang['page_data_cacheable'] ?>:</td>
@@ -357,11 +357,11 @@ 
 					</tr>
 					<tr>
 						<td><?= $_lang['page_data_web_access'] ?>:</td>
-						<td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td>
+						<td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td>
 					</tr>
 					<tr>
 						<td><?= $_lang['page_data_mgr_access'] ?>:</td>
-						<td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td>
+						<td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td>
 					</tr>
 					<tr>
 						<td colspan="2">&nbsp;</td>
@@ -391,13 +391,13 @@ 
 			<script type="text/javascript">docSettings.addTabPage(document.getElementById("tabChildren"));</script>
 			<div class="container container-body">
 				<div class="form-group clearfix">
-					<?php if($numRecords > 0) : ?>
+					<?php if ($numRecords > 0) : ?>
 						<div class="float-xs-left">
-							<span class="publishedDoc"><?= $numRecords . ' ' . $_lang['resources_in_container'] ?> (<strong><?= $content['pagetitle'] ?></strong>)</span>
+							<span class="publishedDoc"><?= $numRecords.' '.$_lang['resources_in_container'] ?> (<strong><?= $content['pagetitle'] ?></strong>)</span>
 						</div>
 					<?php endif; ?>
 					<div class="float-xs-right">
-						<?= $filter_sort . ' ' . $filter_dir ?>
+						<?= $filter_sort.' '.$filter_dir ?>
 					</div>
 
 				</div>
@@ -407,23 +407,23 @@ 
 			</div>
 		</div><!-- end tab-page -->
 
-		<?php if($modx->config['cache_type'] != 2) { ?>
+		<?php if ($modx->config['cache_type'] != 2) { ?>
 			<!-- Page Source -->
 			<div class="tab-page" id="tabSource">
 				<h2 class="tab"><?= $_lang['page_data_source'] ?></h2>
 				<script type="text/javascript">docSettings.addTabPage(document.getElementById("tabSource"));</script>
 				<?php
 				$buffer = "";
-				$filename = $modx->config['base_path'] . "assets/cache/docid_" . $id . ".pageCache.php";
+				$filename = $modx->config['base_path']."assets/cache/docid_".$id.".pageCache.php";
 				$handle = @fopen($filename, "r");
-				if(!$handle) {
-					$buffer = '<div class="container container-body">' . $_lang['page_data_notcached'] . '</div>';
+				if (!$handle) {
+					$buffer = '<div class="container container-body">'.$_lang['page_data_notcached'].'</div>';
 				} else {
-					while(!feof($handle)) {
+					while (!feof($handle)) {
 						$buffer .= fgets($handle, 4096);
 					}
 					fclose($handle);
-					$buffer = '<div class="navbar navbar-editor">' . $_lang['page_data_cached'] . '</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">' . $modx->htmlspecialchars($buffer) . "</textarea></div>\n";
+					$buffer = '<div class="navbar navbar-editor">'.$_lang['page_data_cached'].'</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">'.$modx->htmlspecialchars($buffer)."</textarea></div>\n";
 				}
 				echo $buffer;
 				?>
@@ -433,12 +433,12 @@ 
 	</div><!-- end documentPane -->
 
 <?php
-if(isset($_GET['tab']) && is_numeric($_GET['tab'])) {
-	echo '<script type="text/javascript"> docSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+if (isset($_GET['tab']) && is_numeric($_GET['tab'])) {
+	echo '<script type="text/javascript"> docSettings.setSelectedIndex( '.$_GET['tab'].' );</script>';
 }
 ?>
 
-<?php if($show_preview == 1) { ?>
+<?php if ($show_preview == 1) { ?>
 	<div class="sectionHeader"><?= $_lang['preview'] ?></div>
 	<div class="sectionBody" id="lyr2">
 		<iframe src="<?= MODX_SITE_URL ?>index.php?id=<?= $id ?>&z=manprev" frameborder="0" border="0" id="previewIframe"></iframe>

manager/actions/mutate_password.dynamic.php

Indentation +2 added lines, -2 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('change_password')) {

-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

 

Spacing +2 added lines, -2 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('change_password')) {

+if (!$modx->hasPermission('change_password')) {

 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

Braces +2 added lines, -2 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('change_password')) {

+if(!$modx->hasPermission('change_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

manager/actions/mutate_settings.dynamic.php

Indentation +18 added lines, -18 removed lines

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

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

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

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

 }

 if(!$modx->hasPermission('settings')) {

-	$modx->webAlertAndQuit($_lang['error_no_privileges']);

+    $modx->webAlertAndQuit($_lang['error_no_privileges']);

 }

 

 include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/functions.inc.php');

@@ -11,7 +11,7 @@ 
 // check to see the edit settings page isn't locked

 $rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

 if($username = $modx->db->getValue($rs)) {

-	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

+    $modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

 

@@ -21,7 +21,7 @@ 
 include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]system_settings');

 while($row = $modx->db->getRow($rs)) {

-	$settings[$row['setting_name']] = $row['setting_value'];

+    $settings[$row['setting_name']] = $row['setting_value'];

 }

 $settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

 $settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);

@@ -32,11 +32,11 @@ 
 $lang_keys = array();

 $dir = dir('includes/lang');

 while($file = $dir->read()) {

-	if(strpos($file, '.inc.php') > 0) {

-		$endpos = strpos($file, '.');

-		$languagename = substr($file, 0, $endpos);

-		$lang_keys[$languagename] = get_lang_keys($file);

-	}

+    if(strpos($file, '.inc.php') > 0) {

+        $endpos = strpos($file, '.');

+        $languagename = substr($file, 0, $endpos);

+        $lang_keys[$languagename] = get_lang_keys($file);

+    }

 }

 $dir->close();

 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';

@@ -78,14 +78,14 @@ 
 				</script>

 

 				<?php

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

-				?>

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

+                ?>

 			</div>

 		</div>

 	</form>

@@ -132,5 +132,5 @@ 
 	</script>

 <?php

 if(is_numeric($_GET['tab'])) {

-	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

+    echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

 }

Spacing +21 added lines, -21 removed lines

@@ -1,16 +1,16 @@ 
 <?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 />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']);

 }

 

-include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/functions.inc.php');

+include_once(MODX_MANAGER_PATH.'actions/mutate_settings/functions.inc.php');

 

 // check to see the edit settings page isn't locked

-$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

-if($username = $modx->db->getValue($rs)) {

+$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='".$modx->getLoginUserID()."'");

+if ($username = $modx->db->getValue($rs)) {

 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

@@ -18,21 +18,21 @@ 
 // reload system settings from the database.

 // this will prevent user-defined settings from being saved as system setting

 $settings = array();

-include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

+include_once(MODX_MANAGER_PATH.'includes/default_config.php');

 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]system_settings');

-while($row = $modx->db->getRow($rs)) {

+while ($row = $modx->db->getRow($rs)) {

 	$settings[$row['setting_name']] = $row['setting_value'];

 }

-$settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

-$settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);

+$settings['filemanager_path'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['filemanager_path']);

+$settings['rb_base_dir'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['rb_base_dir']);

 

 extract($settings, EXTR_OVERWRITE);

 

 // load languages and keys

 $lang_keys = array();

 $dir = dir('includes/lang');

-while($file = $dir->read()) {

-	if(strpos($file, '.inc.php') > 0) {

+while ($file = $dir->read()) {

+	if (strpos($file, '.inc.php') > 0) {

 		$endpos = strpos($file, '.');

 		$languagename = substr($file, 0, $endpos);

 		$lang_keys[$languagename] = get_lang_keys($file);

@@ -69,7 +69,7 @@ 
 			<input type="hidden" name="site_id" value="<?php echo $site_id; ?>" />

 			<input type="hidden" name="settings_version" value="<?php echo $modx->getVersionData('version'); ?>" />

 			<!-- this field is used to check site settings have been entered/ updated after install or upgrade -->

-			<?php if(!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>

+			<?php if (!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>

 				<div class='sectionBody'><p class='element-edit-message-tab alert alert-warning'><?php echo $_lang['settings_after_install']; ?></p></div>

 			<?php } ?>

 			<div class="tab-pane" id="settingsPane">

@@ -78,13 +78,13 @@ 
 				</script>

 

 				<?php

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab1_site_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab2_furl_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab3_user_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab4_manager_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab5_security_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab6_filemanager_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

 				?>

 			</div>

 		</div>

@@ -131,6 +131,6 @@ 
 		});

 	</script>

 <?php

-if(is_numeric($_GET['tab'])) {

-	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

+if (is_numeric($_GET['tab'])) {

+	echo '<script type="text/javascript">tpSettings.setSelectedIndex( '.$_GET['tab'].' );</script>';

 }

Braces +7 added lines, -7 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 />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']);

 }

 

@@ -10,7 +10,7 @@ 
 

 // check to see the edit settings page isn't locked

 $rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

-if($username = $modx->db->getValue($rs)) {

+if($username = $modx->db->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

@@ -20,7 +20,7 @@ 
 $settings = array();

 include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]system_settings');

-while($row = $modx->db->getRow($rs)) {

+while($row = $modx->db->getRow($rs)) {
 	$settings[$row['setting_name']] = $row['setting_value'];

 }

 $settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

@@ -31,8 +31,8 @@ 
 // load languages and keys

 $lang_keys = array();

 $dir = dir('includes/lang');

-while($file = $dir->read()) {

-	if(strpos($file, '.inc.php') > 0) {

+while($file = $dir->read()) {
+	if(strpos($file, '.inc.php') > 0) {
 		$endpos = strpos($file, '.');

 		$languagename = substr($file, 0, $endpos);

 		$lang_keys[$languagename] = get_lang_keys($file);

@@ -131,6 +131,6 @@ 
 		});

 	</script>

 <?php

-if(is_numeric($_GET['tab'])) {

+if(is_numeric($_GET['tab'])) {
 	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

 }

manager/actions/access_permissions.dynamic.php

Indentation +90 added lines, -90 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('access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // Get table names (alphabetical)
@@ -18,24 +18,24 @@ 
 // find all document groups, for the select :)
 $rs = $modx->db->select('*', $tbl_documentgroup_names, '', 'name');
 if($modx->db->getRecordCount($rs) < 1) {
-	$docgroupselector = '[no groups to add]';
+    $docgroupselector = '[no groups to add]';
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$docgroupselector .= "</select>\n";
+    $docgroupselector = '<select name="docgroup">' . "\n";
+    while($row = $modx->db->getRow($rs)) {
+        $docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->db->select('*', $tbl_membergroup_names, '', 'name');
 if($modx->db->getRecordCount($rs) < 1) {
-	$usrgroupselector = '[no user groups]';
+    $usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$usrgroupselector .= "</select>\n";
+    $usrgroupselector = '<select name="usergroup">' . "\n";
+    while($row = $modx->db->getRow($rs)) {
+        $usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $usrgroupselector .= "</select>\n";
 }
 
 ?>
@@ -96,24 +96,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames
+            $rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames
 			LEFT JOIN ' . $tbl_member_groups . ' AS groups ON groups.user_group = groupnames.id
 			LEFT JOIN ' . $tbl_manager_users . ' AS users ON users.id = groups.member', '', 'groupnames.name, user_name');
-			if($modx->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->db->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="41" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -128,21 +128,21 @@ 
 						</form>
 						<?= $_lang['access_permissions_users_in_group'] ?>
 						<?php
-					}
-					if(!$row['user_id']) {
-						?>
+                    }
+                    if(!$row['user_id']) {
+                        ?>
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
 						<?php
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=12&id=<?= $row['user_id'] ?>"><?= $row['user_name'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -167,24 +167,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames
+            $rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames
 			LEFT JOIN ' . $tbl_document_groups . ' AS dg ON dg.document_group = dgnames.id
 			LEFT JOIN ' . $tbl_site_content . ' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id');
-			if($modx->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->db->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="41" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -199,21 +199,21 @@ 
 						</form>
 						<?= $_lang['access_permissions_resources_in_group'] ?>
 						<?php
-					}
-					if(!$row['doc_id']) {
-						?>
+                    }
+                    if(!$row['doc_id']) {
+                        ?>
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
 						<?php
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=3&id=<?= $row['doc_id'] ?>" title="<?= $modx->htmlspecialchars($row['doc_title']) ?>"><?= $row['doc_id'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -225,16 +225,16 @@ 
 		<div class="container container-body">
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
-			// User/Document Group Links
-			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames
+            // User/Document Group Links
+            $rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames
 			LEFT JOIN ' . $tbl_membergroup_access . ' AS groupacc ON groupacc.membergroup = groupnames.id
 			LEFT JOIN ' . $tbl_documentgroup_names . ' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name');
-			if($modx->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-				?>
+            } else {
+                ?>
 				<div class="form-group">
 					<b><?= $_lang["access_permissions_group_link"] ?></b>
 					<form method="post" action="index.php" name="accesspermissions">
@@ -250,38 +250,38 @@ 
 				<hr>
 				<ul>
 					<?php
-					$pid = '';
-					while($row = $modx->db->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
-								echo '</ul></li>';
-							} // close previous one
-							?>
+                    $pid = '';
+                    while($row = $modx->db->getRow($rs)) {
+                        if($row['id'] != $pid) {
+                            if($pid != '') {
+                                echo '</ul></li>';
+                            } // close previous one
+                            ?>
 							<li><b><?= $row['name'] ?></b></li>
 							<?php
-							if(!$row['dg_id']) {
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
-								$pid = '';
-								continue;
-							} else {
-								echo '<ul>';
-							}
-						}
-						if(!$row['dg_id']) {
-							continue;
-						}
-						?>
+                            if(!$row['dg_id']) {
+                                echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+                                $pid = '';
+                                continue;
+                            } else {
+                                echo '<ul>';
+                            }
+                        }
+                        if(!$row['dg_id']) {
+                            continue;
+                        }
+                        ?>
 						<li><?= $row['dg_name'] ?>
 							<small><i>(<a class="text-danger" href="index.php?a=41&coupling=<?= $row['link_id'] ?>&operation=remove_document_group_from_user_group"><?= $_lang['remove'] ?></a>)</i></small>
 						</li>
 						<?php
-						$pid = $row['id'];
-					}
-					?>
+                        $pid = $row['id'];
+                    }
+                    ?>
 				</ul>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 

Spacing +37 added lines, -37 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('access_permissions')) {
+if (!$modx->hasPermission('access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -17,23 +17,23 @@ 
 
 // find all document groups, for the select :)
 $rs = $modx->db->select('*', $tbl_documentgroup_names, '', 'name');
-if($modx->db->getRecordCount($rs) < 1) {
+if ($modx->db->getRecordCount($rs) < 1) {
 	$docgroupselector = '[no groups to add]';
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$docgroupselector = '<select name="docgroup">'."\n";
+	while ($row = $modx->db->getRow($rs)) {
+		$docgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->db->select('*', $tbl_membergroup_names, '', 'name');
-if($modx->db->getRecordCount($rs) < 1) {
+if ($modx->db->getRecordCount($rs) < 1) {
 	$usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$usrgroupselector = '<select name="usergroup">'."\n";
+	while ($row = $modx->db->getRow($rs)) {
+		$usrgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$usrgroupselector .= "</select>\n";
 }
@@ -69,7 +69,7 @@ 
 	<div class="alert alert-info"><?= $_lang['access_permissions_introtext'] ?></div>
 </div>
 
-<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">' . $_lang['access_permissions_off'] . '</div>' : '') ?></div>
+<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">'.$_lang['access_permissions_off'].'</div>' : '') ?></div>
 
 <div class="tab-pane" id="uapPane">
 	<script type="text/javascript">
@@ -96,10 +96,10 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames
-			LEFT JOIN ' . $tbl_member_groups . ' AS groups ON groups.user_group = groupnames.id
-			LEFT JOIN ' . $tbl_manager_users . ' AS users ON users.id = groups.member', '', 'groupnames.name, user_name');
-			if($modx->db->getRecordCount($rs) < 1) {
+			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names.' AS groupnames
+			LEFT JOIN ' . $tbl_member_groups.' AS groups ON groups.user_group = groupnames.id
+			LEFT JOIN ' . $tbl_manager_users.' AS users ON users.id = groups.member', '', 'groupnames.name, user_name');
+			if ($modx->db->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -108,9 +108,9 @@ 
 			<div class="form-group">
 				<?php
 				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->db->getRow($rs)) {
+					if ($pid != $row['id']) {
+						if ($pid != '') {
 							echo '</div><div class="form-group">';
 						}
 						?>
@@ -129,7 +129,7 @@ 
 						<?= $_lang['access_permissions_users_in_group'] ?>
 						<?php
 					}
-					if(!$row['user_id']) {
+					if (!$row['user_id']) {
 						?>
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
 						<?php
@@ -167,10 +167,10 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames
-			LEFT JOIN ' . $tbl_document_groups . ' AS dg ON dg.document_group = dgnames.id
-			LEFT JOIN ' . $tbl_site_content . ' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id');
-			if($modx->db->getRecordCount($rs) < 1) {
+			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names.' AS dgnames
+			LEFT JOIN ' . $tbl_document_groups.' AS dg ON dg.document_group = dgnames.id
+			LEFT JOIN ' . $tbl_site_content.' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id');
+			if ($modx->db->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -179,9 +179,9 @@ 
 			<div class="form-group">
 				<?php
 				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->db->getRow($rs)) {
+					if ($pid != $row['id']) {
+						if ($pid != '') {
 							echo '</div><div class="form-group">';
 						}
 						?>
@@ -200,7 +200,7 @@ 
 						<?= $_lang['access_permissions_resources_in_group'] ?>
 						<?php
 					}
-					if(!$row['doc_id']) {
+					if (!$row['doc_id']) {
 						?>
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
 						<?php
@@ -226,10 +226,10 @@ 
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
 			// User/Document Group Links
-			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames
-			LEFT JOIN ' . $tbl_membergroup_access . ' AS groupacc ON groupacc.membergroup = groupnames.id
-			LEFT JOIN ' . $tbl_documentgroup_names . ' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name');
-			if($modx->db->getRecordCount($rs) < 1) {
+			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names.' AS groupnames
+			LEFT JOIN ' . $tbl_membergroup_access.' AS groupacc ON groupacc.membergroup = groupnames.id
+			LEFT JOIN ' . $tbl_documentgroup_names.' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name');
+			if ($modx->db->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -251,23 +251,23 @@ 
 				<ul>
 					<?php
 					$pid = '';
-					while($row = $modx->db->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
+					while ($row = $modx->db->getRow($rs)) {
+						if ($row['id'] != $pid) {
+							if ($pid != '') {
 								echo '</ul></li>';
 							} // close previous one
 							?>
 							<li><b><?= $row['name'] ?></b></li>
 							<?php
-							if(!$row['dg_id']) {
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+							if (!$row['dg_id']) {
+								echo '<i>'.$_lang['no_groups_found'].'</i></li>';
 								$pid = '';
 								continue;
 							} else {
 								echo '<ul>';
 							}
 						}
-						if(!$row['dg_id']) {
+						if (!$row['dg_id']) {
 							continue;
 						}
 						?>

manager/actions/search.static.php

Indentation +22 added lines, -22 removed lines

@@ -113,31 +113,31 @@ 
     // Handle Input "Search in main fields"
     if ($searchfields != '') {
 
-		/*start search by TV. Added Rising13*/
-		$tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
-		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
-		$articul_result = $modx->db->query($articul_query);
-		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
-			$articul_id = '';
-			$i = 1;
-			foreach( $articul_id_array as $articul ) {
-				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
-					$articul_id.=',';
-				}
-				$i++;
-			}
-		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
-			$articul_id_query = '';
-		}
-		/*end search by TV*/
+        /*start search by TV. Added Rising13*/
+        $tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
+        $articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
+        $articul_result = $modx->db->query($articul_query);
+        $articul_id_array = $modx->db->makeArray($articul_result);
+        if(count($articul_id_array)>0){
+            $articul_id = '';
+            $i = 1;
+            foreach( $articul_id_array as $articul ) {
+                $articul_id.=$articul['contentid'];
+                if($i !== count($articul_id_array)){
+                    $articul_id.=',';
+                }
+                $i++;
+            }
+        $articul_id_query = " OR sc.id IN ({$articul_id})";
+        }else{
+            $articul_id_query = '';
+        }
+        /*end search by TV*/
 
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-				$sqladd .= $articul_id_query;//search by TV
+                $sqladd .= $articul_id_query;//search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -157,7 +157,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-			$sqladd .= $articul_id_query;//search by TV
+            $sqladd .= $articul_id_query;//search by TV
         }
     } else if ($idFromAlias) {
         $sqladd .= " sc.id='{$idFromAlias}'";

Spacing +74 added lines, -74 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) {
     exit();
 }
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
@@ -43,7 +43,7 @@ 
                         $option[] = '<option value="">No selected</option>';
                         $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? intval($_REQUEST['templateid']) : '';
                         $selected = $templateid === 0 ? ' selected="selected"' : '';
-                        $option[] = '<option value="0"' . $selected . '>(blank)</option>';
+                        $option[] = '<option value="0"'.$selected.'>(blank)</option>';
                         while ($row = $modx->db->getRow($rs)) {
                             $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']);
                             $selected = $row['id'] == $templateid ? ' selected="selected"' : '';
@@ -100,12 +100,12 @@ 
         $friendly_url_suffix = $modx->config['friendly_url_suffix'];
         $base_url = $modx->config['base_url'];
         $site_url = $modx->config['site_url'];
-        $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url);
+        $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url);
         if ($url[0] === '/') {
-            $url = preg_replace('@^' . $base_url . '@', '', $url);
+            $url = preg_replace('@^'.$base_url.'@', '', $url);
         }
         if (substr($url, 0, 4) === 'http') {
-            $url = preg_replace('@^' . $site_url . '@', '', $url);
+            $url = preg_replace('@^'.$site_url.'@', '', $url);
         }
         $idFromAlias = $modx->getIdFromAlias($url);
     }
@@ -118,18 +118,18 @@ 
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->db->query($articul_query);
 		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if (count($articul_id_array) > 0) {
 			$articul_id = '';
 			$i = 1;
-			foreach( $articul_id_array as $articul ) {
-				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
-					$articul_id.=',';
+			foreach ($articul_id_array as $articul) {
+				$articul_id .= $articul['contentid'];
+				if ($i !== count($articul_id_array)) {
+					$articul_id .= ',';
 				}
 				$i++;
 			}
 		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/
@@ -137,7 +137,7 @@ 
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-				$sqladd .= $articul_id_query;//search by TV
+				$sqladd .= $articul_id_query; //search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -157,7 +157,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-			$sqladd .= $articul_id_query;//search by TV
+			$sqladd .= $articul_id_query; //search by TV
         }
     } else if ($idFromAlias) {
         $sqladd .= " sc.id='{$idFromAlias}'";
@@ -180,8 +180,8 @@ 
         $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
         $mgrRole = (isset ($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1) ? 1 : 0;
         $docgrp_cond = $docgrp ? " OR dg.document_group IN ({$docgrp})" : '';
-        $fields .= ', MAX(IF(1=' . $mgrRole . ' OR sc.privatemgr=0' . $docgrp_cond . ',1,0)) AS hasAccess';
-        $sqladd = '(' . $sqladd . ") AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $fields .= ', MAX(IF(1='.$mgrRole.' OR sc.privatemgr=0'.$docgrp_cond.',1,0)) AS hasAccess';
+        $sqladd = '('.$sqladd.") AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     }
 
     if ($sqladd) {
@@ -191,7 +191,7 @@ 
     $where = $sqladd;
 
     if ($where) {
-        $rs = $modx->db->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id');
+        $rs = $modx->db->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id');
         $limit = $modx->db->getRecordCount($rs);
     } else {
         $limit = 0;
@@ -210,7 +210,7 @@ 
                 if ($limit < 1) {
                     echo $_lang['search_empty'];
                 } else {
-                    printf('<p>' . $_lang['search_results_returned_msg'] . '</p>', $limit);
+                    printf('<p>'.$_lang['search_results_returned_msg'].'</p>', $limit);
                     ?>
                     <script type="text/javascript" src="media/script/tablesort.js"></script>
                     <table class="grid sortabletable sortable-onload-2 rowstyle-even" id="table-1">
@@ -270,14 +270,14 @@ 
                                 if (function_exists('mb_strlen') && function_exists('mb_substr')) {
                                     ?>
                                     <td<?= $tdClass ?>>
-                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset) . "..." : $row['pagetitle'] ?></a>
+                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset)."..." : $row['pagetitle'] ?></a>
                                     </td>
-                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset) . "..." : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset)."..." : $row['description'] ?></td>
                                     <?php
                                 } else {
                                     ?>
-                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20) . '...' : $row['pagetitle'] ?></td>
-                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35) . '...' : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20).'...' : $row['pagetitle'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35).'...' : $row['description'] ?></td>
                                     <?php
                                 }
                                 ?>
@@ -297,115 +297,115 @@ 
                 if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                     $docscounts = $modx->db->getRecordCount($rs);
                     if ($docscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //templates
                 if ($modx->hasPermission('edit_template')) {
-                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' 
-					OR `templatename` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `content` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' 
+					OR `templatename` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `content` like '%" . $searchfields."%'");
                     $templatecounts = $modx->db->getRecordCount($rs);
                     if ($templatecounts > 0) {
-                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //tvs
                 if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `type` like '%" . $searchfields . "%' 
-					OR `elements` like '%" . $searchfields . "%' 
-					OR `display` like '%" . $searchfields . "%' 
-					OR `display_params` like '%" . $searchfields . "%' 
-					OR `default_text` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `type` like '%" . $searchfields."%' 
+					OR `elements` like '%" . $searchfields."%' 
+					OR `display` like '%" . $searchfields."%' 
+					OR `display_params` like '%" . $searchfields."%' 
+					OR `default_text` like '%" . $searchfields."%'");
                     $tvscounts = $modx->db->getRecordCount($rs);
                     if ($tvscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Chunks
                 if ($modx->hasPermission('edit_chunk')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%'     
-					OR `snippet` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%'     
+					OR `snippet` like '%" . $searchfields."%'");
                     $chunkscounts = $modx->db->getRecordCount($rs);
                     if ($chunkscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Snippets
                 if ($modx->hasPermission('edit_snippet')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `snippet` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `snippet` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $snippetscounts = $modx->db->getRecordCount($rs);
                     if ($snippetscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //plugins
                 if ($modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `plugincode` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `plugincode` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $pluginscounts = $modx->db->getRecordCount($rs);
                     if ($pluginscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //modules
                 if ($modx->hasPermission('edit_module')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' 
-                    OR `name` like '%" . $searchfields . "%' 
-                    OR `description` like '%" . $searchfields . "%' 
-                    OR `modulecode` like '%" . $searchfields . "%'  
-                    OR `properties` like '%" . $searchfields . "%'  
-                    OR `guid` like '%" . $searchfields . "%'      
-                    OR `resourcefile` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' 
+                    OR `name` like '%" . $searchfields."%' 
+                    OR `description` like '%" . $searchfields."%' 
+                    OR `modulecode` like '%" . $searchfields."%'  
+                    OR `properties` like '%" . $searchfields."%'  
+                    OR `guid` like '%" . $searchfields."%'      
+                    OR `resourcefile` like '%" . $searchfields."%'");
                     $modulescounts = $modx->db->getRecordCount($rs);
                     if ($modulescounts > 0) {
-                        $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
-                echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1';
+                echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1';
             }
 
             ?>
@@ -416,13 +416,13 @@ 
 
 function highlightingCoincidence($text, $search)
 {
-    $regexp = '!(' . str_replace(array(
+    $regexp = '!('.str_replace(array(
             '(',
             ')'
         ), array(
             '\(',
             '\)'
-        ), trim($search)) . ')!isu';
+        ), trim($search)).')!isu';
     return preg_replace($regexp, '<span class="text-danger">$1</span>', $text);
 }
 
@@ -439,7 +439,7 @@ 
         $class .= ' deleted';
     }
     if ($class) {
-        $class = ' class="' . trim($class) . '"';
+        $class = ' class="'.trim($class).'"';
     }
     return $class;
 }

Braces +3 added lines, -3 removed lines

@@ -118,18 +118,18 @@
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->db->query($articul_query);
 		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if(count($articul_id_array)>0) {
 			$articul_id = '';
 			$i = 1;
 			foreach( $articul_id_array as $articul ) {
 				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
+				if($i !== count($articul_id_array)) {
 					$articul_id.=',';
 				}
 				$i++;
 			}
 		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/

manager/actions/eventlog.dynamic.php

Indentation +34 added lines, -34 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('view_eventlog')) {

-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

 // Get table Names (alphabetical)

@@ -16,14 +16,14 @@ 
 

 // get and save search string

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

-	$sqlQuery = $query = '';

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

+    $sqlQuery = $query = '';

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

 } else {

-	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

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

-	}

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

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

+    if(!is_numeric($sqlQuery)) {

+        $sqlQuery = $modx->db->escape($query);

+    }

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

 }

 

 // get & save listmode

@@ -125,33 +125,33 @@ 
 			<div class="row">

 				<div class="table-responsive">

 					<?php

-					$ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

+                    $ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

 			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

-					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->pagerClass = '';

-					$grd->pageClass = 'page-item';

-					$grd->selPageClass = 'page-item active';

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

-					$grd->cssClass = "table data nowrap";

-					$grd->columnHeaderClass = "tableHeader";

-					$grd->itemClass = "tableItem";

-					$grd->altItemClass = "tableAltItem";

-					$grd->fields = "type,source,createdon,eventid,username";

-					$grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

-					$grd->colWidths = "1%,,1%,1%,1%";

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

-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

-					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->pagerClass = '';

+                    $grd->pageClass = 'page-item';

+                    $grd->selPageClass = 'page-item active';

+                    $grd->noRecordMsg = $_lang['no_records_found'];

+                    $grd->cssClass = "table data nowrap";

+                    $grd->columnHeaderClass = "tableHeader";

+                    $grd->itemClass = "tableItem";

+                    $grd->altItemClass = "tableAltItem";

+                    $grd->fields = "type,source,createdon,eventid,username";

+                    $grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+                    $grd->colWidths = "1%,,1%,1%,1%";

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

+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

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

+                        $grd->pageSize = 0;

+                    }

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

+                        $grd->pageNumber = 1;

+                    }

+                    // render grid

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		</div>

Spacing +11 added lines, -11 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('view_eventlog')) {

+if (!$modx->hasPermission('view_eventlog')) {

 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -15,12 +15,12 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

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

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

 	$sqlQuery = $query = '';

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

 } else {

 	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

+	if (!is_numeric($sqlQuery)) {

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

 	}

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

@@ -31,7 +31,7 @@ 
 $_PAGE['vs']['lm'] = $listmode;

 

 // 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['view_log'], "js:menuAction(1)", $_style['actions_preview']);

 $cm->addSeparator();

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

 					$ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

-			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

+			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "".(is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '')."(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

+					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->pagerClass = '';

 					$grd->pageClass = 'page-item';

@@ -139,14 +139,14 @@ 
 					$grd->itemClass = "tableItem";

 					$grd->altItemClass = "tableAltItem";

 					$grd->fields = "type,source,createdon,eventid,username";

-					$grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+					$grd->columns = $_lang['type']." ,".$_lang['source']." ,".$_lang['date']." ,".$_lang['event_id']." ,".$_lang['sysinfo_userid'];

 					$grd->colWidths = "1%,,1%,1%,1%";

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

-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

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

+					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang['click_to_context']."'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='".$_lang['click_to_view_details']."'>[+source+]</a>||date: ".$modx->toDateFormat(null, 'formatOnly').' %I:%M %p';

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

 						$grd->pageSize = 0;

 					}

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

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

 						$grd->pageNumber = 1;

 					}

 					// render grid

Braces +7 added lines, -7 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('view_eventlog')) {

+if(!$modx->hasPermission('view_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -15,12 +15,12 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

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

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

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

-} else {

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

-	if(!is_numeric($sqlQuery)) {

+	if(!is_numeric($sqlQuery)) {
 		$sqlQuery = $modx->db->escape($query);

 	}

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

@@ -143,10 +143,10 @@ 
 					$grd->colWidths = "1%,,1%,1%,1%";

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

 					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

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

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

 					}

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

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

 					}

 					// render grid

manager/actions/welcome.static.php

Indentation +226 added lines, -226 removed lines

@@ -1,13 +1,13 @@ 
 <?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.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

 if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

-	// seems to be a new install - send the user to the configuration page

-	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

+    // seems to be a new install - send the user to the configuration page

+    exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

 

 // set placeholders

@@ -17,70 +17,70 @@ 
 

 // setup message info

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

-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

-	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

-	$_SESSION['nrnewmessages'] = $nrnewmessages;

-

-	$msg = array();

-	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

-	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

-	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

-	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

-	$ph['MessageInfo'] = join("\n", $msg);

+    include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+    $_SESSION['nrtotalmessages'] = $nrtotalmessages;

+    $_SESSION['nrnewmessages'] = $nrnewmessages;

+

+    $msg = array();

+    $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+    $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+    $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

+    $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

+    $ph['MessageInfo'] = join("\n", $msg);

 }

 

 // setup icons

 if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

-	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

-	$ph['SecurityIcon'] = wrapIcon($icon, 75);

+    $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

+    $ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

 if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

-	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

-	$ph['WebUserIcon'] = wrapIcon($icon, 99);

+    $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

+    $ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

-	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

-	$ph['ModulesIcon'] = wrapIcon($icon, 106);

+    $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

+    $ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

 if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

-	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

-	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

+    $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

+    $ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

-	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

-	$ph['BackupIcon'] = wrapIcon($icon, 93);

+    $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

+    $ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

-	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

-	$ph['HelpIcon'] = wrapIcon($icon, 9);

+    $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

+    $ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

 if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

-		$ph['config_check_results'] = $config_check_results;

-		$ph['config_display'] = 'block';

-	} else {

-		$ph['config_display'] = 'none';

-	}

+    include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

+    if($config_check_results != $_lang['configcheck_ok']) {

+        $ph['config_check_results'] = $config_check_results;

+        $ph['config_display'] = 'block';

+    } else {

+        $ph['config_display'] = 'none';

+    }

 } else {

-	$ph['config_display'] = 'none';

+    $ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

 if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

-		case 'logout_reminder':

-			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

-			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

-			break;

-	}

-	$ph['show_logout_reminder'] = 'block';

-	unset($_SESSION['show_logout_reminder']);

+    switch($_SESSION['show_logout_reminder']['type']) {

+        case 'logout_reminder':

+            $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

+            $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

+            break;

+    }

+    $ph['show_logout_reminder'] = 'block';

+    unset($_SESSION['show_logout_reminder']);

 } else {

-	$ph['show_logout_reminder'] = 'none';

+    $ph['show_logout_reminder'] = 'none';

 }

 

 // Check multiple sessions

@@ -128,11 +128,11 @@ 
 $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

-	'username' => $modx->getLoginUserName(),

-	'role' => $_SESSION['mgrPermissions']['name'],

-	'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

-	'logincount' => $_SESSION['mgrLogincount'] + 1,

-	'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

+    'username' => $modx->getLoginUserName(),

+    'role' => $_SESSION['mgrPermissions']['name'],

+    'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

+    'logincount' => $_SESSION['mgrLogincount'] + 1,

+    'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

 ));

 

 $from = array();

@@ -141,13 +141,13 @@ 
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

 if($modx->db->getRecordCount($rs) < 1) {

-	$html = '<p>[%no_active_users_found%]</p>';

+    $html = '<p>[%no_active_users_found%]</p>';

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

-	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

-	$ph['now'] = strftime('%H:%M:%S', $now);

-	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

-	$html = '

+    include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+    $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

+    $ph['now'] = strftime('%H:%M:%S', $now);

+    $timetocheck = ($now - (60 * 20)); //+$server_offset_time;

+    $html = '

 	<div class="card-body">

 		[%onlineusers_message%] 

 		<b>[+now+]</b>):

@@ -165,33 +165,33 @@ 
 	</thead>

 	<tbody>';

 

-	$userList = array();

-	$userCount = array();

-	// Create userlist with session-count first before output

-	while($activeusers = $modx->db->getRow($rs)) {

-		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

-

-		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

-		$webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

-		$ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

-		$currentaction = getAction($activeusers['action'], $activeusers['id']);

-		$userList[] = array(

-			$idle,

-			'',

-			$activeusers['username'],

-			$webicon,

-			abs($activeusers['internalKey']),

-			$ip,

-			strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

-			$currentaction

-		);

-	}

-	foreach($userList as $params) {

-		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

-	}

-

-	$html .= '

+    $userList = array();

+    $userCount = array();

+    // Create userlist with session-count first before output

+    while($activeusers = $modx->db->getRow($rs)) {

+        $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

+

+        $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

+        $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

+        $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

+        $currentaction = getAction($activeusers['action'], $activeusers['id']);

+        $userList[] = array(

+            $idle,

+            '',

+            $activeusers['username'],

+            $webicon,

+            abs($activeusers['internalKey']),

+            $ip,

+            strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

+            $currentaction

+        );

+    }

+    foreach($userList as $params) {

+        $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

+        $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+    }

+

+    $html .= '

 	</tbody>

 	</table>

 </div>

@@ -232,17 +232,17 @@ 
 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

 if(is_array($evtOut)) {

-	$output = implode('', $evtOut);

-	$ph['OnManagerWelcomePrerender'] = $output;

+    $output = implode('', $evtOut);

+    $ph['OnManagerWelcomePrerender'] = $output;

 }

 

 $widgets['welcome'] = array(

-	'menuindex' => '10',

-	'id' => 'welcome',

-	'cols' => 'col-sm-6',

-	'icon' => 'fa-home',

-	'title' => '[%welcome_title%]',

-	'body' => '

+    'menuindex' => '10',

+    'id' => 'welcome',

+    'cols' => 'col-sm-6',

+    'icon' => 'fa-home',

+    'title' => '[%welcome_title%]',

+    'body' => '

 				<div class="wm_buttons card-body"> 

 					<!--@IF:[[#hasPermission?key=new_user]] OR [[#hasPermission?key=edit_user]]--> 

 					<span class="wm_button">

@@ -320,25 +320,25 @@ 
 					</table>

 				</div>

 		',

-	'hide'=>'0'

+    'hide'=>'0'

 );

 $widgets['onlineinfo'] = array(

-	'menuindex' => '20',

-	'id' => 'onlineinfo',

-	'cols' => 'col-sm-6',

-	'icon' => 'fa-user',

-	'title' => '[%onlineusers_title%]',

-	'body' => '<div class="userstable">[+OnlineInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '20',

+    'id' => 'onlineinfo',

+    'cols' => 'col-sm-6',

+    'icon' => 'fa-user',

+    'title' => '[%onlineusers_title%]',

+    'body' => '<div class="userstable">[+OnlineInfo+]</div>',

+    'hide'=>'0'

 );

 $widgets['recentinfo'] = array(

-	'menuindex' => '30',

-	'id' => 'modxrecent_widget',

-	'cols' => 'col-sm-12',

-	'icon' => 'fa-pencil-square-o',

-	'title' => '[%activity_title%]',

-	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '30',

+    'id' => 'modxrecent_widget',

+    'cols' => 'col-sm-12',

+    'icon' => 'fa-pencil-square-o',

+    'title' => '[%activity_title%]',

+    'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

+    'hide'=>'0'

 );

 if ($modx->config['rss_url_news']) {

     $widgets['news'] = array(

@@ -366,7 +366,7 @@ 
 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

 if(is_array($sitewidgets)) {

-	$newwidgets = array();

+    $newwidgets = array();

     foreach($sitewidgets as $widget){

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

@@ -374,21 +374,21 @@ 
 }

 

 usort($widgets, function ($a, $b) {

-	return $a['menuindex'] - $b['menuindex'];

+    return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

 foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

-		$output .= $modx->parseText($tpl, $widget);

-	}

+    if ($widget['hide'] != '1'){

+        $output .= $modx->parseText($tpl, $widget);

+    }

 }

 $ph['widgets'] = $output;

 

 // load template

 if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

@@ -396,27 +396,27 @@ 
 $target = $modx->mergeSettingsContent($target);

 

 if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

-		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

-		$content = file_get_contents(trim(substr($target, 6)));

-	} else {

-		$content = '';

-	}

+    if(substr($target, 0, 6) === '@CHUNK') {

+        $content = $modx->getChunk(trim(substr($target, 7)));

+    } elseif(substr($target, 0, 5) === '@FILE') {

+        $content = file_get_contents(trim(substr($target, 6)));

+    } else {

+        $content = '';

+    }

 } else {

-	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

-		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

-	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

-	}

+    $chunk = $modx->getChunk($target);

+    if($chunk !== false && !empty($chunk)) {

+        $content = $chunk;

+    } elseif(is_file(MODX_BASE_PATH . $target)) {

+        $content = file_get_contents(MODX_BASE_PATH . $target);

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+    {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+    } else {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+    }

 }

 

 // merge placeholders

@@ -424,8 +424,8 @@ 
 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

 if(strpos($content, '[+') !== false) {

-	$modx->toPlaceholders($ph);

-	$content = $modx->mergePlaceholderContent($content);

+    $modx->toPlaceholders($ph);

+    $content = $modx->mergePlaceholderContent($content);

 }

 $content = $modx->parseDocumentSource($content);

 $content = $modx->parseText($content, $_lang, '[%', '%]');

@@ -433,7 +433,7 @@ 
 $content = $modx->cleanUpMODXTags($content); //cleanup

 

 if($js = $modx->getRegisteredClientScripts()) {

-	$content .= $js;

+    $content .= $js;

 }

 

 echo $content;

@@ -443,7 +443,7 @@ 
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

 function getTplWidget() { // recent document info

-	return '

+    return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

 				<div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div>

@@ -454,11 +454,11 @@ 
 }

 

 function getRecentInfo() { // recent document info

-	global $modx;

+    global $modx;

 

-	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

+    $modx->addSnippet('recentInfoList', 'getRecentInfoList');

 

-	$html = '

+    $html = '

 			<div class="table-responsive">

 				<table class="table data">

 					<thead>

@@ -476,96 +476,96 @@ 
 				</table>

 			</div>

 ';

-	return $html;

+    return $html;

 }

 

 function getRecentInfoList() {

-	global $modx;

-

-	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

-

-	if($modx->db->getRecordCount($rs) < 1) {

-		return '<tr><td>[%no_activity_message%]</td></tr>';

-	}

-

-	$tpl = getRecentInfoRowTpl();

-

-	$btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

-	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

-

-	$output = array();

-	while($ph = $modx->db->getRow($rs)) {

-		$docid = $ph['id'];

-		$_ = $modx->getUserInfo($ph['editedby']);

-		$ph['username'] = $_['username'];

-

-		if($ph['deleted'] == 1) {

-			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

-			$ph['status'] = 'unpublished font-italic text-muted';

-		} else {

-			$ph['status'] = 'published';

-		}

-

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

-			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-		} else {

-			$ph['edit_btn'] = '';

-		}

-

-		$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

-		$ph['preview_btn'] = str_replace(array(

-			'[+id+]',

-			'[+preview_disabled+]'

-		), array(

-			$docid,

-			$preview_disabled

-		), $btntpl['preview_btn']);

-

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

-			if($ph['deleted'] == 0) {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-			} else {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

-			}

-			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-		} else {

-			$ph['delete_btn'] = '';

-		}

-

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

-			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} else {

-			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		}

-		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

-

-		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

-

-		if($ph['longtitle'] == '') {

-			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['description'] == '') {

-			$ph['description'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['introtext'] == '') {

-			$ph['introtext'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['alias'] == '') {

-			$ph['alias'] = '(<i>[%not_set%]</i>)';

-		}

-

-		$output[] = $modx->parseText($tpl, $ph);

-	}

-	return join("\n", $output);

+    global $modx;

+

+    $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

+

+    if($modx->db->getRecordCount($rs) < 1) {

+        return '<tr><td>[%no_activity_message%]</td></tr>';

+    }

+

+    $tpl = getRecentInfoRowTpl();

+

+    $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

+    $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

+

+    $output = array();

+    while($ph = $modx->db->getRow($rs)) {

+        $docid = $ph['id'];

+        $_ = $modx->getUserInfo($ph['editedby']);

+        $ph['username'] = $_['username'];

+

+        if($ph['deleted'] == 1) {

+            $ph['status'] = 'deleted text-danger';

+        } elseif($ph['published'] == 0) {

+            $ph['status'] = 'unpublished font-italic text-muted';

+        } else {

+            $ph['status'] = 'published';

+        }

+

+        if($modx->hasPermission('edit_document')) {

+            $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

+        } else {

+            $ph['edit_btn'] = '';

+        }

+

+        $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

+        $ph['preview_btn'] = str_replace(array(

+            '[+id+]',

+            '[+preview_disabled+]'

+        ), array(

+            $docid,

+            $preview_disabled

+        ), $btntpl['preview_btn']);

+

+        if($modx->hasPermission('delete_document')) {

+            if($ph['deleted'] == 0) {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

+            } else {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

+            }

+            $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

+        } else {

+            $ph['delete_btn'] = '';

+        }

+

+        if($ph['deleted'] == 1 && $ph['published'] == 0) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+            $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } else {

+            $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        }

+        $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

+

+        $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

+

+        if($ph['longtitle'] == '') {

+            $ph['longtitle'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['description'] == '') {

+            $ph['description'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['introtext'] == '') {

+            $ph['introtext'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['alias'] == '') {

+            $ph['alias'] = '(<i>[%not_set%]</i>)';

+        }

+

+        $output[] = $modx->parseText($tpl, $ph);

+    }

+    return join("\n", $output);

 }

 

 function getRecentInfoRowTpl() {

-	$tpl = '

+    $tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

 							<td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]" target="main">[+pagetitle+]</a></td>

@@ -589,16 +589,16 @@ 
 								</div>

 							</td>

 						</tr>';

-	return $tpl;

+    return $tpl;

 }

 

 // setup icons

 function wrapIcon($i, $action) {

-	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

+    return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

 function getStartUpScript() {

-	$script = '

+    $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

         	var xhr = new XMLHttpRequest();

@@ -622,5 +622,5 @@ 
 		})(jQuery);        

         </script>

 ';

-	return $script;

+    return $script;

 }

Spacing +65 added lines, -65 removed lines

@@ -1,11 +1,11 @@ 
 <?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.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

-if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

+if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

 	// seems to be a new install - send the user to the configuration page

 	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

@@ -16,50 +16,50 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

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

-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+if ($modx->hasPermission('messages')) {

+	include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

 

 	$msg = array();

 	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';

 	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';

 	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

 	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

 	$ph['MessageInfo'] = join("\n", $msg);

 }

 

 // setup icons

-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

+if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

 	$ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

+if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

 	$ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

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

 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

 	$ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

 	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

+if ($modx->hasPermission('bk_manager')) {

 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

 	$ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

+if ($modx->hasPermission('help')) {

 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

 	$ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

+	include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');

+	if ($config_check_results != $_lang['configcheck_ok']) {

 		$ph['config_check_results'] = $config_check_results;

 		$ph['config_display'] = 'block';

 	} else {

@@ -70,8 +70,8 @@ 
 }

 

 // Check logout-reminder

-if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

+if (isset($_SESSION['show_logout_reminder'])) {

+	switch ($_SESSION['show_logout_reminder']['type']) {

 		case 'logout_reminder':

 			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

 			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

@@ -125,7 +125,7 @@ 
 	</tr>

 </table>';

 

-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

 	'username' => $modx->getLoginUserName(),

@@ -140,10 +140,10 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

-if($modx->db->getRecordCount($rs) < 1) {

+if ($modx->db->getRecordCount($rs) < 1) {

 	$html = '<p>[%no_active_users_found%]</p>';

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+	include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');

 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

 	$ph['now'] = strftime('%H:%M:%S', $now);

 	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

@@ -168,7 +168,7 @@ 
 	$userList = array();

 	$userCount = array();

 	// Create userlist with session-count first before output

-	while($activeusers = $modx->db->getRow($rs)) {

+	while ($activeusers = $modx->db->getRow($rs)) {

 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

@@ -186,9 +186,9 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach ($userList as $params) {

 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+		$html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

 	}

 

 	$html .= '

@@ -200,7 +200,7 @@ 
 $ph['OnlineInfo'] = $html;

 

 // include rss feeds for important forum topics

-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');

+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');

 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];

 $ph['modx_news_content'] = $feedData['modx_news_content'];

 

@@ -231,7 +231,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

-if(is_array($evtOut)) {

+if (is_array($evtOut)) {

 	$output = implode('', $evtOut);

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -365,57 +365,57 @@ 
 

 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

-if(is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {

 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach ($sitewidgets as $widget) {

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function($a, $b){

 	return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

+foreach ($widgets as $widget) {

+	if ($widget['hide'] != '1') {

 		$output .= $modx->parseText($tpl, $widget);

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

-if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

+	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

-if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

+if (substr($target, 0, 1) === '@') {

+	if (substr($target, 0, 6) === '@CHUNK') {

 		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

+	} elseif (substr($target, 0, 5) === '@FILE') {

 		$content = file_get_contents(trim(substr($target, 6)));

 	} else {

 		$content = '';

 	}

 } else {

 	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

+	if ($chunk !== false && !empty($chunk)) {

 		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+	} elseif (is_file(MODX_BASE_PATH.$target)) {

+		$content = file_get_contents(MODX_BASE_PATH.$target);

+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');

+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible

 	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');

 	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');

 	}

 }

 

@@ -423,7 +423,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

-if(strpos($content, '[+') !== false) {

+if (strpos($content, '[+') !== false) {

 	$modx->toPlaceholders($ph);

 	$content = $modx->mergePlaceholderContent($content);

 }

@@ -432,7 +432,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

-if($js = $modx->getRegisteredClientScripts()) {

+if ($js = $modx->getRegisteredClientScripts()) {

 	$content .= $js;

 }

 

@@ -442,7 +442,7 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget() { // recent document info

+function getTplWidget(){ // recent document info

 	return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

@@ -453,7 +453,7 @@ 
 ';

 }

 

-function getRecentInfo() { // recent document info

+function getRecentInfo(){ // recent document info

 	global $modx;

 

 	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

@@ -479,12 +479,12 @@ 
 	return $html;

 }

 

-function getRecentInfoList() {

+function getRecentInfoList(){

 	global $modx;

 

 	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

 

-	if($modx->db->getRecordCount($rs) < 1) {

+	if ($modx->db->getRecordCount($rs) < 1) {

 		return '<tr><td>[%no_activity_message%]</td></tr>';

 	}

 

@@ -494,20 +494,20 @@ 
 	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

 

 	$output = array();

-	while($ph = $modx->db->getRow($rs)) {

+	while ($ph = $modx->db->getRow($rs)) {

 		$docid = $ph['id'];

 		$_ = $modx->getUserInfo($ph['editedby']);

 		$ph['username'] = $_['username'];

 

-		if($ph['deleted'] == 1) {

+		if ($ph['deleted'] == 1) {

 			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

+		} elseif ($ph['published'] == 0) {

 			$ph['status'] = 'unpublished font-italic text-muted';

 		} else {

 			$ph['status'] = 'published';

 		}

 

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

+		if ($modx->hasPermission('edit_document')) {

 			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

 		} else {

 			$ph['edit_btn'] = '';

@@ -522,8 +522,8 @@ 
 			$preview_disabled

 		), $btntpl['preview_btn']);

 

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

-			if($ph['deleted'] == 0) {

+		if ($modx->hasPermission('delete_document')) {

+			if ($ph['deleted'] == 0) {

 				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

 			} else {

 				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

@@ -533,11 +533,11 @@ 
 			$ph['delete_btn'] = '';

 		}

 

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

+		if ($ph['deleted'] == 1 && $ph['published'] == 0) {

 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+		} elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {

 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+		} elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {

 			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

 		} else {

 			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

@@ -546,16 +546,16 @@ 
 

 		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

 

-		if($ph['longtitle'] == '') {

+		if ($ph['longtitle'] == '') {

 			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['description'] == '') {

+		if ($ph['description'] == '') {

 			$ph['description'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['introtext'] == '') {

+		if ($ph['introtext'] == '') {

 			$ph['introtext'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['alias'] == '') {

+		if ($ph['alias'] == '') {

 			$ph['alias'] = '(<i>[%not_set%]</i>)';

 		}

 

@@ -564,7 +564,7 @@ 
 	return join("\n", $output);

 }

 

-function getRecentInfoRowTpl() {

+function getRecentInfoRowTpl(){

 	$tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

@@ -593,11 +593,11 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action) {

+function wrapIcon($i, $action){

 	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

-function getStartUpScript() {

+function getStartUpScript(){

 	$script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

Braces +77 added lines, -67 removed lines

@@ -1,11 +1,11 @@ 
 <?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.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

-if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

+if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
 	// seems to be a new install - send the user to the configuration page

 	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

@@ -16,7 +16,7 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

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

+if($modx->hasPermission('messages')) {
 	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

@@ -32,46 +32,46 @@ 
 }

 

 // setup icons

-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

+if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

 	$ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

+if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

 	$ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

 	$ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

+if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

 	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

+if($modx->hasPermission('bk_manager')) {
 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

 	$ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

+if($modx->hasPermission('help')) {
 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

 	$ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

+if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
 	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

+	if($config_check_results != $_lang['configcheck_ok']) {
 		$ph['config_check_results'] = $config_check_results;

 		$ph['config_display'] = 'block';

-	} else {

+	} else {
 		$ph['config_display'] = 'none';

 	}

-} else {

+} else {
 	$ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

-if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

+if(isset($_SESSION['show_logout_reminder'])) {
+	switch($_SESSION['show_logout_reminder']['type']) {
 		case 'logout_reminder':

 			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

 			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

@@ -79,7 +79,7 @@ 
 	}

 	$ph['show_logout_reminder'] = 'block';

 	unset($_SESSION['show_logout_reminder']);

-} else {

+} else {
 	$ph['show_logout_reminder'] = 'none';

 }

 

@@ -140,9 +140,9 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

-if($modx->db->getRecordCount($rs) < 1) {

+if($modx->db->getRecordCount($rs) < 1) {
 	$html = '<p>[%no_active_users_found%]</p>';

-} else {

+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

 	$ph['now'] = strftime('%H:%M:%S', $now);

@@ -168,7 +168,7 @@ 
 	$userList = array();

 	$userCount = array();

 	// Create userlist with session-count first before output

-	while($activeusers = $modx->db->getRow($rs)) {

+	while($activeusers = $modx->db->getRow($rs)) {
 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

@@ -186,7 +186,7 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach($userList as $params) {
 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

 		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

 	}

@@ -231,7 +231,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

-if(is_array($evtOut)) {

+if(is_array($evtOut)) {
 	$output = implode('', $evtOut);

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -340,7 +340,7 @@ 
 	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

 	'hide'=>'0'

 );

-if ($modx->config['rss_url_news']) {

+if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(

         'menuindex' => '40',

         'id' => 'news',

@@ -351,7 +351,7 @@ 
         'hide'=>'0'

     );

 }

-if ($modx->config['rss_url_security']) {

+if ($modx->config['rss_url_security']) {
     $widgets['security'] = array(

         'menuindex' => '50',

         'id' => 'security',

@@ -365,29 +365,29 @@ 
 

 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

-if(is_array($sitewidgets)) {

+if(is_array($sitewidgets)) {
 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function ($a, $b){
 	return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

+foreach($widgets as $widget) {
+	if ($widget['hide'] != '1') {
 		$output .= $modx->parseText($tpl, $widget);

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

-if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

+if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
 	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

@@ -395,26 +395,28 @@ 
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

-if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

+if(substr($target, 0, 1) === '@') {
+	if(substr($target, 0, 6) === '@CHUNK') {
 		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

+	} elseif(substr($target, 0, 5) === '@FILE') {
 		$content = file_get_contents(trim(substr($target, 6)));

-	} else {

+	} else {
 		$content = '';

 	}

-} else {

+} else {
 	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

+	if($chunk !== false && !empty($chunk)) {
 		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

+	} elseif(is_file(MODX_BASE_PATH . $target)) {
 		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
 		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) {
+	    // ClipperCMS compatible

 	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-	} else {

+		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
+	}
+	} else {
 		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

 	}

 }

@@ -423,7 +425,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

-if(strpos($content, '[+') !== false) {

+if(strpos($content, '[+') !== false) {
 	$modx->toPlaceholders($ph);

 	$content = $modx->mergePlaceholderContent($content);

 }

@@ -432,7 +434,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

-if($js = $modx->getRegisteredClientScripts()) {

+if($js = $modx->getRegisteredClientScripts()) {
 	$content .= $js;

 }

 

@@ -442,7 +444,9 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget() { // recent document info

+function getTplWidget()
+{
+// recent document info

 	return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

@@ -453,7 +457,9 @@ 
 ';

 }

 

-function getRecentInfo() { // recent document info

+function getRecentInfo()
+{
+// recent document info

 	global $modx;

 

 	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

@@ -479,12 +485,13 @@ 
 	return $html;

 }

 

-function getRecentInfoList() {

+function getRecentInfoList()
+{
 	global $modx;

 

 	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

 

-	if($modx->db->getRecordCount($rs) < 1) {

+	if($modx->db->getRecordCount($rs) < 1) {
 		return '<tr><td>[%no_activity_message%]</td></tr>';

 	}

 

@@ -494,22 +501,22 @@ 
 	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

 

 	$output = array();

-	while($ph = $modx->db->getRow($rs)) {

+	while($ph = $modx->db->getRow($rs)) {
 		$docid = $ph['id'];

 		$_ = $modx->getUserInfo($ph['editedby']);

 		$ph['username'] = $_['username'];

 

-		if($ph['deleted'] == 1) {

+		if($ph['deleted'] == 1) {
 			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

+		} elseif($ph['published'] == 0) {
 			$ph['status'] = 'unpublished font-italic text-muted';

-		} else {

+		} else {
 			$ph['status'] = 'published';

 		}

 

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

+		if($modx->hasPermission('edit_document')) {
 			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-		} else {

+		} else {
 			$ph['edit_btn'] = '';

 		}

 

@@ -522,40 +529,40 @@ 
 			$preview_disabled

 		), $btntpl['preview_btn']);

 

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

-			if($ph['deleted'] == 0) {

+		if($modx->hasPermission('delete_document')) {
+			if($ph['deleted'] == 0) {
 				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-			} else {

+			} else {
 				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

 			}

 			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-		} else {

+		} else {
 			$ph['delete_btn'] = '';

 		}

 

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

+		if($ph['deleted'] == 1 && $ph['published'] == 0) {
 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {
 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {
 			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} else {

+		} else {
 			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

 		}

 		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

 

 		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

 

-		if($ph['longtitle'] == '') {

+		if($ph['longtitle'] == '') {
 			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['description'] == '') {

+		if($ph['description'] == '') {
 			$ph['description'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['introtext'] == '') {

+		if($ph['introtext'] == '') {
 			$ph['introtext'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['alias'] == '') {

+		if($ph['alias'] == '') {
 			$ph['alias'] = '(<i>[%not_set%]</i>)';

 		}

 

@@ -564,7 +571,8 @@ 
 	return join("\n", $output);

 }

 

-function getRecentInfoRowTpl() {

+function getRecentInfoRowTpl()
+{
 	$tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

@@ -593,11 +601,13 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action) {

+function wrapIcon($i, $action)
+{
 	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

-function getStartUpScript() {

+function getStartUpScript()
+{
 	$script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {