X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-optimize.php;h=85a1ac0244661a631eab6053ebf886780d153bf4;hb=98b92ea5ba992a63304091fa1b57f477befffc22;hp=cbf68bdaebdfe534c45a473f3a031b2351eed7d5;hpb=cf3765c38cf0a76f396aca291f71858936e92956;p=mailer.git diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php index cbf68bdaeb..85a1ac0244 100644 --- a/inc/modules/admin/what-optimize.php +++ b/inc/modules/admin/what-optimize.php @@ -57,17 +57,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_' . 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 = ''; $B2 = ''; $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,26 +74,24 @@ foreach ($DATA['tables'] as $row_array) { 'b1' => $B1, 'b2' => $B2, 'tpl' => $row_array[0], - 'rep' => $REP, - 'opt' => $OPT, - 'sum' => translateComma($row_array[3]), - 'sav' => translateComma($row_array[4]), + '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); } // END - foreach +// Transfer main data +$content = $DATA; + // 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']); -$content['now_optimized'] = $gain_tabs; -$content['now_saved'] = translateComma($DATA['total_gain']); +// Transfer data to $content for template +$content['now_optimized'] = $gain_tabs; // Load main template loadTemplate('admin_optimize', false, $content);