X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Ftheme_functions.php;h=c114071e338b70312b23c466278f16550e91a16f;hb=ccd86939ba30aba70497c73264333f2fe4d786e8;hp=9d97d505c302a67c1daaf87fe5d906d79f121f1f;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index 9d97d505c3..c114071e33 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.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 - 2011 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 * @@ -40,7 +38,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 () { @@ -49,9 +47,9 @@ function generateThemeSelectionBox () { $mod = getModule(); // Construction URL - $formAction = "{%url=modules.php?module=" . $mod; - if (!empty($what)) $formAction .= "&what=" . $what; - $formAction = '%}'; + $formAction = '{%url=modules.php?module='. $mod; + if (!empty($what)) $formAction .= '&what=' . $what; + $formAction .= '%}'; // Initialize array $themesArray = array( @@ -66,13 +64,13 @@ function generateThemeSelectionBox () { if (isAdmin()) $add = ''; // Select all themes we want - $result = SQL_QUERY("SELECT - `theme_path`, `theme_name` + $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)) { @@ -92,11 +90,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 @@ -121,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__); @@ -170,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__); @@ -204,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__); @@ -228,34 +227,34 @@ function getActualTheme () { // Load default theme if not empty from configuration if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme'); - if (!isSessionVariableSet('mxchange_theme')) { + if (!isSessionVariableSet('mailer_theme')) { // Set default theme setTheme($ret); - } elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) { + } elseif ((isSessionVariableSet('mailer_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) { //die("
".print_r($GLOBALS['cache_array']['themes'], true).""); // Get theme from cookie - $ret = getSession('mxchange_theme'); + $ret = getSession('mailer_theme'); // Is it valid? if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) { // Fix it to default $ret = 'default'; } // END - if - } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) { + } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) { // Prepare filename for checking - $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme')); + $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme')); // Installation mode active - if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) { + if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) { // Set cookie from URL data - setTheme(getRequestParameter('theme')); - } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) { + setTheme(getRequestElement('theme')); + } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) { // Set cookie from posted data - setTheme(secureString(postRequestParameter('theme'))); + setTheme(postRequestElement('theme')); } // Set return value - $ret = getSession('mxchange_theme'); + $ret = getSession('mailer_theme'); } else { // Invalid design, reset cookie setTheme($ret); @@ -265,9 +264,12 @@ function getActualTheme () { return $ret; } -// Setter for theme in session +/** + * Setter for theme in session (This setter does return the success of + * setSession() which is required e.g. for destroySponsorSession(). + */ function setTheme ($newTheme) { - setSession('mxchange_theme', $newTheme); + return setSession('mailer_theme', $newTheme); } // Get id from theme @@ -301,39 +303,5 @@ 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 ((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)); - } // 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('Please only run this filter for logged in users.'); - } // END - if - - // Change to new theme - setTheme(getUserData('curr_theme')); -} - // [EOF] ?>