A lot fixes to templates and missing functions added, more rewrites

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

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index 26dcdbc71896603513aa377f0c996589afc83208..88cd90537cfbec5310aa7a6e60a8b712e7dfc10e 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -46,7 +46,7 @@ function REPAIR_OPTIMIZE_DB()
        $tot_data = 0; $tabs = 0; $opts = 0;
        $tot_idx = 0; $total_gain = 0;
        $tot_all = 0;
-       $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".__DB_NAME, __FILE__, __LINE__);
+       $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".__DB_NAME, __FUNCTION__, __LINE__);
        $tabs = @SQL_NUMROWS($result);
        $ret['total_size'] = 0;
        $ret['total_tabs'] = $tabs;
@@ -66,11 +66,11 @@ function REPAIR_OPTIMIZE_DB()
                        $gain = round ($gain, 3);
 
                        // Repair table
-                       $result1 = SQL_QUERY("REPAIR TABLE ".$row['Name'], __FILE__, __LINE__);
+                       $result1 = SQL_QUERY("REPAIR TABLE ".$row['Name'], __FUNCTION__, __LINE__);
                        $rep = SQL_FETCHARRAY($result1);
 
                        // Optimize table
-                       $result1 = SQL_QUERY("OPTIMIZE TABLE ".$row['Name'], __FILE__, __LINE__);
+                       $result1 = SQL_QUERY("OPTIMIZE TABLE ".$row['Name'], __FUNCTION__, __LINE__);
                        $opt = SQL_FETCHARRAY($result1);
 
                        // Add data to array
@@ -85,10 +85,10 @@ function REPAIR_OPTIMIZE_DB()
        $ret['total_gain'] = $total_gain;
 
        // Insert new row
-       $result = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_optimize_gain (gain) VALUES ('".$total_gain."')", __FILE__, __LINE__);
+       $result = SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_optimize_gain` (gain) VALUES ('".$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", __FILE__, __LINE__);
+       $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);
 
        // Free memory