X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=b9e61dbe09ee0b45629ce405b43e788bd1433230;hb=91d298e5ec7193849a92bd4902abc02ffab8305b;hp=ed45abc62e3bfd0996a296399d7d2d29ab2a80fe;hpb=7cb246c51e8634735aaf24e546bcbc46c5ce3833;p=mailer.git diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index ed45abc62e..b9e61dbe09 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -4,7 +4,7 @@ * =================== Last change: 12/13/2004 * * * * -------------------------------------------------------------------- * - * File : theme-manager.php * + * File : theme manager.php * * -------------------------------------------------------------------- * * Short description : Theme manager * * -------------------------------------------------------------------- * @@ -18,6 +18,7 @@ * 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 * * * * This program is free software; you can redistribute it and/or modify * @@ -39,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Create a selection box with installed and activated themes or all if admin function generateThemeSelectionBox () { @@ -48,8 +49,9 @@ function generateThemeSelectionBox () { $mod = getModule(); // Construction URL - $formAction = "{?URL?}/modules.php?module=" . $mod; - if (!empty($what)) $formAction .= "&what=" . $what; + $formAction = '{%url=modules.php?module='. $mod; + if (!empty($what)) $formAction .= '&what=' . $what; + $formAction .= '%}'; // Initialize array $themesArray = array( @@ -64,13 +66,13 @@ function generateThemeSelectionBox () { if (isAdmin()) $add = ''; // Select all themes we want - $result = SQL_QUERY("SELECT + $result = SQL_QUERY('SELECT `theme_path`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` -".$add." +' . $add . ' ORDER BY - `theme_name` ASC", __FILE__, __LINE__); + `theme_name` ASC', __FUNCTION__, __LINE__); // Load all themes while ($content = SQL_FETCHARRAY($result)) { @@ -90,11 +92,12 @@ ORDER BY SQL_FREERESULT($result); // Construct selection form for the box template + // @TODO Can't this be rewritten to an API function? $OUT = ''; foreach ($themesArray['theme_unix'] as $key => $theme) { - $OUT .= " '; } // END - foreach // Remember content @@ -119,13 +122,13 @@ function getThemeVersion ($name) { $cver = '?.?'; // Is the cache entry there? - if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) { + if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) { // Get the version from cache - $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name]; + $cver = $GLOBALS['cache_array']['themes']['theme_version'][$name]; // Count up incrementStatsEntry('cache_hits'); - } elseif (getExtensionVersion('cache') != '0.1.8') { + } elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) { // Load version from database $result = SQL_QUERY_ESC("SELECT `theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1", array($name), __FUNCTION__, __LINE__); @@ -168,7 +171,7 @@ function isThemeActive ($name) { // Count up incrementStatsEntry('cache_hits'); - } elseif (getExtensionVersion('cache') != '0.1.8') { + } elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) { // Check if current theme is already imported or not $result = SQL_QUERY_ESC("SELECT `theme_active` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1", array($name), __FUNCTION__, __LINE__); @@ -202,7 +205,7 @@ function getCurrentThemeName () { // Count up incrementStatsEntry('cache_hits'); - } elseif (getExtensionVersion('cache') != '0.1.8') { + } elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) { // Check if current theme is already imported or not $result = SQL_QUERY_ESC("SELECT `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1", array($name), __FUNCTION__, __LINE__); @@ -239,17 +242,17 @@ function getActualTheme () { // Fix it to default $ret = 'default'; } // END - if - } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) { + } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) { // Prepare filename for checking - $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme')); + $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme')); // Installation mode active - if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) { + if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) { // Set cookie from URL data - setTheme(getRequestElement('theme')); - } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestElement('theme'))))) { + setTheme(getRequestParameter('theme')); + } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) { // Set cookie from posted data - setTheme(secureString(postRequestElement('theme'))); + setTheme(secureString(postRequestParameter('theme'))); } // Set return value @@ -299,16 +302,16 @@ function getThemeId ($name) { return $id; } -/////////////////////////////////////////////////////////////////////////////// +//----------------------------------------------------------------------------- // Only filter functions -/////////////////////////////////////////////////////////////////////////////// +//----------------------------------------------------------------------------- // Filter for generic handling of theme change function FILTER_HANDLE_THEME_CHANGE () { // Check if new theme is selcted - if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) { + if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) { // Set new theme for guests - $newTheme = postRequestElement('new_theme'); + $newTheme = postRequestParameter('new_theme'); // Change to new theme setTheme($newTheme); @@ -318,6 +321,9 @@ function FILTER_HANDLE_THEME_CHANGE () { // Add new theme addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme)); + + // Redirect to same URL + redirectToRequestUri(); } // END - if } @@ -326,7 +332,7 @@ function FILTER_SET_USERS_THEME () { // Is the user data valid? if (!isMember()) { // Do only run for logged in members - debug_report_bug('Please only run this filter for logged in users.'); + debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.'); } // END - if // Change to new theme