X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-optimize.php;h=575825702cc0f5decbbc79c2ce2c48ef27d0997e;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=68724755f3202aaada2765cd1899c5c1eb575e00;hpb=4328a215de9cdf89587a9399ce1e87878702c7a0;p=mailer.git

diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php
index 68724755f3..575825702c 100644
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -43,57 +41,55 @@ 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();
+$content = repairOptimizeDatabase();
 
 // Output rows
 $gain_tabs = '0'; $OUT = '';
-foreach ($DATA['tables'] as $row_array) {
+foreach ($content['tables'] as $row_array) {
 	// Init variables
 	$B1 = ''; $B2 = '';
 
 	// 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(array('__', ',', '+', chr(39), ' '), array('_', '', '', '', '_'), 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
-	$content = array(
+	$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],
 	);
 
 	// Load row template and switch color
-	$OUT .= loadTemplate('admin_optimize_row', true, $content);
+	$OUT .= loadTemplate('admin_optimize_row', TRUE, $row);
 } // END - foreach
 
 // 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);
+loadTemplate('admin_optimize', FALSE, $content);
 
 // [EOF]
 ?>