A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

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

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index b4f4a742fb651b4c99c782c9f3f5f17995428c09..3010e34f08c18da8c834c7dcb58f9d6751c383aa 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,25 +37,25 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
+
 //
 // Part taken from admin optimize module of PHPNuke (http://www.phpnuke.org)
 //
 function REPAIR_OPTIMIZE_DB()
 {
-       global $MySQL;
        $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__);
+       $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".__DB_NAME, __FUNCTION__, __LINE__);
        $tabs = @SQL_NUMROWS($result);
        $ret['total_size'] = 0;
        $ret['total_tabs'] = $tabs;
+       $ret['tables'] = array();
        if ($tabs > 0)
        {
                while ($row = SQL_FETCHARRAY($result))
@@ -66,11 +71,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 +90,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