mailer project continued:

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

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index 011484fd2f34af09210828361b9f91d716bbc0f9..ee3e22c9416b304d377dec860e209d3c1944e971 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -14,12 +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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -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';
+
+       // Get table status
        $result = SQL_QUERY('SHOW TABLE STATUS FROM `{?__DB_NAME?}`', __FUNCTION__, __LINE__);
-       $tabs = SQL_NUMROWS($result);
+
+       // 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'];
@@ -76,7 +82,7 @@ function repairOptimizeDatabase () {
                        $opt = SQL_FETCHARRAY($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;