evolution-cms / evolution

install/cli-install.php

Spacing +257 added lines, -258 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'] . ' [utf8_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'].' [utf8_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,22 +303,22 @@ 
     $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'];
 if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
     $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
@@ -343,22 +343,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;
     }
 }
 
@@ -366,10 +366,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;
     }
 }
 
@@ -383,40 +383,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();
@@ -433,7 +433,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;
@@ -443,7 +443,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;
@@ -454,7 +454,7 @@ 
 
 // set session name variable
 if (!isset ($site_sessionname)) {
-    $site_sessionname = 'SN' . uniqid('');
+    $site_sessionname = 'SN'.uniqid('');
 }
 
 // get base path and url
@@ -470,64 +470,64 @@ 
 }
 $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'].': ';
 if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
-    echo $_lang["setup_database_create_connection_failed"] . " " . $_lang['setup_database_create_connection_failed_note'] . PHP_EOL;
+    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;
     }
 }
 
@@ -569,7 +569,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
@@ -593,12 +593,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;
@@ -611,8 +611,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'
@@ -732,7 +731,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']
             );
         }
     }
@@ -757,12 +756,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);
@@ -833,7 +832,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);
@@ -854,21 +853,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\');';
@@ -888,10 +887,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;
@@ -907,38 +906,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')");
         }
     }
 }
@@ -950,25 +949,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;
@@ -980,7 +979,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);
@@ -991,13 +990,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;
                     }
@@ -1005,23 +1004,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;
                 }
             }
         }
@@ -1031,7 +1030,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;
@@ -1054,27 +1053,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
@@ -1084,22 +1083,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)");
                     }
                 }
             }
@@ -1111,7 +1110,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;
@@ -1124,7 +1123,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
@@ -1133,36 +1132,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;
                 }
             }
         }
@@ -1172,7 +1171,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;
@@ -1185,7 +1184,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
@@ -1195,28 +1194,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;
                 }
             }
         }
@@ -1226,7 +1225,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;
@@ -1242,16 +1241,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);
                 }
 
@@ -1262,23 +1261,23 @@ 
                 $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;
                             }
@@ -1287,39 +1286,39 @@ 
                     if ($insert === true) {
                         $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
                         if (!mysqli_query($sqlParser->conn,
-                            "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
-                            echo mysqli_error($sqlParser->conn) . PHP_EOL;
+                            "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$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"];
                         // remove existing events
                         mysqli_query($sqlParser->conn,
-                            'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\'');
+                            'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\'');
                         // add new events
                         mysqli_query($sqlParser->conn,
-                            "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','",
-                                $events) . "')");
+                            "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','",
+                                $events)."')");
                     }
                 }
             }
@@ -1330,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;
@@ -1341,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
@@ -1351,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;
                 }
             }
         }
@@ -1381,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 {
@@ -1405,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;
     }
 }
 
@@ -1413,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 {
@@ -1425,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 {
@@ -1436,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;
                 }
             }
         }
@@ -1472,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/index.php

Spacing +11 added lines, -11 removed lines

@@ -3,13 +3,13 @@ 
  * EVO Installer
  */
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
-$base_path = dirname(__DIR__) . '/';
+$base_path = dirname(__DIR__).'/';
 
