evolution-cms / evolution

index.php

Spacing +16 added lines, -16 removed lines

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

Braces +12 added lines, -6 removed lines

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

Indentation +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 
 $autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
@@ -56,11 +56,11 @@ 
 if(is_file($base_path . 'assets/cache/siteManager.php'))
     include_once($base_path . 'assets/cache/siteManager.php');
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 if(is_file($base_path . 'assets/cache/siteHostnames.php'))
     include_once($base_path . 'assets/cache/siteHostnames.php');
 if(!defined('MODX_SITE_HOSTNAMES'))
-	define('MODX_SITE_HOSTNAMES', '');
+    define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
 $mstart = memory_get_usage();
@@ -84,7 +84,7 @@ 
 
 define('IN_PARSER_MODE', true);
 if ( ! defined('IN_MANAGER_MODE')) {
-	define('IN_MANAGER_MODE', false);
+    define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
     define('MODX_API_MODE', false);
@@ -92,12 +92,12 @@ 
 
 // get the required includes
 if(!isset($database_user) || $database_user=="") {
-	$rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
-	// Be sure config.inc.php is there and that it contains some important values
-	if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
-		readfile('install/not_installed.tpl');
-		exit;
-	}
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
+    // Be sure config.inc.php is there and that it contains some important values
+    if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
+        readfile('install/not_installed.tpl');
+        exit;
+    }
 }
 
 // start session
@@ -105,11 +105,11 @@ 
 
 // initiate a new document parser
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = DocumentParser::getInstance();
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = DocumentParser::getInstance();
 }
 
 // set some parser options

manager/frames/nodes.php

Spacing +3 added lines, -3 removed lines

@@ -18,9 +18,9 @@
     exit('send some data');
 } //??
 
-$indent = (int)$_REQUEST['indent'];
-$parent = (int)$_REQUEST['parent'];
-$expandAll = (int)$_REQUEST['expandAll'];
+$indent = (int) $_REQUEST['indent'];
+$parent = (int) $_REQUEST['parent'];
+$expandAll = (int) $_REQUEST['expandAll'];
 $output = '';
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 

manager/frames/nodes.functions.inc.php

Spacing +31 added lines, -31 removed lines

@@ -38,13 +38,13 @@ 
         case 'publishedon':
         case 'pub_date':
         case 'unpub_date':
-            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], 'sc.'.$_SESSION['tree_sortby']);
             break;
         default:
-            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+            $sortby = 'sc.'.$_SESSION['tree_sortby'];
     };
 
-    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+    $orderby = $modx->db->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
     // Folder sorting gets special setup ;) Add menuindex and pagetitle
     if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -58,11 +58,11 @@ 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $showProtected = false;
     if (isset ($modx->config['tree_show_protected'])) {
-        $showProtected = (boolean)$modx->config['tree_show_protected'];
+        $showProtected = (boolean) $modx->config['tree_show_protected'];
     }
-    $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
     if ($showProtected == false) {
-        $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     } else {
         $access = '';
     }
@@ -98,7 +98,7 @@ 
         }
 
         $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : '';
-        $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+        $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
         // Prepare displaying user-locks
         $lockedByUser = '';
@@ -109,7 +109,7 @@ 
                     'element_type' => $_lang["lock_element_type_7"],
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
-                $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
             } else {
                 $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                     'element_type' => $_lang["lock_element_type_7"],
@@ -117,9 +117,9 @@ 
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
                 if ($modx->hasPermission('remove_locks')) {
-                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 } else {
-                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 }
             }
         }
@@ -128,22 +128,22 @@ 
 
         $title = '';
         if (isDateNode($nodeNameSource)) {
-            $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+            $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
         }
-        $title .= $_lang['id'] . ': ' . $row['id'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-        $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-        $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-        $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-        $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-        $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= $_lang['id'].': '.$row['id'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+        $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+        $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+        $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+        $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+        $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
         $title = $modx->htmlspecialchars($title);
-        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+        $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
         $data = array(
             'id' => $row['id'],
@@ -227,7 +227,7 @@ 
             }
 
             if ($ph['contextmenu']) {
-                $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
             }
 
             if ($_SESSION['tree_show_only_folders']) {
@@ -285,7 +285,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -323,7 +323,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -374,7 +374,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -416,7 +416,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -493,7 +493,7 @@ 
                     $nodetitle .= $modx->config['friendly_url_suffix'];
                 }
             }
-            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
             break;
         case 'pagetitle':
             $nodetitle = $row['pagetitle'];
@@ -553,7 +553,7 @@ 
 {
     $modx = evolutionCMS();
 
-    return (int)$modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+    return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
 }
 
 /**

manager/actions/mutate_content.dynamic.php

Indentation +411 added lines, -411 removed lines

@@ -1,6 +1,6 @@ 
 <?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.");
 }
 
 /********************/
@@ -12,30 +12,30 @@ 
 
 // check permissions
 switch($modx->manager->action) {
-	case 27:
-		if(!$modx->hasPermission('edit_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 85:
-	case 72:
-	case 4:
-		if(!$modx->hasPermission('new_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
-			// check user has permissions for parent
-			include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-			$udperms = new udperms();
-			$udperms->user = $modx->getLoginUserID();
-			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
-			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
-				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-			}
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 27:
+        if(!$modx->hasPermission('edit_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 85:
+    case 72:
+    case 4:
+        if(!$modx->hasPermission('new_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+            // check user has permissions for parent
+            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            $udperms = new udperms();
+            $udperms->user = $modx->getLoginUserID();
+            $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
+            $udperms->role = $_SESSION['mgrRole'];
+            if(!$udperms->checkPermissions()) {
+                $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+            }
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -54,22 +54,22 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
 if($modx->manager->action == 27) {
-	//editing an existing document
-	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-	$udperms = new udperms();
-	$udperms->user = $modx->getLoginUserID();
-	$udperms->document = $id;
-	$udperms->role = $_SESSION['mgrRole'];
-
-	if(!$udperms->checkPermissions()) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
+    //editing an existing document
+    // check permissions on the document
+    include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+    $udperms = new udperms();
+    $udperms->user = $modx->getLoginUserID();
+    $udperms->document = $id;
+    $udperms->role = $_SESSION['mgrRole'];
+
+    if(!$udperms->checkPermissions()) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
 }
 
 // check to see if resource isn't locked
 if($lockedEl = $modx->elementIsLocked(7, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
 
@@ -78,74 +78,74 @@ 
 
 // get document groups for current user
 if($_SESSION['mgrDocgroups']) {
-	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
+    $docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
 if(!empty ($id)) {
-	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
-		$access .= " OR dg.document_group IN ({$docgrp})";
-	}
-	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
-	$content = array();
-	$content = $modx->db->getRow($rs);
-	$modx->documentObject = &$content;
-	if(!$content) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
-	$_SESSION['itemname'] = $content['pagetitle'];
+    $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
+    if($docgrp) {
+        $access .= " OR dg.document_group IN ({$docgrp})";
+    }
+    $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
+    $content = array();
+    $content = $modx->db->getRow($rs);
+    $modx->documentObject = &$content;
+    if(!$content) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
+    $_SESSION['itemname'] = $content['pagetitle'];
 } else {
-	$content = array();
+    $content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
-		$content['template'] = $_REQUEST['newtemplate'];
-	} else {
-		$content['template'] = getDefaultTemplate();
-	}
+    if(isset($_REQUEST['newtemplate'])) {
+        $content['template'] = $_REQUEST['newtemplate'];
+    } else {
+        $content['template'] = getDefaultTemplate();
+    }
 
-	$_SESSION['itemname'] = $_lang["new_resource"];
+    $_SESSION['itemname'] = $_lang["new_resource"];
 }
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
 if(isset($_REQUEST['newtemplate'])) {
-	$formRestored = true;
+    $formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
 if($formRestored == true) {
-	$content = array_merge($content, $_POST);
-	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
-		unset ($content['pub_date']);
-	} else {
-		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
-	}
-	if(empty ($content['unpub_date'])) {
-		unset ($content['unpub_date']);
-	} else {
-		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
-	}
+    $content = array_merge($content, $_POST);
+    $content['content'] = $_POST['ta'];
+    if(empty ($content['pub_date'])) {
+        unset ($content['pub_date']);
+    } else {
+        $content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
+    }
+    if(empty ($content['unpub_date'])) {
+        unset ($content['unpub_date']);
+    } else {
+        $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
+    }
 }
 
 // increase menu index if this is a new document
 if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
-		$modx->config['auto_menuindex'] = 1;
-	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
-		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
-		$content['menuindex'] = $modx->db->getValue($rs);
-	} else {
-		$content['menuindex'] = 0;
-	}
+    if(!isset ($modx->config['auto_menuindex'])) {
+        $modx->config['auto_menuindex'] = 1;
+    }
+    if($modx->config['auto_menuindex']) {
+        $pid = (int)$_REQUEST['pid'];
+        $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
+        $content['menuindex'] = $modx->db->getValue($rs);
+    } else {
+        $content['menuindex'] = 0;
+    }
 }
 
 if(isset ($_POST['which_editor'])) {
-	$modx->config['which_editor'] = $_POST['which_editor'];
+    $modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
@@ -545,23 +545,23 @@ 
 
 	<form name="mutate" id="mutate" class="content" method="post" enctype="multipart/form-data" action="index.php" onsubmit="documentDirty=false;">
 		<?php
-		// invoke OnDocFormPrerender event
-		$evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
-			'id' => $id,
-			'template' => $content['template']
-		));
-
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-
-		/*************************/
-		$dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
-		$sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
-		$page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
-		/*************************/
-
-		?>
+        // invoke OnDocFormPrerender event
+        $evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
+            'id' => $id,
+            'template' => $content['template']
+        ));
+
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+
+        /*************************/
+        $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
+        $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
+        $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
+        /*************************/
+
+        ?>
 		<input type="hidden" name="a" value="5" />
 		<input type="hidden" name="id" value="<?= $content['id'] ?>" />
 		<input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
@@ -576,54 +576,54 @@ 
 
 			<h1>
 				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
-				} else {
-				    if ($modx->manager->action == '4') {
+                    echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+                } else {
+                    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
                     } else if ($modx->manager->action == '72') {
                         echo $_lang['add_weblink'];
                     } else {
                         echo $_lang['create_resource_title'];
                     }
-				} ?>
+                } ?>
 			</h1>
 
 			<?= $_style['actionbuttons']['dynamic']['document'] ?>
 
 			<?php
-			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
-				$temp = array();
-				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
-
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
-					$bID = (int) $_REQUEST['id'];
-					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
-					$bID = (int) $_REQUEST['pid'];
-					$temp = $modx->getParentIds($bID);
-					array_unshift($temp, $bID);
-				}
-
-				if($temp) {
-					$parents = implode(',', $temp);
-
-					if(!empty($parents)) {
-						$where = "FIND_IN_SET(id,'{$parents}') DESC";
-						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
-							$out .= '<li class="breadcrumbs__li">
+            // breadcrumbs
+            if($modx->config['use_breadcrumbs']) {
+                $temp = array();
+                $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
+
+                if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+                    $bID = (int) $_REQUEST['id'];
+                    $temp = $modx->getParentIds($bID);
+                } else if(isset($_REQUEST['pid'])) {
+                    $bID = (int) $_REQUEST['pid'];
+                    $temp = $modx->getParentIds($bID);
+                    array_unshift($temp, $bID);
+                }
+
+                if($temp) {
+                    $parents = implode(',', $temp);
+
+                    if(!empty($parents)) {
+                        $where = "FIND_IN_SET(id,'{$parents}') DESC";
+                        $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
+                        while($row = $modx->db->getRow($rs)) {
+                            $out .= '<li class="breadcrumbs__li">
                                 <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
-			}
-			?>
+                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
+                echo '<ul class="breadcrumbs">' . $out . '</ul>';
+            }
+            ?>
 
 			<!-- start main wrapper -->
 			<div class="sectionBody">
@@ -635,13 +635,13 @@ 
 
 					<!-- General -->
 					<?php
-					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
-						'id' => $id
-					));
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					} else {
-						?>
+                    $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
+                        'id' => $id
+                    ));
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    } else {
+                        ?>
 						<div class="tab-page" id="tabGeneral">
 							<h2 class="tab"><?= $_lang['settings_general'] ?></h2>
 							<script type="text/javascript">tpSettings.addTabPage(document.getElementById("tabGeneral"));</script>
@@ -726,36 +726,36 @@ 
 										<select id="template" name="template" class="inputBox" onchange="templateWarning();">
 											<option value="0">(blank)</option>
 											<?php
-											$field = "t.templatename, t.selectable, t.id, c.category";
-											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
-											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
-											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
-													continue;
-												};
-												// Skip if not selectable but show if selected!
-												$thisCategory = $row['category'];
-												if($thisCategory == null) {
-													$thisCategory = $_lang["no_category"];
-												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
-														echo "\t\t\t\t\t</optgroup>\n";
-													}
-													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
-													$closeOptGroup = true;
-												}
+                                            $field = "t.templatename, t.selectable, t.id, c.category";
+                                            $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
+                                            $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
+                                            $currentCategory = '';
+                                            while($row = $modx->db->getRow($rs)) {
+                                                if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+                                                    continue;
+                                                };
+                                                // Skip if not selectable but show if selected!
+                                                $thisCategory = $row['category'];
+                                                if($thisCategory == null) {
+                                                    $thisCategory = $_lang["no_category"];
+                                                }
+                                                if($thisCategory != $currentCategory) {
+                                                    if($closeOptGroup) {
+                                                        echo "\t\t\t\t\t</optgroup>\n";
+                                                    }
+                                                    echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
+                                                    $closeOptGroup = true;
+                                                }
 
