X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Foptimize_functions.php;h=cc4f0ac0788f59db05946b98d2c2c130aa686232;hb=b045ba361328cce0482ad1e5a73c3f7549ae1f40;hp=15ca6baaa04ca3d1ad6e7abb26ab7638c0574156;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index 15ca6baaa0..cc4f0ac078 100644
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 09/17/2004 *
- * ================                             Last change: 09/17/2004 *
+ * ===================                          Last change: 09/17/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : optimize_functions.php                           *
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -44,16 +43,24 @@ if (!defined('__SECURITY')) {
 // Part taken from admin optimize module of PHPNuke (http://www.phpnuke.org)
 function repairOptimizeDatabase () {
 	$ret = array();
-	$tot_data = '0'; $tabs = '0'; $opts = '0';
-	$tot_idx = '0'; $total_gain = '0';
+	$tot_data = '0';
+	$opts = '0';
+	$tot_idx = '0';
+	$total_gain = '0';
 	$tot_all = '0';
-	$result = SQL_QUERY("SHOW TABLE STATUS FROM `{?__DB_NAME?}`", __FUNCTION__, __LINE__);
-	$tabs = SQL_NUMROWS($result);
+
+	// Get table status
+	$result = sqlQuery('SHOW TABLE STATUS FROM `{?__DB_NAME?}`', __FUNCTION__, __LINE__);
+
+	// Init array
 	$ret['total_size'] = '0';
-	$ret['total_tabs'] = $tabs;
+	$ret['total_tabs'] = sqlNumRows($result);
 	$ret['tables'] = array();
-	if ($tabs > 0) {
-		while ($row = SQL_FETCHARRAY($result)) {
+
+	// Are there entries?
+	if (!ifSqlHasZeroNums($result)) {
+		// Fetch all rows
+		while ($row = sqlFetchArray($result)) {
 			$tot_data = $row['Data_length'];
 			$tot_idx  = $row['Index_length'];
 			$total = $tot_data + $tot_idx;
@@ -65,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;
@@ -86,19 +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 rows, SUM(`gain`) AS opti FROM `{?_MYSQL_PREFIX?}_optimize_gain`", __FUNCTION__, __LINE__);
-	list($total_rows, $total_opti) = SQL_FETCHROW($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);
-
-	// Transfer data
-	$ret['total_rows'] = $total_rows;
-	$ret['total_opti'] = $total_opti;
+	sqlFreeResult($result);
 
 	// Return array
 	return $ret;