evolution-cms / evolution

manager/actions/mutate_module_resources.dynamic.php

Indentation +86 added lines, -86 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 if(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']) ? intval($_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>

Spacing +30 added lines, -30 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (IN_MANAGER_MODE != "true") {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if(!$modx->hasPermission('edit_module')) {
+if (!$modx->hasPermission('edit_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -24,41 +24,41 @@ 
 $modx->manager->initPageViewState();
 
 // 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)) {
+$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'));
 }
 // end check for lock
 
 // take action
-switch($_REQUEST['op']) {
+switch ($_REQUEST['op']) {
 	case 'add':
 		// convert ids to numbers
 		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
 
-		if(count($opids) > 0) {
+		if (count($opids) > 0) {
 			// 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
 			$rt = strtolower($_REQUEST["rt"]);
-			if($rt == 'chunk') {
+			if ($rt == 'chunk') {
 				$type = 10;
 			}
-			if($rt == 'doc') {
+			if ($rt == 'doc') {
 				$type = 20;
 			}
-			if($rt == 'plug') {
+			if ($rt == 'plug') {
 				$type = 30;
 			}
-			if($rt == 'snip') {
+			if ($rt == 'snip') {
 				$type = 40;
 			}
-			if($rt == 'tpl') {
+			if ($rt == 'tpl') {
 				$type = 50;
 			}
-			if($rt == 'tv') {
+			if ($rt == 'tv') {
 				$type = 60;
 			}
-			$modx->db->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
-			foreach($opids as $opid) {
+			$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,
@@ -72,15 +72,15 @@ 
 		$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) . ")");
+		$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') {
+		while ($row = $modx->db->getRow($ds)) {
+			if ($row['type'] == '30') {
 				$plids[$i] = $row['resource'];
 			}
-			if($row['type'] == '40') {
+			if ($row['type'] == '40') {
 				$snids[$i] = $row['resource'];
 			}
 		}
@@ -88,28 +88,28 @@ 
 		$ds = $modx->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 (($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}'");
+			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) . ")");
+		$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) {
+if (!$content) {
 	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
 }
 $_SESSION['itemname'] = $content['name'];
-if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -188,13 +188,13 @@ 
 	<input type="hidden" name="id" value="<?php echo $content['id']; ?>" />
 
 	<h1>
-		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['module_resource_title']) ?>
+		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['module_resource_title']) ?>
 	</h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['close'] ?>
 
 	<div class="section">
-		<div class="sectionHeader"><?php echo $content["name"] . " - " . $_lang['module_resource_title']; ?></div>
+		<div class="sectionHeader"><?php echo $content["name"]." - ".$_lang['module_resource_title']; ?></div>
 		<div class="sectionBody">
 			<p><?php echo $_lang['module_resource_msg']; ?></p>
 			<br />
@@ -218,14 +218,14 @@ 
 					LEFT JOIN {$tbl_site_snippets} AS ss ON ss.id = smd.resource AND smd.type = '40'
 					LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = '50'
 					LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = '60'", "smd.module={$id}", "smd.type,name");
-						include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+						include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 						$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items
 						$grd->noRecordMsg = $_lang["no_records_found"];
 						$grd->cssClass = "grid";
 						$grd->columnHeaderClass = "gridHeader";
 						$grd->itemClass = "gridItem";
 						$grd->altItemClass = "gridAltItem";
-						$grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
+						$grd->columns = $_lang["element_name"]." ,".$_lang["type"];
 						$grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
 						$grd->fields = "name,type";
 						echo $grd->render();

manager/actions/mutate_tmplvars.dynamic.php

Indentation +117 added lines, -117 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 if(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_template') && $modx->manager->action == '301') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
@@ -20,7 +20,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(2, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
 }
 // end check for lock
 
@@ -30,25 +30,25 @@ 
 global $content;
 $content = array();
 if(isset($_GET['id'])) {
-	$rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
-	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
-	}
-
-	$_SESSION['itemname'] = $content['caption'];
-	if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-	}
+    $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
+    $content = $modx->db->getRow($rs);
+    if(!$content) {
+        header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
+    }
+
+    $_SESSION['itemname'] = $content['caption'];
+    if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    }
 } else if(isset($_REQUEST['itemname'])) {
-	$content['name'] = $_REQUEST['itemname'];
+    $content['name'] = $_REQUEST['itemname'];
 } else {
-	$_SESSION['itemname'] = $_lang["new_tmplvars"];
-	$content['category'] = intval($_REQUEST['catid']);
+    $_SESSION['itemname'] = $_lang["new_tmplvars"];
+    $content['category'] = intval($_REQUEST['catid']);
 }
 
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
+    $modx->manager->loadFormValues();
 }
 
 $content = array_merge($content, $_POST);
@@ -62,7 +62,7 @@ 
 $RTEditors = '';
 $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1));
 if(is_array($evtOut)) {
-	$RTEditors = implode(',', $evtOut);
+    $RTEditors = implode(',', $evtOut);
 }
 
 ?>
@@ -277,12 +277,12 @@ 
 
 <form name="mutate" method="post" action="index.php" enctype="multipart/form-data">
 	<?php
-	// invoke OnTVFormPrerender event
-	$evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnTVFormPrerender event
+    $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="id" value="<?= $content['id'] ?>">
 	<input type="hidden" name="a" value="302">
 	<input type="hidden" name="or" value="<?= $origin ?>">
@@ -343,11 +343,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>
@@ -383,14 +383,14 @@ 
 							<optgroup label="Custom Type">
 								<option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option>
 								<?php
-								$custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
-								foreach($custom_tvs as $ctv) {
-									if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
-										$selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
-										echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
-									}
-								}
-								?>
+                                $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
+                                foreach($custom_tvs as $ctv) {
+                                    if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
+                                        $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
+                                        echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
+                                    }
+                                }
+                                ?>
 							</optgroup>
 						</select>
 					</div>
@@ -455,63 +455,63 @@ 
 					<a class="btn btn-secondary btn-sm" href="javascript:;" onClick="check_toggle(); return false;"><?= $_lang['check_toggle'] ?></a>
 				</div>
 				<?php
-				$rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
+                $rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
                     LEFT JOIN %s as stt ON stt.templateid=tpl.id AND stt.tmplvarid='%s'
                     LEFT JOIN %s as cat ON tpl.category=cat.id", $modx->getFullTableName('site_templates'), $modx->getFullTableName('site_tmplvar_templates'), $id, $modx->getFullTableName('categories')), '', "category, templatename");
 
-				$tplList = '<ul>';
-				$preCat = '';
-				$insideUl = 0;
-				while($row = $modx->db->getRow($rs)) {
-					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
-						$tplList .= $insideUl ? '</ul>' : '';
-						$tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
-						$insideUl = 1;
-					}
-
-					if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
-						$checked = true;
-					} elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
-						$checked = true;
-					} elseif($id == 0 && is_array($_POST['template'])) {
-						$checked = in_array($row['id'], $_POST['template']);
-					} else {
-						$checked = $row['tmplvarid'];
-					}
-					$selectable = !$row['selectable'] ? ' class="disabled"' : '';
-					$checked = $checked ? ' checked="checked"' : '';
-					$tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
-					$desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
-
-					$tplInfo = array();
-					if($row['tpllocked']) {
-						$tplInfo[] = $_lang['locked'];
-					}
-					if($row['id'] == $modx->config['default_template']) {
-						$tplInfo[] = $_lang['defaulttemplate_title'];
-					}
-					$tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : '';
-
-					$tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
-					$tplList .= '</li>';
-
-					$preCat = $row['category'];
-				}
-				$tplList .= $insideUl ? '</ul>' : '';
-				$tplList .= '</ul>';
-				echo $tplList;
-
-				?>
+                $tplList = '<ul>';
+                $preCat = '';
+                $insideUl = 0;
+                while($row = $modx->db->getRow($rs)) {
+                    $row['category'] = stripslashes($row['category']); //pixelchutes
+                    if($preCat !== $row['category']) {
+                        $tplList .= $insideUl ? '</ul>' : '';
+                        $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $insideUl = 1;
+                    }
+
+                    if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
+                        $checked = true;
+                    } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
+                        $checked = true;
+                    } elseif($id == 0 && is_array($_POST['template'])) {
+                        $checked = in_array($row['id'], $_POST['template']);
+                    } else {
+                        $checked = $row['tmplvarid'];
+                    }
+                    $selectable = !$row['selectable'] ? ' class="disabled"' : '';
+                    $checked = $checked ? ' checked="checked"' : '';
+                    $tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
+                    $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
+
+                    $tplInfo = array();
+                    if($row['tpllocked']) {
+                        $tplInfo[] = $_lang['locked'];
+                    }
+                    if($row['id'] == $modx->config['default_template']) {
+                        $tplInfo[] = $_lang['defaulttemplate_title'];
+                    }
+                    $tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : '';
+
+                    $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
+                    $tplList .= '</li>';
+
+                    $preCat = $row['category'];
+                }
+                $tplList .= $insideUl ? '</ul>' : '';
+                $tplList .= '</ul>';
+                echo $tplList;
+
+                ?>
 
 				<!-- Access Permissions -->
 				<?php
