A lot naming conventions applied, TODOs.txt updated

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

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index 1b22cbb9b7c73a7ca0f8199cfb48598770df1644..6fae587174774ea89b7646070ad0558c250d8060 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/17/2004 *
- * ================                             Last change: 09/17/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/17/2004 *
+ * ===================                          Last change: 09/17/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : optimize_functions.php                           *
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -90,16 +91,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;
 }