Failed SQL queries are now also reported in bug mails, SQL queries improved (more...

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index e39f97f3f72f926cf4a239555acbb01c583c3897..2fb7de3b7f8a9b8d1a36c7c8bd45c2767fed3609 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +40,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 () {
@@ -48,9 +49,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(
@@ -240,17 +241,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
@@ -307,9 +308,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);
@@ -319,6 +320,9 @@ function FILTER_HANDLE_THEME_CHANGE () {
 
                // Add new theme
                addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
+
+               // Redirect to same URL
+               redirectToRequestUri();
        } // END - if
 }