-				if($use_udperms == 1) {
-					// fetch permissions for the variable
-					$rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
-					$groupsarray = $modx->db->getColumn('documentgroup', $rs);
+                if($use_udperms == 1) {
+                    // fetch permissions for the variable
+                    $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
+                    $groupsarray = $modx->db->getColumn('documentgroup', $rs);
 
-					?>
+                    ?>
 					<?php if($modx->hasPermission('access_permissions')) { ?>
 						<script type="text/javascript">
 							function makePublic(b) {
@@ -539,29 +539,29 @@ 
 						<!--<b><?php /*echo $_lang['access_permissions']; */ ?></b>-->
 						<p><?= $_lang['tmplvar_access_msg'] ?></p>
 						<?php
-						$chk = '';
-						$rs = $modx->db->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
-							$groupsarray = $_POST['docgroups'];
-						}
-						while($row = $modx->db->getRow($rs)) {
-							$checked = in_array($row['id'], $groupsarray);
-							if($modx->hasPermission('access_permissions')) {
-								if($checked) {
-									$notPublic = true;
-								}
-								$chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
-							} else {
-								if($checked) {
-									echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
-								}
-							}
-						}
-						if($modx->hasPermission('access_permissions')) {
-							$chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
-						}
-						echo '<ul>' . $chks . '</ul>';
-						?>
+                        $chk = '';
+                        $rs = $modx->db->select('name, id', $tbl_documentgroup_names);
+                        if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+                            $groupsarray = $_POST['docgroups'];
+                        }
+                        while($row = $modx->db->getRow($rs)) {
+                            $checked = in_array($row['id'], $groupsarray);
+                            if($modx->hasPermission('access_permissions')) {
+                                if($checked) {
+                                    $notPublic = true;
+                                }
+                                $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
+                            } else {
+                                if($checked) {
+                                    echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
+                                }
+                            }
+                        }
+                        if($modx->hasPermission('access_permissions')) {
+                            $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
+                        }
+                        echo '<ul>' . $chks . '</ul>';
+                        ?>
 					<?php } ?>
 				<?php } ?>
 
@@ -571,12 +571,12 @@ 
 		<input type="submit" name="save" style="display:none">
 
 		<?php
-		// invoke OnTVFormRender event
-		$evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-		?>
+        // invoke OnTVFormRender event
+        $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+        ?>
 	</div>
 </form>
 <script type="text/javascript">setTimeout('showParameters()', 10);</script>

