evolution-cms / evolution

manager/actions/mutate_content.dynamic.php

Indentation +415 added lines, -415 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,62 +1517,62 @@ 
 	</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);
+            }
+        }
+    }
 }
 
 function getDefaultTemplate() {
-	global $modx;
-
-	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'];
-	}
-	if(!isset($default_template)) {
-		$default_template = $modx->config['default_template'];
-	} // default_template is already set
-
-	return $default_template;
+    global $modx;
+
+    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'];
+    }
+    if(!isset($default_template)) {
+        $default_template = $modx->config['default_template'];
+    } // default_template is already set
+
+    return $default_template;
 }

manager/actions/mutate_user.dynamic.php

Indentation +158 added lines, -158 removed lines

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

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

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

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

 }

 

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

-	case 12:

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

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

-		}

-		break;

-	case 11:

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

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

-		}

-		break;

-	default:

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

+    case 12:

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

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

+        }

+        break;

+    case 11:

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

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

+        }

+        break;

+    default:

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

 }

 

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

@@ -23,75 +23,75 @@ 
 // check to see the snippet editor isn't locked

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

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

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

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

 }

 // end check for lock

 

 if($modx->manager->action == '12') {

-	// get user attribute

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

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

-	if(!$userdata) {

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

-	}

-

-

-	// get user settings

-	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");

-	$usersettings = array();

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

-	// manually extract so that user display settings are not overwritten

-	foreach($usersettings as $k => $v) {

-		if($k != 'manager_language' && $k != 'manager_theme') {

-			${$k} = $v;

-		}

-	}

-

-	// get user name

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

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

-	if(!$usernamedata) {

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

-	}

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

+    // get user attribute

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

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

+    if(!$userdata) {

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

+    }

+

+

+    // get user settings

+    $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");

+    $usersettings = array();

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

+    // manually extract so that user display settings are not overwritten

+    foreach($usersettings as $k => $v) {

+        if($k != 'manager_language' && $k != 'manager_theme') {

+            ${$k} = $v;

+        }

+    }

+

+    // get user name

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

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

+    if(!$usernamedata) {

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

+    }

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

 } else {

-	$userdata = array();

-	$usersettings = array();

-	$usernamedata = array();

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

+    $userdata = array();

+    $usersettings = array();

+    $usernamedata = array();

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

 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

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

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

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

 };

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

 

 // restore saved form

 $formRestored = false;

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

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

-	// restore post values

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

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

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

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

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

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

-	extract($usersettings, EXTR_OVERWRITE);

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

+    // restore post values

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

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

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

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

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

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

+    extract($usersettings, EXTR_OVERWRITE);

 }

 

 // include the country list language file

 $_country_lang = array();

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

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

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

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

 }

 asort($_country_lang);

 

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

 if($which_browser == 'default') {

-	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];

+    $which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];

 }

 ?>

 <script type="text/javascript">

@@ -201,14 +201,14 @@ 
 <form action="index.php?a=32" method="post" name="userform">

 	<?php

 

-	// invoke OnUserFormPrerender event

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

-		"id" => $user

-	));

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnUserFormPrerender event

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

+        "id" => $user

+    ));

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 	<input type="hidden" name="mode" value="<?php echo $modx->manager->action; ?>">

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

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

@@ -301,21 +301,21 @@ 
 						<td>&nbsp;</td>

 						<td><?php

 

-							$rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');

-							?>

+                            $rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');

+                            ?>

 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">

 								<?php

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

-									if($modx->manager->action == '11') {

-										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';

-									} else {

-										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';

-									}

-									?>

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

+                                    if($modx->manager->action == '11') {

+                                        $selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';

+                                    } else {

+                                        $selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';

+                                    }

+                                    ?>

 									<option value="<?php echo $row['id']; ?>"<?php echo $selectedtext; ?>><?php echo $row['name']; ?></option>

 									<?php

-								}

-								?>

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

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

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

 								<?php

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

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

-								}

-								?>

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

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

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -439,21 +439,21 @@ 
 						<td><select name="manager_language" class="inputBox" onChange="documentDirty=true">

 								<option value=""></option>

 								<?php

-								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';

-								$dir = dir("includes/lang");

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

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

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

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

-										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";

-										?>

+                                $activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';

+                                $dir = dir("includes/lang");

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

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

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

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

+                                        $selectedtext = $languagename == $activelang ? "selected='selected'" : "";

+                                        ?>

 										<option value="<?php echo $languagename; ?>" <?php echo $selectedtext; ?>><?php echo ucwords(str_replace("_", " ", $languagename)); ?></option>

 										<?php

 

-									}

-								}

-								$dir->close();

-								?>

+                                    }

+                                }

+                                $dir->close();

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -528,22 +528,22 @@ 
 						<td><select name="manager_theme" class="inputBox" onChange="documentDirty=true;document.userform.theme_refresher.value = Date.parse(new Date());">

 								<option value=""></option>

 								<?php

-								$dir = dir("media/style/");

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

-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

-										$themename = $file;

-										if($themename === 'common') {

-											continue;

-										}

-										$attr = 'value="' . $themename . '" ';

-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {

-											$attr .= 'selected="selected" ';

-										}

-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";

-									}

-								}

-								$dir->close();

-								?>

+                                $dir = dir("media/style/");

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

+                                    if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

+                                        $themename = $file;

+                                        if($themename === 'common') {

+                                            continue;

+                                        }

+                                        $attr = 'value="' . $themename . '" ';

+                                        if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {

+                                            $attr .= 'selected="selected" ';

+                                        }

+                                        echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";

+                                    }

+                                }

+                                $dir->close();

+                                ?>

 							</select>

 							<input type="hidden" name="theme_refresher" value=""></td>

 					</tr>

@@ -555,15 +555,15 @@ 
 						<th><?php echo $_lang["which_browser_title"] ?></th>

 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">

 								<?php

-								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';

-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";

-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

-									$dir = str_replace('\\', '/', $dir);

-									$browser_name = substr($dir, strrpos($dir, '/') + 1);

-									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';

-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

-								}

-								?>

+                                $selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';

+                                echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";

+                                foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

+                                    $dir = str_replace('\\', '/', $dir);

+                                    $browser_name = substr($dir, strrpos($dir, '/') + 1);

+                                    $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';

+                                    echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -640,17 +640,17 @@ 
 								<option value=""></option>

 								<?php

 

-								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';

-								// invoke OnRichTextEditorRegister event

-								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");

-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";

-								if(is_array($evtOut)) {

-									for($i = 0; $i < count($evtOut); $i++) {

-										$editor = $evtOut[$i];

-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

-									}

-								}

-								?>

+                                $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';

+                                // invoke OnRichTextEditorRegister event

+                                $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");

+                                echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";

+                                if(is_array($evtOut)) {

+                                    for($i = 0; $i < count($evtOut); $i++) {

+                                        $editor = $evtOut[$i];

+                                        echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

+                                    }

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr id='editorRow1' style="display: <?php echo $use_editor == 1 ? $displayStyle : 'none'; ?>">

@@ -683,12 +683,12 @@ 
 					</tr>

 				</table>

 				<?php

-				// invoke OnInterfaceSettingsRender event

-				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");

-				if(is_array($evtOut)) {

-					echo implode("", $evtOut);

-				}

-				?>

+                // invoke OnInterfaceSettingsRender event

+                $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");

+                if(is_array($evtOut)) {

+                    echo implode("", $evtOut);

+                }

+                ?>

 			</div>

 

 			<!-- Photo -->

@@ -737,39 +737,39 @@ 
 			</div>

 			<?php if($use_udperms == 1) {

 

-			$groupsarray = array();

-

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

-				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");

-				$groupsarray = $modx->db->getColumn('user_group', $rs);

-			}

-			// retain selected doc groups between post

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

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

-			}

-			?>

+            $groupsarray = array();

+

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

+                $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");

+                $groupsarray = $modx->db->getColumn('user_group', $rs);

+            }

+            // retain selected doc groups between post

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

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

+            }

+            ?>

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

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

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

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

 				<?php

-				$rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');

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

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

-				}

-				}

-				?>

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

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

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

+                }

+                }

+                ?>

 			</div>

 		</div>

 	</div>

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

 	<?php

-	// invoke OnUserFormRender event

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

-		"id" => $user

-	));

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnUserFormRender event

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

+        "id" => $user

+    ));

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 </form>

manager/actions/mutate_web_user.dynamic.php

Indentation +89 added lines, -89 removed lines

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

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

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

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

 }

 

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

-	case 88:

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

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

-		}

-		break;

-	case 87:

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

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

-		}

-		break;

-	default:

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

+    case 88:

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

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

+        }

+        break;

+    case 87:

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

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

+        }

+        break;

+    default:

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

 }

 

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

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

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

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

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

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

 }

 // end check for lock

 

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

-	// get user attributes

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

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

-	if(!$userdata) {

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

-	}

-

-	// get user settings

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

-	$usersettings = array();

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

-	extract($usersettings, EXTR_OVERWRITE);

-

-	// get user name

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

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

-	if(!$usernamedata) {

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

-	}

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

+    // get user attributes

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

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

+    if(!$userdata) {

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

+    }

+

+    // get user settings

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

+    $usersettings = array();

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

+    extract($usersettings, EXTR_OVERWRITE);

+

+    // get user name

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

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

+    if(!$usernamedata) {

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

+    }

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

 } else {

-	$userdata = array();

-	$usersettings = array();

-	$usernamedata = array();

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

+    $userdata = array();

+    $usersettings = array();

+    $usernamedata = array();

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

 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

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

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

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

 };

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

 

 // restore saved form

 $formRestored = false;

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

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

