Renamed function so it might be more understandable

[mailer.git] / inc / modules / admin / what-optimize.php

diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php
index 68724755f3202aaada2765cd1899c5c1eb575e00..fe6872cb8dfbcf215fce5a6d19f702223f80665c 100644 (file)
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -14,8 +14,6 @@
  * $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 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Optimize and repair database and return the result as a multi-dimensional array
 $DATA = repairOptimizeDatabase();
@@ -57,17 +55,16 @@ foreach ($DATA['tables'] as $row_array) {
        // Fixes a bug which causes a parser error on eval'd code
        if (empty($row_array[1])) $row_array[1] = 'NONE';
 
-       // Get optimization status
-       $REP = '{--OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
-
-       $OPT = '{--OPTIMIZE_STATUS_UNSUPPORTED--}';
+       // Get repair/optimization status
+       $repairStatus = '{--ADMIN_OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
+       $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_UNSUPPORTED--}';
 
        if ($row_array[4] > 0) {
-               $OPT = '{--OPTIMIZE_STATUS_OPTIMIZED--}';
+               $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_OPTIMIZED--}';
                $B1 = '<strong>'; $B2 = '<strong>';
                $gain_tabs++;
        } elseif (count(explode(' ', $row_array[2])) == 0) {
-               $OPT = '{--OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
+               $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
        }
 
        // Prepare data for the row template
@@ -75,8 +72,8 @@ foreach ($DATA['tables'] as $row_array) {
                'b1'  => $B1,
                'b2'  => $B2,
                'tpl' => $row_array[0],
-               'rep' => $REP,
-               'opt' => $OPT,
+               'rep' => $repairStatus,
+               'opt' => $optimizeStatus,
                'sum' => $row_array[3],
                'sav' => $row_array[4],
        );
@@ -85,12 +82,14 @@ foreach ($DATA['tables'] as $row_array) {
        $OUT .= loadTemplate('admin_optimize_row', true, $content);
 } // END - foreach
 
+// Transfer main data
+$content = $DATA;
+
 // Remember rows
 $content['rows'] = $OUT;
 
 // Transfer data to $content for template
-$content = merge_array($content, $DATA);
-$content['now_optimized']   = $gain_tabs;
+$content['now_optimized'] = $gain_tabs;
 
 // Load main template
 loadTemplate('admin_optimize', false, $content);