Spacing +49 added lines, -49 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (IN_MANAGER_MODE != "true") {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_template') && $modx->manager->action == '301') {
+if (!$modx->hasPermission('edit_template') && $modx->manager->action == '301') {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
-if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
+if (!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -19,7 +19,7 @@ 
 $tbl_documentgroup_names = $modx->getFullTableName('documentgroup_names');
 
 // check to see the snippet editor isn't locked
-if($lockedEl = $modx->elementIsLocked(2, $id)) {
+if ($lockedEl = $modx->elementIsLocked(2, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
 }
 // end check for lock
@@ -29,25 +29,25 @@ 
 
 global $content;
 $content = array();
-if(isset($_GET['id'])) {
+if (isset($_GET['id'])) {
 	$rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
 	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
+	if (!$content) {
+		header("Location: ".MODX_SITE_URL."index.php?id={$site_start}");
 	}
 
 	$_SESSION['itemname'] = $content['caption'];
-	if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
+	if ($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 	}
-} else if(isset($_REQUEST['itemname'])) {
+} else if (isset($_REQUEST['itemname'])) {
 	$content['name'] = $_REQUEST['itemname'];
 } else {
 	$_SESSION['itemname'] = $_lang["new_tmplvars"];
 	$content['category'] = intval($_REQUEST['catid']);
 }
 
-if($modx->manager->hasFormValues()) {
+if ($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();
 }
 
@@ -56,12 +56,12 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 2;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // get available RichText Editors
 $RTEditors = '';
 $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1));
-if(is_array($evtOut)) {
+if (is_array($evtOut)) {
 	$RTEditors = implode(',', $evtOut);
 }
 
@@ -107,7 +107,7 @@ 
 		},
 		cancel: function() {
 			documentDirty = false;
-			document.location.href = 'index.php?a=<?= $origin ?><?=($originId != NULL ? '&id=' . $originId : '') ?>';
+			document.location.href = 'index.php?a=<?= $origin ?><?=($originId != NULL ? '&id='.$originId : '') ?>';
 		}
 	};
 
@@ -279,7 +279,7 @@ 
 	<?php
 	// invoke OnTVFormPrerender event
 	$evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -291,7 +291,7 @@ 
 	<input type="hidden" name="params" value="<?= $modx->htmlspecialchars($content['display_params']) ?>">
 
 	<h1>
-		<i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i>
+		<i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i>
 	</h1>
 
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -314,8 +314,8 @@ 
 					<div class="col-md-9 col-lg-10">
 						<div class="form-control-name clearfix">
 							<input name="name" type="text" maxlength="50" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
-							<?php if($modx->hasPermission('save_role')): ?>
-								<label class="custom-control" title="<?= $_lang['lock_tmplvars'] . "\n" . $_lang['lock_tmplvars_msg'] ?>" tooltip>
+							<?php if ($modx->hasPermission('save_role')): ?>
+								<label class="custom-control" title="<?= $_lang['lock_tmplvars']."\n".$_lang['lock_tmplvars_msg'] ?>" tooltip>
 									<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
 									<i class="fa fa-lock"></i>
 								</label>
@@ -343,9 +343,9 @@ 
 						<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>
@@ -383,11 +383,11 @@ 
 							<optgroup label="Custom Type">
 								<option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option>
 								<?php
-								$custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
-								foreach($custom_tvs as $ctv) {
-									if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
-										$selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
-										echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
+								$custom_tvs = scandir(MODX_BASE_PATH.'assets/tvs');
+								foreach ($custom_tvs as $ctv) {
+									if (strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
+										$selected = ($content['type'] == 'custom_tv:'.$ctv ? "selected='selected'" : "");
+										echo '<option value="custom_tv:'.$ctv.'"  '.$selected.'>'.$ctv.'</option>';
 									}
 								}
 								?>
@@ -462,36 +462,36 @@ 
 				$tplList = '<ul>';
 				$preCat = '';
 				$insideUl = 0;
-				while($row = $modx->db->getRow($rs)) {
+				while ($row = $modx->db->getRow($rs)) {
 					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
+					if ($preCat !== $row['category']) {
 						$tplList .= $insideUl ? '</ul>' : '';
-						$tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+						$tplList .= '<li><strong>'.$row['category'].($row['catid'] != '' ? ' <small>('.$row['catid'].')</small>' : '').'</strong><ul>';
 						$insideUl = 1;
 					}
 
-					if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
+					if ($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
 						$checked = true;
-					} elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
+					} elseif (isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
 						$checked = true;
-					} elseif($id == 0 && is_array($_POST['template'])) {
+					} elseif ($id == 0 && is_array($_POST['template'])) {
 						$checked = in_array($row['id'], $_POST['template']);
 					} else {
 						$checked = $row['tmplvarid'];
 					}
 					$selectable = !$row['selectable'] ? ' class="disabled"' : '';
 					$checked = $checked ? ' checked="checked"' : '';
-					$tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
-					$desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
+					$tplId = '&nbsp;<small>('.$row['id'].')</small>';
+					$desc = !empty($row['tpldescription']) ? ' - '.$row['tpldescription'] : '';
 
 					$tplInfo = array();
-					if($row['tpllocked']) {
+					if ($row['tpllocked']) {
 						$tplInfo[] = $_lang['locked'];
 					}
-					if($row['id'] == $modx->config['default_template']) {
+					if ($row['id'] == $modx->config['default_template']) {
 						$tplInfo[] = $_lang['defaulttemplate_title'];
 					}
-					$tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : '';
+					$tplInfo = !empty($tplInfo) ? ' <em>('.join(', ', $tplInfo).')</em>' : '';
 
 					$tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
 					$tplList .= '</li>';
@@ -506,13 +506,13 @@ 
 
 				<!-- Access Permissions -->
 				<?php
-				if($use_udperms == 1) {
+				if ($use_udperms == 1) {
 					// fetch permissions for the variable
 					$rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
 					$groupsarray = $modx->db->getColumn('documentgroup', $rs);
 
 					?>
-					<?php if($modx->hasPermission('access_permissions')) { ?>
+					<?php if ($modx->hasPermission('access_permissions')) { ?>
 						<script type="text/javascript">
 							function makePublic(b) {
 								var notPublic = false;
@@ -541,26 +541,26 @@ 
 						<?php
 						$chk = '';
 						$rs = $modx->db->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+						if (empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
 							$groupsarray = $_POST['docgroups'];
 						}
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							$checked = in_array($row['id'], $groupsarray);
-							if($modx->hasPermission('access_permissions')) {
-								if($checked) {
+							if ($modx->hasPermission('access_permissions')) {
+								if ($checked) {
 									$notPublic = true;
 								}
-								$chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
+								$chks .= "<li><label><input type='checkbox' name='docgroups[]' value='".$row['id']."' ".($checked ? "checked='checked'" : '')." onclick=\"makePublic(false)\" /> ".$row['name']."</label></li>";
 							} else {
-								if($checked) {
-									echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
+								if ($checked) {
+									echo "<input type='hidden' name='docgroups[]'  value='".$row['id']."' />";
 								}
 							}
 						}
-						if($modx->hasPermission('access_permissions')) {
-							$chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
+						if ($modx->hasPermission('access_permissions')) {
+							$chks = "<li><label><input type='checkbox' name='chkalldocs' ".(!$notPublic ? "checked='checked'" : '')." onclick=\"makePublic(true)\" /> <span class='warning'>".$_lang['all_doc_groups']."</span></label></li>".$chks;
 						}
-						echo '<ul>' . $chks . '</ul>';
+						echo '<ul>'.$chks.'</ul>';
 						?>
 					<?php } ?>
 				<?php } ?>
@@ -573,7 +573,7 @@ 
 		<?php
 		// invoke OnTVFormRender event
 		$evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 		?>

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

@@ -11,7 +11,7 @@ 
 
 $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 $origin = isset($_REQUEST['or']) ? intval($_REQUEST['or']) : 76;
-$originId = isset($_REQUEST['oid']) ? intval($_REQUEST['oid']) : NULL;
+$originId = isset($_REQUEST['oid']) ? intval($_REQUEST['oid']) : null;
 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 $tbl_site_templates = $modx->getFullTableName('site_templates');
@@ -107,7 +107,7 @@ 
 		},
 		cancel: function() {
 			documentDirty = false;
-			document.location.href = 'index.php?a=<?= $origin ?><?=($originId != NULL ? '&id=' . $originId : '') ?>';
+			document.location.href = 'index.php?a=<?= $origin ?><?=($originId != null ? '&id=' . $originId : '') ?>';
 		}
 	};
 

manager/actions/mutate_tv_rank.dynamic.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 $updateMsg = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>';
+    $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>';
     foreach ($_POST as $listName => $listValue) {
         if ($listName == 'listSubmitted' || $listName == 'reset') {
             continue;
@@ -40,11 +40,11 @@ 
     $sortableList = '<div class="clearfix"><ul id="sortlist" class="sortableList">';
     while ($row = $modx->db->getRow($rs)) {
         $caption = $row['caption'] != '' ? $row['caption'] : $row['name'];
-        $sortableList .= '<li id="item_' . $row['id'] . '"><i class="fa fa-list-alt"></i> ' . $caption . ' <small class="protectedNode" style="float:right">[*' . $row['name'] . '*]</small></li>';
+        $sortableList .= '<li id="item_'.$row['id'].'"><i class="fa fa-list-alt"></i> '.$caption.' <small class="protectedNode" style="float:right">[*'.$row['name'].'*]</small></li>';
     }
     $sortableList .= '</ul></div>';
 } else {
-    $updateMsg = '<p class="text-danger">' . $_lang['tmplvars_novars'] . '</p>';
+    $updateMsg = '<p class="text-danger">'.$_lang['tmplvars_novars'].'</p>';
 }
 ?>
 

manager/actions/modules.static.php

Spacing +12 added lines, -12 removed lines

@@ -25,7 +25,7 @@ 
 

 

 // context menu

-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";

 $cm = new ContextMenu("cntxm", 150);

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

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

@@ -108,24 +108,24 @@ 
     <div class="table-responsive">

         <?php

         if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

-            $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

+            $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"'.$_lang['yes'].'","-") as disabled, IF(sm.icon<>"",sm.icon,"'.$_style['icons_modules'].'") as icon

+				FROM ' . $modx->getFullTableName('site_modules').' AS sm

+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id

+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group

+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

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

-                $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

+                $title = "<a href='index.php?a=108&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";

             } else if ($modx->hasPermission('exec_module')) {

-                $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

+                $title = "<a href='index.php?a=112&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";

             } else {

                 $title = '[+value+]';

             }

         } else {

             $rs = $modx->db->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

-            $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

+            $title = "<a href='index.php?a=108&id=[+id+]' title='".$_lang["module_edit_click_title"]."'>[+value+]</a>";

         }

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

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

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

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

         $grd->cssClass = "table data";

@@ -133,10 +133,10 @@ 
         $grd->itemClass = "tableItem";

         $grd->altItemClass = "tableAltItem";

         $grd->fields = "icon,name,description,locked,disabled";

-        $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];

+        $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["description"]." ,".$_lang["locked"]." ,".$_lang["disabled"];

         $grd->colWidths = "34,,,60,60";

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

-        $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

+        $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang["click_to_context"]."'><i class='[+value+]'></i></a>||template:".$title;

         if ($listmode == '1') {

             $grd->pageSize = 0;

         }

Braces +12 added lines, -12 removed lines

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

-if (IN_MANAGER_MODE != "true") {

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

 }

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

+if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

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

 

 // get and save search string

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

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

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

-} else {

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

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

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

@@ -28,7 +28,7 @@ 
 include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

 $cm = new ContextMenu("cntxm", 150);

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

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

+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
     $cm->addSeparator();

 }

 $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));

@@ -107,21 +107,21 @@ 
 <div class="tab-page">

     <div class="table-responsive">

         <?php

-        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
             $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

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

+            if ($modx->hasPermission('edit_module')) {
                 $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else if ($modx->hasPermission('exec_module')) {

+            } else if ($modx->hasPermission('exec_module')) {
                 $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else {

+            } else {
                 $title = '[+value+]';

             }

-        } else {

+        } else {
             $rs = $modx->db->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

             $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

         }

@@ -137,10 +137,10 @@ 
         $grd->colWidths = "34,,,60,60";

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

         $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

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

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

         }

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

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

         }

         // render grid

manager/actions/resources/functions.inc.php

Indentation +215 added lines, -215 removed lines

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

 if(IN_MANAGER_MODE != "true") {

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

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

 }

 

 $tpl = array(

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

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

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

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

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

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

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

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

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

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

 );

 

 function parsePh($tpl, $ph) {

-	global $modx, $_lang;

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

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

+    global $modx, $_lang;

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

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

 }

 

 function renderViewSwitchButtons($cssId) {

-	global $modx, $_lang, $tpl;

+    global $modx, $_lang, $tpl;

 

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

-		'cssId' => $cssId

-	));

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

+        'cssId' => $cssId

+    ));

 }

 

 function createResourceList($resourceTable, $resources) {

-	global $modx, $_lang, $_style, $modx_textdir, $tpl;

-

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

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

-

-	if(!$items) {

-		return $_lang['no_results'];

-	}

-

-	// Prepare elements- and categories-list

-	$elements = array();

-	$categories = array();

-	foreach($items as $row) {

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

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

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

-	}

-

-	// Now render categories / panel-collapse

-	$panelGroup = '';

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

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

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

-			'tab' => $resourceTable,

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

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

-			'catid' => $catid,

-		));