-	// restore post values

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

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

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

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

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

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

-	extract($usersettings, EXTR_OVERWRITE);

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

+    // restore post values

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

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

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

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

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

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

+    extract($usersettings, EXTR_OVERWRITE);

 }

 

 // include the country list language file

 $_country_lang = array();

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

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

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

 } else {

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

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

 }

 asort($_country_lang);

 

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

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

 	<?php

-	// invoke OnWUsrFormPrerender event

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

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnWUsrFormPrerender event

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

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

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

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

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

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

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

 								<?php

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

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

-								}

-								?>

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

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

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

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

 						</tr>

 						<?php

-					}

-					?>

+                    }

+                    ?>

 				</table>

 			</div>

 

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

 			</div>

 			<?php

-			if($use_udperms == 1) {

-

-			$groupsarray = array();

-

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

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

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

-			}

-			// retain selected user groups between post

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

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

-			}

-			?>

+            if($use_udperms == 1) {

+

+            $groupsarray = array();

+

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

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

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

+            }

+            // retain selected user groups between post

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

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

+            }

+            ?>

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

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

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

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

 				<?php

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

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

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

-				}

-				}

-				?>

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

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

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

+                }

+                }

+                ?>

 			</div>

 			<?php

-			// invoke OnWUsrFormRender event

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

-				"id" => $user

-			));

-			if(is_array($evtOut)) {

-				echo implode("", $evtOut);

-			}

-			?>

+            // invoke OnWUsrFormRender event

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

+                "id" => $user

+            ));

+            if(is_array($evtOut)) {

+                echo implode("", $evtOut);

+            }

+            ?>

 		</div>

 	</div>

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

manager/actions/mutate_role.dynamic.php

