evolution-cms / evolution

manager/actions/mutate_content.dynamic.php

Indentation +411 added lines, -411 removed lines

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

Spacing +145 added lines, -145 removed lines

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

Braces +12 added lines, -5 removed lines

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

manager/actions/help/01About_EVO.php

Indentation +22 added lines, -22 removed lines

@@ -4,18 +4,18 @@ 
 }
 $logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
 $downloadLinks = array(
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
-	3=>array('title'=>$_lang["extras"],'link'=>array(
-		'http://extras.evolution-cms.com/',
-		'https://github.com/extras-evolution'
-	)),
+    0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
+    1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
+    2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+    3=>array('title'=>$_lang["extras"],'link'=>array(
+        'http://extras.evolution-cms.com/',
+        'https://github.com/extras-evolution'
+    )),
 );
 
 $translationLinks = array(
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+    0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+    1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
 );
 
 /**
@@ -24,23 +24,23 @@ 
  * @return string
  */
 function createList($sectionHeader, $linkArr) {
-	$output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
-	$output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
-	$links = '';
-	foreach($linkArr as $row) {
-		if (!is_array($row['link'])) $row['link'] = array($row['link']);
-		foreach ($row['link'] as $link) {
-			$links .= $links != '' ? '<br/>' : '';
-			$links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
-		}
-		$output .= '
+    $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
+    $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
+    $links = '';
+    foreach($linkArr as $row) {
+        if (!is_array($row['link'])) $row['link'] = array($row['link']);
+        foreach ($row['link'] as $link) {
+            $links .= $links != '' ? '<br/>' : '';
+            $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+        }
+        $output .= '
 		<tr>
 			<td align="left"><strong>' . $row["title"] . '</strong></td>
 			<td align="left">' . $links . '</td>
 		</tr>';
-		$links = '';
-	}
-	$output .= '</table></div>'."\n";
+        $links = '';
+    }
+    $output .= '</table></div>'."\n";
     return $output;
 }
 echo $logo;

Spacing +13 added lines, -13 removed lines

@@ -1,21 +1,21 @@ 
 <?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.");
 }
