Naming convention applied, new API function introduced:

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 6ff22480a41ea2685d63716e9e68bf699af04520..2cb0bfd1c24522c650f57159ad2ecc6bccc43cc5 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -260,19 +260,14 @@ function doRegistration () {
        if (strlen(postRequestParameter('day'))   == 1) setPostRequestParameter('day'  , '0' . postRequestParameter('day'));
        if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', '0' . postRequestParameter('month'));
 
-       // Get total ...
-       // ... confirmed, ...
-       $confirmedUsers   = getTotalConfirmedUser();
-       // ... unconfirmed ...
-       $unconfirmedUsers = getTotalUnconfirmedUser();
-       // ... and locked users!
-       $lockedUsers      = getTotalLockedUser();
-
        // Generate hash which will be inserted into confirmation mail
        $hash = generateHash(sha1(
-               $confirmedUsers . getEncryptSeperator() .
-               $unconfirmedUsers . getEncryptSeperator() .
-               $lockedUsers . getEncryptSeperator() .
+               // Get total confirmed, ...
+               getTotalConfirmedUser() . getEncryptSeperator() .
+               // ... unconfirmed ...
+               getTotalUnconfirmedUser() . getEncryptSeperator() .
+               // ... and locked users!
+               getTotalLockedUser() . getEncryptSeperator() .
                postRequestParameter('month') . '-' .
                postRequestParameter('day') . '-' .
                postRequestParameter('year') . getEncryptSeperator() .
@@ -381,7 +376,7 @@ function doRegistration () {
        } // END - if
 
        // ... rewrite a zero referal id to the main title
-       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getMainTitle());
+       if (!isValidUserId(postRequestParameter('refid'))) setPostRequestParameter('refid', getMainTitle());
 
        // Is ZIP code set?
        if (isPostRequestParameterSet('zip')) {