Indentation +126 added lines, -126 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 switch((int) $modx->manager->action) {
-	case 35:
-		if(!$modx->hasPermission('edit_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 38:
-		if(!$modx->hasPermission('new_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 35:
+        if(!$modx->hasPermission('edit_role')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 38:
+        if(!$modx->hasPermission('new_role')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -24,7 +24,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(8, $role)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
 }
 // end check for lock
 
@@ -32,15 +32,15 @@ 
 $modx->lockElement(8, $role);
 
 if($modx->manager->action == '35') {
-	$rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
-	$roledata = $modx->db->getRow($rs);
-	if(!$roledata) {
-		$modx->webAlertAndQuit("No role returned!");
-	}
-	$_SESSION['itemname'] = $roledata['name'];
+    $rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
+    $roledata = $modx->db->getRow($rs);
+    if(!$roledata) {
+        $modx->webAlertAndQuit("No role returned!");
+    }
+    $_SESSION['itemname'] = $roledata['name'];
 } else {
-	$roledata = 0;
-	$_SESSION['itemname'] = $_lang["new_role"];
+    $roledata = 0;
+    $_SESSION['itemname'] = $_lang["new_role"];
 }
 
 // Add lock-element JS-Script
@@ -107,63 +107,63 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['page_data_general'] ?></h3>
 								<?php
-								echo render_form('frames', $_lang['role_frames'], 'disabled');
-								echo render_form('home', $_lang['role_home'], 'disabled');
-								echo render_form('messages', $_lang['role_messages']);
-								echo render_form('logout', $_lang['role_logout'], 'disabled');
-								echo render_form('help', $_lang['role_help']);
-								echo render_form('action_ok', $_lang['role_actionok'], 'disabled');
-								echo render_form('error_dialog', $_lang['role_errors'], 'disabled');
-								echo render_form('about', $_lang['role_about'], 'disabled');
-								echo render_form('credits', $_lang['role_credits'], 'disabled');
-								echo render_form('change_password', $_lang['role_change_password']);
-								echo render_form('save_password', $_lang['role_save_password']);
-								?>
+                                echo render_form('frames', $_lang['role_frames'], 'disabled');
+                                echo render_form('home', $_lang['role_home'], 'disabled');
+                                echo render_form('messages', $_lang['role_messages']);
+                                echo render_form('logout', $_lang['role_logout'], 'disabled');
+                                echo render_form('help', $_lang['role_help']);
+                                echo render_form('action_ok', $_lang['role_actionok'], 'disabled');
+                                echo render_form('error_dialog', $_lang['role_errors'], 'disabled');
+                                echo render_form('about', $_lang['role_about'], 'disabled');
+                                echo render_form('credits', $_lang['role_credits'], 'disabled');
+                                echo render_form('change_password', $_lang['role_change_password']);
+                                echo render_form('save_password', $_lang['role_save_password']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_content_management'] ?></h3>
 								<?php
-								echo render_form('view_document', $_lang['role_view_docdata'], 'disabled');
-								echo render_form('new_document', $_lang['role_create_doc']);
-								echo render_form('edit_document', $_lang['role_edit_doc']);
-								echo render_form('change_resourcetype', $_lang['role_change_resourcetype']);
-								echo render_form('save_document', $_lang['role_save_doc']);
-								echo render_form('publish_document', $_lang['role_publish_doc']);
-								echo render_form('delete_document', $_lang['role_delete_doc']);
-								echo render_form('empty_trash', $_lang['role_empty_trash']);
-								echo render_form('empty_cache', $_lang['role_cache_refresh']);
-								echo render_form('view_unpublished', $_lang['role_view_unpublished']);
-								?>
+                                echo render_form('view_document', $_lang['role_view_docdata'], 'disabled');
+                                echo render_form('new_document', $_lang['role_create_doc']);
+                                echo render_form('edit_document', $_lang['role_edit_doc']);
+                                echo render_form('change_resourcetype', $_lang['role_change_resourcetype']);
+                                echo render_form('save_document', $_lang['role_save_doc']);
+                                echo render_form('publish_document', $_lang['role_publish_doc']);
+                                echo render_form('delete_document', $_lang['role_delete_doc']);
+                                echo render_form('empty_trash', $_lang['role_empty_trash']);
+                                echo render_form('empty_cache', $_lang['role_cache_refresh']);
+                                echo render_form('view_unpublished', $_lang['role_view_unpublished']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3 form-group">
 							<div class="form-group">
 								<h3><?= $_lang['role_file_management'] ?></h3>
 								<?php
-								echo render_form('file_manager', $_lang['role_file_manager']);
-								echo render_form('assets_files', $_lang['role_assets_files']);
-								echo render_form('assets_images', $_lang['role_assets_images']);
-								?>
+                                echo render_form('file_manager', $_lang['role_file_manager']);
+                                echo render_form('assets_files', $_lang['role_assets_files']);
+                                echo render_form('assets_images', $_lang['role_assets_images']);
+                                ?>
 							</div>
 							<div class="form-group">
 								<h3><?= $_lang['category_management'] ?></h3>
 								<?php
-								echo render_form('category_manager', $_lang['role_category_manager']);
-								?>
+                                echo render_form('category_manager', $_lang['role_category_manager']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_module_management'] ?></h3>
 								<?php
-								echo render_form('new_module', $_lang['role_new_module']);
-								echo render_form('edit_module', $_lang['role_edit_module']);
-								echo render_form('save_module', $_lang['role_save_module']);
-								echo render_form('delete_module', $_lang['role_delete_module']);
-								echo render_form('exec_module', $_lang['role_run_module']);
-								?>
+                                echo render_form('new_module', $_lang['role_new_module']);
+                                echo render_form('edit_module', $_lang['role_edit_module']);
+                                echo render_form('save_module', $_lang['role_save_module']);
+                                echo render_form('delete_module', $_lang['role_delete_module']);
+                                echo render_form('exec_module', $_lang['role_run_module']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -173,44 +173,44 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_template_management'] ?></h3>
 								<?php
-								echo render_form('new_template', $_lang['role_create_template']);
-								echo render_form('edit_template', $_lang['role_edit_template']);
-								echo render_form('save_template', $_lang['role_save_template']);
-								echo render_form('delete_template', $_lang['role_delete_template']);
-								?>
+                                echo render_form('new_template', $_lang['role_create_template']);
+                                echo render_form('edit_template', $_lang['role_edit_template']);
+                                echo render_form('save_template', $_lang['role_save_template']);
+                                echo render_form('delete_template', $_lang['role_delete_template']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_snippet_management'] ?></h3>
 								<?php
-								echo render_form('new_snippet', $_lang['role_create_snippet']);
-								echo render_form('edit_snippet', $_lang['role_edit_snippet']);
-								echo render_form('save_snippet', $_lang['role_save_snippet']);
-								echo render_form('delete_snippet', $_lang['role_delete_snippet']);
-								?>
+                                echo render_form('new_snippet', $_lang['role_create_snippet']);
+                                echo render_form('edit_snippet', $_lang['role_edit_snippet']);
+                                echo render_form('save_snippet', $_lang['role_save_snippet']);
+                                echo render_form('delete_snippet', $_lang['role_delete_snippet']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_chunk_management'] ?></h3>
 								<?php
-								echo render_form('new_chunk', $_lang['role_create_chunk']);
-								echo render_form('edit_chunk', $_lang['role_edit_chunk']);
-								echo render_form('save_chunk', $_lang['role_save_chunk']);
-								echo render_form('delete_chunk', $_lang['role_delete_chunk']);
-								?>
+                                echo render_form('new_chunk', $_lang['role_create_chunk']);
+                                echo render_form('edit_chunk', $_lang['role_edit_chunk']);
+                                echo render_form('save_chunk', $_lang['role_save_chunk']);
+                                echo render_form('delete_chunk', $_lang['role_delete_chunk']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_plugin_management'] ?></h3>
 								<?php
-								echo render_form('new_plugin', $_lang['role_create_plugin']);
-								echo render_form('edit_plugin', $_lang['role_edit_plugin']);
-								echo render_form('save_plugin', $_lang['role_save_plugin']);
-								echo render_form('delete_plugin', $_lang['role_delete_plugin']);
-								?>
+                                echo render_form('new_plugin', $_lang['role_create_plugin']);
+                                echo render_form('edit_plugin', $_lang['role_edit_plugin']);
+                                echo render_form('save_plugin', $_lang['role_save_plugin']);
+                                echo render_form('delete_plugin', $_lang['role_delete_plugin']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -220,42 +220,42 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_user_management'] ?></h3>
 								<?php
-								echo render_form('new_user', $_lang['role_new_user']);
-								echo render_form('edit_user', $_lang['role_edit_user']);
-								echo render_form('save_user', $_lang['role_save_user']);
-								echo render_form('delete_user', $_lang['role_delete_user']);
-								?>
+                                echo render_form('new_user', $_lang['role_new_user']);
+                                echo render_form('edit_user', $_lang['role_edit_user']);
+                                echo render_form('save_user', $_lang['role_save_user']);
+                                echo render_form('delete_user', $_lang['role_delete_user']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_web_user_management'] ?></h3>
 								<?php
-								echo render_form('new_web_user', $_lang['role_new_web_user']);
-								echo render_form('edit_web_user', $_lang['role_edit_web_user']);
-								echo render_form('save_web_user', $_lang['role_save_web_user']);
-								echo render_form('delete_web_user', $_lang['role_delete_web_user']);
-								?>
+                                echo render_form('new_web_user', $_lang['role_new_web_user']);
+                                echo render_form('edit_web_user', $_lang['role_edit_web_user']);
+                                echo render_form('save_web_user', $_lang['role_save_web_user']);
+                                echo render_form('delete_web_user', $_lang['role_delete_web_user']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_udperms'] ?></h3>
 								<?php
-								echo render_form('access_permissions', $_lang['role_access_persmissions']);
-								echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']);
-								?>
+                                echo render_form('access_permissions', $_lang['role_access_persmissions']);
+                                echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_role_management'] ?></h3>
 								<?php
-								echo render_form('new_role', $_lang['role_new_role']);
-								echo render_form('edit_role', $_lang['role_edit_role']);
-								echo render_form('save_role', $_lang['role_save_role']);
-								echo render_form('delete_role', $_lang['role_delete_role']);
-								?>
+                                echo render_form('new_role', $_lang['role_new_role']);
+                                echo render_form('edit_role', $_lang['role_edit_role']);
+                                echo render_form('save_role', $_lang['role_save_role']);
+                                echo render_form('delete_role', $_lang['role_delete_role']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -265,23 +265,23 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_eventlog_management'] ?></h3>
 								<?php
-								echo render_form('view_eventlog', $_lang['role_view_eventlog']);
-								echo render_form('delete_eventlog', $_lang['role_delete_eventlog']);
-								?>
+                                echo render_form('view_eventlog', $_lang['role_view_eventlog']);
+                                echo render_form('delete_eventlog', $_lang['role_delete_eventlog']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_config_management'] ?></h3>
 								<?php
-								echo render_form('logs', $_lang['role_view_logs']);
-								echo render_form('settings', $_lang['role_edit_settings']);
-								echo render_form('bk_manager', $_lang['role_bk_manager']);
-								echo render_form('import_static', $_lang['role_import_static']);
-								echo render_form('export_static', $_lang['role_export_static']);
-								echo render_form('remove_locks', $_lang['role_remove_locks']);
-								echo render_form('display_locks', $_lang['role_display_locks']);
-								?>
+                                echo render_form('logs', $_lang['role_view_logs']);
+                                echo render_form('settings', $_lang['role_edit_settings']);
+                                echo render_form('bk_manager', $_lang['role_bk_manager']);
+                                echo render_form('import_static', $_lang['role_import_static']);
+                                echo render_form('export_static', $_lang['role_export_static']);
+                                echo render_form('remove_locks', $_lang['role_remove_locks']);
+                                echo render_form('display_locks', $_lang['role_display_locks']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -294,32 +294,32 @@ 
 
 <?php
 function render_form($name, $label, $status = '') {
-	global $modx, $roledata;
+    global $modx, $roledata;
 
-	$tpl = '<label class="d-block" for="[+name+]check">
+    $tpl = '<label class="d-block" for="[+name+]check">
 		<input name="[+name+]check" id="[+name+]check" class="click" type="checkbox" onchange="changestate(document.userform.[+name+])" [+checked+] [+status+]>
 		<input type="hidden" class="[+set+]" name="[+name+]" value="[+value+]">
 		[+label+]
 	</label>';
 
-	$checked = ($roledata[$name] == 1) ? 'checked' : '';
-	$value = ($roledata[$name] == 1) ? 1 : 0;
-	if($status == 'disabled') {
-		$checked = 'checked';
-		$value = 1;
-		$set = 'fix';
-	} else {
-		$set = 'set';
-	}
+    $checked = ($roledata[$name] == 1) ? 'checked' : '';
+    $value = ($roledata[$name] == 1) ? 1 : 0;
+    if($status == 'disabled') {
+        $checked = 'checked';
+        $value = 1;
+        $set = 'fix';
+    } else {
+        $set = 'set';
+    }
 
-	$ph = array(
-		'name' => $name,
-		'checked' => $checked,
-		'status' => $status,
-		'value' => $value,
-		'label' => $label,
-		'set' => $set
-	);
+    $ph = array(
+        'name' => $name,
+        'checked' => $checked,
+        'status' => $status,
+        'value' => $value,
+        'label' => $label,
+        'set' => $set
+    );
 
-	return $modx->parseText($tpl, $ph);
+    return $modx->parseText($tpl, $ph);
 }

manager/actions/mutate_templates.dynamic.php

Indentation +124 added lines, -124 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 switch($modx->manager->action) {
-	case 16:
-		if(!$modx->hasPermission('edit_template')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 19:
-		if(!$modx->hasPermission('new_template')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 16:
+        if(!$modx->hasPermission('edit_template')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 19:
+        if(!$modx->hasPermission('new_template')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -24,7 +24,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(1, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['template']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['template']));
 }
 // end check for lock
 
@@ -33,23 +33,23 @@ 
 
 $content = array();
 if(!empty($id)) {
-	$rs = $modx->db->select('*', $tbl_site_templates, "id='{$id}'");
-	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		$modx->webAlertAndQuit("No database record has been found for this template.");
-	}
-
-	$_SESSION['itemname'] = $content['templatename'];
-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-	}
+    $rs = $modx->db->select('*', $tbl_site_templates, "id='{$id}'");
+    $content = $modx->db->getRow($rs);
+    if(!$content) {
+        $modx->webAlertAndQuit("No database record has been found for this template.");
+    }
+
+    $_SESSION['itemname'] = $content['templatename'];
+    if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    }
 } else {
-	$_SESSION['itemname'] = $_lang["new_template"];
-	$content['category'] = (int)$_REQUEST['catid'];
+    $_SESSION['itemname'] = $_lang["new_template"];
+    $content['category'] = (int)$_REQUEST['catid'];
 }
 
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
+    $modx->manager->loadFormValues();
 }
 
 $content = array_merge($content, $_POST);
@@ -98,12 +98,12 @@ 
 
 <form name="mutate" method="post" action="index.php">
 	<?php
-	// invoke OnTempFormPrerender event
-	$evtOut = $modx->invokeEvent("OnTempFormPrerender", array("id" => $id));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnTempFormPrerender event
+    $evtOut = $modx->invokeEvent("OnTempFormPrerender", array("id" => $id));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="a" value="20">
 	<input type="hidden" name="id" value="<?= $_REQUEST['id'] ?>">
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
@@ -133,8 +133,8 @@ 
 						<label class="col-md-3 col-lg-2">
 							<?= $_lang['template_name'] ?>
 							<?php if($id == $modx->config['default_template']) {
-								echo '<small class="form-text text-danger">' . mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset) . '</small>';
-							} ?>
+                                echo '<small class="form-text text-danger">' . mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset) . '</small>';
+                            } ?>
 						</label>
 						<div class="col-md-9 col-lg-10">
 							<div class="form-control-name clearfix">
@@ -162,11 +162,11 @@ 
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">
 								<option>&nbsp;</option>
 								<?php
-								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
-								foreach(getCategories() as $n => $v) {
-									echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
-								}
-								?>
+                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                foreach(getCategories() as $n => $v) {
+                                    echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
+                                }
+                                ?>
 							</select>
 						</div>
 					</div>
@@ -197,38 +197,38 @@ 
 			<input type="submit" name="save" style="display:none">
 
 			<?php
-			$selectedTvs = array();
-			if(!isset($_POST['assignedTv'])) {
-				$rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category", $_lang['no_category']), sprintf("%s tv
+            $selectedTvs = array();
+            if(!isset($_POST['assignedTv'])) {
+                $rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category", $_lang['no_category']), sprintf("%s tv
                 LEFT JOIN %s tr ON tv.id=tr.tmplvarid
                 LEFT JOIN %s cat ON tv.category=cat.id", $modx->getFullTableName('site_tmplvars'), $modx->getFullTableName('site_tmplvar_templates'), $modx->getFullTableName('categories')), "templateid='{$id}'", "tr.rank DESC, tv.rank DESC, tvcaption DESC, tvid DESC"     // workaround for correct sort of none-existing ranks
-				);
-				while($row = $modx->db->getRow($rs)) {
-					$selectedTvs[$row['tvid']] = $row;
-				}
-				$selectedTvs = array_reverse($selectedTvs, true);       // reverse ORDERBY DESC
-			}
-
-			$unselectedTvs = array();
-			$rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category, cat.id as catid", $_lang['no_category']), sprintf("%s tv
+                );
+                while($row = $modx->db->getRow($rs)) {
+                    $selectedTvs[$row['tvid']] = $row;
+                }
+                $selectedTvs = array_reverse($selectedTvs, true);       // reverse ORDERBY DESC
+            }
+
+            $unselectedTvs = array();
+            $rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category, cat.id as catid", $_lang['no_category']), sprintf("%s tv
 	    LEFT JOIN %s tr ON tv.id=tr.tmplvarid
 	    LEFT JOIN %s cat ON tv.category=cat.id", $modx->getFullTableName('site_tmplvars'), $modx->getFullTableName('site_tmplvar_templates'), $modx->getFullTableName('categories')), "", "category, tvcaption");
-			while($row = $modx->db->getRow($rs)) {
-				$unselectedTvs[$row['tvid']] = $row;
-			}
-
-			// Catch checkboxes if form not validated
-			if(isset($_POST['assignedTv'])) {
-				$selectedTvs = array();
-				foreach($_POST['assignedTv'] as $tvid) {
-					if(isset($unselectedTvs[$tvid])) {
-						$selectedTvs[$tvid] = $unselectedTvs[$tvid];
-					}
-				};
-			}
-
-			$total = count($selectedTvs);
-			?>
+            while($row = $modx->db->getRow($rs)) {
+                $unselectedTvs[$row['tvid']] = $row;
+            }
+
+            // Catch checkboxes if form not validated
+            if(isset($_POST['assignedTv'])) {
+                $selectedTvs = array();
+                foreach($_POST['assignedTv'] as $tvid) {
+                    if(isset($unselectedTvs[$tvid])) {
+                        $selectedTvs[$tvid] = $unselectedTvs[$tvid];
+                    }
+                };
+            }
+
+            $total = count($selectedTvs);
+            ?>
 		</div>
 
 		<div class="tab-page" id="tabAssignedTVs">
@@ -238,65 +238,65 @@ 
 
 			<div class="container container-body">
 				<?php
-				if($total > 0) {
-					echo '<p>' . $_lang['template_tv_msg'] . '</p>';
-				}
-				if($modx->hasPermission('save_template') && $total > 1 && $id) {
-					echo sprintf('<div class="form-group"><a class="btn btn-primary" href="index.php?a=117&amp;id=%s">%s</a></div>', $id, $_lang['template_tv_edit']);
-				}
-
-				// Selected TVs
-				$tvList = '';
-				if($total > 0) {
-					$tvList .= '<ul>';
-					foreach($selectedTvs as $row) {
-						$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-						$locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
-						$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" checked="checked" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
-					}
-					$tvList .= '</ul>';
-
-				} else {
-					echo $_lang['template_no_tv'];
-				}
-				echo $tvList;
-
-				// Unselected TVs
-				$tvList = '<hr/><p>' . $_lang['template_notassigned_tv'] . '</p><ul>';
-				$preCat = '';
-				$insideUl = 0;
-				while($row = array_shift($unselectedTvs)) {
-					if(isset($selectedTvs[$row['tvid']])) {
-						continue;
-					} // Skip selected
-					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
-						$tvList .= $insideUl ? '</ul>' : '';
-						$tvList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
-						$insideUl = 1;
-					}
-
-					$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-					$locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
-					$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
-					$tvList .= '</li>';
-
-					$preCat = $row['category'];
-				}
-				$tvList .= $insideUl ? '</ul>' : '';
-				$tvList .= '</ul>';
-				echo $tvList;
-
-				?>
+                if($total > 0) {
+                    echo '<p>' . $_lang['template_tv_msg'] . '</p>';
+                }
+                if($modx->hasPermission('save_template') && $total > 1 && $id) {
+                    echo sprintf('<div class="form-group"><a class="btn btn-primary" href="index.php?a=117&amp;id=%s">%s</a></div>', $id, $_lang['template_tv_edit']);
+                }
+
+                // Selected TVs
+                $tvList = '';
+                if($total > 0) {
+                    $tvList .= '<ul>';
+                    foreach($selectedTvs as $row) {
+                        $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
+                        $locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+                        $tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" checked="checked" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
+                    }
+                    $tvList .= '</ul>';
+
+                } else {
+                    echo $_lang['template_no_tv'];
+                }
+                echo $tvList;
+
+                // Unselected TVs
+                $tvList = '<hr/><p>' . $_lang['template_notassigned_tv'] . '</p><ul>';
+                $preCat = '';
+                $insideUl = 0;
+                while($row = array_shift($unselectedTvs)) {
+                    if(isset($selectedTvs[$row['tvid']])) {
+                        continue;
+                    } // Skip selected
+                    $row['category'] = stripslashes($row['category']); //pixelchutes
+                    if($preCat !== $row['category']) {
+                        $tvList .= $insideUl ? '</ul>' : '';
+                        $tvList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $insideUl = 1;
+                    }
+
+                    $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
+                    $locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+                    $tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
+                    $tvList .= '</li>';
+
+                    $preCat = $row['category'];
+                }
+                $tvList .= $insideUl ? '</ul>' : '';
+                $tvList .= '</ul>';
+                echo $tvList;
+
+                ?>
 			</div>
 		</div>
 
 		<?php
-		// invoke OnTempFormRender event
-		$evtOut = $modx->invokeEvent("OnTempFormRender", array("id" => $id));
-		if(is_array($evtOut)) {
-			echo implode("", $evtOut);
-		}
-		?>
+        // invoke OnTempFormRender event
+        $evtOut = $modx->invokeEvent("OnTempFormRender", array("id" => $id));
+        if(is_array($evtOut)) {
+            echo implode("", $evtOut);
+        }
+        ?>
 	</div>
 </form>

manager/actions/mutate_module.dynamic.php

Indentation +94 added lines, -94 removed lines

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

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

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

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

 }

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

-	case 107:

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

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

-		}

-		break;

-	case 108:

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

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

-		}

-		break;

-	default:

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

+    case 107:

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

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

+        }

+        break;

+    case 108:

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

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

+        }

+        break;

+    default:

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

 }

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

 // Get table names (alphabetical)

@@ -30,16 +30,16 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');

 // create globally unique identifiers (guid)

 function createGUID() {

-	srand((double) microtime() * 1000000);

-	$r = rand();

-	$u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

-	$m = md5($u);

-	return $m;

+    srand((double) microtime() * 1000000);

+    $r = rand();

+    $u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

+    $m = md5($u);

+    return $m;

 }

 

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

 if($lockedEl = $modx->elementIsLocked(6, $id)) {

-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

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

 }

 // end check for lock

 

@@ -47,22 +47,22 @@ 
 $modx->lockElement(6, $id);

 

 if(isset($_GET['id'])) {

-	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

-	$content = $modx->db->getRow($rs);

-	if(!$content) {

-		$modx->webAlertAndQuit("Module not found for id '{$id}'.");

-	}

-	$content['properties'] = str_replace("&", "&amp;", $content['properties']);

-	$_SESSION['itemname'] = $content['name'];

-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

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

-	}

+    $rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

+    $content = $modx->db->getRow($rs);

+    if(!$content) {

+        $modx->webAlertAndQuit("Module not found for id '{$id}'.");

+    }

+    $content['properties'] = str_replace("&", "&amp;", $content['properties']);

+    $_SESSION['itemname'] = $content['name'];

+    if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

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

+    }

 } else {

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

-	$content['wrap'] = '1';

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

+    $content['wrap'] = '1';

 }

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

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

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

 }

 

 // Add lock-element JS-Script

@@ -433,18 +433,18 @@ 
 

 <form name="mutate" id="mutate" class="module" method="post" action="index.php?a=109">

 	<?php

-	// invoke OnModFormPrerender event

-	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

-	if(is_array($evtOut)) {

-		echo implode('', $evtOut);

-	}

-

-	// Prepare internal params & info-tab via parseDocBlock

-	$modulecode = isset($content['modulecode']) ? $modx->db->escape($content['modulecode']) : '';

-	$docBlock = $modx->parseDocBlockFromString($modulecode);

-	$docBlockList = $modx->convertDocBlockIntoList($docBlock);

-	$internal = array();

-	?>

+    // invoke OnModFormPrerender event

+    $evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

+    if(is_array($evtOut)) {

+        echo implode('', $evtOut);

+    }

+

+    // Prepare internal params & info-tab via parseDocBlock

+    $modulecode = isset($content['modulecode']) ? $modx->db->escape($content['modulecode']) : '';

+    $docBlock = $modx->parseDocBlockFromString($modulecode);

+    $docBlockList = $modx->convertDocBlockIntoList($docBlock);

+    $internal = array();

+    ?>

 	<input type="hidden" name="id" value="<?= $content['id'] ?>">

 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">

 

@@ -497,11 +497,11 @@ 
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">

 								<option>&nbsp;</option>

 								<?php

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

-								foreach(getCategories() as $n => $v) {

-									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

-								}

-								?>

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

+                                foreach(getCategories() as $n => $v) {

+                                    echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

+                                }

+                                ?>

 							</select>

 						</div>

 					</div>

@@ -608,7 +608,7 @@ 
 							<i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang['manage_depends'] ?></a>

 					</div>

 					<?php

-					$ds = $modx->db->select("smd.id, COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) AS name, 

+                    $ds = $modx->db->select("smd.id, COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) AS name, 

 					CASE smd.type

 						WHEN 10 THEN 'Chunk'

 						WHEN 20 THEN 'Document'

@@ -624,17 +624,17 @@ 
 						LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = 50

 						LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = 60", "smd.module='{$id}'", 'smd.type,name');

 

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

-					$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items

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

-					$grd->cssClass = 'grid';

-					$grd->columnHeaderClass = 'gridHeader';

-					$grd->itemClass = 'gridItem';

-					$grd->altItemClass = 'gridAltItem';

-					$grd->columns = $_lang['element_name'] . " ," . $_lang['type'];

-					$grd->fields = "name,type";

-					echo $grd->render();

-					?>

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

+                    $grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items

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

+                    $grd->cssClass = 'grid';

+                    $grd->columnHeaderClass = 'gridHeader';

+                    $grd->itemClass = 'gridItem';

+                    $grd->altItemClass = 'gridAltItem';

+                    $grd->columns = $_lang['element_name'] . " ," . $_lang['type'];

+                    $grd->fields = "name,type";

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		<?php endif; ?>

@@ -646,12 +646,12 @@ 
 			<div class="container container-body">

 				<?php if($use_udperms == 1) : ?>

 					<?php

-					// fetch user access permissions for the module

-					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

-					$groupsarray = $modx->db->getColumn('usergroup', $rs);

+                    // fetch user access permissions for the module

+                    $rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

+                    $groupsarray = $modx->db->getColumn('usergroup', $rs);

 

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

-						?>

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

+                        ?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

 							function makePublic(b) {

@@ -675,28 +675,28 @@ 
 						</script>

 						<p><?= $_lang['module_group_access_msg'] ?></p>

 						<?php

-					}

-					$chk = '';

-					$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

-						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

-						$checked = in_array($row['id'], $groupsarray);

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

-							if($checked) {

-								$notPublic = true;

-							}

-							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

-						} else {

-							if($checked) {

-								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

-							}

-						}

-					}

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

-						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

-					}

-					echo $chks;

-					?>

+                    }

+                    $chk = '';

+                    $rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

+                        $groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

+                        $checked = in_array($row['id'], $groupsarray);

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

+                            if($checked) {

+                                $notPublic = true;

+                            }

+                            $chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

+                        } else {

+                            if($checked) {

+                                $chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

+                            }

+                        }

