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

Issue #1745 - Initial Userclass was not being saved during Activation by admin.

Browse Source
This commit is contained in:
Cameron
2017-10-29 11:25:05 -07:00
parent dcf0733ffa
commit 41879e8a94
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_admin/users.php
View File

@@ -167,7 +167,7 @@ JS;
case 'resend':
case 'loginas':
case 'unadmin':
$_POST['etrigger_'.$_POST['useraction']] = $_POST['userid'];
$_POST['etrigger_'.$_POST['useraction']] = intval($_POST['userid']);
break;
@@ -680,12 +680,19 @@ class users_admin_ui extends e_admin_ui
->set('user_sess', '');
$row = $sysuser->getData();
if ($userMethods->userClassUpdate($row, 'userall'))
if ($initUserclasses = $userMethods->userClassUpdate($row, 'userall'))
{
$sysuser->set('user_class', $row['user_class']);
$row['user_class'] = $initUserclasses;
}
$userMethods->addNonDefaulted($row);
$sysuser->setData($row)->save();
$sysuser->setData($row);
// $res = $sysuser->getData();
// e107::getDebug()->log($res);
$sysuser->save();
e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
e107::getEvent()->trigger('userfull', $row); //BC
@@ -704,7 +711,10 @@ class users_admin_ui extends e_admin_ui
'mail_subject' => USRLAN_113.' '.SITENAME,
'mail_body' => nl2br($message),
);
if($sysuser->email('email', $options))
// $options['debug'] = 1;
if($ret =$sysuser->email('email', $options))
{
$mes->addSuccess(USRLAN_224." ".$sysuser->getName().' ('.$sysuser->getValue('email').')');
}

5
e107_handlers/user_model.php
View File

@@ -1212,6 +1212,11 @@ class e_system_user extends e_user_model
return true;
}
if(!empty($options['debug']))
{
return $mailer->preview($eml);
}
return $mailer->sendEmail($userInfo['user_email'], $userInfo['user_name'], $eml, false);
}