X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=1a0b5463d453395417db9f34789e79c7a9f05b2d;hb=49a9663311b732d12ba0c53af2f9eb39a7850fbc;hp=1cf1ea0402282e3033609c540011a66ecf6992be;hpb=2379934be6a196a54f4155bb8e24c49b20736969;p=mailer.git

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 1cf1ea0402..1a0b5463d4 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -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--}');
@@ -116,9 +116,6 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 			break;
 	} // END - switch
 
-	// Adds maximum receiveable mails list... :)
-	$content['max_receive_list'] = addMaxReceiveList('guest', '', true);
-
 	// Shall I display the refid or shall I make it editable?
 	if (isDisplayRefidEnabled()) {
 		// Load "hide" form template
@@ -142,18 +139,6 @@ 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;
-
 	// Set must-fillout fields
 	$content = runFilterChain('register_must_fillout', $content);