+                    }

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

+                        $chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

+                    }

+                    echo $chks;

+                    ?>

 				<?php endif; ?>

 			</div>

 		</div>

@@ -712,11 +712,11 @@ 
 

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

 		<?php

-		// invoke OnModFormRender event

-		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

-		if(is_array($evtOut)) {

-			echo implode('', $evtOut);

-		}

-		?>

+        // invoke OnModFormRender event

+        $evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

+        if(is_array($evtOut)) {

+            echo implode('', $evtOut);

+        }

+        ?>

 </form>

 <script type="text/javascript">setTimeout('showParameters();', 10);</script>

manager/actions/mutate_module_resources.dynamic.php

Indentation +86 added lines, -86 removed lines

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

manager/includes/accesscontrol.inc.php

Indentation +169 added lines, -169 removed lines

@@ -1,193 +1,193 @@
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit;
+    header('HTTP/1.0 404 Not Found');
+    exit;
 }
 
 if(isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
-	//		if (isset($_COOKIE[session_name()])) {
-	//			setcookie(session_name(), '', 0, MODX_BASE_URL);
-	//		}
-	@session_destroy();
-	// start session
-	//	    startCMSSession();
+    //		if (isset($_COOKIE[session_name()])) {
+    //			setcookie(session_name(), '', 0, MODX_BASE_URL);
+    //		}
+    @session_destroy();
+    // start session
+    //	    startCMSSession();
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
 if(file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-	include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
-	if(isset($installStartTime)) {
-		if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
-			unset($installStartTime);
-			@ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-			unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
-		} else {
-			if($_SERVER['REQUEST_METHOD'] != 'POST') {
-				if(isset($_COOKIE[session_name()])) {
-					session_unset();
-					@session_destroy();
-					//					setcookie(session_name(), '', 0, MODX_BASE_URL);
-				}
-				$installGoingOn = 1;
-			}
-		}
-	}
+    include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+    if(isset($installStartTime)) {
+        if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+            unset($installStartTime);
+            @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
+            unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+        } else {
+            if($_SERVER['REQUEST_METHOD'] != 'POST') {
+                if(isset($_COOKIE[session_name()])) {
+                    session_unset();
+                    @session_destroy();
+                    //					setcookie(session_name(), '', 0, MODX_BASE_URL);
+                }
+                $installGoingOn = 1;
+            }
+        }
+    }
 }
 
 // andrazk 20070416 - if session started before install and was not destroyed yet
 if(isset($lastInstallTime)) {
-	if(isset($_SESSION['mgrValidated'])) {
-		if(isset($_SESSION['modx.session.created.time'])) {
-			if($_SESSION['modx.session.created.time'] < $lastInstallTime) {
-				if($_SERVER['REQUEST_METHOD'] != 'POST') {
-					if(isset($_COOKIE[session_name()])) {
-						session_unset();
-						@session_destroy();
-						//						setcookie(session_name(), '', 0, MODX_BASE_URL);
-					}
-					header('HTTP/1.0 307 Redirect');
-					header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
-				}
-			}
-		}
-	}
+    if(isset($_SESSION['mgrValidated'])) {
+        if(isset($_SESSION['modx.session.created.time'])) {
+            if($_SESSION['modx.session.created.time'] < $lastInstallTime) {
+                if($_SERVER['REQUEST_METHOD'] != 'POST') {
+                    if(isset($_COOKIE[session_name()])) {
+                        session_unset();
+                        @session_destroy();
+                        //						setcookie(session_name(), '', 0, MODX_BASE_URL);
+                    }
+                    header('HTTP/1.0 307 Redirect');
+                    header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+                }
+            }
+        }
+    }
 }
 
 if(!isset($_SESSION['mgrValidated'])) {
-	if(isset($manager_language)) {
-		// establish fallback to English default
-		include_once "lang/english.inc.php";
-		// include localized overrides
-		include_once "lang/" . $manager_language . ".inc.php";
-	} else {
-		include_once "lang/english.inc.php";
-	}
-
-	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
-	$modx->setPlaceholder('theme', $manager_theme);
+    if(isset($manager_language)) {
+        // establish fallback to English default
+        include_once "lang/english.inc.php";
+        // include localized overrides
+        include_once "lang/" . $manager_language . ".inc.php";
+    } else {
+        include_once "lang/english.inc.php";
+    }
+
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
     $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
 
-	// invoke OnManagerLoginFormPrerender event
-	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
-	$html = is_array($evtOut) ? implode('', $evtOut) : '';
-	$modx->setPlaceholder('OnManagerLoginFormPrerender', $html);
-
-	$modx->setPlaceholder('site_name', $site_name);
-	$modx->setPlaceholder('manager_path', MGR_DIR);
-	$modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
-	$modx->setPlaceholder('login_message', $_lang["login_message"]);
-	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
-	$modx->setPlaceholder('year', date('Y'));
-	$modx->setPlaceholder('manager_theme_style', (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
-
-	// andrazk 20070416 - notify user of install/update
-	if(isset($_GET['installGoingOn'])) {
-		$installGoingOn = $_GET['installGoingOn'];
-	}
-	if(isset($installGoingOn)) {
-		switch($installGoingOn) {
-			case 1 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
-				break;
-			case 2 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
-				break;
-		}
-	}
-
-	if($modx->config['use_captcha'] == 1) {
-		$modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
-		$modx->setPlaceholder('captcha_image', '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
-		$modx->setPlaceholder('captcha_input', '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
-	}
-
-	// login info
-	$uid = isset($_COOKIE['modx_remember_manager']) ? preg_replace('/[^a-zA-Z0-9\-_@\.]*/', '', $_COOKIE['modx_remember_manager']) : '';
-	$modx->setPlaceholder('uid', $uid);
-	$modx->setPlaceholder('username', $_lang["username"]);
-	$modx->setPlaceholder('password', $_lang["password"]);
-
-	// remember me
-	$html = isset($_COOKIE['modx_remember_manager']) ? 'checked="checked"' : '';
-	$modx->setPlaceholder('remember_me', $html);
-	$modx->setPlaceholder('remember_username', $_lang["remember_username"]);
-	$modx->setPlaceholder('login_button', $_lang["login_button"]);
-
-	// invoke OnManagerLoginFormRender event
-	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
-	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
-
-	// load template
-	$target = $modx->getConfig('manager_login_tpl');
-	$target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
-	$target = $modx->mergeSettingsContent($target);
-
-	$login_tpl = null;
-	if(substr($target, 0, 1) === '@') {
-		if(substr($target, 0, 6) === '@CHUNK') {
-			$target = trim(substr($target, 7));
-			$login_tpl = $modx->getChunk($target);
-		} elseif(substr($target, 0, 5) === '@FILE') {
-			$target = trim(substr($target, 6));
-			$login_tpl = file_get_contents($target);
-		}
-	} else {
-		$theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-		if(is_file($theme_path . 'style.php')) {
-			include($theme_path . 'style.php');
-		}
-		$chunk = $modx->getChunk($target);
-		if($chunk !== false && !empty($chunk)) {
-			$login_tpl = $chunk;
-		} elseif(is_file(MODX_BASE_PATH . $target)) {
-			$target = MODX_BASE_PATH . $target;
-			$login_tpl = file_get_contents($target);
-		} elseif(is_file($target)) {
-			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'login.tpl')) {
-			$target = $theme_path . 'login.tpl';
-			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
-			$target = $theme_path . 'templates/actions/login.tpl';
-			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-			$target = $theme_path . 'html/login.html';
-			$login_tpl = file_get_contents($target);
-		} else {
-			$target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
-			$login_tpl = file_get_contents($target);
-		}
-	}
-
-	// merge placeholders
-	$login_tpl = $modx->mergePlaceholderContent($login_tpl);
-	$regx = strpos($login_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
-	$login_tpl = preg_replace($regx, '', $login_tpl); //cleanup
-
-	echo $login_tpl;
-
-	exit;
+    // invoke OnManagerLoginFormPrerender event
+    $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
+    $html = is_array($evtOut) ? implode('', $evtOut) : '';
+    $modx->setPlaceholder('OnManagerLoginFormPrerender', $html);
+
+    $modx->setPlaceholder('site_name', $site_name);
+    $modx->setPlaceholder('manager_path', MGR_DIR);
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('login_message', $_lang["login_message"]);
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+    $modx->setPlaceholder('year', date('Y'));
+    $modx->setPlaceholder('manager_theme_style', (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
+
+    // andrazk 20070416 - notify user of install/update
+    if(isset($_GET['installGoingOn'])) {
+        $installGoingOn = $_GET['installGoingOn'];
+    }
+    if(isset($installGoingOn)) {
+        switch($installGoingOn) {
+            case 1 :
+                $modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                break;
+            case 2 :
+                $modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                break;
+        }
+    }
+
+    if($modx->config['use_captcha'] == 1) {
+        $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
+        $modx->setPlaceholder('captcha_image', '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
+        $modx->setPlaceholder('captcha_input', '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+    }
+
+    // login info
+    $uid = isset($_COOKIE['modx_remember_manager']) ? preg_replace('/[^a-zA-Z0-9\-_@\.]*/', '', $_COOKIE['modx_remember_manager']) : '';
+    $modx->setPlaceholder('uid', $uid);
+    $modx->setPlaceholder('username', $_lang["username"]);
+    $modx->setPlaceholder('password', $_lang["password"]);
+
+    // remember me
+    $html = isset($_COOKIE['modx_remember_manager']) ? 'checked="checked"' : '';
+    $modx->setPlaceholder('remember_me', $html);
+    $modx->setPlaceholder('remember_username', $_lang["remember_username"]);
+    $modx->setPlaceholder('login_button', $_lang["login_button"]);
+
+    // invoke OnManagerLoginFormRender event
+    $evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
+    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+    $modx->setPlaceholder('OnManagerLoginFormRender', $html);
+
+    // load template
+    $target = $modx->getConfig('manager_login_tpl');
+    $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
+    $target = $modx->mergeSettingsContent($target);
+
+    $login_tpl = null;
+    if(substr($target, 0, 1) === '@') {
+        if(substr($target, 0, 6) === '@CHUNK') {
+            $target = trim(substr($target, 7));
+            $login_tpl = $modx->getChunk($target);
+        } elseif(substr($target, 0, 5) === '@FILE') {
+            $target = trim(substr($target, 6));
+            $login_tpl = file_get_contents($target);
+        }
+    } else {
+        $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
+        if(is_file($theme_path . 'style.php')) {
+            include($theme_path . 'style.php');
+        }
+        $chunk = $modx->getChunk($target);
+        if($chunk !== false && !empty($chunk)) {
+            $login_tpl = $chunk;
+        } elseif(is_file(MODX_BASE_PATH . $target)) {
+            $target = MODX_BASE_PATH . $target;
+            $login_tpl = file_get_contents($target);
+        } elseif(is_file($target)) {
+            $login_tpl = file_get_contents($target);
+        } elseif(is_file($theme_path . 'login.tpl')) {
+            $target = $theme_path . 'login.tpl';
+            $login_tpl = file_get_contents($target);
+        } elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
+            $target = $theme_path . 'templates/actions/login.tpl';
+            $login_tpl = file_get_contents($target);
+        } elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
+            $target = $theme_path . 'html/login.html';
+            $login_tpl = file_get_contents($target);
+        } else {
+            $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+            $login_tpl = file_get_contents($target);
+        }
+    }
+
+    // merge placeholders
+    $login_tpl = $modx->mergePlaceholderContent($login_tpl);
+    $regx = strpos($login_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $login_tpl = preg_replace($regx, '', $login_tpl); //cleanup
+
+    echo $login_tpl;
+
+    exit;
 
 } else {
-	// Update table active_user_sessions
-	$modx->updateValidatedUserSession();
-
-	// Update last action in table active_users
-	$itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
-	$lasthittime = time();
-	$action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
-
-	if($action !== 1) {
-		if((int)$itemid <= 0) {
-			$itemid = null;
-		}
-		$sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", $modx->getFullTableName('active_users') // Table
-			, session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action, $itemid == null ? var_export(null, true) : $itemid);
-		$modx->db->query($sql);
-	}
+    // Update table active_user_sessions
+    $modx->updateValidatedUserSession();
+
+    // Update last action in table active_users
+    $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
+    $lasthittime = time();
+    $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
+
+    if($action !== 1) {
+        if((int)$itemid <= 0) {
+            $itemid = null;
+        }
+        $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", $modx->getFullTableName('active_users') // Table
+            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action, $itemid == null ? var_export(null, true) : $itemid);
+        $modx->db->query($sql);
+    }
 }

manager/includes/extenders/maketable.class.php

Indentation +439 added lines, -439 removed lines

@@ -9,7 +9,7 @@ 
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
 class MakeTable {
-	public $actionField;
+    public $actionField;
     public $cellAction;
     public $linkAction;
     public $tableWidth;
@@ -34,343 +34,343 @@ 
     public $extra;
 
     public function __construct() {
-		$this->fieldHeaders= array();
-		$this->excludeFields= array();
-		$this->actionField= '';
-		$this->cellAction= '';
-		$this->linkAction= '';
-		$this->tableWidth= '';
-		$this->tableClass= '';
-		$this->rowHeaderClass= '';
-		$this->columnHeaderClass= '';
-		$this->rowRegularClass= '';
-		$this->rowAlternateClass= 'alt';
-		$this->formName= 'tableForm';
-		$this->formAction= '[~[*id*]~]';
-		$this->formElementName= '';
-		$this->formElementType= '';
-		$this->rowAlternatingScheme= 'EVEN';
-		$this->allOption= 0;
-		$this->selectedValues= array();
-		$this->extra= '';
-	}
-
-	/**
-	 * Sets the default link href for all cells in the table.
-	 *
-	 * @param $value A URL to execute when table cells are clicked.
-	 */
+        $this->fieldHeaders= array();
+        $this->excludeFields= array();
+        $this->actionField= '';
+        $this->cellAction= '';
+        $this->linkAction= '';
+        $this->tableWidth= '';
+        $this->tableClass= '';
+        $this->rowHeaderClass= '';
+        $this->columnHeaderClass= '';
+        $this->rowRegularClass= '';
+        $this->rowAlternateClass= 'alt';
+        $this->formName= 'tableForm';
+        $this->formAction= '[~[*id*]~]';
+        $this->formElementName= '';
+        $this->formElementType= '';
+        $this->rowAlternatingScheme= 'EVEN';
+        $this->allOption= 0;
+        $this->selectedValues= array();
+        $this->extra= '';
+    }
+
+    /**
+     * Sets the default link href for all cells in the table.
+     *
+     * @param $value A URL to execute when table cells are clicked.
+     */
     public function setCellAction($value) {
-		$this->cellAction= $this->prepareLink($value);
-	}
-
-	/**
-	 * Sets the default link href for the text presented in a cell.
-	 *
-	 * @param $value A URL to execute when text within table cells are clicked.
-	 */
+        $this->cellAction= $this->prepareLink($value);
+    }
+
+    /**
+     * Sets the default link href for the text presented in a cell.
+     *
+     * @param $value A URL to execute when text within table cells are clicked.
+     */
     public function setLinkAction($value) {
-		$this->linkAction= $this->prepareLink($value);
-	}
-
-	/**
-	 * Sets the width attribute of the main HTML TABLE.
-	 *
-	 * @param $value A valid width attribute for the HTML TABLE tag
-	 */
+        $this->linkAction= $this->prepareLink($value);
+    }
+
+    /**
+     * Sets the width attribute of the main HTML TABLE.
+     *
+     * @param $value A valid width attribute for the HTML TABLE tag
+     */
     public function setTableWidth($value) {
-		$this->tableWidth= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the main HTML TABLE.
-	 *
-	 * @param $value A class for the main HTML TABLE.
-	 */
+        $this->tableWidth= $value;
+    }
+
+    /**
+     * Sets the class attribute of the main HTML TABLE.
+     *
+     * @param $value A class for the main HTML TABLE.
+     */
     public function setTableClass($value) {
-		$this->tableClass= $value;
-	}
-
-	/**
-	 * Sets the id attribute of the main HTML TABLE.
-	 *
-	 * @param $value A class for the main HTML TABLE.
-	 */
+        $this->tableClass= $value;
+    }
+
+    /**
+     * Sets the id attribute of the main HTML TABLE.
+     *
+     * @param $value A class for the main HTML TABLE.
+     */
     public function setTableID($value) {
-		$this->tableID= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the table header row.
-	 *
-	 * @param $value A class for the table header row.
-	 */
+        $this->tableID= $value;
+    }
+
+    /**
+     * Sets the class attribute of the table header row.
+     *
+     * @param $value A class for the table header row.
+     */
     public function setRowHeaderClass($value) {
-		$this->rowHeaderClass= $value;
-	}
-
-		/**
-	 * Sets the class attribute of the table header row.
-	 *
-	 * @param $value A class for the table header row.
-	 */
+        $this->rowHeaderClass= $value;
+    }
+
+        /**
+         * Sets the class attribute of the table header row.
+         *
+         * @param $value A class for the table header row.
+         */
     public function setThHeaderClass($value) {
-		$this->thClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the column header row.
-	 *
-	 * @param $value A class for the column header row.
-	 */
+        $this->thClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of the column header row.
+     *
+     * @param $value A class for the column header row.
+     */
     public function setColumnHeaderClass($value) {
-		$this->columnHeaderClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of regular table rows.
-	 *
-	 * @param $value A class for regular table rows.
-	 */
+        $this->columnHeaderClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of regular table rows.
+     *
+     * @param $value A class for regular table rows.
+     */
     public function setRowRegularClass($value) {
-		$this->rowRegularClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of alternate table rows.
-	 *
-	 * @param $value A class for alternate table rows.
-	 */
+        $this->rowRegularClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of alternate table rows.
+     *
+     * @param $value A class for alternate table rows.
+     */
     public function setRowAlternateClass($value) {
-		$this->rowAlternateClass= $value;
-	}
-
-	/**
-	 * Sets the type of INPUT form element to be presented as the first column.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        $this->rowAlternateClass= $value;
+    }
+
+    /**
+     * Sets the type of INPUT form element to be presented as the first column.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function setFormElementType($value) {
-		$this->formElementType= $value;
-	}
-
-	/**
-	 * Sets the name of the INPUT form element to be presented as the first column.
-	 *
-	 * @param $value Indicates the INPUT form element name attribute.
-	 */
+        $this->formElementType= $value;
+    }
+
+    /**
+     * Sets the name of the INPUT form element to be presented as the first column.
+     *
+     * @param $value Indicates the INPUT form element name attribute.
+     */
     public function setFormElementName($value) {
-		$this->formElementName= $value;
-	}
-
-	/**
-	 * Sets the name of the FORM to wrap the table in when a form element has
-	 * been indicated.
-	 *
-	 * @param $value Indicates the FORM name attribute.
-	 */
+        $this->formElementName= $value;
+    }
+
+    /**
+     * Sets the name of the FORM to wrap the table in when a form element has
+     * been indicated.
+     *
+     * @param $value Indicates the FORM name attribute.
+     */
     public function setFormName($value) {
-		$this->formName= $value;
-	}
-
-	/**
-	 * Sets the action of the FORM element.
-	 *
-	 * @param $value Indicates the FORM action attribute.
-	 */
+        $this->formName= $value;
+    }
+
+    /**
+     * Sets the action of the FORM element.
+     *
+     * @param $value Indicates the FORM action attribute.
+     */
     public function setFormAction($value) {
-		$this->formAction= $value;
-	}
-
-	/**
-	 * Excludes fields from the table by array key.
-	 *
-	 * @param $value An Array of field keys to exclude from the table.
-	 */
+        $this->formAction= $value;
+    }
+
+    /**
+     * Excludes fields from the table by array key.
+     *
+     * @param $value An Array of field keys to exclude from the table.
+     */
     public function setExcludeFields($value) {
-		$this->excludeFields= $value;
-	}
-
-	/**
-	 * Sets the table to provide alternate row colors using ODD or EVEN rows
-	 *
-	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
-	 */
+        $this->excludeFields= $value;
+    }
+
+    /**
+     * Sets the table to provide alternate row colors using ODD or EVEN rows
+     *
+     * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
+     */
     public function setRowAlternatingScheme($value) {
-		$this->rowAlternatingScheme= $value;
-	}
-
-	/**
-	 * Sets the default field value to be used when appending query parameters
-	 * to link actions.
-	 *
-	 * @param $value The key of the field to add as a query string parameter.
-	 */
+        $this->rowAlternatingScheme= $value;
+    }
+
+    /**
+     * Sets the default field value to be used when appending query parameters
+     * to link actions.
+     *
+     * @param $value The key of the field to add as a query string parameter.
+     */
     public function setActionFieldName($value) {
-		$this->actionField= $value;
-	}
-
-	/**
-	 * Sets the width attribute of each column in the array.
-	 *
-	 * @param $value An Array of column widths in the order of the keys in the
-	 * 			source table array.
-	 */
+        $this->actionField= $value;
+    }
+
+    /**
+     * Sets the width attribute of each column in the array.
+     *
+     * @param $value An Array of column widths in the order of the keys in the
+     * 			source table array.
+     */
     public function setColumnWidths($widthArray) {
-		$this->columnWidths= $widthArray;
-	}
-
-	/**
-	 * An optional array of values that can be preselected when using
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        $this->columnWidths= $widthArray;
+    }
+
+    /**
+     * An optional array of values that can be preselected when using
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function setSelectedValues($valueArray) {
-		$this->selectedValues= $valueArray;
-	}
-
-	/**
-	 * Sets extra content to be presented following the table (but within
-	 * the form, if a form is being rendered with the table).
-	 *
-	 * @param $value A string of additional content.
-	 */
+        $this->selectedValues= $valueArray;
+    }
+
+    /**
+     * Sets extra content to be presented following the table (but within
+     * the form, if a form is being rendered with the table).
+     *
+     * @param $value A string of additional content.
+     */
     public function setExtra($value) {
-		$this->extra= $value;
-	}
-
-	/**
-	 * Retrieves the width of a specific table column by index position.
-	 *
-	 * @param $columnPosition The index of the column to get the width for.
-	 */
+        $this->extra= $value;
+    }
+
+    /**
+     * Retrieves the width of a specific table column by index position.
+     *
+     * @param $columnPosition The index of the column to get the width for.
+     */
     public function getColumnWidth($columnPosition) {
-		$currentWidth= '';
-		if (is_array($this->columnWidths)) {
-			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
-		}
-		return $currentWidth;
-	}
-
-	/**
-	 * Determines what class the current row should have applied.
-	 *
-	 * @param $value The position of the current row being rendered.
-	 */
+        $currentWidth= '';
+        if (is_array($this->columnWidths)) {
+            $currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
+        }
+        return $currentWidth;
+    }
+
+    /**
+     * Determines what class the current row should have applied.
+     *
+     * @param $value The position of the current row being rendered.
+     */
     public function determineRowClass($position) {
-		switch ($this->rowAlternatingScheme) {
-			case 'ODD' :
-				$modRemainder= 1;
-				break;
-			case 'EVEN' :
-				$modRemainder= 0;
-				break;
-		}
-		if ($position % 2 == $modRemainder) {
-			$currentClass= $this->rowRegularClass;
-		} else {
-			$currentClass= $this->rowAlternateClass;
-		}
-		return ' class="'.$currentClass.'"';
-	}
-
-	/**
-	 * Generates an onclick action applied to the current cell, to execute
-	 * any specified cell actions.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        switch ($this->rowAlternatingScheme) {
+            case 'ODD' :
+                $modRemainder= 1;
+                break;
+            case 'EVEN' :
+                $modRemainder= 0;
+                break;
+        }
+        if ($position % 2 == $modRemainder) {
+            $currentClass= $this->rowRegularClass;
+        } else {
+            $currentClass= $this->rowAlternateClass;
+        }
+        return ' class="'.$currentClass.'"';
+    }
+
+    /**
+     * Generates an onclick action applied to the current cell, to execute
+     * any specified cell actions.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function getCellAction($currentActionFieldValue) {
-		if ($this->cellAction) {
-			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
-		}
-		return $cellAction;
-	}
-
-	/**
-	 * Generates the cell content, including any specified action fields values.
-	 *
-	 * @param $currentActionFieldValue The value to be applied to the link action.
-	 * @param $value The value of the cell.
-	 */
+        if ($this->cellAction) {
+            $cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
+        }
+        return $cellAction;
+    }
+
+    /**
+     * Generates the cell content, including any specified action fields values.
+     *
+     * @param $currentActionFieldValue The value to be applied to the link action.
+     * @param $value The value of the cell.
+     */
     public function createCellText($currentActionFieldValue, $value) {
-		$cell .= $value;
-		if ($this->linkAction) {
-			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
-		}
-		return $cell;
-	}
-
-	/**
-	 * Sets an option to generate a check all link when checkbox is indicated
-	 * as the table formElementType.
-	 */
+        $cell .= $value;
+        if ($this->linkAction) {
+            $cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
+        }
+        return $cell;
+    }
+
+    /**
+     * Sets an option to generate a check all link when checkbox is indicated
+     * as the table formElementType.
+     */
     public function setAllOption() {
-		$this->allOption= 1;
-	}
-
-	/**
-	 * Function to prepare a link generated in the table cell/link actions.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        $this->allOption= 1;
+    }
+
+    /**
+     * Function to prepare a link generated in the table cell/link actions.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function prepareLink($link) {
-		if (strstr($link, '?')) {
-			$end= '&';
-		} else {
-			$end= '?';
-		}
-		return $link.$end;
-	}
-
-	/**
-	 * Generates the table content.
-	 *
-	 * @param $fieldsArray The associative array representing the table rows
-	 * and columns.
-	 * @param $fieldHeadersArray An optional array of values for providing
-	 * alternative field headers; this is an associative arrays of keys from
-	 * the $fieldsArray where the values represent the alt heading content
-	 * for each column.
-	 */
+        if (strstr($link, '?')) {
+            $end= '&';
+        } else {
+            $end= '?';
+        }
+        return $link.$end;
+    }
+
+    /**
+     * Generates the table content.
+     *
+     * @param $fieldsArray The associative array representing the table rows
+     * and columns.
+     * @param $fieldHeadersArray An optional array of values for providing
+     * alternative field headers; this is an associative arrays of keys from
+     * the $fieldsArray where the values represent the alt heading content
+     * for each column.
+     */
     public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