-

-		// Prepare content for panel-collapse

-		$panelCollapse = '';

-		foreach($elList as $el) {

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

-		}

-

-		// Add panel-collapse with elements to output

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

-			'tab' => $resourceTable,

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

-

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

-		'resourceTable' => $resourceTable,

-		'wrapper' => $panelGroup

-	));

+    global $modx, $_lang, $_style, $modx_textdir, $tpl;

+

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

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

+

+    if(!$items) {

+        return $_lang['no_results'];

+    }

+

+    // Prepare elements- and categories-list

+    $elements = array();

+    $categories = array();

+    foreach($items as $row) {

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

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

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

+    }

+

+    // Now render categories / panel-collapse

+    $panelGroup = '';

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

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

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

+            'tab' => $resourceTable,

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

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

+            'catid' => $catid,

+        ));

+

+        // Prepare content for panel-collapse

+        $panelCollapse = '';

+        foreach($elList as $el) {

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

+        }

+

+        // Add panel-collapse with elements to output

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

+            'tab' => $resourceTable,

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

+

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

+        'resourceTable' => $resourceTable,

+        'wrapper' => $panelGroup

+    ));

 }

 

 function createCombinedView($resources) {

-	global $modx, $_lang, $_style, $modx_textdir;

-

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

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

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

-

-	if(!$itemsPerCategory) {

-		return $_lang['no_results'];

-	}

-

-	$tpl = array(

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

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

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

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

-	);

-

-	// Easily loop through $itemsPerCategory-Array

-	$panelGroup = '';

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

-		// Prepare collapse content / elements-list

-		$panelCollapse = '';

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

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

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

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

-		}

