X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-functions.php;h=4e3605f2b665afc866cb926d7c32833022a7b191;hp=b8db7c8dd1cee281654ce3784e01ea229ae87a00;hb=b5e396d81912f97a5752b4a4e61ae08f7c1efbd5;hpb=b6a6d0a2c0a0f274b937eb75c413db8fa9b44f9c

diff --git a/inc/install-functions.php b/inc/install-functions.php
index b8db7c8dd1..4e3605f2b6 100644
--- a/inc/install-functions.php
+++ b/inc/install-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -655,10 +655,10 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
 	unsetSqlLinkUp(__FUNCTION__, __LINE__);
 
 	// Try to connect to the database
-	SQL_CONNECT(postRequestElement('mysql_host'), postRequestElement('mysql_login'), postRequestElement('mysql_password1'), __FUNCTION__, __LINE__);
+	sqlConnectToDatabase(postRequestElement('mysql_host'), postRequestElement('mysql_login'), postRequestElement('mysql_password1'), __FUNCTION__, __LINE__);
 
 	// Is the link up
-	if (!SQL_IS_LINK_UP()) {
+	if (!isSqlLinkUp()) {
 		// Cannot connect to database
 		$GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_CONNECT_ERROR--}';
 		array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_login', 'mysql_password1', 'mysql_password2');
@@ -666,13 +666,13 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
 	} // END - if
 
 	// Then attempt to select the database
-	if (!SQL_SELECT_DB(postRequestElement('mysql_dbase'), __FUNCTION__, __LINE__)) {
+	if (!sqlSelectDatabase(postRequestElement('mysql_dbase'), __FUNCTION__, __LINE__)) {
 		// Could not find database
 		$GLOBALS['installer_post_error'][$currentTab] = '{--INSTALLER_POST_DATABASE_SELECT_FAILED--}';
 		array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_dbase');
 
 		// Disconnect here, we don't need idle database connections laying around
-		SQL_CLOSE(__FUNCTION__, __LINE__);
+		sqlCloseLink(__FUNCTION__, __LINE__);
 
 		// Abort here
 		return FALSE;
@@ -692,7 +692,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
 		array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_engine');
 
 		// Disconnect here, we don't need idle database connections laying around
-		SQL_CLOSE(__FUNCTION__, __LINE__);
+		sqlCloseLink(__FUNCTION__, __LINE__);
 
 		// Abort here
 		return FALSE;
@@ -702,7 +702,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
 		array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_engine');
 
 		// Disconnect here, we don't need idle database connections laying around
-		SQL_CLOSE(__FUNCTION__, __LINE__);
+		sqlCloseLink(__FUNCTION__, __LINE__);
 
 		// Abort here
 		return FALSE;
@@ -728,7 +728,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
 		array_push($GLOBALS['installer_failed_fields'][$currentTab], 'mysql_engine');
 
 		// Disconnect here, we don't need idle database connections laying around
-		SQL_CLOSE(__FUNCTION__, __LINE__);
+		sqlCloseLink(__FUNCTION__, __LINE__);
 
 		// Abort here
 		return FALSE;
@@ -784,7 +784,7 @@ function isInstallerPostDatabaseConfigValid ($currentTab) {
 	$isValid = (count($tables) == $missingTables);
 
 	// Disconnect here, we don't need idle database connections laying around
-	SQL_CLOSE(__FUNCTION__, __LINE__);
+	sqlCloseLink(__FUNCTION__, __LINE__);
 
 	// If the status is true, disconnect the database
 	if ($isValid === FALSE) {