evolution-cms / evolution

manager/processors/delete_user.processor.php

Spacing +6 added lines, -6 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_user')) {
+if (!$modx->hasPermission('delete_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // delete the user, but first check if we are deleting our own record
-if($id==$modx->getLoginUserID()) {
+if ($id == $modx->getLoginUserID()) {
 	$modx->webAlertAndQuit("You can't delete yourself!");
 }
 
@@ -50,5 +50,5 @@ 
 		"id"	=> $id
 	));
 
-$header="Location: index.php?a=75";
+$header = "Location: index.php?a=75";
 header($header);

Indentation +13 added lines, -13 removed lines

@@ -3,17 +3,17 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // delete the user, but first check if we are deleting our own record
 if($id==$modx->getLoginUserID()) {
-	$modx->webAlertAndQuit("You can't delete yourself!");
+    $modx->webAlertAndQuit("You can't delete yourself!");
 }
 
 // Set the item name for logger
@@ -22,25 +22,25 @@ 
 
 // invoke OnBeforeUserFormDelete event
 $modx->invokeEvent("OnBeforeUserFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the user.
 EvolutionCMS\Models\ManagerUser::destroy($id);
 
 // invoke OnManagerDeleteUser event
 $modx->invokeEvent("OnManagerDeleteUser",
-	array(
-		"userid"		=> $id,
-		"username"		=> $username
-	));
+    array(
+        "userid"		=> $id,
+        "username"		=> $username
+    ));
 
 // invoke OnUserFormDelete event
 $modx->invokeEvent("OnUserFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 $header="Location: index.php?a=75";
 header($header);

manager/processors/delete_module.processor.php

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_module')) {
+if (!$modx->hasPermission('delete_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -40,5 +40,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=106&r=2";
+$header = "Location: index.php?a=106&r=2";
 header($header);

Indentation +8 added lines, -8 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,9 +17,9 @@ 
 
 // invoke OnBeforeModFormDelete event
 $modx->invokeEvent("OnBeforeModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the module.
 $modx->getDatabase()->delete($modx->getDatabase()->getFullTableName('site_modules'), "id='{$id}'");
@@ -32,9 +32,9 @@ 
 
 // invoke OnModFormDelete event
 $modx->invokeEvent("OnModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

manager/processors/delete_snippet.processor.php

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_snippet')) {
+if (!$modx->hasPermission('delete_snippet')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -34,5 +34,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);

Indentation +8 added lines, -8 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,18 +17,18 @@ 
 
 // invoke OnBeforeSnipFormDelete event
 $modx->invokeEvent("OnBeforeSnipFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the snippet.
 EvolutionCMS\Models\SiteSnippet::destroy($id);
 
 // invoke OnSnipFormDelete event
 $modx->invokeEvent("OnSnipFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

manager/actions/help/version_notices/1.3.6.php

Spacing +1 added lines, -1 removed lines

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

manager/actions/help/version_notices/1.4.1.php

Spacing +1 added lines, -1 removed lines

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

manager/actions/help/version_notices/1.4.0.php

Spacing +1 added lines, -1 removed lines

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

install/cli-install.php

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -316,7 +316,7 @@ 
 
 
 // make sure we can use the database
-if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
+if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) {
     $errors++;
     echo $_lang['database_use_failed'] . PHP_EOL;
 }
@@ -1117,7 +1117,7 @@ 
 
                 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;")) {
+                        "update $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
                         $errors += 1;
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
 
@@ -1181,7 +1181,7 @@ 
                 $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']};")) {
+                        "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 mysqli_error($sqlParser->conn) . PHP_EOL;
 
                         return;
@@ -1266,7 +1266,7 @@ 
                 $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';")) {
+                        "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
                         $errors += 1;
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
 
@@ -1322,7 +1322,7 @@ 
                     $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';")) {
+                        "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
 
                         return;
@@ -1373,7 +1373,7 @@ 
 
                 // 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);";
+                    $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
                     $rs = mysqli_query($sqlParser->conn, $update_query);
                 }
 
@@ -1391,7 +1391,7 @@ 
                         $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']};")) {
+                                "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo mysqli_error($sqlParser->conn) . PHP_EOL;
 
                                 return;
@@ -1399,7 +1399,7 @@ 
                             $insert = false;
                         } else {
                             if (!mysqli_query($sqlParser->conn,
-                                "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
+                                "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
                                 echo mysqli_error($sqlParser->conn) . PHP_EOL;
 
                                 return;
@@ -1478,7 +1478,7 @@ 
                     $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';")) {
+                        "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
 
                         return;

Spacing +258 added lines, -260 removed lines

@@ -7,8 +7,8 @@ 
  */
 
 $self = 'install/cli-install.php';
-$path = __DIR__ . '/';
-$base_path = dirname(__DIR__) . '/';
+$path = __DIR__.'/';
+$base_path = dirname(__DIR__).'/';
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
 define('MODX_SITE_URL', '/');
@@ -18,22 +18,22 @@ 
 // set error reporting
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
-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') && is_dir($base_path . "manager")) {
+if (!defined('MGR_DIR') && is_dir($base_path."manager")) {
     define('MGR_DIR', 'manager');
 }
 
 require_once 'src/lang.php';
-require_once($base_path . MGR_DIR . '/includes/version.inc.php');
+require_once($base_path.MGR_DIR.'/includes/version.inc.php');
 
 $moduleName = "EVO";
-$moduleVersion = $modx_branch . ' ' . $modx_version;
+$moduleVersion = $modx_branch.' '.$modx_version;
 $moduleRelease = $modx_release_date;
-$moduleSQLBaseFile = $path . 'stubs/sql/setup.sql';
-$moduleSQLDataFile = $path . 'stubs/sql/setup.data.sql';
-$moduleSQLResetFile = $path . 'stubs/sql/setup.data.reset.sql';
+$moduleSQLBaseFile = $path.'stubs/sql/setup.sql';
+$moduleSQLDataFile = $path.'stubs/sql/setup.data.sql';
+$moduleSQLResetFile = $path.'stubs/sql/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
@@ -48,29 +48,29 @@ 
 
 $installMode = 0;
 $installData = 0;
-$tableprefixauto = base_convert(rand(10, 20), 10, 36) . substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'),
-        rand(0, 33), 3) . '_';
+$tableprefixauto = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'),
+        rand(0, 33), 3).'_';
 
 $args = array_slice($argv, 1);
 
 if (empty($args)) {
-    echo 'Install Evolution CMS' . PHP_EOL;
+    echo 'Install Evolution CMS'.PHP_EOL;
     //$installYes = readline("Type 'y' to continue: ");
     //if ($installYes != 'y') return;
 
     //set param manual
-    $databasehost = readline($_lang['connection_screen_database_host'] . ' [localhost] ');
-    $databaseloginname = readline($_lang['connection_screen_database_login'] . ' ');
-    $databaseloginpassword = readline($_lang['connection_screen_database_pass'] . ' ');
-    $database_name = readline($_lang['connection_screen_database_name'] . ' ');
-    $tableprefix = readline($_lang['connection_screen_table_prefix'] . ' [' . $tableprefixauto . '] ');
-    $database_connection_method = readline($_lang['connection_screen_connection_method'] . ' [SET CHARACTER SET] ');
-    $database_collation = readline($_lang['connection_screen_collation'] . ' [utf8mb4_general_ci] ');
-    $cmsadmin = readline($_lang['connection_screen_default_admin_login'] . ' [admin] ');
-    $cmsadminemail = readline($_lang['connection_screen_default_admin_email'] . ' ');
-    $cmspassword = readline($_lang['connection_screen_default_admin_password'] . ' ');
-    $managerlanguage = readline('Мanager language:' . ' [en] ');
-    $installData = readline('Instal demo-site (y/n):' . ' [n] ');
+    $databasehost = readline($_lang['connection_screen_database_host'].' [localhost] ');
+    $databaseloginname = readline($_lang['connection_screen_database_login'].' ');
+    $databaseloginpassword = readline($_lang['connection_screen_database_pass'].' ');
+    $database_name = readline($_lang['connection_screen_database_name'].' ');
+    $tableprefix = readline($_lang['connection_screen_table_prefix'].' ['.$tableprefixauto.'] ');
+    $database_connection_method = readline($_lang['connection_screen_connection_method'].' [SET CHARACTER SET] ');
+    $database_collation = readline($_lang['connection_screen_collation'].' [utf8mb4_general_ci] ');
+    $cmsadmin = readline($_lang['connection_screen_default_admin_login'].' [admin] ');
+    $cmsadminemail = readline($_lang['connection_screen_default_admin_email'].' ');
+    $cmspassword = readline($_lang['connection_screen_default_admin_password'].' ');
+    $managerlanguage = readline('Мanager language:'.' [en] ');
+    $installData = readline('Instal demo-site (y/n):'.' [n] ');
 
 } else {
 
@@ -169,114 +169,114 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo PHP_EOL . $_lang['checking_php_version'];
+echo PHP_EOL.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION,
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION,
             $_lang["modx_requires_php"]);
-    echo $_lang['failed'] . ' ' . $tmp . PHP_EOL;
+    echo $_lang['failed'].' '.$tmp.PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 // check directories
 // cache exists?
 echo strip_tags($_lang['checking_if_cache_exist']);
-if (!file_exists($path . "../assets/cache") || !file_exists($path . "../assets/cache/rss")) {
-    echo $_lang['failed'] . PHP_EOL;
+if (!file_exists($path."../assets/cache") || !file_exists($path."../assets/cache/rss")) {
+    echo $_lang['failed'].PHP_EOL;
     $errors++;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // cache writable?
 echo strip_tags($_lang['checking_if_cache_writable']);
-if (!is_writable($path . "../assets/cache")) {
+if (!is_writable($path."../assets/cache")) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // cache files writable?
 echo strip_tags($_lang['checking_if_cache_file_writable']);
-$tmp = $path . "../assets/cache/siteCache.idx.php";
+$tmp = $path."../assets/cache/siteCache.idx.php";
 if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
 if (!is_writable($tmp)) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 echo strip_tags($_lang['checking_if_cache_file2_writable']);
-if (!is_writable($path . "../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable($path."../assets/cache/sitePublishing.idx.php")) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // File Browser directories exists?
 echo strip_tags($_lang['checking_if_images_exist']);
 switch (true) {
-    case !file_exists($path . "../assets/images"):
-    case !file_exists($path . "../assets/files"):
-    case !file_exists($path . "../assets/backup"):
+    case !file_exists($path."../assets/images"):
+    case !file_exists($path."../assets/files"):
+    case !file_exists($path."../assets/backup"):
         //case !file_exists("../assets/.thumbs"):
         $errors++;
-        echo $_lang['failed'] . PHP_EOL;
+        echo $_lang['failed'].PHP_EOL;
         break;
     default:
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
 }
 
 
 // File Browser directories writable?
 echo strip_tags($_lang['checking_if_images_writable']);
 switch (true) {
-    case !is_writable($path . "../assets/images"):
-    case !is_writable($path . "../assets/files"):
-    case !is_writable($path . "../assets/backup"):
+    case !is_writable($path."../assets/images"):
+    case !is_writable($path."../assets/files"):
+    case !is_writable($path."../assets/backup"):
         //case !is_writable("../assets/.thumbs"):
         $errors++;
-        echo $_lang['failed'] . PHP_EOL;
+        echo $_lang['failed'].PHP_EOL;
         break;
     default:
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
 }
 
 
 // export exists?
 echo strip_tags($_lang['checking_if_export_exists']);
-if (!file_exists($path . "../assets/export")) {
-    echo $_lang['failed'] . PHP_EOL;
+if (!file_exists($path."../assets/export")) {
+    echo $_lang['failed'].PHP_EOL;
     $errors++;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // export writable?
 echo strip_tags($_lang['checking_if_export_writable']);
-if (!is_writable($path . "../assets/export")) {
-    echo $_lang['failed'] . PHP_EOL;
+if (!is_writable($path."../assets/export")) {
+    echo $_lang['failed'].PHP_EOL;
     $errors++;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // config.inc.php writable?
 echo strip_tags($_lang['checking_if_config_exist_and_writable']);
-$tmp = $path . "../" . MGR_DIR . "/includes/config.inc.php";
+$tmp = $path."../".MGR_DIR."/includes/config.inc.php";
 if (!is_file($tmp)) {
     f_owc($tmp, "<?php //EVO configuration file ?>", 0666);
 } else {
@@ -285,15 +285,15 @@ 
 $isWriteable = is_writable($tmp);
 if (!$isWriteable) {
     $errors++;
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // connect to the database
 if ($installMode == 1) {
-    include $path . "../" . MGR_DIR . "/includes/config.inc.php";
+    include $path."../".MGR_DIR."/includes/config.inc.php";
 } else {
     // get db info from post
     $database_server = $databasehost;
@@ -303,23 +303,23 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $database_collation;
     $database_connection_method = $database_connection_method;
-    $dbase = '`' . $database_name . '`';
+    $dbase = '`'.$database_name.'`';
     $table_prefix = $tableprefix;
 }
 echo $_lang['creating_database_connection'];
 $host = explode(':', $database_server, 2);
-if (!$conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
+if (!$conn = mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null)) {
     $errors++;
-    echo $_lang['database_connection_failed'] . PHP_EOL;
+    echo $_lang['database_connection_failed'].PHP_EOL;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 
 // make sure we can use the database
 if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
     $errors++;
-    echo $_lang['database_use_failed'] . PHP_EOL;
+    echo $_lang['database_use_failed'].PHP_EOL;
 }
 
 // check the database collation if not specified in the configuration
@@ -344,22 +344,22 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo $_lang['failed'] . ' ' . $_lang['table_prefix_already_inuse_note'] . PHP_EOL;
+    echo $_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo $_lang['failed'].' '.$_lang['table_prefix_already_inuse_note'].PHP_EOL;
         $errors++;
 
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 } elseif ($conn && $installMode == 2) {
-    echo $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo $_lang['failed'] . ' ' . $_lang['table_prefix_not_exist'] . PHP_EOL;
+    echo $_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo $_lang['failed'].' '.$_lang['table_prefix_not_exist'].PHP_EOL;
         $errors++;
 
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
@@ -367,10 +367,10 @@ 
 if ($conn) {
     echo $_lang['checking_mysql_version'];
     if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
-        echo $_lang['warning'] . ' ' . $_lang['mysql_5051'] . PHP_EOL;
-        echo $_lang['mysql_5051_warning'] . PHP_EOL;
+        echo $_lang['warning'].' '.$_lang['mysql_5051'].PHP_EOL;
+        echo $_lang['mysql_5051_warning'].PHP_EOL;
     } else {
-        echo $_lang['ok'] . ' ' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . PHP_EOL;
+        echo $_lang['ok'].' '.$_lang['mysql_version_is'].mysqli_get_server_info($conn).PHP_EOL;
     }
 }
 
@@ -384,40 +384,40 @@ 
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo $_lang['warning'] . ' ' . $_lang['strict_mode'] . PHP_EOL;
-                echo $_lang['strict_mode_error'] . PHP_EOL;
+                echo $_lang['warning'].' '.$_lang['strict_mode'].PHP_EOL;
+                echo $_lang['strict_mode_error'].PHP_EOL;
             } else {
-                echo $_lang['ok'] . PHP_EOL;
+                echo $_lang['ok'].PHP_EOL;
             }
         }
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 // Version and strict mode check end
 
 // andrazk 20070416 - add install flag and disable manager login
 // assets/cache writable?
-if (is_writable($path . "../assets/cache")) {
-    if (file_exists($path . '../assets/cache/installProc.inc.php')) {
-        @chmod($path . '../assets/cache/installProc.inc.php', 0755);
-        unlink($path . '../assets/cache/installProc.inc.php');
+if (is_writable($path."../assets/cache")) {
+    if (file_exists($path.'../assets/cache/installProc.inc.php')) {
+        @chmod($path.'../assets/cache/installProc.inc.php', 0755);
+        unlink($path.'../assets/cache/installProc.inc.php');
     }
 
-    f_owc($path . "../assets/cache/installProc.inc.php", '<?php $installStartTime = ' . time() . '; ?>');
+    f_owc($path."../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
 if ($installMode > 0 && $_POST['installdata'] == "1") {
-    echo $_lang['sample_web_site'] . ': ' . $_lang['sample_web_site_note'] . PHP_EOL;
+    echo $_lang['sample_web_site'].': '.$_lang['sample_web_site_note'].PHP_EOL;
 }
 
 if ($errors > 0) {
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
     if ($errors > 1) {
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
     } else {
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'] . PHP_EOL;
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'].PHP_EOL;
     }
 
     die();
@@ -434,7 +434,7 @@ 
 
 
 if ($installMode == 1) {
-    include $path . "../" . MGR_DIR . "/includes/config.inc.php";
+    include $path."../".MGR_DIR."/includes/config.inc.php";
 } else {
     // get db info from post
     $database_server = $databasehost;
@@ -444,7 +444,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
     $database_connection_charset = $database_charset;
     $database_connection_method = $database_connection_method;
-    $dbase = "`" . $database_name . "`";
+    $dbase = "`".$database_name."`";
     $table_prefix = $tableprefix;
     $adminname = $cmsadmin;
     $adminemail = $cmsadminemail;
@@ -455,7 +455,7 @@ 
 
 // set session name variable
 if (!isset ($site_sessionname)) {
-    $site_sessionname = 'SN' . uniqid('');
+    $site_sessionname = 'SN'.uniqid('');
 }
 
 // get base path and url
@@ -471,65 +471,65 @@ 
 }
 $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 $_lang['setup_database_create_connection'] . ': ';
+echo $_lang['setup_database_create_connection'].': ';
 $host = explode(':', $database_server, 2);
-if (!$conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
-    echo $_lang["setup_database_create_connection_failed"] . " " . $_lang['setup_database_create_connection_failed_note'] . PHP_EOL;
+if (!$conn = mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null)) {
+    echo $_lang["setup_database_create_connection_failed"]." ".$_lang['setup_database_create_connection_failed_note'].PHP_EOL;
 
     return;
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 // select database
-echo $_lang['setup_database_selection'] . str_replace("`", "", $dbase) . "`: ";
+echo $_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: ";
 if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) {
-    echo $_lang['setup_database_selection_failed'] . " " . $_lang['setup_database_selection_failed_note'] . PHP_EOL;
+    echo $_lang['setup_database_selection_failed']." ".$_lang['setup_database_selection_failed_note'].PHP_EOL;
     $create = true;
 } else {
     if (function_exists('mysqli_set_charset')) {
         mysqli_set_charset($conn, $database_charset);
     }
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 // try to create the database
 if ($create) {
-    echo $_lang['setup_database_creation'] . str_replace("`", "", $dbase) . "`: ";
+    echo $_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")) {
-        echo $_lang['setup_database_creation_failed'] . " " . $_lang['setup_database_creation_failed_note'] . PHP_EOL;
+        echo $_lang['setup_database_creation_failed']." ".$_lang['setup_database_creation_failed_note'].PHP_EOL;
         $errors += 1;
 
-        echo 'database charset: ' . $database_charset . PHP_EOL;
-        echo 'database collation: ' . $database_collation . PHP_EOL;
+        echo 'database charset: '.$database_charset.PHP_EOL;
+        echo 'database collation: '.$database_collation.PHP_EOL;
 
-        echo $_lang['setup_database_creation_failed_note2'] . PHP_EOL;
+        echo $_lang['setup_database_creation_failed_note2'].PHP_EOL;
 
         die();
 
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
 // check table prefix
 if ($installMode == 0) {
-    echo $_lang['checking_table_prefix'] . $table_prefix . "`: ";
-    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo $_lang['failed'] . " " . $_lang['table_prefix_already_inuse'] . PHP_EOL;
+    echo $_lang['checking_table_prefix'].$table_prefix."`: ";
+    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo $_lang['failed']." ".$_lang['table_prefix_already_inuse'].PHP_EOL;
         $errors += 1;
-        echo $_lang['table_prefix_already_inuse_note'] . PHP_EOL;
+        echo $_lang['table_prefix_already_inuse_note'].PHP_EOL;
 
         return;
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
@@ -571,7 +571,7 @@ 
 $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'");
+        "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'");
     $row = mysqli_fetch_row($rs);
     if (!$row) {
         // not installed
@@ -595,12 +595,12 @@ 
 
 // open db connection
 $setupPath = realpath(__DIR__);
-$chunkPath = $path . 'assets/chunks';
-$snippetPath = $path . 'assets/snippets';
-$pluginPath = $path . 'assets/plugins';
-$modulePath = $path . 'assets/modules';
-$templatePath = $path . 'assets/templates';
-$tvPath = $path . 'assets/tvs';
+$chunkPath = $path.'assets/chunks';
+$snippetPath = $path.'assets/snippets';
+$pluginPath = $path.'assets/plugins';
+$modulePath = $path.'assets/modules';
+$templatePath = $path.'assets/templates';
+$tvPath = $path.'assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
@@ -613,8 +613,7 @@ 
         $params = parse_docblock($templatePath, $tplfile);
         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'
@@ -654,8 +653,7 @@ 
                 "$templatePath/{$params['filename']}",
                 /* not currently used */
                 $params['template_assignments'] != "*" ?
-                    $params['template_assignments'] :
-                    implode(',', array_map(function($value){return isset($value[0]) && is_scalar($value[0]);},$mt)),
+                    $params['template_assignments'] : implode(',', array_map(function($value){return isset($value[0]) && is_scalar($value[0]); },$mt)),
                 /* comma-separated list of template names */
                 $params['modx_category'],
                 $params['lock_tv'],
@@ -735,7 +733,7 @@ 
                 $params['modx_category'],
                 $params['legacy_names'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                (int)$params['disabled']
+                (int) $params['disabled']
             );
         }
     }
@@ -760,12 +758,12 @@ 
                 "$modulePath/{$params['filename']}",
                 $params['properties'],
                 $params['guid'],
-                (int)$params['shareparams'],
+                (int) $params['shareparams'],
                 $params['modx_category'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+        if ((int) $params['shareparams'] || !empty($params['dependencies'])) {
             $dependencies = explode(',', $params['dependencies']);
             foreach ($dependencies as $dependency) {
                 $dependency = explode(':', $dependency);
@@ -836,7 +834,7 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-include $path . "src/sqlParser.class.php";
+include $path."src/sqlParser.class.php";
 $sqlParser = new SqlParser($database_server, $database_user, $database_password, str_replace("`", "", $dbase),
     $table_prefix, $adminname, $adminemail, $adminpass, $database_connection_charset, $managerlanguage,
     $database_connection_method, $auto_template_logic);
@@ -857,21 +855,21 @@ 
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo $_lang['database_alerts'] . PHP_EOL;
-        echo $_lang['setup_couldnt_install'] . PHP_EOL;
-        echo $_lang['installation_error_occured'] . PHP_EOL;
+        echo $_lang['database_alerts'].PHP_EOL;
+        echo $_lang['setup_couldnt_install'].PHP_EOL;
+        echo $_lang['installation_error_occured'].PHP_EOL;
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL;
+            echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL;
         }
-        echo $_lang['some_tables_not_updated'] . PHP_EOL;
+        echo $_lang['some_tables_not_updated'].PHP_EOL;
         die();
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
 // custom or not
-if (file_exists($path . "../assets/cache/siteManager.php")) {
+if (file_exists($path."../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(__DIR__."/../../assets/cache/siteManager.php");';
 } else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
@@ -891,10 +889,10 @@ 
 $confph['lastInstallTime'] = time();
 $confph['site_sessionname'] = $site_sessionname;
 
-$configString = file_get_contents($path . 'stubs/config.tpl');
+$configString = file_get_contents($path.'stubs/config.tpl');
 $configString = parse($configString, $confph);
 
-$filename = $base_path . MGR_DIR . '/includes/config.inc.php';
+$filename = $base_path.MGR_DIR.'/includes/config.inc.php';
 $configFileFailed = false;
 if (@ !$handle = fopen($filename, 'w')) {
     $configFileFailed = true;
@@ -910,38 +908,38 @@ 
 $chmodSuccess = @chmod($filename, 0404);
 
 if ($configFileFailed == true) {
-    echo $_lang['failed'] . PHP_EOL;
+    echo $_lang['failed'].PHP_EOL;
     $errors += 1;
 
-    echo $_lang['cant_write_config_file'] . ' ' . MGR_DIR . '/includes/config.inc.php' . PHP_EOL;
-    echo ' ' . PHP_EOL;
-    echo ' ' . PHP_EOL;
+    echo $_lang['cant_write_config_file'].' '.MGR_DIR.'/includes/config.inc.php'.PHP_EOL;
+    echo ' '.PHP_EOL;
+    echo ' '.PHP_EOL;
     echo $configString;
-    echo ' ' . PHP_EOL;
-    echo ' ' . PHP_EOL;
-    echo $_lang['cant_write_config_file_note'] . PHP_EOL;
+    echo ' '.PHP_EOL;
+    echo ' '.PHP_EOL;
+    echo $_lang['cant_write_config_file_note'].PHP_EOL;
     die();
 
 } else {
-    echo $_lang['ok'] . PHP_EOL;
+    echo $_lang['ok'].PHP_EOL;
 }
 
 // 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')");
+        "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'");
+        "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')");
+                "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
         }
     }
 }
@@ -953,25 +951,25 @@ 
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo $_lang['database_alerts'] . PHP_EOL;
-        echo $_lang['setup_couldnt_install'] . PHP_EOL;
-        echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL;
+        echo $_lang['database_alerts'].PHP_EOL;
+        echo $_lang['setup_couldnt_install'].PHP_EOL;
+        echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL;
         /*
         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 "</p>";*/
-        echo $_lang['some_tables_not_updated'] . PHP_EOL;
+        echo $_lang['some_tables_not_updated'].PHP_EOL;
         die();
     } else {
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
 // Install Templates
 $moduleTemplate = $mt;
 if (!empty($moduleTemplate) || $installData) {
-    echo PHP_EOL . $_lang['templates'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['templates'].":".PHP_EOL;
     //$selTemplates = $_POST['template'];
     foreach ($moduleTemplates as $k => $moduleTemplate) {
         $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1;
@@ -983,7 +981,7 @@ 
             $filecontent = $moduleTemplate[3];
             $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site
             if (!file_exists($filecontent)) {
-                echo "  $name: " . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             } else {
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -994,13 +992,13 @@ 
 
                 // See if the template already exists
                 $rs = mysqli_query($sqlParser->conn,
-                    "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'");
+                    "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;")) {
+                        "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
                         $errors += 1;
-                        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
@@ -1008,23 +1006,23 @@ 
                         $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;"));
+                                "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 "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } 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');")) {
+                        "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
                         $errors += 1;
-                        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
                         die();
                     }
                     if (!is_null($save_sql_id_as)) {
                         $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1034,7 +1032,7 @@ 
 // Install Template Variables
 $moduleTVs = $mtv;
 if (is_array($moduleTVs) || $installData) {
-    echo PHP_EOL . $_lang['tvs'] . ': ' . PHP_EOL;
+    echo PHP_EOL.$_lang['tvs'].': '.PHP_EOL;
     //$selTVs = $_POST['tv'];
     foreach ($moduleTVs as $k => $moduleTV) {
         $installSample = in_array('sample', $moduleTV[12]) && $installData == 1;
@@ -1057,27 +1055,27 @@ 
             $category = getCreateDbCategory($category, $sqlParser);
 
             $rs = mysqli_query($sqlParser->conn,
-                "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'");
+                "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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        "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 mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
                     $insert = false;
                 }
-                echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                echo "  $name: ".$_lang['upgraded'].PHP_EOL;
             } 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',$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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                    echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                     return;
                 }
-                echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                echo "  $name: ".$_lang['installed'].PHP_EOL;
             }
 
             // add template assignments
@@ -1087,22 +1085,22 @@ 
 
                 // remove existing tv -> template assignments
                 $ds = mysqli_query($sqlParser->conn,
-                    "SELECT id FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name' AND description='$desc';");
+                    "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 . '\'');
+                    'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\'');
 
                 // add tv -> template assignments
                 foreach ($assignments as $assignment) {
                     $template = mysqli_real_escape_string($conn, $assignment);
                     $ts = mysqli_query($sqlParser->conn,
-                        "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$template';");
+                        "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$template';");
                     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)");
+                            "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
                     }
                 }
             }
@@ -1114,7 +1112,7 @@ 
 $moduleChunks = $mc;
 // Install Chunks
 if (is_array($moduleChunks) || $installData) {
-    echo PHP_EOL . $_lang['chunks'] . ": " . PHP_EOL;
+    echo PHP_EOL.$_lang['chunks'].": ".PHP_EOL;
     foreach ($moduleChunks as $k => $moduleChunk) {
         $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1;
         $count_new_name = 0;
@@ -1127,7 +1125,7 @@ 
             $filecontent = $moduleChunk[2];
 
             if (!file_exists($filecontent)) {
-                echo "  $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             } else {
 
                 // Create the category if it does not already exist
@@ -1136,36 +1134,36 @@ 
                 $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'");
+                    "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);
+                    $newname = $name.'-'.str_replace('.', '_', $modx_version);
                     $rs = mysqli_query($sqlParser->conn,
-                        "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'");
+                        "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';")) {
+                        "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
                         $errors += 1;
-                        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } 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);")) {
+                        "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
                         $errors += 1;
-                        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1175,7 +1173,7 @@ 
 // Install Modules
 $moduleModules = $mm;
 if (is_array($moduleModules) || $installData) {
-    echo PHP_EOL . $_lang['modules'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['modules'].":".PHP_EOL;
     //$selModules = $_POST['module'];
     foreach ($moduleModules as $k => $moduleModule) {
         $installSample = in_array('sample', $moduleModule[7]) && $installData == 1;
@@ -1188,7 +1186,7 @@ 
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
             if (!file_exists($filecontent)) {
-                echo "  $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             } else {
 
                 // Create the category if it does not already exist
@@ -1198,28 +1196,28 @@ 
                 // $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'");
+                    "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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } else {
                     if ($properties != null) {
                         $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>";
+                        "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 "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1229,7 +1227,7 @@ 
 // Install Plugins
 $modulePlugins = $mp;
 if (is_array($modulePlugins) || $installData) {
-    echo PHP_EOL . $_lang['plugins'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['plugins'].":".PHP_EOL;
     $selPlugs = $_POST['plugin'];
     foreach ($modulePlugins as $k => $modulePlugin) {
         //$installSample = in_array('sample', $modulePlugin[8]) && $installData == 1;
@@ -1245,16 +1243,16 @@ 
             $disabled = $modulePlugin[9];
             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 "  $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             } 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);";
+                    $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
                     $rs = mysqli_query($sqlParser->conn, $update_query);
                 }
 
@@ -1265,58 +1263,58 @@ 
                 $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'");
+                    "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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                                "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
+                                echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                                 return;
                             }
                             $insert = false;
                         } else {
                             if (!mysqli_query($sqlParser->conn,
-                                "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
-                                echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                                "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
+                                echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                                 return;
                             }
                         }
                     }
                     if ($insert === true) {
-                        if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$props','$guid','0',$category);")) {
-                            echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                        if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$props','$guid','0',$category);")) {
+                            echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                             return;
                         }
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } else {
                     if ($properties != null) {
                         $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
                 // 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';");
+                        "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
                     if ($ds) {
                         $row = mysqli_fetch_assoc($ds);
                         $id = $row["id"];
                         $_events = implode("','", $events);
                         // add new events
-                        $sql = "INSERT IGNORE 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 ('{$_events}')";
+                        $sql = "INSERT IGNORE 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 ('{$_events}')";
                         mysqli_query($sqlParser->conn, $sql);
                         // remove absent events
                         $sql = "DELETE `pe` FROM {$dbase}.`{$table_prefix}site_plugin_events` `pe` LEFT JOIN {$dbase}.`{$table_prefix}system_eventnames` `se` ON `pe`.`evtid`=`se`.`id` AND `name` IN ('{$_events}') WHERE ISNULL(`name`) AND `pluginid` = {$id}";
@@ -1331,7 +1329,7 @@ 
 // Install Snippets
 $moduleSnippet = $ms;
 if (is_array($moduleSnippet) || $installData) {
-    echo PHP_EOL . $_lang['snippets'] . ":" . PHP_EOL;
+    echo PHP_EOL.$_lang['snippets'].":".PHP_EOL;
     //$selSnips = $_POST['snippet'];
     foreach ($moduleSnippets as $k => $moduleSnippet) {
         $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1;
@@ -1342,7 +1340,7 @@ 
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
             if (!file_exists($filecontent)) {
-                echo "  $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+                echo "  $name: ".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].PHP_EOL;
             } else {
 
                 // Create the category if it does not already exist
@@ -1352,28 +1350,28 @@ 
                 $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'");
+                    "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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
-                    echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
+                    echo "  $name: ".$_lang['upgraded'].PHP_EOL;
                 } else {
                     if ($properties != null) {
                         $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 mysqli_error($sqlParser->conn) . PHP_EOL;
+                        "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
+                        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                         return;
                     }
-                    echo "  $name: " . $_lang['installed'] . PHP_EOL;
+                    echo "  $name: ".$_lang['installed'].PHP_EOL;
                 }
             }
         }
@@ -1382,19 +1380,19 @@ 
 
 // Install demo-site
 if ($installData && $moduleSQLDataFile) {
-    echo PHP_EOL . $_lang['installing_demo_site'];
+    echo PHP_EOL.$_lang['installing_demo_site'];
     $sqlParser->process($moduleSQLDataFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo $_lang['database_alerts'] . PHP_EOL;
-        echo $_lang['setup_couldnt_install'] . PHP_EOL;
-        echo $_lang['installation_error_occured'] . PHP_EOL . PHP_EOL;
+        echo $_lang['database_alerts'].PHP_EOL;
+        echo $_lang['setup_couldnt_install'].PHP_EOL;
+        echo $_lang['installation_error_occured'].PHP_EOL.PHP_EOL;
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo $sqlParser->mysqlErrors[$i]["error"] . " " . $_lang['during_execution_of_sql'] . " " . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . PHP_EOL;
+            echo $sqlParser->mysqlErrors[$i]["error"]." ".$_lang['during_execution_of_sql']." ".strip_tags($sqlParser->mysqlErrors[$i]["sql"]).PHP_EOL;
         }
 
-        echo $_lang['some_tables_not_updated'] . PHP_EOL;
+        echo $_lang['some_tables_not_updated'].PHP_EOL;
 
         return;
     } else {
@@ -1406,7 +1404,7 @@ 
             $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']);
             mysqli_query($sqlParser->conn, $sql);
         }
-        echo $_lang['ok'] . PHP_EOL;
+        echo $_lang['ok'].PHP_EOL;
     }
 }
 
@@ -1414,9 +1412,9 @@ 
 $moduleDependencies = $mdp;
 foreach ($moduleDependencies as $dependency) {
     $ds = mysqli_query($sqlParser->conn,
-        'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+        'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"');
     if (!$ds) {
-        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
         return;
     } else {
@@ -1426,9 +1424,9 @@ 
     }
     // get extra id
     $ds = mysqli_query($sqlParser->conn,
-        'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+        'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"');
     if (!$ds) {
-        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
         return;
     } else {
@@ -1437,34 +1435,34 @@ 
     }
     // 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');
+        'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1');
     if (!$ds) {
-        echo mysqli_error($sqlParser->conn) . PHP_EOL;
+        echo mysqli_error($sqlParser->conn).PHP_EOL;
 
         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 $dependency['module'] . ' Module: ' . $_lang['depedency_create'] . PHP_EOL;
+                'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')');
+            echo $dependency['module'].' Module: '.$_lang['depedency_create'].PHP_EOL;
         } 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 $dependency['module'] . ' Module: ' . $_lang['depedency_update'] . PHP_EOL;
+                '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 $dependency['module'].' Module: '.$_lang['depedency_update'].PHP_EOL;
         }
         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');
+                'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1');
             if (!$ds) {
-                echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                echo mysqli_error($sqlParser->conn).PHP_EOL;
 
                 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 $dependency['name'] . ': ' . $_lang['guid_set'] . PHP_EOL;
+                        'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId);
+                    echo $dependency['name'].': '.$_lang['guid_set'].PHP_EOL;
                 }
             }
         }
@@ -1473,58 +1471,58 @@ 
 
 // call back function
 if ($callBackFnc != "") {
-    $callBackFnc ($sqlParser);
+    $callBackFnc($sqlParser);
 }
 
 // Setup the MODX API -- needed for the cache processor
 if (!defined('MODX_MANAGER_PATH')) {
-    define('MODX_MANAGER_PATH', $base_path . MGR_DIR . '/');
+    define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
 }
 $database_type = 'mysqli';
 // initiate a new document parser
-include_once($path . '../' . MGR_DIR . '/includes/document.parser.class.inc.php');
+include_once($path.'../'.MGR_DIR.'/includes/document.parser.class.inc.php');
 $modx = new DocumentParser;
 $modx->db->connect();
 // always empty cache after install
 $sync = new EvolutionCMS\Cache();
-$sync->setCachepath($path . "../assets/cache/");
+$sync->setCachepath($path."../assets/cache/");
 $sync->setReport(false);
 $sync->emptyCache(); // first empty the cache
 
 // try to chmod the cache go-rwx (for suexeced php)
-$chmodSuccess = @chmod($path . '../assets/cache/siteCache.idx.php', 0600);
-$chmodSuccess = @chmod($path . '../assets/cache/sitePublishing.idx.php', 0600);
+$chmodSuccess = @chmod($path.'../assets/cache/siteCache.idx.php', 0600);
+$chmodSuccess = @chmod($path.'../assets/cache/sitePublishing.idx.php', 0600);
 
 // remove any locks on the manager functions so initial manager login is not blocked
-mysqli_query($conn, "TRUNCATE TABLE `" . $table_prefix . "active_users`");
+mysqli_query($conn, "TRUNCATE TABLE `".$table_prefix."active_users`");
 
 // close db connection
 $sqlParser->close();
 
 // andrazk 20070416 - release manager access
-if (file_exists($path . '../assets/cache/installProc.inc.php')) {
-    @chmod($path . '../assets/cache/installProc.inc.php', 0755);
-    unlink($path . '../assets/cache/installProc.inc.php');
+if (file_exists($path.'../assets/cache/installProc.inc.php')) {
+    @chmod($path.'../assets/cache/installProc.inc.php', 0755);
+    unlink($path.'../assets/cache/installProc.inc.php');
 }
 
 // setup completed!
-echo PHP_EOL . $_lang['installation_successful'] . PHP_EOL . PHP_EOL;
+echo PHP_EOL.$_lang['installation_successful'].PHP_EOL.PHP_EOL;
 //echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>";
 if ($installMode == 0) {
-    echo strip_tags($_lang['installation_note']) . PHP_EOL;
+    echo strip_tags($_lang['installation_note']).PHP_EOL;
 } else {
-    echo strip_tags($_lang['upgrade_note']) . PHP_EOL;
+    echo strip_tags($_lang['upgrade_note']).PHP_EOL;
 }
 
 
 if (empty($args)) {
-    echo PHP_EOL . 'Remove install folder?' . PHP_EOL;
+    echo PHP_EOL.'Remove install folder?'.PHP_EOL;
     $removeInstall = readline("Type 'y' or 'n' to continue: ");
 }
 //remove installFolder
 if ($removeInstall === 'y') {
     removeFolder($path);
-    removeFolder($base_path . '.tx');
-    unlink($base_path . 'README.md');
-    echo 'Install folder deleted!' . PHP_EOL . PHP_EOL;
+    removeFolder($base_path.'.tx');
+    unlink($base_path.'README.md');
+    echo 'Install folder deleted!'.PHP_EOL.PHP_EOL;
 }

install/src/controllers/language.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-$content = file_get_contents(dirname(__DIR__) . '/template/actions/language.tpl');
+$content = file_get_contents(dirname(__DIR__).'/template/actions/language.tpl');
 $content = parse($content, array(
     'langOptions' => getLangOptions($install_language))
 );
-$content = parse($content, $_lang,'[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 
 echo $content;

install/src/controllers/summary.php

Indentation +2 added lines, -2 removed lines

@@ -248,9 +248,9 @@
         echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
         $errors++;
         echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
-  } else {
+    } else {
         echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
-  }
+    }
 }
 
 // check mysql version

Braces +35 added lines, -18 removed lines

@@ -1,19 +1,22 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if( ! function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
      * @param null|int $mode
      */
-    function f_owc($path, $data, $mode = null){
+    function f_owc($path, $data, $mode = null)
+    {
         try {
             // make an attempt to create the file
             $hnd = fopen($path, 'w');
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if(null !== $mode) {
+                chmod($path, $mode);
+            }
+        } catch(Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
@@ -21,7 +24,9 @@ 
 }
 
 $installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+if( ! isset($_lang)) {
+    $_lang = array();
+}
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
@@ -57,7 +62,7 @@ 
 // check if iconv is available
 echo '<p>' . $_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
+if ($iconv == '0') {
     echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
@@ -119,7 +124,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch(true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +139,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch(true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -268,7 +273,7 @@ 
 if ($conn) {
     echo '<p>'. $_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
@@ -305,9 +310,9 @@ 
     echo '<p>';
     echo $_lang['setup_cannot_continue'] . ' ';
 
-    if($errors > 1){
+    if($errors > 1) {
         echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
+    } else {
         echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
     }
 
@@ -343,23 +348,35 @@ 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
     $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
-    foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
+    foreach ($templates as $i => $template) {
+        echo '<input type="hidden" name="template[]" value="'.$template.'" />';
+    }
 
     $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
-    foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
+    foreach ($tvs as $i => $tv) {
+        echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
+    }
 
     $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
-    foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
+    foreach ($chunks as $i => $chunk) {
+        echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
+    }
 
     $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
-    foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
+    foreach ($snippets as $i => $snippet) {
+        echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
+    }
 
     $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
-    foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
+    foreach ($plugins as $i => $plugin) {
+        echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
+    }
 
     $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
-    foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
-?>
+    foreach ($modules as $i => $module) {
+        echo '<input type="hidden" name="module[]" value="'.$module.'" />';
+    }
+    ?>
 </div>
 
 <h2><?php echo $_lang['agree_to_terms'];?></h2>

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 
 
 // make sure we can use the database
-if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
+if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) {
     $errors++;
     echo '<span class="notok">'.$_lang['database_use_failed'].'</span><p />'.$_lang["database_use_failed_note"].'</p>';
 }

Spacing +75 added lines, -75 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -12,30 +12,30 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
     }
 }
 
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
+if (!isset($_lang)) $_lang = array();
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
-          <li class="visited">' . $_lang['choose_language'] . '</li>
-          <li class="visited">' . $_lang['installation_mode'] . '</li>
-          <li class="visited">' . $_lang['optional_items'] . '</li>
-          <li class="active">' . $_lang['preinstall_validation'] . '</li>
-          <li>' . $_lang['install_results'] . '</li>
+          <li class="visited">' . $_lang['choose_language'].'</li>
+          <li class="visited">' . $_lang['installation_mode'].'</li>
+          <li class="visited">' . $_lang['optional_items'].'</li>
+          <li class="active">' . $_lang['preinstall_validation'].'</li>
+          <li>' . $_lang['install_results'].'</li>
   </ul>
   <div class="clearleft"></div>
 </div>';
 
-echo '<h2>' . $_lang['preinstall_validation'] . '</h2>';
-echo '<h3>' . $_lang['summary_setup_check'] . '</h3>';
+echo '<h2>'.$_lang['preinstall_validation'].'</h2>';
+echo '<h3>'.$_lang['summary_setup_check'].'</h3>';
 
 $errors = 0;
 
@@ -43,33 +43,33 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo '<p>' . $_lang['checking_php_version'];
+echo '<p>'.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo '<span class="notok">' . $_lang['failed'] . '</span>' . $tmp . '</p>';
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo '<span class="notok">'.$_lang['failed'].'</span>'.$tmp.'</p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check if iconv is available
-echo '<p>' . $_lang['checking_iconv'];
+echo '<p>'.$_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
-    echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
+if ($iconv == '0') {
+    echo '<span class="notok">'.$_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 // check sessions
-echo '<p>' . $_lang['checking_sessions'];
+echo '<p>'.$_lang['checking_sessions'];
 if ($_SESSION['test'] != 1) {
-    echo '<span class="notok">' . $_lang['failed'].  '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
@@ -85,24 +85,24 @@ 
 
 
 // cache writable?
-echo '<p>' . $_lang['checking_if_cache_writable'];
+echo '<p>'.$_lang['checking_if_cache_writable'];
 if (!is_writable("../assets/cache")) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache files writable?
-echo '<p>' . $_lang['checking_if_cache_file_writable'];
+echo '<p>'.$_lang['checking_if_cache_file_writable'];
 $tmp = "../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
     echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
@@ -119,7 +119,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch (true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +134,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch (true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -196,12 +196,12 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $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'];
 }
 echo '<p>'.$_lang['creating_database_connection'];
 $host = explode(':', $database_server, 2);
-if (!$conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
+if (!$conn = mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null)) {
     $errors++;
     echo '<span class="notok">'.$_lang['database_connection_failed'].'</span><p />'.$_lang['database_connection_failed_note'].'</p>';
 } else {
@@ -237,54 +237,54 @@ 
 
 // check table prefix
 if ($conn && $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></b>' . $_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></b>'.$_lang['table_prefix_already_inuse'].'</p>';
         $errors++;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . '</p>';
+        echo "<p>".$_lang['table_prefix_already_inuse_note'].'</p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 } elseif ($conn && $installMode == 2) {
-    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></b>' . $_lang['table_prefix_not_exist'] . '</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></b>'.$_lang['table_prefix_not_exist'].'</p>';
         $errors++;
-        echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
+        echo '<p>'.$_lang['table_prefix_not_exist_note'].'</p>';
   } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
   }
 }
 
 // check mysql version
 if ($conn) {
-    echo '<p>' . $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo '<span class="notok">'  . $_lang['warning'] . '</span></b>&nbsp;&nbsp;<strong>' . $_lang['mysql_5051'] . '</strong></p>';
-        echo '<p><span class="notok">' . $_lang['mysql_5051_warning'] . '</span></p>';
+    echo '<p>'.$_lang['checking_mysql_version'];
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo '<span class="notok">'.$_lang['warning'].'</span></b>&nbsp;&nbsp;<strong>'.$_lang['mysql_5051'].'</strong></p>';
+        echo '<p><span class="notok">'.$_lang['mysql_5051_warning'].'</span></p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span>&nbsp;&nbsp;<strong>' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . '</strong></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span>&nbsp;&nbsp;<strong>'.$_lang['mysql_version_is'].mysqli_get_server_info($conn).'</strong></p>';
     }
 }
 
 // check for strict mode
 if ($conn) {
-    echo '<p>'. $_lang['checking_mysql_strict_mode'];
+    echo '<p>'.$_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo '<span class="notok">' . $_lang['warning'] . '</span></b> <strong>&nbsp;&nbsp;' . $_lang['strict_mode'] . '</strong></p>';
-                echo '<p><span class="notok">' . $_lang['strict_mode_error'] . '</span></p>';
+                echo '<span class="notok">'.$_lang['warning'].'</span></b> <strong>&nbsp;&nbsp;'.$_lang['strict_mode'].'</strong></p>';
+                echo '<p><span class="notok">'.$_lang['strict_mode_error'].'</span></p>';
             } else {
-                echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+                echo '<span class="ok">'.$_lang['ok'].'</span></p>';
             }
         }
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 }
 // Version and strict mode check end
@@ -300,18 +300,18 @@ 
     f_owc("../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo '<p class="notes"><strong>' . $_lang['sample_web_site'] . ':</strong> ' . $_lang['sample_web_site_note'] . '</p>';
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo '<p class="notes"><strong>'.$_lang['sample_web_site'].':</strong> '.$_lang['sample_web_site_note'].'</p>';
 }
 
 if ($errors > 0) {
     echo '<p>';
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'];
     }
 
     echo $_lang['visit_forum'];
@@ -320,10 +320,10 @@ 
 
 echo '<p>&nbsp;</p>';
 
-$nextAction= $errors > 0 ? 'summary' : 'install';
-$nextButton= $errors > 0 ? $_lang['retry'] : $_lang['install'];
-$nextVisibility= $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
-$agreeToggle= $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
+$nextAction = $errors > 0 ? 'summary' : 'install';
+$nextButton = $errors > 0 ? $_lang['retry'] : $_lang['install'];
+$nextVisibility = $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
+$agreeToggle = $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
 ?>
 <form name="install" id="install_form" action="index.php?action=<?php echo $nextAction ?>" method="post">
   <div>
@@ -345,32 +345,32 @@ 
 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
-    $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
+    $templates = isset ($_POST['template']) ? $_POST['template'] : array();
     foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
 
-    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
 
-    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
 
-    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
 
-    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
 
-    $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
+    $modules = isset ($_POST['module']) ? $_POST['module'] : array();
     foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
 ?>
 </div>
 
-<h2><?php echo $_lang['agree_to_terms'];?></h2>
+<h2><?php echo $_lang['agree_to_terms']; ?></h2>
 <p>
-<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
+<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ' : ""; ?><?php echo $agreeToggle; ?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
         <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
-        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
+        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility; ?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>