evolution-cms / evolution

manager/actions/mutate_htmlsnippet.dynamic.php

Spacing +8 added lines, -8 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.");
 }
 
@@ -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->manager->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->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->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->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/sysinfo.static.php

Spacing +14 added lines, -14 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('logs')) {

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

 

 $serverArr = array(

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

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

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

     'PHP Version' => phpversion(),

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

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

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

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

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

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

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

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

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

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

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

                     <tbody>

                     <?php

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

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

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

                     $i = 0;

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

                         ?>

                         <tr>

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

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

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

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

 

                             <?php

                             $truncateable = array(

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

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

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

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

                             );

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

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

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

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

                                 echo "</td>";

                             } else {

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

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

                             }

 

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

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

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

                             } else {

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

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

                             }

                             ?>

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

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

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

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

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

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

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

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

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

                     </tr>

                     </tbody>

                 </table>

manager/actions/refresh_site.dynamic.php

Spacing +3 added lines, -3 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.");
 }
 
@@ -29,8 +29,8 @@ 
 
 <div class="tab-page">
 	<div class="container container-body">
-		<?php if($num_rows_pub)   printf('<p>' . $_lang["refresh_published"]   . '</p>', $num_rows_pub) ?>
-		<?php if($num_rows_unpub) printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub) ?>
+		<?php if ($num_rows_pub)   printf('<p>'.$_lang["refresh_published"].'</p>', $num_rows_pub) ?>
+		<?php if ($num_rows_unpub) printf('<p>'.$_lang["refresh_unpublished"].'</p>', $num_rows_unpub) ?>
 		<?php
 		$modx->clearCache('full', true);
 		// invoke OnSiteRefresh event

manager/actions/help.static.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.");

 }

 $helpBasePath = "actions/help/";

 ?>

 

 <h1>

-	<?php echo $_style['page_help'];  echo $_lang['help']; ?>

+	<?php echo $_style['page_help']; echo $_lang['help']; ?>

 </h1>

 

 <div class="sectionBody">

@@ -16,9 +16,9 @@ 
 		</script>

 

 		<?php

-		if($handle = opendir('actions/help')) {

-			while(false !== ($file = readdir($handle))) {

-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {

+		if ($handle = opendir('actions/help')) {

+			while (false !== ($file = readdir($handle))) {

+				if ($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath.$file)) {

 					$help[] = $file;

 				}

 			}

@@ -27,22 +27,22 @@ 
 

 		natcasesort($help);

 

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

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

 

 			$helpname = substr($v, 0, strrpos($v, '.'));

 

 			$prefix = substr($helpname, 0, 2);

-			if(is_numeric($prefix)) {

+			if (is_numeric($prefix)) {

 				$helpname = substr($helpname, 2, strlen($helpname) - 1);

 			}

 

 			$hnLower = strtolower($helpname);

 			$helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);

 

-			echo '<div class="tab-page" id="tab' . $k . 'Help">';

-			echo '<h2 class="tab">' . $helpname . '</h2>';

-			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';

-			include_once($helpBasePath . "{$v}");

+			echo '<div class="tab-page" id="tab'.$k.'Help">';

+			echo '<h2 class="tab">'.$helpname.'</h2>';

+			echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab'.$k.'Help" ) );</script>';

+			include_once($helpBasePath."{$v}");

 			echo '</div>';

 		}

 		?>

manager/actions/resource_selector.static.php

Spacing +6 added lines, -6 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('edit_module')) {
@@ -63,7 +63,7 @@ 
 
 }
 
-include_once MODX_MANAGER_PATH . "includes/header.inc.php";
+include_once MODX_MANAGER_PATH."includes/header.inc.php";
 ?>
 <script language="JavaScript" type="text/javascript">
     function saveSelection()
@@ -138,7 +138,7 @@ 
 </script>
 
 <h1>
-    <?= $title . " - " . $_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
+    <?= $title." - ".$_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
 </h1>
 
 <div id="actions">
@@ -177,15 +177,15 @@ 
             <div class="row">
                 <div class="table-responsive">
                     <?php
-                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
                     $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
                     $grd->noRecordMsg = $_lang["no_records_found"];
                     $grd->cssClass = "table data nowrap";
                     $grd->columnHeaderClass = "tableHeader";
                     $grd->itemClass = "tableItem";
                     $grd->altItemClass = "tableAltItem";
-                    $grd->columns = $_lang["name"] . " ," . $_lang["description"];
-                    $grd->colTypes = "template:<input type='" . ($sm == 'm' ? 'checkbox' : 'radio') . "' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
+                    $grd->columns = $_lang["name"]." ,".$_lang["description"];
+                    $grd->colTypes = "template:<input type='".($sm == 'm' ? 'checkbox' : 'radio')."' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
                     $grd->colWidths = "45%";
                     $grd->fields = "name,description";
                     if ($_REQUEST['listmode'] == '1') {

manager/actions/phpinfo.static.php

Spacing +1 added lines, -1 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.");
 }
 ?>

manager/actions/mutate_tmplvars.dynamic.php

Spacing +49 added lines, -49 removed lines

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

manager/actions/web_user_management.static.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?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_web_user')) {
+if (!$modx->hasPermission('edit_web_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,7 +10,7 @@ 
 $modx->manager->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -25,7 +25,7 @@ 
 
 
 // context menu
-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";
 $cm = new ContextMenu("cntxm", 150);
 $cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0));
 $cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0));
