diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php index c7eb75921..463729955 100755 --- a/e107_core/shortcodes/batch/signup_shortcodes.php +++ b/e107_core/shortcodes/batch/signup_shortcodes.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2012 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -32,8 +32,9 @@ class signup_shortcodes extends e_shortcode return "
\n

- ".LAN_NO." - ".LAN_YES."
+ + +

@@ -88,7 +89,7 @@ class signup_shortcodes extends e_shortcode // 'signup' Creates a new XUP user if not found, otherwise it logs the person in. - $button = (defset('FONTAWESOME') === 4) ? $tp->toGlyph('fa-'.$ic, array('size'=>$size)) : ""; + $button = (defset('FONTAWESOME') === 4) ? $tp->toGlyph('fa-'.$ic, array('size'=>$size)) : ""; $text .= " ".$button." "; } //TODO different icon options. see: http://zocial.smcllns.com/ @@ -103,7 +104,8 @@ class signup_shortcodes extends e_shortcode function sc_signup_xup_signup($parm) { $pref = e107::getPref('social_login_active'); - $tp = e107::getParser(); + $tp = e107::getParser(); + if(!empty($pref)) { $text = ""; @@ -129,7 +131,7 @@ class signup_shortcodes extends e_shortcode $ic = 'windows'; } - $button = (defset('FONTAWESOME') === 4) ? "".$tp->toGlyph('fa-'.$ic, array('size'=>$size))."" : ""; + $button = (defset('FONTAWESOME') === 4) ? "".$tp->toGlyph('fa-'.$ic, array('size'=>$size))."" : ""; $text .= " ".$button." "; } @@ -359,7 +361,7 @@ class signup_shortcodes extends e_shortcode if ($pref) { - return $rs->form_radio("hideemail", 1, $default_email_setting==1)." ".LAN_YES."  ".$rs->form_radio("hideemail", 0,$default_email_setting==0)." ".LAN_NO; + return $rs->form_radio("hideemail", 1, $default_email_setting==1)."   ".$rs->form_radio("hideemail", 0,$default_email_setting==0)." "; } } @@ -555,8 +557,10 @@ class signup_shortcodes extends e_shortcode // allow main admin to view signup page for design/testing. function sc_signup_adminoptions() { - - if(getperms('0')) + + $tp = e107::getParser(); + + if(getperms('0')) { $pref = e107::getPref(); $frm = e107::getForm(); @@ -564,17 +568,17 @@ class signup_shortcodes extends e_shortcode if(intval($pref['user_reg']) !== 1) { - $adminMsg .= "
User registration is currently disabled.
"; + $adminMsg .= "
".LAN_SIGNUP_114."
"; } $adminMsg .= "
- Preview Activation Email - Preview After Form Submit - Send a Test Activation + ".LAN_SIGNUP_115." + ".LAN_SIGNUP_116." + ".LAN_SIGNUP_117."
"; - $adminMsg .= $frm->checkbox('simulation',1, false, "Don't send email"); + $adminMsg .= $frm->checkbox('simulation',1, false, LAN_SIGNUP_119); return "
".$adminMsg."
"; diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php index 54c69d51b..78b34cfa1 100755 --- a/e107_core/templates/signup_template.php +++ b/e107_core/templates/signup_template.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -21,8 +21,8 @@ define("REQUIRED_FIELD_MARKER", " *"); $sc_style['SIGNUP_DISPLAYNAME']['pre'] = " - " - .LAN_SIGNUP_89." *
".LAN_SIGNUP_90." + "; $sc_style['SIGNUP_DISPLAYNAME']['post'] = " @@ -31,8 +31,8 @@ $sc_style['SIGNUP_DISPLAYNAME']['post'] = " $sc_style['SIGNUP_REALNAME']['pre'] = " - " - .LAN_SIGNUP_91."".req($pref['signup_option_realname'])." + "; $sc_style['SIGNUP_REALNAME']['post'] = " @@ -119,7 +119,7 @@ $SIGNUP_SIGNATURE_END = " $sc_style['SIGNUP_SIGNATURE']['pre'] = " - ".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])." + "; $sc_style['SIGNUP_SIGNATURE']['post'] = " @@ -128,7 +128,7 @@ $sc_style['SIGNUP_SIGNATURE']['post'] = " $sc_style['SIGNUP_IMAGES']['pre'] = " - ".LAN_SIGNUP_94.req($pref['signup_option_image'])." + "; $sc_style['SIGNUP_IMAGES']['post'] = " @@ -136,7 +136,7 @@ $sc_style['SIGNUP_IMAGES']['post'] = " $sc_style['SIGNUP_IMAGECODE']['pre'] = " - ".e107::getSecureImg()->renderLabel().req(2)." + "; $sc_style['SIGNUP_IMAGECODE']['post'] = " @@ -144,7 +144,7 @@ $sc_style['SIGNUP_IMAGECODE']['post'] = " $sc_style['SIGNUP_LOGINNAME']['pre'] = " - ".LAN_SIGNUP_81.req(2)." + "; $sc_style['SIGNUP_LOGINNAME']['post'] = " @@ -160,7 +160,7 @@ $sc_style['SIGNUP_HIDE_EMAIL']['post'] = " $sc_style['SIGNUP_EMAIL_CONFIRM']['pre'] = " - ".LAN_SIGNUP_39." + "; $sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = " @@ -170,13 +170,13 @@ $sc_style['SIGNUP_XUP']['pre'] = "
* + "; $sc_style['SIGNUP_PASSWORD1']['post'] = " "; $sc_style['SIGNUP_PASSWORD2']['pre'] = " - ".LAN_SIGNUP_84." * + "; $sc_style['SIGNUP_PASSWORD2']['post'] = " "; @@ -229,7 +229,7 @@ if(!defined($SIGNUP_BODY)) {SIGNUP_LOGINNAME} {SIGNUP_REALNAME} - ".LAN_USER_60."{SIGNUP_IS_MANDATORY=email} + {SIGNUP_EMAIL} diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index d1a6548c6..aa0e447ae 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2015 e107 Inc (e107.org) + * Copyright (C) 2008-2016 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -50,7 +50,7 @@ define("LAN_SIGNUP_13", "You can now log in from the Login box, or from [here]." define("LAN_SIGNUP_14", "here"); define("LAN_SIGNUP_15", "Please contact the main site admin"); define("LAN_SIGNUP_16", "if you require assistance."); -define("LAN_SIGNUP_17", "Please certify you are 13 or over the age of 13."); +define("LAN_SIGNUP_17", "Please confirm that you are age 13 or over."); define("LAN_SIGNUP_18", "Your registration has been received and created with the following login information:"); //define("LAN_SIGNUP_19", "Username:"); // now LAN_LOGINNAME //define("LAN_SIGNUP_20", "Password:"); // now LAN_PASSWORD @@ -140,7 +140,6 @@ define("LAN_SIGNUP_103", "Too many users already using IP address: "); define("LAN_SIGNUP_105", "Unable to action your request - please contact the site administrator"); // Two people with same password. define("LAN_SIGNUP_106", "Unable to action your request - do you already have an account here?"); // Trying to set email same as existing - define("LAN_LOGINNAME", "Username"); //define("LAN_PASSWORD", "Password"); define("LAN_USERNAME", "Display Name"); @@ -154,3 +153,10 @@ define("LAN_SIGNUP_112", "You are currently logged in as Main Admin."); define("LAN_SIGNUP_113", "Subscription(s)"); +define("LAN_SIGNUP_114", "User registration is currently disabled."); +define("LAN_SIGNUP_115", "Preview Activation Email"); +define("LAN_SIGNUP_116", "Preview After Form Submit"); +define("LAN_SIGNUP_117", "Send a Test Activation"); +define("LAN_SIGNUP_118", "To [x]"); +define("LAN_SIGNUP_119", "Don't send email"); +