-

-		// Add panel-heading / button

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

-			'tab' => 'categories_list',

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

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

-			'catid' => $catid,

-		));

-

-		// Add panel

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

-			'tab' => 'categories_list',

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

-

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

-		'resourceTable' => 'categories_list',

-		'wrapper' => $panelGroup

-	));

+    global $modx, $_lang, $_style, $modx_textdir;

+

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

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

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

+

+    if(!$itemsPerCategory) {

+        return $_lang['no_results'];

+    }

+

+    $tpl = array(

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

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

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

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

+    );

+

+    // Easily loop through $itemsPerCategory-Array

+    $panelGroup = '';

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

+        // Prepare collapse content / elements-list

+        $panelCollapse = '';

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

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

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

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

+        }

+

+        // Add panel-heading / button

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

+            'tab' => 'categories_list',

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

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

+            'catid' => $catid,

+        ));

+

+        // Add panel

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

+            'tab' => 'categories_list',

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

+

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

+        'resourceTable' => 'categories_list',

+        'wrapper' => $panelGroup

+    ));

 }

 

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

-	global $modx, $modx_textdir, $_style, $_lang;

-

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

-

-	$class = '';

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

-

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

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

-		$lockElementType = 1;

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

-	}

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

-		$class = $row['reltpl'] ? '' : 'disabledPlugin';

-		$lockElementType = 2;

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

-	}

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

+    global $modx, $modx_textdir, $_style, $_lang;

+

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

+

+    $class = '';

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

+

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

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

+        $lockElementType = 1;

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

+    }

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

+        $class = $row['reltpl'] ? '' : 'disabledPlugin';

+        $lockElementType = 2;

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

+    }

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

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

-		$lockElementType = 3;

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

-	}

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

+        $lockElementType = 3;

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

+    }

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

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

-		$lockElementType = 4;

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

-	}

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

-		$class = $row['disabled'] ? 'disabledPlugin' : '';

-		$lockElementType = 5;

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

-	}

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

+        $lockElementType = 4;

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

+    }

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

+        $class = $row['disabled'] ? 'disabledPlugin' : '';

+        $lockElementType = 5;

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

+    }

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

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

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

-	}

-

-	// Prepare displaying user-locks

-	$lockedByUser = '';

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

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

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

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

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

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

-			));

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

