X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_edit.php;h=3bcde2df823cb349fb75171518fd86f3e4c91889;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=04b637aa35a336ac121f96c1e65dde0e821e221e;hpb=1cbf289d059637cb2707b0f5384637f081ad6402;p=mailer.git diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index 04b637aa35..3bcde2df82 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.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__); if (!isExtensionActive('theme')) { loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme')); @@ -51,29 +49,29 @@ if (!isExtensionActive('theme')) { } // END - if // Check for selected themes -if (countPostSelection() > 0) { +if (ifPostContainsSelections()) { $OUT = ''; foreach (postRequestParameter('sel') as $id => $sel) { $sql = ''; // Shall I de-/activate or delete themes? - if (isPostRequestParameterSet(('status'))) { + if (isPostRequestParameterSet('status')) { // Change status if (postRequestParameter('active', $id) == 'Y') { - $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET theme_active='N' WHERE `id`=" . bigintval($id) . " LIMIT 1"; + $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='N' WHERE `id`=%s LIMIT 1"; } else { - $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET theme_active='Y' WHERE `id`=" . bigintval($id) . " LIMIT 1"; + $sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='Y' WHERE `id`=%s LIMIT 1"; } - $OUT = getMessage('ADMIN_THEMES_UPDATED'); - } elseif (isFormSent('del')) { + $OUT = '{--ADMIN_THEMES_UPDATED--}'; + } elseif (isFormSent('delete')) { // Delete themes - $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`=" . bigintval($id) . " LIMIT 1"; - $OUT = getMessage('ADMIN_THEMES_DELETED'); + $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`=%s LIMIT 1"; + $OUT = '{--ADMIN_THEMES_DELETED--}'; } // Run SQL command? if (!empty($sql)) { // Run it - $result = SQL_QUERY($sql, __FILE__, __LINE__); + $result = SQL_QUERY_ESC($sql, array(bigintval($id)), __FILE__, __LINE__); // Rebuild cache rebuildCache('themes', 'them'); @@ -81,7 +79,7 @@ if (countPostSelection() > 0) { } // END - foreach // Output generated? - if (empty($OUT)) $OUT = getMessage('ADMIN_THEME_NO_OUTPUT'); + if (empty($OUT)) $OUT = '{--ADMIN_THEME_NO_OUTPUT--}'; } elseif (isGetRequestParameterSet('default_theme')) { // Escape string from input $postData['default_theme'] = getRequestParameter('default_theme'); @@ -106,16 +104,14 @@ $result = SQL_QUERY("SELECT `id`, `theme_path`, `theme_active`, - `theme_ver`, + `theme_ver` AS `theme_version`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `theme_path` ASC", __FILE__, __LINE__); -if (SQL_NUMROWS($result) > 0) { - // Init color - $SW = 2; +if (!SQL_HASZERONUMS($result)) { while ($content = SQL_FETCHARRAY($result)) { // Construct IFN $inc = sprintf("theme/%s/theme.php", $content['theme_path']); @@ -123,42 +119,33 @@ if (SQL_NUMROWS($result) > 0) { // Load theme in test mode loadInclude($inc); + // Copy data from theme to content + $content['theme_url'] = $GLOBALS['theme_data']['url']; + // Is the loaded theme name != current theme name? - $LINK = $content['theme_path']; - if ($content['theme_path'] != getCurrentTheme()) $LINK = '' . $content['theme_path'] . ''; + $content['link'] = $content['theme_path']; + if ($content['theme_path'] != getCurrentTheme()) $content['link'] = '' . $content['theme_path'] . ''; // Prepare data for the row template - $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'active' => $content['theme_active'], - 'link' => $LINK, - 'name' => $content['theme_name'], - 'is_act' => translateYesNo($content['theme_active']), - 'email' => '' . $GLOBALS['theme_data']['author'] . ''; // Load row template and switch color - $OUT .= loadTemplate('admin_theme_edit_row', true, $content); - $SW = 3 - $SW; + $OUT .= loadTemplate('admin_edit_theme_row', true, $content); } // END - while // Free memory SQL_FREERESULT($result); } else { // No themes found??? - $OUT .= "