mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Signup template upgraded to full v2.x standards. Template cleanup of usersettings and contact templates.

Browse Source
This commit is contained in:
Cameron
2021-01-03 10:17:01 -08:00
parent 566613f050
commit 721892f5bf
8 changed files with 499 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -21,7 +21,13 @@ e107::coreLan('signup');
class signup_shortcodes extends e_shortcode
{
function sc_signup_coppa_text($parm=null)
{
$text = LAN_SIGNUP_77. " <a target='_blank' href='http://www.ftc.gov/privacy/coppafaqs.shtm'>". LAN_SIGNUP_14."</a>. ".
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;
}

44
e107_core/templates/contact_template.php
View File

@@ -12,20 +12,6 @@
if (!defined('e107_INIT')) { exit; }
/*
if(!isset($CONTACT_INFO))
{
$CONTACT_INFO = "
<table style='".USER_WIDTH."' cellpadding='1' cellspacing='7'>
<tr>
<td>
{SITECONTACTINFO}
<br />
</td>
</tr>
</table>";
}
*/
$CONTACT_TEMPLATE['info'] = "
@@ -61,26 +47,18 @@ $CONTACT_TEMPLATE['menu'] = '
</div>
';
// 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'] = "<tr><td>{---}".LANCONTACT_07."</td></tr>";
// $SC_WRAPPER['CONTACT_PERSON'] = "<tr><td>".LANCONTACT_14."<br />{---}</td></tr>";
// $SC_WRAPPER['CONTACT_IMAGECODE'] = "<tr><td>".LANCONTACT_16."<br />{---}";
// $SC_WRAPPER['CONTACT_IMAGECODE_INPUT'] = "{---}</td></tr>";
// 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'] = "<div class='control-group form-group'><label for='code-verify'>{CONTACT_IMAGECODE_LABEL}</label> {---}";
$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] = "{---}</div>";
$CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] = "<div class='control-group form-group'>{---}".LANCONTACT_07."</div>";
$CONTACT_WRAPPER['form']['CONTACT_PERSON'] = "<div class='control-group form-group'><label for='contactPerson'>".LANCONTACT_14."</label>{---}</div>";
$CONTACT_TEMPLATE['form'] = "
// Shortcode wrappers.
$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] = "<div class='control-group form-group'><label for='code-verify'>{CONTACT_IMAGECODE_LABEL}</label> {---}";
$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] = "{---}</div>";
$CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] = "<div class='control-group form-group'>{---}".LANCONTACT_07."</div>";
$CONTACT_WRAPPER['form']['CONTACT_PERSON'] = "<div class='control-group form-group'><label for='contactPerson'>".LANCONTACT_14."</label>{---}</div>";
$CONTACT_TEMPLATE['form'] = "
<form action='".e_SELF."' method='post' id='contactForm' >
{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}";

220
e107_core/templates/legacy/signup_template.php Normal file
View File