-		} else {

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

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

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

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

-			));

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

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

-			} else {

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

-			}

-		}

-	}

-	if($lockedByUser) {

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

-	}

-

-	// Caption

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

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

-	} else {

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

-	}

-

-	// Special marks

-	$tplInfo = array();

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

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

-	}

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

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

-	}

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

-

-	/* row buttons */

-	$buttons = '';

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

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

-	}

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

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

-	}

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

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

-	}

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

-

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

-

-	// Placeholders for elements-row

-	return array(

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

-		'lockedByUser' => $lockedByUser,

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

-		'caption' => $caption,

-		'buttons' => $buttons,

-		'marks' => $marks,

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

-		'resourceTable' => $resourceTable,

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

-		'catid' => $catid,

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

-	);

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

+    }

+

+    // Prepare displaying user-locks

+    $lockedByUser = '';

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

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

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

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

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

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

+            ));

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

+        } else {

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

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

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

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

+            ));

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

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

+            } else {

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

+            }

+        }

+    }

+    if($lockedByUser) {

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

+    }

+

+    // Caption

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

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

+    } else {

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

+    }

+

+    // Special marks

+    $tplInfo = array();

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

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

+    }

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

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

+    }

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

+

+    /* row buttons */

+    $buttons = '';

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

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

+    }

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

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

+    }

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

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

+    }

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

+

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

+

+    // Placeholders for elements-row

+    return array(

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

+        'lockedByUser' => $lockedByUser,

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

+        'caption' => $caption,

+        'buttons' => $buttons,

+        'marks' => $marks,

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

+        'resourceTable' => $resourceTable,

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

+        'catid' => $catid,

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

+    );

 }

Spacing +54 added lines, -54 removed lines

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

-if(IN_MANAGER_MODE != "true") {

+if (IN_MANAGER_MODE != "true") {

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

 }

 

 $tpl = array(

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

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

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

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

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

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

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

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

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

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

 );

 

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph){

 	global $modx, $_lang;

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

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

 }

 

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId){

 	global $modx, $_lang, $tpl;

 

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

@@ -25,20 +25,20 @@ 
 	));

 }

 

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources){

 	global $modx, $_lang, $_style, $modx_textdir, $tpl;

 

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

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

 

-	if(!$items) {

+	if (!$items) {

 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach ($items as $row) {

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

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

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

@@ -46,18 +46,18 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

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

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

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

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

 			'tab' => $resourceTable,

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

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

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

 			'catid' => $catid,

 		));

 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach ($elList as $el) {

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

 		}

 

@@ -75,30 +75,30 @@ 
 	));

 }

 

-function createCombinedView($resources) {

+function createCombinedView($resources){

 	global $modx, $_lang, $_style, $modx_textdir;

 

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

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

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

 

-	if(!$itemsPerCategory) {

+	if (!$itemsPerCategory) {

 		return $_lang['no_results'];

 	}

 

 	$tpl = array(

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

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

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

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

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

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

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

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

 	);

 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

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

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

 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

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

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

 			$resourceTable = $el['type'];

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

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

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

 			'tab' => 'categories_list',

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

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

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

 			'catid' => $catid,

 		));

 

@@ -126,7 +126,7 @@ 
 	));

 }

 

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

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

 	global $modx, $modx_textdir, $_style, $_lang;

 

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

@@ -134,32 +134,32 @@ 
 	$class = '';

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

 

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

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

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

 		$lockElementType = 1;

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

 	}

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

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

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

 		$lockElementType = 2;

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

 	}

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

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

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

 		$lockElementType = 3;

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

 	}

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

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

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

 		$lockElementType = 4;

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

 	}

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

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

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

 		$lockElementType = 5;

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

 	}

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

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

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

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

 	}

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

 	$lockedByUser = '';

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

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

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

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

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

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

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

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

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

 			));

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

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

 		} else {

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

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

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

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

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

 			));

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

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

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

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

 			} else {

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

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

 			}

 		}

 	}

-	if($lockedByUser) {

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

+	if ($lockedByUser) {

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

 	}

 

 	// Caption

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

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

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

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

 	} else {

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

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

 	}

 

 	// Special marks

 	$tplInfo = array();

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

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

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

 	}

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

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

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

 	}

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

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

 

 	/* row buttons */

 	$buttons = '';

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

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

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

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

 	}

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

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

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

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

 	}

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

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

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

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

 	}

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

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

 

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

 

 	// Placeholders for elements-row

 	return array(

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

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

 		'lockedByUser' => $lockedByUser,

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

 		'caption' => $caption,

Braces +37 added lines, -32 removed lines

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

-if(IN_MANAGER_MODE != "true") {

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

 }

 

@@ -11,13 +11,15 @@ 
 	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

 );

 

-function parsePh($tpl, $ph) {

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

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

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

 }

 

-function renderViewSwitchButtons($cssId) {

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

 

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

@@ -25,20 +27,21 @@ 
 	));

 }

 

-function createResourceList($resourceTable, $resources) {

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

 

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

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

 

-	if(!$items) {

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

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

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

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

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

@@ -46,7 +49,7 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

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

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

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

 			'tab' => $resourceTable,

@@ -57,7 +60,7 @@ 
 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

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

 		}

 

@@ -75,14 +78,15 @@ 
 	));

 }

 

-function createCombinedView($resources) {

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

 

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

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

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

 

-	if(!$itemsPerCategory) {

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

 	}

 

@@ -95,10 +99,10 @@ 
 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

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

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

 		$panelCollapse = '';

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

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

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

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

@@ -126,7 +130,8 @@ 
 	));

 }

 

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

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

 

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

@@ -134,32 +139,32 @@ 
 	$class = '';

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

 

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

+	if($resourceTable == 'site_templates') {
 		$class = $row['selectable'] ? '' : 'disabledPlugin';

 		$lockElementType = 1;

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

 	}

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