@@ -120,9 +120,9 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
-			INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+					$ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users")." wu 
+			INNER JOIN " . $modx->getFullTableName("web_user_attributes")." wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
+					include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 					$grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
 					$grd->noRecordMsg = $_lang["no_records_found"];
 					$grd->cssClass = "table data";
@@ -130,14 +130,14 @@ 
 					$grd->itemClass = "tableItem";
 					$grd->altItemClass = "tableAltItem";
 					$grd->fields = "id,username,fullname,email,gender,blocked";
-					$grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"];
+					$grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["user_full_name"]." ,".$_lang["email"]." ,".$_lang["user_gender"]." ,".$_lang["user_block"];
 					$grd->colWidths = "1%,,,,1%,1%";
 					$grd->colAligns = "center,,,,center,right' nowrap='nowrap";
-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>";
-					if($listmode == '1') {
+					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang["click_to_context"]."'><i class='".$_style["icons_user"]."'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='".$_lang["click_to_edit_title"]."'>[+value+]</a>";
+					if ($listmode == '1') {
 						$grd->pageSize = 0;
 					}
-					if($_REQUEST['op'] == 'reset') {
+					if ($_REQUEST['op'] == 'reset') {
 						$grd->pageNumber = 1;
 					}
 					// render grid

manager/actions/mutate_plugin.dynamic.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.");
 }
 
@@ -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');
 
 function bold($cond = false)
 {
@@ -478,7 +478,7 @@ 
     <input type="hidden" name="mode" value="<?= $modx->manager->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'] ?>
@@ -504,7 +504,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                <label class="custom-control" title="<?= $_lang['lock_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>
@@ -528,9 +528,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->htmlspecialchars($v["category"]) . "</option>";
+                                    echo '<option value="'.$v['id'].'"'.($content["category"] == $v["id"] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v["category"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -546,7 +546,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>
@@ -593,11 +593,11 @@ 
                             <select name="moduleguid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules") . " sm 
-								INNER JOIN " . $modx->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30
-								INNER JOIN " . $modx->getFullTableName("site_plugins") . " sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
+                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules")." sm 
+								INNER JOIN " . $modx->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30
+								INNER JOIN " . $modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
                                 while ($row = $modx->db->getRow($ds)) {
-                                    echo "<option value='" . $row['guid'] . "'" . ($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($row["name"]) . "</option>";
+                                    echo "<option value='".$row['guid']."'".($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($row["name"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -658,7 +658,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']) {
@@ -667,9 +667,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);
                         }
@@ -681,7 +681,7 @@ 
 
                 function echoEventRows(&$evtnames)
                 {
-                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">' . implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) . '</div></div>';
+                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">'.implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).'</div></div>';
                     $evtnames = array();
                 }