X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=e97d76721ca2f9bea56e84ff8791296f7cd38a78;hb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;hp=5adb09e7df41bbfae32fe1627f7b4594252291a4;hpb=3b85bd5030ad591b0c5cb038ca534a7b50e1b319;p=mailer.git diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index 5adb09e7df..e97d76721c 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -37,65 +37,9 @@ if (!defined('__SECURITY')) { require($INC); } -// Always make sure the session management is initialized first -require_once(PATH."inc/session.php"); - -// Get current theme name -function GET_CURR_THEME() { - global $INC_POOL, $_CONFIG, $CSS, $cacheArray; - - // The default theme is 'default'... ;-) - $ret = "default"; - - // Load default theme if not empty from configuration - if (!empty($_CONFIG['default_theme'])) $ret = $_CONFIG['default_theme']; - - if (!isSessionVariableSet('mxchange_theme')) { - // Set default theme - set_session("mxchange_theme", $ret); - } elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) { - //die("
".print_r($cacheArray['themes'], true)."
"); - // Get theme from cookie - $ret = get_session('mxchange_theme'); - - // Is it valid? - if (THEME_GET_ID($ret) == 0) { - // Fix it to default - $ret = "default"; - } // END - if - } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) && ((isBooleanConstantAndTrue('mxchange_installing')) || ($CSS == true)) && ((!empty($_GET['theme'])) || (!empty($_POST['theme'])))) { - // Prepare FQFN for checking - $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_GET['theme'])); - - // Installation mode active - if ((!empty($_GET['theme'])) && (FILE_READABLE($theme))) { - // Set cookie from URL data - set_session("mxchange_theme", $_GET['theme']); - } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) { - // Set cookie from posted data - set_session("mxchange_theme", $_POST['theme']); - } - - // Set return value - $ret = get_session('mxchange_theme'); - } else { - // Invalid design, reset cookie - set_session("mxchange_theme", $ret); - } - - // Add (maybe) found theme.php file to inclusion list - $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($ret)); - - // Try to load the requested include file - if (FILE_READABLE($theme)) $INC_POOL[] = $theme; - - // Return theme value - return $ret; -} - function THEME_SELECTION_BOX($mod, $act, $wht, $result) { // Construction URL - $FORM = URL."/modules.php?module=".$mod; + $FORM = "{!URL!}/modules.php?module=".$mod; if (!empty($act)) $FORM .= "&action=".$act; if (!empty($wht)) $FORM .= "&what=".$wht; define('__FORM_VALUE', $FORM); @@ -107,12 +51,12 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) { ); // Load all themes - while(list($theme) = SQL_FETCHROW($result)) { + while (list($theme) = SQL_FETCHROW($result)) { // Load it's theme.php file - $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme)); - if (FILE_READABLE($INC)) { + $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($theme)); + if (INCLUDE_READABLE($INC)) { // And save all data in array - require($INC); + LOAD_INC($INC); $THEMES['theme_unix'][] = $theme; $THEMES['theme_name'][] = $THEME_NAME; } // END - if @@ -124,9 +68,9 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) { // Construct selection form for the box template $OUT = ""; foreach ($THEMES['theme_unix'] as $key => $theme) { - $OUT .= " \n"; } // END - foreach // Return generated selection @@ -137,28 +81,26 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) { // Get version from name function THEME_GET_VERSION ($name) { - global $cacheArray, $_CONFIG; - // Is the extension "theme" installed? if (!EXT_IS_ACTIVE("theme")) { // Then abort here - return "0.0"; + return "!.!"; } // END - if // Default version "number" - $cver = "-.-"; + $cver = "?.?"; // Is the cache entry there? - if (isset($cacheArray['themes']['theme_ver'][$name])) { + if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) { // Get the version from cache - $cver = $cacheArray['themes']['theme_ver'][$name]; + $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name]; // Count up - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + incrementConfigEntry('cache_hits'); } elseif (GET_EXT_VERSION("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), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT theme_ver FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1", + array($name), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -174,45 +116,6 @@ function THEME_GET_VERSION ($name) { return $cver; } -// Get id from theme -function THEME_GET_ID ($name) { - global $cacheArray, $_CONFIG; - - // Is the extension "theme" installed? - if (!EXT_IS_ACTIVE("theme")) { - // Then abort here - return 0; - } // END - if - - // Default id - $id = 0; - - // Is the cache entry there? - if (isset($cacheArray['themes']['id'][$name])) { - // Get the version from cache - $id = $cacheArray['themes']['id'][$name]; - - // Count up - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } - } elseif (GET_EXT_VERSION("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), __FILE__, __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; -} - // Checks wether a theme is found in db function THEME_CHECK_EXIST ($name) { // Get theme and is it not nul? @@ -221,8 +124,6 @@ function THEME_CHECK_EXIST ($name) { // Checks if a theme is active function THEME_IS_ACTIVE ($name) { - global $cacheArray, $_CONFIG; - // Is the extension "theme" installed? if (!EXT_IS_ACTIVE("theme")) { // Then abort here @@ -233,16 +134,16 @@ function THEME_IS_ACTIVE ($name) { $active = false; // Is the cache entry there? - if (isset($cacheArray['themes']['theme_active'][$name])) { + if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) { // Get the version from cache - $active = ($cacheArray['themes']['theme_active'][$name] == "Y"); + $active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == "Y"); // Count up - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + incrementConfigEntry('cache_hits'); } elseif (GET_EXT_VERSION("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), __FILE__, __LINE__); + $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? $active = (SQL_NUMROWS($result) == 1); @@ -257,8 +158,6 @@ function THEME_IS_ACTIVE ($name) { // Gets current human-readable theme name function GET_CURR_THEME_NAME () { - global $cacheArray, $_CONFIG; - // Is the extension "theme" installed? if (!EXT_IS_ACTIVE("theme")) { // Then abort here @@ -269,16 +168,16 @@ function GET_CURR_THEME_NAME () { $name = GET_CURR_THEME(); // Is the cache entry there? - if (isset($cacheArray['themes']['theme_name'][$name])) { + if (isset($GLOBALS['cache_array']['themes']['theme_name'][$name])) { // Get the version from cache - $name = $cacheArray['themes']['theme_name'][$name]; + $name = $GLOBALS['cache_array']['themes']['theme_name'][$name]; // Count up - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + incrementConfigEntry('cache_hits'); } elseif (GET_EXT_VERSION("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), __FILE__, __LINE__); + $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 list($name) = SQL_FETCHROW($result); @@ -292,20 +191,20 @@ function GET_CURR_THEME_NAME () { } // Initialize variables -$currTheme = GET_CURR_THEME(); +$GLOBALS['curr_theme'] = GET_CURR_THEME(); // Check if new theme is selcted -if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) { +if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) { // Set new theme for guests - $newTheme = $_POST['new_theme']; + $newTheme = REQUEST_POST('new_theme'); // Change to new theme - set_session("mxchange_theme", $newTheme); + set_session('mxchange_theme', $newTheme); // Remove current from array and set new - $theme = sprintf("%stheme/%s/theme.php", PATH, $currTheme); + $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']); unset($INC_POOL[array_search($theme, $INC_POOL)]); - $INC_POOL[] = sprintf("%stheme/%s/theme.php", PATH, $newTheme); + $INC_POOL[] = sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme); } // END - if //