evolution-cms / evolution

manager/actions/mutate_menuindex_sort.dynamic.php

Spacing +11 added lines, -11 removed lines

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

manager/actions/mutate_plugin.dynamic.php

Spacing +16 added lines, -16 removed lines

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

manager/actions/mutate_templates.dynamic.php

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->getDatabase()->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->getDatabase()->getFullTableName('site_tmplvars'), $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), $modx->getDatabase()->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->getDatabase()->getFullTableName('site_tmplvars'), $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), $modx->getDatabase()->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_htmlsnippet.dynamic.php

Spacing +10 added lines, -10 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_htmlsnippets = $modx->getDatabase()->getFullTableName('site_htmlsnippets');
@@ -47,7 +47,7 @@ 
     $content['name'] = $_REQUEST['itemname'];
 } else {
     $_SESSION['itemname'] = $_lang["new_htmlsnippet"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->getManagerApi()->hasFormValues()) {
@@ -65,7 +65,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 3;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // Print RTE Javascript function
 ?>
@@ -136,7 +136,7 @@ 
         <input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>" />
 
         <h1>
-            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
+            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
         </h1>
 
         <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -160,7 +160,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_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 || $content['locked'] == 'on' ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -184,9 +184,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 "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->getPhpCompat()->htmlspecialchars($v['category']) . "</option>\n";
+                                    echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->getPhpCompat()->htmlspecialchars($v['category'])."</option>\n";
                                 }
                                 ?>
                             </select>
@@ -200,7 +200,7 @@ 
                     </div>
                     <?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>
@@ -216,7 +216,7 @@ 
                             $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
                             if (is_array($evtOut)) {
                                 foreach ($evtOut as $i => $editor) {
-                                    echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n";
+                                    echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n";
                                 }
                             }
                             ?>

manager/actions/mutate_user.dynamic.php

Spacing +59 added lines, -59 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 12:
-		if(!$modx->hasPermission('edit_user')) {
+		if (!$modx->hasPermission('edit_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 11:
-		if(!$modx->hasPermission('new_user')) {
+		if (!$modx->hasPermission('new_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -18,24 +18,24 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$user = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // check to see the snippet editor isn't locked
-$rs = $modx->getDatabase()->select('username', $modx->getDatabase()->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->getDatabase()->getValue($rs)) {
+$rs = $modx->getDatabase()->select('username', $modx->getDatabase()->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->getDatabase()->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
 }
 // end check for lock
 
-if($modx->getManagerApi()->action == '12') {
+if ($modx->getManagerApi()->action == '12') {
 	// get user attribute
 	$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('user_attributes'), "internalKey = '{$user}'");
 	$userdata = $modx->getDatabase()->getRow($rs);
-	if(!$userdata) {
+	if (!$userdata) {
 		$modx->webAlertAndQuit("No user returned!");
 	}
 
-    if($_SESSION['mgrRole'] != 1 && $userdata['role'] == 1) {
+    if ($_SESSION['mgrRole'] != 1 && $userdata['role'] == 1) {
         $modx->webAlertAndQuit('Illegal attempt to create/modify administrator by non-administrator!');
     }
 
@@ -43,10 +43,10 @@ 
 	// get user settings
 	$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while ($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
 	// manually extract so that user display settings are not overwritten
-	foreach($usersettings as $k => $v) {
-		if($k != 'manager_language' && $k != 'manager_theme') {
+	foreach ($usersettings as $k => $v) {
+		if ($k != 'manager_language' && $k != 'manager_theme') {
 			${$k} = $v;
 		}
 	}
@@ -54,7 +54,7 @@ 
 	// get user name
 	$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('manager_users'), "id = '{$user}'");
 	$usernamedata = $modx->getDatabase()->getRow($rs);
-	if(!$usernamedata) {
+	if (!$usernamedata) {
 		$modx->webAlertAndQuit("No user returned while getting username!");
 	}
 	$_SESSION['itemname'] = $usernamedata['username'];
@@ -66,14 +66,14 @@ 
 }
 
 // avoid doubling htmlspecialchars (already encoded in DB)
-foreach($userdata as $key => $val) {
+foreach ($userdata as $key => $val) {
 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
 };
 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);
 
 // restore saved form
 $formRestored = false;
-if($modx->getManagerApi()->hasFormValues()) {
+if ($modx->getManagerApi()->hasFormValues()) {
 	$modx->getManagerApi()->loadFormValues();
 	// restore post values
 	$userdata = array_merge($userdata, $_POST);
@@ -88,13 +88,13 @@ 
 // include the country list language file
 $_country_lang = array();
 include_once "lang/country/english_country.inc.php";
-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
-	include_once "lang/country/" . $manager_language . "_country.inc.php";
+if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {
+	include_once "lang/country/".$manager_language."_country.inc.php";
 }
 asort($_country_lang);
 
 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';
-if($which_browser == 'default') {
+if ($which_browser == 'default') {
 	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
 }
 ?>
@@ -186,7 +186,7 @@ 
 			document.userform.save.click();
 		},
 		delete: function() {
-			<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
+			<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
 			alert("<?php echo $_lang['alert_delete_self']; ?>");
 			<?php } else { ?>
 			if(confirm("<?php echo $_lang['confirm_delete_user']; ?>") === true) {
@@ -209,7 +209,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -218,7 +218,7 @@ 
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />
 
 	<h1>
-        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['user_title']) ?>
+        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['user_title']) ?>
     </h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>
@@ -236,13 +236,13 @@ 
 				<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">
 					<tr>
 						<td colspan="3"><span id="blocked" class="warning">
-							<?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
 								<?php echo $_lang['user_is_blocked']; ?>
 							<?php } ?>
 							</span>
 							<br /></td>
 					</tr>
-					<?php if(!empty($userdata['id'])) { ?>
+					<?php if (!empty($userdata['id'])) { ?>
 						<tr id="showname" style="display: <?php echo ($modx->getManagerApi()->action == '12' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">
 							<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i>&nbsp;<b><?php echo $modx->getPhpCompat()->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span>
 								<input type="hidden" name="oldusername" value="<?php echo $modx->getPhpCompat()->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />
@@ -255,7 +255,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->getPhpCompat()->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>
 					</tr>
 					<tr>
-						<th><?php echo $modx->getManagerApi()->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>
+						<th><?php echo $modx->getManagerApi()->action == '11' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>
 						<td>&nbsp;</td>
 						<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->getManagerApi()->action == "11" ? " checked disabled" : ""; ?>>
 							<input type="hidden" name="newpassword" value="<?php echo $modx->getManagerApi()->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" />
@@ -313,8 +313,8 @@ 
 							?>
 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">
 								<?php
-								while($row = $modx->getDatabase()->getRow($rs)) {
-									if($modx->getManagerApi()->action == '11') {
+								while ($row = $modx->getDatabase()->getRow($rs)) {
+									if ($modx->getManagerApi()->action == '11') {
 										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
 									} else {
 										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
@@ -368,8 +368,8 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>
 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>
 								<?php
-								foreach($_country_lang as $key => $country) {
-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
+								foreach ($_country_lang as $key => $country) {
+									echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";
 								}
 								?>
 							</select></td>
@@ -395,7 +395,7 @@ 
 						<td>&nbsp;</td>
 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->getPhpCompat()->htmlspecialchars($userdata['comment']); ?></textarea></td>
 					</tr>
-					<?php if($modx->getManagerApi()->action == '12') { ?>
+					<?php if ($modx->getManagerApi()->action == '12') { ?>
 						<tr>
 							<th><?php echo $_lang['user_logincount']; ?>:</th>
 							<td>&nbsp;</td>
@@ -432,7 +432,7 @@ 
 						</tr>
 					<?php } ?>
 				</table>
-				<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
+				<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
 					<p><?php echo $_lang['user_edit_self_msg']; ?></p>
 				<?php } ?>
 			</div>
@@ -449,8 +449,8 @@ 
 								<?php
 								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
 								$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);
 										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";
@@ -537,17 +537,17 @@ 
 								<option value=""></option>
 								<?php
 								$dir = dir("media/style/");
-								while($file = $dir->read()) {
-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+								while ($file = $dir->read()) {
+									if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
 										$themename = $file;
-										if($themename === 'common') {
+										if ($themename === 'common') {
 											continue;
 										}
-										$attr = 'value="' . $themename . '" ';
-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
+										$attr = 'value="'.$themename.'" ';
+										if (isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
 											$attr .= 'selected="selected" ';
 										}
-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
+										echo "\t\t<option ".rtrim($attr).'>'.ucwords(str_replace("_", " ", $themename))."</option>\n";
 									}
 								}
 								$dir->close();
@@ -588,12 +588,12 @@ 
 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
 								<?php
 								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
+								echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n";
+								foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
 									$dir = str_replace('\\', '/', $dir);
 									$browser_name = substr($dir, strrpos($dir, '/') + 1);
 									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
+									echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";
 								}
 								?>
 							</select></td>
@@ -620,7 +620,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_media_title"] ?></th>
@@ -632,7 +632,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_media_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_flash_title"] ?></th>
@@ -644,7 +644,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_files_title"] ?></th>
@@ -656,7 +656,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr class='row2'>
 						<th><?php echo $_lang["upload_maxsize_title"] ?></th>
@@ -675,11 +675,11 @@ 
 								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
 								// invoke OnRichTextEditorRegister event
 								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
-								if(is_array($evtOut)) {
-									for($i = 0; $i < count($evtOut); $i++) {
+								echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n";
+								if (is_array($evtOut)) {
+									for ($i = 0; $i < count($evtOut); $i++) {
 										$editor = $evtOut[$i];
-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
+										echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n";
 									}
 								}
 								?>
@@ -717,7 +717,7 @@ 
 				<?php
 				// invoke OnInterfaceSettingsRender event
 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					echo implode("", $evtOut);
 				}
 				?>
@@ -744,7 +744,7 @@ 
 					function BrowseServer() {
 						var w = screen.width * 0.7;
 						var h = screen.height * 0.7;
-						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
+						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
 					}
 
 					function SetUrl(url, width, height, alt) {
@@ -767,17 +767,17 @@ 
 					</tr>
 				</table>
 			</div>
-			<?php if($use_udperms == 1) {
+			<?php if ($use_udperms == 1) {
 
 			$groupsarray = array();
 
-			if($modx->getManagerApi()->action == '12') { // only do this bit if the user is being edited
+			if ($modx->getManagerApi()->action == '12') { // only do this bit if the user is being edited
 				$rs = $modx->getDatabase()->select('user_group', $modx->getDatabase()->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->getDatabase()->getColumn('user_group', $rs);
 			}
 			// retain selected doc groups between post
-			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+			if (is_array($_POST['user_groups'])) {
+				foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
 			}
 			?>
 			<div class="tab-page" id="tabAccess">
@@ -786,8 +786,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>
 				<?php
 				$rs = $modx->getDatabase()->select('name, id', $modx->getDatabase()->getFullTableName('membergroup_names'), '', 'name');
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />";
 				}
 				}
 				?>
@@ -800,7 +800,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>

manager/actions/mutate_role.dynamic.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-switch ((int)$modx->getManagerApi()->action) {
+switch ((int) $modx->getManagerApi()->action) {
     case 35:
         if (!$modx->hasPermission('edit_role')) {
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$role = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_user_roles = $modx->getDatabase()->getFullTableName('user_roles');
 
@@ -46,7 +46,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $role;
 $lockElementType = 8;
-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 changestate(element) {
@@ -82,7 +82,7 @@ 
     <input type="hidden" name="id" value="<?= $_GET['id'] ?>">
 
     <h1>
-        <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'] . '<small>(' . $roledata['id'] . ')</small>' : $_lang['role_title']) ?>
+        <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'].'<small>('.$roledata['id'].')</small>' : $_lang['role_title']) ?>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['savedelete'] ?>

manager/actions/modules.static.php

Spacing +11 added lines, -11 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('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

@@ -107,22 +107,22 @@ 
     <div class="table-responsive">

         <?php

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

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

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

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

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

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

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

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

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

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

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

                 ORDER BY sm.name');

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

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

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

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

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

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

             } else {

                 $title = '[+value+]';

             }

         } else {

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

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

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

         }

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

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

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

         $grd->altItemClass = "tableAltItem";

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

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

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

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

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

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

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

         if ($listmode == '1') {

             $grd->pageSize = 0;

         }

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->getDatabase()->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'");
+            $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->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->getDatabase()->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+        $rs = $modx->getDatabase()->select('count(id)', $modx->getDatabase()->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->getDatabase()->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
+        $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->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->getDatabase()->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'");
+            $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->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->getDatabase()->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . " and messageread=0");
+$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." and messageread=0");
 $_SESSION['nrnewmessages'] = $modx->getDatabase()->getValue($rs);
-$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+$rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."");
 $_SESSION['nrtotalmessages'] = $modx->getDatabase()->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 ?>

manager/actions/search.static.php

Spacing +73 added lines, -73 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) {
     exit();
 }
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
@@ -41,9 +41,9 @@ 
                         <?php
                         $rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('site_templates'));
                         $option[] = '<option value="">No selected</option>';
-                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int)$_REQUEST['templateid'] : '';
+                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int) $_REQUEST['templateid'] : '';
                         $selected = $templateid === 0 ? ' selected="selected"' : '';
-                        $option[] = '<option value="0"' . $selected . '>(blank)</option>';
+                        $option[] = '<option value="0"'.$selected.'>(blank)</option>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
                             $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']);
                             $selected = $row['id'] == $templateid ? ' selected="selected"' : '';
@@ -86,7 +86,7 @@ 
     $searchfields = htmlentities(trim($_POST['searchfields']), ENT_QUOTES, $modx_manager_charset);
     $searchlongtitle = $modx->getDatabase()->escape(trim($_REQUEST['searchfields']));
     $search_alias = $modx->getDatabase()->escape(trim($_REQUEST['searchfields']));
-    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int)$_REQUEST['templateid'] : '';
+    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int) $_REQUEST['templateid'] : '';
     $searchcontent = $modx->getDatabase()->escape($_REQUEST['content']);
 
     $fields = 'DISTINCT sc.id, contenttype, pagetitle, longtitle, description, introtext, menutitle, deleted, published, isfolder, type';
@@ -100,12 +100,12 @@ 
         $friendly_url_suffix = $modx->config['friendly_url_suffix'];
         $base_url = $modx->config['base_url'];
         $site_url = $modx->config['site_url'];
-        $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url);
+        $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url);
         if ($url[0] === '/') {
-            $url = preg_replace('@^' . $base_url . '@', '', $url);
+            $url = preg_replace('@^'.$base_url.'@', '', $url);
         }
         if (substr($url, 0, 4) === 'http') {
-            $url = preg_replace('@^' . $site_url . '@', '', $url);
+            $url = preg_replace('@^'.$site_url.'@', '', $url);
         }
         $idFromAlias = $modx->getIdFromAlias($url);
     }
@@ -118,18 +118,18 @@ 
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->getDatabase()->query($articul_query);
 		$articul_id_array = $modx->getDatabase()->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if (count($articul_id_array) > 0) {
 			$articul_id = '';
 			$i = 1;
-			foreach( $articul_id_array as $articul ) {
-				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
-					$articul_id.=',';
+			foreach ($articul_id_array as $articul) {
+				$articul_id .= $articul['contentid'];
+				if ($i !== count($articul_id_array)) {
+					$articul_id .= ',';
 				}
 				$i++;
 			}
 		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/
@@ -137,7 +137,7 @@ 
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-				$sqladd .= $articul_id_query;//search by TV
+				$sqladd .= $articul_id_query; //search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -157,7 +157,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-            $sqladd .= $articul_id_query;//search by TV
+            $sqladd .= $articul_id_query; //search by TV
             $sqladd .= ")";
         }
     } else if ($idFromAlias) {
@@ -181,8 +181,8 @@ 
         $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
         $mgrRole = (isset ($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1) ? 1 : 0;
         $docgrp_cond = $docgrp ? " OR dg.document_group IN ({$docgrp})" : '';
-        $fields .= ', MAX(IF(1=' . $mgrRole . ' OR sc.privatemgr=0' . $docgrp_cond . ',1,0)) AS hasAccess';
-        $sqladd = '(' . $sqladd . ") AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $fields .= ', MAX(IF(1='.$mgrRole.' OR sc.privatemgr=0'.$docgrp_cond.',1,0)) AS hasAccess';
+        $sqladd = '('.$sqladd.") AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     }
 
     if ($sqladd) {
@@ -192,7 +192,7 @@ 
     $where = $sqladd;
 
     if ($where) {
-        $rs = $modx->getDatabase()->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id');
+        $rs = $modx->getDatabase()->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id');
         $limit = $modx->getDatabase()->getRecordCount($rs);
     } else {
         $limit = 0;
@@ -211,7 +211,7 @@ 
                 if ($limit < 1) {
                     echo $_lang['search_empty'];
                 } else {
-                    printf('<p>' . $_lang['search_results_returned_msg'] . '</p>', $limit);
+                    printf('<p>'.$_lang['search_results_returned_msg'].'</p>', $limit);
                     ?>
                     <script type="text/javascript" src="media/script/tablesort.js"></script>
                     <table class="grid sortabletable sortable-onload-2 rowstyle-even" id="table-1">
@@ -271,14 +271,14 @@ 
                                 if (function_exists('mb_strlen') && function_exists('mb_substr')) {
                                     ?>
                                     <td<?= $tdClass ?>>
-                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset) . "..." : $row['pagetitle'] ?></a>
+                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset)."..." : $row['pagetitle'] ?></a>
                                     </td>
-                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset) . "..." : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset)."..." : $row['description'] ?></td>
                                     <?php
                                 } else {
                                     ?>
-                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20) . '...' : $row['pagetitle'] ?></td>
-                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35) . '...' : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20).'...' : $row['pagetitle'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35).'...' : $row['description'] ?></td>
                                     <?php
                                 }
                                 ?>
@@ -298,115 +298,115 @@ 
                 if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                     $docscounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($docscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //templates
                 if ($modx->hasPermission('edit_template')) {
-                    $rs = $modx->getDatabase()->select("id,templatename,locked", $modx->getDatabase()->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' 
-					OR `templatename` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `content` like '%" . $searchfields . "%'");
+                    $rs = $modx->getDatabase()->select("id,templatename,locked", $modx->getDatabase()->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' 
+					OR `templatename` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `content` like '%" . $searchfields."%'");
                     $templatecounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($templatecounts > 0) {
-                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //tvs
                 if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->getDatabase()->select("id,name,locked", $modx->getDatabase()->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `type` like '%" . $searchfields . "%' 
-					OR `elements` like '%" . $searchfields . "%' 
-					OR `display` like '%" . $searchfields . "%' 
-					OR `display_params` like '%" . $searchfields . "%' 
-					OR `default_text` like '%" . $searchfields . "%'");
+                    $rs = $modx->getDatabase()->select("id,name,locked", $modx->getDatabase()->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `type` like '%" . $searchfields."%' 
+					OR `elements` like '%" . $searchfields."%' 
+					OR `display` like '%" . $searchfields."%' 
+					OR `display_params` like '%" . $searchfields."%' 
+					OR `default_text` like '%" . $searchfields."%'");
                     $tvscounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($tvscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Chunks
                 if ($modx->hasPermission('edit_chunk')) {
-                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%'     
-					OR `snippet` like '%" . $searchfields . "%'");
+                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%'     
+					OR `snippet` like '%" . $searchfields."%'");
                     $chunkscounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($chunkscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Snippets
                 if ($modx->hasPermission('edit_snippet')) {
-                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `snippet` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `snippet` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $snippetscounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($snippetscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //plugins
                 if ($modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `plugincode` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `plugincode` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $pluginscounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($pluginscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //modules
                 if ($modx->hasPermission('edit_module')) {
-                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' 
-                    OR `name` like '%" . $searchfields . "%' 
-                    OR `description` like '%" . $searchfields . "%' 
-                    OR `modulecode` like '%" . $searchfields . "%'  
-                    OR `properties` like '%" . $searchfields . "%'  
-                    OR `guid` like '%" . $searchfields . "%'      
-                    OR `resourcefile` like '%" . $searchfields . "%'");
+                    $rs = $modx->getDatabase()->select("id,name,locked,disabled", $modx->getDatabase()->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' 
+                    OR `name` like '%" . $searchfields."%' 
+                    OR `description` like '%" . $searchfields."%' 
+                    OR `modulecode` like '%" . $searchfields."%'  
+                    OR `properties` like '%" . $searchfields."%'  
+                    OR `guid` like '%" . $searchfields."%'      
+                    OR `resourcefile` like '%" . $searchfields."%'");
                     $modulescounts = $modx->getDatabase()->getRecordCount($rs);
                     if ($modulescounts > 0) {
-                        $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>';
                         while ($row = $modx->getDatabase()->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
-                echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1';
+                echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1';
             }
 
             ?>