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

Issue #755 - resending of user activation email. Added fix. Requires testing.

Browse Source
This commit is contained in:
Cameron
2014-10-03 20:59:05 -07:00
parent a812d452d4
commit 740b8cf29a
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_admin/users.php
View File

@@ -969,6 +969,7 @@ class users_admin_ui extends e_admin_ui
// custom header now auto-added in email() method // custom header now auto-added in email() method
//$mailheader_e107id = $id; //$mailheader_e107id = $id;
$check = $sysuser->email('email', array( $check = $sysuser->email('email', array(
'mail_subject' => LAN_SIGNUP_96." ".SITENAME, 'mail_subject' => LAN_SIGNUP_96." ".SITENAME,
@@ -1257,7 +1258,7 @@ class users_admin_ui extends e_admin_ui
// activate and send password // activate and send password
$check = $sysuser->email('quickadd', array( $check = $sysuser->email('quickadd', array(
'user_password' => $savePassword, 'user_password' => $savePassword,
'email_subject' => USRLAN_187.SITENAME, 'mail_subject' => USRLAN_187.SITENAME,
// TODO lan // TODO lan
'activation_url' => 'Your current status is <strong>Active</strong>', 'activation_url' => 'Your current status is <strong>Active</strong>',
)); ));
@@ -1271,7 +1272,7 @@ class users_admin_ui extends e_admin_ui
$check = $sysuser->email('quickadd', array( $check = $sysuser->email('quickadd', array(
'user_password' => $savePassword, 'user_password' => $savePassword,
'email_subject' => USRLAN_187.SITENAME, 'mail_subject' => USRLAN_187.SITENAME,
'activation_url' => SITEURL."signup.php?activate.".$sysuser->getId().".".$sysuser->getValue('sess'), 'activation_url' => SITEURL."signup.php?activate.".$sysuser->getId().".".$sysuser->getValue('sess'),
)); ));
break; break;

8
e107_handlers/shortcode_handler.php
View File

@@ -1054,7 +1054,13 @@ class e_parse_shortcode
if ($scCode) if ($scCode)
{ {
$ret = eval($scCode); $ret = @eval($scCode);
if($ret === false && E107_DEBUG_LEVEL > 0) // Error in Code.
{
$string = print_a($scCode,true);
e107::getMessage()->addDebug('Could not parse Shortcode '.$scFile.' :: {'.$code .'} '.$string);
}
} }
if (isset($ret) && ($ret != '' || is_numeric($ret))) if (isset($ret) && ($ret != '' || is_numeric($ret)))

24
e107_handlers/user_model.php
View File

@@ -1055,7 +1055,8 @@ class e_system_user extends e_user_model
{ {
if($this->debug) if($this->debug)
{ {
echo '$eml returned nothing'; echo '$eml returned nothing on Line 1050 of user_model.php using $type = '.$type;
print_a($userInfo);
} }
return false; return false;
} }
@@ -1103,6 +1104,7 @@ class e_system_user extends e_user_model
$pref = e107::getPref(); $pref = e107::getPref();
$ret = array(); $ret = array();
$tp = e107::getParser(); $tp = e107::getParser();
$mes = e107::getMessage();
// mailer options // mailer options
@@ -1166,7 +1168,11 @@ class e_system_user extends e_user_model
break; break;
} }
if(!$template) return array(); if(!$template)
{
$mes->addDebug('$template is empty in user_model.php line 1171.'); // Debug only, do not translate.
return array();
}
$pass_show = varset($userInfo['user_password']); $pass_show = varset($userInfo['user_password']);
@@ -1253,13 +1259,20 @@ class e_system_user extends e_user_model
return $ret; return $ret;
} }
// all other email types // all other email types
if(!$userInfo['email_subject']) if(!$userInfo['mail_subject'])
{ {
return array(); $mes->addDebug('No Email subject provided to renderEmail() method.'); // Debug only, do not translate.
return array();
} }
$ret['email_subject'] = $userInfo['email_subject']; // $EMAIL_TEMPLATE['signup']['subject'];
$templateName = $ret['template'];
$ret['email_subject'] = varset($EMAIL_TEMPLATE[$templateName]['subject'], $EMAIL_TEMPLATE['default']['subject']) ; // $subject;
$ret['e107_header'] = $userInfo['user_id']; $ret['e107_header'] = $userInfo['user_id'];
if (vartrue($userInfo['email_copy_to'])) { $ret['email_copy_to'] = $userInfo['email_copy_to']; } if (vartrue($userInfo['email_copy_to'])) { $ret['email_copy_to'] = $userInfo['email_copy_to']; }
@@ -1274,6 +1287,7 @@ class e_system_user extends e_user_model
$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']) ? $userInfo['user_website'] : "";
$sc['PASSWORD'] = $pass_show ? $pass_show : '******'; $sc['PASSWORD'] = $pass_show ? $pass_show : '******';
$sc['SUBJECT'] = $userInfo['mail_subject'];
/* /*