-$logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
+$logo = '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
 $downloadLinks = array(
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
-	3=>array('title'=>$_lang["extras"],'link'=>array(
+	0=>array('title'=>$_lang["information"], 'link'=>'https://evo.im/'),
+	1=>array('title'=>$_lang["download"], 'link'=>'https://github.com/evolution-cms/evolution/releases'),
+	2=>array('title'=>$_lang["previous_releases"], 'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+	3=>array('title'=>$_lang["extras"], 'link'=>array(
 		'http://extras.evolution-cms.com/',
 		'https://github.com/extras-evolution'
 	)),
 );
 
 $translationLinks = array(
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+	0=>array('title'=>'Evolution CMS', 'link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+	1=>array('title'=>$_lang["extras"], 'link'=>'https://www.transifex.com/evolutioncms/extras/'),
 );
 
 /**
@@ -23,20 +23,20 @@ 
  * @param array $linkArr
  * @return string
  */
-function createList($sectionHeader, $linkArr) {
+function createList($sectionHeader, $linkArr){
 	$output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
 	$output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
 	$links = '';
-	foreach($linkArr as $row) {
+	foreach ($linkArr as $row) {
 		if (!is_array($row['link'])) $row['link'] = array($row['link']);
 		foreach ($row['link'] as $link) {
 			$links .= $links != '' ? '<br/>' : '';
-			$links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+			$links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
 		}
 		$output .= '
 		<tr>
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
-			<td align="left">' . $links . '</td>
+			<td align="left"><strong>' . $row["title"].'</strong></td>
+			<td align="left">' . $links.'</td>
 		</tr>';
 		$links = '';
 	}

Braces +5 added lines, -2 removed lines

@@ -23,12 +23,15 @@
  * @param array $linkArr
  * @return string
  */
-function createList($sectionHeader, $linkArr) {
+function createList($sectionHeader, $linkArr)
+{
 	$output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
 	$output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
 	$links = '';
 	foreach($linkArr as $row) {
-		if (!is_array($row['link'])) $row['link'] = array($row['link']);
+		if (!is_array($row['link'])) {
+		    $row['link'] = array($row['link']);
+		}
 		foreach ($row['link'] as $link) {
 			$links .= $links != '' ? '<br/>' : '';
 			$links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';

manager/actions/category_mgr/inc/Module_Categories_Manager.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
     die('Please use the MODx Backend.');
 }
 
-require_once realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'Categories.php';
+require_once realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'Categories.php';
 
 class Module_Categories_Manager extends Categories
 {
@@ -94,8 +94,8 @@ 
     {
         global $_lang, $_style;
 
-        $filename = trim($view_name) . '.tpl.phtml';
-        $file = self::get('views_dir') . $filename;
+        $filename = trim($view_name).'.tpl.phtml';
+        $file = self::get('views_dir').$filename;
         $view = &$this;
 
         if (is_file($file)
@@ -120,14 +120,14 @@ 
     {
 
         $_update = array(
-            'id'       => (int)$element_id,
-            'category' => (int)$category_id
+            'id'       => (int) $element_id,
+            'category' => (int) $category_id
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl[$element],
-            "`id` = '" . (int)$element_id . "'"
+            "`id` = '".(int) $element_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;

manager/actions/category_mgr/inc/Categories.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
         $this->db_tbl['categories'] = $modx->getFullTableName('categories');
 
         foreach ($this->elements as $element) {
-            $this->db_tbl[$element] = $modx->getFullTableName('site_' . $element);
+            $this->db_tbl[$element] = $modx->getFullTableName('site_'.$element);
         }
     }
 
@@ -54,7 +54,7 @@ 
             $this->db->select(
                 '*',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -71,9 +71,9 @@ 
     {
         $_value = $this->db->getValue(
             $this->db->select(
-                '`' . $value . '`',
+                '`'.$value.'`',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -92,7 +92,7 @@ 
                 $this->db->select(
                     '*',
                     $this->db_tbl[$element],
-                    "`category` = '" . (int)$category_id . "'"
+                    "`category` = '".(int) $category_id."'"
                 )
             );
 
@@ -135,13 +135,13 @@ 
             $this->db->update(
                 $_update,
                 $this->db_tbl[$element],
-                "`category` = '" . (int)$category_id . "'"
+                "`category` = '".(int) $category_id."'"
             );
         }
 
         $this->db->delete(
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;
@@ -160,13 +160,13 @@ 
 
         $_update = array(
             'category' => $this->db->escape($data['category']),
-            'rank'     => (int)$data['rank']
+            'rank'     => (int) $data['rank']
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         if ($this->db->getAffectedRows() === 1) {
@@ -189,7 +189,7 @@ 
 
         $_insert = array(
             'category' => $this->db->escape($category_name),
-            'rank'     => (int)$category_rank
+            'rank'     => (int) $category_rank
         );
 
         $this->db->insert(
@@ -216,7 +216,7 @@ 
             $this->db->select(
                 '`id`',
                 $this->db_tbl['categories'],
-                "`category` = '" . $category . "'"
+                "`category` = '".$category."'"
             )
         );
 

manager/includes/secure_mgr_documents.inc.php

Spacing +5 added lines, -5 removed lines

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

manager/includes/user_settings.inc.php

Spacing +1 added lines, -1 removed lines

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

manager/includes/secure_web_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
     $rs = $modx->db->select(
         'DISTINCT sc.id',
-        $modx->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0"
+        $modx->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
     );
     $ids = $modx->db->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/messageCount.inc.php

Spacing +3 added lines, -3 removed lines

@@ -4,15 +4,15 @@
 }
 
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'),
-    "recipient=" . $modx->getLoginUserID() . " AND messageread=0");
+    "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->db->getValue($rs);
-$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID());
+$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID());
 $nrtotalmessages = $modx->db->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 
 // ajax response
 if (isset($_POST['updateMsgCount'])) {
     header("Content-Type: application/json; charset=utf-8");
-    print $nrnewmessages . ',' . $nrtotalmessages;
+    print $nrnewmessages.','.$nrtotalmessages;
     exit;
 }

manager/includes/template.parser.class.inc.php

Indentation +142 added lines, -142 removed lines

@@ -10,178 +10,178 @@
 Class TemplateParser {

 

     /**

-	 * @param array $config [action, tabs, toArray]

-	 * @param array $data

-	 * @return string

-	 */

-	public function output($config = array(), $data = array()) {

-		global $modx;

-

-		$output = '';

-		$action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

-		$tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

-

-		if($action) {

-			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

+     * @param array $config [action, tabs, toArray]

+     * @param array $data

+     * @return string

+     */

+    public function output($config = array(), $data = array()) {

+        global $modx;

+

+        $output = '';

+        $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

+        $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

+

+        if($action) {

+            $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

 			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

 			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

 			WHERE t1.action IN(' . $action . ') ' . $tab . '

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

-				$tabs = array();

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

-					if(!$row['value'] && !empty($data[$row['name']])) {

-						$row['value'] = $data[$row['name']];

-					}

-					$tabs[$row['tab']]['category_name'] = $row['category_name'];

-					$tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

-				}

-

-				if(!empty($config['toArray'])) {

-					$output = $tabs;

-				} else {

-					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

-					$output .= '

+            if($modx->db->getRecordCount($sql)) {

+                $tabs = array();

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

+                    if(!$row['value'] && !empty($data[$row['name']])) {

+                        $row['value'] = $data[$row['name']];

+                    }

+                    $tabs[$row['tab']]['category_name'] = $row['category_name'];

+                    $tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

+                }

+

+                if(!empty($config['toArray'])) {

+                    $output = $tabs;

+                } else {

+                    $output .= '<div class="tab-pane" id="pane_' . $action . '">';

+                    $output .= '

 					<script type="text/javascript">

 						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

-						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

-						$output .= '

+                    foreach($tabs as $idTab => $tab) {

+                        $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

+                        $output .= '

 						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

 						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

-						unset($tab['category_name']);

-						foreach($tab as $item) {

-							$output .= $item;

-						}

-						$output .= '</div>';

-					}

-					$output .= '</div>';

-				}

-			}

-		}

-

-		return $output;

-	}

+                        unset($tab['category_name']);

+                        foreach($tab as $item) {

+                            $output .= $item;

+                        }

+                        $output .= '</div>';

+                    }

+                    $output .= '</div>';

+                }

+            }

+        }

+

+        return $output;

+    }

 

     /**

      * @param array $data

      * @return string

      */

-	private function render($data) {

-		global $modx, $_lang, $_country_lang;

+    private function render($data) {

+        global $modx, $_lang, $_country_lang;

 

-		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

-		$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

-		$data['readonly'] = ($data['readonly'] ? ' readonly' : '');

+        $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

+        $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

+        $data['readonly'] = ($data['readonly'] ? ' readonly' : '');

 

-		$output = '';

-		$output .= '<div class="form-group row">';

+        $output = '';

+        $output .= '<div class="form-group row">';

 

-		switch($data['type']) {

+        switch($data['type']) {

 

-			case 'text':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'text':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'textarea':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'textarea':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<textarea name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;"[+readonly+]>[+value+]</textarea>';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'date':

-				$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'date':

+                $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control DatePicker" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'select':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-				if($data['name'] == 'country' && isset($_country_lang)) {

-					$chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

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

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

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

-					}

-				} else {

-					if($data['elements']) {

-						$elements = explode('||', $data['elements']);

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

-							$value = explode('==', $value);

-							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

-						}

-					}

-				}

-				$output .= '</select>';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'checkbox':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

-					$elements = explode('||', $data['elements']);

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

-						$value = explode('==', $value);

-						$output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

-					}

-				}

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'radio':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

-					$elements = explode('||', $data['elements']);

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

-						$value = explode('==', $value);

-						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

-					}

-				}

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'custom':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-		}

-

-		$output .= '</div>';

-

-		$output = $modx->parseText($output, $data);

-

-		return $output;

-	}

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'select':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

+                if($data['name'] == 'country' && isset($_country_lang)) {

+                    $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

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

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

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

+                    }

+                } else {

+                    if($data['elements']) {

+                        $elements = explode('||', $data['elements']);

+                        foreach($elements as $key => $value) {

+                            $value = explode('==', $value);

+                            $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

+                        }

+                    }

+                }

+                $output .= '</select>';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'checkbox':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

+                if($data['elements']) {

+                    $elements = explode('||', $data['elements']);

+                    foreach($elements as $key => $value) {

+                        $value = explode('==', $value);

+                        $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+                    }

+                }

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'radio':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

+                if($data['elements']) {

+                    $elements = explode('||', $data['elements']);

+                    foreach($elements as $key => $value) {

+                        $value = explode('==', $value);

+                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+                    }

+                }

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'custom':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+        }

+

+        $output .= '</div>';

+

+        $output = $modx->parseText($output, $data);

+

+        return $output;

+    }

 

 }

 

Spacing +33 added lines, -33 removed lines

@@ -7,53 +7,53 @@ 
  *

  */

 

-Class TemplateParser {

+Class TemplateParser{

 

     /**

 	 * @param array $config [action, tabs, toArray]

 	 * @param array $data

 	 * @return string

 	 */

-	public function output($config = array(), $data = array()) {

+	public function output($config = array(), $data = array()){

 		global $modx;

 

 		$output = '';

 		$action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

-		$tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

+		$tab = isset($config['tab']) ? ' AND tab IN('.$config['tab'].')' : '';

 

-		if($action) {

+		if ($action) {

 			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

-			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

-			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

-			WHERE t1.action IN(' . $action . ') ' . $tab . '

+			FROM ' . $modx->getFullTableName('system_templates').' AS t1

+			INNER JOIN ' . $modx->getFullTableName('categories').' AS t2 ON t2.id=t1.category

+			WHERE t1.action IN(' . $action.') '.$tab.'

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

+			if ($modx->db->getRecordCount($sql)) {

 				$tabs = array();

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

-					if(!$row['value'] && !empty($data[$row['name']])) {

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

+					if (!$row['value'] && !empty($data[$row['name']])) {

 						$row['value'] = $data[$row['name']];

 					}

 					$tabs[$row['tab']]['category_name'] = $row['category_name'];

 					$tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

 				}

 

-				if(!empty($config['toArray'])) {

+				if (!empty($config['toArray'])) {

 					$output = $tabs;

 				} else {

-					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

+					$output .= '<div class="tab-pane" id="pane_'.$action.'">';

 					$output .= '

 					<script type="text/javascript">

-						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

+						var pane_' . $action.' = new WebFXTabPane(document.getElementById("pane_'.$action.'"), '.($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

-						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

+					foreach ($tabs as $idTab => $tab) {

+						$output .= '<div class="tab-page" id="tab_'.$action.'_'.$idTab.'">';

 						$output .= '

-						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

-						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

+						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']).'</h2>

+						<script type="text/javascript">pane_' . $action.'.addTabPage(document.getElementById("tab_'.$action.'_'.$idTab.'"));</script>';

 						unset($tab['category_name']);

-						foreach($tab as $item) {

+						foreach ($tab as $item) {

 							$output .= $item;

 						}

 						$output .= '</div>';

@@ -70,7 +70,7 @@ 
      * @param array $data

      * @return string

      */

-	private function render($data) {

+	private function render($data){

 		global $modx, $_lang, $_country_lang;

 

 		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

@@ -80,7 +80,7 @@ 
 		$output = '';

 		$output .= '<div class="form-group row">';

 

-		switch($data['type']) {

+		switch ($data['type']) {

 

 			case 'text':

 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

@@ -114,18 +114,18 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-				if($data['name'] == 'country' && isset($_country_lang)) {

+				if ($data['name'] == 'country' && isset($_country_lang)) {

 					$chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

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

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

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

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

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

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

 					}

 				} else {

-					if($data['elements']) {

+					if ($data['elements']) {

 						$elements = explode('||', $data['elements']);

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

+						foreach ($elements as $key => $value) {

 							$value = explode('==', $value);

-							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

+							$output .= '<option value="'.$value[1].'">'.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]).'</option>';

 						}

 					}

 				}

@@ -139,11 +139,11 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

+				if ($data['elements']) {

 					$elements = explode('||', $data['elements']);

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

+					foreach ($elements as $key => $value) {

 						$value = explode('==', $value);

-						$output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+						$output .= '<br /><input type="checkbox" name="'.$value[0].'" class="form-control" id="'.$value[0].'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

 					}

 				}

 				$output .= $data['content'];

@@ -155,11 +155,11 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

+				if ($data['elements']) {

 					$elements = explode('||', $data['elements']);

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

+					foreach ($elements as $key => $value) {

 						$value = explode('==', $value);

-						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_'.$key.'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

 					}

 				}

 				$output .= $data['content'];

Braces +24 added lines, -21 removed lines

@@ -7,53 +7,55 @@ 
  *

  */

 

-Class TemplateParser {

+Class TemplateParser
+{
 

     /**

 	 * @param array $config [action, tabs, toArray]

 	 * @param array $data

 	 * @return string

 	 */

-	public function output($config = array(), $data = array()) {

+	public function output($config = array(), $data = array())
+	{
 		global $modx;

 

 		$output = '';

 		$action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

 		$tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

 

-		if($action) {

+		if($action) {
 			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

 			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

 			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

 			WHERE t1.action IN(' . $action . ') ' . $tab . '

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

+			if($modx->db->getRecordCount($sql)) {
 				$tabs = array();

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

-					if(!$row['value'] && !empty($data[$row['name']])) {

+				while($row = $modx->db->getRow($sql)) {
+					if(!$row['value'] && !empty($data[$row['name']])) {
 						$row['value'] = $data[$row['name']];

 					}

 					$tabs[$row['tab']]['category_name'] = $row['category_name'];

 					$tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

 				}

 

-				if(!empty($config['toArray'])) {

+				if(!empty($config['toArray'])) {
 					$output = $tabs;

-				} else {

+				} else {
 					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

 					$output .= '

 					<script type="text/javascript">

 						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

+					foreach($tabs as $idTab => $tab) {
 						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

 						$output .= '

 						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

 						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

 						unset($tab['category_name']);

-						foreach($tab as $item) {

+						foreach($tab as $item) {
 							$output .= $item;

 						}

 						$output .= '</div>';

@@ -70,7 +72,8 @@ 
      * @param array $data

      * @return string

      */

-	private function render($data) {

+	private function render($data)
+	{
 		global $modx, $_lang, $_country_lang;

 

 		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

@@ -80,7 +83,7 @@ 
 		$output = '';

 		$output .= '<div class="form-group row">';

 

-		switch($data['type']) {

+		switch($data['type']) {
 

 			case 'text':

 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

@@ -114,16 +117,16 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-				if($data['name'] == 'country' && isset($_country_lang)) {

+				if($data['name'] == 'country' && isset($_country_lang)) {
 					$chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

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

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

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

 					}

-				} else {

-					if($data['elements']) {

+				} else {
+					if($data['elements']) {
 						$elements = explode('||', $data['elements']);

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

+						foreach($elements as $key => $value) {
 							$value = explode('==', $value);

 							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

 						}

@@ -139,9 +142,9 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

+				if($data['elements']) {
 					$elements = explode('||', $data['elements']);

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

+					foreach($elements as $key => $value) {
 						$value = explode('==', $value);

 						$output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

 					}

@@ -155,9 +158,9 @@ 
 				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

 				$output .= '<div class="col-sm-7">';

 				$output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

+				if($data['elements']) {
 					$elements = explode('||', $data['elements']);

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

+					foreach($elements as $key => $value) {
 						$value = explode('==', $value);

 						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

 					}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  *

  */

 

-Class TemplateParser {

+class TemplateParser {

 

     /**

 	 * @param array $config [action, tabs, toArray]