mailer project continued:

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

diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php
index 8b8ad026e698885a38f0ff400e9c3ed9c26e544e..0be63a434b2ff1de75dccbd4bf06ca6ca5e8f3f3 100644 (file)
--- a/inc/filter/register_filter.php
+++ b/inc/filter/register_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 *
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Run a filter for must-fillout fields
-function FILTER_REGISTER_MUST_FILLOUT ($content) {
+function FILTER_REGISTER_MUST_FILLOUT ($filterData) {
        // Get all fields for output
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        $result = SQL_QUERY('SELECT `field_name`,`field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC',
@@ -56,7 +56,7 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) {
                } // END - if
 
                // Add it
-               $content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
+               $filterData['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
        } // END - while
 
        // Free memory
@@ -64,7 +64,62 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) {
 
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $content;
+       return $filterData;
+}
+
+/**
+ * Run a filter for pre user registration - generic code (e.g. create hash,
+ * init global array elements). WARNING: This filter MUST run filter before all
+ * others, make your extension/-update depending on ext-register to avoid
+ * missing global array elements, etc.
+ *
+ * @param      $filterData             Filter data from previous filter
+ * @return     $filterData             Unchanged filter data
+ */
+function FILTER_PRE_USER_REGISTRATION_GENERIC ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
+       // Generate hash which will be inserted into confirmation mail
+       $GLOBALS['register_confirm_hash'] = generateHash(sha1(
+               // Get total confirmed, ...
+               getTotalConfirmedUser() . getEncryptSeparator() .
+               // ... unconfirmed ...
+               getTotalUnconfirmedUser() . getEncryptSeparator() .
+               // ... and locked users
+               getTotalLockedUser() . getEncryptSeparator() .
+               postRequestElement('month') . '-' .
+               postRequestElement('day') . '-' .
+               postRequestElement('year') . getEncryptSeparator() .
+               postRequestElement('pass1') . getEncryptSeparator() .
+               detectServerName() . getEncryptSeparator() .
+               detectRemoteAddr() . getEncryptSeparator() .
+               detectUserAgent() . '/' .
+               getSiteKey() . '/' .
+               getDateKey() . '/' .
+               getConfig('CACHE_BUSTER')
+       ));
+
+       // Old way with enterable two-char-code
+       $GLOBALS['register_country_row'] = '`country`';
+       $GLOBALS['register_country_data'] = substr(postRequestElement('cntry'), 0, 2);
+
+       // Init extra SQL data
+       $GLOBALS['register_sql_columns'] = '';
+       $GLOBALS['register_sql_data']    = '';
+
+       // Init "status" as for many users
+       setPostRequestElement('status', 'UNCONFIRMED');
+
+       // Add ip for later POST pings
+       setPostRequestElement('remote_addr', detectRemoteAddr());
+
+       // Generic initialization is done
+       $filterData['init_done'] = true;
+
+       // Return it
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       return $filterData;
 }
 
 // [EOF]