mailer project continued:

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

diff --git a/inc/filter/theme_filter.php b/inc/filter/theme_filter.php
index f531016da15cc0ca309596a88ccaa497778e6718..37b6bc5bc847b93cb50df6e154cf90f21dae273b 100644 (file)
--- a/inc/filter/theme_filter.php
+++ b/inc/filter/theme_filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -42,14 +42,15 @@ if (!defined('__SECURITY')) {
 
 // Filter for generic handling of theme change
 function FILTER_HANDLE_THEME_CHANGE ($filterData) {
-       // Check if new theme is selcted
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
+       // Check if new theme is selcted
        if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
                // Set new theme for guests
                $newTheme = postRequestElement('new_theme');
 
                // Change to new theme
-               setTheme($newTheme);
+               setMailerTheme($newTheme);
 
                // Remove current from array
                removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
@@ -68,20 +69,35 @@ function FILTER_HANDLE_THEME_CHANGE ($filterData) {
 
 // Filter for settings theme from user profile, must be executed only if FILTER_FETCH_USER_DATA() ran before
 function FILTER_SET_USERS_THEME ($filterData) {
-       // Is the user data valid?
        //* 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
+       $GLOBALS['register_sql_columns'] .= ', `curr_theme`';
+       $GLOBALS['register_sql_data']    .= ", '{%%pipe,getCurrentTheme%%}'";
+
+       // Return filter data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       return $filterData;
+}
+
 // [EOF]
 ?>