+	if($resourceTable == 'site_tmplvars') {
 		$class = $row['reltpl'] ? '' : 'disabledPlugin';

 		$lockElementType = 2;

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

 	}

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

+	if($resourceTable == 'site_htmlsnippets') {
         $class = $row['disabled'] ? 'disabledPlugin' : '';

 		$lockElementType = 3;

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

 	}

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

+	if($resourceTable == 'site_snippets') {
         $class = $row['disabled'] ? 'disabledPlugin' : '';

 		$lockElementType = 4;

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

 	}

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

+	if($resourceTable == 'site_plugins') {
 		$class = $row['disabled'] ? 'disabledPlugin' : '';

 		$lockElementType = 5;

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

 	}

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

+	if($resourceTable == 'site_modules') {
         $class = $row['disabled'] ? '' : 'disabledPlugin';

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

 	}

@@ -167,56 +172,56 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

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

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

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

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

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

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

 			));

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

-		} else {

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

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

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

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

 			));

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

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

-			} else {

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

 			}

 		}

 	}

-	if($lockedByUser) {

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

 	}

 

 	// Caption

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

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

-	} else {

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

 	}

 

 	// Special marks

 	$tplInfo = array();

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

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

 	}

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

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

 	}

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

 

 	/* row buttons */

 	$buttons = '';

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

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

 	}

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

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

 	}

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

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

 	}

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

manager/actions/resources/mgrResources.class.php

Indentation +101 added lines, -101 removed lines

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

Spacing +37 added lines, -37 removed lines

