Skip to content

Commit

Permalink
User Send Password and Login Reminder now uses Templates and can be s…
Browse files Browse the repository at this point in the history 
…ent as HTML

For feature #1003

Also fixed Send User Password logic and User Admin form now requires strong passwords like user settings
  • Loading branch information
@eSilverStrike
eSilverStrike committed Apr 6, 2022
1 parent ca27e56 commit bf77977
Show file tree
Hide file tree
Showing 11 changed files with 143 additions and 72 deletions.
10 changes: 5 additions & 5 deletions language/english.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
11 => 'No User Comments',
12 => 'User Preferences for',
13 => 'Email Nightly Digest',
14 => 'This password is generated by a randomizer. It is recommended that you change this password immediately. To change your password, log in and then click My Account from the User Functions menu.',
14 => 'Since this password was sent by email, it is recommended that you change it immediately. To change your password, log in and then click My Account from the User Functions menu.',
15 => "Your {$_CONF['site_name']} account has been created successfully. To be able to use it, you must login using the information below. Please save this mail for further reference.",
'email_convert_remote' => "Your {$_CONF['site_name']} remote account has been converted to a local account. To continue to use your account, you must login using the information below. Please save this mail for further reference.",
16 => 'Your Account Information',
Expand Down Expand Up @@ -1278,11 +1278,11 @@
78 => 'Send Reminder',
79 => 'No User selected for reminders',
80 => 'Successfully sent Reminders',
81 => 'Reminder to verify account for %s',
82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not accessed in the next 30 days.",
81 => 'Reminder to access your user account on %s',
82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not used soon.",
83 => "Your account on {$_CONF['site_name']} has not been used since it was created and will be deleted soon if not accessed.",
84 => "Your login name is: %s for our site: {$_CONF['site_url']}",
85 => 'If you have forgotten the password use the following link: %s',
84 => "Your login name is: %s for our site: {$_CONF['site_url']}",
85 => 'If you have forgotten the password use the following link: ',
86 => 'Include',
87 => 'Reminders',
88 => 'Default Group',
Expand Down
10 changes: 5 additions & 5 deletions language/english_utf-8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
11 => 'No User Comments',
12 => 'User Preferences for',
13 => 'Email Nightly Digest',
14 => 'This password is generated by a randomizer. It is recommended that you change this password immediately. To change your password, log in and then click My Account from the User Functions menu.',
14 => 'Since this password was sent by email, it is recommended that you change it immediately. To change your password, log in and then click My Account from the User Functions menu.',
15 => "Your {$_CONF['site_name']} account has been created successfully. To be able to use it, you must login using the information below. Please save this mail for further reference.",
'email_convert_remote' => "Your {$_CONF['site_name']} remote account has been converted to a local account. To continue to use your account, you must login using the information below. Please save this mail for further reference.",
16 => 'Your Account Information',
Expand Down Expand Up @@ -1277,11 +1277,11 @@
78 => 'Send Reminder',
79 => 'No User selected for reminders',
80 => 'Successfully sent Reminders',
81 => 'Reminder to verify account for %s',
82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not accessed in the next 30 days.",
81 => 'Reminder to access your user account on %s',
82 => "Your account on {$_CONF['site_name']} has not been accessed since %s and will be disabled if not used soon.",
83 => "Your account on {$_CONF['site_name']} has not been used since it was created and will be deleted soon if not accessed.",
84 => "Your login name is: %s for our site: {$_CONF['site_url']}",
85 => 'If you have forgotten the password use the following link: %s',
84 => "Your login name is: %s for our site: {$_CONF['site_url']}",
85 => 'If you have forgotten the password use the following link: ',
86 => 'Include',
87 => 'Reminders',
88 => 'Default Group',
Expand Down
2 changes: 1 addition & 1 deletion language/japanese_utf-8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@
82 => "あなたの{$_CONF['site_name']}のアカウントは%sからアクセスしていません。今後30日以内にアクセスしないと無効になりますのでご注意ください。",
83 => "あなたの{$_CONF['site_name']}のアカウントは作成後使用していません。このままアクセスしないと近日中に削除しますのでご注意ください。",
84 => "あなたのログイン名: %s サイト名: {$_CONF['site_url']}",
85 => 'パスワードを紛失した場合には、以下のリンクをクリックしてください: %s',
85 => 'パスワードを紛失した場合には、以下のリンクをクリックしてください: ',
86 => '含む',
87 => 'リマインダー',
88 => 'デフォルトグループ',
Expand Down
143 changes: 87 additions & 56 deletions public_html/admin/user.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ function listusers()
*/
function saveusers($uid, $username, $fullname, $passwd, $passwd_conf, $email, $regdate, $homepage, $location, $postmode, $signature, $pgpkey, $about, $groups, $delete_photo = '', $convert_remote = '', $userstatus = 3, $oldstatus = 3, $enable_twofactorauth = 0)
{
global $_CONF, $_TABLES, $_USER, $LANG04, $LANG28, $_USER_VERBOSE;
global $_CONF, $_TABLES, $_USER, $LANG04, $LANG28, $LANG31, $_USER_VERBOSE;

$retval = '';
$userChanged = false;
Expand All @@ -625,24 +625,33 @@ function saveusers($uid, $username, $fullname, $passwd, $passwd_conf, $email, $r
$service = DB_getItem($_TABLES['users'], 'remoteservice', "uid = $uid");
// If remote service then assume blank password
if (!empty($service)) {
$passwd_changed = false;
$passwd = '';
$passwd_conf = '';

// Make sure User Status is not some how USER_ACCOUNT_NEW_PASSWORD for remote users
if ($userstatus == USER_ACCOUNT_NEW_PASSWORD) {
$userstatus = USER_ACCOUNT_ACTIVE;
}
}

$passwd_changed = true;
if (empty($service) && (SEC_encryptUserPassword($passwd, $uid) === 0) && ($passwd_conf === '')) {
$passwd_changed = false;
}

if ($passwd_changed && ($passwd != $passwd_conf)) { // passwords don't match
return edituser($uid, 67);
}

} else {
$passwd_changed = true;
if ((SEC_encryptUserPassword($passwd, $uid) === 0) && ($passwd_conf === '')) {
$passwd_changed = false;
}

if ($passwd_changed && ($passwd != $passwd_conf)) { // passwords don't match
return edituser($uid, 67);
}

if ($passwd_changed && !SEC_checkPasswordStrength($passwd)) { // Strong Passwords
return edituser($uid, 504);
}

if ($passwd_changed && empty($passwd)) { // no empty passwords
$passwd_changed = false;
}
}

$nameAndEmailOkay = true;
if (empty($username)) {
$nameAndEmailOkay = false;
Expand Down Expand Up @@ -710,8 +719,6 @@ function saveusers($uid, $username, $fullname, $passwd, $passwd_conf, $email, $r
// basic filtering only (same as in usersettings.php)
$fullname = GLText::stripTags(GLText::remove4byteUtf8Chars($fullname));
$location = GLText::stripTags(GLText::remove4byteUtf8Chars($location));
//$signature = GLText::stripTags(GLText::remove4byteUtf8Chars($signature));
//$about = GLText::stripTags(GLText::remove4byteUtf8Chars($about));
$postmode = ($postmode === 'html') ? 'html' : 'plaintext';
if ($postmode === 'html') {
// HTML
Expand Down Expand Up @@ -795,7 +802,7 @@ function saveusers($uid, $username, $fullname, $passwd, $passwd_conf, $email, $r

DB_query("UPDATE {$_TABLES['users']} SET username = '{$escUserName}', fullname = '{$escFullName}', email = '$email', homepage = '$homepage', sig = '$signature', postmode='$postmode', photo = '$curphoto', status = '$userstatus' $sql_enable_twofactorauth WHERE uid = {$uid}");
DB_query("UPDATE {$_TABLES['user_attributes']} SET pgpkey='$pgpkey',about='$about',location='$location' WHERE uid=$uid");
if ($passwd_changed && !empty($passwd)) {
if ($passwd_changed) {
SEC_updateUserPassword($passwd, $uid);
}
if ($_CONF['custom_registration'] AND (function_exists('CUSTOM_userSave'))) {
Expand Down Expand Up @@ -882,21 +889,36 @@ function saveusers($uid, $username, $fullname, $passwd, $passwd_conf, $email, $r
}

// Send password to the user
if (!empty($uid) && ($uid > 1) &&
(Input::fPost('send_passwd') === 'on') &&
($emailData['is_new_user'] || $passwd_changed)) {
$subject = $_CONF['site_name'] . ': ' . $LANG04[16];
$mailText = $emailData['is_new_user'] ? $LANG04[15] : $LANG04[170];
$mailText .= "\n\n"
. $LANG04[2] . ": {$emailData['username']}\n"
. $LANG04[4] . ": {$emailData['password']}\n\n"
. $LANG04[14] . "\n\n"
. $_CONF['site_name'] . "\n"
. $_CONF['site_url'] . "\n";

if (!COM_mail($emailData['email'], $subject, $mailText)) {
if (!empty($uid) && ($uid > 1) && (Input::fPost('send_passwd') === 'on') && ($emailData['is_new_user'] || $passwd_changed)) {
// Create HTML and plaintext version of email
$t = COM_newTemplate(CTL_core_templatePath($_CONF['path_layout'] . 'emails/'));

$t->set_file(array('email_html' => 'user_send_password-html.thtml'));
$t->set_file(array('email_plaintext' => 'user_send_password-plaintext.thtml'));

$t->set_var('email_divider', $LANG31['email_divider']);
$t->set_var('email_divider_html', $LANG31['email_divider_html']);
$t->set_var('LB', LB);

$t->set_var('lang_user_password_msg', $emailData['is_new_user'] ? $LANG04[15] : $LANG04[170]);
$t->set_var('lang_username', $LANG04[2]);
$t->set_var('username', $username);
$t->set_var('lang_new_password', $LANG04[4]);
$t->set_var('password', $emailData['password']);
$t->set_var('lang_password_msg', $LANG04[14]);
$t->set_var('site_name', $_CONF['site_name']);
$t->set_var('site_url', $_CONF['site_url']);
$t->set_var('site_slogan', $_CONF['site_slogan']);

// Output final content
$message[] = $t->parse('output', 'email_html');
$message[] = $t->parse('output', 'email_plaintext');

$mailSubject = $_CONF['site_name'] . ': ' . $LANG04[16];

if (!COM_mail($emailData['email'], $mailSubject, $message, '', true)) {
COM_errorLog(sprintf('failed to send a new password to user (uid: %d)', $uid));
}
}
}

if ($userChanged) {
Expand Down Expand Up @@ -1181,7 +1203,7 @@ function batchdeleteexec()
*/
function batchreminders()
{
global $_CONF, $_TABLES, $LANG04, $LANG28;
global $_CONF, $_TABLES, $LANG04, $LANG28, $LANG31;

$msg = '';
$user_list = Geeklog\Input::fPost('delitem', array());
Expand All @@ -1198,32 +1220,41 @@ function batchreminders()
$username = DB_getItem($_TABLES['users'], 'username', "uid = '{$userid}'");
$lastlogin = DB_getItem($_TABLES['user_attributes'], 'lastlogin', "uid = '{$userid}'");
$lasttime = COM_getUserDateTimeFormat($lastlogin);
if (file_exists($_CONF['path_data'] . 'reminder_email.txt')) {
$template = COM_newTemplate(CTL_core_templatePath($_CONF['path_data']));
$template->set_file(array('mail' => 'reminder_email.txt'));
$template->set_var('site_name', $_CONF['site_name']);
$template->set_var('site_slogan', $_CONF['site_slogan']);
$template->set_var('lang_username', $LANG04[2]);
$template->set_var('username', $username);
$template->set_var('name', COM_getDisplayName($userid));
$template->set_var('lastlogin', $lasttime[0]);

$template->parse('output', 'mail');
$mailtext = $template->finish($template->get_var('output'));
} else {
if ($lastlogin == 0) {
$mailtext = $LANG28[83] . "\n\n";
} else {
$mailtext = sprintf($LANG28[82], $lasttime[0]) . "\n\n";
}
$mailtext .= sprintf($LANG28[84], $username) . "\n";
$mailtext .= sprintf($LANG28[85], $_CONF['site_url']
. '/users.php?mode=getpassword') . "\n\n";

}
$subject = sprintf($LANG28[81], $_CONF['site_name']);

if (COM_mail($useremail, $subject, $mailtext)) {

// Create HTML and plaintext version of email
$t = COM_newTemplate(CTL_core_templatePath($_CONF['path_layout'] . 'emails/'));

$t->set_file(array('email_html' => 'user_login_reminder-html.thtml'));
$t->set_file(array('email_plaintext' => 'user_login_reminder-plaintext.thtml'));

$t->set_var('email_divider', $LANG31['email_divider']);
$t->set_var('email_divider_html', $LANG31['email_divider_html']);
$t->set_var('LB', LB);

if ($lastlogin == 0) {
$t->set_var('lang_account_access_msg', $LANG28[83]);
} else {
$t->set_var('lang_account_access_msg', sprintf($LANG28[82], $lasttime[0]));
}
$t->set_var('lang_login_info_msg', sprintf($LANG28[84], $username));
$t->set_var('lang_retrieve_password_msg', $LANG28[85]);
$t->set_var('new_password_url', $_CONF['site_url'] . '/users.php?mode=getpassword');

$t->set_var('lang_username', $LANG04[2]);
$t->set_var('username', $username);
$t->set_var('name', COM_getDisplayName($userid));

$t->set_var('site_name', $_CONF['site_name']);
$t->set_var('site_url', $_CONF['site_url']);
$t->set_var('site_slogan', $_CONF['site_slogan']);

// Output final content
$message[] = $t->parse('output', 'email_html');
$message[] = $t->parse('output', 'email_plaintext');

$mailSubject = sprintf($LANG28[81], $_CONF['site_name']);

if (COM_mail($useremail, $mailSubject, $message, '', true)) {
DB_query("UPDATE {$_TABLES['users']} SET num_reminders=num_reminders+1 WHERE uid=$userid");
$c++;
} else {
Expand Down
8 changes: 8 additions & 0 deletions public_html/layout/denim/emails/user_login_reminder-html.thtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<p>{lang_account_access_msg}</p>

<p>{lang_login_info_msg}</p>

<p>{lang_retrieve_password_msg} <a href="{new_password_url}">{new_password_url}</a></p>

<p>{site_name}{!if site_slogan} - {site_slogan}{!endif}<br{XHTML}>
<a href="{site_url}">{site_url}</a></p>
12 changes: 12 additions & 0 deletions public_html/layout/denim/emails/user_login_reminder-plaintext.thtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{lang_account_access_msg}


{lang_login_info_msg}


{lang_retrieve_password_msg} {new_password_url}


{site_name}{!if site_slogan} - {site_slogan}{!endif}

{site_url}
0 ...out/denim/emails/user_password-html.thtml → ...m/emails/user_request_password-html.thtml
View file
File renamed without changes.
0 ...enim/emails/user_password-plaintext.thtml → ...ils/user_request_password-plaintext.thtml
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions public_html/layout/denim/emails/user_send_password-html.thtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<p>{lang_user_password_msg}</p>

<p>{lang_username}: {username}<br{XHTML}>
{lang_new_password}: {password}</p>

<p>{lang_password_msg}</p>

<p>{site_name}{!if site_slogan} - {site_slogan}{!endif}<br{XHTML}>
<a href="{site_url}">{site_url}</a></p>
14 changes: 14 additions & 0 deletions public_html/layout/denim/emails/user_send_password-plaintext.thtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{lang_user_password_msg}


{lang_username}: {username}

{lang_new_password}: {password}


{lang_password_msg}


{site_name}{!if site_slogan} - {site_slogan}{!endif}

{site_url}
7 changes: 2 additions & 5 deletions public_html/users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,11 @@ function USER_requestPassword($username)
DB_change($_TABLES['users'], 'pwrequestid', "$reqid",
'uid', $A['uid']);




// Create HTML and plaintext version of email
$t = COM_newTemplate(CTL_core_templatePath($_CONF['path_layout'] . 'emails/'));

$t->set_file(array('email_html' => 'user_password-html.thtml'));
$t->set_file(array('email_plaintext' => 'user_password-plaintext.thtml'));
$t->set_file(array('email_html' => 'user_request_password-html.thtml'));
$t->set_file(array('email_plaintext' => 'user_request_password-plaintext.thtml'));

$t->set_var('email_divider', $LANG31['email_divider']);
$t->set_var('email_divider_html', $LANG31['email_divider_html']);
Expand Down

0 comments on commit bf77977

Please sign in to comment.