-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')) {
-    if (is_dir($base_path . 'manager')) {
+if (!defined('MGR_DIR')) {
+    if (is_dir($base_path.'manager')) {
         define('MGR_DIR', 'manager');
     } else {
         die('MGR_DIR is not defined');
@@ -19,7 +19,7 @@ 
 require_once 'src/functions.php';
 
 if (empty($_GET['self'])) {
-    require_once '../' . MGR_DIR . '/includes/version.inc.php';
+    require_once '../'.MGR_DIR.'/includes/version.inc.php';
 
     // start session
     session_start();
@@ -27,7 +27,7 @@ 
     install_sessionCheck();
 
     $moduleName = 'EVO';
-    $moduleVersion = $modx_branch . ' ' . $modx_version;
+    $moduleVersion = $modx_branch.' '.$modx_version;
     $moduleRelease = $modx_release_date;
     $moduleSQLBaseFile = 'stubs/sql/setup.sql';
     $moduleSQLDataFile = 'stubs/sql/setup.data.sql';
@@ -68,8 +68,8 @@ 
     $action = isset($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
     str_replace('.', '', $action);
 
-    $controller = 'src/controllers/' . $action . '.php';
-    if (! file_exists($controller)) {
+    $controller = 'src/controllers/'.$action.'.php';
+    if (!file_exists($controller)) {
         die("Invalid install action attempted. [action={$action}]");
     }
     require $controller;
@@ -81,8 +81,8 @@ 
 } else {
     $action = isset($_GET['action']) && is_scalar($_GET['action']) ? trim($_GET['action']) : 'language';
     str_replace('.', '', $action);
-    $controller = 'src/controllers/' . $action . '.php';
-    if (! file_exists($controller)) {
+    $controller = 'src/controllers/'.$action.'.php';
+    if (!file_exists($controller)) {
         die("Invalid install action attempted. [action={$action}]");
     }
     require $controller;

manager/includes/manager.lockout.inc.php

Spacing +32 added lines, -32 removed lines

@@ -1,75 +1,75 @@
 <?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->getManagerApi()->action!='8' && isset($_SESSION['mgrValidated'])){
+if ($modx->getManagerApi()->action != '8' && isset($_SESSION['mgrValidated'])) {
 
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
 
-    $modx->setPlaceholder('modx_charset',$modx_manager_charset);
-    $modx->setPlaceholder('theme',$manager_theme);
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
 
-    $modx->setPlaceholder('site_name',$site_name);
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
+    $modx->setPlaceholder('site_name', $site_name);
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
 
-    $modx->setPlaceholder('home',$_lang["home"]);
-    $modx->setPlaceholder('homeurl',$homeurl);
-    $modx->setPlaceholder('logout',$_lang["logout"]);
-    $modx->setPlaceholder('logouturl',$logouturl);
-    $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
-    $modx->setPlaceholder('year',date('Y'));
+    $modx->setPlaceholder('home', $_lang["home"]);
+    $modx->setPlaceholder('homeurl', $homeurl);
+    $modx->setPlaceholder('logout', $_lang["logout"]);
+    $modx->setPlaceholder('logouturl', $logouturl);
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
+    $modx->setPlaceholder('year', date('Y'));
 
     // load template
-    if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
+    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
     $target = $modx->mergeSettingsContent($target);
 
-    if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
+    if (substr($target, 0, 1) === '@') {
+    	if (substr($target, 0, 6) === '@CHUNK') {
+    		$target = trim(substr($target, 7));
     		$lockout_tpl = $modx->getChunk($target);
     	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
+    	elseif (substr($target, 0, 5) === '@FILE') {
+    		$target = trim(substr($target, 6));
     		$lockout_tpl = file_get_contents($target);
     	}
 	} else {
     	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
+    	if ($chunk !== false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
     	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
+    	elseif (is_file(MODX_BASE_PATH.$target)) {
+    		$target = MODX_BASE_PATH.$target;
     		$lockout_tpl = file_get_contents($target);
     	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
+		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
 	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
     	}
     	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    		$target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
 	}
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
-    $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
 
     echo $lockout_tpl;

manager/includes/config_check.inc.php

Spacing +41 added lines, -41 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.");
 }
 
 // PROCESSOR FIRST
-if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+if ($_SESSION['mgrRole'] == 1) {
+	if ($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
 		$current = $modx->getManagerApi()->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
+		if (!empty($current)) {
 			$modx->getManagerApi()->setSystemChecksum($current);
 			$modx->clearCache('full');
 			$modx->config['sys_files_checksum'] = $current;
@@ -19,14 +19,14 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->getManagerApi()->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check !== '0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
-    if(@fileperms('includes/config.inc.php') & 0x0002) {
+    if (@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_configinc']);
     }
@@ -42,8 +42,8 @@ 
     $warnings[] = array($_lang['configcheck_php_gdzip']);
 }
 
-if(!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
+if (!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
         if ($modx->getDatabase()->getValue($modx->getDatabase()->select('COUNT(setting_value)', $modx->getFullTableName('system_settings'), "setting_name='validate_referer' AND setting_value='0'"))) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_validate_referer']);
@@ -52,11 +52,11 @@ 
 }
 
 // check for Template Switcher plugin
-if(!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
+if (!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
         $rs = $modx->getDatabase()->select('name, disabled', $modx->getFullTableName('site_plugins'), "name IN ('TemplateSwitcher', 'Template Switcher', 'templateswitcher', 'template_switcher', 'template switcher') OR plugincode LIKE '%TemplateSwitcher%'");
         $row = $modx->getDatabase()->getRow($rs);
-        if($row && $row['disabled'] == 0) {
+        if ($row && $row['disabled'] == 0) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_templateswitcher_present']);
             $tplName = $row['name'];
@@ -120,36 +120,36 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache(){
         $modx = evolutionCMS();
-        $checked= true;
-        if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
-            $checked= @include_once ($modx->config['base_path'] . 'assets/cache/siteCache.idx.php');
+        $checked = true;
+        if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) {
+            $checked = @include_once ($modx->config['base_path'].'assets/cache/siteCache.idx.php');
         }
         return $checked;
     }
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/cache/")) {
+if (!is_writable(MODX_BASE_PATH."assets/cache/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_cache']);
 }
 
 if (!checkSiteCache()) {
     $warningspresent = 1;
-    $warnings[]= array($lang['configcheck_sitecache_integrity']);
+    $warnings[] = array($lang['configcheck_sitecache_integrity']);
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/images/")) {
+if (!is_writable(MODX_BASE_PATH."assets/images/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_images']);
 }
 
-if(strpos($modx->config['rb_base_dir'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_rb_base_dir']);
 }
-if(strpos($modx->config['filemanager_path'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_filemanager_path']);
 }
@@ -157,36 +157,36 @@ 
 // clear file info cache
 clearstatcache();
 
-if ($warningspresent==1) {
+if ($warningspresent == 1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if (!isset($modx->config['send_errormail'])) $modx->config['send_errormail'] = '3';
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
-for ($i=0;$i<count($warnings);$i++) {
+for ($i = 0; $i < count($warnings); $i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+			$warnings[$i][2] = '<ul><li>'.implode('</li><li>', $sysfiles_check).'</li></ul>';
+			if ($modx->hasPermission('settings')) {
+				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\''.$_lang["reset_sysfiles_checksum_alert"].'\')">'.$_lang["reset_sysfiles_checksum_button"].'</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
@@ -208,18 +208,18 @@ 
             break;
         case $_lang['configcheck_validate_referer'] :
             $msg = $_lang['configcheck_validate_referer_msg'];
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
             $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_templateswitcher_present'] :
             $msg = $_lang["configcheck_templateswitcher_present_msg"];
-            if(isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
+            if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"];
             }
-            if(isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
+            if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"];
             }
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
             $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_rb_base_dir'] :
@@ -232,7 +232,7 @@ 
             $warnings[$i][1] = $_lang['configcheck_default_msg'];
     }
 
-    $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
+    $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : "";
     $config_check_results .= "
             <fieldset>
             <p><strong>".$_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p>
@@ -241,11 +241,11 @@ 
             ".(isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')."
             </fieldset>
 ";
-        if ($i!=count($warnings)-1) {
+        if ($i != count($warnings) - 1) {
             $config_check_results .= "<br />";
         }
     }
-    $_SESSION["mgrConfigCheck"]=true;
+    $_SESSION["mgrConfigCheck"] = true;
 } else {
     $config_check_results = $_lang['configcheck_ok'];
 }

manager/includes/secure_mgr_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
     $rs = $modx->getDatabase()->select(
         'DISTINCT sc.id',
-        $modx->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getFullTableName("membergroup_access") . " mga ON mga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "mga.id>0"
+        $modx->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
     );
     $ids = $modx->getDatabase()->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->getDatabase()->update('privatemgr = 1', $modx->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/user_settings.inc.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 if (!empty($user_id)) {
     // Raymond: grab the user settings from the database.
     $rs = $modx->getDatabase()->select('setting_name, setting_value', $modx->getFullTableName('user_settings'),
-        "user=" . $modx->getLoginUserID());
+        "user=".$modx->getLoginUserID());
 
     $which_browser_default = $which_browser;
     while ($row = $modx->getDatabase()->getRow($rs)) {

manager/includes/secure_web_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
     $rs = $modx->getDatabase()->select(
         'DISTINCT sc.id',
-        $modx->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0"
+        $modx->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
     );
     $ids = $modx->getDatabase()->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->getDatabase()->update('privateweb = 1', $modx->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/footer.inc.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <?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.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
-if(count($SystemAlertMsgQueque) > 0) {
+if (count($SystemAlertMsgQueque) > 0) {
 	include "sysalert.display.inc.php";
 }
 ?>
@@ -18,7 +18,7 @@ 
 	});
 </script>
 <?php
-if(in_array($modx->getManagerApi()->action, array(
+if (in_array($modx->getManagerApi()->action, array(
 	85,
 	27,
 	4,

manager/includes/sysalert.display.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 	$sysMsgs = "";
 	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
+	for ($i = 0; $i < $limit; $i++) {
 		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
 	}
 	// reset message queque
@@ -20,7 +20,7 @@ 
 	$_SESSION['SystemAlertMsgQueque'] = array();
 	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+	if ($sysMsgs != "") {
 ?>
 
 <?php // fetch the styles
@@ -32,7 +32,7 @@ 
 			var sysAlert = new Element('div').setProperties({
 				'class': 'sysAlert'
 			});
-			sysAlert.innerHTML = '<?php echo $modx->getDatabase()->escape($sysMsgs);?>';
+			sysAlert.innerHTML = '<?php echo $modx->getDatabase()->escape($sysMsgs); ?>';
 			var boxHtml = new MooPrompt('<?php echo $_lang['sys_alert']; ?>', sysAlert, {
 				buttons: 1,
 				button1: 'Ok',