evolution-cms / evolution

manager/actions/messages.static.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('messages')) {
@@ -16,7 +16,7 @@ 
         <div class="container container-body" id="lyr3">
             <b><?= $_lang['messages_read_message'] ?></b>
             <?php
-            $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'");
+            $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_messages'), "id='".(int) $_REQUEST['id']."'");
             $message = $modx->getDatabase()->getRow($rs);
             if (!$message) {
                 echo "Wrong number of messages returned!";
@@ -87,7 +87,7 @@ 
         <p><b><?= $_lang['messages_inbox'] ?></b></p>
         <?php
         // Get  number of rows
-        $rs = $modx->getDatabase()->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+        $rs = $modx->getDatabase()->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."");
         $num_rows = $modx->getDatabase()->getValue($rs);
 
         // ==============================================================
@@ -100,7 +100,7 @@ 
         if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
             $int_cur_position = 0;
         } else {
-            $int_cur_position = (int)$_REQUEST['int_cur_position'];
+            $int_cur_position = (int) $_REQUEST['int_cur_position'];
         }
 
         // Number of result to display on the page, will be in the LIMIT of the sql query also
@@ -116,21 +116,21 @@ 
         $array_row_paging = $p->getPagingRowArray();
 
         // Display the result as you like...
-        $pager .= $_lang['showing'] . " " . $array_paging['lower'];
-        $pager .= " " . $_lang['to'] . " " . $array_paging['upper'];
-        $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")";
-        $pager .= "<br />" . $array_paging['previous_link'] . "&lt;&lt;" . (isset($array_paging['previous_link']) ? "</a> " : " ");
+        $pager .= $_lang['showing']." ".$array_paging['lower'];
+        $pager .= " ".$_lang['to']." ".$array_paging['upper'];
+        $pager .= " (".$array_paging['total']." ".$_lang['total'].")";
+        $pager .= "<br />".$array_paging['previous_link']."&lt;&lt;".(isset($array_paging['previous_link']) ? "</a> " : " ");
         for ($i = 0; $i < sizeof($array_row_paging); $i++) {
-            $pager .= $array_row_paging[$i] . "&nbsp;";
+            $pager .= $array_row_paging[$i]."&nbsp;";
         }
-        $pager .= $array_paging['next_link'] . "&gt;&gt;" . (isset($array_paging['next_link']) ? "</a>" : "");
+        $pager .= $array_paging['next_link']."&gt;&gt;".(isset($array_paging['next_link']) ? "</a>" : "");
 
         // The above exemple print somethings like:
         // Results 1 to 20 of 597  <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
         // Of course you can now play with array_row_paging in order to print
         // only the results you would like...
 
-        $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
+        $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
         $limit = $modx->getDatabase()->getRecordCount($rs);
         if ($limit < 1) {
             echo $_lang['messages_no_messages'];
@@ -188,7 +188,7 @@ 
         <p><b><?= $_lang['messages_compose'] ?></b></p>
         <?php
         if (($_REQUEST['m'] == 'rp' || $_REQUEST['m'] == 'f') && isset($_REQUEST['id'])) {
-            $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'");
+            $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_messages'), "id='".$_REQUEST['id']."'");
             $message = $modx->getDatabase()->getRow($rs);
             if (!$message) {
                 echo "Wrong number of messages returned!";
@@ -207,7 +207,7 @@ 
                     }
                     $subjecttext = $_REQUEST['m'] == 'rp' ? "Re: " : "Fwd: ";
                     $subjecttext .= $message['subject'];
-                    $messagetext = "\n\n\n-----\n" . $_lang['messages_from'] . ": $sendername\n" . $_lang['messages_sent'] . ": " . $modx->toDateFormat($message['postdate'] + $server_offset_time) . "\n" . $_lang['messages_subject'] . ": " . $message['subject'] . "\n\n" . $message['message'];
+                    $messagetext = "\n\n\n-----\n".$_lang['messages_from'].": $sendername\n".$_lang['messages_sent'].": ".$modx->toDateFormat($message['postdate'] + $server_offset_time)."\n".$_lang['messages_subject'].": ".$message['subject']."\n\n".$message['message'];
                     if ($_REQUEST['m'] == 'rp') {
                         $recipientindex = $message['sender'];
                     }
@@ -294,9 +294,9 @@ 
 
 <?php
 // count messages again, as any action on the messages page may have altered the message count
-$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . " and messageread=0");
+$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." and messageread=0");
 $_SESSION['nrnewmessages'] = $modx->getDatabase()->getValue($rs);
-$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."");
 $_SESSION['nrtotalmessages'] = $modx->getDatabase()->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 ?>

manager/actions/mutate_templates.dynamic.php

Indentation +124 added lines, -124 removed lines

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

Switch Indentation +12 added lines, -12 removed lines

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

