From: Roland Häder <roland@mxchange.org>
Date: Fri, 10 Jun 2011 22:23:17 +0000 (+0000)
Subject: New wrapper function changeDataInLocalConfigurationFile() introduced
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=57df537144f8fbc3fd0ca239ab0076a891d06783;p=mailer.git

New wrapper function changeDataInLocalConfigurationFile() introduced
---

diff --git a/inc/install-functions.php b/inc/install-functions.php
index c1375178da..b989100a55 100644
--- a/inc/install-functions.php
+++ b/inc/install-functions.php
@@ -46,33 +46,33 @@ function doInstallWriteLocalConfig () {
 	copyFileVerified(postRequestParameter('spath') . 'inc/config-local.php.dist', getPath() . getCachePath() . 'config-local.php', 0644);
 
 	// Ok, all done. So we can write the config data to the php files
-	if (postRequestParameter('spath') != getPath()) changeDataInInclude(getCachePath() . 'config-local.php', 'SERVER-PATH', "setConfigEntry('PATH', '", "');", postRequestParameter('spath'), 0);
-	if (postRequestParameter('burl')  != getUrl())  changeDataInInclude(getCachePath() . 'config-local.php', 'HOST-URL', "setConfigEntry('URL', '", "');", postRequestParameter('burl'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", postRequestParameter('title'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'SLOGAN', "setConfigEntry('SLOGAN', '", "');", postRequestParameter('slogan'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", postRequestParameter('email'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", postRequestParameter('warn_no_pass'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", postRequestParameter('wfooter'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", postRequestParameter('blink'), 0);
-	// @TODO DEACTIVATED: changeDataInInclude(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'MYSQL-HOST', "	'host'     => '", "',", postRequestParameter('mysql','host'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'MYSQL-DBASE', "	'dbase'    => '", "',", postRequestParameter('mysql','dbase'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'MYSQL-LOGIN', "	'login'    => '", "',", postRequestParameter('mysql','login'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'MYSQL-PASSWORD', "	'password' => '", "',", postRequestParameter('mysql','pass1'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", postRequestParameter('mysql','prefix'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", postRequestParameter('mysql','type'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", postRequestParameter('smtp_host'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", postRequestParameter('smtp_user'), 0);
-	changeDataInInclude(getCachePath() . 'config-local.php', 'SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", postRequestParameter('smtp_pass1'), 0);
+	if (postRequestParameter('spath') != getPath()) changeDataInLocalConfigurationFile('SERVER-PATH', "setConfigEntry('PATH', '", "');", postRequestParameter('spath'), 0);
+	if (postRequestParameter('burl')  != getUrl())  changeDataInLocalConfigurationFile('HOST-URL', "setConfigEntry('URL', '", "');", postRequestParameter('burl'), 0);
+	changeDataInLocalConfigurationFile('MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", postRequestParameter('title'), 0);
+	changeDataInLocalConfigurationFile('SLOGAN', "setConfigEntry('SLOGAN', '", "');", postRequestParameter('slogan'), 0);
+	changeDataInLocalConfigurationFile('WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", postRequestParameter('email'), 0);
+	changeDataInLocalConfigurationFile('NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", postRequestParameter('warn_no_pass'), 0);
+	changeDataInLocalConfigurationFile('WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", postRequestParameter('wfooter'), 0);
+	changeDataInLocalConfigurationFile('BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", postRequestParameter('blink'), 0);
+	// @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
+	changeDataInLocalConfigurationFile('MYSQL-HOST', "	'host'     => '", "',", postRequestParameter('mysql','host'), 0);
+	changeDataInLocalConfigurationFile('MYSQL-DBASE', "	'dbase'    => '", "',", postRequestParameter('mysql','dbase'), 0);
+	changeDataInLocalConfigurationFile('MYSQL-LOGIN', "	'login'    => '", "',", postRequestParameter('mysql','login'), 0);
+	changeDataInLocalConfigurationFile('MYSQL-PASSWORD', "	'password' => '", "',", postRequestParameter('mysql','pass1'), 0);
+	changeDataInLocalConfigurationFile('MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", postRequestParameter('mysql','prefix'), 0);
+	changeDataInLocalConfigurationFile('TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", postRequestParameter('mysql','type'), 0);
+	changeDataInLocalConfigurationFile('SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", postRequestParameter('smtp_host'), 0);
+	changeDataInLocalConfigurationFile('SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", postRequestParameter('smtp_user'), 0);
+	changeDataInLocalConfigurationFile('SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", postRequestParameter('smtp_pass1'), 0);
 
 	// Generate a long site key
 	$siteKey = generatePassword(50);
 
 	// And write it
-	changeDataInInclude(getCachePath() . 'config-local.php', 'SITE-KEY', "setConfigEntry('SITE_KEY', '", "');", $siteKey, 0);
+	changeDataInLocalConfigurationFile('SITE-KEY', "setConfigEntry('SITE_KEY', '", "');", $siteKey, 0);
 
 	// Script is now installed
-	changeDataInInclude(getCachePath() . 'config-local.php', 'INSTALLED', "setConfigEntry('MXCHANGE_INSTALLED', '", "');", 'Y', 0);
+	changeDataInLocalConfigurationFile('INSTALLED', "setConfigEntry('MXCHANGE_INSTALLED', '", "');", 'Y', 0);
 }
 
 // Adds a given template with content to install output stream
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 9068e4536a..aa379236ed 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -73,7 +73,7 @@ if (!isAdminRegistered()) {
 		switch ($ret) {
 			case 'done':
 				// Change ADMIN_REGISTERED entry
-				$done = changeDataInInclude(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+				$done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
 				// Was it successfull?
 				if ($done === true) {
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 8925b3deb9..11ef1ef287 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -2430,6 +2430,12 @@ function changeDataInInclude ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0)
 	return changeDataInFile($FQFN, $comment, $prefix, $suffix, $DATA, $seek);
 }
 
+// Wrapper for changing entries in config-local.php
+function changeDataInInclude ($comment, $prefix, $suffix, $DATA, $seek = 0) {
+	// Call the inner function
+	return changeDataInInclude(getCachePath() . 'config-local.php', $comment, $prefix, $suffix, $DATA, $seek);
+}
+
 // Shortens ucfirst(strtolower()) calls
 function firstCharUpperCase ($str) {
 	return ucfirst(strtolower($str));