-												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
+                                                $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
-												$currentCategory = $thisCategory;
-											}
-											if($thisCategory != '') {
-												echo "\t\t\t\t\t</optgroup>\n";
-											}
-											?>
+                                                echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+                                                $currentCategory = $thisCategory;
+                                            }
+                                            if($thisCategory != '') {
+                                                echo "\t\t\t\t\t</optgroup>\n";
+                                            }
+                                            ?>
 										</select>
 									</td>
 								</tr>
@@ -795,37 +795,37 @@ 
 									</td>
 									<td valign="top">
 										<?php
-										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $content['parent'];
-											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_REQUEST['pid'];
-											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_POST['parent'];
-											}
-										} else {
-											$parentname = $site_name;
-											$content['parent'] = 0;
-										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
-											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
-											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
-												$modx->webAlertAndQuit($_lang["error_no_parent"]);
-											}
-										}
-										?>
+                                        $parentlookup = false;
+                                        if(isset ($_REQUEST['id'])) {
+                                            if($content['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $content['parent'];
+                                            }
+                                        } elseif(isset ($_REQUEST['pid'])) {
+                                            if($_REQUEST['pid'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_REQUEST['pid'];
+                                            }
+                                        } elseif(isset($_POST['parent'])) {
+                                            if($_POST['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_POST['parent'];
+                                            }
+                                        } else {
+                                            $parentname = $site_name;
+                                            $content['parent'] = 0;
+                                        }
+                                        if($parentlookup !== false && is_numeric($parentlookup)) {
+                                            $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
+                                            $parentname = $modx->db->getValue($rs);
+                                            if(!$parentname) {
+                                                $modx->webAlertAndQuit($_lang["error_no_parent"]);
+                                            }
+                                        }
+                                        ?>
 										<i id="plock" class="<?= $_style["actions_folder"] ?>" onclick="enableParentSelection(!allowParentSelection);"></i>
 										<b><span id="parentName"><?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?> (<?= $parentname ?>)</span></b>
 										<input type="hidden" name="parent" value="<?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?>" onchange="documentDirty=true;" />
@@ -833,7 +833,7 @@ 
 								</tr>
 								<tr></tr>
 								<?php
-								/*
+                                /*
 								if($content['type'] == 'reference' || $modx->manager->action == '72') {
 									?>
 									<tr>
@@ -861,7 +861,7 @@ 
 									</tr>
 									<?php
 								}*/
-								?>
+                                ?>
 
 								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
@@ -874,36 +874,36 @@ 
 													<select id="which_editor" class="form-control form-control-sm" size="1" name="which_editor" onchange="changeRTE();">
 													<option value="none"><?= $_lang['none'] ?></option>
 														<?php
-														// invoke OnRichTextEditorRegister event
-														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
-																$editor = $evtOut[$i];
-																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
-															}
-														}
-														?>
+                                                        // invoke OnRichTextEditorRegister event
+                                                        $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                                        if(is_array($evtOut)) {
+                                                            for($i = 0; $i < count($evtOut); $i++) {
+                                                                $editor = $evtOut[$i];
+                                                                echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
+                                                            }
+                                                        }
+                                                        ?>
 													</select>
 												</label>
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
-													$htmlContent = $content['content'];
-													?>
+                                                if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+                                                    $htmlContent = $content['content'];
+                                                    ?>
 													<div class="section-editor clearfix">
 														<textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->htmlspecialchars($htmlContent) ?></textarea>
 													</div>
 													<?php
-													// Richtext-[*content*]
-													$richtexteditorIds = array();
-													$richtexteditorOptions = array();
-													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
-													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
-												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
-												}
-												?>
+                                                    // Richtext-[*content*]
+                                                    $richtexteditorIds = array();
+                                                    $richtexteditorOptions = array();
+                                                    $richtexteditorIds[$modx->config['which_editor']][] = 'ta';
+                                                    $richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
+                                                } else {
+                                                    echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                }
+                                                ?>
 											</div>
 										</td>
 									</tr>
@@ -1190,8 +1190,8 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
-									?>
+                                if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+                                    ?>
 									<tr>
 										<td>
 											<span class="warning"><?= $_lang['resource_type'] ?></span>
@@ -1213,15 +1213,15 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
-													$content['contentType'] = 'text/html';
-												}
-												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
-												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
-												}
-												?>
+                                                if(!$content['contentType']) {
+                                                    $content['contentType'] = 'text/html';
+                                                }
+                                                $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
+                                                $ct = explode(",", $custom_contenttype);
+                                                for($i = 0; $i < count($ct); $i++) {
+                                                    echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+                                                }
+                                                ?>
 											</select>
 										</td>
 									</tr>
@@ -1244,23 +1244,23 @@ 
 										</td>
 									</tr>
 									<?php
-								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
-										// non-admin managers creating or editing a document resource
-										?>
+                                } else {
+                                    if($content['type'] != 'reference' && $modx->manager->action != '72') {
+                                        // non-admin managers creating or editing a document resource
+                                        ?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
 										<input type="hidden" name="type" value="document" />
 										<input type="hidden" name="content_dispo" value="<?= (isset($content['content_dispo']) ? $content['content_dispo'] : '0') ?>" />
 										<?php
-									} else {
-										// non-admin managers creating or editing a reference (weblink) resource
-										?>
+                                    } else {
+                                        // non-admin managers creating or editing a reference (weblink) resource
+                                        ?>
 										<input type="hidden" name="type" value="reference" />
 										<input type="hidden" name="contentType" value="text/html" />
 										<?php
-									}
-								}//if mgrRole
-								?>
+                                    }
+                                }//if mgrRole
+                                ?>
 
 								<tr>
 									<td>
@@ -1343,112 +1343,112 @@ 
                     ?>
 
 						<?php
