More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index 3010e34f08c18da8c834c7dcb58f9d6751c383aa..59d142b907371444bcfd5a2e486adfef3a485fe2 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -42,24 +42,19 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 

-//

 // Part taken from admin optimize module of PHPNuke (http://www.phpnuke.org)
 // Part taken from admin optimize module of PHPNuke (http://www.phpnuke.org)

-//
-function REPAIR_OPTIMIZE_DB()
-{
+function REPAIR_OPTIMIZE_DB () {

        $ret = array();
        $tot_data = 0; $tabs = 0; $opts = 0;
        $tot_idx = 0; $total_gain = 0;
        $tot_all = 0;
        $ret = array();
        $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, __FUNCTION__, __LINE__);
-       $tabs = @SQL_NUMROWS($result);
+       $result = SQL_QUERY_ESC("SHOW TABLE STATUS FROM `%s`", array(constant('__DB_NAME')), __FUNCTION__, __LINE__);
+       $tabs = SQL_NUMROWS($result);

        $ret['total_size'] = 0;
        $ret['total_tabs'] = $tabs;
        $ret['tables'] = array();
        $ret['total_size'] = 0;
        $ret['total_tabs'] = $tabs;
        $ret['tables'] = array();

-       if ($tabs > 0)
-       {
-               while ($row = SQL_FETCHARRAY($result))
-               {
+       if ($tabs > 0) {
+               while ($row = SQL_FETCHARRAY($result)) {

                        $tot_data = $row['Data_length'];
                        $tot_idx  = $row['Index_length'];
                        $total = $tot_data + $tot_idx;
                        $tot_data = $row['Data_length'];
                        $tot_idx  = $row['Index_length'];
                        $total = $tot_data + $tot_idx;


@@ -71,11 +66,13 @@ function REPAIR_OPTIMIZE_DB()
                        $gain = round ($gain, 3);
 
                        // Repair table
                        $gain = round ($gain, 3);
 
                        // Repair table

-                       $result1 = SQL_QUERY("REPAIR TABLE ".$row['Name'], __FUNCTION__, __LINE__);
+                       $result1 = SQL_QUERY_ESC("REPAIR TABLE `%s`",
+                               array($row['Name']), __FUNCTION__, __LINE__);

                        $rep = SQL_FETCHARRAY($result1);
 
                        // Optimize table
                        $rep = SQL_FETCHARRAY($result1);
 
                        // Optimize table

-                       $result1 = SQL_QUERY("OPTIMIZE TABLE ".$row['Name'], __FUNCTION__, __LINE__);
+                       $result1 = SQL_QUERY_ESC("OPTIMIZE TABLE `%s`",
+                               array($row['Name']), __FUNCTION__, __LINE__);

                        $opt = SQL_FETCHARRAY($result1);
 
                        // Add data to array
                        $opt = SQL_FETCHARRAY($result1);
 
                        // Add data to array


@@ -90,10 +87,11 @@ function REPAIR_OPTIMIZE_DB()
        $ret['total_gain'] = $total_gain;
 
        // Insert new row
        $ret['total_gain'] = $total_gain;
 
        // Insert new row

-       $result = SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_optimize_gain` (gain) VALUES ('".$total_gain."')", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_optimize_gain` (`gain`) VALUES (%s)",
+               array($total_gain), __FUNCTION__, __LINE__);

 
        // Get total runs and total optimization count
 
        // 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__);
+       $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
        list($total_rows, $total_opti) = SQL_FETCHROW($result);
 
        // Free memory


@@ -106,5 +104,6 @@ function REPAIR_OPTIMIZE_DB()
        // Return array
        return $ret;
 }
        // Return array
        return $ret;
 }

-//
+
+// [EOF]

 ?>
 ?>