Spacing +44 added lines, -44 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-switch($modx->getManagerApi()->action) {
+switch ($modx->getManagerApi()->action) {
 	case 16:
-		if(!$modx->hasPermission('edit_template')) {
+		if (!$modx->hasPermission('edit_template')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 19:
-		if(!$modx->hasPermission('new_template')) {
+		if (!$modx->hasPermission('new_template')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -18,12 +18,12 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_site_templates = $modx->getFullTableName('site_templates');
 
 // check to see the snippet editor isn't locked
-if($lockedEl = $modx->elementIsLocked(1, $id)) {
+if ($lockedEl = $modx->elementIsLocked(1, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['template']));
 }
 // end check for lock
@@ -32,23 +32,23 @@ 
 $modx->lockElement(1, $id);
 
 $content = array();
-if(!empty($id)) {
+if (!empty($id)) {
 	$rs = $modx->getDatabase()->select('*', $tbl_site_templates, "id='{$id}'");
 	$content = $modx->getDatabase()->getRow($rs);
-	if(!$content) {
+	if (!$content) {
 		$modx->webAlertAndQuit("No database record has been found for this template.");
 	}
 
 	$_SESSION['itemname'] = $content['templatename'];
-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+	if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 	}
 } else {
 	$_SESSION['itemname'] = $_lang["new_template"];
-	$content['category'] = (int)$_REQUEST['catid'];
+	$content['category'] = (int) $_REQUEST['catid'];
 }
 
-if($modx->getManagerApi()->hasFormValues()) {
+if ($modx->getManagerApi()->hasFormValues()) {
 	$modx->getManagerApi()->loadFormValues();
 }
 
@@ -58,7 +58,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 1;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 <script type="text/javascript">
 
@@ -100,7 +100,7 @@ 
 	<?php
 	// invoke OnTempFormPrerender event
 	$evtOut = $modx->invokeEvent("OnTempFormPrerender", array("id" => $id));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -109,7 +109,7 @@ 
 	<input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
 
 	<h1>
-		<i class="fa fa-newspaper-o"></i><?= ($content['templatename'] ? $content['templatename'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_template']) ?><i class="fa fa-question-circle help"></i>
+		<i class="fa fa-newspaper-o"></i><?= ($content['templatename'] ? $content['templatename'].'<small>('.$content['id'].')</small>' : $_lang['new_template']) ?><i class="fa fa-question-circle help"></i>
 	</h1>
 
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -132,15 +132,15 @@ 
 					<div class="row form-row">
 						<label class="col-md-3 col-lg-2">
 							<?= $_lang['template_name'] ?>
-							<?php if($id == $modx->config['default_template']) {
-								echo '<small class="form-text text-danger">' . mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset) . '</small>';
+							<?php if ($id == $modx->config['default_template']) {
+								echo '<small class="form-text text-danger">'.mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset).'</small>';
 							} ?>
 						</label>
 						<div class="col-md-9 col-lg-10">
 							<div class="form-control-name clearfix">
 								<input name="templatename" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['templatename']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;">
-								<?php if($modx->hasPermission('save_role')): ?>
-									<label class="custom-control" title="<?= $_lang['lock_template'] . "\n" . $_lang['lock_template_msg'] ?>" tooltip>
+								<?php if ($modx->hasPermission('save_role')): ?>
+									<label class="custom-control" title="<?= $_lang['lock_template']."\n".$_lang['lock_template_msg'] ?>" tooltip>
 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
 										<i class="fa fa-lock"></i>
 									</label>
@@ -162,9 +162,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->getPhpCompat()->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->getPhpCompat()->htmlspecialchars($v["category"])."</option>";
 								}
 								?>
 							</select>
@@ -177,7 +177,7 @@ 
 						</div>
 					</div>
 				</div>
-				<?php if($modx->hasPermission('save_role')): ?>
+				<?php if ($modx->hasPermission('save_role')): ?>
 					<div class="form-group">
 						<label>
 							<input name="selectable" type="checkbox"<?= ($selectable == 1 ? ' checked="checked"' : '') ?> /> <?= $_lang['template_selectable'] ?></label>
@@ -198,30 +198,30 @@ 
 
 			<?php
 			$selectedTvs = array();
-			if(!isset($_POST['assignedTv'])) {
+			if (!isset($_POST['assignedTv'])) {
 				$rs = $modx->getDatabase()->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category", $_lang['no_category']), sprintf("%s tv
                 LEFT JOIN %s tr ON tv.id=tr.tmplvarid
                 LEFT JOIN %s cat ON tv.category=cat.id", $modx->getFullTableName('site_tmplvars'), $modx->getFullTableName('site_tmplvar_templates'), $modx->getFullTableName('categories')), "templateid='{$id}'", "tr.rank DESC, tv.rank DESC, tvcaption DESC, tvid DESC"     // workaround for correct sort of none-existing ranks
 				);
-				while($row = $modx->getDatabase()->getRow($rs)) {
+				while ($row = $modx->getDatabase()->getRow($rs)) {
 					$selectedTvs[$row['tvid']] = $row;
 				}
-				$selectedTvs = array_reverse($selectedTvs, true);       // reverse ORDERBY DESC
+				$selectedTvs = array_reverse($selectedTvs, true); // reverse ORDERBY DESC
 			}
 
 			$unselectedTvs = array();
 			$rs = $modx->getDatabase()->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category, cat.id as catid", $_lang['no_category']), sprintf("%s tv
 	    LEFT JOIN %s tr ON tv.id=tr.tmplvarid
 	    LEFT JOIN %s cat ON tv.category=cat.id", $modx->getFullTableName('site_tmplvars'), $modx->getFullTableName('site_tmplvar_templates'), $modx->getFullTableName('categories')), "", "category, tvcaption");
-			while($row = $modx->getDatabase()->getRow($rs)) {
+			while ($row = $modx->getDatabase()->getRow($rs)) {
 				$unselectedTvs[$row['tvid']] = $row;
 			}
 
 			// Catch checkboxes if form not validated
-			if(isset($_POST['assignedTv'])) {
+			if (isset($_POST['assignedTv'])) {
 				$selectedTvs = array();
-				foreach($_POST['assignedTv'] as $tvid) {
-					if(isset($unselectedTvs[$tvid])) {
+				foreach ($_POST['assignedTv'] as $tvid) {
+					if (isset($unselectedTvs[$tvid])) {
 						$selectedTvs[$tvid] = $unselectedTvs[$tvid];
 					}
 				};
@@ -238,20 +238,20 @@ 
 
 			<div class="container container-body">
 				<?php
-				if($total > 0) {
-					echo '<p>' . $_lang['template_tv_msg'] . '</p>';
+				if ($total > 0) {
+					echo '<p>'.$_lang['template_tv_msg'].'</p>';
 				}
-				if($modx->hasPermission('save_template') && $total > 1 && $id) {
+				if ($modx->hasPermission('save_template') && $total > 1 && $id) {
 					echo sprintf('<div class="form-group"><a class="btn btn-primary" href="index.php?a=117&amp;id=%s">%s</a></div>', $id, $_lang['template_tv_edit']);
 				}
 
 				// Selected TVs
 				$tvList = '';
-				if($total > 0) {
+				if ($total > 0) {
 					$tvList .= '<ul>';
-					foreach($selectedTvs as $row) {
-						$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-						$locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+					foreach ($selectedTvs as $row) {
+						$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>('.$row['tvdescription'].')</small>' : '';
+						$locked = $row['tvlocked'] ? ' <em>('.$_lang['locked'].')</em>' : "";
 						$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" checked="checked" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->getManagerApi()->action, $id, $_lang['edit']);
 					}
 					$tvList .= '</ul>';
@@ -262,22 +262,22 @@ 
 				echo $tvList;
 
 				// Unselected TVs
-				$tvList = '<hr/><p>' . $_lang['template_notassigned_tv'] . '</p><ul>';
+				$tvList = '<hr/><p>'.$_lang['template_notassigned_tv'].'</p><ul>';
 				$preCat = '';
 				$insideUl = 0;
-				while($row = array_shift($unselectedTvs)) {
-					if(isset($selectedTvs[$row['tvid']])) {
+				while ($row = array_shift($unselectedTvs)) {
+					if (isset($selectedTvs[$row['tvid']])) {
 						continue;
 					} // Skip selected
 					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
+					if ($preCat !== $row['category']) {
 						$tvList .= $insideUl ? '</ul>' : '';
-						$tvList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+						$tvList .= '<li><strong>'.$row['category'].($row['catid'] != '' ? ' <small>('.$row['catid'].')</small>' : '').'</strong><ul>';
 						$insideUl = 1;
 					}
 
-					$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-					$locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+					$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>('.$row['tvdescription'].')</small>' : '';
+					$locked = $row['tvlocked'] ? ' <em>('.$_lang['locked'].')</em>' : "";
 					$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->getManagerApi()->action, $id, $_lang['edit']);
 					$tvList .= '</li>';
 
@@ -294,7 +294,7 @@ 
 		<?php
 		// invoke OnTempFormRender event
 		$evtOut = $modx->invokeEvent("OnTempFormRender", array("id" => $id));
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode("", $evtOut);
 		}
 		?>

manager/actions/mutate_snippet.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table Names (alphabetical)
 $tbl_site_module_depobj = $modx->getFullTableName('site_module_depobj');
@@ -39,7 +39,7 @@ 
     $rs = $modx->getDatabase()->select('*', $tbl_site_snippets, "id='{$id}'");
     $content = $modx->getDatabase()->getRow($rs);
     if (!$content) {
-        header("Location: " . MODX_SITE_URL . "index.php?id=" . $site_start);
+        header("Location: ".MODX_SITE_URL."index.php?id=".$site_start);
     }
     $_SESSION['itemname'] = $content['name'];
     if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
@@ -50,7 +50,7 @@ 
     $content['name'] = $_REQUEST['itemname'];
 } else {
     $_SESSION['itemname'] = $_lang["new_snippet"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->getManagerApi()->hasFormValues()) {
@@ -62,7 +62,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 4;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 <script type="text/javascript">
 
@@ -431,7 +431,7 @@ 
     <input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">
 
     <h1 class="pagetitle">
-        <i class="fa fa-code"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_snippet']) ?><i class="fa fa-question-circle help"></i>
+        <i class="fa fa-code"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_snippet']) ?><i class="fa fa-question-circle help"></i>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -457,7 +457,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                    <label class="custom-control" title="<?= $_lang['lock_snippet'] . "\n" . $_lang['lock_snippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_snippet']."\n".$_lang['lock_snippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -481,9 +481,9 @@ 
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
                                 foreach (getCategories() as $n => $v) {
-                                    echo '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($v['category']) . '</option>';
+                                    echo '<option value="'.$v['id'].'"'.($content['category'] == $v['id'] ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($v['category']).'</option>';
                                 }
                                 ?>
                             </select>
@@ -500,7 +500,7 @@ 
                     <div class="form-group">
                         <?php if ($_SESSION['mgrRole'] == 1): ?>
                             <div class="form-row">
-                                <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
+                                <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
                             </div>
                         <?php endif; ?>
                         <div class="form-row">
@@ -517,7 +517,7 @@ 
                 <span><?= $_lang['snippet_code'] ?></span>
             </div>
             <div class="section-editor clearfix">
-                <textarea dir="ltr" name="post" class="phptextarea" rows="20" wrap="soft" onchange="documentDirty=true;"><?= (isset($content['post']) ? trim($modx->getPhpCompat()->htmlspecialchars($content['post'])) : "<?php" . "\n" . trim($modx->getPhpCompat()->htmlspecialchars($content['snippet'])) . "\n") ?></textarea>
+                <textarea dir="ltr" name="post" class="phptextarea" rows="20" wrap="soft" onchange="documentDirty=true;"><?= (isset($content['post']) ? trim($modx->getPhpCompat()->htmlspecialchars($content['post'])) : "<?php"."\n".trim($modx->getPhpCompat()->htmlspecialchars($content['snippet']))."\n") ?></textarea>
             </div>
             <!-- PHP text editor end -->
         </div>
@@ -552,7 +552,7 @@ 
 								INNER JOIN {$tbl_site_module_depobj} AS smd ON smd.module=sm.id AND smd.type=40 
 								INNER JOIN {$tbl_site_snippets} AS ss ON ss.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams=1", 'sm.name');
                                 while ($row = $modx->getDatabase()->getRow($ds)) {
-                                    echo "<option value='" . $row['guid'] . "'" . ($content['moduleguid'] == $row['guid'] ? " selected='selected'" : "") . ">" . $modx->getPhpCompat()->htmlspecialchars($row['name']) . "</option>";
+                                    echo "<option value='".$row['guid']."'".($content['moduleguid'] == $row['guid'] ? " selected='selected'" : "").">".$modx->getPhpCompat()->htmlspecialchars($row['name'])."</option>";
                                 }
                                 ?>
                             </select>

manager/actions/mutate_tv_rank.dynamic.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_template')) {
@@ -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->getDatabase()->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/mutate_tmplvars.dynamic.php

Indentation +117 added lines, -117 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template') && $modx->getManagerApi()->action == '301') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 if(!$modx->hasPermission('new_template') && $modx->getManagerApi()->action == '300') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_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->getDatabase()->select('*', $tbl_site_tmplvars, "id='{$id}'");
-	$content = $modx->getDatabase()->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->getDatabase()->select('*', $tbl_site_tmplvars, "id='{$id}'");
+    $content = $modx->getDatabase()->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'] = (int)$_REQUEST['catid'];
+    $_SESSION['itemname'] = $_lang["new_tmplvars"];
+    $content['category'] = (int)$_REQUEST['catid'];
 }
 
 if($modx->getManagerApi()->hasFormValues()) {
-	$modx->getManagerApi()->loadFormValues();
+    $modx->getManagerApi()->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->getPhpCompat()->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->getPhpCompat()->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->getDatabase()->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->getDatabase()->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->getDatabase()->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->getManagerApi()->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>(' . implode(', ', $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->getDatabase()->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->getManagerApi()->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>(' . implode(', ', $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->getDatabase()->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
-					$groupsarray = $modx->getDatabase()->getColumn('documentgroup', $rs);
+                if($use_udperms == 1) {
+                    // fetch permissions for the variable
+                    $rs = $modx->getDatabase()->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
+                    $groupsarray = $modx->getDatabase()->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->getDatabase()->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
-							$groupsarray = $_POST['docgroups'];
-						}
-						while($row = $modx->getDatabase()->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->getDatabase()->select('name, id', $tbl_documentgroup_names);
+                        if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+                            $groupsarray = $_POST['docgroups'];
+                        }
+                        while($row = $modx->getDatabase()->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 +53 added lines, -53 removed lines

@@ -1,17 +1,17 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_template') && $modx->getManagerApi()->action == '301') {
+if (!$modx->hasPermission('edit_template') && $modx->getManagerApi()->action == '301') {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
-if(!$modx->hasPermission('new_template') && $modx->getManagerApi()->action == '300') {
+if (!$modx->hasPermission('new_template') && $modx->getManagerApi()->action == '300') {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
-$origin = isset($_REQUEST['or']) ? (int)$_REQUEST['or'] : 76;
-$originId = isset($_REQUEST['oid']) ? (int)$_REQUEST['oid'] : NULL;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+$origin = isset($_REQUEST['or']) ? (int) $_REQUEST['or'] : 76;
+$originId = isset($_REQUEST['oid']) ? (int) $_REQUEST['oid'] : NULL;
 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 $tbl_site_templates = $modx->getFullTableName('site_templates');
@@ -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->getDatabase()->select('*', $tbl_site_tmplvars, "id='{$id}'");
 	$content = $modx->getDatabase()->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'] = (int)$_REQUEST['catid'];
+	$content['category'] = (int) $_REQUEST['catid'];
 }
 
-if($modx->getManagerApi()->hasFormValues()) {
+if ($modx->getManagerApi()->hasFormValues()) {
 	$modx->getManagerApi()->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 ?><?=(empty($originId) ? '' : '&id=' . $originId) ?>';
+			document.location.href = 'index.php?a=<?= $origin ?><?=(empty($originId) ? '' : '&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->getPhpCompat()->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->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
-							<?php if($modx->hasPermission('save_role')): ?>
-								<label class="custom-control" title="<?= $_lang['lock_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->getPhpCompat()->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->getPhpCompat()->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->getDatabase()->getRow($rs)) {
+				while ($row = $modx->getDatabase()->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->getManagerApi()->action == '300' && $modx->config['default_template'] == $row['id']) {
+					if ($modx->getManagerApi()->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>(' . implode(', ', $tplInfo) . ')</em>' : '';
+					$tplInfo = !empty($tplInfo) ? ' <em>('.implode(', ', $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->getDatabase()->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
 					$groupsarray = $modx->getDatabase()->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->getDatabase()->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->getDatabase()->getRow($rs)) {
+						while ($row = $modx->getDatabase()->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);
 		}
 		?>

manager/actions/bkmanager.static.php

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('bk_manager')) {
@@ -9,10 +9,10 @@ 
 $dbase = trim($dbase, '`');
 
 if (!isset($modx->config['snapshot_path'])) {
-    if (is_dir(MODX_BASE_PATH . 'temp/backup/')) {
-        $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/';
+    if (is_dir(MODX_BASE_PATH.'temp/backup/')) {
+        $modx->config['snapshot_path'] = MODX_BASE_PATH.'temp/backup/';
     } else {
-        $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/';
+        $modx->config['snapshot_path'] = MODX_BASE_PATH.'assets/backup/';
     }
 }
 
@@ -23,7 +23,7 @@ 
 if ($mode == 'restore1') {
     if (isset($_POST['textarea']) && !empty($_POST['textarea'])) {
         $source = trim($_POST['textarea']);
-        $_SESSION['textarea'] = $source . "\n";
+        $_SESSION['textarea'] = $source."\n";
     } else {
         $source = file_get_contents($_FILES['sqlfile']['tmp_name']);
     }
@@ -31,7 +31,7 @@ 
     header('Location: index.php?r=9&a=93');
     exit;
 } elseif ($mode == 'restore2') {
-    $path = $modx->config['snapshot_path'] . $_POST['filename'];
+    $path = $modx->config['snapshot_path'].$_POST['filename'];
     if (file_exists($path)) {
         $source = file_get_contents($path);
         import_sql($source);
@@ -77,7 +77,7 @@ 
     if (!is_writable(rtrim($modx->config['snapshot_path'], '/'))) {
         $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path'])));
     }
-    $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix']) . "%'";
+    $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '".$modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix'])."%'";
     $rs = $modx->getDatabase()->query($sql);
     $tables = $modx->getDatabase()->getColumn('Name', $rs);
     $today = date('Y-m-d_H-i-s');
@@ -109,18 +109,18 @@ 
         $modx->webAlertAndQuit('Unable to Backup Database');
     }
 } else {
-    include_once MODX_MANAGER_PATH . "includes/header.inc.php";  // start normal header
+    include_once MODX_MANAGER_PATH."includes/header.inc.php"; // start normal header
 }
 
 if (isset($_SESSION['result_msg']) && $_SESSION['result_msg'] != '') {
     switch ($_SESSION['result_msg']) {
         case 'import_ok':
-            $ph['result_msg_import'] = '<div class="alert alert-success">' . $_lang["bkmgr_import_ok"] . '</div>';
-            $ph['result_msg_snapshot'] = '<div class="alert alert-success">' . $_lang["bkmgr_import_ok"] . '</div>';
+            $ph['result_msg_import'] = '<div class="alert alert-success">'.$_lang["bkmgr_import_ok"].'</div>';
+            $ph['result_msg_snapshot'] = '<div class="alert alert-success">'.$_lang["bkmgr_import_ok"].'</div>';
             break;
         case 'snapshot_ok':
             $ph['result_msg_import'] = '';
-            $ph['result_msg_snapshot'] = '<div class="alert alert-success">' . $_lang["bkmgr_snapshot_ok"] . '</div>';
+            $ph['result_msg_snapshot'] = '<div class="alert alert-success">'.$_lang["bkmgr_snapshot_ok"].'</div>';
             break;
     }
     $_SESSION['result_msg'] = '';
@@ -179,7 +179,7 @@ 
                 f.style.display = 'none';
             }
         }
-        <?= (isset($_REQUEST['r']) ? " doRefresh(" . $_REQUEST['r'] . ");" : "") ?>
+        <?= (isset($_REQUEST['r']) ? " doRefresh(".$_REQUEST['r'].");" : "") ?>
 
     </script>
 
@@ -223,7 +223,7 @@ 
                                 </thead>
                                 <tbody>
                                 <?php
-                                $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix']) . "%'";
+                                $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '".$modx->getDatabase()->escape($modx->getDatabase()->config['table_prefix'])."%'";
                                 $rs = $modx->getDatabase()->query($sql);
                                 $i = 0;
                                 while ($db_status = $modx->getDatabase()->getRow($rs)) {
@@ -233,29 +233,29 @@ 
                                         $table_string = '';
                                     }
 
-                                    echo '<tr>' . "\n" . '<td><label class="form-check form-check-label"><input type="checkbox" name="chk[]" class="form-check-input" value="' . $db_status['Name'] . '"' . (strstr($table_string, $db_status['Name']) === false ? '' : ' checked="checked"') . ' /><b class="text-primary">' . $db_status['Name'] . '</b></label></td>' . "\n";
-                                    echo '<td class="text-xs-center">' . (!empty($db_status['Comment']) ? '<i class="' . $_style['actions_help'] . '" data-tooltip="' . $db_status['Comment'] . '"></i>' : '') . '</td>' . "\n";
-                                    echo '<td class="text-xs-right">' . $db_status['Rows'] . '</td>' . "\n";
-                                    echo '<td class="text-xs-right">' . $db_status['Collation'] . '</td>' . "\n";
+                                    echo '<tr>'."\n".'<td><label class="form-check form-check-label"><input type="checkbox" name="chk[]" class="form-check-input" value="'.$db_status['Name'].'"'.(strstr($table_string, $db_status['Name']) === false ? '' : ' checked="checked"').' /><b class="text-primary">'.$db_status['Name'].'</b></label></td>'."\n";
+                                    echo '<td class="text-xs-center">'.(!empty($db_status['Comment']) ? '<i class="'.$_style['actions_help'].'" data-tooltip="'.$db_status['Comment'].'"></i>' : '').'</td>'."\n";
+                                    echo '<td class="text-xs-right">'.$db_status['Rows'].'</td>'."\n";
+                                    echo '<td class="text-xs-right">'.$db_status['Collation'].'</td>'."\n";
 
                                     // Enable record deletion for certain tables (TRUNCATE TABLE) if they're not already empty
                                     $truncateable = array(
-                                        $modx->getDatabase()->config['table_prefix'] . 'event_log',
-                                        $modx->getDatabase()->config['table_prefix'] . 'manager_log',
+                                        $modx->getDatabase()->config['table_prefix'].'event_log',
+                                        $modx->getDatabase()->config['table_prefix'].'manager_log',
                                     );
                                     if ($modx->hasPermission('settings') && in_array($db_status['Name'], $truncateable) && $db_status['Rows'] > 0) {
-                                        echo '<td class="text-xs-right"><a class="text-danger" href="index.php?a=54&mode=' . $action . '&u=' . $db_status['Name'] . '" title="' . $_lang['truncate_table'] . '">' . $modx->nicesize($db_status['Data_length'] + $db_status['Data_free']) . '</a>' . '</td>' . "\n";
+                                        echo '<td class="text-xs-right"><a class="text-danger" href="index.php?a=54&mode='.$action.'&u='.$db_status['Name'].'" title="'.$_lang['truncate_table'].'">'.$modx->nicesize($db_status['Data_length'] + $db_status['Data_free']).'</a>'.'</td>'."\n";
                                     } else {
-                                        echo '<td class="text-xs-right">' . $modx->nicesize($db_status['Data_length'] + $db_status['Data_free']) . '</td>' . "\n";
+                                        echo '<td class="text-xs-right">'.$modx->nicesize($db_status['Data_length'] + $db_status['Data_free']).'</td>'."\n";
                                     }
 
                                     if ($modx->hasPermission('settings')) {
-                                        echo '<td class="text-xs-right">' . ($db_status['Data_free'] > 0 ? '<a class="text-danger" href="index.php?a=54&mode=' . $action . '&t=' . $db_status['Name'] . '" title="' . $_lang['optimize_table'] . '">' . $modx->nicesize($db_status['Data_free']) . '</a>' : '-') . '</td>' . "\n";
+                                        echo '<td class="text-xs-right">'.($db_status['Data_free'] > 0 ? '<a class="text-danger" href="index.php?a=54&mode='.$action.'&t='.$db_status['Name'].'" title="'.$_lang['optimize_table'].'">'.$modx->nicesize($db_status['Data_free']).'</a>' : '-').'</td>'."\n";
                                     } else {
-                                        echo '<td class="text-xs-right">' . ($db_status['Data_free'] > 0 ? $modx->nicesize($db_status['Data_free']) : '-') . '</td>' . "\n";
+                                        echo '<td class="text-xs-right">'.($db_status['Data_free'] > 0 ? $modx->nicesize($db_status['Data_free']) : '-').'</td>'."\n";
                                     }
 
-                                    echo '<td class="text-xs-right">' . $modx->nicesize($db_status['Data_length'] - $db_status['Data_free']) . '</td>' . "\n" . '<td class="text-xs-right">' . $modx->nicesize($db_status['Index_length']) . '</td>' . "\n" . '<td class="text-xs-right">' . $modx->nicesize($db_status['Index_length'] + $db_status['Data_length'] + $db_status['Data_free']) . '</td>' . "\n" . "</tr>";
+                                    echo '<td class="text-xs-right">'.$modx->nicesize($db_status['Data_length'] - $db_status['Data_free']).'</td>'."\n".'<td class="text-xs-right">'.$modx->nicesize($db_status['Index_length']).'</td>'."\n".'<td class="text-xs-right">'.$modx->nicesize($db_status['Index_length'] + $db_status['Data_length'] + $db_status['Data_free']).'</td>'."\n"."</tr>";
 
                                     $total = $total + $db_status['Index_length'] + $db_status['Data_length'];
                                     $totaloverhead = $totaloverhead + $db_status['Data_free'];
@@ -266,9 +266,9 @@ 
                                 <tr>
                                     <td class="text-xs-right"><?= $_lang['database_table_totals'] ?></td>
                                     <td colspan="4">&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>
                                 </tfoot>
                             </table>
@@ -319,7 +319,7 @@ 
                             foreach ($last_result['0'] as $k => $v) {
                                 $title[] = $k;
                             }
-                            $result = '<thead><tr><th>' . implode('</th><th>', $title) . '</th></tr></thead>';
+                            $result = '<thead><tr><th>'.implode('</th><th>', $title).'</th></tr></thead>';
                             $result .= '<tbody>';
                             foreach ($last_result as $row) {
                                 $result_value = array();
@@ -327,11 +327,11 @@ 
                                     foreach ($row as $k => $v) {
                                         $result_value[] = $v;
                                     }
-                                    $result .= '<tr><td>' . implode('</td><td>', $result_value) . '</td></tr>';
+                                    $result .= '<tr><td>'.implode('</td><td>', $result_value).'</td></tr>';
                                 }
                             }
                             $result .= '</tbody>';
-                            $result = '<table class="table data">' . $result . '</table>';
+                            $result = '<table class="table data">'.$result.'</table>';
                         }
                     }
 
@@ -433,7 +433,7 @@ 
                                         while ($count < 11) {
                                             $line = fgets($file);
                                             foreach ($detailFields as $label) {
-                                                $fileLabel = '# ' . $label;
+                                                $fileLabel = '# '.$label;
                                                 if (strpos($line, $fileLabel) !== false) {
                                                     $details[$label] = htmlentities(trim(str_replace(array(
                                                         $fileLabel,
@@ -446,10 +446,10 @@ 
                                         };
                                         fclose($file);
 
-                                        $tooltip = "Generation Time: " . $details["Generation Time"] . "\n";
-                                        $tooltip .= "Server version: " . $details["Server version"] . "\n";
-                                        $tooltip .= "PHP Version: " . $details["PHP Version"] . "\n";
-                                        $tooltip .= "Host: " . $details["Host"] . "\n";
+                                        $tooltip = "Generation Time: ".$details["Generation Time"]."\n";
+                                        $tooltip .= "Server version: ".$details["Server version"]."\n";
+                                        $tooltip .= "PHP Version: ".$details["PHP Version"]."\n";
+                                        $tooltip .= "Host: ".$details["Host"]."\n";
                                         ?>
                                         <tr>
                                             <td><?= $filename ?></td>
@@ -481,7 +481,7 @@ 
 <?php
 
 if (is_numeric($_GET['tab'])) {
-    echo '<script type="text/javascript">tpDBM.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+    echo '<script type="text/javascript">tpDBM.setSelectedIndex( '.$_GET['tab'].' );</script>';
 }
 
 include_once "footer.inc.php"; // send footer

manager/actions/web_access_permissions.dynamic.php

Indentation +89 added lines, -89 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('web_access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // find all document groups, for the select :)
 $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('documentgroup_names'), '', 'name');
 if($modx->getDatabase()->getRecordCount($rs) < 1) {
-	$docgroupselector = "[no groups to add]";
+    $docgroupselector = "[no groups to add]";
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->getDatabase()->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$docgroupselector .= "</select>\n";
+    $docgroupselector = '<select name="docgroup">' . "\n";
+    while($row = $modx->getDatabase()->getRow($rs)) {
+        $docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('webgroup_names'), '', 'name');
 if($modx->getDatabase()->getRecordCount($rs) < 1) {
-	$usrgroupselector = '[no user groups]';
+    $usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->getDatabase()->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$usrgroupselector .= "</select>\n";
+    $usrgroupselector = '<select name="usergroup">' . "\n";
+    while($row = $modx->getDatabase()->getRow($rs)) {
+        $usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $usrgroupselector .= "</select>\n";
 }
 
 ?>
@@ -88,24 +88,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names') . " AS groupnames
+            $rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names') . " AS groupnames
 			LEFT JOIN " . $modx->getFullTableName('web_groups') . " AS groups ON groups.webgroup = groupnames.id
 			LEFT JOIN " . $modx->getFullTableName('web_users') . " AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
-				?>
+            if($modx->getDatabase()->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->getDatabase()->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="92" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -120,21 +120,21 @@ 
 						</form>
 						<?= $_lang['web_access_permissions_users_in_group'] ?>
 						<?php
-					}
-					if(!$row['user_id']) {
-						?>
+                    }
+                    if(!$row['user_id']) {
+                        ?>
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
 						<?php
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=88&id=<?= $row['user_id'] ?>"><?= $row['user_name'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -159,24 +159,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names') . " AS dgnames
+            $rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names') . " AS dgnames
 			LEFT JOIN " . $modx->getFullTableName('document_groups') . " AS dg ON dg.document_group = dgnames.id
 			LEFT JOIN " . $modx->getFullTableName('site_content') . " AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
-				?>
+            if($modx->getDatabase()->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->getDatabase()->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="92" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -191,21 +191,21 @@ 
 						</form>
 						<?= $_lang['access_permissions_resources_in_group'] ?>
 						<?php
-					}
-					if(!$row['doc_id']) {
-						?>
+                    }
+                    if(!$row['doc_id']) {
+                        ?>
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
 						<?php
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=3&id=<?= $row['doc_id'] ?>" title="<?= $modx->getPhpCompat()->htmlspecialchars($row['doc_title']) ?>"><?= $row['doc_id'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -217,15 +217,15 @@ 
 		<div class="container container-body">
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
-			$rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names') . " AS groupnames
+            $rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names') . " AS groupnames
 			LEFT JOIN " . $modx->getFullTableName('webgroup_access') . " AS groupacc ON groupacc.webgroup = groupnames.id
 			LEFT JOIN " . $modx->getFullTableName('documentgroup_names') . " AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
-				?>
+            if($modx->getDatabase()->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-				?>
+            } else {
+                ?>
 				<div class="form-group">
 					<b><?= $_lang["access_permissions_group_link"] ?></b>
 					<form method="post" action="index.php" name="accesspermissions">
@@ -241,38 +241,38 @@ 
 				<hr>
 				<ul>
 					<?php
-					$pid = '';
-					while($row = $modx->getDatabase()->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
-								echo '</ul></li>';
-							} // close previous one
-							?>
+                    $pid = '';
+                    while($row = $modx->getDatabase()->getRow($rs)) {
+                        if($row['id'] != $pid) {
+                            if($pid != '') {
+                                echo '</ul></li>';
+                            } // close previous one
+                            ?>
 							<li><b><?= $row['name'] ?></b></li>
 							<?php
-							if(!$row['dg_id']) {
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
-								$pid = '';
-								continue;
-							} else {
-								echo '<ul>';
-							}
-						}
-						if(!$row['dg_id']) {
-							continue;
-						}
-						?>
+                            if(!$row['dg_id']) {
+                                echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+                                $pid = '';
+                                continue;
+                            } else {
+                                echo '<ul>';
+                            }
+                        }
+                        if(!$row['dg_id']) {
+                            continue;
+                        }
+                        ?>
 						<li><?= $row['dg_name'] ?>
 							<small><i>(<a class="text-danger" href="index.php?a=92&coupling=<?= $row['link_id'] ?>&operation=remove_document_group_from_user_group"><?= $_lang['remove'] ?></a>)</i></small>
 						</li>
 						<?php
-						$pid = $row['id'];
-					}
-					?>
+                        $pid = $row['id'];
+                    }
+                    ?>
 				</ul>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 

Spacing +37 added lines, -37 removed lines

@@ -1,30 +1,30 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('web_access_permissions')) {
+if (!$modx->hasPermission('web_access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // find all document groups, for the select :)
 $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('documentgroup_names'), '', 'name');
-if($modx->getDatabase()->getRecordCount($rs) < 1) {
+if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 	$docgroupselector = "[no groups to add]";
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->getDatabase()->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$docgroupselector = '<select name="docgroup">'."\n";
+	while ($row = $modx->getDatabase()->getRow($rs)) {
+		$docgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->getDatabase()->select('*', $modx->getFullTableName('webgroup_names'), '', 'name');
-if($modx->getDatabase()->getRecordCount($rs) < 1) {
+if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 	$usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->getDatabase()->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$usrgroupselector = '<select name="usergroup">'."\n";
+	while ($row = $modx->getDatabase()->getRow($rs)) {
+		$usrgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$usrgroupselector .= "</select>\n";
 }
@@ -60,7 +60,7 @@ 
 	<div class="alert alert-info"><?= $_lang['access_permissions_introtext'] ?></div>
 </div>
 
-<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">' . $_lang['access_permissions_off'] . '</div>' : '') ?></div>
+<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">'.$_lang['access_permissions_off'].'</div>' : '') ?></div>
 
 
 <div class="tab-pane" id="wuapPane">
@@ -88,10 +88,10 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names') . " AS groupnames
-			LEFT JOIN " . $modx->getFullTableName('web_groups') . " AS groups ON groups.webgroup = groupnames.id
-			LEFT JOIN " . $modx->getFullTableName('web_users') . " AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
+			$rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names')." AS groupnames
+			LEFT JOIN " . $modx->getFullTableName('web_groups')." AS groups ON groups.webgroup = groupnames.id
+			LEFT JOIN " . $modx->getFullTableName('web_users')." AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
+			if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -100,9 +100,9 @@ 
 			<div class="form-group">
 				<?php
 				$pid = '';
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					if ($pid != $row['id']) {
+						if ($pid != '') {
 							echo '</div><div class="form-group">';
 						}
 						?>
@@ -121,7 +121,7 @@ 
 						<?= $_lang['web_access_permissions_users_in_group'] ?>
 						<?php
 					}
-					if(!$row['user_id']) {
+					if (!$row['user_id']) {
 						?>
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
 						<?php
@@ -159,10 +159,10 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names') . " AS dgnames
-			LEFT JOIN " . $modx->getFullTableName('document_groups') . " AS dg ON dg.document_group = dgnames.id
-			LEFT JOIN " . $modx->getFullTableName('site_content') . " AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
+			$rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names')." AS dgnames
+			LEFT JOIN " . $modx->getFullTableName('document_groups')." AS dg ON dg.document_group = dgnames.id
+			LEFT JOIN " . $modx->getFullTableName('site_content')." AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
+			if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -171,9 +171,9 @@ 
 			<div class="form-group">
 				<?php
 				$pid = '';
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					if ($pid != $row['id']) {
+						if ($pid != '') {
 							echo '</div><div class="form-group">';
 						}
 						?>
@@ -192,7 +192,7 @@ 
 						<?= $_lang['access_permissions_resources_in_group'] ?>
 						<?php
 					}
-					if(!$row['doc_id']) {
+					if (!$row['doc_id']) {
 						?>
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
 						<?php
@@ -217,10 +217,10 @@ 
 		<div class="container container-body">
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
-			$rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names') . " AS groupnames
-			LEFT JOIN " . $modx->getFullTableName('webgroup_access') . " AS groupacc ON groupacc.webgroup = groupnames.id
-			LEFT JOIN " . $modx->getFullTableName('documentgroup_names') . " AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
+			$rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names')." AS groupnames
+			LEFT JOIN " . $modx->getFullTableName('webgroup_access')." AS groupacc ON groupacc.webgroup = groupnames.id
+			LEFT JOIN " . $modx->getFullTableName('documentgroup_names')." AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
+			if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -242,23 +242,23 @@ 
 				<ul>
 					<?php
 					$pid = '';
-					while($row = $modx->getDatabase()->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
+					while ($row = $modx->getDatabase()->getRow($rs)) {
+						if ($row['id'] != $pid) {
+							if ($pid != '') {
 								echo '</ul></li>';
 							} // close previous one
 							?>
 							<li><b><?= $row['name'] ?></b></li>
 							<?php
-							if(!$row['dg_id']) {
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+							if (!$row['dg_id']) {
+								echo '<i>'.$_lang['no_groups_found'].'</i></li>';
 								$pid = '';
 								continue;
 							} else {
 								echo '<ul>';
 							}
 						}
-						if(!$row['dg_id']) {
+						if (!$row['dg_id']) {
 							continue;
 						}
 						?>

manager/actions/mutate_module.dynamic.php

Indentation +89 added lines, -89 removed lines

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

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

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

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

 }

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

-	case 107:

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

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

-		}

-		break;

-	case 108:

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

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

-		}

-		break;

-	default:

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

+    case 107:

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

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

+        }

+        break;

+    case 108:

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

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

+        }

+        break;

+    default:

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

 }

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

 // Get table names (alphabetical)

@@ -32,7 +32,7 @@ 
 

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

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

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

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

 }

 // end check for lock

 

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

 

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

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

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

-	if(!$content) {

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

-	}

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

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

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

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

-	}

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

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

+    if(!$content) {

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

+    }

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

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

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

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

+    }

 } else {

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

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

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

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

 }

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

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

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

 }

 

 // Add lock-element JS-Script

@@ -426,18 +426,18 @@ 
 

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

 	<?php

-	// invoke OnModFormPrerender event

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

-	if(is_array($evtOut)) {

-		echo implode('', $evtOut);

-	}

-

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

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

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

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

-	$internal = array();

-	?>

+    // invoke OnModFormPrerender event

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

+    if(is_array($evtOut)) {

+        echo implode('', $evtOut);

+    }

+

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

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

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

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

+    $internal = array();

+    ?>

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

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

 

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

 								<option>&nbsp;</option>

 								<?php

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

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

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

-								}

-								?>

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

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

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

+                                }

+                                ?>

 							</select>

 						</div>

 					</div>

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

 					</div>

 					<?php

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

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

 					CASE smd.type

 						WHEN 10 THEN 'Chunk'

 						WHEN 20 THEN 'Document'

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

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

 

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

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

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

-					$grd->cssClass = 'grid';

-					$grd->columnHeaderClass = 'gridHeader';

-					$grd->itemClass = 'gridItem';

-					$grd->altItemClass = 'gridAltItem';

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

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

-					echo $grd->render();

-					?>

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

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

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

+                    $grd->cssClass = 'grid';

+                    $grd->columnHeaderClass = 'gridHeader';

+                    $grd->itemClass = 'gridItem';

+                    $grd->altItemClass = 'gridAltItem';

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

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

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		<?php endif; ?>

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

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

 					<?php

-					// fetch user access permissions for the module

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

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

+                    // fetch user access permissions for the module

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

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

 

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

-						?>

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

+                        ?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

 							function makePublic(b) {

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

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

 						<?php

-					}

-					$chk = '';

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

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

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

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

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

-							if($checked) {

-								$notPublic = true;

-							}

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

-						} else {

-							if($checked) {

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

-							}

-						}

-					}

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

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

-					}

-					echo $chks;

-					?>

+                    }

+                    $chk = '';

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

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

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

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

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

+                            if($checked) {

+                                $notPublic = true;

+                            }

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

+                        } else {

+                            if($checked) {

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

+                            }

+                        }

+                    }

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

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

+                    }

+                    echo $chks;

+                    ?>

 				<?php endif; ?>

 			</div>

 		</div>

@@ -705,11 +705,11 @@ 
 

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

 		<?php

-		// invoke OnModFormRender event

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

-		if(is_array($evtOut)) {

-			echo implode('', $evtOut);

-		}

-		?>

+        // invoke OnModFormRender event

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

+        if(is_array($evtOut)) {

+            echo implode('', $evtOut);

+        }

+        ?>

 </form>

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

Switch Indentation +12 added lines, -12 removed lines

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

 }

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

-	case 107:

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

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

-		}

-		break;

-	case 108:

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

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

-		}

-		break;

-	default:

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

+	    case 107:

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

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

+		    }

+		    break;

+	    case 108:

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

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

+		    }

+		    break;

+	    default:

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

 }

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

 // Get table names (alphabetical)

Spacing +34 added lines, -34 removed lines

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

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

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

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

 }

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

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

 	case 107:

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

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

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

 		}

 		break;

 	case 108:

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

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

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

 		}

 		break;

 	default:

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

 }

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

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

 // Get table names (alphabetical)

 $tbl_membergroup_names = $modx->getFullTableName('membergroup_names');

 $tbl_site_content = $modx->getFullTableName('site_content');

@@ -31,7 +31,7 @@ 
 

 

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

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

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

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

 }

 // end check for lock

@@ -39,29 +39,29 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

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

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

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

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

-	if(!$content) {

+	if (!$content) {

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

 	}

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

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

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

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

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

 	}

 } else {

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

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

 }

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

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

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

 }

 

 // Add lock-element JS-Script

 $lockElementId = $id;

 $lockElementType = 6;

-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');

+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');

 ?>

 <script type="text/javascript">

 	function loadDependencies() {

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

 		var w = screen.width * 0.7;

 		var h = screen.height * 0.7;

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

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

 	}

 

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

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

 	// invoke OnModFormPrerender event

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

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode('', $evtOut);

 	}

 

@@ -442,7 +442,7 @@ 
 	<input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">

 

 	<h1>

-		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>

+		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>

 	</h1>

 

 	<?= $_style['actionbuttons']['dynamic']['element'] ?>

@@ -467,8 +467,8 @@ 
 						<div class="col-md-9 col-lg-10">

 							<div class="form-control-name clearfix">

 								<input name="name" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />

-								<?php if($modx->hasPermission('save_role')): ?>

-									<label class="custom-control" title="<?= $_lang['lock_module'] . "\n" . $_lang['lock_module_msg'] ?>" tooltip>

+								<?php if ($modx->hasPermission('save_role')): ?>

+									<label class="custom-control" title="<?= $_lang['lock_module']."\n".$_lang['lock_module_msg'] ?>" tooltip>

 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />

 										<i class="fa fa-lock"></i>

 									</label>

@@ -490,9 +490,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 "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($v['category']) . "</option>\n";

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

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

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

 								}

 								?>

 							</select>

@@ -524,7 +524,7 @@ 
 				<div class="form-group">

 					<div class="form-row">

 						<label for="disabled"><input name="disabled" id="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> />

-							<?= ($content['disabled'] == 1 ? '<span class="text-danger">' . $_lang['module_disabled'] . '</span>' : $_lang['module_disabled']) ?></label>

+							<?= ($content['disabled'] == 1 ? '<span class="text-danger">'.$_lang['module_disabled'].'</span>' : $_lang['module_disabled']) ?></label>

 					</div>

 					<div class="form-row">

 						<label for="parse_docblock">

@@ -589,7 +589,7 @@ 
 			</div>

 			<!-- HTML text editor end -->

 		</div>

-		<?php if($modx->getManagerApi()->action == '108'): ?>

+		<?php if ($modx->getManagerApi()->action == '108'): ?>

 			<!-- Dependencies -->

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

 				<h2 class="tab"><?= $_lang['settings_dependencies'] ?></h2>

@@ -617,14 +617,14 @@ 
 						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->fields = "name,type";

 					echo $grd->render();

 					?>

@@ -637,13 +637,13 @@ 
 			<h2 class="tab"><?= $_lang['access_permissions'] ?></h2>

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

 			<div class="container container-body">

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

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

 					<?php

 					// fetch user access permissions for the module

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

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

 

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

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

 						?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -671,22 +671,22 @@ 
 					}

 					$chk = '';

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

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

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

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

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

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

-							if($checked) {

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

+							if ($checked) {

 								$notPublic = true;

 							}

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

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

 						} else {

-							if($checked) {

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

+							if ($checked) {

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

 							}

 						}

 					}

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

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

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

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

 					}

 					echo $chks;

 					?>

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

 		// invoke OnModFormRender event

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

-		if(is_array($evtOut)) {

+		if (is_array($evtOut)) {

 			echo implode('', $evtOut);

 		}

 		?>

Braces +20 added lines, -20 removed lines

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

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

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

 }

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

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

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

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

 		}

 		break;

 	case 108:

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

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

 		}

 		break;

@@ -31,7 +31,7 @@ 
 

 

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

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

+if($lockedEl = $modx->elementIsLocked(6, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

@@ -39,22 +39,22 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

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

+if(isset($_GET['id'])) {
 	$rs = $modx->getDatabase()->select('*', $tbl_site_modules, "id='{$id}'");

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

-	if(!$content) {

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

 	}

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

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

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

+	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 	}

-} else {

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

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

 }

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

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

 }

 

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

 	// invoke OnModFormPrerender event

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

-	if(is_array($evtOut)) {

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

 	}

 

@@ -491,7 +491,7 @@ 
 								<option>&nbsp;</option>

 								<?php

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

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

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

 								}

 								?>

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

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

 

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

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

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -671,21 +671,21 @@ 
 					}

 					$chk = '';

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

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

+					while($row = $modx->getDatabase()->getRow($rs)) {
 						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

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

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

-							if($checked) {

+						if($modx->hasPermission('access_permissions')) {
+							if($checked) {
 								$notPublic = true;

 							}

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

-						} else {

-							if($checked) {

+						} else {
+							if($checked) {
 								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

 							}

 						}

 					}

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

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

 					}

 					echo $chks;

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

 		// invoke OnModFormRender event

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

-		if(is_array($evtOut)) {

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

 		}

 		?>

manager/actions/mutate_settings.dynamic.php

Indentation +18 added lines, -18 removed lines

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

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

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

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

 }

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

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

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

 }

 

 // check to see the edit settings page isn't locked

 $rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

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

-	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

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

 }

 // end check for lock

 

@@ -19,7 +19,7 @@ 
 include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

 $rs = $modx->getDatabase()->select('setting_name, setting_value', '[+prefix+]system_settings');

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

-	$settings[$row['setting_name']] = $row['setting_value'];

+    $settings[$row['setting_name']] = $row['setting_value'];

 }

 $settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

 $settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);

@@ -30,11 +30,11 @@ 
 $lang_keys = array();

 $dir = dir('includes/lang');

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

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

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

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

-		$lang_keys[$languagename] = get_lang_keys($file);

-	}

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

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

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

+        $lang_keys[$languagename] = get_lang_keys($file);

+    }

 }

 $dir->close();

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

