Moved all FILTER_FOO() filter functions to an own include directory:

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 895ef86bf2798cc96181b411beb4c58c6582b122..6ee3384fd709d32502068dd8e68ad13d65ce48e7 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -66,13 +64,13 @@ function generateThemeSelectionBox () {
        if (isAdmin()) $add = '';
 
        // Select all themes we want
-       $result = SQL_QUERY("SELECT
+       $result = SQL_QUERY('SELECT
        `theme_path`, `theme_name`
 FROM
        `{?_MYSQL_PREFIX?}_themes`
-".$add."
+' . $add . '
 ORDER BY
-       `theme_name` ASC", __FUNCTION__, __LINE__);
+       `theme_name` ASC', __FUNCTION__, __LINE__);
 
        // Load all themes
        while ($content = SQL_FETCHARRAY($result)) {
@@ -242,7 +240,7 @@ function getActualTheme () {
                        // Fix it to default
                        $ret = 'default';
                } // END - if
-       } elseif ((!isInstalled()) && ((isInstalling()) || (getScriptOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
                // Prepare filename for checking
                $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
 
@@ -266,9 +264,12 @@ function getActualTheme () {
        return $ret;
 }
 
-// Setter for theme in session
+/**
+ * Setter for theme in session (This setter does return the success of
+ * setSession() which is required e.g. for destroySponsorSession().
+ */
 function setTheme ($newTheme) {
-       setSession('mxchange_theme', $newTheme);
+       return setSession('mxchange_theme', $newTheme);
 }
 
 // Get id from theme
@@ -302,42 +303,5 @@ function getThemeId ($name) {
        return $id;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-//                              Only filter functions
-///////////////////////////////////////////////////////////////////////////////
-
-// Filter for generic handling of theme change
-function FILTER_HANDLE_THEME_CHANGE () {
-       // Check if new theme is selcted
-       if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
-               // Set new theme for guests
-               $newTheme = postRequestParameter('new_theme');
-
-               // Change to new theme
-               setTheme($newTheme);
-
-               // Remove current from array
-               removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
-
-               // Add new theme
-               addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
-
-               // Redirect to same URL
-               redirectToRequestUri();
-       } // END - if
-}
-
-// Filter for settings theme from user profile, must be executed only if FILTER_FETCH_USER_DATA() ran before
-function FILTER_SET_USERS_THEME () {
-       // Is the user data valid?
-       if (!isMember()) {
-               // Do only run for logged in members
-               debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
-       } // END - if
-
-       // Change to new theme
-       setTheme(getUserData('curr_theme'));
-}
-
 // [EOF]
 ?>