evolution-cms / evolution

manager/actions/mutate_menuindex_sort.dynamic.php

Spacing +11 added lines, -11 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('edit_document') || !$modx->hasPermission('save_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : null;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : null;
 $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0;
 $items = isset($_POST['list']) ? $_POST['list'] : '';
 $ressourcelist = '';
@@ -23,7 +23,7 @@ 
 }
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<div class="text-success" id="updated">' . $_lang['sort_updated'] . '</div>';
+    $updateMsg .= '<div class="text-success" id="updated">'.$_lang['sort_updated'].'</div>';
     if (strlen($items) > 0) {
         $items = explode(';', $items);
         foreach ($items as $key => $value) {
@@ -43,15 +43,15 @@ 
     $tblsc = $modx->getFullTableName('site_content');
     $tbldg = $modx->getFullTableName('document_groups');
 
-    $rs = $modx->getDatabase()->select('pagetitle', $tblsc, 'id=' . $id . '');
+    $rs = $modx->getDatabase()->select('pagetitle', $tblsc, 'id='.$id.'');
     $pagetitle = $modx->getDatabase()->getValue($rs);
 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
-    $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
-    $access = " AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+    $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $access = " AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
 
-    $rs = $modx->getDatabase()->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc . 'AS sc LEFT JOIN ' . $tbldg . ' dg ON dg.document=sc.id', 'sc.parent=' . $id . $access . ' GROUP BY sc.id', 'menuindex ASC');
+    $rs = $modx->getDatabase()->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc.'AS sc LEFT JOIN '.$tbldg.' dg ON dg.document=sc.id', 'sc.parent='.$id.$access.' GROUP BY sc.id', 'menuindex ASC');
 
     if ($modx->getDatabase()->getRecordCount($rs)) {
         $ressourcelist .= '<div class="clearfix"><ul id="sortlist" class="sortableList">';
@@ -60,12 +60,12 @@ 
             $classes .= ($row['hidemenu']) ? ' notInMenuNode ' : ' inMenuNode';
             $classes .= ($row['published']) ? ' publishedNode ' : ' unpublishedNode ';
             $classes = ($row['deleted']) ? ' deletedNode ' : $classes;
-            $icon = $row['isfolder'] ? '<i class="' . $_style['files_folder'] . '"></i> ' : ' <i class="' . $_style['files_page_html'] . '"></i> ';
-            $ressourcelist .= '<li id="item_' . $row['id'] . '" class="' . $classes . '">' . $icon . $row['pagetitle'] . ' <small>(' . $row['id'] . ')</small></li>';
+            $icon = $row['isfolder'] ? '<i class="'.$_style['files_folder'].'"></i> ' : ' <i class="'.$_style['files_page_html'].'"></i> ';
+            $ressourcelist .= '<li id="item_'.$row['id'].'" class="'.$classes.'">'.$icon.$row['pagetitle'].' <small>('.$row['id'].')</small></li>';
         }
         $ressourcelist .= '</ul></div>';
     } else {
-        $updateMsg = '<p class="text-danger">' . $_lang['sort_nochildren'] . '</p>';
+        $updateMsg = '<p class="text-danger">'.$_lang['sort_nochildren'].'</p>';
     }
 }
 
@@ -148,7 +148,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['sort_menuindex']) ?>
+    <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['sort_menuindex']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/actions/mutate_content.dynamic.php