@@ -76,14 +76,14 @@ 
 				</script>

 

 				<?php

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

-				?>

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

+                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

+                ?>

 			</div>

 		</div>

 	</form>

@@ -130,5 +130,5 @@ 
 	</script>

 <?php

 if(is_numeric($_GET['tab'])) {

-	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

+    echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

 }

Spacing +20 added lines, -20 removed lines

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

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

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

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

 }

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

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

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

 }

 

 // check to see the edit settings page isn't locked

-$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

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

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

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

 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

@@ -16,21 +16,21 @@ 
 // reload system settings from the database.

 // this will prevent user-defined settings from being saved as system setting

 $settings = array();

-include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

+include_once(MODX_MANAGER_PATH.'includes/default_config.php');

 $rs = $modx->getDatabase()->select('setting_name, setting_value', '[+prefix+]system_settings');

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

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

 	$settings[$row['setting_name']] = $row['setting_value'];

 }

-$settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

-$settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);

+$settings['filemanager_path'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['filemanager_path']);

+$settings['rb_base_dir'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['rb_base_dir']);

 

 extract($settings, EXTR_OVERWRITE);

 

 // load languages and keys

 $lang_keys = array();

 $dir = dir('includes/lang');

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

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

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

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

 		$endpos = strpos($file, '.');

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

 		$lang_keys[$languagename] = get_lang_keys($file);