-					/*******************************
+                    /*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
-						$groupsarray = array();
-						$sql = '';
-
-						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
-							// Load up, the permissions from the parent (if new document) or existing document
-							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
-
-							// Load up the current permissions and names
-							$vs = array(
-								$tbl_document_group_names,
-								$tbl_document_groups,
-								$documentId
-							);
-							$from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
-							$rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
-						} else {
-							// Just load up the names, we're starting clean
-							$rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
-						}
-
-						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
-							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
-						}
+                    if($use_udperms == 1) {
+                        $groupsarray = array();
+                        $sql = '';
+
+                        $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
+                        if($documentId > 0) {
+                            // Load up, the permissions from the parent (if new document) or existing document
+                            $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
+                            while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+
+                            // Load up the current permissions and names
+                            $vs = array(
+                                $tbl_document_group_names,
+                                $tbl_document_groups,
+                                $documentId
+                            );
+                            $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
+                            $rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
+                        } else {
+                            // Just load up the names, we're starting clean
+                            $rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
+                        }
+
+                        // retain selected doc groups between post
+                        if(isset($_POST['docgroups'])) {
+                            $groupsarray = array_merge($groupsarray, $_POST['docgroups']);
+                        }
+
+                        $isManager = $modx->hasPermission('access_permissions');
+                        $isWeb = $modx->hasPermission('web_access_permissions');
+
+                        // Setup Basic attributes for each Input box
+                        $inputAttributes = array(
+                            'type' => 'checkbox',
+                            'class' => 'checkbox',
+                            'name' => 'docgroups[]',
+                            'onclick' => 'makePublic(false);',
+                        );
+                        $permissions = array(); // New Permissions array list (this contains the HTML)
+                        $permissions_yes = 0; // count permissions the current mgr user has
+                        $permissions_no = 0; // count permissions the current mgr user doesn't have
+
+                        // Loop through the permissions list
+                        while($row = $modx->db->getRow($rs)) {
+
+                            // Create an inputValue pair (group ID and group link (if it exists))
+                            $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
+                            $inputId = 'group-' . $row['id'];
+
+                            $checked = in_array($inputValue, $groupsarray);
+                            if($checked) {
+                                $notPublic = true;
+                            } // Mark as private access (either web or manager)
+
+                            // Skip the access permission if the user doesn't have access...
+                            if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+                                continue;
+                            }
 
-						$isManager = $modx->hasPermission('access_permissions');
-						$isWeb = $modx->hasPermission('web_access_permissions');
-
-						// Setup Basic attributes for each Input box
-						$inputAttributes = array(
-							'type' => 'checkbox',
-							'class' => 'checkbox',
-							'name' => 'docgroups[]',
-							'onclick' => 'makePublic(false);',
-						);
-						$permissions = array(); // New Permissions array list (this contains the HTML)
-						$permissions_yes = 0; // count permissions the current mgr user has
-						$permissions_no = 0; // count permissions the current mgr user doesn't have
-
-						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
-
-							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
-
-							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
-								$notPublic = true;
-							} // Mark as private access (either web or manager)
-
-							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
-								continue;
-							}
-
-							// Setup attributes for this Input box
-							$inputAttributes['id'] = $inputId;
-							$inputAttributes['value'] = $inputValue;
-							if($checked) {
-								$inputAttributes['checked'] = 'checked';
-							} else {
-								unset($inputAttributes['checked']);
-							}
-
-							// Create attribute string list
-							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
-
-							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
-
-							// does user have this permission?
-							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
-							$vs = array(
-								$row['id'],
-								$_SESSION['mgrInternalKey']
-							);
-							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
-							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
-							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
-								++$permissions_yes;
-							} else {
-								++$permissions_no;
-							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
-						}
-						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
-							$permissions = array();
-						}
+                            // Setup attributes for this Input box
+                            $inputAttributes['id'] = $inputId;
+                            $inputAttributes['value'] = $inputValue;
+                            if($checked) {
+                                $inputAttributes['checked'] = 'checked';
+                            } else {
+                                unset($inputAttributes['checked']);
+                            }
 
-						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
-							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
-							}
-							// Output the permissions list...
-							?>
+                            // Create attribute string list
+                            $inputString = array();
+                            foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+
+                            // Make the <input> HTML
+                            $inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+
+                            // does user have this permission?
+                            $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
+                            $vs = array(
+                                $row['id'],
+                                $_SESSION['mgrInternalKey']
+                            );
+                            $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
+                            $rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
+                            $count = $modx->db->getValue($rsp);
+                            if($count > 0) {
+                                ++$permissions_yes;
+                            } else {
+                                ++$permissions_no;
+                            }
+                            $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+                        }
+                        // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
+                        if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+                            $permissions = array();
+                        }
+
+                        // See if the Access Permissions section is worth displaying...
+                        if(!empty($permissions)) {
+                            // Add the "All Document Groups" item if we have rights in both contexts
+                            if($isManager && $isWeb) {
+                                array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+                            }
+                            // Output the permissions list...
+                            ?>
 							<!-- Access Permissions -->
 							<div class="tab-page" id="tabAccess">
 								<h2 class="tab" id="tab_access_header"><?= $_lang['access_permissions'] ?></h2>
@@ -1482,31 +1482,31 @@ 
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
-						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
-							?>
+                        } // !empty($permissions)
+                        elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+                            ?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
 
-						}
-					}
-					/* End Document Access Permissions *
+                        }
+                    }
+                    /* End Document Access Permissions *
 					 ***********************************/
-					?>
+                    ?>
 
 					<input type="submit" name="save" style="display:none" />
 					<?php
 
-					// invoke OnDocFormRender event
-					$evtOut = $modx->invokeEvent('OnDocFormRender', array(
-						'id' => $id,
-						'template' => $content['template']
-					));
+                    // invoke OnDocFormRender event
+                    $evtOut = $modx->invokeEvent('OnDocFormRender', array(
+                        'id' => $id,
+                        'template' => $content['template']
+                    ));
 
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					}
-					?>
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    }
+                    ?>
 				</div><!--div class="tab-pane" id="documentPane"-->
 			</div><!--div class="sectionBody"-->
 		</fieldset>
@@ -1517,63 +1517,63 @@ 
 	</script>
 <?php
 if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
-			// invoke OnRichTextEditorInit event
-			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
-				'editor' => $editor,
-				'elements' => $elements,
-				'options' => $richtexteditorOptions[$editor]
-			));
-			if(is_array($evtOut)) {
-				echo implode('', $evtOut);
-			}
-		}
-	}
+    if(is_array($richtexteditorIds)) {
+        foreach($richtexteditorIds as $editor => $elements) {
+            // invoke OnRichTextEditorInit event
+            $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
+                'editor' => $editor,
+                'elements' => $elements,
+                'options' => $richtexteditorOptions[$editor]
+            ));
+            if(is_array($evtOut)) {
+                echo implode('', $evtOut);
+            }
+        }
+    }
 }
 
 /**
  * @return string
  */
 function getDefaultTemplate() {
-	$modx = evolutionCMS();
+    $modx = evolutionCMS();
 
     $default_template = '';
-	switch($modx->config['auto_template_logic']) {
-		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
-				$site_start = $modx->config['site_start'];
-				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				}
-			} else {
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				} else {
-					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-						$default_template = $sibl[0]['template'];
-					}
-				}
-			}
-			if(isset($default_template)) {
-				break;
-			} // If $default_template could not be determined, fall back / through to "parent"-mode
-		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
-				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
-					$default_template = $parent['template'];
-				}
-			}
-			break;
-		case 'system':
-		default: // default_template is already set
-			$default_template = $modx->config['default_template'];
-	}
-
-	return empty($default_template) ? $modx->config['default_template'] : $default_template;
+    switch($modx->config['auto_template_logic']) {
+        case 'sibling':
+            if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+                $site_start = $modx->config['site_start'];
+                $where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                }
+            } else {
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                } else {
+                    $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                    if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                        $default_template = $sibl[0]['template'];
+                    }
+                }
+            }
+            if(isset($default_template)) {
+                break;
+            } // If $default_template could not be determined, fall back / through to "parent"-mode
+        case 'parent':
+            if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+                $parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
+                if(isset($parent['template'])) {
+                    $default_template = $parent['template'];
+                }
+            }
+            break;
+        case 'system':
+        default: // default_template is already set
+            $default_template = $modx->config['default_template'];
+    }
+
+    return empty($default_template) ? $modx->config['default_template'] : $default_template;
 }

Spacing +145 added lines, -145 removed lines

@@ -1,35 +1,35 @@ 
 <?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.");
 }
 
 /********************/
-$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC';
-$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon';
-$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : '';
-$add_path = $sd . $sb . $pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 /*******************/
 
 // check permissions
