Rewrites to use filters instead of mass if() blocks

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

diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php
index 0be63a434b2ff1de75dccbd4bf06ca6ca5e8f3f3..655ee8caa584ecf5c695c9d26fca45fa169de7ec 100644 (file)
--- a/inc/filter/register_filter.php
+++ b/inc/filter/register_filter.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 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',
+       $result = SQL_QUERY('SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC',
                __FUNCTION__, __LINE__);
 
        // Walk through all entries
@@ -90,7 +90,7 @@ function FILTER_PRE_USER_REGISTRATION_GENERIC ($filterData) {
                postRequestElement('month') . '-' .
                postRequestElement('day') . '-' .
                postRequestElement('year') . getEncryptSeparator() .
-               postRequestElement('pass1') . getEncryptSeparator() .
+               postRequestElement('password1') . getEncryptSeparator() .
                detectServerName() . getEncryptSeparator() .
                detectRemoteAddr() . getEncryptSeparator() .
                detectUserAgent() . '/' .
@@ -103,10 +103,6 @@ function FILTER_PRE_USER_REGISTRATION_GENERIC ($filterData) {
        $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');
 
@@ -114,11 +110,11 @@ function FILTER_PRE_USER_REGISTRATION_GENERIC ($filterData) {
        setPostRequestElement('remote_addr', detectRemoteAddr());
 
        // Generic initialization is done
-       $filterData['init_done'] = true;
+       $filterData['init_done'] = TRUE;
 
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,true).'</pre>';
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';
        return $filterData;
 }