X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Ftheme_functions.php;h=c114071e338b70312b23c466278f16550e91a16f;hb=ccd86939ba30aba70497c73264333f2fe4d786e8;hp=e53451b33b9bb211df4c20a7037f50cd3990aa0e;hpb=af57cc214f46f69247698f50d2eec74a8449b79c;p=mailer.git diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index e53451b33b..c114071e33 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -1,10 +1,10 @@ $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,89 @@ 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('mailer_theme')) { + // Set default theme + setTheme($ret); + } elseif ((isSessionVariableSet('mailer_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) { + //die("
".print_r($GLOBALS['cache_array']['themes'], true).""); + // Get theme from cookie + $ret = getSession('mailer_theme'); + + // Is it valid? + if ((!isExtensionActive('theme')) || (getThemeId($ret) == '0')) { + // Fix it to default + $ret = 'default'; + } // END - if + } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) { + // Prepare filename for checking + $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme')); + + // Installation mode active + if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) { + // Set cookie from URL data + setTheme(getRequestElement('theme')); + } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) { + // Set cookie from posted data + setTheme(postRequestElement('theme')); + } + + // Set return value + $ret = getSession('mailer_theme'); + } else { + // Invalid design, reset cookie + setTheme($ret); + } + + // Return theme value + return $ret; +} + +/** + * 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('mailer_theme', $newTheme); +} - // Change to new theme - setTheme($newTheme); +// Get id from theme +function getThemeId ($name) { + // Default id + $id = '0'; - // Remove current from array - removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme())); + // 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]; - // Add new theme - addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme)); -} // END - if + // 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; +} // [EOF] ?>