Remove more XUP-related items

e107_core/shortcodes/batch/signup_shortcodes.php

@@ -57,23 +57,6 @@ elseif($pref['user_reg_veri'])
 SC_END
 
 
-SC_BEGIN SIGNUP_XUP
-global $pref, $tp, $SIGNUP_XUP_FORM, $signup_shortcodes;
-if(isset($pref['xup_enabled']) && $pref['xup_enabled'])
-{
-	return $tp->parseTemplate($SIGNUP_XUP_FORM, TRUE, $signup_shortcodes);
-}
-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;
@@ -292,20 +275,6 @@ SC_BEGIN SIGNUP_FORM_CLOSE
 return "</form>";
 SC_END
 
-SC_BEGIN SIGNUP_XUP_LOGINNAME
-global $rs, $loginname;
-return $rs->form_text("loginnamexup", 30, $loginname, 30);
-SC_END
-
-SC_BEGIN SIGNUP_XUP_PASSWORD1
-global $rs, $password1;
-return $rs->form_password("password1xup", 30, $password1, 20);
-SC_END
-
-SC_BEGIN SIGNUP_XUP_PASSWORD2
-global $rs, $password1;
-return $rs->form_password("password2xup", 30, $password2, 20);
-SC_END
 
 SC_BEGIN SIGNUP_IS_MANDATORY
 global $pref;

e107_core/shortcodes/batch/usersettings_shortcodes.php

@@ -192,13 +192,6 @@ if ($pref['photo_upload'] && FILE_UPLOADS)
 }
 SC_END
 
-SC_BEGIN XUP
-global $pref,$curVal;
-if(isset($pref['xup_enabled']) && $pref['xup_enabled'] == 1)
-{
-	return 	"<input class='tbox' type='text' name='user_xup' size='50' value='{$curVal['user_xup']}' maxlength='100' />";
-}
-SC_END
 
 
 SC_BEGIN USEREXTENDED_ALL

e107_languages/English/lan_signup.php

@@ -69,11 +69,11 @@ define("LAN_SIGNUP_27", "Show");
 //define("LAN_SIGNUP_28", "choice of Content/Mail-lists");		Now LAN_USER_73
 define("LAN_SIGNUP_29", "A verification email will be sent to the email address you enter here so it must be valid.");
 define("LAN_SIGNUP_30", "If you do not wish to display your email address on this site, please select 'Yes' for the 'Hide email address?' option.");
-define("LAN_SIGNUP_31", "URL to your XUP file");
+//define("LAN_SIGNUP_31", "URL to your XUP file");
-define("LAN_SIGNUP_32", "What's an XUP file?");
+//define("LAN_SIGNUP_32", "What's an XUP file?");
 define("LAN_SIGNUP_33", "Type path or choose avatar");
 define("LAN_SIGNUP_34", "Please note: Any image uploaded to this server that is deemed inappropriate by the administrators will be deleted immediately.");
-define("LAN_SIGNUP_35", "Click here to register using an XUP file");
+//define("LAN_SIGNUP_35", "Click here to register using an XUP file");
 define("LAN_SIGNUP_36", "An error has occurred creating your user information, please contact the site admin");
 define("LAN_SIGNUP_37", "This stage of registration is complete. The site admin will need to approve your membership.  Once this has been done you will receive a confirmation email alerting you that your membership has been approved.");
 define("LAN_SIGNUP_38", "You entered two different email addresses. Please enter a valid email address in the two fields provided");
@@ -105,7 +105,7 @@ define('LAN_SIGNUP_64','That doesn\'t appear to be valid user information');
 define('LAN_SIGNUP_65','You have been assigned the following login name');
 define('LAN_SIGNUP_66','Please make a note of it.');
 define('LAN_SIGNUP_67','This will be assigned by the system after signup');
-define('LAN_SIGNUP_68','Error: Unable to open remote XUP file');
+//define('LAN_SIGNUP_68','Error: Unable to open remote XUP file');
 define('LAN_SIGNUP_69','');
 define('LAN_SIGNUP_70','');
 define('LAN_SIGNUP_71', 'You have reached the site limit for account registrations. Please login using one of your other accounts.');		// LAN_202

e107_languages/English/lan_user.php

@@ -41,7 +41,7 @@ define('LAN_USER_07','Avatar');
 define('LAN_USER_08','Email address');
 define('LAN_USER_09','Signature');
 define('LAN_USER_10','Hide email');
