Double question mark fixed

[mailer.git] / inc / libs / optimize_functions.php

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index d97c738ab489605b26803c174ab5e7be71e6e65d..d8d044628b62d5c0ce0ad7c623e6e27783e49fa8 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -14,11 +14,9 @@
  * $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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,15 +43,23 @@ 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 = SQL_QUERY('SHOW TABLE STATUS FROM `{?__DB_NAME?}`', __FUNCTION__, __LINE__);
+
+       // Init array
        $ret['total_size'] = '0';
-       $ret['total_tabs'] = $tabs;
+       $ret['total_tabs'] = SQL_NUMROWS($result);
        $ret['tables'] = array();
-       if ($tabs > 0) {
+
+       // Do we have entries?
+       if (!SQL_HASZERONUMS($result)) {
+               // Fetch all rows
                while ($row = SQL_FETCHARRAY($result)) {
                        $tot_data = $row['Data_length'];
                        $tot_idx  = $row['Index_length'];
@@ -91,16 +97,12 @@ function repairOptimizeDatabase () {
                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 = 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));
 
        // Free memory
        SQL_FREERESULT($result);
 
-       // Transfer data
-       $ret['total_rows'] = $total_rows;
-       $ret['total_opti'] = $total_opti;
-
        // Return array
        return $ret;
 }