evolution-cms / evolution

manager/actions/eventlog.dynamic.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('view_eventlog')) {

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

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

 }

 

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

 

 // get and save search string

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

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

 	$sqlQuery = $query = '';

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

 } else {

 	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

+	if (!is_numeric($sqlQuery)) {

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

 	}

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

@@ -31,7 +31,7 @@ 
 $_PAGE['vs']['lm'] = $listmode;

 

 // 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['view_log'], "js:menuAction(1)", $_style['actions_preview']);

 $cm->addSeparator();

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

 					$ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

-			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

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

+			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "".(is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '')."(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

+					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->pagerClass = '';

 					$grd->pageClass = 'page-item';

@@ -139,14 +139,14 @@ 
 					$grd->itemClass = "tableItem";

 					$grd->altItemClass = "tableAltItem";

 					$grd->fields = "type,source,createdon,eventid,username";

-					$grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+					$grd->columns = $_lang['type']." ,".$_lang['source']." ,".$_lang['date']." ,".$_lang['event_id']." ,".$_lang['sysinfo_userid'];

 					$grd->colWidths = "1%,,1%,1%,1%";

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

-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

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

+					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang['click_to_context']."'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='".$_lang['click_to_view_details']."'>[+source+]</a>||date: ".$modx->toDateFormat(null, 'formatOnly').' %I:%M %p';

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

 						$grd->pageSize = 0;

 					}

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

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

 						$grd->pageNumber = 1;

 					}

 					// render grid

manager/actions/mutate_snippet.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.");
 }
 
@@ -39,7 +39,7 @@ 
     $rs = $modx->db->select('*', $tbl_site_snippets, "id='{$id}'");
     $content = $modx->db->getRow($rs);
     if (!$content) {
-        header("Location: " . MODX_SITE_URL . "index.php?id=" . $site_start);
+        header("Location: ".MODX_SITE_URL."index.php?id=".$site_start);
     }
     $_SESSION['itemname'] = $content['name'];
     if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
@@ -62,7 +62,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 4;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 <script type="text/javascript">
 
@@ -431,7 +431,7 @@ 
     <input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
 
     <h1 class="pagetitle">
