X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Foptimize_functions.php;h=07b24ef8ab17bb308bc83dcd0441d7686e38732b;hp=66ec22b6322ddba1e5cd8f5ebe285f02acf71e45;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index 66ec22b632..07b24ef8ab 100644
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -50,17 +50,17 @@ function repairOptimizeDatabase () {
 	$tot_all = '0';
 
 	// Get table status
-	$result = SQL_QUERY('SHOW TABLE STATUS FROM `{?__DB_NAME?}`', __FUNCTION__, __LINE__);
+	$result = sqlQuery('SHOW TABLE STATUS FROM `{?__DB_NAME?}`', __FUNCTION__, __LINE__);
 
 	// Init array
 	$ret['total_size'] = '0';
-	$ret['total_tabs'] = SQL_NUMROWS($result);
+	$ret['total_tabs'] = sqlNumRows($result);
 	$ret['tables'] = array();
 
-	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	// Are there entries?
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Fetch all rows
-		while ($row = SQL_FETCHARRAY($result)) {
+		while ($row = sqlFetchArray($result)) {
 			$tot_data = $row['Data_length'];
 			$tot_idx  = $row['Index_length'];
 			$total = $tot_data + $tot_idx;
@@ -72,17 +72,17 @@ function repairOptimizeDatabase () {
 			$gain = round ($gain, 3);
 
 			// Repair table
-			$result1 = SQL_QUERY_ESC("REPAIR TABLE `%s`",
+			$result1 = sqlQueryEscaped("REPAIR TABLE `%s`",
 				array($row['Name']), __FUNCTION__, __LINE__);
-			$rep = SQL_FETCHARRAY($result1);
+			$rep = sqlFetchArray($result1);
 
 			// Optimize table
-			$result1 = SQL_QUERY_ESC("OPTIMIZE TABLE `%s`",
+			$result1 = sqlQueryEscaped("OPTIMIZE TABLE `%s`",
 				array($row['Name']), __FUNCTION__, __LINE__);
-			$opt = SQL_FETCHARRAY($result1);
+			$opt = sqlFetchArray($result1);
 
 			// Add data to array
-			$ret['tables'][] = array($row['Name'], $opt['Msg_text'], $rep['Msg_text'], $total, $gain);
+			array_push($ret['tables'], array($row['Name'], $opt['Msg_text'], $rep['Msg_text'], $total, $gain));
 
 			// Count total table data
 			$ret['total_size'] += $total;
@@ -93,15 +93,15 @@ function repairOptimizeDatabase () {
 	$ret['total_gain'] = $total_gain;
 
 	// Insert new row
-	$result = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_optimize_gain` (`gain`) VALUES (%s)",
+	$result = sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_optimize_gain` (`gain`) VALUES (%s)",
 		array($total_gain), __FUNCTION__, __LINE__);
 
 	// Get total runs and total optimization count
-	$result = SQL_QUERY('SELECT COUNT(`id`) AS `total_rows`, SUM(`gain`) AS `total_optimized` FROM `{?_MYSQL_PREFIX?}_optimize_gain`', __FUNCTION__, __LINE__);
-	$ret = merge_array($ret, SQL_FETCHARRAY($result));
+	$result = sqlQuery('SELECT COUNT(`id`) AS `total_rows`, SUM(`gain`) AS `total_optimized` FROM `{?_MYSQL_PREFIX?}_optimize_gain`', __FUNCTION__, __LINE__);
+	$ret = merge_array($ret, sqlFetchArray($result));
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return array
 	return $ret;