Huge rewrite of default parameters, ext-network continued:

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

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index cefbd46fa43f3eb5bac8f5f662cce87ab056b11d..1b22cbb9b7c73a7ca0f8199cfb48598770df1644 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Optimize-Funktionen                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,28 +38,22 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
+       die();
 }
 
-//
 // Part taken from admin optimize module of PHPNuke (http://www.phpnuke.org)
-//
-function REPAIR_OPTIMIZE_DB()
-{
-       global $MySQL;
+function repairOptimizeDatabase () {
        $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 ".$MySQL['dbase'], __FILE__, __LINE__);
-       $tabs = @SQL_NUMROWS($result);
-       $ret['total_size'] = 0;
+       $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);
+       $ret['total_size'] = '0';
        $ret['total_tabs'] = $tabs;
-       if ($tabs > 0)
-       {
-               while ($row = SQL_FETCHARRAY($result))
-               {
+       $ret['tables'] = array();
+       if ($tabs > 0) {
+               while ($row = SQL_FETCHARRAY($result)) {
                        $tot_data = $row['Data_length'];
                        $tot_idx  = $row['Index_length'];
                        $total = $tot_data + $tot_idx;
@@ -66,11 +65,13 @@ function REPAIR_OPTIMIZE_DB()
                        $gain = round ($gain, 3);
 
                        // Repair table
-                       $result1 = SQL_QUERY("REPAIR TABLE ".$row['Name'], __FILE__, __LINE__);
+                       $result1 = SQL_QUERY_ESC("REPAIR TABLE `%s`",
+                               array($row['Name']), __FUNCTION__, __LINE__);
                        $rep = SQL_FETCHARRAY($result1);
 
                        // Optimize table
-                       $result1 = SQL_QUERY("OPTIMIZE TABLE ".$row['Name'], __FILE__, __LINE__);
+                       $result1 = SQL_QUERY_ESC("OPTIMIZE TABLE `%s`",
+                               array($row['Name']), __FUNCTION__, __LINE__);
                        $opt = SQL_FETCHARRAY($result1);
 
                        // Add data to array
@@ -85,10 +86,11 @@ 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_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_optimize_gain` (`gain`) VALUES (%s)",
+               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", __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
@@ -101,5 +103,6 @@ function REPAIR_OPTIMIZE_DB()
        // Return array
        return $ret;
 }
-//
+
+// [EOF]
 ?>