@@ -0,0 +1,220 @@
<?php
/*
* e107 website system
*
* 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)
*
*
*
* $Source: /cvs_backup/e107_0.8/e107_themes/templates/signup_template.php,v $
* $Revision: 12837 $
* $Date: 2012-06-19 11:08:41 +0200 (di, 19 jun 2012) $
* $Author: e107coders $
*/
if (!defined('e107_INIT')) { exit; }
if (!defined("USER_WIDTH")){ define("USER_WIDTH", "width:100%"); }
$sc_style['SIGNUP_DISPLAYNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap' ><label for='username'>"
.LAN_SIGNUP_89."{SIGNUP_IS_MANDATORY=true}<br /><span class='smalltext'>".LAN_SIGNUP_90."</span></label>
</td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_DISPLAYNAME']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_REALNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='realname'>"
.LAN_SIGNUP_91."{SIGNUP_IS_MANDATORY=realname}</label>
</td>
<td class='forumheader3' style='width:70%' >";
$sc_style['SIGNUP_REALNAME']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_GDPR_INFO']['pre'] = "<tr style='vertical-align:top'><td class='forumheader' colspan='2' style='text-align:center'>";
$sc_style['SIGNUP_GDPR_INFO']['post'] = "</td>
</tr>";
if(!isset($SIGNUP_PASSWORD_LEN))
{
$SIGNUP_PASSWORD_LEN = "
<span class='smalltext'> (".LAN_SIGNUP_1." {$pref['signup_pass_len']} ".LAN_SIGNUP_2.")</span>";
}
if(!isset($SIGNUP_EXTENDED_USER_FIELDS))
{
$SIGNUP_EXTENDED_USER_FIELDS = "
<tr>
<td style='width:40%' class='forumheader3'>
<label>{EXTENDED_USER_FIELD_TEXT}
{EXTENDED_USER_FIELD_REQUIRED}</label>
</td>
<td style='width:60%' class='forumheader3'>
{EXTENDED_USER_FIELD_EDIT}
</td>
</tr>";
}
$sc_style['SIGNUP_SIGNATURE']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' ><label for='signature'>".LAN_SIGNUP_93." {SIGNUP_IS_MANDATORY=signature}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_SIGNATURE']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_IMAGES']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' ><label for='avatar'>".LAN_SIGNUP_94."{SIGNUP_IS_MANDATORY=avatar}</label></td>
<td class='forumheader3' style='width:70%;vertical-align:top'>";
$sc_style['SIGNUP_IMAGES']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_IMAGECODE']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%'><label for='code-verify'>".e107::getSecureImg()->renderLabel()."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_IMAGECODE']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_LOGINNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%'><label for='loginname'>".LAN_SIGNUP_81."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_LOGINNAME']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_HIDE_EMAIL']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>".LAN_USER_83."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_HIDE_EMAIL']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_EMAIL_CONFIRM']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email-confirm'>".LAN_SIGNUP_39."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = "
</td>
</tr>";
$sc_style['SIGNUP_XUP']['pre'] = "<div class='center' style='display:block;padding:10px'>";
$sc_style['SIGNUP_XUP']['post'] = "<h2 class='signup-divider'><span>".LAN_SIGNUP_120."</span></h2></div>";
$sc_style['SIGNUP_PASSWORD1']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password1'>".LAN_SIGNUP_83."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_PASSWORD1']['post'] = "</td>
</tr>";
$sc_style['SIGNUP_PASSWORD2']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password2'>".LAN_SIGNUP_84."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_PASSWORD2']['post'] = "</td>
</tr>";
$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>".LAN_SIGNUP_113."{SIGNUP_IS_MANDATORY=subscribe}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['post'] = "</td>
</tr>";
if(!isset($COPPA_TEMPLATE))
{
$COPPA_TEMPLATE =
LAN_SIGNUP_77." <a target='_blank' href='http://www.ftc.gov/privacy/coppafaqs.shtm'>".LAN_SIGNUP_14."</a>. "
.LAN_SIGNUP_15." ".e107::getParser()->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."<br />
<br />
<div style='text-align:center'><b>".LAN_SIGNUP_17."</b>
{SIGNUP_COPPA_FORM}
</div>";
}
if(!isset($COPPA_FAIL))
{
$COPPA_FAIL = "<div style='text-align:center'>".LAN_SIGNUP_9."</div>";
}
//if(!defined($SIGNUP_TEXT))
{
//$SIGNUP_TEXT = $tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // .
//LAN_SIGNUP_80." <b>".LAN_SIGNUP_29."</b><br /><br />".
//LAN_SIGNUP_30."<br />".
//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}
<div id='default'>
{SIGNUP_XUP_ACTION}
<table class='table fborder' style='".USER_WIDTH."'>
{SIGNUP_DISPLAYNAME}
{SIGNUP_LOGINNAME}
{SIGNUP_REALNAME}
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email'>".LAN_USER_60."{SIGNUP_IS_MANDATORY=email}</label></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_EMAIL}
</td>
</tr>
{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}
<tr style='vertical-align:top'>
<td class='forumheader' colspan='2' style='text-align:center'>
<input class='button btn btn-primary' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
<br />
</td>
</tr>
</table>
</div>
{SIGNUP_FORM_CLOSE}";
}
if(!isset($SIGNUP_EXTENDED_CAT))
{
$SIGNUP_EXTENDED_CAT = "
<tr>
<td colspan='2' class='forumheader'>
{EXTENDED_CAT_TEXT}
</td>
</tr>";
}
if(!isset($SIGNUP_END))
{
$SIGNUP_END = '';
}

