Code style changed, ext-user continued:

[mailer.git] / inc / filter / theme_filter.php

diff --git a/inc/filter/theme_filter.php b/inc/filter/theme_filter.php
index 5cb385c9949fca852d83278af6635a6d136df1f8..742f6b08c8def5eba2e709fac91d0c9a742010f3 100644 (file)
--- a/inc/filter/theme_filter.php
+++ b/inc/filter/theme_filter.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,14 +41,16 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Filter for generic handling of theme change
-function FILTER_HANDLE_THEME_CHANGE () {
+function FILTER_HANDLE_THEME_CHANGE ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
        // Check if new theme is selcted
-       if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
+       if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
                // Set new theme for guests
-               $newTheme = postRequestParameter('new_theme');
+               $newTheme = postRequestElement('new_theme');
 
                // Change to new theme
-               setTheme($newTheme);
+               setMailerTheme($newTheme);
 
                // Remove current from array
                removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
@@ -59,18 +61,42 @@ function FILTER_HANDLE_THEME_CHANGE () {
                // Redirect to same URL
                redirectToRequestUri();
        } // END - if
+
+       // Return data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       return $filterData;
 }
 
 // Filter for settings theme from user profile, must be executed only if FILTER_FETCH_USER_DATA() ran before
-function FILTER_SET_USERS_THEME () {
+function FILTER_SET_USERS_THEME ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
        // 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.');
+               reportBug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
        } // END - if
 
        // Change to new theme
-       setTheme(getUserData('curr_theme'));
+       setMailerTheme(getUserData('curr_theme'));
+
+       // Return data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       return $filterData;
+}
+
+// Filter for adding SQL columns on user registration about current theme
+function FILTER_THEME_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
+       // Okay, add design here
+       addExtraRegistrationColumns(', `curr_theme`');
+       addExtraRegistrationData(", '{%%pipe,getCurrentTheme%%}'");
+
+       // Return filter data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';
+       return $filterData;
 }
 
 // [EOF]