Merge pull request #711 from AgelxNash/fix-install

Update installer

Author: Pathologic

.gitignore

@@ -45,6 +45,7 @@
 
 # Manager
 /manager/includes/config.inc.php
+/manager/includes/config_mutator.php
 
 # Composer
 /composer.phar

install/actions/action_options.php

@@ -188,9 +188,9 @@ function getSnippets($presets = array())
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(empty($_SESSION['databaseloginpassword']))
+        if(!empty($_POST['databaseloginpassword']))
             $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(empty($_SESSION['databaseloginname']))
+        if(!empty($_POST['databaseloginname']))
             $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
         break;
     case 1:

install/config.inc.tpl

@@ -18,6 +18,20 @@ $coreClass = '\DocumentParser';
 $session_cookie_path = '';
 $session_cookie_domain = '';
 
+/**
+ * Preventing the overwrite of the config when updating
+ * Here you can
+ *  - define manual constants, dedicated specifically for you project
+ *  - inject composer
+ *  - change predefined variables by the environment variables
+ *  - ...
+ *  - etc.
+ *  - PROFIT!
+ */
+if (file_exists(__DIR__ . '/config_mutator.php')) {
+    require_once __DIR__ . '/config_mutator.php';
+}
+
 if (!defined('MGR_DIR')) {
     define('MGR_DIR', 'manager');
 }

install/instprocessor.php

@@ -4,6 +4,7 @@
 }else{
     define('MGR_DIR', 'manager');
 }
+define('MODX_CLI', false);
 
 global $moduleName;
 global $moduleVersion;