X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=6050874d19826384f1b9f646569a1ed2f6d9b740;hb=e17685c65d1a48c061b7c4f64c7a23c165430460;hp=590e4b9793d9be0350038d72552aeec5a042cdb4;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 590e4b9793..6050874d19 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,24 +41,24 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+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;
 }
 
 // Is the form sent and all went fine?
-//* DEBUG: */ print intval(isFormSent()) . '/' . intval(isRegistrationDataComplete()) . '/' . intval(isAdmin()) . '<br />';
+//* DEBUG: */ debugOutput('isFormSent=' . intval(isFormSent()) . ',isRegistrationDataComplete=' . intval(isRegistrationDataComplete()) . ',isAdmin=' . intval(isAdmin()));
 if ((isFormSent()) && (isRegistrationDataComplete())) {
 	// Do the registration here
 	doRegistration();
 
 	// Output success registration
-	loadTemplate('admin_settings_saved', false, getMessage('REGISTRATION_DONE'));
+	displayMessage('{--REGISTRATION_DONE--}');
 } else {
 	// Do this only if form is sent
 	if (isFormSent()) {
@@ -72,7 +70,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 			registerOutputFailedMessage('ENTER_EMAIL');
 			setPostRequestParameter('email', '');
 		} elseif (postRequestParameter('email') == '?') {
-			registerOutputFailedMessage('EMAIL_ALREADY_DB');
+			registerOutputFailedMessage('GUEST_EMAIL_ALREADY_DB');
 			setPostRequestParameter('email', '');
 		}
 
@@ -95,15 +93,15 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 		}
 
 		if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === true)) {
-			registerOutputFailedMessage('SHORT_PASS', ': ' . getConfig('pass_len'));
+			registerOutputFailedMessage('GUEST_SHORT_PASS', ': ' . getPassLen());
 		} // END - if
 
 		if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === true)) {
 			registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
 		} // END - if
 
-		if ((!empty($GLOBALS['register_selected_cats'])) && ($GLOBALS['register_selected_cats'] < getConfig('least_cats'))) {
-			registerOutputFailedMessage('', getMessage('CATS_LEAST'));
+		if ((!empty($GLOBALS['registration_selected_cats'])) && ($GLOBALS['registration_selected_cats'] < getLeastCats())) {
+			registerOutputFailedMessage('', '{--CHOOSE_MORE_CATEGORIES--}');
 		} // END - if
 	} // END - if
 
@@ -116,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);
@@ -125,34 +123,38 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 	$content['max_receive_list'] = addMaxReceiveList('guest', '', true);
 
 	// Shall I display the refid or shall I make it editable?
-	if (getConfig('display_refid') == 'Y') {
+	if (isDisplayRefidEnabled()) {
 		// Load "hide" form template
-		$content['refid_content'] = loadTemplate('guest_register_refid_hide', true, determineReferalId());
+		$content['refid_content'] = loadTemplate('guest_register_refid_hide', true);
 	} else {
 		// Load template to enter it
-		$content['refid_content'] = loadTemplate('guest_register_refid', true, determineReferalId());
+		$content['refid_content'] = loadTemplate('guest_register_refid', true);
 	}
 
 	// 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);
 
+	// ZIP codes are numerical values
+	$content['zip'] = '';
+	if ((isPostRequestParameterSet('zip')) && (postRequestParameter('zip') > 0)) {
+		$content['zip'] = bigintval(postRequestParameter('zip'));
+	} // END - if
+
 	// 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'));
+	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 = '';
 	} // END - if
-	$content['city']      = SQL_ESCAPE(postRequestParameter('city'));
-	$content['email']     = SQL_ESCAPE(postRequestParameter('email'));
 
 	// Prepare country selection box
-	$OUT  = "<select name=\"country_code\" class=\"guest_select\" size=\"1\">\n";
-	$whereStatement = "WHERE `is_active`='Y'";
-	if (isAdmin()) $whereStatement = '';
+	$OUT  = '<select name="country_code" class="form_select" size="1">';
 	$OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
-	$OUT .= "</select>";
+	$OUT .= '</select>';
 	$content['country'] = $OUT;
 
 	// Set must-fillout fields