-	    global $_lang;
-		if (is_array($fieldsArray)) {
-			$i= 0;
-			foreach ($fieldsArray as $fieldName => $fieldValue) {
-				$table .= "\t<tr".$this->determineRowClass($i).">\n";
-				$currentActionFieldValue= $fieldValue[$this->actionField];
-				if (is_array($this->selectedValues)) {
-					$isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
-				} else {
-					$isChecked= false;
-				}
-				$table .= $this->addFormField($currentActionFieldValue, $isChecked);
-				$colPosition= 0;
-				foreach ($fieldValue as $key => $value) {
-					if (!in_array($key, $this->excludeFields)) {
-						$table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
-						$table .= $this->createCellText($currentActionFieldValue, $value);
-						$table .= "</td>\n";
-						if ($i == 0) {
-							if (empty ($header) && $this->formElementType) {
-								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
-							}
-							$headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
-							$header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
-						}
-						$colPosition ++;
-					}
-				}
-				$i ++;
-				$table .= "\t</tr>\n";
-			}
-			$table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
-			if ($this->formElementType) {
-				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
-			}
-			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
-				/* commented this part because of cookie
+        global $_lang;
+        if (is_array($fieldsArray)) {
+            $i= 0;
+            foreach ($fieldsArray as $fieldName => $fieldValue) {
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
+                $currentActionFieldValue= $fieldValue[$this->actionField];
+                if (is_array($this->selectedValues)) {
+                    $isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
+                } else {
+                    $isChecked= false;
+                }
+                $table .= $this->addFormField($currentActionFieldValue, $isChecked);
+                $colPosition= 0;
+                foreach ($fieldValue as $key => $value) {
+                    if (!in_array($key, $this->excludeFields)) {
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
+                        $table .= $this->createCellText($currentActionFieldValue, $value);
+                        $table .= "</td>\n";
+                        if ($i == 0) {
+                            if (empty ($header) && $this->formElementType) {
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
+                            }
+                            $headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
+                        }
+                        $colPosition ++;
+                    }
+                }
+                $i ++;
+                $table .= "\t</tr>\n";
+            }
+            $table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
+            if ($this->formElementType) {
+                $table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
+            }
+            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+                /* commented this part because of cookie
 				$table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
 				$pageSizes= array (10, 25, 50, 100, 250);
 				for ($i= 0; $i < count($pageSizes); $i ++) {
@@ -381,12 +381,12 @@ 
 
 				$table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
 				*/
-				$table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
-				//$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
+                //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
-			}
-			if ($this->allOption) {
-				$table .= '
+            }
+            if ($this->allOption) {
+                $table .= '
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
@@ -399,134 +399,134 @@ 
 		toggled = (toggled?0:1);
 	}
 </script>';