159
e107_core/templates/legacy/usersettings_template.php Normal file
View File

@@ -0,0 +1,159 @@
<?php
if (!defined("USER_WIDTH"))
{
define("USER_WIDTH", "width:97%");
}
// global $usersettings_shortcodes, $pref;
$sc_style['CUSTOMTITLE']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_04.":</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['CUSTOMTITLE']['post'] = "</td></tr>\n";
$sc_style['PASSWORD1']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USET_24."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['PASSWORD1']['post'] = "</td></tr>\n";
$sc_style['PASSWORD2']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USET_25."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['PASSWORD2']['post'] = "</td></tr>\n";
$sc_style['PASSWORD_LEN']['pre'] = "<br /><span class='smalltext'> (".LAN_USER_78." ";
$sc_style['PASSWORD_LEN']['post'] = " ".LAN_USER_79.")</span>";
$sc_style['USERCLASSES']['pre'] = "<tr>
<td style='width:40%;vertical-align:top' class='forumheader3'>".LAN_USER_76.":".req(e107::getPref('signup_option_class'))."
<br /><span class='smalltext'>".LAN_USER_73."</span>
</td>
<td style='width:60%' class='forumheader2'>";
$sc_style['USERCLASSES']['post'] = "</td></tr>\n";
$sc_style['AVATAR_UPLOAD']['pre'] = "<tr>
<td style='width:40%; vertical-align:top' class='forumheader3'>".LAN_USET_26."<br /></td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['AVATAR_UPLOAD']['post'] = "</td></tr>\n";
$sc_style['PHOTO_UPLOAD']['pre'] = "<tr>
<td style='width:40%; vertical-align:top' class='forumheader3'>".LAN_USER_06."</td>
<td style='width:60%' class='forumheader2'><span class='smalltext'>\n";
$sc_style['PHOTO_UPLOAD']['post'] = "</span></td></tr>";
$sc_style['USERNAME']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_01."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['USERNAME']['post'] = "</td</tr>";
$sc_style['LOGINNAME']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_81."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['LOGINNAME']['post'] = "</td></tr>\n";
$sc_style['SIGNATURE']['pre'] = "<tr><td style='width:40%;vertical-align:top' class='forumheader3'>".LAN_USER_71.req(e107::getPref('signup_option_signature'))."</td>
<td style='width:60%' class='forumheader2'>";
//$sc_style['SIGNATURE']['pre'] = "<tr><td style='width:40%;vertical-align:top' class='forumheader3'></td>
// <td style='width:60%' class='forumheader2'>";
// $sc_style['SIGNATURE_HELP']['pre'] = "</td></tr>"; \
$sc_style['SIGNATURE_HELP']['post'] = "</td></tr>";
$USER_EXTENDED_CAT = "<tr><td colspan='2' class='forumheader'>{CATNAME}</td></tr>";
$USEREXTENDED_FIELD = "<tr>
<td style='width:40%' class='forumheader3'>
{FIELDNAME}
</td>
<td style='width:60%' class='forumheader3'>
{FIELDVAL} {HIDEFIELD}
</td>
</tr>
";
$REQUIRED_FIELD = "{FIELDNAME} <span class='required'><!-- emtpy --></span>";
// After Saving has occurred.
$USERSETTINGS_MESSAGE = "{MESSAGE}";
$USERSETTINGS_MESSAGE_CAPTION = LAN_OK;
$USERSETTINGS_EDIT_CAPTION = LAN_USET_39; // 'Update User Settings'
$USERSETTINGS_EDIT = "
<div style='text-align:center'>
<table style='".USER_WIDTH."' class='table fborder adminform'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tr>
<td colspan='2' class='forumheader'>".LAN_USET_31."</td>
</tr>
{USERNAME}
{LOGINNAME}
<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_60.req(!e107::getPref('disable_emailcheck'))."</td>
<td style='width:60%' class='forumheader2'>
{EMAIL}
</td>
</tr>
{REALNAME}
{CUSTOMTITLE}
{PASSWORD1}
{PASSWORD_LEN}
{PASSWORD2}
<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_83."</td>
<td style='width:60%' class='forumheader2'><span class='defaulttext'>
{HIDEEMAIL=radio}
</span>
</td>
</tr>
<tr>
<td style='width:40%; vertical-align:top' class='forumheader3'>".LAN_USER_07.req(e107::getPref('signup_option_image'))."</td>
<td style='width:60%' class='forumheader2'>
{AVATAR_REMOTE}
</td>
</tr>
{AVATAR_UPLOAD}
{PHOTO_UPLOAD}
{USERCLASSES}
{USEREXTENDED_ALL}
{SIGNATURE=cols=58&rows=4}
{SIGNATURE_HELP}
</tr>
</table>
<div>
{UPDATESETTINGSBUTTON}
{DELETEACCOUNTBUTTON}
</div>
</div>
";