-        <i class="fa fa-code"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_snippet']) ?><i class="fa fa-question-circle help"></i>
+        <i class="fa fa-code"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_snippet']) ?><i class="fa fa-question-circle help"></i>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -457,7 +457,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                    <label class="custom-control" title="<?= $_lang['lock_snippet'] . "\n" . $_lang['lock_snippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_snippet']."\n".$_lang['lock_snippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -481,9 +481,9 @@ 
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
                                 foreach (getCategories() as $n => $v) {
-                                    echo '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . '</option>';
+                                    echo '<option value="'.$v['id'].'"'.($content['category'] == $v['id'] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category']).'</option>';
                                 }
                                 ?>
                             </select>
@@ -500,7 +500,7 @@ 
                     <div class="form-group">
                         <?php if ($_SESSION['mgrRole'] == 1): ?>
                             <div class="form-row">
-                                <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
+                                <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
                             </div>
                         <?php endif; ?>
                         <div class="form-row">
@@ -517,7 +517,7 @@ 
                 <span><?= $_lang['snippet_code'] ?></span>
             </div>
             <div class="section-editor clearfix">
-                <textarea dir="ltr" name="post" class="phptextarea" rows="20" wrap="soft" onchange="documentDirty=true;"><?= (isset($content['post']) ? trim($modx->htmlspecialchars($content['post'])) : "<?php" . "\n" . trim($modx->htmlspecialchars($content['snippet'])) . "\n") ?></textarea>
+                <textarea dir="ltr" name="post" class="phptextarea" rows="20" wrap="soft" onchange="documentDirty=true;"><?= (isset($content['post']) ? trim($modx->htmlspecialchars($content['post'])) : "<?php"."\n".trim($modx->htmlspecialchars($content['snippet']))."\n") ?></textarea>
             </div>
             <!-- PHP text editor end -->
         </div>
@@ -552,7 +552,7 @@ 
 								INNER JOIN {$tbl_site_module_depobj} AS smd ON smd.module=sm.id AND smd.type=40 
 								INNER JOIN {$tbl_site_snippets} AS ss ON ss.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams=1", 'sm.name');
                                 while ($row = $modx->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>

manager/actions/import_site.static.php

Spacing +82 added lines, -82 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('import_static')) {
+if (!$modx->hasPermission('import_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -43,8 +43,8 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			if(!isset($_POST['import'])) {
-				echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
+			if (!isset($_POST['import'])) {
+				echo "<div class=\"element-edit-message\">".$_lang['import_site_message']."</div>";
 				?>
 				<form action="index.php" method="post" name="importFrm">
 					<input type="hidden" name="import" value="import" />
@@ -101,14 +101,14 @@ 
 	</div>
 
 <?php
-function run() {
+function run(){
 	global $modx;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
 	$output = '';
 	$maxtime = $_POST['maxtime'];
 
-	if(!is_numeric($maxtime)) {
+	if (!is_numeric($maxtime)) {
 		$maxtime = 30;
 	}
 
@@ -119,17 +119,17 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importstart = $mtime;
 
-	if($_POST['reset'] == 'on') {
+	if ($_POST['reset'] == 'on') {
 		$modx->db->truncate($tbl_site_content);
 		$modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
 	}
 
 	$parent = intval($_POST['parent']);
 
-	if(is_dir(MODX_BASE_PATH . 'temp/import')) {
-		$filedir = MODX_BASE_PATH . 'temp/import/';
-	} elseif(is_dir(MODX_BASE_PATH . 'assets/import')) {
-		$filedir = MODX_BASE_PATH . 'assets/import/';
+	if (is_dir(MODX_BASE_PATH.'temp/import')) {
+		$filedir = MODX_BASE_PATH.'temp/import/';
+	} elseif (is_dir(MODX_BASE_PATH.'assets/import')) {
+		$filedir = MODX_BASE_PATH.'assets/import/';
 	}
 
 	$filesfound = 0;
@@ -138,10 +138,10 @@ 
 	$files = pop_index($files);
 
 	// no. of files to import
-	$output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+	$output .= sprintf('<p>'.$_lang['import_files_found'].'</p>', $filesfound);
 
 	// import files
-	if(0 < count($files)) {
+	if (0 < count($files)) {
 		$modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
 		importFiles($parent, $filedir, $files, 'root');
 	}
@@ -151,16 +151,16 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importend = $mtime;
 	$totaltime = ($importend - $importstart);
-	$output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+	$output .= sprintf('<p>'.$_lang['import_site_time'].'</p>', round($totaltime, 3));
 
-	if($_POST['convert_link'] == 'on') {
+	if ($_POST['convert_link'] == 'on') {
 		convertLink();
 	}
 
 	return $output;
 }
 
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode){
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -169,21 +169,21 @@ 
 	$tbl_system_settings = $modx->getFullTableName('system_settings');
 
 	$createdby = $modx->getLoginUserID();
-	if(!is_array($files)) {
+	if (!is_array($files)) {
 		return;
 	}
-	if($_POST['object'] == 'all') {
+	if ($_POST['object'] == 'all') {
 		$modx->config['default_template'] = '0';
 		$richtext = '0';
 	} else {
 		$richtext = '1';
 	}
 
-	foreach($files as $id => $value) {
-		if(is_array($value)) {
+	foreach ($files as $id => $value) {
+		if (is_array($value)) {
 			// create folder
 			$alias = $id;
-			printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+			printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias);
 			$field = array();
 			$field['type'] = 'document';
 			$field['contentType'] = 'text/html';
@@ -198,12 +198,12 @@ 
 			$field['isfolder'] = 1;
 			$field['menuindex'] = 1;
 			$find = false;
-			foreach(array(
+			foreach (array(
 						'index.html',
 						'index.htm'
 					) as $filename) {
-				$filepath = $filedir . $alias . '/' . $filename;
-				if($find === false && file_exists($filepath)) {
+				$filepath = $filedir.$alias.'/'.$filename;
+				if ($find === false && file_exists($filepath)) {
 					$file = getFileContent($filepath);
 					list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -215,17 +215,17 @@ 
 					$field['createdon'] = $date;
 					$field['editedon'] = $date;
 					$newid = $modx->db->insert($field, $tbl_site_content);
-					if($newid) {
+					if ($newid) {
 						$find = true;
-						echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-						importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+						echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+						importFiles($newid, $filedir.$alias.'/', $value, 'sub');
 					} else {
-						echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+						echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 						exit;
 					}
 				}
 			}
-			if($find === false) {
+			if ($find === false) {
 				$date = time();
 				$field['pagetitle'] = '---';
 				$field['content'] = '';
@@ -233,30 +233,30 @@ 
 				$field['editedon'] = $date;
 				$field['hidemenu'] = '1';
 				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
+				if ($newid) {
 					$find = true;
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-					importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+					echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+					importFiles($newid, $filedir.$alias.'/', $value, 'sub');
 				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+					echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 					exit;
 				}
 			}
 		} else {
 			// create document
-			if($mode == 'sub' && $value == 'index.html') {
+			if ($mode == 'sub' && $value == 'index.html') {
 				continue;
 			}
 			$filename = $value;
 			$fparts = explode('.', $value);
 			$alias = $fparts[0];
 			$ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-			printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
+			printf("<span>".$_lang['import_site_importing_document']."</span>", $filename);
 
-			if(!in_array($ext, $allowedfiles)) {
-				echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
+			if (!in_array($ext, $allowedfiles)) {
+				echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />'."\n";
 			} else {
-				$filepath = $filedir . $filename;
+				$filepath = $filedir.$filename;
 				$file = getFileContent($filepath);
 				list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -281,18 +281,18 @@ 
 				$field['isfolder'] = 0;
 				$field['menuindex'] = ($alias == 'index') ? 0 : 2;
 				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+				if ($newid) {
+					echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
 				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+					echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 					exit;
 				}
 
 				$is_site_start = false;
-				if($filename == 'index.html') {
+				if ($filename == 'index.html') {
 					$is_site_start = true;
 				}
-				if($is_site_start == true && $_POST['reset'] == 'on') {
+				if ($is_site_start == true && $_POST['reset'] == 'on') {
 					$modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
 					$modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
 				}
@@ -301,85 +301,85 @@ 
 	}
 }
 
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0){
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
-	if($files = scandir($directory)) {
-		foreach($files as $file) {
-			if($file == '.' || $file == '..') {
+	if ($files = scandir($directory)) {
+		foreach ($files as $file) {
+			if ($file == '.' || $file == '..') {
 				continue;
-			} elseif($h = @opendir($directory . $file . "/")) {
+			} elseif ($h = @opendir($directory.$file."/")) {
 				closedir($h);
 				$count = -1;
-				$listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
-			} elseif(strpos($file, '.htm') !== false) {
+				$listing[$file] = getFiles($directory.$file."/", array(), $count + 1);
+			} elseif (strpos($file, '.htm') !== false) {
 				$listing[$dummy] = $file;
 				$dummy = $dummy + 1;
 				$filesfound++;
 			}
 		}
 	} else {
-		echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+		echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>";
 	}
 	return ($listing);
 }
 
-function getFileContent($filepath) {
+function getFileContent($filepath){
 	global $_lang;
 	// get the file
-	if(!$buffer = file_get_contents($filepath)) {
-		echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
+	if (!$buffer = file_get_contents($filepath)) {
+		echo '<p><span class="fail">'.$_lang['import_site_failed']."</span> ".$_lang["import_site_failed_no_retrieve_file"].$filepath.".</p>";
 	} else {
 		return $buffer;
 	}
 }
 
-function pop_index($array) {
+function pop_index($array){
 	$new_array = array();
-	foreach($array as $k => $v) {
-		if($v !== 'index.html' && $v !== 'index.htm') {
+	foreach ($array as $k => $v) {
+		if ($v !== 'index.html' && $v !== 'index.htm') {
 			$new_array[$k] = $v;
 		} else {
 			array_unshift($new_array, $v);
 		}
 	}
-	foreach($array as $k => $v) {
-		if(is_array($v)) {
+	foreach ($array as $k => $v) {
+		if (is_array($v)) {
 			$new_array[$k] = $v;
 		}
 	}
 	return $new_array;
 }
 
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias){
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
 
-	if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
+	if (preg_match("@<title>(.*)</title>@i", $src, $matches)) {
 		$pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
 		$pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
 	} else {
 		$pagetitle = $alias;
 	}
-	if(!$pagetitle) {
+	if (!$pagetitle) {
 		$pagetitle = $alias;
 	}
 
-	if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
+	if (preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
 		$description = ($matches[1] !== '') ? $matches[1] : $filename;
 		$description = str_replace('[*description*]', '', $description);
 	} else {
 		$description = '';
 	}
 
-	if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
+	if ((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
 		$content = $matches[1];
 	} else {
 		$content = $src;
 		$s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-		$r = '$1' . $modx->config['modx_charset'] . '$2';
+		$r = '$1'.$modx->config['modx_charset'].'$2';
 		$content = preg_replace($s, $r, $content);
 		$content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
 	}
@@ -393,38 +393,38 @@ 
 	);
 }
 
-function convertLink() {
+function convertLink(){
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 
 	$rs = $modx->db->select('id,content', $tbl_site_content);
-	while($row = $modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$id = $row['id'];
 		$array = explode('<a href=', $row['content']);
 		$c = 0;
-		foreach($array as $v) {
-			if($v[0] === '"') {
+		foreach ($array as $v) {
+			if ($v[0] === '"') {
 				$v = substr($v, 1);
 				list($href, $v) = explode('"', $v, 2);
 				$_ = $href;
-				if(strpos($_, $modx->config['site_url']) !== false) {
-					$_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+				if (strpos($_, $modx->config['site_url']) !== false) {
+					$_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
 				}
-				if($_[0] === '/') {
+				if ($_[0] === '/') {
 					$_ = substr($_, 1);
 				}
 				$_ = str_replace('/index.html', '.html', $_);
 				$level = substr_count($_, '../');
-				if(1 < $level) {
-					if(!isset($p[$id])) {
+				if (1 < $level) {
+					if (!isset($p[$id])) {
 						$p[$id] = $modx->getParentIds($id);
 					}
 					$k = array_keys($p[$id]);
-					while(0 < $level) {
+					while (0 < $level) {
 						$dir = array_shift($k);
 						$level--;
 					}
-					if($dir != '') {
+					if ($dir != '') {
 						$dir .= '/';
 					}
 				} else {
@@ -432,18 +432,18 @@ 
 				}
 
 				$_ = trim($_, './');
-				if(strpos($_, '/') !== false) {
+				if (strpos($_, '/') !== false) {
 					$_ = substr($_, strrpos($_, '/'));
 				}
-				$_ = $dir . str_replace('.html', '', $_);
-				if(!isset($target[$_])) {
+				$_ = $dir.str_replace('.html', '', $_);
+				if (!isset($target[$_])) {
 					$target[$_] = $modx->getIdFromAlias($_);
 				}
 				$target[$_] = trim($target[$_]);
-				if(!empty($target[$_])) {
-					$href = '[~' . $target[$_] . '~]';
+				if (!empty($target[$_])) {
+					$href = '[~'.$target[$_].'~]';
 				}
-				$array[$c] = '<a href="' . $href . '"' . $v;
+				$array[$c] = '<a href="'.$href.'"'.$v;
 			}
 			$c++;
 		}

manager/actions/welcome.static.php

Spacing +65 added lines, -65 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.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

-if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

+if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

 	// seems to be a new install - send the user to the configuration page

 	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

@@ -16,50 +16,50 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

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

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

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

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

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

 

 	$msg = array();

 	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';

 	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';

 	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

 	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

 	$ph['MessageInfo'] = join("\n", $msg);

 }

 

 // setup icons

-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

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

 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

 	$ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

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

 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

 	$ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

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

 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

 	$ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

 	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

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

 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

 	$ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

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

 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

 	$ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

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

-	if($config_check_results != $_lang['configcheck_ok']) {

+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

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

+	if ($config_check_results != $_lang['configcheck_ok']) {

 		$ph['config_check_results'] = $config_check_results;

 		$ph['config_display'] = 'block';

 	} else {

@@ -70,8 +70,8 @@ 
 }

 

 // Check logout-reminder

-if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

+if (isset($_SESSION['show_logout_reminder'])) {

+	switch ($_SESSION['show_logout_reminder']['type']) {

 		case 'logout_reminder':

 			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

 			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

@@ -125,7 +125,7 @@ 
 	</tr>

 </table>';

 

-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

 	'username' => $modx->getLoginUserName(),

@@ -140,10 +140,10 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

-if($modx->db->getRecordCount($rs) < 1) {

+if ($modx->db->getRecordCount($rs) < 1) {

 	$html = '<p>[%no_active_users_found%]</p>';

 } else {

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

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

 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

 	$ph['now'] = strftime('%H:%M:%S', $now);

 	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

@@ -168,7 +168,7 @@ 
 	$userList = array();

 	$userCount = array();

 	// Create userlist with session-count first before output

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

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

 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

@@ -186,9 +186,9 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach ($userList as $params) {

 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+		$html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

 	}

 

 	$html .= '

@@ -200,7 +200,7 @@ 
 $ph['OnlineInfo'] = $html;

 

 // include rss feeds for important forum topics

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

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

 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];

 $ph['modx_news_content'] = $feedData['modx_news_content'];

 

@@ -231,7 +231,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

-if(is_array($evtOut)) {

+if (is_array($evtOut)) {

 	$output = implode('', $evtOut);

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -365,57 +365,57 @@ 
 

 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

-if(is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {

 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach ($sitewidgets as $widget) {

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function($a, $b){

 	return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

+foreach ($widgets as $widget) {

+	if ($widget['hide'] != '1') {

 		$output .= $modx->parseText($tpl, $widget);

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

-if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

+	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

-if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

+if (substr($target, 0, 1) === '@') {

+	if (substr($target, 0, 6) === '@CHUNK') {

 		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

+	} elseif (substr($target, 0, 5) === '@FILE') {

 		$content = file_get_contents(trim(substr($target, 6)));

 	} else {

 		$content = '';

 	}

 } else {

 	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

+	if ($chunk !== false && !empty($chunk)) {

 		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+	} elseif (is_file(MODX_BASE_PATH.$target)) {

+		$content = file_get_contents(MODX_BASE_PATH.$target);

+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');

+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible

 	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');

 	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');

 	}

 }

 

@@ -423,7 +423,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

-if(strpos($content, '[+') !== false) {

+if (strpos($content, '[+') !== false) {

 	$modx->toPlaceholders($ph);

 	$content = $modx->mergePlaceholderContent($content);

 }

@@ -432,7 +432,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

-if($js = $modx->getRegisteredClientScripts()) {

+if ($js = $modx->getRegisteredClientScripts()) {

 	$content .= $js;

 }

 

@@ -442,7 +442,7 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget() { // recent document info

+function getTplWidget(){ // recent document info

 	return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

@@ -453,7 +453,7 @@ 
 ';

 }

 

-function getRecentInfo() { // recent document info

+function getRecentInfo(){ // recent document info

 	global $modx;

 

 	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

@@ -479,12 +479,12 @@ 
 	return $html;

 }

 

-function getRecentInfoList() {

+function getRecentInfoList(){

 	global $modx;

 

 	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

 

-	if($modx->db->getRecordCount($rs) < 1) {

+	if ($modx->db->getRecordCount($rs) < 1) {

 		return '<tr><td>[%no_activity_message%]</td></tr>';

 	}

 

@@ -494,20 +494,20 @@ 
 	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

 

 	$output = array();

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

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

 		$docid = $ph['id'];

 		$_ = $modx->getUserInfo($ph['editedby']);

 		$ph['username'] = $_['username'];

 

-		if($ph['deleted'] == 1) {

+		if ($ph['deleted'] == 1) {

 			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

+		} elseif ($ph['published'] == 0) {

 			$ph['status'] = 'unpublished font-italic text-muted';

 		} else {

 			$ph['status'] = 'published';

 		}

 

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

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

 			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

 		} else {

 			$ph['edit_btn'] = '';

@@ -522,8 +522,8 @@ 
 			$preview_disabled

 		), $btntpl['preview_btn']);

 

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

-			if($ph['deleted'] == 0) {

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

+			if ($ph['deleted'] == 0) {

 				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

 			} else {

 				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

@@ -533,11 +533,11 @@ 
 			$ph['delete_btn'] = '';

 		}

 

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

+		if ($ph['deleted'] == 1 && $ph['published'] == 0) {

 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+		} elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {

 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+		} elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {

 			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

 		} else {

 			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

@@ -546,16 +546,16 @@ 
 

 		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

 

-		if($ph['longtitle'] == '') {

+		if ($ph['longtitle'] == '') {

 			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['description'] == '') {

+		if ($ph['description'] == '') {

 			$ph['description'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['introtext'] == '') {

+		if ($ph['introtext'] == '') {

 			$ph['introtext'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['alias'] == '') {

+		if ($ph['alias'] == '') {

 			$ph['alias'] = '(<i>[%not_set%]</i>)';

 		}

 

@@ -564,7 +564,7 @@ 
 	return join("\n", $output);

 }

 

-function getRecentInfoRowTpl() {

+function getRecentInfoRowTpl(){

 	$tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

@@ -593,11 +593,11 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action) {

+function wrapIcon($i, $action){

 	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

-function getStartUpScript() {

+function getStartUpScript(){

 	$script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

manager/actions/mutate_web_user.dynamic.php

Spacing +31 added lines, -31 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->manager->action) {

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

 	case 88:

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

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

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

 		}

 		break;

 	case 87:

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

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

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

 		}

 		break;

@@ -22,30 +22,30 @@ 
 

 

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

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

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

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

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

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

 }

 // end check for lock

 

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

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

 	// get user attributes

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

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

-	if(!$userdata) {

+	if (!$userdata) {

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

 	}

 

 	// get user settings

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

 	$usersettings = array();

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

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

 	extract($usersettings, EXTR_OVERWRITE);

 

 	// get user name

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

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

-	if(!$usernamedata) {

+	if (!$usernamedata) {

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

 	}

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

@@ -57,14 +57,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->manager->hasFormValues()) {

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

 	$modx->manager->loadFormValues();

 	// restore post values

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

@@ -78,8 +78,8 @@ 
 

 // include the country list language file

 $_country_lang = array();

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

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

+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";

 } else {

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

 }

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

 	// invoke OnWUsrFormPrerender event

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

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

@@ -200,7 +200,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-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['web_user_title']) ?>

+        <i class="fa fa fa-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['web_user_title']) ?>

     </h1>

 

 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>

@@ -218,13 +218,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['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>

+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>

 								<b><?php echo $_lang['user_is_blocked']; ?></b>

 							<?php } ?>

 							</span>

 							<br /></td>

 					</tr>

-					<?php if(!empty($userdata['id'])) { ?>

+					<?php if (!empty($userdata['id'])) { ?>

 						<tr id="showname" style="display: <?php echo ($modx->manager->action == '88' && (!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->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->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />

@@ -237,7 +237,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars(isset($_POST['newusername']) ? $_POST['newusername'] : $usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>

 					</tr>

 					<tr>

-						<th><?php echo $modx->manager->action == '87' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>

+						<th><?php echo $modx->manager->action == '87' ? $_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->manager->action == "87" ? " checked disabled" : ""; ?>>

 							<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "87" ? 1 : 0; ?>" onChange="documentDirty=true;" />

@@ -324,8 +324,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>

@@ -351,7 +351,7 @@ 
 						<td>&nbsp;</td>

 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars(isset($_POST['comment']) ? $_POST['comment'] : $userdata['comment']); ?></textarea></td>

 					</tr>

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

+					<?php if ($modx->manager->action == '88') { ?>

 						<tr>

 							<th><?php echo $_lang['user_logincount']; ?>:</th>

 							<td>&nbsp;</td>

@@ -472,7 +472,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) {

@@ -491,22 +491,22 @@ 
 						<td class='comment'><?php echo $_lang["user_photo_message"] ?></td>

 					</tr>

 					<tr>

-						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "") . $_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "") . $userdata['photo'] : $_style["tx"]; ?>" /></td>

+						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "").$_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "").$userdata['photo'] : $_style["tx"]; ?>" /></td>

 					</tr>

 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

+			if ($use_udperms == 1) {

 

 			$groupsarray = array();

 

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

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

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

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

 			}

 			// retain selected user groups between post

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

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

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

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

 			}

 			?>

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

@@ -515,8 +515,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

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

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

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

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

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

 				}

 				}

 				?>

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

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

+			if (is_array($evtOut)) {

 				echo implode("", $evtOut);

 			}

 			?>

manager/actions/mutate_module_resources.dynamic.php

Spacing +30 added lines, -30 removed lines

@@ -1,9 +1,9 @@ 
 <?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')) {
+if (!$modx->hasPermission('edit_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -24,41 +24,41 @@ 
 $modx->manager->initPageViewState();
 
 // check to see the  editor isn't locked
-$rs = $modx->db->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->db->getValue($rs)) {
+$rs = $modx->db->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->db->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
 }
 // end check for lock
 
 // take action
-switch($_REQUEST['op']) {
+switch ($_REQUEST['op']) {
 	case 'add':
 		// convert ids to numbers
 		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
 
-		if(count($opids) > 0) {
+		if (count($opids) > 0) {
 			// 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
 			$rt = strtolower($_REQUEST["rt"]);
-			if($rt == 'chunk') {
+			if ($rt == 'chunk') {
 				$type = 10;
 			}
-			if($rt == 'doc') {
+			if ($rt == 'doc') {
 				$type = 20;
 			}
-			if($rt == 'plug') {
+			if ($rt == 'plug') {
 				$type = 30;
 			}
-			if($rt == 'snip') {
+			if ($rt == 'snip') {
 				$type = 40;
 			}
-			if($rt == 'tpl') {
+			if ($rt == 'tpl') {
 				$type = 50;
 			}
-			if($rt == 'tv') {
+			if ($rt == 'tv') {
 				$type = 60;
 			}
-			$modx->db->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
-			foreach($opids as $opid) {
+			$modx->db->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (".implode(',', $opids).") AND type='{$type}'");
+			foreach ($opids as $opid) {
 				$modx->db->insert(array(
 					'module' => $id,
 					'resource' => $opid,
@@ -72,15 +72,15 @@ 
 		$opids = array_filter(array_map('intval', $_REQUEST['depid']));
 
 		// get resources that needs to be removed
-		$ds = $modx->db->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
+		$ds = $modx->db->select('*', $tbl_site_module_depobj, "id IN (".implode(",", $opids).")");
 		// loop through resources and look for plugins and snippets
 		$plids = array();
 		$snid = array();
-		while($row = $modx->db->getRow($ds)) {
-			if($row['type'] == '30') {
+		while ($row = $modx->db->getRow($ds)) {
+			if ($row['type'] == '30') {
 				$plids[$i] = $row['resource'];
 			}
-			if($row['type'] == '40') {
+			if ($row['type'] == '40') {
 				$snids[$i] = $row['resource'];
 			}
 		}
@@ -88,28 +88,28 @@ 
 		$ds = $modx->db->select('guid', $tbl_site_modules, "id='{$id}'");
 		$guid = $modx->db->getValue($ds);
 		// reset moduleguid for deleted resources
-		if(($cp = count($plids)) || ($cs = count($snids))) {
-			if($cp) {
-				$modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
+		if (($cp = count($plids)) || ($cs = count($snids))) {
+			if ($cp) {
+				$modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $plids).") AND moduleguid='{$guid}'");
 			}
-			if($cs) {
-				$modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
+			if ($cs) {
+				$modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $snids).") AND moduleguid='{$guid}'");
 			}
 			// reset cache
 			$modx->clearCache('full');
 		}
-		$modx->db->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
+		$modx->db->delete($tbl_site_module_depobj, "id IN (".implode(',', $opids).")");
 		break;
 }
 
 // load record
 $rs = $modx->db->select('*', $tbl_site_modules, "id = '{$id}'");
 $content = $modx->db->getRow($rs);
-if(!$content) {
+if (!$content) {
 	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
 }
 $_SESSION['itemname'] = $content['name'];
-if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -188,13 +188,13 @@ 
 	<input type="hidden" name="id" value="<?php echo $content['id']; ?>" />
 
 	<h1>
-		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['module_resource_title']) ?>
+		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['module_resource_title']) ?>
 	</h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['close'] ?>
 
 	<div class="section">
-		<div class="sectionHeader"><?php echo $content["name"] . " - " . $_lang['module_resource_title']; ?></div>
+		<div class="sectionHeader"><?php echo $content["name"]." - ".$_lang['module_resource_title']; ?></div>
 		<div class="sectionBody">
 			<p><?php echo $_lang['module_resource_msg']; ?></p>
 			<br />
@@ -218,14 +218,14 @@ 
 					LEFT JOIN {$tbl_site_snippets} AS ss ON ss.id = smd.resource AND smd.type = '40'
 					LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = '50'
 					LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = '60'", "smd.module={$id}", "smd.type,name");
-						include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+						include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 						$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items
 						$grd->noRecordMsg = $_lang["no_records_found"];
 						$grd->cssClass = "grid";
 						$grd->columnHeaderClass = "gridHeader";
 						$grd->itemClass = "gridItem";
 						$grd->altItemClass = "gridAltItem";
-						$grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
+						$grd->columns = $_lang["element_name"]." ,".$_lang["type"];
 						$grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
 						$grd->fields = "name,type";
 						echo $grd->render();

manager/actions/files.dynamic.php

Spacing +105 added lines, -105 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('file_manager')) {
@@ -9,15 +9,15 @@ 
 $newToken = makeToken();
 
 // settings
-$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/';
+$theme_image_path = $modx->config['site_manager_url'].'media/style/'.$modx->config['manager_theme'].'/images/';
 $excludes = array(
     '.',
     '..',
     '.svn'
 );
-$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : '';
-$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json' . $alias_suffix);
-$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json' . $alias_suffix);
+$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : '';
+$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json'.$alias_suffix);
+$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json'.$alias_suffix);
 $viewablefiles = explode(',', 'jpg,gif,png,ico');
 
 $editablefiles = add_dot($editablefiles);
@@ -30,31 +30,31 @@ 
 {
 */
 $protected_path[] = $modx->config['site_manager_path'];
-$protected_path[] = $modx->config['base_path'] . 'temp/backup';
-$protected_path[] = $modx->config['base_path'] . 'assets/backup';
+$protected_path[] = $modx->config['base_path'].'temp/backup';
+$protected_path[] = $modx->config['base_path'].'assets/backup';
 
 if (!$modx->hasPermission('save_plugin')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/plugins';
+    $protected_path[] = $modx->config['base_path'].'assets/plugins';
 }
 if (!$modx->hasPermission('save_snippet')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/snippets';
+    $protected_path[] = $modx->config['base_path'].'assets/snippets';
 }
 if (!$modx->hasPermission('save_template')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/templates';
+    $protected_path[] = $modx->config['base_path'].'assets/templates';
 }
 if (!$modx->hasPermission('save_module')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/modules';
+    $protected_path[] = $modx->config['base_path'].'assets/modules';
 }
 if (!$modx->hasPermission('empty_cache')) {
-    $protected_path[] = $modx->config['base_path'] . 'assets/cache';
+    $protected_path[] = $modx->config['base_path'].'assets/cache';
 }
 if (!$modx->hasPermission('import_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/import';
-    $protected_path[] = $modx->config['base_path'] . 'assets/import';
+    $protected_path[] = $modx->config['base_path'].'temp/import';
+    $protected_path[] = $modx->config['base_path'].'assets/import';
 }
 if (!$modx->hasPermission('export_static')) {
-    $protected_path[] = $modx->config['base_path'] . 'temp/export';
-    $protected_path[] = $modx->config['base_path'] . 'assets/export';
+    $protected_path[] = $modx->config['base_path'].'temp/export';
+    $protected_path[] = $modx->config['base_path'].'assets/export';
 }
 /*
 }
@@ -79,7 +79,7 @@ 
 {
     $count = count($array);
     for ($i = 0; $i < $count; $i++) {
-        $array[$i] = '.' . strtolower(trim($array[$i])); // add a dot :)
+        $array[$i] = '.'.strtolower(trim($array[$i])); // add a dot :)
     }
     return $array;
 }
@@ -104,15 +104,15 @@ 
 $rw = realpath('../');
 $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf));
 if (substr($webstart_path, 0, 1) == '/') {
-    $webstart_path = '..' . $webstart_path;
+    $webstart_path = '..'.$webstart_path;
 } else {
-    $webstart_path = '../' . $webstart_path;
+    $webstart_path = '../'.$webstart_path;
 }
 
 ?>
     <script type="text/javascript">
 
-        var current_path = '<?= $startpath;?>';
+        var current_path = '<?= $startpath; ?>';
 
         function viewfile (url)
         {
@@ -148,7 +148,7 @@ 
         function unzipFile (file)
         {
             if (confirmUnzip()) {
-                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -170,7 +170,7 @@ 
         function deleteFolder (folder, status)
         {
             if (confirmDeleteFolder(status)) {
-                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -178,7 +178,7 @@ 
         function deleteFile (file)
         {
             if (confirmDelete()) {
-                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -187,7 +187,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -195,7 +195,7 @@ 
         {
             var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir);
             if (newDirname !== null && newDirname !== dir) {
-                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -203,7 +203,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -222,7 +222,7 @@ 
             <?php endif ?>
             <?php
             if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') {
-                $href = 'a=31&path=' . urlencode($_REQUEST['path']);
+                $href = 'a=31&path='.urlencode($_REQUEST['path']);
             } else {
                 $href = 'a=2';
             }
@@ -232,12 +232,12 @@ 
                 $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>';
                 $ph['image'] = $_style['files_folder-open'];
                 $ph['subject'] = $_lang['add_folder'];
-                $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name=';
                 $_ = parsePlaceholder($tpl, $ph);
 
-                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>';
+                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>';
                 $ph['image'] = $_style['files_page_html'];
-                $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name=';
                 $_ .= parsePlaceholder($tpl, $ph);
                 echo $_;
             }
@@ -267,12 +267,12 @@ 
             $ph = array();
             $ph['style_path'] = $theme_image_path;
             // To Top Level with folder icon to the left
-            if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) {
-                $ph['image'] = '' . $_style['files_top'] . '';
+            if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) {
+                $ph['image'] = ''.$_style['files_top'].'';
                 $ph['subject'] = '<span>Top</span>';
             } else {
-                $ph['image'] = '' . $_style['files_top'] . '';
-                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/';
+                $ph['image'] = ''.$_style['files_top'].'';
+                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/';
             }
 
             echo parsePlaceholder($tpl, $ph);
@@ -289,12 +289,12 @@ 
                     if (empty($v)) {
                         continue;
                     }
-                    $path .= rtrim($v, '/') . '/';
+                    $path .= rtrim($v, '/').'/';
                     if (1 < $count) {
-                        $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path);
-                        $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>';
+                        $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path);
+                        $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>';
                     } else {
-                        $pieces[$i] = '<span>' . trim($v, '/') . '</span>';
+                        $pieces[$i] = '<span>'.trim($v, '/').'</span>';
                     }
                     $count--;
                 }
@@ -307,16 +307,16 @@ 
         </div>
         <?php
         // check to see user isn't trying to move below the document_root
-        if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) {
+        if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) {
             $modx->webAlertAndQuit($_lang["files_access_denied"]);
         }
 
         // Unzip .zip files - by Raymond
         if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) {
-            if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) {
-                echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />';
+            if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) {
+                echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />';
             } else {
-                echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />';
+                echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />';
             }
         }
         // End Unzip - Raymond
@@ -328,9 +328,9 @@ 
             if ($_REQUEST['mode'] == 'deletefolder') {
                 $folder = $_REQUEST['folderpath'];
                 if (!$token_check || !@rrmdir($folder)) {
-                    echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />';
                 } else {
-                    echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />';
                 }
             }
 
@@ -341,10 +341,10 @@ 
                 if (!mkdirs("{$startpath}/{$foldername}", 0777)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 } else {
-                    if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) {
-                        echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />';
+                    if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) {
+                        echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />';
                     } else {
-                        echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />';
+                        echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />';
                     }
                 }
                 umask($old_umask);
@@ -356,7 +356,7 @@ 
                 $filename = $modx->db->escape($filename);
 
                 if (!checkExtension($filename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
@@ -378,11 +378,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!copy($filename, MODX_BASE_PATH . $newFilename)) {
+                    if (!copy($filename, MODX_BASE_PATH.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -391,7 +391,7 @@ 
             // Rename folder here
             if ($_REQUEST['mode'] == 'renameFolder') {
                 $old_umask = umask(0);
-                $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname'];
+                $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname'];
                 $dirname = $modx->db->escape($dirname);
                 $newDirname = str_replace(array(
                     '..\\',
@@ -403,7 +403,7 @@ 
 
                 if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) {
                     echo $_lang['files.dynamic.php3'];
-                } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) {
+                } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 }
                 umask($old_umask);
@@ -423,11 +423,11 @@ 
                 $newFilename = $modx->db->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!rename($filename, $path . '/' . $newFilename)) {
+                    if (!rename($filename, $path.'/'.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -460,7 +460,7 @@ 
                 ls($startpath);
                 echo "\n\n\n";
                 if ($folders == 0 && $files == 0) {
-                    echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>';
+                    echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>';
                 }
                 ?>
             </table>
@@ -469,10 +469,10 @@ 
         <div class="container">
             <p>
                 <?php
-                echo $_lang['files_directories'] . ': <b>' . $folders . '</b> ';
-                echo $_lang['files_files'] . ': <b>' . $files . '</b> ';
-                echo $_lang['files_data'] . ': <b><span dir="ltr">' . $modx->nicesize($filesizes) . '</span></b> ';
-                echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>'
+                echo $_lang['files_directories'].': <b>'.$folders.'</b> ';
+                echo $_lang['files_files'].': <b>'.$files.'</b> ';
+                echo $_lang['files_data'].': <b><span dir="ltr">'.$modx->nicesize($filesizes).'</span></b> ';
+                echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>'
                 ?>
             </p>
 
@@ -497,7 +497,7 @@ 
                 </form>
                 <?php
             } else {
-                echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>";
+                echo "<p>".$_lang['files_upload_inhibited_msg']."</p>";
             }
             ?>
             <div id="imageviewer"></div>
@@ -576,7 +576,7 @@ 
     if ($file == $selFile) {
         $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
     }
-    return '<i class="' . $icon . ' FilesPage"></i>';
+    return '<i class="'.$icon.' FilesPage"></i>';
 }
 
 function markRow($file, $selFile, $mode)
@@ -588,7 +588,7 @@ 
     );
     if ($file == $selFile) {
         $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
-        return ' class="' . $class . '"';
+        return ' class="'.$class.'"';
     }
     return '';
 }
@@ -599,7 +599,7 @@ 
     global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
     $dircounter = 0;
     $filecounter = 0;
-    $curpath = str_replace('//', '/', $curpath . '/');
+    $curpath = str_replace('//', '/', $curpath.'/');
 
     if (!is_dir($curpath)) {
         echo 'Invalid path "', $curpath, '"<br />';
@@ -609,7 +609,7 @@ 
 
     // first, get info
     foreach ($dir as $file) {
-        $newpath = $curpath . $file;
+        $newpath = $curpath.$file;
         if ($file === '..' || $file === '.') {
             continue;
         }
@@ -619,7 +619,7 @@ 
             if ($file === '..' || $file === '.') {
                 continue;
             } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) {
-                $dirs_array[$dircounter]['text'] = '<i class="' . $_style['files_folder'] . ' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path=' . urlencode($newpath) . '"><b>' . $file . '</b></a>';
+                $dirs_array[$dircounter]['text'] = '<i class="'.$_style['files_folder'].' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path='.urlencode($newpath).'"><b>'.$file.'</b></a>';
 
                 $dfiles = scandir($newpath);
                 foreach ($dfiles as $i => $infile) {
@@ -632,13 +632,13 @@ 
                 }
                 $file_exists = (0 < count($dfiles)) ? 'file_exists' : '';
 
-                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\'' . urlencode($file) . '\',\'' . $file_exists . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></a>' : '';
+                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\''.urlencode($file).'\',\''.$file_exists.'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></a>' : '';
             } else {
-                $dirs_array[$dircounter]['text'] = '<span><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> ' . $file . '</span>';
-                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></span>' : '';
+                $dirs_array[$dircounter]['text'] = '<span><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> '.$file.'</span>';
+                $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></span>' : '';
             }
 
-            $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" title="' . $_lang['rename'] . '"></i></a> ' : '';
+            $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" title="'.$_lang['rename'].'"></i></a> ' : '';
 
             // increment the counter
             $dircounter++;
@@ -646,14 +646,14 @@ 
             $type = getExtension($newpath);
             $files_array[$filecounter]['file'] = $newpath;
             $files_array[$filecounter]['stats'] = lstat($newpath);
-            $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' ' . $file;
-            $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\'' . $webstart_path . substr($newpath, $len, strlen($newpath)) . '\');"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="' . $webstart_path . implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))) . '" style="cursor:pointer;"><i class="' . $_style['files_download'] . '" title="' . $_lang['file_download_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></span>');
-            $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path=' . urlencode($newpath) . '"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : $files_array[$filecounter]['view'];
-            $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_unzip'] . '" title="' . $_lang['file_download_unzip'] . '"></i></a>' : '';
-            $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path=' . urlencode($newpath) . '#file_editfile"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></span>';
-            $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_duplicate'] . '" title="' . $_lang['duplicate'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_duplicate'] . '" align="absmiddle" title="' . $_lang['duplicate'] . '"></i></span>';
-            $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></span>';
-            $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></span>';
+            $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']).' '.$file;
+            $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\''.$webstart_path.substr($newpath, $len, strlen($newpath)).'\');"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="'.$webstart_path.implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))).'" style="cursor:pointer;"><i class="'.$_style['files_download'].'" title="'.$_lang['file_download_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></span>');
+            $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path='.urlencode($newpath).'"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : $files_array[$filecounter]['view'];
+            $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\''.urlencode($file).'\');"><i class="'.$_style['files_unzip'].'" title="'.$_lang['file_download_unzip'].'"></i></a>' : '';
+            $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path='.urlencode($newpath).'#file_editfile"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></span>';
+            $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\''.urlencode($file).'\');"><i class="'.$_style['files_duplicate'].'" title="'.$_lang['duplicate'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_duplicate'].'" align="absmiddle" title="'.$_lang['duplicate'].'"></i></span>';
+            $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></span>';
+            $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\''.urlencode($file).'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></span>';
 
             // increment the counter
             $filecounter++;
@@ -666,9 +666,9 @@ 
     for ($i = 0; $i < $folders; $i++) {
         $filesizes += $dirs_array[$i]['stats']['7'];
         echo '<tr>';
-        echo '<td>' . $dirs_array[$i]['text'] . '</td>';
-        echo '<td class="text-nowrap">' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>';
-        echo '<td class="text-right">' . $modx->nicesize($dirs_array[$i]['stats']['7']) . '</td>';
+        echo '<td>'.$dirs_array[$i]['text'].'</td>';
+        echo '<td class="text-nowrap">'.$modx->toDateFormat($dirs_array[$i]['stats']['9']).'</td>';
+        echo '<td class="text-right">'.$modx->nicesize($dirs_array[$i]['stats']['7']).'</td>';
         echo '<td class="actions text-right">';
         echo $dirs_array[$i]['rename'];
         echo $dirs_array[$i]['delete'];
@@ -681,10 +681,10 @@ 
     sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
     for ($i = 0; $i < $files; $i++) {
         $filesizes += $files_array[$i]['stats']['7'];
-        echo '<tr ' . markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']) . '>';
-        echo '<td>' . $files_array[$i]['text'] . '</td>';
-        echo '<td class="text-nowrap">' . $modx->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
-        echo '<td class="text-right">' . $modx->nicesize($files_array[$i]['stats']['7']) . '</td>';
+        echo '<tr '.markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']).'>';
+        echo '<td>'.$files_array[$i]['text'].'</td>';
+        echo '<td class="text-nowrap">'.$modx->toDateFormat($files_array[$i]['stats']['9']).'</td>';
+        echo '<td class="text-right">'.$modx->nicesize($files_array[$i]['stats']['7']).'</td>';
         echo '<td class="actions text-right">';
         echo $files_array[$i]['unzip'];
         echo $files_array[$i]['view'];
@@ -792,17 +792,17 @@ 
     $zip = zip_open($file);
     if ($zip) {
         $old_umask = umask(0);
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         while ($zip_entry = zip_read($zip)) {
             if (zip_entry_filesize($zip_entry) > 0) {
                 // str_replace must be used under windows to convert "/" into "\"
                 $zip_entry_name = zip_entry_name($zip_entry);
-                $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name));
-                $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
+                $complete_path = $path.str_replace('\\', '/', dirname($zip_entry_name));
+                $complete_name = $path.str_replace('\\', '/', $zip_entry_name);
                 if (!file_exists($complete_path)) {
                     $tmp = '';
                     foreach (explode('/', $complete_path) AS $k) {
-                        $tmp .= $k . '/';
+                        $tmp .= $k.'/';
                         if (!is_dir($tmp)) {
                             mkdir($tmp, 0777);
                         }
@@ -823,7 +823,7 @@ 
 
 function rrmdir($dir)
 {
-    foreach (glob($dir . '/*') as $file) {
+    foreach (glob($dir.'/*') as $file) {
         if (is_dir($file)) {
             rrmdir($file);
         } else {
@@ -855,12 +855,12 @@ 
             $userfile['type'] = $_FILES['userfile']['type'][$i];
 
             // this seems to be an upload action.
-            $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath));
-            $path = rtrim($path, '/') . '/' . $userfile['name'];
+            $path = $modx->config['site_url'].substr($startpath, strlen($filemanager_path), strlen($startpath));
+            $path = rtrim($path, '/').'/'.$userfile['name'];
             $msg .= $path;
             if ($userfile['error'] == 0) {
-                $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : '';
-                $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '</p>';
+                $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="'.$path.'" height="75" />' : '';
+                $msg .= "<p>".$_lang['files_file_type'].$userfile['type'].", ".$modx->nicesize(filesize($userfile['tmp_name'])).$img.'</p>';
             }
 
             $userfilename = $userfile['tmp_name'];
@@ -868,15 +868,15 @@ 
             if (is_uploaded_file($userfilename)) {
                 // file is uploaded file, process it!
                 if (!checkExtension($userfile['name'])) {
-                    $msg .= '<p><span class="warning">' . $_lang['files_filetype_notok'] . '</span></p>';
+                    $msg .= '<p><span class="warning">'.$_lang['files_filetype_notok'].'</span></p>';
                 } else {
-                    if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) {
+                    if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'].'/'.$userfile['name'])) {
                         // Ryan: Repair broken permissions issue with file manager
                         if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
-                            @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions);
+                            @chmod($_POST['path']."/".$userfile['name'], $new_file_permissions);
                         }
                         // Ryan: End
-                        $msg .= '<p><span class="success">' . $_lang['files_upload_ok'] . '</span></p><hr/>';
+                        $msg .= '<p><span class="success">'.$_lang['files_upload_ok'].'</span></p><hr/>';
 
                         // invoke OnFileManagerUpload event
                         $modx->invokeEvent('OnFileManagerUpload', array(
@@ -884,13 +884,13 @@ 
                             'filename' => $userfile['name']
                         ));
                         // Log the change
-                        logFileChange('upload', $_POST['path'] . '/' . $userfile['name']);
+                        logFileChange('upload', $_POST['path'].'/'.$userfile['name']);
                     } else {
-                        $msg .= '<p><span class="warning">' . $_lang['files_upload_copyfailed'] . '</span> ' . $_lang["files_upload_permissions_error"] . '</p>';
+                        $msg .= '<p><span class="warning">'.$_lang['files_upload_copyfailed'].'</span> '.$_lang["files_upload_permissions_error"].'</p>';
                     }
                 }
             } else {
-                $msg .= '<br /><span class="warning"><b>' . $_lang['files_upload_error'] . ':</b>';
+                $msg .= '<br /><span class="warning"><b>'.$_lang['files_upload_error'].':</b>';
                 switch ($userfile['error']) {
                     case 0: //no error; possible file attack!
                         $msg .= $_lang['files_upload_error0'];
@@ -915,7 +915,7 @@ 
             }
         }
     }
-    return $msg . '<br/>';
+    return $msg.'<br/>';
 }
 
 function textsave()
@@ -928,9 +928,9 @@ 
 
     // Write $content to our opened file.
     if (file_put_contents($filename, $content) === false) {
-        $msg .= '<span class="warning"><b>' . $_lang['file_not_saved'] . '</b></span><br /><br />';
+        $msg .= '<span class="warning"><b>'.$_lang['file_not_saved'].'</b></span><br /><br />';
     } else {
-        $msg .= '<span class="success"><b>' . $_lang['file_saved'] . '</b></span><br /><br />';
+        $msg .= '<span class="success"><b>'.$_lang['file_saved'].'</b></span><br /><br />';
         $_REQUEST['mode'] = 'edit';
     }
     // Log the change
@@ -946,9 +946,9 @@ 
 
     $file = $_REQUEST['path'];
     if (!$token_check || !@unlink($file)) {
-        $msg .= '<span class="warning"><b>' . $_lang['file_not_deleted'] . '</b></span><br /><br />';
+        $msg .= '<span class="warning"><b>'.$_lang['file_not_deleted'].'</b></span><br /><br />';
     } else {
-        $msg .= '<span class="success"><b>' . $_lang['file_deleted'] . '</b></span><br /><br />';
+        $msg .= '<span class="success"><b>'.$_lang['file_deleted'].'</b></span><br /><br />';
     }
 
     // Log the change

manager/actions/mutate_user.dynamic.php

Spacing +57 added lines, -57 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->manager->action) {

+switch ($modx->manager->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;

@@ -21,17 +21,17 @@ 
 $user = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;

 

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

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

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

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

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

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

 }

 // end check for lock

 

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

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

 	// get user attribute

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

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

-	if(!$userdata) {

+	if (!$userdata) {

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

 	}

 

@@ -39,10 +39,10 @@ 
 	// get user settings

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

 	$usersettings = array();

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

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

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

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

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

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

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

 			${$k} = $v;

 		}

 	}

@@ -50,7 +50,7 @@ 
 	// get user name

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

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

-	if(!$usernamedata) {

+	if (!$usernamedata) {

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

 	}

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

@@ -62,14 +62,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->manager->hasFormValues()) {

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

 	$modx->manager->loadFormValues();

 	// restore post values

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

@@ -84,13 +84,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'];

 }

 ?>

@@ -182,7 +182,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) {

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

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

@@ -214,7 +214,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'] ?>

@@ -232,13 +232,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->manager->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->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->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />

@@ -251,7 +251,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>

 					</tr>

 					<tr>

-						<th><?php echo $modx->manager->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>

+						<th><?php echo $modx->manager->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->manager->action == "11" ? " checked disabled" : ""; ?>>

 							<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" />

@@ -305,8 +305,8 @@ 
 							?>

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

 								<?php

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

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

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

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

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

 									} else {

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

@@ -360,8 +360,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>

@@ -387,7 +387,7 @@ 
 						<td>&nbsp;</td>

 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars($userdata['comment']); ?></textarea></td>

 					</tr>

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

+					<?php if ($modx->manager->action == '12') { ?>

 						<tr>

 							<th><?php echo $_lang['user_logincount']; ?>:</th>

 							<td>&nbsp;</td>

@@ -424,7 +424,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>

@@ -441,8 +441,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'" : "";

@@ -529,17 +529,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();

@@ -556,12 +556,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>

@@ -588,7 +588,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>

@@ -600,7 +600,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>

@@ -612,7 +612,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>

@@ -624,7 +624,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>

@@ -643,11 +643,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";

 									}

 								}

 								?>

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

 				// invoke OnInterfaceSettingsRender event

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

-				if(is_array($evtOut)) {

+				if (is_array($evtOut)) {

 					echo implode("", $evtOut);

 				}

 				?>

@@ -712,7 +712,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) {

@@ -735,17 +735,17 @@ 
 					</tr>

 				</table>

 			</div>

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

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

 

 			$groupsarray = array();

 

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

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

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

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

 			}

 			// retain selected doc groups between post

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

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

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

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

 			}

 			?>

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

@@ -754,8 +754,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

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

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

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

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

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

 				}

 				}

 				?>

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

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

manager/actions/category_mgr/inc/request_trigger.inc.php

Spacing +49 added lines, -49 removed lines

@@ -2,16 +2,16 @@ 
 /**
  * Ajax Requests
  */
-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( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) )
+if (isset($_REQUEST[$cm->get('request_key')]['ajax']))
 {
     $_data  = $_REQUEST[$cm->get('request_key')];
     $output = '';
     $task   = $_data['task'];
-    switch( $task )
+    switch ($task)
     {
         /**
          * get categories
@@ -19,19 +19,19 @@ 
         case 'categorize_load_elements':
             $elements = $_data['elements'];
 
-            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
+            if ($uncategorized_elements = $cm->getAssignedElements(0, $_data['elements']))
             {
                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
-            foreach( $cm->getCategories() as $category )
+            foreach ($cm->getCategories() as $category)
             {
-                $category['elements'] = $cm->getAssignedElements( $category['id'], $_data['elements'] );
+                $category['elements'] = $cm->getAssignedElements($category['id'], $_data['elements']);
                 $output .= $cm->renderView('chunks/categorize/category', $category);
             }
             break;
     }
-    exit( $output );
+    exit($output);
 }
 /**
  * Categorize elements
@@ -41,7 +41,7 @@ 
  * @see http://modxcms.com/forums/index.php/topic,40430.msg251476.html#msg251476
  *
  */
-if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['categorize']['submit']))
 {
     $_data = $_POST[$cm->get('request_key')]['categorize'];
     $_changes = 0;
@@ -54,15 +54,15 @@ 
         'categorize'
     );
 
-    if( !isset( $_data['elements'] ) )
+    if (!isset($_data['elements']))
     {
-        $cm->addMessage( $cm->txt('cm_unknown_error'), 'categorize' );
+        $cm->addMessage($cm->txt('cm_unknown_error'), 'categorize');
         return;
     }
 
-    foreach( $_data['elements'] as $element_id => $data )
+    foreach ($_data['elements'] as $element_id => $data)
     {
-        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) )
+        if ($cm->updateElement($_data['elementsgroup'], $element_id, $data['category_id']))
         {
             $cm->addMessage(
                 sprintf(
@@ -78,9 +78,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt('cm_no_categorization'), 'categorize' );
+        $cm->addMessage($cm->txt('cm_no_categorization'), 'categorize');
         return;
     }
     else
@@ -98,29 +98,29 @@ 
 /**
  * Add a new category
  */
-if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['add']['submit']))
 {
     $_data    = $_POST[$cm->get('request_key')]['add']['data'];
-    $category = trim( html_entity_decode($_data['name']) );
+    $category = trim(html_entity_decode($_data['name']));
     $rank     = (int) $_data['rank'];
 
-    if( empty( $category ) )
+    if (empty($category))
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+       $cm->addMessage($cm->txt('cm_enter_name_for_category'), 'add');
        return;
     }
 
-    if( $cm->isCategoryExists( $category ) )
+    if ($cm->isCategoryExists($category))
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
+       $cm->addMessage(sprintf($cm->txt('cm_category_x_exists'), $category), 'add');
        return;
     }
 
-    if( $cm->addCategory( $category, $rank ) !== 0 )
+    if ($cm->addCategory($category, $rank) !== 0)
     {
         $cm->addMessage(
             sprintf(
-                $cm->txt( 'cm_category_x_saved_at_position_y' ),
+                $cm->txt('cm_category_x_saved_at_position_y'),
                 $category,
                 $rank
             ),
@@ -129,26 +129,26 @@ 
     }
     else
     {
-        $cm->addMessage( $cm->txt('cm_unknown_error'), 'add' );
+        $cm->addMessage($cm->txt('cm_unknown_error'), 'add');
     }
 }
 
 /**
  * Sort categories
  */
-if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['sort']['submit']))
 {
     $categories = $_POST[$cm->get('request_key')]['sort']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
+    foreach ($categories as $category_id => $_data)
     {
         $data = array(
-            'category' => urldecode( $_data['category'] ),
+            'category' => urldecode($_data['category']),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
+        if ($cm->updateCategory($category_id, $data))
         {
             $cm->addMessage(
                 sprintf(
@@ -162,9 +162,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'sort');
+        $cm->addMessage($cm->txt('cm_no_changes'), 'sort');
     }
     else
     {
@@ -181,21 +181,21 @@ 
 /**
  * Edit categories
  */
-if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['edit']['submit']))
 {
     $categories = $_POST[$cm->get('request_key')]['edit']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
+    foreach ($categories as $category_id => $_data)
     {
-        if( isset( $_data['delete'] ) )
+        if (isset($_data['delete']))
         {
-            if( $cm->deleteCategory( $category_id ) )
+            if ($cm->deleteCategory($category_id))
             {
                 $cm->addMessage(
                     sprintf(
                         $cm->txt('cm_category_x_deleted'),
-                        urldecode( $_data['origin'] )
+                        urldecode($_data['origin'])
                     ),
                     'edit'
                 );
@@ -205,16 +205,16 @@ 
         }
 
         $data = array(
-            'category' => trim( html_entity_decode( $_data['category'] ) ),
+            'category' => trim(html_entity_decode($_data['category'])),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
+        if ($cm->updateCategory($category_id, $data))
         {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_renamed_to_y'),
-                    urldecode( $_data['origin'] ),
+                    urldecode($_data['origin']),
                     $data['category']
                 ),
                 'edit'
@@ -223,26 +223,26 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'edit');
+        $cm->addMessage($cm->txt('cm_no_changes'), 'edit');
     }
 }
 
 /**
  * Delete singel category by $_GET
  */
-if( isset( $_GET[$cm->get('request_key')]['delete'] )
-    && !empty( $_GET[$cm->get('request_key')]['delete'] ) )
+if (isset($_GET[$cm->get('request_key')]['delete'])
+    && !empty($_GET[$cm->get('request_key')]['delete']))
 {
-    $category_id = (int)$_GET[$cm->get('request_key')]['delete'];
+    $category_id = (int) $_GET[$cm->get('request_key')]['delete'];
 
-    if( $cm->deleteCategory( $category_id ) )
+    if ($cm->deleteCategory($category_id))
     {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_category_x_deleted'),
-                urldecode( $_GET[$cm->get('request_key')]['category'] )
+                urldecode($_GET[$cm->get('request_key')]['category'])
             ),
             'edit'
         );
@@ -251,15 +251,15 @@ 
 /**
  * Translate phrases
  */
-if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['translate']['submit']))
 {
     $translations = $_POST[$cm->get('request_key')]['translate']['data'];
 
-    foreach( $translations as $native_phrase => $translation )
+    foreach ($translations as $native_phrase => $translation)
     {
-        $native_phrase = urldecode( $native_phrase );
+        $native_phrase = urldecode($native_phrase);
 
-        if( empty( $translation ) )
+        if (empty($translation))
         {
             $translation = $native_phrase;
 
@@ -272,7 +272,7 @@ 
             );
         }
 
-        $cm->c('Translator')->addTranslation( $native_phrase, $translation, 'phrase' );
+        $cm->c('Translator')->addTranslation($native_phrase, $translation, 'phrase');
 
         $cm->addMessage(
             sprintf(