X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=c1745541512c202d46eff0393d0b5fd504ff2a24;hb=4277ede0c1a5f15c319ee0bf187f0fdda43d3475;hp=590e4b9793d9be0350038d72552aeec5a042cdb4;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 590e4b9793..c174554151 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -39,127 +37,40 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
 if (!isExtensionActive('register')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('register'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=register%}');
 	return;
 } elseif (!isExtensionActive('country')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('country'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=country%}');
 	return;
 }
 
 // Is the form sent and all went fine?
-//* DEBUG: */ print intval(isFormSent()) . '/' . intval(isRegistrationDataComplete()) . '/' . intval(isAdmin()) . '<br />';
-if ((isFormSent()) && (isRegistrationDataComplete())) {
+//* DEBUG: */ debugOutput('isFormSent=' . intval(isFormSent()) . ',isRegistrationDataComplete=' . intval(isRegistrationDataComplete()) . ',isAdmin=' . intval(isAdmin()));
+if (runFilterChain('check_user_registration') === TRUE) {
 	// Do the registration here
-	doRegistration();
-
-	// Output success registration
-	loadTemplate('admin_settings_saved', false, getMessage('REGISTRATION_DONE'));
-} else {
-	// Do this only if form is sent
-	if (isFormSent()) {
-		if (postRequestParameter('agree') == '!') {
-			registerOutputFailedMessage('HAVE_TO_AGREE');
-		} // END - if
-
-		if (postRequestParameter('email') == '!') {
-			registerOutputFailedMessage('ENTER_EMAIL');
-			setPostRequestParameter('email', '');
-		} elseif (postRequestParameter('email') == '?') {
-			registerOutputFailedMessage('EMAIL_ALREADY_DB');
-			setPostRequestParameter('email', '');
-		}
-
-		if (postRequestParameter('surname') == '!') {
-			registerOutputFailedMessage('ENTER_SURNAME');
-			setPostRequestParameter('surname', '');
-		} // END - if
-
-		if (postRequestParameter('family') == '!') {
-			registerOutputFailedMessage('ENTER_FAMILY');
-			setPostRequestParameter('family', '');
-		} // END - if
-
-		if ((postRequestParameter('pass1') == '!') && (postRequestParameter('pass2') == '!')) {
-			registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
-		} elseif (postRequestParameter('pass1') == '!') {
-			registerOutputFailedMessage('ENTER_PASS1');
-		} elseif (postRequestParameter('pass2') == '!') {
-			registerOutputFailedMessage('ENTER_PASS2');
-		}
-
-		if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === true)) {
-			registerOutputFailedMessage('SHORT_PASS', ': ' . getConfig('pass_len'));
-		} // 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'));
-		} // END - if
-	} // END - if
-
-	// 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'));
-			break;
-
-		default: // Default is the US date format... :)
-			$content['birthday_selection'] = addSelectionBox('month', postRequestParameter('month')).addSelectionBox('day', postRequestParameter('day')).addSelectionBox('year', postRequestParameter('year'));
-			break;
-	}
-
-	// Adds a table for the guests with all visible categories
-	$content['category_selection'] = registerGenerateCategoryTable('guest', true);
-
-	// Adds maximum receiveable mails list... :)
-	$content['max_receive_list'] = addMaxReceiveList('guest', '', true);
-
-	// Shall I display the refid or shall I make it editable?
-	if (getConfig('display_refid') == 'Y') {
-		// Load "hide" form template
-		$content['refid_content'] = loadTemplate('guest_register_refid_hide', true, determineReferalId());
+	if (doUserRegistration()) {
+		// All done
+		runFilterChain('user_registration_done');
 	} else {
-		// Load template to enter it
-		$content['refid_content'] = loadTemplate('guest_register_refid', true, determineReferalId());
+		// Something failed
+		runFilterChain('user_registration_failed');
 	}
-
-	// 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'));
+} else {
+	// Is a registration provider selected?
+	if (!isGetRequestElementSet('registration_provider')) {
+		// Display selector form
+		loadTemplate('guest_registration_select');
 	} // 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 .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
-	$OUT .= "</select>";
-	$content['country'] = $OUT;
-
-	// Set must-fillout fields
-	$content = runFilterChain('register_must_fillout', $content);
 
 	// Display registration form
-	loadTemplate('guest_register', false, $content);
+	runFilterChain('user_registration_form');
 }
 
 // [EOF]