More rewrites to use EL code

[mailer.git] / inc / modules / guest / what-register.php

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index ae06e50078449de93bb7516c0b8e72dd3009d28b..6050874d19826384f1b9f646569a1ed2f6d9b740 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -44,10 +44,10 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if (!isExtensionActive('register')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('register'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('register'));
        return;
 } elseif (!isExtensionActive('country')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('country'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('country'));
        return;
 }
 
@@ -58,7 +58,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        doRegistration();
 
        // Output success registration
-       loadTemplate('admin_settings_saved', false, '{--REGISTRATION_DONE--}');
+       displayMessage('{--REGISTRATION_DONE--}');
 } else {
        // Do this only if form is sent
        if (isFormSent()) {
@@ -114,7 +114,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
                default: // Default is the US date format... :)
                        $content['birthday_selection'] = addSelectionBox('month', postRequestParameter('month')).addSelectionBox('day', postRequestParameter('day')).addSelectionBox('year', postRequestParameter('year'));
                        break;
-       }
+       } // END - switch
 
        // Adds a table for the guests with all visible categories
        $content['category_selection'] = registerGenerateCategoryTable('guest', true);
@@ -134,20 +134,22 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)
        $content['header_content'] = loadTemplate('register_header', true);
 
-       // Other values
-       $content['surname']   = SQL_ESCAPE(postRequestParameter('surname'));
-       $content['family']    = SQL_ESCAPE(postRequestParameter('family'));
-       $content['street_nr'] = SQL_ESCAPE(postRequestParameter('street_nr'));
-       $content['zip']       = '';
-       if (isPostRequestParameterSet('zip')) {
-               $content['zip']       = bigintval(postRequestParameter('zip'));
+       // ZIP codes are numerical values
+       $content['zip'] = '';
+       if ((isPostRequestParameterSet('zip')) && (postRequestParameter('zip') > 0)) {
+               $content['zip'] = bigintval(postRequestParameter('zip'));
        } // END - if
-       $content['city']      = SQL_ESCAPE(postRequestParameter('city'));
-       $content['email']     = SQL_ESCAPE(postRequestParameter('email'));
+
+       // Other values
+       foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) {
+               $content[$entry] = SQL_ESCAPE(postRequestParameter($entry));
+       } // END - foreach
 
        // The admin may see all
        $whereStatement = "WHERE `is_active`='Y'";
-       if (isAdmin()) $whereStatement = '';
+       if (isAdmin()) {
+               $whereStatement = '';
+       } // END - if
 
        // Prepare country selection box
        $OUT  = '<select name="country_code" class="form_select" size="1">';