Several more constants rewritten to getConfig()

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 561967bd61dc3848ba5307ae49bf7315373342e4..3a3844bbbd45eb725205f7e6ce6666fcf4e88f4a 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -83,7 +83,7 @@ if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
 // Is MXChange installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
        // Set URL for FORM actions
-       define('__BURL_ACTION', constant('URL'));
+       define('__BURL_ACTION', getConfig('URL'));
 
        // Output page for entered value
        switch (REQUEST_GET('page')) {
@@ -252,15 +252,15 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        copyFileVerified(REQUEST_POST('spath') . 'inc/config-local.php.dist', REQUEST_POST('spath') . 'inc/cache/config-local.php', 0644);
 
                                                        // Ok, all done. So we can write the config data to the php files
-                                                       if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SERVER-PATH', "define('PATH', '", "');", REQUEST_POST('spath'), 0);
-                                                       if (REQUEST_POST('burl')  != constant('URL'))  changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'HOST-URL', "define('URL', '", "');", REQUEST_POST('burl'), 0);
-                                                       changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MAIN-TITLE', "define('MAIN_TITLE', '", "');", REQUEST_POST('title'), 0);
-                                                       changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SLOGAN', "define('SLOGAN', '", "');", REQUEST_POST('slogan'), 0);
-                                                       changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WEBMASTER', "define('WEBMASTER', '", "');", REQUEST_POST('email'), 0);
+                                                       if (REQUEST_POST('spath') != getConfig('PATH')) changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SERVER-PATH', "setConfigEntry('PATH', '", "');", REQUEST_POST('spath'), 0);
+                                                       if (REQUEST_POST('burl')  != getConfig('URL'))  changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'HOST-URL', "setConfigEntry('URL', '", "');", REQUEST_POST('burl'), 0);
+                                                       changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", REQUEST_POST('title'), 0);
+                                                       changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SLOGAN', "setConfigEntry('SLOGAN', '", "');", REQUEST_POST('slogan'), 0);
+                                                       changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", REQUEST_POST('email'), 0);
                                                        changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", REQUEST_POST('warn_no_pass'), 0);
                                                        changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", REQUEST_POST('wfooter'), 0);
                                                        changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", REQUEST_POST('blink'), 0);
-                                                       // DEACTIVATED: changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'OUTPUT-MODE', "define('OUTPUT_MODE', '", "');", REQUEST_POST('omode'), 0);
+                                                       // @TODO DEACTIVATED: changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", REQUEST_POST('omode'), 0);
                                                        changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-HOST', "  'host'     => '", "',", $mysql['host'], 0);
                                                        changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-DBASE', " 'dbase'    => '", "',", $mysql['dbase'], 0);
                                                        changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-LOGIN', " 'login'    => '", "',", $mysql['login'], 0);