evolution-cms / evolution

install/setup.info.php

Spacing +64 added lines, -65 removed lines

@@ -1,33 +1,32 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if (!defined('MGR_DIR')) define('MGR_DIR', 'manager');
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath    = $base_path .'install/assets/chunks';
-$snippetPath  = $base_path .'install/assets/snippets';
-$pluginPath   = $base_path .'install/assets/plugins';
-$modulePath   = $base_path .'install/assets/modules';
-$templatePath = $base_path .'install/assets/templates';
-$tvPath = $base_path .'install/assets/tvs';
+$chunkPath    = $base_path.'install/assets/chunks';
+$snippetPath  = $base_path.'install/assets/snippets';
+$pluginPath   = $base_path.'install/assets/plugins';
+$modulePath   = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
-if(is_dir($templatePath) && is_readable($templatePath)) {
+if (is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
     while (false !== ($tplfile = $d->read()))
     {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
+        if (is_array($params) && (count($params) > 0))
         {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -45,12 +44,12 @@ 
 
 // setup Template Variable template files
 $mtv = &$moduleTVs;
-if(is_dir($tvPath) && is_readable($tvPath)) {
+if (is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($tvPath, $tplfile);
-        if(is_array($params) && (count($params)>0)) {
+        if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mtv[] = array(
                 $params['name'],
@@ -62,9 +61,9 @@ 
                 $params['output_widget'],
                 $params['output_widget_params'],
                 "$templatePath/{$params['filename']}", /* not currently used */
-                $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */
+                $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */
                 $params['modx_category'],
-                $params['lock_tv'],  /* value should be 1 or 0 */
+                $params['lock_tv'], /* value should be 1 or 0 */
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
@@ -74,14 +73,14 @@ 
 
 // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content
 $mc = &$moduleChunks;
-if(is_dir($chunkPath) && is_readable($chunkPath)) {
+if (is_dir($chunkPath) && is_readable($chunkPath)) {
     $d = dir($chunkPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($chunkPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $mc[] = array(
                 $params['name'],
                 $params['description'],
@@ -97,14 +96,14 @@ 
 
 // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $ms = &$moduleSnippets;
-if(is_dir($snippetPath) && is_readable($snippetPath)) {
+if (is_dir($snippetPath) && is_readable($snippetPath)) {
     $d = dir($snippetPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($snippetPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $ms[] = array(
                 $params['name'],
@@ -121,14 +120,14 @@ 
 
 // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $mp = &$modulePlugins;
-if(is_dir($pluginPath) && is_readable($pluginPath)) {
+if (is_dir($pluginPath) && is_readable($pluginPath)) {
     $d = dir($pluginPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($pluginPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mp[] = array(
                 $params['name'],
@@ -150,14 +149,14 @@ 
 // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams
 $mm = &$moduleModules;
 $mdp = &$moduleDependencies;
-if(is_dir($modulePath) && is_readable($modulePath)) {
+if (is_dir($modulePath) && is_readable($modulePath)) {
     $d = dir($modulePath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($modulePath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mm[] = array(
                 $params['name'],
@@ -241,109 +240,109 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser){
     $ids = array();
     $mysqlVerOk = -1;
 
-    if(function_exists("mysqli_get_server_info")) {
-        $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn),"4.0.2")>=0);
+    if (function_exists("mysqli_get_server_info")) {
+        $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn), "4.0.2") >= 0);
     }
 
     // secure web documents - privateweb
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 
     // secure manager documents privatemgr
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename){
     $params = array();
-    $fullpath = $element_dir . '/' . $filename;
-    if(is_readable($fullpath)) {
+    $fullpath = $element_dir.'/'.$filename;
+    if (is_readable($fullpath)) {
         $tpl = @fopen($fullpath, "r");
-        if($tpl) {
+        if ($tpl) {
             $params['filename'] = $filename;
             $docblock_start_found = false;
             $name_found = false;
             $description_found = false;
             $docblock_end_found = false;
 
-            while(!feof($tpl)) {
+            while (!feof($tpl)) {
                 $line = fgets($tpl);
-                if(!$docblock_start_found) {
+                if (!$docblock_start_found) {
                     // find docblock start
-                    if(strpos($line, '/**') !== false) {
+                    if (strpos($line, '/**') !== false) {
                         $docblock_start_found = true;
                     }
                     continue;
-                } elseif(!$name_found) {
+                } elseif (!$name_found) {
                     // find name
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['name'] = trim($ma[1]);
                         $name_found = !empty($params['name']);
                     }
                     continue;
-                } elseif(!$description_found) {
+                } elseif (!$description_found) {
                     // find description
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['description'] = trim($ma[1]);
                         $description_found = !empty($params['description']);
                     }
                     continue;
                 } else {
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
                         $param = trim($ma[1]);
                         $val = trim($ma[2]);
-                        if(!empty($param) && !empty($val)) {
-                            if($param == 'internal') {
+                        if (!empty($param) && !empty($val)) {
+                            if ($param == 'internal') {
                                 $ma = null;
-                                if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
+                                if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
                                     $param = trim($ma[1]);
                                     $val = trim($ma[2]);
                                 }
                                 //if($val !== '0' && (empty($param) || empty($val))) {
-                                if(empty($param)) {
+                                if (empty($param)) {
                                     continue;
                                 }
                             }
                             $params[$param] = $val;
                         }
-                    } elseif(preg_match("/^\s*\*\/\s*$/", $line)) {
+                    } elseif (preg_match("/^\s*\*\/\s*$/", $line)) {
                         $docblock_end_found = true;
                         break;
                     }

install/actions/action_install.php

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 	var chk = document.install.rminstaller;
 	if(chk && chk.checked) {
 		// remove install folder and files
-		window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+		window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
 	}
 	else {
-		window.location.href = "../<?php echo MGR_DIR;?>/";
+		window.location.href = "../<?php echo MGR_DIR; ?>/";
 	}
 }
 /* ]]> */

install/connection.databasetest.php

Spacing +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@ 
 $installMode = $_POST['installMode'];
 
 $self = 'install/connection.databasetest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (!mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         }
         else {

install/functions.php

Spacing +18 added lines, -18 removed lines

@@ -4,9 +4,9 @@ 
 	global $_lang;
 	
 	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
+	if (!isset($_GET['action']) || $_GET['action'] !== 'mode')
 	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+		if (!isset($_SESSION['test']) || $_SESSION['test'] != 1)
 		{
 			echo '
 <html>
@@ -22,8 +22,8 @@ 
 </head>
 <body>
 	<div class="install">
-		<p>' . $_lang["session_problem"] . '</p>
-		<p><a href="./">' .$_lang["session_problem_try_again"] . '</a></p>
+		<p>' . $_lang["session_problem"].'</p>
+		<p><a href="./">' .$_lang["session_problem_try_again"].'</a></p>
 	</div>
 </body>
 </html>';
@@ -32,28 +32,28 @@ 
 	}
 }
 
-function parse($src,$ph,$left='[+',$right='+]')
+function parse($src, $ph, $left = '[+', $right = '+]')
 {
-	foreach($ph as $k=>$v)
+	foreach ($ph as $k=>$v)
 	{
-		$k = $left . $k . $right;
-		$src = str_replace($k,$v,$src);
+		$k = $left.$k.$right;
+		$src = str_replace($k, $v, $src);
 	}
 	return $src;
 }
 
 function ph()
 {
-	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
+	global $_lang, $moduleName, $moduleVersion, $modx_textdir, $modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
+	if (isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
 	else                                $installmode = get_installmode();
 
 	$ph['pagetitle']     = $_lang['modx_install'];
-	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
+	$ph['textdir']       = $modx_textdir ? ' id="rtl"' : '';
 	$ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
 	$ph['version']       = $moduleVersion;
-	$ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
+	$ph['release_date']  = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
 	$ph['footer1']       = $_lang['modx_footer1'];
 	$ph['footer2']       = $_lang['modx_footer2'];
 	$ph['current_year']  = date('Y');
@@ -62,20 +62,20 @@ 
 
 function get_installmode()
 {
-	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
+	global $base_path, $database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
 	$conf_path = "{$base_path}manager/includes/config.inc.php";
 	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
+	elseif (isset($_POST['installmode'])) $installmode = $_POST['installmode'];
 	else
 	{
 		include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
+		if (!isset($dbase) || empty($dbase)) $installmode = 0;
 		else
 		{
 			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
+			if ($conn)
 			{
 				$_SESSION['database_server']   = $database_server;
 				$_SESSION['database_user']     = $database_user;
@@ -86,7 +86,7 @@ 
 			}
 			else $rs = false;
 			
-			if($rs)
+			if ($rs)
 			{
 				$_SESSION['dbase']                      = $dbase;
 				$_SESSION['table_prefix']               = $table_prefix;
@@ -95,7 +95,7 @@ 
 				
 				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
 				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
+				if ($rs)
 				{
 					$row = mysqli_fetch_assoc($rs);
 					$settings_version = $row['setting_value'];

install/connection.servertest.php

Spacing +5 added lines, -5 removed lines

@@ -5,12 +5,12 @@ 
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.servertest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -22,12 +22,12 @@ 
     $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
     // Mysql version check
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
         $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {

install/connection.collation.php

Spacing +18 added lines, -18 removed lines

@@ -5,17 +5,17 @@ 
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.collation.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if (!$conn) exit('can not connect');
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,20 +29,20 @@ 
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
+    elseif (isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
+    elseif (isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
+    elseif (isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
     
-    $_ = sortItem($_,$_lang['recommend_collations_order']);
+    $_ = sortItem($_, $_lang['recommend_collations_order']);
     
-    foreach($_ as $collation=>$selected) {
+    foreach ($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
+        if (strpos($collation, 'sjis') === 0) continue;
+        if ($collation == 'recommend')
             $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
+        elseif ($collation == 'unrecommend')
             $output .= '</optgroup><optgroup label="unrecommend">';
         else
             $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
@@ -55,17 +55,17 @@ 
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array = array(), $order = 'utf8mb4,utf8'){
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
-    foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
+    foreach ($order as $v) {
+    	foreach ($array as $name=>$sel) {
+        	if (strpos($name, $v) !== false) {
         		$rs[$name] = $array[$name];
         		unset($array[$name]);
         	}
     	}
     }
-    $rs['unrecommend']='';
+    $rs['unrecommend'] = '';
     return $rs + $array;
 }

install/index.php

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 $self = 'install/index.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 require_once("{$base_path}install/functions.php");
 
 // set error reporting
@@ -18,7 +18,7 @@ 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
 }
 
@@ -38,26 +38,26 @@ 
 $moduleSQLDataFile = "setup.data.sql";
 $moduleSQLResetFile = "setup.data.reset.sql";
 
-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
 $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
 
-$errors= 0;
+$errors = 0;
 
 // get post back status
 $isPostBack = (count($_POST));
 
 $ph = ph();
-$ph = array_merge($ph,$_lang);
+$ph = array_merge($ph, $_lang);
 $ph['install_language'] = $install_language;
 
 ob_start();
-$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
+$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
 if (!@include_once("actions/action_{$action}.php")) {
     die ("Invalid install action attempted. [action={$action}]");
 }
@@ -65,5 +65,5 @@ 
 ob_end_clean();
 
 $tpl = file_get_contents("{$base_path}install/template.tpl");
-echo parse($tpl,$ph);
+echo parse($tpl, $ph);
 

install/instprocessor.php

Spacing +181 added lines, -181 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -28,7 +28,7 @@ 
 
 echo "<p>{$_lang['setup_database']}</p>\n";
 
-$installMode= intval($_POST['installmode']);
+$installMode = intval($_POST['installmode']);
 $installData = $_POST['installdata'] == "1" ? 1 : 0;
 
 //if ($installMode == 1) {
@@ -42,7 +42,7 @@ 
 $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
 $database_connection_charset = $_POST['database_connection_charset'];
 $database_connection_method = $_POST['database_connection_method'];
-$dbase = "`" . $_POST['database_name'] . "`";
+$dbase = "`".$_POST['database_name']."`";
 $table_prefix = $_POST['tableprefix'];
 $adminname = $_POST['cmsadmin'];
 $adminemail = $_POST['cmsadminemail'];
@@ -53,7 +53,7 @@ 
 
 // set session name variable
 if (!isset ($site_sessionname)) {
-    $site_sessionname = 'SN' . uniqid('');
+    $site_sessionname = 'SN'.uniqid('');
 }
 
 // get base path and url
@@ -67,11 +67,11 @@ 
     array_pop($a);
 $pth = implode("install", $a);
 unset ($a);
-$base_url = $url . (substr($url, -1) != "/" ? "/" : "");
-$base_path = $pth . (substr($pth, -1) != "/" ? "/" : "");
+$base_url = $url.(substr($url, -1) != "/" ? "/" : "");
+$base_path = $pth.(substr($pth, -1) != "/" ? "/" : "");
 
 // connect to the database
-echo "<p>". $_lang['setup_database_create_connection'];
+echo "<p>".$_lang['setup_database_create_connection'];
 if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
     echo '<span class="notok">'.$_lang["setup_database_create_connection_failed"]."</span></p><p>".$_lang['setup_database_create_connection_failed_note']."</p>";
     return;
@@ -80,7 +80,7 @@ 
 }
 
 // select database
-echo "<p>".$_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: ";
+echo "<p>".$_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: ";
 if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) {
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
@@ -92,9 +92,9 @@ 
 
 // try to create the database
 if ($create) {
-    echo "<p>".$_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: ";
+    echo "<p>".$_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: ";
     //	if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) {
-    if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) {
+    if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) {
         echo '<span class="notok">'.$_lang['setup_database_creation_failed']."</span>".$_lang['setup_database_creation_failed_note']."</p>";
         $errors += 1;
 ?>
@@ -113,33 +113,33 @@ 
 
 // check table prefix
 if ($installMode == 0) {
-    echo "<p>" . $_lang['checking_table_prefix'] . $table_prefix . "`: ";
-    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . "</span>" . $_lang['table_prefix_already_inuse'] . "</p>";
+    echo "<p>".$_lang['checking_table_prefix'].$table_prefix."`: ";
+    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed']."</span>".$_lang['table_prefix_already_inuse']."</p>";
         $errors += 1;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . "</p>";
+        echo "<p>".$_lang['table_prefix_already_inuse_note']."</p>";
         return;
     } else {
         echo '<span class="ok">'.$_lang['ok']."</span></p>";
     }
 }
 
-if(!function_exists('parseProperties')) {
+if (!function_exists('parseProperties')) {
     // parses a resource property string and returns the result as an array
     // duplicate of method in documentParser class
-    function parseProperties($propertyString) {
-        $parameter= array ();
+    function parseProperties($propertyString){
+        $parameter = array();
         if (!empty ($propertyString)) {
-            $tmpParams= explode("&", $propertyString);
-            for ($x= 0; $x < count($tmpParams); $x++) {
+            $tmpParams = explode("&", $propertyString);
+            for ($x = 0; $x < count($tmpParams); $x++) {
                 if (strpos($tmpParams[$x], '=', 0)) {
-                    $pTmp= explode("=", $tmpParams[$x]);
-                    $pvTmp= explode(";", trim($pTmp[1]));
+                    $pTmp = explode("=", $tmpParams[$x]);
+                    $pvTmp = explode(";", trim($pTmp[1]));
                     if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                        $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default
                     else
                         if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                            $parameter[trim($pTmp[0])] = $pvTmp[2];
                 }
             }
         }
@@ -150,20 +150,20 @@ 
 // check status of Inherit Parent Template plugin
 $auto_template_logic = 'parent';
 if ($installMode != 0) {
-    $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'");
+    $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'");
     $row = mysqli_fetch_row($rs);
-    if(!$row) {
+    if (!$row) {
         // not installed
         $auto_template_logic = 'system';
     } else {
-        if($row[1] == 1) {
+        if ($row[1] == 1) {
             // installed but disabled
             $auto_template_logic = 'system';
         } else {
             // installed, enabled .. see how it's configured
             $properties = parseProperties($row[0]);
-            if(isset($properties['inheritTemplate'])) {
-                if($properties['inheritTemplate'] == 'From First Sibling') {
+            if (isset($properties['inheritTemplate'])) {
+                if ($properties['inheritTemplate'] == 'From First Sibling') {
                     $auto_template_logic = 'sibling';
                 }
             }
@@ -187,20 +187,20 @@ 
 $sqlParser->connect();
 
 // install/update database
-echo "<p>" . $_lang['setup_database_creating_tables'];
+echo "<p>".$_lang['setup_database_creating_tables'];
 if ($moduleSQLBaseFile) {
     $sqlParser->process($moduleSQLBaseFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+        echo "<p>".$_lang['setup_couldnt_install']."</p>";
+        echo "<p>".$_lang['installation_error_occured']."<br /><br />";
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+            echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
         }
         echo "</p>";
-        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        echo "<p>".$_lang['some_tables_not_updated']."</p>";
         return;
     } else {
         echo '<span class="ok">'.$_lang['ok']."</span></p>";
@@ -210,12 +210,12 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
 // write the config.inc.php file if new installation
-echo "<p>" . $_lang['writing_config_file'];
+echo "<p>".$_lang['writing_config_file'];
 
 $confph = array();
 $confph['database_server']    = $database_server;
@@ -247,7 +247,7 @@ 
 $chmodSuccess = @chmod($filename, 0404);
 
 if ($configFileFailed == true) {
-    echo '<span class="notok">' . $_lang['failed'] . "</span></p>";
+    echo '<span class="notok">'.$_lang['failed']."</span></p>";
     $errors += 1;
 ?>
     <p><?php echo $_lang['cant_write_config_file']?><span class="mono"><?php echo MGR_DIR; ?>/includes/config.inc.php</span></p>
@@ -264,35 +264,35 @@ 
 // generate new site_id and set manager theme to default
 if ($installMode == 0) {
     $siteid = uniqid('');
-    mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')");
+    mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')");
 } else {
     // update site_id if missing
-    $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'");
+    $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'");
     if ($ds) {
         $r = mysqli_fetch_assoc($ds);
         $siteid = $r['setting_value'];
         if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') {
             $siteid = uniqid('');
-            mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
+            mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
         }
     }
 }
 
 // Reset database for installation of demo-site 
 if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) {
-	echo "<p>" . $_lang['resetting_database'];
+	echo "<p>".$_lang['resetting_database'];
 	$sqlParser->process($moduleSQLResetFile);
 	// display database results
 	if ($sqlParser->installFailed == true) {
 		$errors += 1;
-		echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-		echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-		echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+		echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+		echo "<p>".$_lang['setup_couldnt_install']."</p>";
+		echo "<p>".$_lang['installation_error_occured']."<br /><br />";
 		for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-			echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+			echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
 		}
 		echo "</p>";
-		echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+		echo "<p>".$_lang['some_tables_not_updated']."</p>";
 		return;
 	} else {
 		echo '<span class="ok">'.$_lang['ok']."</span></p>";
@@ -301,11 +301,11 @@ 
 
 // Install Templates
 if (isset ($_POST['template']) || $installData) {
-    echo "<h3>" . $_lang['templates'] . ":</h3> ";
+    echo "<h3>".$_lang['templates'].":</h3> ";
     $selTemplates = $_POST['template'];
     foreach ($moduleTemplates as $k=>$moduleTemplate) {
         $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1;
-        if($installSample || in_array($k, $selTemplates)) {
+        if ($installSample || in_array($k, $selTemplates)) {
             $name = mysqli_real_escape_string($conn, $moduleTemplate[0]);
             $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]);
             $category = mysqli_real_escape_string($conn, $moduleTemplate[4]);
@@ -313,7 +313,7 @@ 
             $filecontent = $moduleTemplate[3];
             $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site
             if (!file_exists($filecontent)) {
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             } else {
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -323,31 +323,31 @@ 
                 $template = mysqli_real_escape_string($conn, $template);
 
                 // See if the template already exists
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'");
 
                 if (mysqli_num_rows($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) {
+                    if (!is_null($save_sql_id_as)) {
                         $sql_id = @mysqli_insert_id($sqlParser->conn);
-                        if(!$sql_id) {
-                            $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;"));
+                        if (!$sql_id) {
+                            $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;"));
                             $sql_id = $idQuery['id'];
                         }
                         $custom_placeholders[$save_sql_id_as] = $sql_id;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
-                    if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
+                    if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -356,11 +356,11 @@ 
 
 // Install Template Variables
 if (isset ($_POST['tv']) || $installData) {
-    echo "<h3>" . $_lang['tvs'] . ":</h3> ";
+    echo "<h3>".$_lang['tvs'].":</h3> ";
     $selTVs = $_POST['tv'];
     foreach ($moduleTVs as $k=>$moduleTV) {
         $installSample = in_array('sample', $moduleTV[12]) && $installData == 1;
-        if($installSample || in_array($k, $selTVs)) {
+        if ($installSample || in_array($k, $selTVs)) {
             $name = mysqli_real_escape_string($conn, $moduleTV[0]);
             $caption = mysqli_real_escape_string($conn, $moduleTV[1]);
             $desc = mysqli_real_escape_string($conn, $moduleTV[2]);
@@ -378,25 +378,25 @@ 
             // Create the category if it does not already exist
             $category = getCreateDbCategory($category, $sqlParser);
 
-            $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'");
+            $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'");
             if (mysqli_num_rows($rs)) {
                 $insert = true;
-                while($row = mysqli_fetch_assoc($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                while ($row = mysqli_fetch_assoc($rs)) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
                     $insert = false;
                 }
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
             } else {
                 //$q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',(SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE `id` END) `id` FROM $dbase.`" . $table_prefix . "categories` WHERE `category` = '$category'),$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
-                $q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
+                $q = "INSERT INTO $dbase.`".$table_prefix."site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
                 if (!mysqli_query($sqlParser->conn, $q)) {
-                    echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                     return;
                 }
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
             }
 
             // add template assignments
@@ -405,10 +405,10 @@ 
             if (count($assignments) > 0) {
 
                 // remove existing tv -> template assignments
-                $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';");
+                $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';");
                 $row = mysqli_fetch_assoc($ds);
                 $id = $row["id"];
-                mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\'');
+                mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\'');
 
                 // add tv -> template assignments
                 foreach ($assignments as $assignment) {
@@ -417,7 +417,7 @@ 
                     if ($ds && $ts) {
                         $tRow = mysqli_fetch_assoc($ts);
                         $templateId = $tRow['id'];
-                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
+                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
                    }
                 }
             }
@@ -427,12 +427,12 @@ 
 
 // Install Chunks
 if (isset ($_POST['chunk']) || $installData) {
-    echo "<h3>" . $_lang['chunks'] . ":</h3> ";
+    echo "<h3>".$_lang['chunks'].":</h3> ";
     $selChunks = $_POST['chunk'];
     foreach ($moduleChunks as $k=>$moduleChunk) {
         $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1;
         $count_new_name = 0;
-        if($installSample || in_array($k, $selChunks)) {
+        if ($installSample || in_array($k, $selChunks)) {
 
             $name = mysqli_real_escape_string($conn, $moduleChunk[0]);
             $desc = mysqli_real_escape_string($conn, $moduleChunk[1]);
@@ -441,7 +441,7 @@ 
             $filecontent = $moduleChunk[2];
 
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -449,31 +449,31 @@ 
 
                 $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1);
                 $chunk = mysqli_real_escape_string($conn, $chunk);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'");
                 $count_original_name = mysqli_num_rows($rs);
-                if($overwrite == 'false') {
-                    $newname = $name . '-' . str_replace('.', '_', $modx_version);
-                    $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'");
+                if ($overwrite == 'false') {
+                    $newname = $name.'-'.str_replace('.', '_', $modx_version);
+                    $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'");
                     $count_new_name = mysqli_num_rows($rs);
                 }
                 $update = $count_original_name > 0 && $overwrite == 'true';
                 if ($update) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
-                } elseif($count_new_name == 0) {
-                    if($count_original_name > 0 && $overwrite == 'false') {
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
+                } elseif ($count_new_name == 0) {
+                    if ($count_original_name > 0 && $overwrite == 'false') {
                         $name = $newname;
                     }
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -482,11 +482,11 @@ 
 
 // Install Modules
 if (isset ($_POST['module']) || $installData) {
-    echo "<h3>" . $_lang['modules'] . ":</h3> ";
+    echo "<h3>".$_lang['modules'].":</h3> ";
     $selModules = $_POST['module'];
     foreach ($moduleModules as $k=>$moduleModule) {
         $installSample = in_array('sample', $moduleModule[7]) && $installData == 1;
-        if($installSample || in_array($k, $selModules)) {
+        if ($installSample || in_array($k, $selModules)) {
             $name = mysqli_real_escape_string($conn, $moduleModule[0]);
             $desc = mysqli_real_escape_string($conn, $moduleModule[1]);
             $filecontent = $moduleModule[2];
@@ -495,7 +495,7 @@ 
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -504,22 +504,22 @@ 
                 $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2));
                 // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab
                 $module = mysqli_real_escape_string($conn, $module);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
-                    $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -528,11 +528,11 @@ 
 
 // Install Plugins
 if (isset ($_POST['plugin']) || $installData) {
-    echo "<h3>" . $_lang['plugins'] . ":</h3> ";
+    echo "<h3>".$_lang['plugins'].":</h3> ";
     $selPlugs = $_POST['plugin'];
     foreach ($modulePlugins as $k=>$modulePlugin) {
         $installSample = in_array('sample', $modulePlugin[8]) && $installData == 1;
-        if($installSample || in_array($k, $selPlugs)) {
+        if ($installSample || in_array($k, $selPlugs)) {
             $name = mysqli_real_escape_string($conn, $modulePlugin[0]);
             $desc = mysqli_real_escape_string($conn, $modulePlugin[1]);
             $filecontent = $modulePlugin[2];
@@ -542,17 +542,17 @@ 
             $category = mysqli_real_escape_string($conn, $modulePlugin[6]);
             $leg_names = '';
             $disabled = $modulePlugin[9];
-            if(array_key_exists(7, $modulePlugin)) {
+            if (array_key_exists(7, $modulePlugin)) {
                 // parse comma-separated legacy names and prepare them for sql IN clause
-                $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
+                $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'";
             }
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // disable legacy versions based on legacy_names provided
-                if(!empty($leg_names)) {
-                    $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
+                if (!empty($leg_names)) {
+                    $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
                     $rs = mysqli_query($sqlParser->conn, $update_query);
                 }
 
@@ -562,50 +562,50 @@ 
                 $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2));
                 $plugin = removeDocblock($plugin, 'plugin');
                 $plugin = mysqli_real_escape_string($conn, $plugin);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $insert = true;
-                    while($row = mysqli_fetch_assoc($rs)) {
-                        $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
-                            if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
-                                echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    while ($row = mysqli_fetch_assoc($rs)) {
+                        $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                        if ($row['description'] == $desc) {
+                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
+                                echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
                             $insert = false;
                         } else {
-                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
+                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
                                 echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
                         }
                     }
-                    if($insert === true) {
-                        $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
+                    if ($insert === true) {
+                        $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                        if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
                             echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                             return;
                         }
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
                 // add system events
                 if (count($events) > 0) {
-                    $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
+                    $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
                     if ($ds) {
                         $row = mysqli_fetch_assoc($ds);
                         $id = $row["id"];
                         // remove existing events
-                        mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\'');
+                        mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\'');
                         // add new events
-                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','", $events) . "')");
+                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','", $events)."')");
                     }
                 }
             }
@@ -615,18 +615,18 @@ 
 
 // Install Snippets
 if (isset ($_POST['snippet']) || $installData) {
-    echo "<h3>" . $_lang['snippets'] . ":</h3> ";
+    echo "<h3>".$_lang['snippets'].":</h3> ";
     $selSnips = $_POST['snippet'];
     foreach ($moduleSnippets as $k=>$moduleSnippet) {
         $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1;
-        if($installSample || in_array($k, $selSnips)) {
+        if ($installSample || in_array($k, $selSnips)) {
             $name = mysqli_real_escape_string($conn, $moduleSnippet[0]);
             $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]);
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -635,22 +635,22 @@ 
                 $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent)));
                 $snippet = removeDocblock($snippet, 'snippet');
                 $snippet = mysqli_real_escape_string($conn, $snippet);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
-                    $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -659,24 +659,24 @@ 
 
 // Install demo-site
 if ($installData && $moduleSQLDataFile) {
-    echo "<p>" . $_lang['installing_demo_site'];
+    echo "<p>".$_lang['installing_demo_site'];
     $sqlParser->process($moduleSQLDataFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+        echo "<p>".$_lang['setup_couldnt_install']."</p>";
+        echo "<p>".$_lang['installation_error_occured']."<br /><br />";
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+            echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
         }
         echo "</p>";
-        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        echo "<p>".$_lang['some_tables_not_updated']."</p>";
         return;
     } else {
         $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix);
         $rs = mysqli_query($sqlParser->conn, $sql);
-        if(mysqli_num_rows($rs)) {
+        if (mysqli_num_rows($rs)) {
             $row = mysqli_fetch_assoc($rs);
             $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']);
             mysqli_query($sqlParser->conn, $sql);
@@ -687,9 +687,9 @@ 
 
 // Install Dependencies
 foreach ($moduleDependencies as $dependency) {
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		$row = mysqli_fetch_assoc($ds);
@@ -697,37 +697,37 @@ 
 		$moduleGuid = $row["guid"];
 	}
 	// get extra id
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		$row = mysqli_fetch_assoc($ds);
 		$extraId = $row["id"];
 	}
 	// setup extra as module dependency
-	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		if (mysqli_num_rows($ds) === 0) {
-			mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
+			mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')');
+			echo '<p>&nbsp;&nbsp;'.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_create'].'</span></p>';
 		} else {
-			mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
+			mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` SET module = '.$moduleId.', resource = '.$extraId.', type = '.$dependency['type'].' WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type']);
+			echo '<p>&nbsp;&nbsp;'.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_update'].'</span></p>';
 		}
 		if ($dependency['type'] == 30 || $dependency['type'] == 40) {
 			// set extra guid for plugins and snippets
-			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
+			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1');
 			if (!$ds) {
-				echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+				echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 				return;
 			} else {
 				if (mysqli_num_rows($ds) != 0) {
-					mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
-					echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
+					mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId);
+					echo '<p>&nbsp;&nbsp;'.$dependency['name'].': <span class="ok">'.$_lang['guid_set'].'</span></p>';
 				}
 			}
 		}
@@ -736,7 +736,7 @@ 
 
 // call back function
 if ($callBackFnc != "")
-    $callBackFnc ($sqlParser);
+    $callBackFnc($sqlParser);
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
@@ -771,20 +771,20 @@ 
 }
 
 // setup completed!
-echo "<p><b>" . $_lang['installation_successful'] . "</b></p>";
-echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>";
+echo "<p><b>".$_lang['installation_successful']."</b></p>";
+echo "<p>".$_lang['to_log_into_content_manager']."</p>";
 if ($installMode == 0) {
-    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['installation_note'] . "</p>";
+    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['installation_note']."</p>";
 } else {
-    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['upgrade_note'] . "</p>";
+    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['upgrade_note']."</p>";
 }
 
 // Property Update function
-function propUpdate($new,$old){
+function propUpdate($new, $old){
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -794,22 +794,22 @@ 
     return $return;
 }
 
-function parseProperties($propertyString, $json=false) {   
-    $propertyString = str_replace('{}', '', $propertyString ); 
-    $propertyString = str_replace('} {', ',', $propertyString );
+function parseProperties($propertyString, $json = false){   
+    $propertyString = str_replace('{}', '', $propertyString); 
+    $propertyString = str_replace('} {', ',', $propertyString);
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if (empty($propertyString)) return array();
+    if ($propertyString == '{}' || $propertyString == '[]') return array();
     
     $jsonFormat = isJson($propertyString, true);
     $property = array();
     // old format
-    if ( $jsonFormat === false) {
-        $props= explode('&', $propertyString);
+    if ($jsonFormat === false) {
+        $props = explode('&', $propertyString);
         $arr = array();
         $key = array();
         foreach ($props as $prop) {
-            if ($prop != ''){
+            if ($prop != '') {
                 $arr = explode(';', $prop);
                 $key = explode('=', $arr['0']);
                 $property[$key['0']]['0']['label'] = trim($key['1']);
@@ -833,7 +833,7 @@ 
             
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if (!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -843,25 +843,25 @@ 
     return $property;
 }
 
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData = false){
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
 
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser){
     $dbase = $sqlParser->dbname;
-    $dbase = '`' . trim($dbase,'`') . '`';
+    $dbase = '`'.trim($dbase, '`').'`';
     $table_prefix = $sqlParser->prefix;
     $category_id = 0;
-    if(!empty($category)) {
+    if (!empty($category)) {
         $category = mysqli_real_escape_string($sqlParser->conn, $category);
         $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'");
-        if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
+        if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
             $category_id = $row['id'];
         } else {
             $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');";
             $rs = mysqli_query($sqlParser->conn, $q);
-            if($rs) {
+            if ($rs) {
                 $category_id = mysqli_insert_id($sqlParser->conn);
             }
         }
@@ -870,12 +870,12 @@ 
 }
 
 // Remove installer Docblock only from components using plugin FileSource / fileBinding
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type){
     
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
     
     // Procedure taken from plugin.filesource.php
-    switch($type) {
+    switch ($type) {
         case 'snippet':
             $elm_name = 'snippets';
             $include = 'return require';
@@ -891,7 +891,7 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
+    if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
         return $cleaned;
     
     // fileBinding not found - return code incl docblock

manager/actions/welcome.static.php

Spacing +65 added lines, -65 removed lines

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

-if(IN_MANAGER_MODE != 'true') {

+if (IN_MANAGER_MODE != 'true') {

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

 }

 

 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) {