X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=01339ea1d06165f5cd149570d664086bdc6f0d05;hb=c9b17a86f4d62b50b8b1fbe6f9d88e6092430526;hp=3b281e2cc2317323098b4f5b4fd0edcf8cf693c4;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index 3b281e2cc2..01339ea1d0 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 * * -------------------------------------------------------------------- * @@ -14,10 +14,9 @@ * $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 * * * * This program is free software; you can redistribute it and/or modify * @@ -39,20 +38,18 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Create a selection box with installed and activated themes or all if admin function generateThemeSelectionBox () { // Init variables and fill them if set - $what = ''; + $what = getWhat(); $mod = getModule(); - if (isWhatSet()) { - $what = getWhat(); - } // END - if // 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( @@ -67,7 +64,13 @@ function generateThemeSelectionBox () { if (isAdmin()) $add = ''; // Select all themes we want - $result = SQL_QUERY("SELECT `theme_path`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes`".$add." ORDER BY `theme_name` ASC", __FILE__, __LINE__); + $result = SQL_QUERY('SELECT + `theme_path`, `theme_name` +FROM + `{?_MYSQL_PREFIX?}_themes` +' . $add . ' +ORDER BY + `theme_name` ASC', __FUNCTION__, __LINE__); // Load all themes while ($content = SQL_FETCHARRAY($result)) { @@ -87,11 +90,12 @@ function generateThemeSelectionBox () { 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 @@ -116,13 +120,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__); @@ -144,7 +148,7 @@ function getThemeVersion ($name) { // Checks wether a theme is found in db function ifThemeExists ($name) { // Get theme and is it not nul? - return (getThemeId($name) > 0); + return ((isExtensionActive('theme')) && (getThemeId($name) > 0)); } // Checks if a theme is active @@ -165,7 +169,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__); @@ -199,7 +203,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__); @@ -215,21 +219,126 @@ function getCurrentThemeName () { return $name; } -// @TODO Move this code block into a filter and register it with 'init' -// Check if new theme is selcted -if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) { - // Set new theme for guests - $newTheme = postRequestElement('new_theme'); +// Get current theme name +function getActualTheme () { + // The default theme is 'default'... ;-) + $ret = 'default'; + + // Load default theme if not empty from configuration + if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme'); + + if (!isSessionVariableSet('mxchange_theme')) { + // Set default theme + setTheme($ret); + } elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) { + //die("
".print_r($GLOBALS['cache_array']['themes'], true)."
"); + // Get theme from cookie + $ret = getSession('mxchange_theme'); + + // Is it valid? + if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) { + // Fix it to default + $ret = 'default'; + } // END - if + } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) { + // Prepare filename for checking + $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme')); + + // Installation mode active + if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) { + // Set cookie from URL data + setTheme(getRequestParameter('theme')); + } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) { + // Set cookie from posted data + setTheme(secureString(postRequestParameter('theme'))); + } + + // Set return value + $ret = getSession('mxchange_theme'); + } else { + // Invalid design, reset cookie + setTheme($ret); + } - // Change to new theme - setTheme($newTheme); + // Return theme value + return $ret; +} - // Remove current from array - removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme())); +/** + * Setter for theme in session (This setter does return the success of + * setSession() which is required e.g. for destroySponsorSession(). + */ +function setTheme ($newTheme) { + return setSession('mxchange_theme', $newTheme); +} - // Add new theme - addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme)); -} // END - if +// Get id from theme +function getThemeId ($name) { + // Default id + $id = '0'; + + // Is the cache entry there? + if (isset($GLOBALS['cache_array']['themes']['id'][$name])) { + // Get the version from cache + $id = $GLOBALS['cache_array']['themes']['id'][$name]; + + // Count up + incrementStatsEntry('cache_hits'); + } elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) { + // Check if current theme is already imported or not + $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1", + array($name), __FUNCTION__, __LINE__); + + // Entry found? + if (SQL_NUMROWS($result) == 1) { + // Fetch data + list($id) = SQL_FETCHROW($result); + } // END - if + + // Free result + SQL_FREERESULT($result); + } + + // Return id + return $id; +} + +//----------------------------------------------------------------------------- +// Only filter functions +//----------------------------------------------------------------------------- + +// Filter for generic handling of theme change +function FILTER_HANDLE_THEME_CHANGE () { + // Check if new theme is selcted + if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) { + // Set new theme for guests + $newTheme = postRequestParameter('new_theme'); + + // Change to new theme + setTheme($newTheme); + + // Remove current from array + removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme())); + + // Add new theme + addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme)); + + // Redirect to same URL + redirectToRequestUri(); + } // END - if +} + +// Filter for settings theme from user profile, must be executed only if FILTER_FETCH_USER_DATA() ran before +function FILTER_SET_USERS_THEME () { + // Is the user data valid? + if (!isMember()) { + // Do only run for logged in members + debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.'); + } // END - if + + // Change to new theme + setTheme(getUserData('curr_theme')); +} // [EOF] ?>