diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php index 7992c474e..f9998205e 100755 --- a/e107_core/shortcodes/batch/signup_shortcodes.php +++ b/e107_core/shortcodes/batch/signup_shortcodes.php @@ -21,7 +21,13 @@ e107::coreLan('signup'); class signup_shortcodes extends e_shortcode { + function sc_signup_coppa_text($parm=null) + { + $text = LAN_SIGNUP_77. " ". LAN_SIGNUP_14.". ". + LAN_SIGNUP_15 . " " . e107::getParser()->emailObfuscate(SITEADMINEMAIL, LAN_SIGNUP_14) . " " . LAN_SIGNUP_16; + return $text; + } function sc_signup_coppa_form($parm) { @@ -278,8 +284,12 @@ class signup_shortcodes extends e_shortcode { $options['placeholder'] = $parm['placeholder']; } + elseif(!empty($preLen)) + { + $text = defset('LAN_SIGNUP_125', "Min. [x] chars."); + $options['placeholder'] = e107::getParser()->lanVars($text, $preLen); + } - // $options['pattern'] = '\w{'.$len.',}'; // word of minimum length return e107::getForm()->password('password1', '', 20, $options); @@ -314,12 +324,16 @@ class signup_shortcodes extends e_shortcode return e107::getForm()->password('password2', '', 20, $options); } - - + + + /** + * @deprecated - placeholder in PASSWORD1 includes this. + * @return null + */ function sc_signup_password_len() { global $pref, $SIGNUP_PASSWORD_LEN; - if($pref['signup_pass_len']) + if($pref['signup_pass_len'] && !empty($SIGNUP_PASSWORD_LEN)) { return $SIGNUP_PASSWORD_LEN; } diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php index 849a68e5e..b45de67b2 100644 --- a/e107_core/templates/contact_template.php +++ b/e107_core/templates/contact_template.php @@ -12,20 +12,6 @@ if (!defined('e107_INIT')) { exit; } -/* -if(!isset($CONTACT_INFO)) -{ - $CONTACT_INFO = " - - - - -
- {SITECONTACTINFO} -
-
"; -} -*/ $CONTACT_TEMPLATE['info'] = " @@ -61,26 +47,18 @@ $CONTACT_TEMPLATE['menu'] = ' '; - - // Option I - new sc style variable and format, global available per shortcode (mode also applied) - // sc_style is renamed to sc_wrapper and uppercased now - distinguished from the legacy $sc_style variable and compatible with the new template standards, we deprecate $sc_style soon - - // $SC_WRAPPER['CONTACT_EMAIL_COPY'] = "{---}".LANCONTACT_07.""; - // $SC_WRAPPER['CONTACT_PERSON'] = "".LANCONTACT_14."
{---}"; - // $SC_WRAPPER['CONTACT_IMAGECODE'] = "".LANCONTACT_16."
{---}"; - // $SC_WRAPPER['CONTACT_IMAGECODE_INPUT'] = "{---}"; - - - // Option II - Wrappers, used ONLY with batch objects, requires explicit wrapper registration - // In this case (see contact.php) e107::getScBatch('contact')->wrapper('contact/form') - // Only one Option is used - WRAPPER > SC_STYLE - $CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] = "
{---}"; - $CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] = "{---}
"; - $CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] = "
{---}".LANCONTACT_07."
"; - $CONTACT_WRAPPER['form']['CONTACT_PERSON'] = "
{---}
"; - $CONTACT_TEMPLATE['form'] = " +// Shortcode wrappers. +$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] = "
{---}"; +$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] = "{---}
"; +$CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] = "
{---}".LANCONTACT_07."
"; +$CONTACT_WRAPPER['form']['CONTACT_PERSON'] = "
{---}
"; + + + + +$CONTACT_TEMPLATE['form'] = "
{CONTACT_PERSON} @@ -120,7 +98,7 @@ $CONTACT_TEMPLATE['menu'] = ' // Customize the email subject // Variables: CONTACT_SUBJECT and CONTACT_PERSON as well as any custom fields set in the form. ) - $CONTACT_TEMPLATE['email']['subject'] = "{CONTACT_SUBJECT}"; +$CONTACT_TEMPLATE['email']['subject'] = "{CONTACT_SUBJECT}"; diff --git a/e107_core/templates/legacy/signup_template.php b/e107_core/templates/legacy/signup_template.php new file mode 100644 index 000000000..207b9a97e --- /dev/null +++ b/e107_core/templates/legacy/signup_template.php @@ -0,0 +1,220 @@ + + + + "; +$sc_style['SIGNUP_DISPLAYNAME']['post'] = " + +"; + +$sc_style['SIGNUP_REALNAME']['pre'] = " + + + + "; +$sc_style['SIGNUP_REALNAME']['post'] = " + +"; +$sc_style['SIGNUP_GDPR_INFO']['pre'] = ""; +$sc_style['SIGNUP_GDPR_INFO']['post'] = " + "; + + + +if(!isset($SIGNUP_PASSWORD_LEN)) +{ + $SIGNUP_PASSWORD_LEN = " + (".LAN_SIGNUP_1." {$pref['signup_pass_len']} ".LAN_SIGNUP_2.")"; +} + +if(!isset($SIGNUP_EXTENDED_USER_FIELDS)) +{ + $SIGNUP_EXTENDED_USER_FIELDS = " + + + + + + {EXTENDED_USER_FIELD_EDIT} + + "; +} + + + +$sc_style['SIGNUP_SIGNATURE']['pre'] = " + + + "; + +$sc_style['SIGNUP_SIGNATURE']['post'] = " + +"; + +$sc_style['SIGNUP_IMAGES']['pre'] = " + + + "; +$sc_style['SIGNUP_IMAGES']['post'] = " + +"; + +$sc_style['SIGNUP_IMAGECODE']['pre'] = " + + + "; +$sc_style['SIGNUP_IMAGECODE']['post'] = " + +"; + +$sc_style['SIGNUP_LOGINNAME']['pre'] = " + + + "; +$sc_style['SIGNUP_LOGINNAME']['post'] = " + +"; + +$sc_style['SIGNUP_HIDE_EMAIL']['pre'] = " + + + "; +$sc_style['SIGNUP_HIDE_EMAIL']['post'] = " + +"; + +$sc_style['SIGNUP_EMAIL_CONFIRM']['pre'] = " + + + "; +$sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = " + +"; + +$sc_style['SIGNUP_XUP']['pre'] = "
"; +$sc_style['SIGNUP_XUP']['post'] = "
"; + +$sc_style['SIGNUP_PASSWORD1']['pre'] = " + + "; +$sc_style['SIGNUP_PASSWORD1']['post'] = " + "; + +$sc_style['SIGNUP_PASSWORD2']['pre'] = " + + "; +$sc_style['SIGNUP_PASSWORD2']['post'] = " + "; + +$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['pre'] = " + + "; +$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['post'] = " + "; + + +if(!isset($COPPA_TEMPLATE)) +{ + $COPPA_TEMPLATE = + LAN_SIGNUP_77." ".LAN_SIGNUP_14.". " + .LAN_SIGNUP_15." ".e107::getParser()->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."
+
+
".LAN_SIGNUP_17." + {SIGNUP_COPPA_FORM} +
"; +} + +if(!isset($COPPA_FAIL)) +{ + $COPPA_FAIL = "
".LAN_SIGNUP_9."
"; +} + +//if(!defined($SIGNUP_TEXT)) +{ + //$SIGNUP_TEXT = $tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // . + //LAN_SIGNUP_80." ".LAN_SIGNUP_29."

". + //LAN_SIGNUP_30."
". + //LAN_SIGNUP_85; +} + +if(!isset($SIGNUP_BEGIN)) +{ + $SIGNUP_BEGIN = " + {SIGNUP_FORM_OPEN} {SIGNUP_ADMINOPTIONS} {SIGNUP_SIGNUP_TEXT}"; +} + +if(!isset($SIGNUP_BODY)) +{ + $SIGNUP_BODY = " + {SIGNUP_XUP} +
+ {SIGNUP_XUP_ACTION} + + {SIGNUP_DISPLAYNAME} + {SIGNUP_LOGINNAME} + {SIGNUP_REALNAME} + + + + + {SIGNUP_EMAIL_CONFIRM} + {SIGNUP_PASSWORD1} + {SIGNUP_PASSWORD2} + {SIGNUP_HIDE_EMAIL} + {SIGNUP_USERCLASS_SUBSCRIBE} + {SIGNUP_EXTENDED_USER_FIELDS} + {SIGNUP_SIGNATURE} + {SIGNUP_IMAGES} + {SIGNUP_IMAGECODE} + {SIGNUP_GDPR_INFO} + + + +
+ {SIGNUP_EMAIL} +
+ +
+
+
+ {SIGNUP_FORM_CLOSE}"; +} + +if(!isset($SIGNUP_EXTENDED_CAT)) +{ + $SIGNUP_EXTENDED_CAT = " + + + {EXTENDED_CAT_TEXT} + + "; +} + +if(!isset($SIGNUP_END)) +{ + $SIGNUP_END = ''; +} + diff --git a/e107_core/templates/legacy/usersettings_template.php b/e107_core/templates/legacy/usersettings_template.php new file mode 100644 index 000000000..20eda1f3f --- /dev/null +++ b/e107_core/templates/legacy/usersettings_template.php @@ -0,0 +1,159 @@ + + ".LAN_USER_04.": + \n"; +$sc_style['CUSTOMTITLE']['post'] = "\n"; + +$sc_style['PASSWORD1']['pre'] = " + ".LAN_USET_24." + \n"; +$sc_style['PASSWORD1']['post'] = "\n"; + + +$sc_style['PASSWORD2']['pre'] = " + ".LAN_USET_25." + \n"; +$sc_style['PASSWORD2']['post'] = "\n"; + + +$sc_style['PASSWORD_LEN']['pre'] = "
(".LAN_USER_78." "; +$sc_style['PASSWORD_LEN']['post'] = " ".LAN_USER_79.")"; + +$sc_style['USERCLASSES']['pre'] = " + ".LAN_USER_76.":".req(e107::getPref('signup_option_class'))." +
".LAN_USER_73." + + "; +$sc_style['USERCLASSES']['post'] = "\n"; + +$sc_style['AVATAR_UPLOAD']['pre'] = " + ".LAN_USET_26."
+ \n"; +$sc_style['AVATAR_UPLOAD']['post'] = "\n"; + + +$sc_style['PHOTO_UPLOAD']['pre'] = " + ".LAN_USER_06." + \n"; +$sc_style['PHOTO_UPLOAD']['post'] = ""; + + +$sc_style['USERNAME']['pre'] = " + ".LAN_USER_01." + \n"; + +$sc_style['USERNAME']['post'] = ""; + + +$sc_style['LOGINNAME']['pre'] = " + ".LAN_USER_81." + \n"; +$sc_style['LOGINNAME']['post'] = "\n"; + + +$sc_style['SIGNATURE']['pre'] = "".LAN_USER_71.req(e107::getPref('signup_option_signature'))." + "; + +//$sc_style['SIGNATURE']['pre'] = " + // "; + +// $sc_style['SIGNATURE_HELP']['pre'] = ""; \ +$sc_style['SIGNATURE_HELP']['post'] = ""; + + +$USER_EXTENDED_CAT = "{CATNAME}"; +$USEREXTENDED_FIELD = " + + {FIELDNAME} + + + {FIELDVAL} {HIDEFIELD} + + + "; + + + + +$REQUIRED_FIELD = "{FIELDNAME} "; + +// After Saving has occurred. +$USERSETTINGS_MESSAGE = "{MESSAGE}"; +$USERSETTINGS_MESSAGE_CAPTION = LAN_OK; +$USERSETTINGS_EDIT_CAPTION = LAN_USET_39; // 'Update User Settings' + + + + +$USERSETTINGS_EDIT = " +
+ + + + + + + + + {USERNAME} + {LOGINNAME} + + + + + + + {REALNAME} + + {CUSTOMTITLE} + + {PASSWORD1} + {PASSWORD_LEN} + {PASSWORD2} + + + + + + + + + + + + + {AVATAR_UPLOAD} + {PHOTO_UPLOAD} + + {USERCLASSES} + {USEREXTENDED_ALL} + + + {SIGNATURE=cols=58&rows=4} + {SIGNATURE_HELP} + +
".LAN_USET_31."
".LAN_USER_60.req(!e107::getPref('disable_emailcheck'))." + {EMAIL} +
".LAN_USER_83." + {HIDEEMAIL=radio} + +
".LAN_USER_07.req(e107::getPref('signup_option_image'))." + {AVATAR_REMOTE} +
+
+ {UPDATESETTINGSBUTTON} + {DELETEACCOUNTBUTTON} +
+
+ "; + diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php index f541268dd..6e6819727 100755 --- a/e107_core/templates/signup_template.php +++ b/e107_core/templates/signup_template.php @@ -14,170 +14,102 @@ * $Author: e107coders $ */ -if (!defined('e107_INIT')) { exit; } -if (!defined("USER_WIDTH")){ define("USER_WIDTH", "width:100%"); } +if(!defined('e107_INIT')) +{ + exit; +} +// Shortcode Wrappers -$sc_style['SIGNUP_DISPLAYNAME']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_DISPLAYNAME'] = " - - "; -$sc_style['SIGNUP_DISPLAYNAME']['post'] = " - + . LAN_SIGNUP_89 . "{SIGNUP_IS_MANDATORY=true}
" . LAN_SIGNUP_90 . " + {---} "; -$sc_style['SIGNUP_REALNAME']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_REALNAME'] = " - - - "; -$sc_style['SIGNUP_REALNAME']['post'] = " - + + {---} "; -$sc_style['SIGNUP_GDPR_INFO']['pre'] = ""; -$sc_style['SIGNUP_GDPR_INFO']['post'] = " - "; - -if(!isset($SIGNUP_PASSWORD_LEN)) -{ - $SIGNUP_PASSWORD_LEN = " - (".LAN_SIGNUP_1." {$pref['signup_pass_len']} ".LAN_SIGNUP_2.")"; -} - -if(!isset($SIGNUP_EXTENDED_USER_FIELDS)) -{ - $SIGNUP_EXTENDED_USER_FIELDS = " - - - - - - {EXTENDED_USER_FIELD_EDIT} - - "; -} +$SIGNUP_WRAPPER['SIGNUP_GDPR_INFO'] = "{---}"; - -$sc_style['SIGNUP_SIGNATURE']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_SIGNATURE'] = " - - "; - -$sc_style['SIGNUP_SIGNATURE']['post'] = " - + + {---} "; - -$sc_style['SIGNUP_IMAGES']['pre'] = " + +$SIGNUP_WRAPPER['SIGNUP_IMAGES'] = " - - "; -$sc_style['SIGNUP_IMAGES']['post'] = " - + + {---} "; -$sc_style['SIGNUP_IMAGECODE']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_IMAGECODE'] = " - - "; -$sc_style['SIGNUP_IMAGECODE']['post'] = " - + + {---} "; -$sc_style['SIGNUP_LOGINNAME']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_LOGINNAME'] = " - - "; -$sc_style['SIGNUP_LOGINNAME']['post'] = " - + + {---} "; -$sc_style['SIGNUP_HIDE_EMAIL']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_HIDE_EMAIL'] = " - - "; -$sc_style['SIGNUP_HIDE_EMAIL']['post'] = " - + + {---} "; -$sc_style['SIGNUP_EMAIL_CONFIRM']['pre'] = " +$SIGNUP_WRAPPER['SIGNUP_EMAIL_CONFIRM'] = " - - "; -$sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = " - + + {---} "; -$sc_style['SIGNUP_XUP']['pre'] = "
"; -$sc_style['SIGNUP_XUP']['post'] = "
"; +$SIGNUP_WRAPPER['SIGNUP_XUP'] = "
{---} +
"; -$sc_style['SIGNUP_PASSWORD1']['pre'] = " - - "; -$sc_style['SIGNUP_PASSWORD1']['post'] = " +$SIGNUP_WRAPPER['SIGNUP_PASSWORD1'] = " + + {---} "; -$sc_style['SIGNUP_PASSWORD2']['pre'] = " - - "; -$sc_style['SIGNUP_PASSWORD2']['post'] = " +$SIGNUP_WRAPPER['SIGNUP_PASSWORD2'] = " + + {---} "; -$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['pre'] = " - - "; -$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['post'] = " +$SIGNUP_WRAPPER['SIGNUP_USERCLASS_SUBSCRIBE'] = " + + {---} "; -if(!isset($COPPA_TEMPLATE)) -{ - $COPPA_TEMPLATE = - LAN_SIGNUP_77." ".LAN_SIGNUP_14.". " - .LAN_SIGNUP_15." ".e107::getParser()->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."
-
-
".LAN_SIGNUP_17." - {SIGNUP_COPPA_FORM} -
"; -} +// Template v2.x spec. -if(!isset($COPPA_FAIL)) -{ - $COPPA_FAIL = "
".LAN_SIGNUP_9."
"; -} -//if(!defined($SIGNUP_TEXT)) -{ - //$SIGNUP_TEXT = $tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // . - //LAN_SIGNUP_80." ".LAN_SIGNUP_29."

". - //LAN_SIGNUP_30."
". - //LAN_SIGNUP_85; -} - -if(!isset($SIGNUP_BEGIN)) -{ - $SIGNUP_BEGIN = " +$SIGNUP_TEMPLATE['start'] = " {SIGNUP_FORM_OPEN} {SIGNUP_ADMINOPTIONS} {SIGNUP_SIGNUP_TEXT}"; -} -if(!isset($SIGNUP_BODY)) -{ - $SIGNUP_BODY = " + +$SIGNUP_TEMPLATE['body'] = " {SIGNUP_XUP}
{SIGNUP_XUP_ACTION} - +
{SIGNUP_DISPLAYNAME} {SIGNUP_LOGINNAME} {SIGNUP_REALNAME} - + @@ -194,40 +126,41 @@ if(!isset($SIGNUP_BODY)) {SIGNUP_GDPR_INFO}
{SIGNUP_EMAIL}
- +
{SIGNUP_FORM_CLOSE}"; -} -if(!isset($SIGNUP_EXTENDED_CAT)) -{ - $SIGNUP_EXTENDED_CAT = " + +$SIGNUP_TEMPLATE['end'] = ''; + + +$SIGNUP_TEMPLATE['coppa'] = "{SIGNUP_COPPA_TEXT}

+
{LAN=LAN_SIGNUP_17} + {SIGNUP_COPPA_FORM} +
"; + +$SIGNUP_TEMPLATE['coppa-fail'] = "
{LAN=LAN_SIGNUP_9}
"; + + +$SIGNUP_TEMPLATE['extended-category'] = " {EXTENDED_CAT_TEXT} "; -} - -if(!isset($SIGNUP_END)) -{ - $SIGNUP_END = ''; -} - - -// v2.x to-do - -$SIGNUP_TEMPLATE = array(); -$SIGNUP_TEMPLATE['start'] = $SIGNUP_BEGIN; -$SIGNUP_TEMPLATE['end'] = $SIGNUP_END; -$SIGNUP_TEMPLATE['body'] = $SIGNUP_BODY; -$SIGNUP_TEMPLATE['extended-user-fields'] = $SIGNUP_EXTENDED_USER_FIELDS; -$SIGNUP_TEMPLATE['coppa'] = ''; -$SIGNUP_TEMPLATE['coppa-fail'] = ''; - +$SIGNUP_TEMPLATE['extended-user-fields'] = " + + + + + + {EXTENDED_USER_FIELD_EDIT} + + "; \ No newline at end of file diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php index b01ac66e6..a6f3f19e2 100755 --- a/e107_core/templates/usersettings_template.php +++ b/e107_core/templates/usersettings_template.php @@ -15,165 +15,7 @@ */ if (!defined('e107_INIT')) { exit; } -if (!defined("USER_WIDTH")) -{ - $uw = (deftrue('BOOTSTRAP')) ? "" : "width:97%"; - define("USER_WIDTH", $uw); -} - -// global $usersettings_shortcodes, $pref; - - -$sc_style['CUSTOMTITLE']['pre'] = " - ".LAN_USER_04.": - \n"; -$sc_style['CUSTOMTITLE']['post'] = "\n"; - -$sc_style['PASSWORD1']['pre'] = " - ".LAN_USET_24." - \n"; -$sc_style['PASSWORD1']['post'] = "\n"; - - -$sc_style['PASSWORD2']['pre'] = " - ".LAN_USET_25." - \n"; -$sc_style['PASSWORD2']['post'] = "\n"; - - -$sc_style['PASSWORD_LEN']['pre'] = "
(".LAN_USER_78." "; -$sc_style['PASSWORD_LEN']['post'] = " ".LAN_USER_79.")"; - -$sc_style['USERCLASSES']['pre'] = " - ".LAN_USER_76.":".req(e107::getPref('signup_option_class'))." -
".LAN_USER_73." - - "; -$sc_style['USERCLASSES']['post'] = "\n"; - -$sc_style['AVATAR_UPLOAD']['pre'] = " - ".LAN_USET_26."
- \n"; -$sc_style['AVATAR_UPLOAD']['post'] = "\n"; - - -$sc_style['PHOTO_UPLOAD']['pre'] = " - ".LAN_USER_06." - \n"; -$sc_style['PHOTO_UPLOAD']['post'] = ""; - - -$sc_style['USERNAME']['pre'] = " - ".LAN_USER_01." - \n"; - -$sc_style['USERNAME']['post'] = ""; - - -$sc_style['LOGINNAME']['pre'] = " - ".LAN_USER_81." - \n"; -$sc_style['LOGINNAME']['post'] = "\n"; - - -$sc_style['SIGNATURE']['pre'] = "".LAN_USER_71.req(e107::getPref('signup_option_signature'))." - "; - -//$sc_style['SIGNATURE']['pre'] = " - // "; - -// $sc_style['SIGNATURE_HELP']['pre'] = ""; \ -$sc_style['SIGNATURE_HELP']['post'] = ""; - - -$USER_EXTENDED_CAT = "{CATNAME}"; -$USEREXTENDED_FIELD = " - - {FIELDNAME} - - - {FIELDVAL} {HIDEFIELD} - - - "; - - - - -$REQUIRED_FIELD = "{FIELDNAME} "; - -// After Saving has occurred. -$USERSETTINGS_MESSAGE = "{MESSAGE}"; -$USERSETTINGS_MESSAGE_CAPTION = LAN_OK; -$USERSETTINGS_EDIT_CAPTION = LAN_USET_39; // 'Update User Settings' - - - - -$USERSETTINGS_EDIT = " -
- - - - - - - - - {USERNAME} - {LOGINNAME} - - - - - - - {REALNAME} - - {CUSTOMTITLE} - - {PASSWORD1} - {PASSWORD_LEN} - {PASSWORD2} - - - - - - - - - - - - - {AVATAR_UPLOAD} - {PHOTO_UPLOAD} - - {USERCLASSES} - {USEREXTENDED_ALL} - - - {SIGNATURE=cols=58&rows=4} - {SIGNATURE_HELP} - -
".LAN_USET_31."
".LAN_USER_60.req(!e107::getPref('disable_emailcheck'))." - {EMAIL} -
".LAN_USER_83." - {HIDEEMAIL=radio} - -
".LAN_USER_07.req(e107::getPref('signup_option_image'))." - {AVATAR_REMOTE} -
-
- {UPDATESETTINGSBUTTON} - {DELETEACCOUNTBUTTON} -
-
- "; - - @@ -244,21 +86,15 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "
- - -// Bootstrap 3 only. +// Bootstrap only. $USERSETTINGS_TEMPLATE = array(); $USERSETTINGS_TEMPLATE['edit'] = "
- {USERNAME} - {LOGINNAME} - -
@@ -274,7 +110,6 @@ $USERSETTINGS_TEMPLATE['edit'] = " {PASSWORD2} -
diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index b8e8673c1..321d2081c 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -165,3 +165,5 @@ define("LAN_SIGNUP_121", "Use a different email address"); define("LAN_SIGNUP_122", "Privacy Policy"); define("LAN_SIGNUP_123", "Terms and conditions"); define("LAN_SIGNUP_124", "By signing up you agree to our [x] and our [y]."); +define("LAN_SIGNUP_125", "Min. [x] chars."); + diff --git a/signup.php b/signup.php index f1a274f3d..c981ab410 100644 --- a/signup.php +++ b/signup.php @@ -70,8 +70,23 @@ $SIGNUP_END = null; $COPPA_TEMPLATE = null; $COPPA_FAIL = null; -require_once(e107::coreTemplatePath('signup')); //correct way to load a core template. +if($template = e107::getCoreTemplate('signup')) +{ + $SIGNUP_BEGIN = $template['start']; + $SIGNUP_BODY = $template['body']; + $SIGNUP_END = $template['end']; + $COPPA_TEMPLATE = $template['coppa']; + $COPPA_FAIL = $template['coppa-fail']; + $SIGNUP_EXTENDED_USER_FIELDS = $template['extended-user-fields']; + $SIGNUP_EXTENDED_CAT = $template['extended-category']; +} +else +{ + require_once(e107::coreTemplatePath('signup')); //correct way to load a core template. +} + $signup_shortcodes = e107::getScBatch('signup'); +$signup_shortcodes->wrapper('signup'); // $facebook_shortcodes = e107::getScBatch('facebook',TRUE); $signup_imagecode = ($pref['signcode'] && extension_loaded('gd'));