-			}
-			if ($this->formElementType) {
-				if ($this->extra) {
-					$table.= "\n".$this->extra."\n";
-				}
-				$table.= "\n".'</form>'."\n";
-			}
-			return $table;
-		}
-	}
-
-	/**
-	 * Generates optional paging navigation controls for the table.
-	 *
-	 * @param $numRecords The number of records to show per page.
-	 * @param $qs An optional query string to be appended to the paging links
-	 */
+            }
+            if ($this->formElementType) {
+                if ($this->extra) {
+                    $table.= "\n".$this->extra."\n";
+                }
+                $table.= "\n".'</form>'."\n";
+            }
+            return $table;
+        }
+    }
+
+    /**
+     * Generates optional paging navigation controls for the table.
+     *
+     * @param $numRecords The number of records to show per page.
+     * @param $qs An optional query string to be appended to the paging links
+     */
     public function createPagingNavigation($numRecords, $qs='') {
-		global $_lang;
-		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
-		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
-		if ($numPages > 1) {
-			$currentURL= empty($qs)? '': '?'.$qs;
-			if ($currentPage > 6) {
-				$nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
-			}
-			if ($currentPage != 1) {
-				$nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
-			}
-			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
-			$i= 1;
-			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
-				if ($currentPage == $currentPage + $offset)
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
-				else
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
-				$i ++;
-				$offset ++;
-			}
-			if ($currentPage < $numPages) {
-				$nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
-			}
-			if ($currentPage != $numPages) {
-				$nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
-			}
-		}
-		$this->pageNav= ' '.$nav;
-	}
-
-	/**
-	 * Creates an individual page link for the paging navigation.
-	 *
-	 * @param $link The link for the page, defaulted to the current document.
-	 * @param $pageNum The page number of the link.
-	 * @param $displayText The text of the link.
-	 * @param $currentPage Indicates if the link is to the current page.
-	 * @param $qs And optional query string to be appended to the link.
-	 */
+        global $_lang;
+        $currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
+        $numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
+        if ($numPages > 1) {
+            $currentURL= empty($qs)? '': '?'.$qs;
+            if ($currentPage > 6) {
+                $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
+            }
+            if ($currentPage != 1) {
+                $nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
+            }
+            $offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
+            $i= 1;
+            while ($i < 10 && ($currentPage + $offset <= $numPages)) {
+                if ($currentPage == $currentPage + $offset)
+                    $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
+                else
+                    $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+                $i ++;
+                $offset ++;
+            }
+            if ($currentPage < $numPages) {
+                $nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
+            }
+            if ($currentPage != $numPages) {
+                $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
+            }
+        }
+        $this->pageNav= ' '.$nav;
+    }
+
+    /**
+     * Creates an individual page link for the paging navigation.
+     *
+     * @param $link The link for the page, defaulted to the current document.
+     * @param $pageNum The page number of the link.
+     * @param $displayText The text of the link.
+     * @param $currentPage Indicates if the link is to the current page.
+     * @param $qs And optional query string to be appended to the link.
+     */
     public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
