X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Foptimize_functions.php;h=d8d044628b62d5c0ce0ad7c623e6e27783e49fa8;hb=c6418c3240dd6f50413c35b4bcf21405a939bb90;hp=6fae587174774ea89b7646070ad0558c250d8060;hpb=7e17864b7d07fb5123b1b1d68f83db28ea5394ef;p=mailer.git diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php index 6fae587174..d8d044628b 100644 --- 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,7 +97,7 @@ function repairOptimizeDatabase () { 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__); + $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