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

Fixes #1462 - Hiding of password in signup email.

Browse Source
This commit is contained in:
Cameron
2016-04-04 18:00:07 -07:00
parent 9c5f7e1087
commit e073a2cb87
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/templates/email_template.php
View File

@@ -178,7 +178,7 @@ $EMAIL_TEMPLATE['signup']['body'] = "
<br /> <br />
".LAN_SIGNUP_18."<br /> ".LAN_SIGNUP_18."<br />
<br /> <br />
".LAN_LOGINNAME.": <b> {LOGINNAME} </b><br /> ".LAN_LOGIN.": <b> {LOGINNAME} </b><br />
".LAN_PASSWORD.": <b> {PASSWORD} </b><br /> ".LAN_PASSWORD.": <b> {PASSWORD} </b><br />
<br /> <br />
".LAN_EMAIL_04."<br /> ".LAN_EMAIL_04."<br />

15
e107_handlers/user_model.php
View File

@@ -1247,14 +1247,17 @@ class e_system_user extends e_user_model
return array(); return array();
} }
$pass_show = varset($userInfo['user_password']);
//
// signup email only // signup email only
if($type == 'signup') if($type == 'signup')
{ {
$HEAD = ''; $HEAD = '';
$FOOT = ''; $FOOT = '';
$pass_show = e107::pref('core','user_reg_secureveri', false);
$ret['e107_header'] = $userInfo['user_id']; $ret['e107_header'] = $userInfo['user_id'];
@@ -1275,7 +1278,7 @@ class e_system_user extends e_user_model
$sc = array(); $sc = array();
$sc['LOGINNAME'] = intval($pref['allowEmailLogin']) === 0 ? $userInfo['user_loginname'] : $userInfo['user_email']; $sc['LOGINNAME'] = intval($pref['allowEmailLogin']) === 0 ? $userInfo['user_loginname'] : $userInfo['user_email'];
$sc['PASSWORD'] = $pass_show ? $pass_show : '******'; $sc['PASSWORD'] = ($pass_show && !empty($userInfo['user_password'])) ? '*************' : $userInfo['user_password'];
$sc['ACTIVATION_LINK'] = strpos($userInfo['activation_url'], 'http') === 0 ? '<a href="'.$userInfo['activation_url'].'">'.$userInfo['activation_url'].'</a>' : $userInfo['activation_url']; $sc['ACTIVATION_LINK'] = strpos($userInfo['activation_url'], 'http') === 0 ? '<a href="'.$userInfo['activation_url'].'">'.$userInfo['activation_url'].'</a>' : $userInfo['activation_url'];
// $sc['SITENAME'] = SITENAME; // $sc['SITENAME'] = SITENAME;
$sc['SITEURL'] = "<a href='".SITEURL."' {$style}>".SITEURL."</a>"; $sc['SITEURL'] = "<a href='".SITEURL."' {$style}>".SITEURL."</a>";
@@ -1348,7 +1351,7 @@ class e_system_user extends e_user_model
return array(); return array();
} }
$templateName = $ret['template']; $templateName = $ret['template'];
$ret['email_subject'] = varset($EMAIL_TEMPLATE[$templateName]['subject'], $EMAIL_TEMPLATE['default']['subject']) ; // $subject; $ret['email_subject'] = varset($EMAIL_TEMPLATE[$templateName]['subject'], $EMAIL_TEMPLATE['default']['subject']) ; // $subject;
@@ -1364,8 +1367,8 @@ class e_system_user extends e_user_model
$sc['DISPLAYNAME'] = $userInfo['user_login'] ? $userInfo['user_login'] : $userInfo['user_name']; $sc['DISPLAYNAME'] = $userInfo['user_login'] ? $userInfo['user_login'] : $userInfo['user_name'];
$sc['SITEURL'] = "<a href='".SITEURL."'>".SITEURL."</a>"; $sc['SITEURL'] = "<a href='".SITEURL."'>".SITEURL."</a>";
$sc['USERNAME'] = $userInfo['user_name']; $sc['USERNAME'] = $userInfo['user_name'];
$sc['USERURL'] = vartrue($userInfo['user_website']) ? $userInfo['user_website'] : ""; $sc['USERURL'] = vartrue($userInfo['user_website'], '');
$sc['PASSWORD'] = $pass_show ? $pass_show : '******'; $sc['PASSWORD'] = vartrue($userInfo['user_password'], '***********');
$sc['SUBJECT'] = $userInfo['mail_subject']; $sc['SUBJECT'] = $userInfo['mail_subject'];

2
signup.php
View File

@@ -505,7 +505,7 @@ class signup
$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_email'] = "test-username@email.com";
$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";