fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / libs / theme_functions.php

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index ed45abc62e3bfd0996a296399d7d2d29ab2a80fe..4c5c934c98922ae8d90f662c2dd9c319e313af44 100644 (file)
--- 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                                    *
  * -------------------------------------------------------------------- *
@@ -48,8 +48,9 @@ function generateThemeSelectionBox () {
        $mod = getModule();
 
        // Construction URL
-       $formAction = "{?URL?}/modules.php?module=" . $mod;
+       $formAction = "{%url=modules.php?module=" . $mod;
        if (!empty($what)) $formAction .= "&what=" . $what;
+       $formAction = '%}';
 
        // Initialize array
        $themesArray = array(
@@ -239,17 +240,17 @@ function getActualTheme () {
                        // Fix it to default
                        $ret = 'default';
                } // END - if
-       } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
                // Prepare filename for checking
-               $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
+               $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
 
                // Installation mode active
-               if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
+               if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
                        // Set cookie from URL data
-                       setTheme(getRequestElement('theme'));
-               } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestElement('theme'))))) {
+                       setTheme(getRequestParameter('theme'));
+               } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) {
                        // Set cookie from posted data
-                       setTheme(secureString(postRequestElement('theme')));
+                       setTheme(secureString(postRequestParameter('theme')));
                }
 
                // Set return value
@@ -306,9 +307,9 @@ function getThemeId ($name) {
 // Filter for generic handling of theme change
 function FILTER_HANDLE_THEME_CHANGE () {
        // Check if new theme is selcted
-       if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
+       if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
                // Set new theme for guests
-               $newTheme = postRequestElement('new_theme');
+               $newTheme = postRequestParameter('new_theme');
 
                // Change to new theme
                setTheme($newTheme);