mailer project continued:

[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 04686ab297662f5fc7e57567c6ce4e7c25685fef..3ef7b69b32c1efcd9156a6390443200f35498e9f 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } // END - if
 
 // Add description as navigation point
@@ -55,7 +55,7 @@ if (!isExtensionActive('register')) {
 //* DEBUG: */ debugOutput('isFormSent=' . intval(isFormSent()) . ',isRegistrationDataComplete=' . intval(isRegistrationDataComplete()) . ',isAdmin=' . intval(isAdmin()));
 if ((isFormSent()) && (isRegistrationDataComplete())) {
        // Do the registration here
-       doRegistration();
+       doUserRegistration();
 
        // Output success registration
        displayMessage('{--REGISTRATION_DONE--}');
@@ -142,17 +142,8 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
                $content[$entry] = SQL_ESCAPE(postRequestElement($entry));
        } // END - foreach
 
-       // The admin may see all
-       $whereStatement = "WHERE `is_active`='Y'";
-       if (isAdmin()) {
-               $whereStatement = '';
-       } // END - if
-
        // Prepare country selection box
-       $OUT  = '<select name="country_code" class="form_select" size="1">';
-       $OUT .= generateOptionList('countries', 'id', 'descr', postRequestElement('country_code'), 'code', $whereStatement);
-       $OUT .= '</select>';
-       $content['country'] = $OUT;
+       $content['country'] = addCountryCodeSelectionBox(postRequestElement('country_code'));
 
        // Set must-fillout fields
        $content = runFilterChain('register_must_fillout', $content);