211
e107_core/templates/signup_template.php
View File

@@ -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'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap' ><label for='username'>"
.LAN_SIGNUP_89."{SIGNUP_IS_MANDATORY=true}<br /><span class='smalltext'>".LAN_SIGNUP_90."</span></label>
</td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_DISPLAYNAME']['post'] = "
</td>
. LAN_SIGNUP_89 . "{SIGNUP_IS_MANDATORY=true}<br /><span class='smalltext'>" . LAN_SIGNUP_90 . "</span></label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_REALNAME']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_REALNAME'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='realname'>"
.LAN_SIGNUP_91."{SIGNUP_IS_MANDATORY=realname}</label>
</td>
<td class='forumheader3' style='width:70%' >";
$sc_style['SIGNUP_REALNAME']['post'] = "
</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='realname'>" . LAN_SIGNUP_91 . "{SIGNUP_IS_MANDATORY=realname}</label></td>
<td class='forumheader3' style='width:70%' >{---}</td>
</tr>";
$sc_style['SIGNUP_GDPR_INFO']['pre'] = "<tr style='vertical-align:top'><td class='forumheader' colspan='2' style='text-align:center'>";
$sc_style['SIGNUP_GDPR_INFO']['post'] = "</td>
</tr>";
if(!isset($SIGNUP_PASSWORD_LEN))
{
$SIGNUP_PASSWORD_LEN = "
<span class='smalltext'> (".LAN_SIGNUP_1." {$pref['signup_pass_len']} ".LAN_SIGNUP_2.")</span>";
}
if(!isset($SIGNUP_EXTENDED_USER_FIELDS))
{
$SIGNUP_EXTENDED_USER_FIELDS = "
<tr>
<td style='width:40%' class='forumheader3'>
<label>{EXTENDED_USER_FIELD_TEXT}
{EXTENDED_USER_FIELD_REQUIRED}</label>
</td>
<td style='width:60%' class='forumheader3'>
{EXTENDED_USER_FIELD_EDIT}
</td>
</tr>";
}
$SIGNUP_WRAPPER['SIGNUP_GDPR_INFO'] = "<tr style='vertical-align:top'><td class='forumheader' colspan='2' style='text-align:center'>{---}</td></tr>";
$sc_style['SIGNUP_SIGNATURE']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_SIGNATURE'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' ><label for='signature'>".LAN_SIGNUP_93." {SIGNUP_IS_MANDATORY=signature}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_SIGNATURE']['post'] = "
</td>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' ><label for='signature'>" . LAN_SIGNUP_93 . " {SIGNUP_IS_MANDATORY=signature}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_IMAGES']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_IMAGES'] = "
<tr>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' ><label for='avatar'>".LAN_SIGNUP_94."{SIGNUP_IS_MANDATORY=avatar}</label></td>
<td class='forumheader3' style='width:70%;vertical-align:top'>";
$sc_style['SIGNUP_IMAGES']['post'] = "
</td>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' ><label for='avatar'>" . LAN_SIGNUP_94 . "{SIGNUP_IS_MANDATORY=avatar}</label></td>
<td class='forumheader3' style='width:70%;vertical-align:top'>{---}</td>
</tr>";
$sc_style['SIGNUP_IMAGECODE']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_IMAGECODE'] = "
<tr>
<td class='forumheader3' style='width:30%'><label for='code-verify'>".e107::getSecureImg()->renderLabel()."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_IMAGECODE']['post'] = "
</td>
<td class='forumheader3' style='width:30%'><label for='code-verify'>" . e107::getSecureImg()->renderLabel() . "{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_LOGINNAME']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_LOGINNAME'] = "
<tr>
<td class='forumheader3' style='width:30%'><label for='loginname'>".LAN_SIGNUP_81."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_LOGINNAME']['post'] = "
</td>
<td class='forumheader3' style='width:30%'><label for='loginname'>" . LAN_SIGNUP_81 . "{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_HIDE_EMAIL']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_HIDE_EMAIL'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>".LAN_USER_83."</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_HIDE_EMAIL']['post'] = "
</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>" . LAN_USER_83 . "</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_EMAIL_CONFIRM']['pre'] = "
$SIGNUP_WRAPPER['SIGNUP_EMAIL_CONFIRM'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email-confirm'>".LAN_SIGNUP_39."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_EMAIL_CONFIRM']['post'] = "
</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email-confirm'>" . LAN_SIGNUP_39 . "{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_XUP']['pre'] = "<div class='center' style='display:block;padding:10px'>";
$sc_style['SIGNUP_XUP']['post'] = "<h2 class='signup-divider'><span>".LAN_SIGNUP_120."</span></h2></div>";
$SIGNUP_WRAPPER['SIGNUP_XUP'] = "<div class='center' style='display:block;padding:10px'>{---}
<h2 class='signup-divider'><span>" . LAN_SIGNUP_120 . "</span></h2></div>";
$sc_style['SIGNUP_PASSWORD1']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password1'>".LAN_SIGNUP_83."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_PASSWORD1']['post'] = "</td>
$SIGNUP_WRAPPER['SIGNUP_PASSWORD1'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password1'>" . LAN_SIGNUP_83 . "{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_PASSWORD2']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password2'>".LAN_SIGNUP_84."{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_PASSWORD2']['post'] = "</td>
$SIGNUP_WRAPPER['SIGNUP_PASSWORD2'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='password2'>" . LAN_SIGNUP_84 . "{SIGNUP_IS_MANDATORY=true}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['pre'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>".LAN_SIGNUP_113."{SIGNUP_IS_MANDATORY=subscribe}</label></td>
<td class='forumheader3' style='width:70%'>";
$sc_style['SIGNUP_USERCLASS_SUBSCRIBE']['post'] = "</td>
$SIGNUP_WRAPPER['SIGNUP_USERCLASS_SUBSCRIBE'] = "<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label>" . LAN_SIGNUP_113 . "{SIGNUP_IS_MANDATORY=subscribe}</label></td>
<td class='forumheader3' style='width:70%'>{---}</td>
</tr>";
if(!isset($COPPA_TEMPLATE))
{
$COPPA_TEMPLATE =
LAN_SIGNUP_77." <a target='_blank' href='http://www.ftc.gov/privacy/coppafaqs.shtm'>".LAN_SIGNUP_14."</a>. "
.LAN_SIGNUP_15." ".e107::getParser()->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."<br />
<br />
<div style='text-align:center'><b>".LAN_SIGNUP_17."</b>
{SIGNUP_COPPA_FORM}
</div>";
}
// Template v2.x spec.
if(!isset($COPPA_FAIL))
{
$COPPA_FAIL = "<div style='text-align:center'>".LAN_SIGNUP_9."</div>";
}
//if(!defined($SIGNUP_TEXT))
{
//$SIGNUP_TEXT = $tp->parseTemplate("{SIGNUP_SIGNUP_TEXT}"); // .
//LAN_SIGNUP_80." <b>".LAN_SIGNUP_29."</b><br /><br />".
//LAN_SIGNUP_30."<br />".
//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}
<div id='default'>
{SIGNUP_XUP_ACTION}
<table class='table fborder' style='".USER_WIDTH."'>
<table class='table fborder' >
{SIGNUP_DISPLAYNAME}
{SIGNUP_LOGINNAME}
{SIGNUP_REALNAME}
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email'>".LAN_USER_60."{SIGNUP_IS_MANDATORY=email}</label></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'><label for='email'>" . LAN_USER_60 . "{SIGNUP_IS_MANDATORY=email}</label></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_EMAIL}
</td>
@@ -194,40 +126,41 @@ if(!isset($SIGNUP_BODY))
{SIGNUP_GDPR_INFO}
<tr style='vertical-align:top'>
<td class='forumheader' colspan='2' style='text-align:center'>
<input class='button btn btn-primary' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
<input class='button btn btn-primary' type='submit' name='register' value=\"{LAN=LAN_SIGNUP_79}\" />
<br />
</td>
</tr>
</table>
</div>
{SIGNUP_FORM_CLOSE}";
}
if(!isset($SIGNUP_EXTENDED_CAT))
{
$SIGNUP_EXTENDED_CAT = "
$SIGNUP_TEMPLATE['end'] = '';
$SIGNUP_TEMPLATE['coppa'] = "{SIGNUP_COPPA_TEXT}<br /><br />
<div style='text-align:center'><b>{LAN=LAN_SIGNUP_17}</b>
{SIGNUP_COPPA_FORM}
</div>";
$SIGNUP_TEMPLATE['coppa-fail'] = "<div class='alert alert-danger alert-block' style='text-align:center'>{LAN=LAN_SIGNUP_9}</div>";
$SIGNUP_TEMPLATE['extended-category'] = "
<tr>
<td colspan='2' class='forumheader'>
{EXTENDED_CAT_TEXT}
</td>
</tr>";
}
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'] = "
<tr>
<td style='width:40%' class='forumheader3'>
<label>{EXTENDED_USER_FIELD_TEXT}
{EXTENDED_USER_FIELD_REQUIRED}</label>
</td>
<td style='width:60%' class='forumheader3'>
{EXTENDED_USER_FIELD_EDIT}
</td>
</tr>";

167
e107_core/templates/usersettings_template.php
View File

@@ -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'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_04.":</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['CUSTOMTITLE']['post'] = "</td></tr>\n";
$sc_style['PASSWORD1']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USET_24."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['PASSWORD1']['post'] = "</td></tr>\n";
$sc_style['PASSWORD2']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USET_25."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['PASSWORD2']['post'] = "</td></tr>\n";
$sc_style['PASSWORD_LEN']['pre'] = "<br /><span class='smalltext'> (".LAN_USER_78." ";
$sc_style['PASSWORD_LEN']['post'] = " ".LAN_USER_79.")</span>";
$sc_style['USERCLASSES']['pre'] = "<tr>
<td style='width:40%;vertical-align:top' class='forumheader3'>".LAN_USER_76.":".req(e107::getPref('signup_option_class'))."
<br /><span class='smalltext'>".LAN_USER_73."</span>
</td>
<td style='width:60%' class='forumheader2'>";
$sc_style['USERCLASSES']['post'] = "</td></tr>\n";
$sc_style['AVATAR_UPLOAD']['pre'] = "<tr>
<td style='width:40%; vertical-align:top' class='forumheader3'>".LAN_USET_26."<br /></td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['AVATAR_UPLOAD']['post'] = "</td></tr>\n";
$sc_style['PHOTO_UPLOAD']['pre'] = "<tr>
<td style='width:40%; vertical-align:top' class='forumheader3'>".LAN_USER_06."</td>
<td style='width:60%' class='forumheader2'><span class='smalltext'>\n";
$sc_style['PHOTO_UPLOAD']['post'] = "</span></td></tr>";
$sc_style['USERNAME']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_01."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['USERNAME']['post'] = "</td</tr>";
$sc_style['LOGINNAME']['pre'] = "<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_81."</td>
<td style='width:60%' class='forumheader2'>\n";
$sc_style['LOGINNAME']['post'] = "</td></tr>\n";
$sc_style['SIGNATURE']['pre'] = "<tr><td style='width:40%;vertical-align:top' class='forumheader3'>".LAN_USER_71.req(e107::getPref('signup_option_signature'))."</td>
<td style='width:60%' class='forumheader2'>";
//$sc_style['SIGNATURE']['pre'] = "<tr><td style='width:40%;vertical-align:top' class='forumheader3'></td>
// <td style='width:60%' class='forumheader2'>";
// $sc_style['SIGNATURE_HELP']['pre'] = "</td></tr>"; \
$sc_style['SIGNATURE_HELP']['post'] = "</td></tr>";
$USER_EXTENDED_CAT = "<tr><td colspan='2' class='forumheader'>{CATNAME}</td></tr>";
$USEREXTENDED_FIELD = "<tr>
<td style='width:40%' class='forumheader3'>
{FIELDNAME}
</td>
<td style='width:60%' class='forumheader3'>
{FIELDVAL} {HIDEFIELD}
</td>
</tr>
";
$REQUIRED_FIELD = "{FIELDNAME} <span class='required'><!-- emtpy --></span>";
// After Saving has occurred.
$USERSETTINGS_MESSAGE = "{MESSAGE}";
$USERSETTINGS_MESSAGE_CAPTION = LAN_OK;
$USERSETTINGS_EDIT_CAPTION = LAN_USET_39; // 'Update User Settings'
$USERSETTINGS_EDIT = "
<div style='text-align:center'>
<table style='".USER_WIDTH."' class='table fborder adminform'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tr>
<td colspan='2' class='forumheader'>".LAN_USET_31."</td>
</tr>
{USERNAME}
{LOGINNAME}
<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_60.req(!e107::getPref('disable_emailcheck'))."</td>
<td style='width:60%' class='forumheader2'>
{EMAIL}
</td>
</tr>
{REALNAME}
{CUSTOMTITLE}
{PASSWORD1}
{PASSWORD_LEN}
{PASSWORD2}
<tr>
<td style='width:40%' class='forumheader3'>".LAN_USER_83."</td>
<td style='width:60%' class='forumheader2'><span class='defaulttext'>
{HIDEEMAIL=radio}
</span>
</td>
</tr>
<tr>
<td style='width:40%; vertical-align:top' class='forumheader3'>".LAN_USER_07.req(e107::getPref('signup_option_image'))."</td>
<td style='width:60%' class='forumheader2'>
{AVATAR_REMOTE}
</td>
</tr>
{AVATAR_UPLOAD}
{PHOTO_UPLOAD}
{USERCLASSES}
{USEREXTENDED_ALL}
{SIGNATURE=cols=58&rows=4}
{SIGNATURE_HELP}
</tr>
</table>
<div>
{UPDATESETTINGSBUTTON}
{DELETEACCOUNTBUTTON}
</div>
</div>
";
@@ -244,21 +86,15 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "<div class='form-group'>
// Bootstrap 3 only.
// Bootstrap only.
$USERSETTINGS_TEMPLATE = array();
$USERSETTINGS_TEMPLATE['edit'] = "
<div>
{USERNAME}
{LOGINNAME}
<div class='form-group'>
<label for='email' class='col-sm-3 control-label'>".LAN_USER_60.req(!e107::getPref('disable_emailcheck'))."</label>
<div class='col-sm-9'>
@@ -274,7 +110,6 @@ $USERSETTINGS_TEMPLATE['edit'] = "
{PASSWORD2}
<div class='form-group'>
<label for='hideemail' class='col-sm-3 control-label'>".LAN_USER_83."</label>
<div class='col-sm-9'>

2
e107_languages/English/lan_signup.php
View File

@@ -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.");

17
signup.php
View File

@@ -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'));