More cached wrapper functions introduced

[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 cfdd26f694f6dc7317a8600f3a09b6f311d602cd..2f73c933e6c23f1b352439f277155cd11bb81515 100644 (file)
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -49,7 +49,7 @@ addMenuDescription('admin', __FILE__);
 $DATA = repairOptimizeDatabase();
 
 // Output rows
-$SW = 2; $gain_tabs = '0'; $OUT = '';
+$gain_tabs = '0'; $OUT = '';
 foreach ($DATA['tables'] as $row_array) {
        // Init variables
        $B1 = ''; $B2 = '';
@@ -72,31 +72,25 @@ foreach ($DATA['tables'] as $row_array) {
 
        // Prepare data for the row template
        $content = array(
-               'sw'  => $SW,
                'b1'  => $B1,
                'b2'  => $B2,
                'tpl' => $row_array[0],
                'rep' => $REP,
                'opt' => $OPT,
-               'sum' => translateComma($row_array[3]),
-               'sav' => translateComma($row_array[4]),
+               'sum' => $row_array[3],
+               'sav' => $row_array[4],
        );
 
        // Load row template and switch color
        $OUT .= loadTemplate('admin_optimize_row', true, $content);
-       $SW = 3 - $SW;
 } // END - foreach
 
 // Remember rows
 $content['rows'] = $OUT;
 
-// Prepare data for the template
-$content['total_tabs']      = $DATA['total_tabs'];
-$content['total_size']      = translateComma($DATA['total_size']);
-$content['total_rows']      = $DATA['total_rows'];
-$content['total_optimized'] = translateComma($DATA['total_opti']);
+// Transfer data to $content for template
+$content = merge_array($content, $DATA);
 $content['now_optimized']   = $gain_tabs;
-$content['now_saved']       = translateComma($DATA['total_gain']);
 
 // Load main template
 loadTemplate('admin_optimize', false, $content);