Removed comment introduced by Profi-Concept, this comment should fine (in a much...

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 97c6216650a967671876b9d477c9931ee1013c01..2eac520fe61802cff03aab275fc57ad9ef7d6aac 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function ifRequiredRegisterFieldsAreSet (&$array) {
@@ -126,9 +124,9 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 // Outputs a 'failed message'
 function registerOutputFailedMessage ($messageId, $extra='') {
        if (empty($messageId)) {
-               outputHtml('<div class="register_failed">' . $extra . '</div>');
+               outputHtml('<div class="notice">' . $extra . '</div>');
        } else {
-               outputHtml('<div class="register_failed">{--' . $messageId . '--}' . $extra . '</div>');
+               outputHtml('<div class="notice">{--' . $messageId . '--}' . $extra . '</div>');
        }
 }
 
@@ -142,7 +140,7 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) {
        while ($row = SQL_FETCHARRAY($result)) {
                // Must the user fill out this element?
                $value = '';
-               if ($row['field_required'] == 'Y') $value = '<span class="guest_failed">(*)</span>';
+               if ($row['field_required'] == 'Y') $value = '<span class="notice">(*)</span>';
 
                // Add it
                $content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
@@ -260,19 +258,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() .
@@ -319,10 +312,7 @@ function doRegistration () {
                $countryData = bigintval(postRequestParameter('country_code'));
        } // END - if
 
-       //////////////////////////////
-       // Create user's account... //
-       //////////////////////////////
-       //
+       // Create user's account...
        SQL_QUERY_ESC("INSERT INTO
        `{?_MYSQL_PREFIX?}_user_data`
 (`gender`, `surname`, `family`, `street_nr`,%s, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `password`, `max_mails`, `receive_mails`, `refid`, `status`, `user_hash`, `REMOTE_ADDR`, `joined`, `last_update`".$GLOBALS['register_sql_columns'].")
@@ -384,41 +374,41 @@ 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')) {
                // Prepare data array for the email template
                // Start with the gender...
                $content = array(
-                       'hash'    => $hash,
-                       'userid'  => $userid,
-                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
-                       'surname' => SQL_ESCAPE(postRequestParameter('surname')),
-                       'family'  => SQL_ESCAPE(postRequestParameter('family')),
-                       'email'   => SQL_ESCAPE(postRequestParameter('email')),
-                       'street'  => SQL_ESCAPE(postRequestParameter('street_nr')),
-                       'city'    => SQL_ESCAPE(postRequestParameter('city')),
-                       'zip'     => bigintval(postRequestParameter('zip')),
-                       'country' => $countryData,
-                       'refid'   => SQL_ESCAPE(postRequestParameter('refid')),
-                       'pass'    => SQL_ESCAPE(postRequestParameter('pass1')),
+                       'hash'     => $hash,
+                       'userid'   => $userid,
+                       'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
+                       'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
+                       'family'   => SQL_ESCAPE(postRequestParameter('family')),
+                       'email'    => SQL_ESCAPE(postRequestParameter('email')),
+                       'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
+                       'city'     => SQL_ESCAPE(postRequestParameter('city')),
+                       'zip'      => bigintval(postRequestParameter('zip')),
+                       'country'  => $countryData,
+                       'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
+                       'password' => SQL_ESCAPE(postRequestParameter('pass1')),
                );
        } else {
                // No ZIP code entered
                $content = array(
-                       'hash'    => $hash,
-                       'userid'  => $userid,
-                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
-                       'surname' => SQL_ESCAPE(postRequestParameter('surname')),
-                       'family'  => SQL_ESCAPE(postRequestParameter('family')),
-                       'email'   => SQL_ESCAPE(postRequestParameter('email')),
-                       'street'  => SQL_ESCAPE(postRequestParameter('street_nr')),
-                       'city'    => SQL_ESCAPE(postRequestParameter('city')),
-                       'zip'     => '',
-                       'country' => $countryData,
-                       'refid'   => SQL_ESCAPE(postRequestParameter('refid')),
-                       'pass'    => SQL_ESCAPE(postRequestParameter('pass1')),
+                       'hash'     => $hash,
+                       'userid'   => $userid,
+                       'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
+                       'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
+                       'family'   => SQL_ESCAPE(postRequestParameter('family')),
+                       'email'    => SQL_ESCAPE(postRequestParameter('email')),
+                       'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
+                       'city'     => SQL_ESCAPE(postRequestParameter('city')),
+                       'zip'      => '',
+                       'country'  => $countryData,
+                       'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
+                       'password' => SQL_ESCAPE(postRequestParameter('pass1')),
                );
        }