@@ -1,75 +1,75 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
-class mgrResources {
+class mgrResources{
 	var $types = array();
 	var $items = array();
 	var $categories = array();
 	var $itemsPerCategory = array();
 	
-	function __construct() {
+	function __construct(){
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
 	}
 
-	function setTypes() {
+	function setTypes(){
 		global $_lang;
-		$this->types['site_templates']    = array(
+		$this->types['site_templates'] = array(
 			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
+			'actions'=>array('edit'=>array(16, 'edit_template'), 'duplicate'=>array(96, 'new_template'), 'remove'=>array(21, 'delete_template')),
+			'permissions'=>array('new_template', 'edit_template'),
 			'name'=>'templatename'
 		);
-		$this->types['site_tmplvars']     = array(
+		$this->types['site_tmplvars'] = array(
 			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
+			'actions'=>array('edit'=>array(301, 'edit_template'), 'duplicate'=>array(304, 'edit_template'), 'remove'=>array(303, 'edit_template')),
+			'permissions'=>array('new_template', 'edit_template'),
 		);
 		$this->types['site_htmlsnippets'] = array(
 			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
+			'actions'=>array('edit'=>array(78, 'edit_chunk'), 'duplicate'=>array(97, 'new_chunk'), 'remove'=>array(80, 'delete_chunk')),
+			'permissions'=>array('new_chunk', 'edit_chunk'),
 		);
-		$this->types['site_snippets']     = array(
+		$this->types['site_snippets'] = array(
 			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
+			'actions'=>array('edit'=>array(22, 'edit_snippet'), 'duplicate'=>array(98, 'new_snippet'), 'remove'=>array(25, 'delete_snippet')),
+			'permissions'=>array('new_snippet', 'edit_snippet'),
 		);
-		$this->types['site_plugins']      = array(
+		$this->types['site_plugins'] = array(
 			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
+			'actions'=>array('edit'=>array(102, 'edit_plugin'), 'duplicate'=>array(105, 'new_plugin'), 'remove'=>array(104, 'delete_plugin')),
+			'permissions'=>array('new_plugin', 'edit_plugin'),
 		);
-		$this->types['site_modules']      = array(
+		$this->types['site_modules'] = array(
 			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
+			'actions'=>array('edit'=>array(108, 'edit_module'), 'duplicate'=>array(111, 'new_module'), 'remove'=>array(110, 'delete_module')),
+			'permissions'=>array('new_module', 'edit_module'),
 		);
 	}
 	
-	function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
+	function queryItemsFromDB(){
+		foreach ($this->types as $resourceTable=>$type) {
+			if ($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
 				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
 		   }
 		 }
 	}
 
-	function hasAnyPermissions($permissions) {
+	function hasAnyPermissions($permissions){
 		global $modx;
 		
-		foreach($permissions as $p) 
-			if($modx->hasPermission($p)) return true;
+		foreach ($permissions as $p) 
+			if ($modx->hasPermission($p)) return true;
 		
 		return false;
 	}
 
-	function queryResources($resourceTable, $nameField = 'name') {
+	function queryResources($resourceTable, $nameField = 'name'){
 		global $modx, $_lang;
 
-		$pluginsql = ($resourceTable == 'site_htmlsnippets' || $resourceTable == 'site_snippets' || $resourceTable == 'site_plugins' || $resourceTable == 'site_modules') ? $resourceTable . '.disabled, ' : '';
+		$pluginsql = ($resourceTable == 'site_htmlsnippets' || $resourceTable == 'site_snippets' || $resourceTable == 'site_plugins' || $resourceTable == 'site_modules') ? $resourceTable.'.disabled, ' : '';
 
 		$tvsql  = '';
 		$tvjoin = '';
@@ -84,14 +84,14 @@ 
 
 		$rs = $modx->db->select(
 			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
-	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
+			$modx->getFullTableName($resourceTable)." AS {$resourceTable}
+	            LEFT JOIN ".$modx->getFullTableName('categories')." AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
 			"",
 			"category,name"
 		);
 		$limit = $modx->db->getRecordCount($rs);
 		
-		if($limit < 1) return false;
+		if ($limit < 1) return false;
 		
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -100,9 +100,9 @@ 
 		return $result;
 	}
 
-	function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
+	function prepareCategoryArrays(){
+		foreach ($this->items as $type=>$items) {
+			foreach ((array) $items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
 				$this->categories[$catid] = $item['category'];
 				
@@ -115,8 +115,8 @@ 
 		natcasesort($this->categories);
 		
 		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+		foreach ($this->itemsPerCategory as $catid=>$items) {
+			usort($this->itemsPerCategory[$catid], function($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

Braces +26 added lines, -13 removed lines

@@ -1,19 +1,24 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 
-class mgrResources {
+class mgrResources
+{
 	var $types = array();
 	var $items = array();
 	var $categories = array();
 	var $itemsPerCategory = array();
 	
-	function __construct() {
+	function __construct()
+	{
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
 	}
 
-	function setTypes() {
+	function setTypes()
+	{
 		global $_lang;
 		$this->types['site_templates']    = array(
 			'title'=>$_lang["manage_templates"],
@@ -48,7 +53,8 @@ 
 		);
 	}
 	
-	function queryItemsFromDB() {
+	function queryItemsFromDB()
+	{
 		foreach($this->types as $resourceTable=>$type) {
 			if($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -57,16 +63,19 @@ 
 		 }
 	}
 
-	function hasAnyPermissions($permissions) {
+	function hasAnyPermissions($permissions)
+	{
 		global $modx;
 		
-		foreach($permissions as $p) 
-			if($modx->hasPermission($p)) return true;
+		foreach($permissions as $p) {
+					if($modx->hasPermission($p)) return true;
+		}
 		
 		return false;
 	}
 
-	function queryResources($resourceTable, $nameField = 'name') {
+	function queryResources($resourceTable, $nameField = 'name')
+	{
 		global $modx, $_lang;
 
 		$pluginsql = ($resourceTable == 'site_htmlsnippets' || $resourceTable == 'site_snippets' || $resourceTable == 'site_plugins' || $resourceTable == 'site_modules') ? $resourceTable . '.disabled, ' : '';
@@ -77,8 +86,9 @@ 
 			$tvsql    = 'site_tmplvars.caption, ';
 			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
 			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+		} else {
+		    $sttfield = '';
 		}
-		else $sttfield = '';
 
 		$selectableTemplates = $resourceTable == 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -91,7 +101,9 @@ 
 		);
 		$limit = $modx->db->getRecordCount($rs);
 		
-		if($limit < 1) return false;
+		if($limit < 1) {
+		    return false;
+		}
 		
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -100,7 +112,8 @@ 
 		return $result;
 	}
 
-	function prepareCategoryArrays() {
+	function prepareCategoryArrays()
+	{
 		foreach($this->items as $type=>$items) {
 			foreach((array)$items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
@@ -116,7 +129,7 @@ 
 		
 		// Now sort by name
 		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+			usort($this->itemsPerCategory[$catid], function ($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

manager/actions/sysinfo.static.php

Spacing +13 added lines, -13 removed lines

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

 

 $serverArr = array(

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

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

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

     'PHP Version' => phpversion(),

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

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

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

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

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

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

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

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

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

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

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

                     <tbody>

                     <?php

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

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

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

                     $i = 0;

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

                         ?>

                         <tr>

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

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

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

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

 

                             <?php

                             $truncateable = array(

-                                $modx->db->config['table_prefix'] . 'event_log',

-                                $modx->db->config['table_prefix'] . 'manager_log',

+                                $modx->db->config['table_prefix'].'event_log',

+                                $modx->db->config['table_prefix'].'manager_log',

                             );

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

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

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

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

                                 echo "</td>";

                             } else {

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

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

                             }

 

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

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

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

                             } else {

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

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

                             }

                             ?>

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

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

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

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

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

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

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

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

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

                     </tr>

                     </tbody>

                 </table>

Braces +8 added lines, -8 removed lines

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

-if (IN_MANAGER_MODE != "true") {

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

 }

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

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

 }

 

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

                     <tbody>

                     <?php

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

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

                         <tr>

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

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

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

                     $i = 0;

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

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

                         <tr>

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

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

                                 $modx->db->config['table_prefix'] . 'manager_log',

                             );

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

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

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

                                 echo "</td>";

-                            } else {

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

                             }

 

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

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

-                            } else {

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

                             }

                             ?>

manager/actions/mutate_password.dynamic.php

Indentation +2 added lines, -2 removed lines

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

 if(IN_MANAGER_MODE != "true") {

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

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

 }

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

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

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

 }

 ?>

 

Spacing +2 added lines, -2 removed lines

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

-if(IN_MANAGER_MODE != "true") {

+if (IN_MANAGER_MODE != "true") {

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

 }

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

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

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

 }

 ?>

Braces +2 added lines, -2 removed lines

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

-if(IN_MANAGER_MODE != "true") {

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

 }

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

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

 }

 ?>

manager/actions/refresh_site.dynamic.php

Indentation +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if(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.");
 }
 
 // (un)publishing of documents, version 2!
@@ -32,9 +32,9 @@ 
 		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
 		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
 		<?php
-		$modx->clearCache('full', true);
-		// invoke OnSiteRefresh event
-		$modx->invokeEvent("OnSiteRefresh");
-		?>
+        $modx->clearCache('full', true);
+        // invoke OnSiteRefresh event
+        $modx->invokeEvent("OnSiteRefresh");
+        ?>
 	</div>
 </div>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (IN_MANAGER_MODE != "true") {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -29,8 +29,8 @@ 
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
-		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
+		<?php if ($num_rows_pub)   printf('<p>'.$_lang["refresh_published"].'</p>', $num_rows_pub) ?>
+		<?php if ($num_rows_unpub) printf('<p>'.$_lang["refresh_unpublished"].'</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
 		// invoke OnSiteRefresh event

Braces +3 added lines, -1 removed lines

@@ -29,10 +29,12 @@
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
+		<?php if($num_rows_pub) {
+    printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
 		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
+}
 		// invoke OnSiteRefresh event
 		$modx->invokeEvent("OnSiteRefresh");
 		?>