Indentation +371 added lines, -371 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,29 +12,29 @@ 
 
 // check permissions
 switch($modx->getManagerApi()->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
-			$udperms = new EvolutionCMS\Legacy\Permissions();
-			$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
+            $udperms = new EvolutionCMS\Legacy\Permissions();
+            $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;
@@ -53,21 +53,21 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
 if($modx->getManagerApi()->action == 27) {
-	//editing an existing document
-	// check permissions on the document
-	$udperms = new EvolutionCMS\Legacy\Permissions();
-	$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
+    $udperms = new EvolutionCMS\Legacy\Permissions();
+    $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
 
@@ -76,74 +76,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->getDatabase()->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->getDatabase()->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->getDatabase()->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->getDatabase()->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->getManagerApi()->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->getDatabase()->select('count(*)', $tbl_site_content, "parent='{$pid}'");
-		$content['menuindex'] = $modx->getDatabase()->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->getDatabase()->select('count(*)', $tbl_site_content, "parent='{$pid}'");
+        $content['menuindex'] = $modx->getDatabase()->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
@@ -543,23 +543,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->getManagerApi()->action ?>" />
@@ -574,54 +574,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->getManagerApi()->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->getManagerApi()->action == '4') {
                         echo $_lang['add_resource'];
                     } else if ($modx->getManagerApi()->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->getDatabase()->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->getDatabase()->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->getDatabase()->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
+                        while($row = $modx->getDatabase()->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">
@@ -633,13 +633,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>
@@ -724,36 +724,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->getDatabase()->select($field, $from, '', 'c.category, t.templatename ASC');
-											$currentCategory = '';
-											while($row = $modx->getDatabase()->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->getDatabase()->select($field, $from, '', 'c.category, t.templatename ASC');
+                                            $currentCategory = '';
+                                            while($row = $modx->getDatabase()->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>
@@ -793,37 +793,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->getDatabase()->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
-											$parentname = $modx->getDatabase()->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->getDatabase()->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
+                                            $parentname = $modx->getDatabase()->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;" />
@@ -831,7 +831,7 @@ 
 								</tr>
 								<tr></tr>
 								<?php
-								/*
+                                /*
 								if($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') {
 									?>
 									<tr>
@@ -859,7 +859,7 @@ 
 									</tr>
 									<?php
 								}*/
-								?>
+                                ?>
 
 								<?php if($content['type'] == 'document' || $modx->getManagerApi()->action == '4') { ?>
 									<tr>
@@ -872,36 +872,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->getManagerApi()->action == '4') && $use_editor == 1) {
-													$htmlContent = $content['content'];
-													?>
+                                                if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
+                                                    $htmlContent = $content['content'];
+                                                    ?>
 													<div class="section-editor clearfix">
 														<textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->getPhpCompat()->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->getPhpCompat()->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->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                }
+                                                ?>
 											</div>
 										</td>
 									</tr>
@@ -1207,8 +1207,8 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
-									?>
+                                if($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+                                    ?>
 									<tr>
 										<td>
 											<span class="warning"><?= $_lang['resource_type'] ?></span>
@@ -1230,15 +1230,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>
@@ -1261,23 +1261,23 @@ 
 										</td>
 									</tr>
 									<?php
-								} else {
-									if($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
-										// non-admin managers creating or editing a document resource
-										?>
+                                } else {
+                                    if($content['type'] != 'reference' && $modx->getManagerApi()->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>
@@ -1360,112 +1360,112 @@ 
                     ?>
 
 						<?php
-					/*******************************
+                    /*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
-						$groupsarray = array();
-						$sql = '';
-
-						$documentId = ($modx->getManagerApi()->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->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->getDatabase()->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->getDatabase()->select('dgn.*, groups.id AS link_id', $from, '', 'name');
-						} else {
-							// Just load up the names, we're starting clean
-							$rs = $modx->getDatabase()->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->getManagerApi()->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->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
+                            while($currentgroup = $modx->getDatabase()->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->getDatabase()->select('dgn.*, groups.id AS link_id', $from, '', 'name');
+                        } else {
+                            // Just load up the names, we're starting clean
+                            $rs = $modx->getDatabase()->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->getDatabase()->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->getDatabase()->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->getDatabase()->select('COUNT(mg.id)', $from, $where);
-							$count = $modx->getDatabase()->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->getDatabase()->select('COUNT(mg.id)', $from, $where);
+                            $count = $modx->getDatabase()->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>
@@ -1499,31 +1499,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>
@@ -1534,17 +1534,17 @@ 
 	</script>
 <?php
 if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4' || $modx->getManagerApi()->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);
+            }
+        }
+    }
 }

Spacing +133 added lines, -133 removed lines

@@ -1,34 +1,34 @@ 
 <?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->getManagerApi()->action) {
+switch ($modx->getManagerApi()->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
 			$udperms = new EvolutionCMS\Legacy\Permissions();
 			$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"]);
 			}
 		}
@@ -37,7 +37,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');
@@ -52,7 +52,7 @@ 
 $tbl_site_tmplvar_templates = $modx->getFullTableName('site_tmplvar_templates');
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
-if($modx->getManagerApi()->action == 27) {
+if ($modx->getManagerApi()->action == 27) {
 	//editing an existing document
 	// check permissions on the document
 	$udperms = new EvolutionCMS\Legacy\Permissions();
@@ -60,13 +60,13 @@ 
 	$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
@@ -75,27 +75,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->getDatabase()->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->getDatabase()->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();
@@ -106,22 +106,22 @@ 
 
 // restore saved form
 $formRestored = $modx->getManagerApi()->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']);
@@ -129,12 +129,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->getDatabase()->select('count(*)', $tbl_site_content, "parent='{$pid}'");
 		$content['menuindex'] = $modx->getDatabase()->getValue($rs);
 	} else {
@@ -142,14 +142,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[ */
@@ -179,7 +179,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) {
@@ -187,7 +187,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');
 			}
 		};
 
@@ -549,7 +549,7 @@ 
 			'template' => $content['template']
 		));
 
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 
@@ -573,8 +573,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->getManagerApi()->action == '4') {
                         echo $_lang['add_resource'];
@@ -590,36 +590,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->getDatabase()->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->getDatabase()->getRow($rs)) {
+						while ($row = $modx->getDatabase()->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>';
 			}
 			?>
 
@@ -636,7 +636,7 @@ 
 					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
 						'id' => $id
 					));
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					} else {
 						?>
@@ -692,7 +692,7 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') { // Web Link specific ?>
+								<?php if ($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') { // Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -728,17 +728,17 @@ 
 											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
 											$rs = $modx->getDatabase()->select($field, $from, '', 'c.category, t.templatename ASC');
 											$currentCategory = '';
-											while($row = $modx->getDatabase()->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+											while ($row = $modx->getDatabase()->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";
@@ -747,10 +747,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";
 											}
 											?>
@@ -794,20 +794,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'];
@@ -816,10 +816,10 @@ 
 											$parentname = $site_name;
 											$content['parent'] = 0;
 										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
+										if ($parentlookup !== false && is_numeric($parentlookup)) {
 											$rs = $modx->getDatabase()->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
 											$parentname = $modx->getDatabase()->getValue($rs);
-											if(!$parentname) {
+											if (!$parentname) {
 												$modx->webAlertAndQuit($_lang["error_no_parent"]);
 											}
 										}
@@ -861,7 +861,7 @@ 
 								}*/
 								?>
 
-								<?php if($content['type'] == 'document' || $modx->getManagerApi()->action == '4') { ?>
+								<?php if ($content['type'] == 'document' || $modx->getManagerApi()->action == '4') { ?>
 									<tr>
 										<td colspan="2">
 											<hr>
@@ -874,8 +874,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";
 															}
@@ -886,7 +886,7 @@ 
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
+												if (($content['richtext'] == 1 || $modx->getManagerApi()->action == '4') && $use_editor == 1) {
 													$htmlContent = $content['content'];
 													?>
 													<div class="section-editor clearfix">
@@ -899,7 +899,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->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+													echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->getPhpCompat()->htmlspecialchars($content['content']), '</textarea></div>'."\n";
 												}
 												?>
 											</div>
@@ -915,7 +915,7 @@ 
 
                             if (($content['type'] == 'document' || $modx->getManagerApi()->action == '4') || ($content['type'] == 'reference' || $modx->getManagerApi()->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 {
@@ -943,10 +943,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->getDatabase()->select($field, $from, $where, $sort);
@@ -964,8 +964,8 @@ 
                                                 if ($group_tvs == 1 || $group_tvs == 3) {
                                                     if ($i === 0) {
                                                         $templateVariablesOutput .= '
-                            <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 {
@@ -974,17 +974,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) {
                                                         $templateVariablesOutput .= '
-                            <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>';
@@ -994,9 +994,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>';
@@ -1004,18 +1004,18 @@ 
                                                 } else if ($group_tvs == 5) {
                                                     if ($i === 0) {
                                                         $templateVariablesOutput .= '
-                                <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 {
                                                         $templateVariablesOutput .= '
                                     </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>';
                                                     }
@@ -1035,8 +1035,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;
                                         }
 
                                         $templateVariablesTmp = '';
@@ -1053,24 +1053,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>' : '';
 
                                         $templateVariablesTmp .= '
                                         <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>';
 
                                         if ($group_tvs && $row['category_id'] == 0) {
@@ -1084,38 +1084,38 @@ 
                                     }
 
                                     if ($templateVariablesGeneral) {
-                                        echo '<table id="tabTV_0" class="tmplvars"><tbody>' . $templateVariablesGeneral . '</tbody></table>';
+                                        echo '<table id="tabTV_0" class="tmplvars"><tbody>'.$templateVariablesGeneral.'</tbody></table>';
                                     }
 
                                     $templateVariables .= '
                         <!-- 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>';
                                     }
                                     $templateVariables .= $templateVariablesOutput;
@@ -1207,7 +1207,7 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+								if ($_SESSION['mgrRole'] == 1 || $modx->getManagerApi()->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
 									?>
 									<tr>
 										<td>
@@ -1230,13 +1230,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>
@@ -1262,7 +1262,7 @@ 
 									</tr>
 									<?php
 								} else {
-									if($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
+									if ($content['type'] != 'reference' && $modx->getManagerApi()->action != '72') {
 										// non-admin managers creating or editing a document resource
 										?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
@@ -1362,15 +1362,15 @@ 
 						<?php
 					/*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
+					if ($use_udperms == 1) {
 						$groupsarray = array();
 						$sql = '';
 
 						$documentId = ($modx->getManagerApi()->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->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while ($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id'];
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1386,7 +1386,7 @@ 
 						}
 
 						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
+						if (isset($_POST['docgroups'])) {
 							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
 						}
 
@@ -1405,26 +1405,26 @@ 
 						$permissions_no = 0; // count permissions the current mgr user doesn't have
 
 						// Loop through the permissions list
-						while($row = $modx->getDatabase()->getRow($rs)) {
+						while ($row = $modx->getDatabase()->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']);
@@ -1432,10 +1432,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";
@@ -1446,23 +1446,23 @@ 
 							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
 							$rsp = $modx->getDatabase()->select('COUNT(mg.id)', $from, $where);
 							$count = $modx->getDatabase()->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...
 							?>
@@ -1495,12 +1495,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
@@ -1520,7 +1520,7 @@ 
 						'template' => $content['template']
 					));
 
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					}
 					?>
@@ -1533,16 +1533,16 @@ 
 		storeCurTemplate();
 	</script>
 <?php
-if(($content['richtext'] == 1 || $modx->getManagerApi()->action == '4' || $modx->getManagerApi()->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
+if (($content['richtext'] == 1 || $modx->getManagerApi()->action == '4' || $modx->getManagerApi()->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);
 			}
 		}

Braces +10 added lines, -4 removed lines

@@ -476,7 +476,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') { // Web Link specific ?>
+		<?php if ($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') {
+// Web Link specific ?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -692,7 +693,8 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') { // Web Link specific ?>
+								<?php if($content['type'] == 'reference' || $modx->getManagerApi()->action == '72') {
+// Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -1370,7 +1372,9 @@ 
 						if($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->getDatabase()->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->getDatabase()->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while($currentgroup = $modx->getDatabase()->getRow($rs)) {
+							    $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							}
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1432,7 +1436,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) . ' />';

manager/actions/sysinfo.static.php

Spacing +14 added lines, -14 removed lines

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

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

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

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

 }

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

@@ -12,14 +12,14 @@ 
 $collation = $modx->getDatabase()->getRow($res, 'num');

 

 $serverArr = array(

-    $_lang['modx_version'] => $modx->getVersionData('version') . ' ' . $newversiontext,

+    $_lang['modx_version'] => $modx->getVersionData('version').' '.$newversiontext,

     $_lang['release_date'] => $modx->getVersionData('release_date'),

     'PHP Version' => phpversion(),

-    'phpInfo()' => '<a class="text-underline" href="javascript:;" onclick="viewPHPInfo();return false;">' . $_lang['view'] . '</a>',

+    'phpInfo()' => '<a class="text-underline" href="javascript:;" onclick="viewPHPInfo();return false;">'.$_lang['view'].'</a>',

     $_lang['access_permissions'] => ($use_udperms == 1 ? $_lang['enabled'] : $_lang['disabled']),

     $_lang['servertime'] => strftime('%H:%M:%S', time()),

     $_lang['localtime'] => strftime('%H:%M:%S', time() + $server_offset_time),

-    $_lang['serveroffset'] => $server_offset_time / (60 * 60) . ' h',

+    $_lang['serveroffset'] => $server_offset_time / (60 * 60).' h',

     $_lang['database_name'] => trim($dbase, '`'),

     $_lang['database_server'] => $database_server,

     $_lang['database_version'] => $modx->getDatabase()->getVersion(),

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

                     <tbody>

                     <?php

-                    $sql = "SHOW TABLE STATUS FROM $dbase LIKE '" . $modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix']) . "%';";

+                    $sql = "SHOW TABLE STATUS FROM $dbase LIKE '".$modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix'])."%';";

                     $rs = $modx->getDatabase()->query($sql);

                     $i = 0;

                     while ($log_status = $modx->getDatabase()->getRow($rs)) {

                         ?>

                         <tr>

                             <td class="text-primary"><b><?= $log_status['Name'] ?></b></td>

-                            <td class="text-xs-center"><?= (!empty($log_status['Comment']) ? '<i class="' . $_style['actions_help'] . '" data-tooltip="' . $log_status['Comment'] . '"></i>' : '') ?></td>

+                            <td class="text-xs-center"><?= (!empty($log_status['Comment']) ? '<i class="'.$_style['actions_help'].'" data-tooltip="'.$log_status['Comment'].'"></i>' : '') ?></td>

                             <td class="text-xs-right"><?= $log_status['Rows'] ?></td>

 

                             <?php

                             $truncateable = array(

-                                $modx->getDatabase()->config['table_prefix'] . 'event_log',

-                                $modx->getDatabase()->config['table_prefix'] . 'manager_log',

+                                $modx->getDatabase()->config['table_prefix'].'event_log',

+                                $modx->getDatabase()->config['table_prefix'].'manager_log',

                             );

                             if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {

                                 echo "<td class=\"text-xs-right\">";

-                                echo "<a class=\"text-danger\" href='index.php?a=54&mode=$action&u=" . $log_status['Name'] . "' title='" . $_lang['truncate_table'] . "'>" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</a>";

+                                echo "<a class=\"text-danger\" href='index.php?a=54&mode=$action&u=".$log_status['Name']."' title='".$_lang['truncate_table']."'>".$modx->nicesize($log_status['Data_length'] + $log_status['Data_free'])."</a>";

                                 echo "</td>";

                             } else {

-                                echo "<td class=\"text-xs-right\">" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</td>";

+                                echo "<td class=\"text-xs-right\">".$modx->nicesize($log_status['Data_length'] + $log_status['Data_free'])."</td>";

                             }

 

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

-                                echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? "<a class=\"text-danger\" href='index.php?a=54&mode=$action&t=" . $log_status['Name'] . "' title='" . $_lang['optimize_table'] . "' ><span>" . $modx->nicesize($log_status['Data_free']) . "</span></a>" : "-") . "</td>";

+                                echo "<td class=\"text-xs-right\">".($log_status['Data_free'] > 0 ? "<a class=\"text-danger\" href='index.php?a=54&mode=$action&t=".$log_status['Name']."' title='".$_lang['optimize_table']."' ><span>".$modx->nicesize($log_status['Data_free'])."</span></a>" : "-")."</td>";

                             } else {

-                                echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-") . "</td>";

+                                echo "<td class=\"text-xs-right\">".($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-")."</td>";

                             }

                             ?>

                             <td class="text-xs-right"><?= $modx->nicesize($log_status['Data_length'] - $log_status['Data_free']) ?></td>

@@ -136,9 +136,9 @@ 
                     <tr class="unstyled">

                         <td class="text-xs-right"><?= $_lang['database_table_totals'] ?></td>

                         <td colspan="3">&nbsp;</td>

-                        <td class="text-xs-right"><?= $totaloverhead > 0 ? "<b class=\"text-danger\">" . $modx->nicesize($totaloverhead) . "</b><br />(" . number_format($totaloverhead) . " B)" : "-" ?></td>

+                        <td class="text-xs-right"><?= $totaloverhead > 0 ? "<b class=\"text-danger\">".$modx->nicesize($totaloverhead)."</b><br />(".number_format($totaloverhead)." B)" : "-" ?></td>

                         <td colspan="2">&nbsp;</td>

-                        <td class="text-xs-right"><?= "<b>" . $modx->nicesize($total) . "</b><br />(" . number_format($total) . " B)" ?></td>

+                        <td class="text-xs-right"><?= "<b>".$modx->nicesize($total)."</b><br />(".number_format($total)." B)" ?></td>

                     </tr>

                     </tbody>

                 </table>

Braces +8 added lines, -8 removed lines

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

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

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

 }

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

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

 }

 

@@ -55,7 +55,7 @@ 
                 <table class="table data table-sm nowrap">

                     <tbody>

                     <?php

-                    foreach ($serverArr as $key => $value) {

+                    foreach ($serverArr as $key => $value) {
                         ?>

                         <tr>

                             <td width="1%"><?= $key ?></td>

@@ -98,7 +98,7 @@ 
                     $sql = "SHOW TABLE STATUS FROM $dbase LIKE '" . $modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix']) . "%';";

                     $rs = $modx->getDatabase()->query($sql);

                     $i = 0;

-                    while ($log_status = $modx->getDatabase()->getRow($rs)) {

+                    while ($log_status = $modx->getDatabase()->getRow($rs)) {
                         ?>

                         <tr>

                             <td class="text-primary"><b><?= $log_status['Name'] ?></b></td>

@@ -110,17 +110,17 @@ 
                                 $modx->getDatabase()->config['table_prefix'] . 'event_log',

                                 $modx->getDatabase()->config['table_prefix'] . 'manager_log',

                             );

-                            if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {

+                            if ($modx->hasPermission('settings') && in_array($log_status['Name'], $truncateable)) {
                                 echo "<td class=\"text-xs-right\">";

                                 echo "<a class=\"text-danger\" href='index.php?a=54&mode=$action&u=" . $log_status['Name'] . "' title='" . $_lang['truncate_table'] . "'>" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</a>";

                                 echo "</td>";

-                            } else {

+                            } else {
                                 echo "<td class=\"text-xs-right\">" . $modx->nicesize($log_status['Data_length'] + $log_status['Data_free']) . "</td>";

                             }

 

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

+                            if ($modx->hasPermission('settings')) {
                                 echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? "<a class=\"text-danger\" href='index.php?a=54&mode=$action&t=" . $log_status['Name'] . "' title='" . $_lang['optimize_table'] . "' ><span>" . $modx->nicesize($log_status['Data_free']) . "</span></a>" : "-") . "</td>";

-                            } else {

+                            } else {
                                 echo "<td class=\"text-xs-right\">" . ($log_status['Data_free'] > 0 ? $modx->nicesize($log_status['Data_free']) : "-") . "</td>";

                             }

                             ?>

manager/actions/mutate_plugin.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch ($modx->getManagerApi()->action) {
-    case 102:
-        if (!$modx->hasPermission('edit_plugin')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 101:
-        if (!$modx->hasPermission('new_plugin')) {
+        case 102:
+            if (!$modx->hasPermission('edit_plugin')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 101:
+            if (!$modx->hasPermission('new_plugin')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +16 added lines, -16 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.");
 }
 
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_site_plugins = $modx->getFullTableName('site_plugins');
 $tbl_site_plugin_events = $modx->getFullTableName('site_plugin_events');
@@ -46,7 +46,7 @@ 
     $content['properties'] = str_replace("&", "&amp;", $content['properties']);
 } else {
     $_SESSION['itemname'] = $_lang["new_plugin"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->getManagerApi()->hasFormValues()) {
@@ -56,7 +56,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 5;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 
 
@@ -473,7 +473,7 @@ 
     <input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
 
     <h1>
-        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
+        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -499,7 +499,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                <label class="custom-control" title="<?= $_lang['lock_plugin'] . "\n" . $_lang['lock_plugin_msg'] ?>" tooltip>
+                                <label class="custom-control" title="<?= $_lang['lock_plugin']."\n".$_lang['lock_plugin_msg'] ?>" tooltip>
                                     <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
                                     <i class="fa fa-lock"></i>
                                 </label>
@@ -523,9 +523,9 @@ 
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
                                 foreach (getCategories() as $n => $v) {
-                                    echo '<option value="' . $v['id'] . '"' . ($content["category"] == $v["id"] ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($v["category"]) . "</option>";
+                                    echo '<option value="'.$v['id'].'"'.($content["category"] == $v["id"] ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($v["category"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -541,7 +541,7 @@ 
                 <?php if ($modx->hasPermission('save_role')): ?>
                 <div class="form-group">
                     <div class="form-row">
-                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['plugin_disabled'] . "</span>" : $_lang['plugin_disabled']) ?></label>
+                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['plugin_disabled']."</span>" : $_lang['plugin_disabled']) ?></label>
                     </div>
                     <div class="form-row">
                         <label>
@@ -588,11 +588,11 @@ 
                             <select name="moduleguid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                $ds = $modx->getDatabase()->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules") . " sm 
-								INNER JOIN " . $modx->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30
-								INNER JOIN " . $modx->getFullTableName("site_plugins") . " sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
+                                $ds = $modx->getDatabase()->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules")." sm 
+								INNER JOIN " . $modx->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30
+								INNER JOIN " . $modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
                                 while ($row = $modx->getDatabase()->getRow($ds)) {
-                                    echo "<option value='" . $row['guid'] . "'" . ($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "") . ">" . $modx->getPhpCompat()->htmlspecialchars($row["name"]) . "</option>";
+                                    echo "<option value='".$row['guid']."'".($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "").">".$modx->getPhpCompat()->htmlspecialchars($row["name"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -654,7 +654,7 @@ 
                                 echoEventRows($evtnames);
                             }
                             echo '<hr class="clear">';
-                            echo '<div class="form-group"><b>' . $services[$srv - 1] . '</b></div>';
+                            echo '<div class="form-group"><b>'.$services[$srv - 1].'</b></div>';
                         }
                         // display group name
                         if ($grp != $row['groupname']) {
@@ -663,9 +663,9 @@ 
                                 echoEventRows($evtnames);
                             }
                             echo '<hr class="clear">';
-                            echo '<div class="form-group"><b>' . $row['groupname'] . '</b></div>';
+                            echo '<div class="form-group"><b>'.$row['groupname'].'</b></div>';
                         }
-                        $evtnames[] = '<input name="sysevents[]" id="' . $row['name'] . '" type="checkbox" ' . (in_array($row['id'], $evts) ? ' checked="checked" ' : '') . 'class="inputBox" value="' . $row['id'] . '" /> <label for="' . $row['name'] . '" ' . bold(in_array($row['id'], $evts)) . '> ' . $row['name'] . '</label>' . "\n";
+                        $evtnames[] = '<input name="sysevents[]" id="'.$row['name'].'" type="checkbox" '.(in_array($row['id'], $evts) ? ' checked="checked" ' : '').'class="inputBox" value="'.$row['id'].'" /> <label for="'.$row['name'].'" '.bold(in_array($row['id'], $evts)).'> '.$row['name'].'</label>'."\n";
                         if (count($evtnames) == 2) {
                             echoEventRows($evtnames);
                         }

manager/actions/role_management.static.php

Indentation +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 ?>
@@ -18,14 +18,14 @@ 
 		<div class="form-group"><?= $_lang['role_management_msg'] ?> <a class="btn btn-secondary btn-sm" href="index.php?a=38"><i class="<?= $_style["actions_new"] ?> hide4desktop"></i> <?= $_lang['new_role'] ?></a></div>
 		<div class="form-group">
 			<?php
-			$rs = $modx->getDatabase()->select('name, id, description', $modx->getFullTableName('user_roles'), '', 'name');
-			$limit = $modx->getDatabase()->getRecordCount($rs);
-			if($limit < 1) {
-				?>
+            $rs = $modx->getDatabase()->select('name, id, description', $modx->getFullTableName('user_roles'), '', 'name');
+            $limit = $modx->getDatabase()->getRecordCount($rs);
+            if($limit < 1) {
+                ?>
 				<p><?= $_lang["no_records_found"] ?></p>
 				<?php
-			} else {
-				?>
+            } else {
+                ?>
 				<div class="row">
 					<div class="table-responsive">
 						<table class="table data">
@@ -37,24 +37,24 @@ 
 							</thead>
 							<tbody>
 							<?php
-							while($row = $modx->getDatabase()->getRow($rs)) {
-								if($row['id'] == 1) {
-									?>
+                            while($row = $modx->getDatabase()->getRow($rs)) {
+                                if($row['id'] == 1) {
+                                    ?>
 									<tr class="text-muted disabled">
 										<td><b><?= $row['name'] ?></b></td>
 										<td><span><?= $_lang['administrator_role_message'] ?></span></td>
 									</tr>
 									<?php
-								} else {
-									?>
+                                } else {
+                                    ?>
 									<tr>
 										<td><a class="text-primary" href="index.php?id=<?= $row['id'] ?>&a=35"><?= $row['name'] ?></a></td>
 										<td><?= $row['description'] ?></td>
 									</tr>
 									<?php
-								}
-							}
-							?>
+                                }
+                            }
+                            ?>
 							</tbody>
 						</table>
 					</div>

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_user')) {
+if (!$modx->hasPermission('edit_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -20,7 +20,7 @@ 
 			<?php
 			$rs = $modx->getDatabase()->select('name, id, description', $modx->getFullTableName('user_roles'), '', 'name');
 			$limit = $modx->getDatabase()->getRecordCount($rs);
-			if($limit < 1) {
+			if ($limit < 1) {
 				?>
 				<p><?= $_lang["no_records_found"] ?></p>
 				<?php
@@ -37,8 +37,8 @@ 
 							</thead>
 							<tbody>
 							<?php
-							while($row = $modx->getDatabase()->getRow($rs)) {
-								if($row['id'] == 1) {
+							while ($row = $modx->getDatabase()->getRow($rs)) {
+								if ($row['id'] == 1) {
 									?>
 									<tr class="text-muted disabled">
 										<td><b><?= $row['name'] ?></b></td>

manager/actions/mutate_module_resources.dynamic.php

Indentation +86 added lines, -86 removed lines

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

Spacing +31 added lines, -31 removed lines

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

manager/actions/web_user_management.static.php

Indentation +30 added lines, -30 removed lines

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

Spacing +11 added lines, -11 removed lines

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

manager/actions/mutate_web_user.dynamic.php

Indentation +89 added lines, -89 removed lines

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

 }

 

 switch($modx->getManagerApi()->action) {

-	case 88:

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

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

-		}

-		break;

-	case 87:

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

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

-		}

-		break;

-	default:

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

+    case 88:

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

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

+        }

+        break;

+    case 87:

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

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

+        }

+        break;

+    default:

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

 }

 

 $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

@@ -24,64 +24,64 @@ 
 // check to see the snippet editor isn't locked

 $rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

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

-	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

+    $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

 }

 // end check for lock

 

 if($modx->getManagerApi()->action == '88') {

-	// get user attributes

-	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");

-	$userdata = $modx->getDatabase()->getRow($rs);

-	if(!$userdata) {

-		$modx->webAlertAndQuit("No user returned!");

-	}

-

-	// get user settings

-	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$user}'");

-	$usersettings = array();

-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

-	extract($usersettings, EXTR_OVERWRITE);

-

-	// get user name

-	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_users'), "id = '{$user}'");

-	$usernamedata = $modx->getDatabase()->getRow($rs);

-	if(!$usernamedata) {

-		$modx->webAlertAndQuit("No user returned while getting username!");

-	}

-	$_SESSION['itemname'] = $usernamedata['username'];

+    // get user attributes

+    $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");

+    $userdata = $modx->getDatabase()->getRow($rs);

+    if(!$userdata) {

+        $modx->webAlertAndQuit("No user returned!");

+    }

+

+    // get user settings

+    $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$user}'");

+    $usersettings = array();

+    while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

+    extract($usersettings, EXTR_OVERWRITE);

+

+    // get user name

+    $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_users'), "id = '{$user}'");

+    $usernamedata = $modx->getDatabase()->getRow($rs);

+    if(!$usernamedata) {

+        $modx->webAlertAndQuit("No user returned while getting username!");

+    }

+    $_SESSION['itemname'] = $usernamedata['username'];

 } else {

-	$userdata = array();

-	$usersettings = array();

-	$usernamedata = array();

-	$_SESSION['itemname'] = $_lang["new_web_user"];

+    $userdata = array();

+    $usersettings = array();

+    $usernamedata = array();

+    $_SESSION['itemname'] = $_lang["new_web_user"];

 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

 foreach($userdata as $key => $val) {

-	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

+    $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

 if($modx->getManagerApi()->hasFormValues()) {

-	$modx->getManagerApi()->loadFormValues();

-	// restore post values

-	$userdata = array_merge($userdata, $_POST);

-	$userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

-	$usernamedata['username'] = $userdata['newusername'];

-	$usernamedata['oldusername'] = $_POST['oldusername'];

-	$usersettings = array_merge($usersettings, $userdata);

-	$usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

-	extract($usersettings, EXTR_OVERWRITE);

+    $modx->getManagerApi()->loadFormValues();

+    // restore post values

+    $userdata = array_merge($userdata, $_POST);

+    $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

+    $usernamedata['username'] = $userdata['newusername'];

+    $usernamedata['oldusername'] = $_POST['oldusername'];

+    $usersettings = array_merge($usersettings, $userdata);

+    $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

+    extract($usersettings, EXTR_OVERWRITE);

 }

 

 // include the country list language file

 $_country_lang = array();

 if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

-	include_once "lang/country/" . $manager_language . "_country.inc.php";

+    include_once "lang/country/" . $manager_language . "_country.inc.php";

 } else {

-	include_once "lang/country/english_country.inc.php";

+    include_once "lang/country/english_country.inc.php";

 }

 asort($_country_lang);

 

@@ -189,12 +189,12 @@ 
 

 <form action="index.php?a=89" method="post" name="userform">

 	<?php

-	// invoke OnWUsrFormPrerender event

-	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnWUsrFormPrerender event

+    $evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 	<input type="hidden" name="mode" value="<?php echo $modx->getManagerApi()->action; ?>" />

 	<input type="hidden" name="id" value="<?php echo $user ?>" />

 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />

@@ -324,10 +324,10 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>

 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

-								foreach($_country_lang as $key => $country) {

-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

-								}

-								?>

+                                foreach($_country_lang as $key => $country) {

+                                    echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -387,8 +387,8 @@ 
 								<i onClick="document.userform.blockedafter.value=''; return true;" class="clearDate <?php echo $_style["actions_calendar_delete"] ?>" data-tooltip="<?php echo $_lang['remove_date']; ?>"></i></td>

 						</tr>

 						<?php

-					}

-					?>

+                    }

+                    ?>

 				</table>

 			</div>

 

@@ -496,40 +496,40 @@ 
 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

-

-			$groupsarray = array();

-

-			if($modx->getManagerApi()->action == '88') { // only do this bit if the user is being edited

-				$rs = $modx->getDatabase()->select('webgroup', $modx->getFullTableName('web_groups'), "webuser='{$user}'");

-				$groupsarray = $modx->getDatabase()->getColumn('webgroup', $rs);

-			}

-			// retain selected user groups between post

-			if(is_array($_POST['user_groups'])) {

-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

-			}

-			?>

+            if($use_udperms == 1) {

+

+            $groupsarray = array();

+

+            if($modx->getManagerApi()->action == '88') { // only do this bit if the user is being edited

+                $rs = $modx->getDatabase()->select('webgroup', $modx->getFullTableName('web_groups'), "webuser='{$user}'");

+                $groupsarray = $modx->getDatabase()->getColumn('webgroup', $rs);

+            }

+            // retain selected user groups between post

+            if(is_array($_POST['user_groups'])) {

+                foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

+            }

+            ?>

 			<div class="tab-page" id="tabPermissions">

 				<h2 class="tab"><?php echo $_lang['web_access_permissions'] ?></h2>

 				<script type="text/javascript">tpUser.addTabPage(document.getElementById("tabPermissions"));</script>

 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

-				$rs = $modx->getDatabase()->select('name, id', $modx->getFullTableName('webgroup_names'), '', 'name');

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

-					echo '<label><input type="checkbox" name="user_groups[]" value="' . $row['id'] . '"' . (in_array($row['id'], $groupsarray) ? ' checked="checked"' : '') . ' />' . $row['name'] . '</label><br />';

-				}

-				}

-				?>

+                $rs = $modx->getDatabase()->select('name, id', $modx->getFullTableName('webgroup_names'), '', 'name');

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

+                    echo '<label><input type="checkbox" name="user_groups[]" value="' . $row['id'] . '"' . (in_array($row['id'], $groupsarray) ? ' checked="checked"' : '') . ' />' . $row['name'] . '</label><br />';

+                }

+                }

+                ?>

 			</div>

 			<?php

-			// invoke OnWUsrFormRender event

-			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

-				"id" => $user

-			));

-			if(is_array($evtOut)) {

-				echo implode("", $evtOut);

-			}

-			?>

+            // invoke OnWUsrFormRender event

+            $evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

+                "id" => $user

+            ));

+            if(is_array($evtOut)) {

+                echo implode("", $evtOut);

+            }

+            ?>

 		</div>

 	</div>

 	<input type="submit" name="save" style="display:none">

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }

 

 switch($modx->getManagerApi()->action) {

-	case 88:

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

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

-		}

-		break;

-	case 87:

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

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

-		}

-		break;

-	default:

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

+	    case 88:

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

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

+		    }

+		    break;

+	    case 87:

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

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

+		    }

+		    break;

+	    default:

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

 }

 

 $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +32 added lines, -32 removed lines

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

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

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

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

 }

 

-switch($modx->getManagerApi()->action) {

+switch ($modx->getManagerApi()->action) {

 	case 88:

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

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

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

 		}

 		break;

 	case 87:

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

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

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

 		}

 		break;

@@ -18,34 +18,34 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

-$user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

+$user = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;

 

 

 // check to see the snippet editor isn't locked

-$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

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

+$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");

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

 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

 }

 // end check for lock

 

-if($modx->getManagerApi()->action == '88') {

+if ($modx->getManagerApi()->action == '88') {

 	// get user attributes

 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");

 	$userdata = $modx->getDatabase()->getRow($rs);

-	if(!$userdata) {

+	if (!$userdata) {

 		$modx->webAlertAndQuit("No user returned!");

 	}

 

 	// get user settings

 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$user}'");

 	$usersettings = array();

-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

+	while ($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

 	extract($usersettings, EXTR_OVERWRITE);

 

 	// get user name

 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_users'), "id = '{$user}'");

 	$usernamedata = $modx->getDatabase()->getRow($rs);

-	if(!$usernamedata) {

+	if (!$usernamedata) {

 		$modx->webAlertAndQuit("No user returned while getting username!");

 	}

 	$_SESSION['itemname'] = $usernamedata['username'];

@@ -57,14 +57,14 @@ 
 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

-foreach($userdata as $key => $val) {

+foreach ($userdata as $key => $val) {

 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

-if($modx->getManagerApi()->hasFormValues()) {

+if ($modx->getManagerApi()->hasFormValues()) {

 	$modx->getManagerApi()->loadFormValues();

 	// restore post values

 	$userdata = array_merge($userdata, $_POST);

@@ -78,8 +78,8 @@ 
 

 // include the country list language file

 $_country_lang = array();

-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

-	include_once "lang/country/" . $manager_language . "_country.inc.php";

+if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {

+	include_once "lang/country/".$manager_language."_country.inc.php";

 } else {

 	include_once "lang/country/english_country.inc.php";

 }

@@ -191,7 +191,7 @@ 
 	<?php

 	// invoke OnWUsrFormPrerender event

 	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

@@ -200,7 +200,7 @@ 
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />

 

 	<h1>

-        <i class="fa fa fa-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['web_user_title']) ?>

+        <i class="fa fa fa-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['web_user_title']) ?>

     </h1>

 

 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>

@@ -218,13 +218,13 @@ 
 				<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">

 					<tr>

 						<td colspan="3"><span id="blocked" class="warning">

-							<?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>

+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>

 								<b><?php echo $_lang['user_is_blocked']; ?></b>

 							<?php } ?>

 							</span>

 							<br /></td>

 					</tr>

-					<?php if(!empty($userdata['id'])) { ?>

+					<?php if (!empty($userdata['id'])) { ?>

 						<tr id="showname" style="display: <?php echo ($modx->getManagerApi()->action == '88' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">

 							<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i>&nbsp;<b><?php echo $modx->getPhpCompat()->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span>

 								<input type="hidden" name="oldusername" value="<?php echo $modx->getPhpCompat()->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />

@@ -237,7 +237,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->getPhpCompat()->htmlspecialchars(isset($_POST['newusername']) ? $_POST['newusername'] : $usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>

 					</tr>

 					<tr>

-						<th><?php echo $modx->getManagerApi()->action == '87' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>

+						<th><?php echo $modx->getManagerApi()->action == '87' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>

 						<td>&nbsp;</td>

 						<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->getManagerApi()->action == "87" ? " checked disabled" : ""; ?>>

 							<input type="hidden" name="newpassword" value="<?php echo $modx->getManagerApi()->action == "87" ? 1 : 0; ?>" onChange="documentDirty=true;" />

@@ -324,8 +324,8 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>

 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

-								foreach($_country_lang as $key => $country) {

-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

+								foreach ($_country_lang as $key => $country) {

+									echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";

 								}

 								?>

 							</select></td>

@@ -351,7 +351,7 @@ 
 						<td>&nbsp;</td>

 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->getPhpCompat()->htmlspecialchars(isset($_POST['comment']) ? $_POST['comment'] : $userdata['comment']); ?></textarea></td>

 					</tr>

-					<?php if($modx->getManagerApi()->action == '88') { ?>

+					<?php if ($modx->getManagerApi()->action == '88') { ?>

 						<tr>

 							<th><?php echo $_lang['user_logincount']; ?>:</th>

 							<td>&nbsp;</td>

@@ -472,7 +472,7 @@ 
 					function BrowseServer() {

 						var w = screen.width * 0.7;

 						var h = screen.height * 0.7;

-						OpenServerBrowser("<?php echo MODX_MANAGER_URL;?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);

+						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);

 					}

 

 					function SetUrl(url, width, height, alt) {

@@ -491,22 +491,22 @@ 
 						<td class='comment'><?php echo $_lang["user_photo_message"] ?></td>

 					</tr>

 					<tr>

-						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "") . $_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "") . $userdata['photo'] : $_style["tx"]; ?>" /></td>

+						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "").$_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "").$userdata['photo'] : $_style["tx"]; ?>" /></td>

 					</tr>

 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

+			if ($use_udperms == 1) {

 

 			$groupsarray = array();

 

-			if($modx->getManagerApi()->action == '88') { // only do this bit if the user is being edited

+			if ($modx->getManagerApi()->action == '88') { // only do this bit if the user is being edited

 				$rs = $modx->getDatabase()->select('webgroup', $modx->getFullTableName('web_groups'), "webuser='{$user}'");

 				$groupsarray = $modx->getDatabase()->getColumn('webgroup', $rs);

 			}

 			// retain selected user groups between post

-			if(is_array($_POST['user_groups'])) {

-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

+			if (is_array($_POST['user_groups'])) {

+				foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

 			}

 			?>

 			<div class="tab-page" id="tabPermissions">

@@ -515,8 +515,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

 				$rs = $modx->getDatabase()->select('name, id', $modx->getFullTableName('webgroup_names'), '', 'name');

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

-					echo '<label><input type="checkbox" name="user_groups[]" value="' . $row['id'] . '"' . (in_array($row['id'], $groupsarray) ? ' checked="checked"' : '') . ' />' . $row['name'] . '</label><br />';

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

+					echo '<label><input type="checkbox" name="user_groups[]" value="'.$row['id'].'"'.(in_array($row['id'], $groupsarray) ? ' checked="checked"' : '').' />'.$row['name'].'</label><br />';

 				}

 				}

 				?>

@@ -526,7 +526,7 @@ 
 			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

+			if (is_array($evtOut)) {

 				echo implode("", $evtOut);

 			}

 			?>

Braces +27 added lines, -22 removed lines

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

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

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

 }

 

-switch($modx->getManagerApi()->action) {

+switch($modx->getManagerApi()->action) {
 	case 88:

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

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

 		}

 		break;

 	case 87:

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

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

 		}

 		break;

@@ -23,33 +23,35 @@ 
 

 // check to see the snippet editor isn't locked

 $rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

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

+if($username = $modx->getDatabase()->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

 }

 // end check for lock

 

-if($modx->getManagerApi()->action == '88') {

+if($modx->getManagerApi()->action == '88') {
 	// get user attributes

 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");

 	$userdata = $modx->getDatabase()->getRow($rs);

-	if(!$userdata) {

+	if(!$userdata) {
 		$modx->webAlertAndQuit("No user returned!");

 	}

 

 	// get user settings

 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$user}'");

 	$usersettings = array();

-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

+	while($row = $modx->getDatabase()->getRow($rs)) {
+	    $usersettings[$row['setting_name']] = $row['setting_value'];
+	}
 	extract($usersettings, EXTR_OVERWRITE);

 

 	// get user name

 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('web_users'), "id = '{$user}'");

 	$usernamedata = $modx->getDatabase()->getRow($rs);

-	if(!$usernamedata) {

+	if(!$usernamedata) {
 		$modx->webAlertAndQuit("No user returned while getting username!");

 	}

 	$_SESSION['itemname'] = $usernamedata['username'];

-} else {

+} else {
 	$userdata = array();

 	$usersettings = array();

 	$usernamedata = array();

@@ -57,14 +59,14 @@ 
 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

-foreach($userdata as $key => $val) {

+foreach($userdata as $key => $val) {
 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

-if($modx->getManagerApi()->hasFormValues()) {

+if($modx->getManagerApi()->hasFormValues()) {
 	$modx->getManagerApi()->loadFormValues();

 	// restore post values

 	$userdata = array_merge($userdata, $_POST);

@@ -78,9 +80,9 @@ 
 

 // include the country list language file

 $_country_lang = array();

-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

+if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
 	include_once "lang/country/" . $manager_language . "_country.inc.php";

-} else {

+} else {
 	include_once "lang/country/english_country.inc.php";

 }

 asort($_country_lang);

@@ -191,7 +193,7 @@ 
 	<?php

 	// invoke OnWUsrFormPrerender event

 	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

-	if(is_array($evtOut)) {

+	if(is_array($evtOut)) {
 		echo implode("", $evtOut);

 	}

 	?>

@@ -324,7 +326,7 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>

 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

-								foreach($_country_lang as $key => $country) {

+								foreach($_country_lang as $key => $country) {
 									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

 								}

 								?>

@@ -496,17 +498,20 @@ 
 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

+			if($use_udperms == 1) {
 

 			$groupsarray = array();

 

-			if($modx->getManagerApi()->action == '88') { // only do this bit if the user is being edited

+			if($modx->getManagerApi()->action == '88') {
+// only do this bit if the user is being edited

 				$rs = $modx->getDatabase()->select('webgroup', $modx->getFullTableName('web_groups'), "webuser='{$user}'");

 				$groupsarray = $modx->getDatabase()->getColumn('webgroup', $rs);

 			}

 			// retain selected user groups between post

-			if(is_array($_POST['user_groups'])) {

-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

+			if(is_array($_POST['user_groups'])) {
+				foreach($_POST['user_groups'] as $n => $v) {
+				    $groupsarray[] = $v;
+				}
 			}

 			?>

 			<div class="tab-page" id="tabPermissions">

@@ -515,7 +520,7 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

 				$rs = $modx->getDatabase()->select('name, id', $modx->getFullTableName('webgroup_names'), '', 'name');

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

+				while($row = $modx->getDatabase()->getRow($rs)) {
 					echo '<label><input type="checkbox" name="user_groups[]" value="' . $row['id'] . '"' . (in_array($row['id'], $groupsarray) ? ' checked="checked"' : '') . ' />' . $row['name'] . '</label><br />';

 				}

 				}

@@ -526,7 +531,7 @@ 
 			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

+			if(is_array($evtOut)) {
 				echo implode("", $evtOut);

 			}

 			?>

manager/actions/user_management.static.php

Indentation +54 added lines, -54 removed lines

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

Spacing +17 added lines, -17 removed lines

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