From 14e7cf7262d6ee15ba48d2cbf53ffede57ff404f Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Wed, 27 Dec 2006 22:26:56 +0000
Subject: [PATCH] Bug #2803 - can't get out once XUP signup selected. Also
 check display name length on signup, cursor:hand --> cursor:pointer

---
 .../shortcode/batch/signup_shortcodes.php     | 15 ++++++++++---
 e107_languages/English/lan_signup.php         |  8 ++++---
 e107_themes/templates/signup_template.php     | 21 ++++++++++++++-----
 signup.php                                    | 15 +++++++++----
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/e107_files/shortcode/batch/signup_shortcodes.php b/e107_files/shortcode/batch/signup_shortcodes.php
index 0de2f7c7e..5c4f2bec8 100755
--- a/e107_files/shortcode/batch/signup_shortcodes.php
+++ b/e107_files/shortcode/batch/signup_shortcodes.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2006-12-22 20:53:59 $
+|     $Revision: 1.3 $
+|     $Date: 2006-12-27 22:26:41 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -67,6 +67,15 @@ if(isset($pref['xup_enabled']) && $pref['xup_enabled'])
 }
 SC_END
 
+SC_BEGIN SIGNUP_XUP_ACTION
+global $pref, $tp, $SIGNUP_XUP_BUTTON, $signup_shortcodes;
+if(isset($pref['xup_enabled']) && $pref['xup_enabled'])
+{
+// Puts the button to allow XUP signup onto the 'normal' signup screen
+	return $tp->parseTemplate($SIGNUP_XUP_BUTTON, TRUE, $signup_shortcodes);
+}
+SC_END
+
 
 SC_BEGIN SIGNUP_DISPLAYNAME
 global $pref, $rs;
@@ -193,7 +202,7 @@ if($pref['signup_option_image'])
 	$text = "
 	<input class='tbox' style='width:80%' id='avatar' type='text' name='image' size='40' value='$image' maxlength='100' />
 
-	<input class='button' type ='button' style='cursor:hand' size='30' value='".LAN_SIGNUP_27."' onclick='expandit(this)' />
+	<input class='button' type ='button' style='cursor:pointer' size='30' value='".LAN_SIGNUP_27."' onclick='expandit(this)' />
 	<div style='display:none' >";
 	$avatarlist[0] = "";
 	$handle = opendir(e_IMAGE."avatars/");
diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php
index 1c169e385..f726ac7c9 100644
--- a/e107_languages/English/lan_signup.php
+++ b/e107_languages/English/lan_signup.php
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_signup.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-27 22:26:47 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Register");
@@ -113,6 +113,8 @@ define("LAN_SIGNUP_50", "New Email");
 define("LAN_SIGNUP_51", "Old Password");
 define("LAN_SIGNUP_52", "Incorrect Password");
 define("LAN_SIGNUP_53", "field failed validation test");
+define("LAN_SIGNUP_54", "Click here to fill in your details to register");
+define("LAN_SIGNUP_55", "That display name is too long. Please choose another");
 
 
 
diff --git a/e107_themes/templates/signup_template.php b/e107_themes/templates/signup_template.php
index f9a38f25a..c1f74b14a 100755
--- a/e107_themes/templates/signup_template.php
+++ b/e107_themes/templates/signup_template.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/signup_template.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:36:13 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-27 22:26:56 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -177,11 +177,12 @@ LAN_309." <b>".LAN_SIGNUP_29."</b><br /><br />".LAN_SIGNUP_30."<br />
 if(!defined($SIGNUP_XUP_FORM))
 {
 $SIGNUP_XUP_FORM = "
+	<div id='xup' style='display:none' >
+
 	<div style='padding:10px;text-align:center'>
-	<input class='button' type ='button' style='cursor:hand' size='30' value=\"".LAN_SIGNUP_35."\" onclick=\"expandit('xup','default')\" />
+	<input class='button' type ='button' style='cursor:pointer' size='30' value=\"".LAN_SIGNUP_54."\" onclick=\"expandit('default');expandit('xup')\" />
 	</div>
 
-	<div id='xup' style='display:none' >
 	<table style='".USER_WIDTH."'>
 	<tr>
 	<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_31."
@@ -229,6 +230,15 @@ $SIGNUP_XUP_FORM = "
 ";
 }
 
+if (!defined($SIGNUP_XUP_BUTTON))
+{
+$SIGNUP_XUP_BUTTON = "	<div style='padding:10px;text-align:center'>
+	<input class='button' type ='button' style='cursor:pointer' size='30' value=\"".LAN_SIGNUP_35."\" onclick=\"expandit('default');expandit('xup')\" />
+	</div>
+";
+}
+
+
 if(!defined($SIGNUP_BEGIN))
 {
 $SIGNUP_BEGIN = "
@@ -244,6 +254,7 @@ if(!defined($SIGNUP_BODY))
 $SIGNUP_BODY = "
 {SIGNUP_XUP}
 <div id='default'>
+{SIGNUP_XUP_ACTION}
 <table class='fborder' style='".USER_WIDTH."'>
 {SIGNUP_DISPLAYNAME}
 <tr>
diff --git a/signup.php b/signup.php
index f67295a11..eb7916e5f 100644
--- a/signup.php
+++ b/signup.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/signup.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2006-12-11 08:34:43 $
-|     $Author: e107coders $
+|     $Revision: 1.3 $
+|     $Date: 2006-12-27 22:26:41 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -413,6 +413,13 @@ if (isset($_POST['register']))
 		exit;
 	}
 
+	// Check if display name exceeds maximum allowed length
+	if (isset($pref['displayname_maxlength']) && (strlen($_POST['name']) > $pref['displayname_maxlength']))
+	{
+	  $error_message .= LAN_SIGNUP_55."\\n";
+	  $error = TRUE;
+	}
+	
 	// Display Name exists.
 	if ($sql->db_Select("user", "*", "user_name='".$tp -> toDB($_POST['name'])."'"))
 	{
@@ -522,7 +529,7 @@ if (isset($_POST['register']))
 			{
 				$regexfail = $ext['user_extended_struct_name']." ".LAN_SIGNUP_53;
 			}
-	
+
 			if(defined($regexfail)) {$regexfail = constant($regexfail);}
 
 			if($regex != "" && $newval != "")