A lot calls saved, expression language rewritten:

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 89539ff5461a68658e4522d65f5888a0b97d1303..e34ccd2b503ccd57c68a7184df3e46d6c15e1021 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -274,14 +274,14 @@ function doRegistration () {
 
        // Generate hash which will be inserted into confirmation mail
        $hash = generateHash(sha1(
-               $confirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
-               $unconfirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
-               $lockedUsers . getConfig('ENCRYPT_SEPERATOR') .
+               $confirmedUsers . getEncryptSeperator() .
+               $unconfirmedUsers . getEncryptSeperator() .
+               $lockedUsers . getEncryptSeperator() .
                postRequestParameter('month') . '-' .
                postRequestParameter('day') . '-' .
-               postRequestParameter('year') . getConfig('ENCRYPT_SEPERATOR') .
-               detectServerName() . getConfig('ENCRYPT_SEPERATOR') .
-               detectRemoteAddr() . getConfig('ENCRYPT_SEPERATOR') .
+               postRequestParameter('year') . getEncryptSeperator() .
+               detectServerName() . getEncryptSeperator() .
+               detectRemoteAddr() . getEncryptSeperator() .
                detectUserAgent() . '/' .
                getConfig('SITE_KEY') . '/' .
                getConfig('DATE_KEY') . '/' .
@@ -409,7 +409,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // ... rewrite a zero referal id to the main title
-       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getConfig('MAIN_TITLE'));
+       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getMainTitle());
 
        // Is ZIP code set?
        if (isPostRequestParameterSet('zip')) {
@@ -418,7 +418,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                $content = array(
                        'hash'    => $hash,
                        'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
+                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
                        'surname' => SQL_ESCAPE(postRequestParameter('surname')),
                        'family'  => SQL_ESCAPE(postRequestParameter('family')),
                        'email'   => SQL_ESCAPE(postRequestParameter('email')),
@@ -434,7 +434,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                $content = array(
                        'hash'    => $hash,
                        'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
+                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
                        'surname' => SQL_ESCAPE(postRequestParameter('surname')),
                        'family'  => SQL_ESCAPE(postRequestParameter('family')),
                        'email'   => SQL_ESCAPE(postRequestParameter('email')),