-define('LAN_USER_11','XUP file');
+//define('LAN_USER_11','XUP file');
 define('LAN_USER_12','User class');
 define('LAN_USER_13','ID');
 define('LAN_USER_14','Join Date');

e107_languages/English/lan_usersettings.php

@@ -95,7 +95,7 @@ define('LAN_USET_25', 'Re-type New Password: ');					// LAN_153
 define('LAN_USET_26', 'Upload your Avatar');						// LAN_415
 define('LAN_USET_27', 'Upload Your Photograph');					// LAN_414
 define('LAN_USET_28', 'This will be shown on your profile page');	// LAN_426
-define('LAN_USET_29', 'URL to your XUP file');						// LAN_433
+//define('LAN_USET_29', 'URL to your XUP file');						// LAN_433
 define('LAN_USET_30', 'what\'s this?');								// LAN_434
 define('LAN_USET_31', 'Registration Information');					// LAN_418
 define('LAN_USET_32', 'Please note: Any image uploaded to this server that is deemed inappropriate by the administrators will be deleted immediately.');	// LAN_404

e107_themes/templates/signup_template.php

@@ -168,70 +168,6 @@ LAN_SIGNUP_80." <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:pointer' size='30' value=\"".LAN_SIGNUP_54."\" onclick=\"expandit('default');expandit('xup')\" />
-	</div>
-
-	<table style='".USER_WIDTH."'>
-	<tr>
-	<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_31."
-	</td>
-	<td class='forumheader3' style='width:70%'>
-	<input class='tbox' type='text' name='user_xup' size='50' value='' maxlength='100' />
-	</td>
-	</tr>
-
-	<tr>
-	<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_SIGNUP_81."<span class='required'> *</span><br /><span class='smalltext'>".LAN_SIGNUP_82."</span></td>
-	<td class='forumheader3' style='width:70%'>
-	{SIGNUP_XUP_LOGINNAME}
-	</td>
-	</tr>
-
-	<tr>
-	<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_83."<span class='required'> *</span></td>
-	<td class='forumheader3' style='width:70%'>
-	{SIGNUP_XUP_PASSWORD1}
-	</td>
-	</tr>
-
-	<tr>
-	<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_84."<span class='required'> *</span></td>
-	<td class='forumheader3' style='width:70%'>
-	{SIGNUP_XUP_PASSWORD2}
-	</td>
-	</tr>
-
-	<tr>
-	<td class='forumheader3' colspan='2'  style='text-align:center'>
-	<span class='smalltext'><a href='http://e107.org/generate_xup.php' rel='external'>".LAN_SIGNUP_32."</a></span>
-	</td>
-	</tr>
-
-	<tr>
-	<td class='forumheader' colspan='2'  style='text-align:center'>
-	<input class='button' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
-	</td>
-	</tr>
-
-	</table>
-	</div>
-";
-}
-
-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))
 {

e107_themes/templates/usersettings_template.php

@@ -73,16 +73,6 @@ $sc_style['PHOTO_UPLOAD']['pre'] = "
 $sc_style['PHOTO_UPLOAD']['post'] = "</span></td></tr>";
 
 
-$sc_style['XUP']['pre'] = "
-<tr>
-<td colspan='2' class='forumheader'>".LAN_USER_11."</td>
-</tr>
-<tr>
-<td style='width:20%; vertical-align:top' class='forumheader3'>".LAN_USET_29."<br /><span class='smalltext'><a href='http://e107.org/generate_xup.php' rel='external'>".LAN_USET_30."</a></span></td>
-<td style='width:80%' class='forumheader2'>
-";
-$sc_style['XUP']['post'] = "</td></tr>";
-
 $USER_EXTENDED_CAT = "<tr><td colspan='2' class='forumheader'>{CATNAME}</td></tr>";
 $USEREXTENDED_FIELD = "
 <tr>
@@ -192,7 +182,6 @@ $USERSETTINGS_EDIT = "
 
 	{AVATAR_UPLOAD}
 	{PHOTO_UPLOAD}
-	{XUP}
 
 	<tr style='vertical-align:top'>
 	<td colspan='2' style='text-align:center' class='forumheader'><input class='button' type='submit' name='updatesettings' value='".LAN_USET_37."' /></td>