CSS classes cleaned up, templates simplified:

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 97c6216650a967671876b9d477c9931ee1013c01..7e08dcbdf89638d2f19cff87944b261681240589 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function ifRequiredRegisterFieldsAreSet (&$array) {
@@ -126,9 +126,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="guest_failed">' . $extra . '</div>');
        } else {
-               outputHtml('<div class="register_failed">{--' . $messageId . '--}' . $extra . '</div>');
+               outputHtml('<div class="guest_failed">{--' . $messageId . '--}' . $extra . '</div>');
        }
 }
 
@@ -319,10 +319,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'].")
@@ -391,34 +388,34 @@ function doRegistration () {
                // 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')),
                );
        }