-		global $modx;
-		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
-		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
-		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
-		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
-		return $nav;
-	}
-
-	/**
-	 * Adds an INPUT form element column to the table.
-	 *
-	 * @param $value The value attribute of the element.
-	 * @param $isChecked Indicates if the checked attribute should apply to the
-	 * element.
-	 */
+        global $modx;
+        $orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
+        $orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
+        if (!empty($qs)) $qs= "?$qs";
+        $link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
+        $nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
+        return $nav;
+    }
+
+    /**
+     * Adds an INPUT form element column to the table.
+     *
+     * @param $value The value attribute of the element.
+     * @param $isChecked Indicates if the checked attribute should apply to the
+     * element.
+     */
     public function addFormField($value, $isChecked) {
-		if ($this->formElementType) {
-			$checked= $isChecked? "checked ": "";
-			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
-		}
-		return $field;
-	}
-
-	/**
-	 * Generates the proper LIMIT clause for queries to retrieve paged results in
-	 * a MakeTable $fieldsArray.
-	 */
+        if ($this->formElementType) {
+            $checked= $isChecked? "checked ": "";
+            $field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
+        }
+        return $field;
+    }
+
+    /**
+     * Generates the proper LIMIT clause for queries to retrieve paged results in
+     * a MakeTable $fieldsArray.
+     */
     public function handlePaging() {
-		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
-		return $limitClause;
-	}
-
-	/**
-	 * Generates the SORT BY clause for queries used to retrieve a MakeTable
-	 * $fieldsArray
-	 *
-	 * @param $natural_order If true, the results are returned in natural order.
-	 */
+        $offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
+        $limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
+        return $limitClause;
+    }
+
+    /**
+     * Generates the SORT BY clause for queries used to retrieve a MakeTable
+     * $fieldsArray
+     *
+     * @param $natural_order If true, the results are returned in natural order.
+     */
     public function handleSorting($natural_order=false) {
-		$orderByClause= '';
-		if (!$natural_order) {
-			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
-			$orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
-			$orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
-		}
-		return $orderbyClause;
-	}
-
-	/**
-	 * Generates a link to order by a specific $fieldsArray key; use to generate
-	 * sort by links in the MakeTable $fieldHeadingsArray values.
-	 *
-	 * @param $key The $fieldsArray key for the column to sort by.
-	 * @param $text The text for the link (e.g. table column header).
-	 * @param $qs An optional query string to append to the order by link.
-	 */
+        $orderByClause= '';
+        if (!$natural_order) {
+            $orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
+            $orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
+            $orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
+        }
+        return $orderbyClause;
+    }
+
+    /**
+     * Generates a link to order by a specific $fieldsArray key; use to generate
+     * sort by links in the MakeTable $fieldHeadingsArray values.
+     *
+     * @param $key The $fieldsArray key for the column to sort by.
+     * @param $text The text for the link (e.g. table column header).
+     * @param $qs An optional query string to append to the order by link.
+     */
     public function prepareOrderByLink($key, $text, $qs='') {
-		global $modx;
-		if (!empty($_GET['orderdir'])) {
-			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
-		} else {
-			$orderDir= '&orderdir=asc';
-		}
-		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
-		}
-		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
-	}
+        global $modx;
+        if (!empty($_GET['orderdir'])) {
+            $orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
+        } else {
+            $orderDir= '&orderdir=asc';
+        }
+        if (!empty($qs)) {
+            if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+        }
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
+    }
 
 }