diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php index e5eba2d68..8453ae6dc 100755 --- a/e107_core/shortcodes/batch/signup_shortcodes.php +++ b/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 ""; 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; diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php index d9d2ffa01..1e8c1e58d 100755 --- a/e107_core/shortcodes/batch/usersettings_shortcodes.php +++ b/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 ""; -} -SC_END SC_BEGIN USEREXTENDED_ALL diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index 479ab35d6..ea3b6839c 100644 --- a/e107_languages/English/lan_signup.php +++ b/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_32", "What's an XUP file?"); +//define("LAN_SIGNUP_31", "URL to your 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 diff --git a/e107_languages/English/lan_user.php b/e107_languages/English/lan_user.php index e5b7ba0ec..cb7683166 100644 --- a/e107_languages/English/lan_user.php +++ b/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'); diff --git a/e107_languages/English/lan_usersettings.php b/e107_languages/English/lan_usersettings.php index 6c01d15a2..7b1a93761 100644 --- a/e107_languages/English/lan_usersettings.php +++ b/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 diff --git a/e107_themes/templates/signup_template.php b/e107_themes/templates/signup_template.php index bbdedcdb5..6bd107c89 100755 --- a/e107_themes/templates/signup_template.php +++ b/e107_themes/templates/signup_template.php @@ -168,70 +168,6 @@ LAN_SIGNUP_80." ".LAN_SIGNUP_29."

".LAN_SIGNUP_30."
"; } -if(!defined($SIGNUP_XUP_FORM)) -{ -$SIGNUP_XUP_FORM = " - -"; -} - -if (!defined($SIGNUP_XUP_BUTTON)) -{ -$SIGNUP_XUP_BUTTON = "
- -
-"; -} - if(!defined($SIGNUP_BEGIN)) { diff --git a/e107_themes/templates/usersettings_template.php b/e107_themes/templates/usersettings_template.php index ad4949ba6..ff5379a84 100755 --- a/e107_themes/templates/usersettings_template.php +++ b/e107_themes/templates/usersettings_template.php @@ -73,16 +73,6 @@ $sc_style['PHOTO_UPLOAD']['pre'] = " $sc_style['PHOTO_UPLOAD']['post'] = ""; -$sc_style['XUP']['pre'] = " - -".LAN_USER_11." - - -".LAN_USET_29."
".LAN_USET_30." - -"; -$sc_style['XUP']['post'] = ""; - $USER_EXTENDED_CAT = "{CATNAME}"; $USEREXTENDED_FIELD = " @@ -192,7 +182,6 @@ $USERSETTINGS_EDIT = " {AVATAR_UPLOAD} {PHOTO_UPLOAD} - {XUP}