X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Flibs%2Ftheme_functions.php;h=1a8e05bba28b6aa0656cfaa46313db2c1d1c577d;hb=f2edf32502b2774dc17ef419a2e6a1c60e361c0a;hp=eb85579a286784abf03ecd8802fac91a85a2cb96;hpb=ba9c3172c6affc0fc5c5d8855575d03a6399bd71;p=mailer.git diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index eb85579a28..1a8e05bba2 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -1,10 +1,10 @@ $theme) { - $OUT .= " '; } // END - foreach // Remember content @@ -102,13 +106,13 @@ function generateThemeSelectionBox () { ); // Return generated selection - return LOAD_TEMPLATE('theme_select_form', true, $content); + return loadTemplate('theme_select_form', TRUE, $content); } // Get version from name -function THEME_GET_VERSION ($name) { +function getThemeVersion ($name) { // Is the extension 'theme' installed? - if (!EXT_IS_ACTIVE('theme')) { + if (!isExtensionActive('theme')) { // Then abort here return '!.!'; } // END - if @@ -117,15 +121,15 @@ function THEME_GET_VERSION ($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 - incrementConfigEntry('cache_hits'); - } elseif (GET_EXT_VERSION('cache') != '0.1.8') { + incrementStatsEntry('cache_hits'); + } 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", + $result = SQL_QUERY_ESC("SELECT `theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1", array($name), __FUNCTION__, __LINE__); // Entry found? @@ -142,22 +146,22 @@ function THEME_GET_VERSION ($name) { return $cver; } -// Checks wether a theme is found in db +// Checks whether 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 function isThemeActive ($name) { // Is the extension 'theme' installed? - if (!EXT_IS_ACTIVE('theme')) { + if (!isExtensionActive('theme')) { // Then abort here - return false; + return FALSE; } // END - if // Default is nothing active - $active = false; + $active = FALSE; // Is the cache entry there? if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) { @@ -165,10 +169,10 @@ function isThemeActive ($name) { $active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == 'Y'); // Count up - incrementConfigEntry('cache_hits'); - } elseif (GET_EXT_VERSION('cache') != '0.1.8') { + incrementStatsEntry('cache_hits'); + } 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", + $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__); // Is the theme active and installed? @@ -185,7 +189,7 @@ function isThemeActive ($name) { // Gets current human-readable theme name function getCurrentThemeName () { // Is the extension 'theme' installed? - if (!EXT_IS_ACTIVE('theme')) { + if (!isExtensionActive('theme')) { // Then abort here return 'default'; } // END - if @@ -199,10 +203,10 @@ function getCurrentThemeName () { $name = $GLOBALS['cache_array']['themes']['theme_name'][$name]; // Count up - incrementConfigEntry('cache_hits'); - } elseif (GET_EXT_VERSION('cache') != '0.1.8') { + incrementStatsEntry('cache_hits'); + } 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", + $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__); // Load theme name @@ -216,22 +220,83 @@ function getCurrentThemeName () { return $name; } -// Initialize variables -$GLOBALS['curr_theme'] = getCurrentTheme(); +// Get current theme name +function getActualTheme () { + // The default theme is 'default'... ;-) + $ret = 'default'; -// Check if new theme is selcted -if ((REQUEST_ISSET_POST('new_theme')) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) { - // Set new theme for guests - $newTheme = REQUEST_POST('new_theme'); + // Load default theme if not empty from configuration + if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) { + $ret = getConfig('default_theme'); + } // END - if - // Change to new theme - setSession('mxchange_theme', $newTheme); + if (!isMailerThemeSet()) { + // Set default theme + setMailerTheme($ret); + } elseif ((isMailerThemeSet()) && (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 + setMailerTheme(getRequestElement('theme')); + } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) { + // Set cookie from posted data + setMailerTheme(postRequestElement('theme')); + } + + // Set return value + $ret = getSession('mailer_theme'); + } else { + // Invalid design, reset cookie + setMailerTheme($ret); + } - // Remove current from array and set new - $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']); - REMOVE_INC_FROM_POOL($theme); - ADD_INC_TO_POOL(sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme)); -} // END - if + // Return theme value + return $ret; +} + +// 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; +} // [EOF] ?>