-switch($modx->manager->action) {
+switch ($modx->manager->action) {
 	case 27:
-		if(!$modx->hasPermission('edit_document')) {
+		if (!$modx->hasPermission('edit_document')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 85:
 	case 72:
 	case 4:
-		if(!$modx->hasPermission('new_document')) {
+		if (!$modx->hasPermission('new_document')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
 			// check user has permissions for parent
-			include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+			include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
 			$udperms = new udperms();
 			$udperms->user = $modx->getLoginUserID();
 			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
 			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
+			if (!$udperms->checkPermissions()) {
 				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 			}
 		}
@@ -38,7 +38,7 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table names (alphabetical)
 $tbl_categories = $modx->getFullTableName('categories');
@@ -53,22 +53,22 @@ 
 $tbl_site_tmplvar_templates = $modx->getFullTableName('site_tmplvar_templates');
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
-if($modx->manager->action == 27) {
+if ($modx->manager->action == 27) {
 	//editing an existing document
 	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+	include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
 	$udperms = new udperms();
 	$udperms->user = $modx->getLoginUserID();
 	$udperms->document = $id;
 	$udperms->role = $_SESSION['mgrRole'];
 
-	if(!$udperms->checkPermissions()) {
+	if (!$udperms->checkPermissions()) {
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 	}
 }
 
 // check to see if resource isn't locked
-if($lockedEl = $modx->elementIsLocked(7, $id)) {
+if ($lockedEl = $modx->elementIsLocked(7, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
@@ -77,27 +77,27 @@ 
 $modx->lockElement(7, $id);
 
 // get document groups for current user
-if($_SESSION['mgrDocgroups']) {
+if ($_SESSION['mgrDocgroups']) {
 	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
-if(!empty ($id)) {
+if (!empty ($id)) {
 	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
+	if ($docgrp) {
 		$access .= " OR dg.document_group IN ({$docgrp})";
 	}
 	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
 	$content = array();
 	$content = $modx->db->getRow($rs);
 	$modx->documentObject = &$content;
-	if(!$content) {
+	if (!$content) {
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 	}
 	$_SESSION['itemname'] = $content['pagetitle'];
 } else {
 	$content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
+	if (isset($_REQUEST['newtemplate'])) {
 		$content['template'] = $_REQUEST['newtemplate'];
 	} else {
 		$content['template'] = getDefaultTemplate();
@@ -108,22 +108,22 @@ 
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
-if(isset($_REQUEST['newtemplate'])) {
+if (isset($_REQUEST['newtemplate'])) {
 	$formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
-if($formRestored == true) {
+if ($formRestored == true) {
 	$content = array_merge($content, $_POST);
 	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
+	if (empty ($content['pub_date'])) {
 		unset ($content['pub_date']);
 	} else {
 		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
 	}
-	if(empty ($content['unpub_date'])) {
+	if (empty ($content['unpub_date'])) {
 		unset ($content['unpub_date']);
 	} else {
 		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
@@ -131,12 +131,12 @@ 
 }
 
 // increase menu index if this is a new document
-if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
+if (!isset ($_REQUEST['id'])) {
+	if (!isset ($modx->config['auto_menuindex'])) {
 		$modx->config['auto_menuindex'] = 1;
 	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
+	if ($modx->config['auto_menuindex']) {
+		$pid = (int) $_REQUEST['pid'];
 		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
 		$content['menuindex'] = $modx->db->getValue($rs);
 	} else {
@@ -144,14 +144,14 @@ 
 	}
 }
 
-if(isset ($_POST['which_editor'])) {
+if (isset ($_POST['which_editor'])) {
 	$modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 7;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 	<script type="text/javascript">
 		/* <![CDATA[ */
@@ -181,7 +181,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) ?>';
 			},
 			duplicate: function() {
 				if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) {
@@ -189,7 +189,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');
 			}
 		};
 
@@ -551,7 +551,7 @@ 
 			'template' => $content['template']
 		));
 
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 
@@ -575,8 +575,8 @@ 
 		<fieldset id="create_edit">
 
 			<h1>
-				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo 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-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) {
+					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>';
 				} else {
 				    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
@@ -592,36 +592,36 @@ 
 
 			<?php
 			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
+			if ($modx->config['use_breadcrumbs']) {
 				$temp = array();
 				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
 
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+				if (isset($_REQUEST['id']) && $content['parent'] != 0) {
 					$bID = (int) $_REQUEST['id'];
 					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
+				} else if (isset($_REQUEST['pid'])) {
 					$bID = (int) $_REQUEST['pid'];
 					$temp = $modx->getParentIds($bID);
 					array_unshift($temp, $bID);
 				}
 
-				if($temp) {
+				if ($temp) {
 					$parents = implode(',', $temp);
 
-					if(!empty($parents)) {
+					if (!empty($parents)) {
 						$where = "FIND_IN_SET(id,'{$parents}') DESC";
 						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							$out .= '<li class="breadcrumbs__li">
-                                <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
+                                <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
 						}
 					}
 				}
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
+				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>';
+				echo '<ul class="breadcrumbs">'.$out.'</ul>';
 			}
 			?>
 
@@ -638,7 +638,7 @@ 
 					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
 						'id' => $id
 					));
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					} else {
 						?>
@@ -694,7 +694,7 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+								<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -730,17 +730,17 @@ 
 											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
 											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
 											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+											while ($row = $modx->db->getRow($rs)) {
+												if ($row['selectable'] != 1 && $row['id'] != $content['template']) {
 													continue;
 												};
 												// Skip if not selectable but show if selected!
 												$thisCategory = $row['category'];
-												if($thisCategory == null) {
+												if ($thisCategory == null) {
 													$thisCategory = $_lang["no_category"];
 												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
+												if ($thisCategory != $currentCategory) {
+													if ($closeOptGroup) {
 														echo "\t\t\t\t\t</optgroup>\n";
 													}
 													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
@@ -749,10 +749,10 @@ 
 
 												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+												echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
 												$currentCategory = $thisCategory;
 											}
-											if($thisCategory != '') {
+											if ($thisCategory != '') {
 												echo "\t\t\t\t\t</optgroup>\n";
 											}
 											?>
@@ -796,20 +796,20 @@ 
 									<td valign="top">
 										<?php
 										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
+										if (isset ($_REQUEST['id'])) {
+											if ($content['parent'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $content['parent'];
 											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
+										} elseif (isset ($_REQUEST['pid'])) {
+											if ($_REQUEST['pid'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $_REQUEST['pid'];
 											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
+										} elseif (isset($_POST['parent'])) {
+											if ($_POST['parent'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $_POST['parent'];
@@ -818,10 +818,10 @@ 
 											$parentname = $site_name;
 											$content['parent'] = 0;
 										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
+										if ($parentlookup !== false && is_numeric($parentlookup)) {
 											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
 											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
+											if (!$parentname) {
 												$modx->webAlertAndQuit($_lang["error_no_parent"]);
 											}
 										}
@@ -863,7 +863,7 @@ 
 								}*/
 								?>
 
-								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
+								<?php if ($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
 										<td colspan="2">
 											<hr>
@@ -876,8 +876,8 @@ 
 														<?php
 														// invoke OnRichTextEditorRegister event
 														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
+														if (is_array($evtOut)) {
+															for ($i = 0; $i < count($evtOut); $i++) {
 																$editor = $evtOut[$i];
 																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
 															}
@@ -888,7 +888,7 @@ 
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+												if (($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
 													$htmlContent = $content['content'];
 													?>
 													<div class="section-editor clearfix">
@@ -901,7 +901,7 @@ 
 													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
 													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
 												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+													echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>'."\n";
 												}
 												?>
 											</div>
@@ -917,7 +917,7 @@ 
 
                             if (($content['type'] == 'document' || $modx->manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) {
                                 $template = $default_template;
-                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs'];
+                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs'];
                                 if (isset ($_REQUEST['newtemplate'])) {
                                     $template = $_REQUEST['newtemplate'];
                                 } else {
@@ -945,10 +945,10 @@ 
                                 );
                                 $sort = 'tvtpl.rank,tv.rank, tv.id';
                                 if ($group_tvs) {
-                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank';
+                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank';
                                     $from .= '
-                                    LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category';
-                                    $sort = 'cat.rank,cat.id,' . $sort;
+                                    LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category';
+                                    $sort = 'cat.rank,cat.id,'.$sort;
                                 }
                                 $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs);
                                 $rs = $modx->db->select($field, $from, $where, $sort);
@@ -957,37 +957,37 @@ 
                         <!-- Template Variables -->' . "\n";
                                     if (!$group_tvs) {
                                         $templateVariables .= '
-                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div>
                                         <div class="sectionBody tmplvars">
                                             <table>';
                                     } else if ($group_tvs == 2) {
                                         $templateVariables .= '
                     <div class="tab-section">
-                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div>
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                     } else if ($group_tvs == 3) {
                                         $templateVariables .= '
                         <div id="templateVariables" class="tab-page tmplvars">
-                            <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                            <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                             <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>';
                                     } else if ($group_tvs == 4) {
                                         $templateVariables .= '
                     <div id="templateVariables" class="tab-page tmplvars">
-                        <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                        <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                         <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>
                         
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                     }
 
                                     $tvsArray = $modx->db->makeArray($rs, 'name');
-                                    require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php');
-                                    require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                                    require_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php');
+                                    require_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                                     $i = 0;
                                     $tab = '';
                                     foreach ($tvsArray as $row) {
@@ -995,8 +995,8 @@ 
                                             if ($group_tvs == 1 || $group_tvs == 3) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>' . "\n";
                                                 } else {
@@ -1005,17 +1005,17 @@ 
                                 </div>
                             </div>
                             
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>';
                                                 }
                                             } else if ($group_tvs == 2 || $group_tvs == 4) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1025,9 +1025,9 @@ 
                                 </div>
                             </div>
                             
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1035,18 +1035,18 @@ 
                                             } else if ($group_tvs == 5) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     <table>';
                                                 } else {
                                                     $templateVariables .= '
                                     </table>
                                 </div>
                                 
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     
                                     <table>';
                                                 }
@@ -1064,8 +1064,8 @@ 
                                                 $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
                                             };
                                             // Add richtext editor to the list
-                                            $richtexteditorIds[$editor][] = "tv" . $row['id'];
-                                            $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
+                                            $richtexteditorIds[$editor][] = "tv".$row['id'];
+                                            $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions;
                                         }
                                         // splitter
                                         if ($group_tvs) {
@@ -1079,24 +1079,24 @@ 
                                         }
 
                                         // post back value
-                                        if (array_key_exists('tv' . $row['id'], $_POST)) {
-                                            if (is_array($_POST['tv' . $row['id']])) {
-                                                $tvPBV = implode('||', $_POST['tv' . $row['id']]);
+                                        if (array_key_exists('tv'.$row['id'], $_POST)) {
+                                            if (is_array($_POST['tv'.$row['id']])) {
+                                                $tvPBV = implode('||', $_POST['tv'.$row['id']]);
                                             } else {
-                                                $tvPBV = $_POST['tv' . $row['id']];
+                                                $tvPBV = $_POST['tv'.$row['id']];
                                             }
                                         } else {
                                             $tvPBV = $row['value'];
                                         }
 
-                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : '';
-                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : '';
-                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : '';
+                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : '';
+                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : '';
+                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : '';
 
                                         $templateVariables .= '
                                         <tr>
-                                            <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td>
-                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td>
+                                            <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td>
+                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td>
                                         </tr>';
 
                                         $tab = $row['category_id'];
@@ -1190,7 +1190,7 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+								if ($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
 									?>
 									<tr>
 										<td>
@@ -1213,13 +1213,13 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
+												if (!$content['contentType']) {
 													$content['contentType'] = 'text/html';
 												}
 												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
 												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+												for ($i = 0; $i < count($ct); $i++) {
+													echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n";
 												}
 												?>
 											</select>
@@ -1245,7 +1245,7 @@ 
 									</tr>
 									<?php
 								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
+									if ($content['type'] != 'reference' && $modx->manager->action != '72') {
 										// non-admin managers creating or editing a document resource
 										?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
@@ -1345,15 +1345,15 @@ 
 						<?php
 					/*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
+					if ($use_udperms == 1) {
 						$groupsarray = array();
 						$sql = '';
 
 						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
+						if ($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while ($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id'];
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1369,7 +1369,7 @@ 
 						}
 
 						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
+						if (isset($_POST['docgroups'])) {
 							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
 						}
 
@@ -1388,26 +1388,26 @@ 
 						$permissions_no = 0; // count permissions the current mgr user doesn't have
 
 						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 
 							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
+							$inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new');
+							$inputId = 'group-'.$row['id'];
 
 							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
+							if ($checked) {
 								$notPublic = true;
 							} // Mark as private access (either web or manager)
 
 							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+							if ((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
 								continue;
 							}
 
 							// Setup attributes for this Input box
 							$inputAttributes['id'] = $inputId;
 							$inputAttributes['value'] = $inputValue;
-							if($checked) {
+							if ($checked) {
 								$inputAttributes['checked'] = 'checked';
 							} else {
 								unset($inputAttributes['checked']);
@@ -1415,10 +1415,10 @@ 
 
 							// Create attribute string list
 							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+							foreach ($inputAttributes as $k => $v) $inputString[] = $k.'="'.$v.'"';
 
 							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+							$inputHTML = '<input '.implode(' ', $inputString).' />';
 
 							// does user have this permission?
 							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
@@ -1429,23 +1429,23 @@ 
 							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
 							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
 							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
+							if ($count > 0) {
 								++$permissions_yes;
 							} else {
 								++$permissions_no;
 							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+							$permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>';
 						}
 						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+						if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
 							$permissions = array();
 						}
 
 						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
+						if (!empty($permissions)) {
 							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+							if ($isManager && $isWeb) {
+								array_unshift($permissions, "\t\t".'<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true);" /><label for="groupall" class="warning">'.$_lang['all_doc_groups'].'</label></li>');
 							}
 							// Output the permissions list...
 							?>
@@ -1478,12 +1478,12 @@ 
 								</script>
 								<p><?= $_lang['access_permissions_docs_message'] ?></p>
 								<ul>
-									<?= implode("\n", $permissions) . "\n" ?>
+									<?= implode("\n", $permissions)."\n" ?>
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
 						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+						elseif ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
 							?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
@@ -1503,7 +1503,7 @@ 
 						'template' => $content['template']
 					));
 
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					}
 					?>
@@ -1516,16 +1516,16 @@ 
 		storeCurTemplate();
 	</script>
 <?php
-if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
+if (($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
+	if (is_array($richtexteditorIds)) {
+		foreach ($richtexteditorIds as $editor => $elements) {
 			// invoke OnRichTextEditorInit event
 			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
 				'editor' => $editor,
 				'elements' => $elements,
 				'options' => $richtexteditorOptions[$editor]
 			));
-			if(is_array($evtOut)) {
+			if (is_array($evtOut)) {
 				echo implode('', $evtOut);
 			}
 		}
@@ -1535,37 +1535,37 @@ 
 /**
  * @return string
  */
-function getDefaultTemplate() {
+function getDefaultTemplate(){
 	$modx = evolutionCMS();
 
     $default_template = '';
-	switch($modx->config['auto_template_logic']) {
+	switch ($modx->config['auto_template_logic']) {
 		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+			if (!isset($_GET['pid']) || empty($_GET['pid'])) {
 				$site_start = $modx->config['site_start'];
 				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
 				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+				if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 					$default_template = $sibl[0]['template'];
 				}
 			} else {
 				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+				if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 					$default_template = $sibl[0]['template'];
 				} else {
 					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+					if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 						$default_template = $sibl[0]['template'];
 					}
 				}
 			}
-			if(isset($default_template)) {
+			if (isset($default_template)) {
 				break;
 			} // If $default_template could not be determined, fall back / through to "parent"-mode
 		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+			if (isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
 				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
+				if (isset($parent['template'])) {
 					$default_template = $parent['template'];
 				}
 			}

Braces +12 added lines, -5 removed lines

@@ -478,7 +478,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -694,7 +695,8 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -1353,7 +1355,9 @@ 
 						if($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while($currentgroup = $modx->db->getRow($rs)) {
+							    $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							}
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1415,7 +1419,9 @@ 
 
 							// Create attribute string list
 							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+							foreach($inputAttributes as $k => $v) {
+							    $inputString[] = $k . '="' . $v . '"';
+							}
 
 							// Make the <input> HTML
 							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
@@ -1535,7 +1541,8 @@ 
 /**
  * @return string
  */
-function getDefaultTemplate() {
+function getDefaultTemplate()
+{
 	$modx = evolutionCMS();
 
     $default_template = '';

manager/actions/resources/functions.inc.php

Indentation +165 added lines, -165 removed lines

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

 }

 

 $tpl = array(

-	'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

-	'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-	'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

+    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

 );

 

 /**

@@ -17,9 +17,9 @@ 
  * @return string

  */

 function parsePh($tpl, $ph) {

-	$modx = evolutionCMS(); global $_lang;

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

-	return $modx->parseText($tpl, $ph);

+    $modx = evolutionCMS(); global $_lang;

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

+    return $modx->parseText($tpl, $ph);

 }

 

 /**

@@ -27,11 +27,11 @@ 
  * @return string

  */

 function renderViewSwitchButtons($cssId) {

-	$modx = evolutionCMS(); global $_lang, $tpl;

+    $modx = evolutionCMS(); global $_lang, $tpl;

 

-	return parsePh($tpl['viewForm'], array(

-		'cssId' => $cssId

-	));

+    return parsePh($tpl['viewForm'], array(

+        'cssId' => $cssId

+    ));

 }

 

 /**

@@ -40,52 +40,52 @@ 
  * @return string

  */

 function createResourceList($resourceTable, $resources) {

-	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

+    $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

-	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

+    $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

-		return $_lang['no_results'];

-	}

+    if( ! is_array($items) || empty($items)) {

+        return $_lang['no_results'];

+    }

 

-	// Prepare elements- and categories-list

-	$elements = array();

-	$categories = array();

-	foreach($items as $row) {

-		$catid = $row['catid'] ? $row['catid'] : 0;

-		$categories[$catid] = array('name' => stripslashes($row['category']));

-		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

-	}

+    // Prepare elements- and categories-list

+    $elements = array();

+    $categories = array();

+    foreach($items as $row) {

+        $catid = $row['catid'] ? $row['catid'] : 0;

+        $categories[$catid] = array('name' => stripslashes($row['category']));

+        $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

+    }

 

-	// Now render categories / panel-collapse

-	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

-		// Add panel-heading / category-collapse to output

-		$panelGroup .= parsePh($tpl['panelHeading'], array(

-			'tab' => $resourceTable,

-			'category' => $categories[$catid]['name'],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

-			'catid' => $catid,

-		));

+    // Now render categories / panel-collapse

+    $panelGroup = '';

+    foreach($elements as $catid => $elList) {

+        // Add panel-heading / category-collapse to output

+        $panelGroup .= parsePh($tpl['panelHeading'], array(

+            'tab' => $resourceTable,

+            'category' => $categories[$catid]['name'],

+            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+            'catid' => $catid,

+        ));

 

-		// Prepare content for panel-collapse

-		$panelCollapse = '';

-		foreach($elList as $el) {

-			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

-		}

+        // Prepare content for panel-collapse

+        $panelCollapse = '';

+        foreach($elList as $el) {

+            $panelCollapse .= parsePh($tpl['elementsRow'], $el);

+        }

 

-		// Add panel-collapse with elements to output

-		$panelGroup .= parsePh($tpl['panelCollapse'], array(

-			'tab' => $resourceTable,

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

+        // Add panel-collapse with elements to output

+        $panelGroup .= parsePh($tpl['panelCollapse'], array(

+            'tab' => $resourceTable,

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

 

-	return parsePh($tpl['panelGroup'], array(

-		'resourceTable' => $resourceTable,

-		'wrapper' => $panelGroup

-	));

+    return parsePh($tpl['panelGroup'], array(

+        'resourceTable' => $resourceTable,

+        'wrapper' => $panelGroup

+    ));

 }

 

 /**

@@ -93,54 +93,54 @@ 
  * @return string

  */

 function createCombinedView($resources) {

-	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

+    $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

-	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

-	$types = isset($resources->types) ? $resources->types : false;

-	$categories = isset($resources->categories) ? $resources->categories : false;

+    $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

+    $types = isset($resources->types) ? $resources->types : false;

+    $categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

-		return $_lang['no_results'];

-	}

+    if(!$itemsPerCategory) {

+        return $_lang['no_results'];

+    }

 

-	$tpl = array(

-		'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-		'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-		'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

-	);

+    $tpl = array(

+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

+    );

 

-	// Easily loop through $itemsPerCategory-Array

-	$panelGroup = '';

-	foreach($categories as $catid => $category) {

-		// Prepare collapse content / elements-list

-		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

-			$resourceTable = $el['type'];

-			$ph = prepareElementRowPh($el, $resourceTable, $resources);

-			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

-		}

+    // Easily loop through $itemsPerCategory-Array

+    $panelGroup = '';

+    foreach($categories as $catid => $category) {

+        // Prepare collapse content / elements-list

+        $panelCollapse = '';

+        foreach($itemsPerCategory[$catid] as $el) {

+            $resourceTable = $el['type'];

+            $ph = prepareElementRowPh($el, $resourceTable, $resources);

+            $panelCollapse .= parsePh($tpl['elementsRow'], $ph);

+        }

 

-		// Add panel-heading / button

-		$panelGroup .= parsePh($tpl['panelHeading'], array(

-			'tab' => 'categories_list',

-			'category' => $categories[$catid],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

-			'catid' => $catid,

-		));

+        // Add panel-heading / button

+        $panelGroup .= parsePh($tpl['panelHeading'], array(

+            'tab' => 'categories_list',

+            'category' => $categories[$catid],

+            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+            'catid' => $catid,

+        ));

 

-		// Add panel

-		$panelGroup .= parsePh($tpl['panelCollapse'], array(

-			'tab' => 'categories_list',

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

+        // Add panel

+        $panelGroup .= parsePh($tpl['panelCollapse'], array(

+            'tab' => 'categories_list',

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

 

-	return parsePh($tpl['panelGroup'], array(

-		'resourceTable' => 'categories_list',

-		'wrapper' => $panelGroup

-	));

+    return parsePh($tpl['panelGroup'], array(

+        'resourceTable' => 'categories_list',

+        'wrapper' => $panelGroup

+    ));

 }

 

 /**

@@ -150,13 +150,13 @@ 
  * @return array

  */

 function prepareElementRowPh($row, $resourceTable, $resources) {

-	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

+    $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

-	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

+    $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

-	$_lang["confirm_delete"] = $_lang["delete"];

+    $_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+    switch($resourceTable){

         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -190,77 +190,77 @@ 
             return array();

     }

 

-	// Prepare displaying user-locks

-	$lockedByUser = '';

-	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

-			$title = $modx->parseText($_lang["lock_element_editing"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

-				'lasthit_df' => $rowLock['lasthit_df']

-			));

-			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-		} else {

-			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

-				'username' => $rowLock['username'],

-				'lasthit_df' => $rowLock['lasthit_df']

-			));

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

-				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-			} else {

-				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

-			}

-		}

-	}

-	if($lockedByUser) {

-		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

-	}

+    // Prepare displaying user-locks

+    $lockedByUser = '';

+    $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

+    if($rowLock && $modx->hasPermission('display_locks')) {

+        if($rowLock['sid'] == $modx->sid) {

+            $title = $modx->parseText($_lang["lock_element_editing"], array(

+                'element_type' => $_lang["lock_element_type_" . $lockElementType],

+                'lasthit_df' => $rowLock['lasthit_df']

+            ));

+            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

+        } else {

+            $title = $modx->parseText($_lang["lock_element_locked_by"], array(

+                'element_type' => $_lang["lock_element_type_" . $lockElementType],

+                'username' => $rowLock['username'],

+                'lasthit_df' => $rowLock['lasthit_df']

+            ));

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

+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

+            } else {

+                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

+            }

+        }

+    }

+    if($lockedByUser) {

+        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

+    }

 

-	// Caption

-	if($resourceTable == 'site_tmplvars') {

-		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-	} else {

-		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

-	}

+    // Caption

+    if($resourceTable == 'site_tmplvars') {

+        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

+    } else {

+        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';

+    }

 

-	// Special marks

-	$tplInfo = array();

-	if($row['locked']) {

-		$tplInfo[] = $_lang['locked'];

-	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

-		$tplInfo[] = $_lang['defaulttemplate_title'];

-	}

-	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

+    // Special marks

+    $tplInfo = array();

+    if($row['locked']) {

+        $tplInfo[] = $_lang['locked'];

+    }

+    if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+        $tplInfo[] = $_lang['defaulttemplate_title'];

+    }

+    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

-	/* row buttons */

-	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

-		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

-	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

-	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

-	}

-	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

+    /* row buttons */

+    $buttons = '';

+    if($modx->hasPermission($types['actions']['edit'][1])) {

+        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

+    }

+    if($modx->hasPermission($types['actions']['duplicate'][1])) {

+        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

+    }

+    if($modx->hasPermission($types['actions']['remove'][1])) {

+        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

+    }

+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

 

-	$catid = $row['catid'] ? $row['catid'] : 0;

+    $catid = $row['catid'] ? $row['catid'] : 0;

 

-	// Placeholders for elements-row

-	return array(

-		'class' => $class ? ' class="' . $class . '"' : '',

-		'lockedByUser' => $lockedByUser,

-		'name' => $row['name'],

-		'caption' => $caption,

-		'buttons' => $buttons,

-		'marks' => $marks,

-		'id' => $row['id'],

-		'resourceTable' => $resourceTable,

-		'actionEdit' => $types['actions']['edit'][0],

-		'catid' => $catid,

-		'textdir' => $modx_textdir ? '&rlm;' : '',

-	);

+    // Placeholders for elements-row

+    return array(

+        'class' => $class ? ' class="' . $class . '"' : '',

+        'lockedByUser' => $lockedByUser,

+        'name' => $row['name'],

+        'caption' => $caption,

+        'buttons' => $buttons,

+        'marks' => $marks,

+        'id' => $row['id'],

+        'resourceTable' => $resourceTable,

+        'actionEdit' => $types['actions']['edit'][0],

+        'catid' => $catid,

+        'textdir' => $modx_textdir ? '&rlm;' : '',

+    );

 }

Spacing +49 added lines, -49 removed lines

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

 }

 

 $tpl = array(

-	'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

-	'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-	'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

+	'viewForm' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_viewForm.tpl'),

+	'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),

+	'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),

+	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),

+	'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl')

 );

 

 /**

@@ -16,7 +16,7 @@ 
  * @param array $ph

  * @return string

  */

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph){

 	$modx = evolutionCMS(); global $_lang;

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

 	return $modx->parseText($tpl, $ph);

@@ -26,7 +26,7 @@ 
  * @param string|int $cssId

  * @return string

  */

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId){

 	$modx = evolutionCMS(); global $_lang, $tpl;

 

 	return parsePh($tpl['viewForm'], array(

@@ -39,19 +39,19 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources){

 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

 	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

+	if (!is_array($items) || empty($items)) {

 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach ($items as $row) {

 		$catid = $row['catid'] ? $row['catid'] : 0;

 		$categories[$catid] = array('name' => stripslashes($row['category']));

 		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

@@ -59,18 +59,18 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

+	foreach ($elements as $catid => $elList) {

 		// Add panel-heading / category-collapse to output

 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => $resourceTable,

 			'category' => $categories[$catid]['name'],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+			'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',

 			'catid' => $catid,

 		));

 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach ($elList as $el) {

 			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

 		}

 

@@ -92,30 +92,30 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createCombinedView($resources) {

+function createCombinedView($resources){

 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

 	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

 	$types = isset($resources->types) ? $resources->types : false;

 	$categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

+	if (!$itemsPerCategory) {

 		return $_lang['no_results'];

 	}

 

 	$tpl = array(

-		'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-		'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-		'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

+		'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),

+		'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),

+		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),

+		'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl'),

 	);

 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

-	foreach($categories as $catid => $category) {

+	foreach ($categories as $catid => $category) {

 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

+		foreach ($itemsPerCategory[$catid] as $el) {

 			$resourceTable = $el['type'];

 			$ph = prepareElementRowPh($el, $resourceTable, $resources);

 			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

@@ -125,7 +125,7 @@ 
 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => 'categories_list',

 			'category' => $categories[$catid],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+			'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',

 			'catid' => $catid,

 		));

 

@@ -149,14 +149,14 @@ 
  * @param mgrResources $resources

  * @return array

  */

-function prepareElementRowPh($row, $resourceTable, $resources) {

+function prepareElementRowPh($row, $resourceTable, $resources){

 	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

 	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

 	$_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+	switch ($resourceTable) {

         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -193,65 +193,65 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

 	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

+	if ($rowLock && $modx->hasPermission('display_locks')) {

+		if ($rowLock['sid'] == $modx->sid) {

 			$title = $modx->parseText($_lang["lock_element_editing"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

+				'element_type' => $_lang["lock_element_type_".$lockElementType],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

-			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

+			$lockedByUser = '<span title="'.$title.'" class="editResource" style="cursor:context-menu;">'.$_style['tree_preview_resource'].'</span>&nbsp;';

 		} else {

 			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

+				'element_type' => $_lang["lock_element_type_".$lockElementType],

 				'username' => $rowLock['username'],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

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

-				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

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

+				$lockedByUser = '<a href="javascript:;" onclick="unlockElement('.$lockElementType.', '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource"><i class="'.$_style['icons_secured'].'"></i></a>';

 			} else {

-				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

+				$lockedByUser = '<span title="'.$title.'" class="lockedResource" style="cursor:context-menu;"><i class="'.$_style['icons_secured'].'"></i></span>';

 			}

 		}

 	}

-	if($lockedByUser) {

-		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

+	if ($lockedByUser) {

+		$lockedByUser = '<div class="lockCell">'.$lockedByUser.'</div>';

 	}

 

 	// Caption

-	if($resourceTable == 'site_tmplvars') {

-		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

+	if ($resourceTable == 'site_tmplvars') {

+		$caption = !empty($row['description']) ? ' '.$row['caption'].' &nbsp; <small>('.$row['description'].')</small>' : ' '.$row['caption'];

 	} else {

-		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

+		$caption = !empty($row['description']) ? ' '.$row['description'] : '';

 	}

 

 	// Special marks

 	$tplInfo = array();

-	if($row['locked']) {

+	if ($row['locked']) {

 		$tplInfo[] = $_lang['locked'];

 	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+	if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

 		$tplInfo[] = $_lang['defaulttemplate_title'];

 	}

-	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

+	$marks = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : '';

 

 	/* row buttons */

 	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

-		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

+	if ($modx->hasPermission($types['actions']['edit'][1])) {

+		$buttons .= '<li><a title="'.$_lang["edit_resource"].'" href="index.php?a='.$types['actions']['edit'][0].'&amp;id='.$row['id'].'"><i class="fa fa-edit fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

+	if ($modx->hasPermission($types['actions']['duplicate'][1])) {

+		$buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_duplicate_record"].'\')" title="'.$_lang["resource_duplicate"].'" href="index.php?a='.$types['actions']['duplicate'][0].'&amp;id='.$row['id'].'"><i class="fa fa-clone fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

+	if ($modx->hasPermission($types['actions']['remove'][1])) {

+		$buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_delete"].'\')" title="'.$_lang["delete"].'" href="index.php?a='.$types['actions']['remove'][0].'&amp;id='.$row['id'].'"><i class="fa fa-trash fa-fw"></i></a></li>';

 	}

-	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

+	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">'.$buttons.'</ul></div>' : '';

 

 	$catid = $row['catid'] ? $row['catid'] : 0;

 

 	// Placeholders for elements-row

 	return array(

-		'class' => $class ? ' class="' . $class . '"' : '',

+		'class' => $class ? ' class="'.$class.'"' : '',

 		'lockedByUser' => $lockedByUser,

 		'name' => $row['name'],

 		'caption' => $caption,

Braces +32 added lines, -27 removed lines

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

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

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

 }

 

@@ -16,7 +16,8 @@ 
  * @param array $ph

  * @return string

  */

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph)
+{
 	$modx = evolutionCMS(); global $_lang;

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

 	return $modx->parseText($tpl, $ph);

@@ -26,7 +27,8 @@ 
  * @param string|int $cssId

  * @return string

  */

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId)
+{
 	$modx = evolutionCMS(); global $_lang, $tpl;

 

 	return parsePh($tpl['viewForm'], array(

@@ -39,19 +41,20 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources)
+{
 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

 	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

+	if( ! is_array($items) || empty($items)) {
 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach($items as $row) {
 		$catid = $row['catid'] ? $row['catid'] : 0;

 		$categories[$catid] = array('name' => stripslashes($row['category']));

 		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

@@ -59,7 +62,7 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

+	foreach($elements as $catid => $elList) {
 		// Add panel-heading / category-collapse to output

 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => $resourceTable,

@@ -70,7 +73,7 @@ 
 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach($elList as $el) {
 			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

 		}

 

@@ -92,14 +95,15 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createCombinedView($resources) {

+function createCombinedView($resources)
+{
 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

 	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

 	$types = isset($resources->types) ? $resources->types : false;

 	$categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

+	if(!$itemsPerCategory) {
 		return $_lang['no_results'];

 	}

 

@@ -112,10 +116,10 @@ 
 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

-	foreach($categories as $catid => $category) {

+	foreach($categories as $catid => $category) {
 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

+		foreach($itemsPerCategory[$catid] as $el) {
 			$resourceTable = $el['type'];

 			$ph = prepareElementRowPh($el, $resourceTable, $resources);

 			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

@@ -149,14 +153,15 @@ 
  * @param mgrResources $resources

  * @return array

  */

-function prepareElementRowPh($row, $resourceTable, $resources) {

+function prepareElementRowPh($row, $resourceTable, $resources)
+{
 	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

 	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

 	$_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+	switch($resourceTable) {
         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -193,56 +198,56 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

 	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

+	if($rowLock && $modx->hasPermission('display_locks')) {
+		if($rowLock['sid'] == $modx->sid) {
 			$title = $modx->parseText($_lang["lock_element_editing"], array(

 				'element_type' => $_lang["lock_element_type_" . $lockElementType],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

 			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-		} else {

+		} else {
 			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

 				'element_type' => $_lang["lock_element_type_" . $lockElementType],

 				'username' => $rowLock['username'],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

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

+			if($modx->hasPermission('remove_locks')) {
 				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-			} else {

+			} else {
 				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

 			}

 		}

 	}

-	if($lockedByUser) {

+	if($lockedByUser) {
 		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

 	}

 

 	// Caption

-	if($resourceTable == 'site_tmplvars') {

+	if($resourceTable == 'site_tmplvars') {
 		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-	} else {

+	} else {
 		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

 	}

 

 	// Special marks

 	$tplInfo = array();

-	if($row['locked']) {

+	if($row['locked']) {
 		$tplInfo[] = $_lang['locked'];

 	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
 		$tplInfo[] = $_lang['defaulttemplate_title'];

 	}

 	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

 	/* row buttons */

 	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

+	if($modx->hasPermission($types['actions']['edit'][1])) {
 		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

+	if($modx->hasPermission($types['actions']['duplicate'][1])) {
 		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

+	if($modx->hasPermission($types['actions']['remove'][1])) {
 		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

 	}

 	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

manager/actions/resources/mgrResources.class.php

Indentation +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
     /**
      * @var array
      */
-	public $types = array();
+    public $types = array();
     /**
      * @var array
      */
@@ -25,73 +25,73 @@ 
      * mgrResources constructor.
      */
     public function __construct() {
-		$this->setTypes();
-		$this->queryItemsFromDB();
-		$this->prepareCategoryArrays();
-	}
+        $this->setTypes();
+        $this->queryItemsFromDB();
+        $this->prepareCategoryArrays();
+    }
 
     /**
      * @return void
      */
     public function setTypes() {
-		global $_lang;
-		$this->types['site_templates']    = array(
-			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
-			'name'=>'templatename'
-		);
-		$this->types['site_tmplvars']     = array(
-			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
-		);
-		$this->types['site_htmlsnippets'] = array(
-			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
-		);
-		$this->types['site_snippets']     = array(
-			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
-		);
-		$this->types['site_plugins']      = array(
-			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
-		);
-		$this->types['site_modules']      = array(
-			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
-		);
-	}
+        global $_lang;
+        $this->types['site_templates']    = array(
+            'title'=>$_lang["manage_templates"],
+            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
+            'permissions'=>array('new_template','edit_template'),
+            'name'=>'templatename'
+        );
+        $this->types['site_tmplvars']     = array(
+            'title'=>$_lang["tmplvars"],
+            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
+            'permissions'=>array('new_template','edit_template'),
+        );
+        $this->types['site_htmlsnippets'] = array(
+            'title'=>$_lang["manage_htmlsnippets"],
+            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
+            'permissions'=>array('new_chunk','edit_chunk'),
+        );
+        $this->types['site_snippets']     = array(
+            'title'=>$_lang["manage_snippets"],
+            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
+            'permissions'=>array('new_snippet','edit_snippet'),
+        );
+        $this->types['site_plugins']      = array(
+            'title'=>$_lang["manage_plugins"],
+            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
+            'permissions'=>array('new_plugin','edit_plugin'),
+        );
+        $this->types['site_modules']      = array(
+            'title'=>$_lang["manage_modules"],
+            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
+            'permissions'=>array('new_module','edit_module'),
+        );
+    }
 
     /**
      * @return void
      */
     public function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
-				$nameField = isset($type['name']) ? $type['name'] : 'name';
-				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
-		   }
-		 }
-	}
+        foreach($this->types as $resourceTable=>$type) {
+            if($this->hasAnyPermissions($type['permissions'])) {
+                $nameField = isset($type['name']) ? $type['name'] : 'name';
+                $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
+            }
+            }
+    }
 
     /**
      * @param array $permissions
      * @return bool
      */
     public function hasAnyPermissions($permissions) {
-		$modx = evolutionCMS();
+        $modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p)
+            if($modx->hasPermission($p)) return true;
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * @param string $resourceTable
@@ -99,7 +99,7 @@ 
      * @return array|bool
      */
     public function queryResources($resourceTable, $nameField = 'name') {
-		$modx = evolutionCMS(); global $_lang;
+        $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
             'site_htmlsnippets',
@@ -107,59 +107,59 @@ 
             'site_plugins',
             'site_modules'
         );
-		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
-
-		$tvsql  = '';
-		$tvjoin = '';
-		if ($resourceTable === 'site_tmplvars') {
-			$tvsql    = 'site_tmplvars.caption, ';
-			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
-			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
-		}
-		else $sttfield = '';
-
-		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
-
-		$rs = $modx->db->select(
-			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+
+        $tvsql  = '';
+        $tvjoin = '';
+        if ($resourceTable === 'site_tmplvars') {
+            $tvsql    = 'site_tmplvars.caption, ';
+            $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
+            $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        }
+        else $sttfield = '';
+
+        $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
+
+        $rs = $modx->db->select(
+            "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
+            $modx->getFullTableName($resourceTable) . " AS {$resourceTable}
 	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
-			"",
-			"category,name"
-		);
-		$limit = $modx->db->getRecordCount($rs);
+            "",
+            "category,name"
+        );
+        $limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+        if($limit < 1) return false;
 
-		$result = array();
-		while ($row = $modx->db->getRow($rs)) {
-			$result[] = $row;
-		}
-		return $result;
-	}
+        $result = array();
+        while ($row = $modx->db->getRow($rs)) {
+            $result[] = $row;
+        }
+        return $result;
+    }
 
     /**
      * @return void
      */
     public function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
-				$catid = $item['catid'] ? $item['catid'] : 0;
-				$this->categories[$catid] = $item['category'];
-
-				$item['type'] = $type;
-				$this->itemsPerCategory[$catid][] = $item;
-			}
-		}
-
-		// Sort categories by name
-		natcasesort($this->categories);
-
-		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
-				return strcasecmp($a['name'], $b['name']);
-			});
-		}
-	}
+        foreach($this->items as $type=>$items) {
+            foreach((array)$items as $item) {
+                $catid = $item['catid'] ? $item['catid'] : 0;
+                $this->categories[$catid] = $item['category'];
+
+                $item['type'] = $type;
+                $this->itemsPerCategory[$catid][] = $item;
+            }
+        }
+
+        // Sort categories by name
+        natcasesort($this->categories);
+
+        // Now sort by name
+        foreach($this->itemsPerCategory as $catid=>$items) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+                return strcasecmp($a['name'], $b['name']);
+            });
+        }
+    }
 }

Spacing +37 added lines, -37 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.");
 }
 
-class mgrResources {
+class mgrResources{
     /**
      * @var array
      */
@@ -24,7 +24,7 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct(){
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
@@ -33,47 +33,47 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes(){
 		global $_lang;
-		$this->types['site_templates']    = array(
+		$this->types['site_templates'] = array(
 			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
+			'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')),
+			'permissions'=>array('new_template', 'edit_template'),
 			'name'=>'templatename'
 		);
-		$this->types['site_tmplvars']     = array(
+		$this->types['site_tmplvars'] = array(
 			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
+			'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')),
+			'permissions'=>array('new_template', 'edit_template'),
 		);
 		$this->types['site_htmlsnippets'] = array(
 			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
+			'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')),
+			'permissions'=>array('new_chunk', 'edit_chunk'),
 		);
-		$this->types['site_snippets']     = array(
+		$this->types['site_snippets'] = array(
 			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
+			'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')),
+			'permissions'=>array('new_snippet', 'edit_snippet'),
 		);
-		$this->types['site_plugins']      = array(
+		$this->types['site_plugins'] = array(
 			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
+			'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')),
+			'permissions'=>array('new_plugin', 'edit_plugin'),
 		);
-		$this->types['site_modules']      = array(
+		$this->types['site_modules'] = array(
 			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
+			'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')),
+			'permissions'=>array('new_module', 'edit_module'),
 		);
 	}
 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
+    public function queryItemsFromDB(){
+		foreach ($this->types as $resourceTable=>$type) {
+			if ($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
 				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
 		   }
@@ -84,11 +84,11 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions){
 		$modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+		foreach ($permissions as $p)
+			if ($modx->hasPermission($p)) return true;
 
 		return false;
 	}
@@ -98,7 +98,7 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name'){
 		$modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -107,7 +107,7 @@ 
             'site_plugins',
             'site_modules'
         );
-		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable.'.disabled, ' : '';
 
 		$tvsql  = '';
 		$tvjoin = '';
@@ -122,14 +122,14 @@ 
 
 		$rs = $modx->db->select(
 			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
-	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
+			$modx->getFullTableName($resourceTable)." AS {$resourceTable}
+	            LEFT JOIN ".$modx->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
 			"",
 			"category,name"
 		);
 		$limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+		if ($limit < 1) return false;
 
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -141,9 +141,9 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
+    public function prepareCategoryArrays(){
+		foreach ($this->items as $type=>$items) {
+			foreach ((array) $items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
 				$this->categories[$catid] = $item['category'];
 
@@ -156,8 +156,8 @@ 
 		natcasesort($this->categories);
 
 		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+		foreach ($this->itemsPerCategory as $catid=>$items) {
+			usort($this->itemsPerCategory[$catid], function($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

Braces +23 added lines, -12 removed lines

@@ -3,7 +3,8 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -24,7 +25,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
@@ -33,7 +35,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
 		global $_lang;
 		$this->types['site_templates']    = array(
 			'title'=>$_lang["manage_templates"],
@@ -71,7 +74,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
 		foreach($this->types as $resourceTable=>$type) {
 			if($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -84,11 +88,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
 		$modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+		foreach($permissions as $p) {
+					if($modx->hasPermission($p)) return true;
+		}
 
 		return false;
 	}
@@ -98,7 +104,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
 		$modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -115,8 +122,9 @@ 
 			$tvsql    = 'site_tmplvars.caption, ';
 			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
 			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+		} else {
+		    $sttfield = '';
 		}
-		else $sttfield = '';
 
 		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -129,7 +137,9 @@ 
 		);
 		$limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+		if($limit < 1) {
+		    return false;
+		}
 
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -141,7 +151,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
 		foreach($this->items as $type=>$items) {
 			foreach((array)$items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
@@ -157,7 +168,7 @@ 
 
 		// Now sort by name
 		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+			usort($this->itemsPerCategory[$catid], function ($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

manager/includes/veriword.php

Spacing +33 added lines, -33 removed lines

@@ -5,7 +5,7 @@ 
 $modx->getSettings();
 $modx->invokeEvent('OnWebPageInit');
 
-$vword = new VeriWord(148,60);
+$vword = new VeriWord(148, 60);
 $vword->output_image();
 $vword->destroy_image();
 
@@ -41,7 +41,7 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord{
 
     /* path to font directory*/
     public $dir_font   = "ttf/";
@@ -52,44 +52,44 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w = 200, $h = 80){
         /* create session to set word for verification */
         $this->set_veriword();
-        $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
+        $this->dir_font = dirname(__FILE__).'/'.$this->dir_font;
         $this->im_width         = $w;
         $this->im_height        = $h;
     }
 
-    public function set_veriword() {
+    public function set_veriword(){
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image(){
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public function pick_word(){
         $modx = evolutionCMS();
         // set default words
-        $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
+        $words = "MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
 
         /* pick one randomly for text verification */
-        return (string) $arr_words[array_rand($arr_words)].rand(10,999);
+        return (string) $arr_words[array_rand($arr_words)].rand(10, 999);
     }
 
-    public function draw_text() {
+    public function draw_text(){
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
-            if(substr($file, -4) == '.ttf') {
+            if (substr($file, -4) == '.ttf') {
                 $fontstmp[] = $this->dir_font.$file;
             }
         }
@@ -97,35 +97,35 @@ 
         $text_font = (string) $fontstmp[array_rand($fontstmp)];
 
         /* angle for text inclination */
-        $text_angle = rand(-9,9);
+        $text_angle = rand(-9, 9);
         /* initial text size */
         $text_size  = 30;
         /* calculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* adjust text size */
-        $text_size  = round((20 * $this->im_width)/$text_width);
+        $text_size  = round((20 * $this->im_width) / $text_width);
 
         /* recalculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* calculate center position of text */
-        $text_x         = ($this->im_width - $text_width)/2;
-        $text_y         = ($this->im_height - $text_height)/2;
+        $text_x         = ($this->im_width - $text_width) / 2;
+        $text_y         = ($this->im_height - $text_height) / 2;
 
         /* create canvas for text drawing */
-        $im_text        = imagecreate ($this->im_width, $this->im_height);
-        $bg_color       = imagecolorallocate ($im_text, 255, 255, 255);
+        $im_text        = imagecreate($this->im_width, $this->im_height);
+        $bg_color       = imagecolorallocate($im_text, 255, 255, 255);
 
         /* pick color for text */
-        $text_color     = imagecolorallocate ($im_text, 0, 51, 153);
+        $text_color     = imagecolorallocate($im_text, 0, 51, 153);
 
         /* draw text into canvas */
-        imagettftext    (   $im_text,
+        imagettftext($im_text,
             $text_size,
             $text_angle,
             $text_x,
@@ -140,19 +140,19 @@ 
     }
 
 
-    public function draw_image() {
+    public function draw_image(){
 
         /* pick one background image randomly from image directory */
-        $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
+        $img_file       = $this->dir_noise."noise".rand(1, 4).".jpg";
 
         /* create "noise" background image from your image stock*/
-        $noise_img      = @imagecreatefromjpeg ($img_file);
+        $noise_img      = @imagecreatefromjpeg($img_file);
         $noise_width    = imagesx($noise_img);
         $noise_height   = imagesy($noise_img);
 
         /* resize the background image to fit the size of image output */
-        $this->im       = imagecreatetruecolor($this->im_width,$this->im_height);
-        imagecopyresampled ($this->im,
+        $this->im       = imagecreatetruecolor($this->im_width, $this->im_height);
+        imagecopyresampled($this->im,
             $noise_img,
             0, 0, 0, 0,
             $this->im_width,
@@ -161,17 +161,17 @@ 
             $noise_height);
 
         /* put text image into background image */
-        imagecopymerge (    $this->im,
+        imagecopymerge($this->im,
             $this->draw_text(),
             0, 0, 0, 0,
             $this->im_width,
             $this->im_height,
-            70 );
+            70);
 
         return $this->im;
     }
 
-    public function destroy_image() {
+    public function destroy_image(){
 
         imagedestroy($this->im);
 

Braces +16 added lines, -8 removed lines

@@ -41,7 +41,8 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord
+{
 
     /* path to font directory*/
     public $dir_font   = "ttf/";
@@ -52,7 +53,8 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         $this->set_veriword();
         $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
@@ -60,21 +62,24 @@ 
         $this->im_height        = $h;
     }
 
-    public function set_veriword() {
+    public function set_veriword()
+    {
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image()
+    {
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public function pick_word()
+    {
         $modx = evolutionCMS();
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -85,7 +90,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }
 
-    public function draw_text() {
+    public function draw_text()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -140,7 +146,8 @@ 
     }
 
 
-    public function draw_image() {
+    public function draw_image()
+    {
 
         /* pick one background image randomly from image directory */
         $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
@@ -171,7 +178,8 @@ 
         return $this->im;
     }
 
-    public function destroy_image() {
+    public function destroy_image()
+    {
 
         imagedestroy($this->im);
 

manager/includes/extenders/manager.api.class.inc.php

Spacing +14 added lines, -14 removed lines

@@ -144,33 +144,33 @@ 
             $algorithm = 'UNCRYPT';
         }
 
-        $salt = md5($password . $seed);
+        $salt = md5($password.$seed);
 
         switch ($algorithm) {
             case 'BLOWFISH_Y':
-                $salt = '$2y$07$' . substr($salt, 0, 22);
+                $salt = '$2y$07$'.substr($salt, 0, 22);
                 break;
             case 'BLOWFISH_A':
-                $salt = '$2a$07$' . substr($salt, 0, 22);
+                $salt = '$2a$07$'.substr($salt, 0, 22);
                 break;
             case 'SHA512':
-                $salt = '$6$' . substr($salt, 0, 16);
+                $salt = '$6$'.substr($salt, 0, 16);
                 break;
             case 'SHA256':
-                $salt = '$5$' . substr($salt, 0, 16);
+                $salt = '$5$'.substr($salt, 0, 16);
                 break;
             case 'MD5':
-                $salt = '$1$' . substr($salt, 0, 8);
+                $salt = '$1$'.substr($salt, 0, 8);
                 break;
         }
 
         if ($algorithm !== 'UNCRYPT') {
-            $password = sha1($password) . crypt($password, $salt);
+            $password = sha1($password).crypt($password, $salt);
         } else {
-            $password = sha1($salt . $password);
+            $password = sha1($salt.$password);
         }
 
-        $result = strtolower($algorithm) . '>' . md5($salt . $password) . substr(md5($salt), 0, 8);
+        $result = strtolower($algorithm).'>'.md5($salt.$password).substr(md5($salt), 0, 8);
 
         return $result;
     }
@@ -252,7 +252,7 @@ 
         $check_files = explode("\n", $check_files);
         foreach ($check_files as $file) {
             $file = trim($file);
-            $file = MODX_BASE_PATH . $file;
+            $file = MODX_BASE_PATH.$file;
             if (!is_file($file)) {
                 continue;
             }
@@ -275,7 +275,7 @@ 
         $checksum = unserialize($checksum);
         foreach ($check_files as $file) {
             $file = trim($file);
-            $filePath = MODX_BASE_PATH . $file;
+            $filePath = MODX_BASE_PATH.$file;
             if (!is_file($filePath)) {
                 continue;
             }
@@ -294,7 +294,7 @@ 
     {
         $modx = evolutionCMS();
         $tbl_system_settings = $modx->getFullTableName('system_settings');
-        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','" . $modx->db->escape($checksum) . "')";
+        $sql = "REPLACE INTO {$tbl_system_settings} (setting_name, setting_value) VALUES ('sys_files_checksum','".$modx->db->escape($checksum)."')";
         $modx->db->query($sql);
     }
 
@@ -371,10 +371,10 @@ 
             foreach ($settings as $key => $val) {
                 $f = array();
                 $f['user'] = $_SESSION['mgrInternalKey'];
-                $f['setting_name'] = '_LAST_' . $key;
+                $f['setting_name'] = '_LAST_'.$key;
                 $f['setting_value'] = $val;
                 $f = $modx->db->escape($f);
-                $f = "(`" . implode("`, `", array_keys($f)) . "`) VALUES('" . implode("', '", array_values($f)) . "')";
+                $f = "(`".implode("`, `", array_keys($f))."`) VALUES('".implode("', '", array_values($f))."')";
                 $f .= " ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)";
                 $modx->db->insert($f, $modx->getFullTableName('user_settings'));
             }

Braces +4 added lines, -2 removed lines

@@ -116,7 +116,8 @@ 
      * @return string
      */
     public function getHashType($db_value = '')
-    { // md5 | v1 | phpass
+    {
+// md5 | v1 | phpass
         $c = substr($db_value, 0, 1);
         if ($c === '$') {
             return 'phpass';
@@ -135,7 +136,8 @@ 
      * @return string
      */
     public function genV1Hash($password, $seed = '1')
-    { // $seed is user_id basically
+    {
+// $seed is user_id basically
         $modx = evolutionCMS();
 
         if (isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) {

manager/media/calendar/datepicker.inc.php

Indentation +7 added lines, -7 removed lines

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

 

 class DATEPICKER {

-	function __construct() {

-	}

+    function __construct() {

+    }

 

-	function getDP() {

-		$modx = evolutionCMS(); global $_lang;

+    function getDP() {

+        $modx = evolutionCMS(); global $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

-		return $modx->parseText($tpl, $_lang, '[%', '%]');

-	}

+        $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+        return $modx->parseText($tpl, $_lang, '[%', '%]');

+    }

 }

Spacing +4 added lines, -4 removed lines

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

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER{

+	function __construct(){

 	}

 

-	function getDP() {

+	function getDP(){

 		$modx = evolutionCMS(); global $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+		$tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

 		return $modx->parseText($tpl, $_lang, '[%', '%]');

 	}

 }

Braces +6 added lines, -3 removed lines

@@ -1,10 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER
+{
+	function __construct()
+	{
 	}

 

-	function getDP() {

+	function getDP()
+	{
 		$modx = evolutionCMS(); global $_lang;

 

 		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');