mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Show user email as login name when required

Browse Source
This commit is contained in:
secretr
2012-05-09 14:57:30 +00:00
parent bed78df539
commit c244d683f8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
signup.php
View File

@@ -562,7 +562,7 @@ if (isset($_POST['register']))
} }
$adviseLoginName = ''; $adviseLoginName = '';
if (varsettrue($pref['predefinedLoginName'])) if (varsettrue($pref['predefinedLoginName']) && (integer) $pref['allowEmailLogin'] === 0)
{ {
$adviseLoginName = LAN_SIGNUP_65.': '.$allData['data']['user_loginname'].'<br />'.LAN_SIGNUP_66.'<br />'; $adviseLoginName = LAN_SIGNUP_65.': '.$allData['data']['user_loginname'].'<br />'.LAN_SIGNUP_66.'<br />';
} }
@@ -726,6 +726,7 @@ function render_email($userInfo, $preview = FALSE)
$userInfo['user_password'] = "test-password"; $userInfo['user_password'] = "test-password";
$userInfo['user_loginname'] = "test-loginname"; $userInfo['user_loginname'] = "test-loginname";
$userInfo['user_name'] = "test-username"; $userInfo['user_name'] = "test-username";
$userInfo['user_email'] = "test-username@email";
$userInfo['user_website'] = "www.test-site.com"; // This may not be defined $userInfo['user_website'] = "www.test-site.com"; // This may not be defined
$userInfo['user_id'] = 0; $userInfo['user_id'] = 0;
$userInfo['user_sess'] = "1234567890ABCDEFGHIJKLMNOP"; $userInfo['user_sess'] = "1234567890ABCDEFGHIJKLMNOP";
@@ -761,7 +762,7 @@ function render_email($userInfo, $preview = FALSE)
$style = ($SIGNUPEMAIL_LINKSTYLE) ? "style='{$SIGNUPEMAIL_LINKSTYLE}'" : ""; $style = ($SIGNUPEMAIL_LINKSTYLE) ? "style='{$SIGNUPEMAIL_LINKSTYLE}'" : "";
$search[0] = '{LOGINNAME}'; $search[0] = '{LOGINNAME}';
$replace[0] = $userInfo['user_loginname']; $replace[0] = intval($pref['allowEmailLogin']) === 0 ? $userInfo['user_loginname'] : $userInfo['user_email'];
$search[1] = '{PASSWORD}'; $search[1] = '{PASSWORD}';
$replace[1] = $pass_show; $replace[1] = $pass_show;