@@ -67,7 +67,7 @@ 
 			<input type="hidden" name="site_id" value="<?php echo $site_id; ?>" />

 			<input type="hidden" name="settings_version" value="<?php echo $modx->getVersionData('version'); ?>" />

 			<!-- this field is used to check site settings have been entered/ updated after install or upgrade -->

-			<?php if(!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>

+			<?php if (!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>

 				<div class='sectionBody'><p class='element-edit-message-tab alert alert-warning'><?php echo $_lang['settings_after_install']; ?></p></div>

 			<?php } ?>

 			<div class="tab-pane" id="settingsPane">

@@ -76,13 +76,13 @@ 
 				</script>

 

 				<?php

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab1_site_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab2_furl_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab3_user_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab4_manager_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab5_security_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab6_filemanager_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

 				?>

 			</div>

 		</div>

@@ -129,6 +129,6 @@ 
 		});

 	</script>

 <?php

-if(is_numeric($_GET['tab'])) {

-	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

+if (is_numeric($_GET['tab'])) {

+	echo '<script type="text/javascript">tpSettings.setSelectedIndex( '.$_GET['tab'].' );</script>';

 }

Braces +7 added lines, -7 removed lines

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

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

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

 }

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

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

 }

 

 // check to see the edit settings page isn't locked

 $rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

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

+if($username = $modx->getDatabase()->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

@@ -18,7 +18,7 @@ 
 $settings = array();

 include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

 $rs = $modx->getDatabase()->select('setting_name, setting_value', '[+prefix+]system_settings');

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

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

 }

 $settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

@@ -29,8 +29,8 @@ 
 // load languages and keys

 $lang_keys = array();

 $dir = dir('includes/lang');

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

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

+while($file = $dir->read()) {
+	if(strpos($file, '.inc.php') > 0) {
 		$endpos = strpos($file, '.');

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

 		$lang_keys[$languagename] = get_lang_keys($file);

@@ -129,6 +129,6 @@ 
 		});

 	</script>

 <?php

-if(is_numeric($_GET['tab'])) {

+if(is_numeric($_GET['tab'])) {
 	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

 }