X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=04686ab297662f5fc7e57567c6ce4e7c25685fef;hp=a7eb9b6676f4af60f351efe1c55e4d4e9393fdfa;hb=20741b93fd58620af677a7f1039ffd16ea6ec689;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index a7eb9b6676..04686ab297 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -44,10 +44,10 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if (!isExtensionActive('register')) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('register'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=register%}');
 	return;
 } elseif (!isExtensionActive('country')) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('country'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=country%}');
 	return;
 }
 
@@ -62,34 +62,34 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 } else {
 	// Do this only if form is sent
 	if (isFormSent()) {
-		if (postRequestParameter('agree') == '!') {
+		if (postRequestElement('agree') == '!') {
 			registerOutputFailedMessage('HAVE_TO_AGREE');
 		} // END - if
 
-		if (postRequestParameter('email') == '!') {
+		if (postRequestElement('email') == '!') {
 			registerOutputFailedMessage('ENTER_EMAIL');
-			setPostRequestParameter('email', '');
-		} elseif (postRequestParameter('email') == '?') {
-			registerOutputFailedMessage('GUEST_EMAIL_ALREADY_DB');
-			setPostRequestParameter('email', '');
+			setPostRequestElement('email', '');
+		} elseif (postRequestElement('email') == '?') {
+			registerOutputFailedMessage('GUEST_EMAIL_IS_ALREADY_REGISTERED');
+			setPostRequestElement('email', '');
 		}
 
-		if (postRequestParameter('surname') == '!') {
+		if (postRequestElement('surname') == '!') {
 			registerOutputFailedMessage('ENTER_SURNAME');
-			setPostRequestParameter('surname', '');
+			setPostRequestElement('surname', '');
 		} // END - if
 
-		if (postRequestParameter('family') == '!') {
+		if (postRequestElement('family') == '!') {
 			registerOutputFailedMessage('ENTER_FAMILY');
-			setPostRequestParameter('family', '');
+			setPostRequestElement('family', '');
 		} // END - if
 
-		if ((postRequestParameter('pass1') == '!') && (postRequestParameter('pass2') == '!')) {
+		if ((postRequestElement('pass1') == '!') && (postRequestElement('pass2') == '!')) {
 			registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
-		} elseif (postRequestParameter('pass1') == '!') {
-			registerOutputFailedMessage('ENTER_PASS1');
-		} elseif (postRequestParameter('pass2') == '!') {
-			registerOutputFailedMessage('ENTER_PASS2');
+		} elseif (postRequestElement('pass1') == '!') {
+			registerOutputFailedMessage('ENTER_PASSWORD1');
+		} elseif (postRequestElement('pass2') == '!') {
+			registerOutputFailedMessage('ENTER_PASSWORD2');
 		}
 
 		if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === true)) {
@@ -108,16 +108,13 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 	// Generate birthday selection
 	switch (getLanguage()) {
 		case 'de': // German date format
-			$content['birthday_selection'] = addSelectionBox('day', postRequestParameter('day')).addSelectionBox('month', postRequestParameter('month')).addSelectionBox('year', postRequestParameter('year'));
+			$content['birthday_selection'] = addSelectionBox('day', postRequestElement('day')).addSelectionBox('month', postRequestElement('month')).addSelectionBox('year', postRequestElement('year'));
 			break;
 
 		default: // Default is the US date format... :)
-			$content['birthday_selection'] = addSelectionBox('month', postRequestParameter('month')).addSelectionBox('day', postRequestParameter('day')).addSelectionBox('year', postRequestParameter('year'));
+			$content['birthday_selection'] = addSelectionBox('month', postRequestElement('month')).addSelectionBox('day', postRequestElement('day')).addSelectionBox('year', postRequestElement('year'));
 			break;
-	}
-
-	// Adds a table for the guests with all visible categories
-	$content['category_selection'] = registerGenerateCategoryTable('guest', true);
+	} // END - switch
 
 	// Adds maximum receiveable mails list... :)
 	$content['max_receive_list'] = addMaxReceiveList('guest', '', true);
@@ -134,24 +131,26 @@ 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 ((isPostRequestElementSet('zip')) && (postRequestElement('zip') > 0)) {
+		$content['zip'] = bigintval(postRequestElement('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(postRequestElement($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">';
-	$OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
+	$OUT .= generateOptionList('countries', 'id', 'descr', postRequestElement('country_code'), 'code', $whereStatement);
 	$OUT .= '</select>';
 	$content['country'] = $OUT;