1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +02:00
Various minor system bugfixes and enhancements
This commit is contained in:
SecretR
2012-12-11 18:44:34 +02:00
parent deafa2812f
commit 5aad9b6553
5 changed files with 652 additions and 1968 deletions

View File

@@ -1239,6 +1239,15 @@ class e_system_user extends e_user_model
$search[7] = '{PASSWORD}';
$replace[7] = $pass_show ? $pass_show : '******';
if(isset($userInfo['activation_url']))
{
$search[8] = '{ACTIVATION_URL}';
$replace[8] = $userInfo['activation_url'];
$search[9] = '{ACTIVATION_LINK}';
$replace[9] = strpos($userInfo['activation_url'], 'http') === 0 ? '<a href="'.$userInfo['url_activate'].'">'.$userInfo['activation_url'].'</a>' : $userInfo['activation_url'];
}
$ret['send_html'] = TRUE;
$ret['mail_body'] = e107::getParser()->parseTemplate(str_replace($search, $replace, $template));
$ret['preview'] = $ret['mail_body']; // Non-standard field