Added update_year.sh (still not fully flexible) and updated all years with it.

[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 ff266c741ca34543d5c1401f878e1c7d019f0424..2bbdfadadc2c6c6075121cfb1a8894df6fc1e86a 100644 (file)
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,11 +44,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Optimize and repair database and return the result as a multi-dimensional array
-$DATA = repairOptimizeDatabase();
+$content = repairOptimizeDatabase();
 
 // Output rows
 $gain_tabs = '0'; $OUT = '';
-foreach ($DATA['tables'] as $row_array) {
+foreach ($content['tables'] as $row_array) {
        // Init variables
        $B1 = ''; $B2 = '';
 
@@ -56,19 +56,19 @@ foreach ($DATA['tables'] as $row_array) {
        if (empty($row_array[1])) $row_array[1] = 'NONE';
 
        // Get repair/optimization status
-       $repairStatus = '{--ADMIN_OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
+       $repairStatus = '{--ADMIN_OPTIMIZE_STATUS_' . str_replace(array('__', ',', '+', chr(39), ' '), array('_', '', '', '', '_'), strtoupper($row_array[1])) . '--}';
        $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_UNSUPPORTED--}';
 
        if ($row_array[4] > 0) {
                $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_OPTIMIZED--}';
                $B1 = '<strong>'; $B2 = '<strong>';
                $gain_tabs++;
-       } elseif (count(explode(' ', $row_array[2])) == 0) {
+       } elseif (!isFilledArray(explode(' ', $row_array[2]))) {
                $optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
        }
 
        // Prepare data for the row template
-       $content = array(
+       $row = array(
                'b1'  => $B1,
                'b2'  => $B2,
                'tpl' => $row_array[0],
@@ -79,12 +79,9 @@ foreach ($DATA['tables'] as $row_array) {
        );
 
        // Load row template and switch color
-       $OUT .= loadTemplate('admin_optimize_row', true, $content);
+       $OUT .= loadTemplate('admin_optimize_row', TRUE, $row);
 } // END - foreach
 
-// Transfer main data
-$content = $DATA;
-
 // Remember rows
 $content['rows'] = $OUT;
 
@@ -92,7 +89,7 @@ $content['rows'] = $OUT;
 $content['now_optimized'] = $gain_tabs;
 
 // Load main template
-loadTemplate('admin_optimize', false, $content);
+loadTemplate('admin_optimize', FALSE, $content);
 
 // [EOF]
 ?>