1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +02:00

Issue #1378 Fix for XUP avatar check. User audit log for login and logout now functioning correctly. Admin log no longer adds a log when deleting a log!

This commit is contained in:
Cameron
2016-03-16 13:53:57 -07:00
parent 01d1c6560c
commit 1202c72390
8 changed files with 81 additions and 30 deletions

View File

@@ -1702,7 +1702,7 @@ class e_user extends e_user_model
$where = implode(' OR ', $where);
if($sql->select('user', 'user_id, user_password, user_xup', $where))
if($sql->select('user', 'user_id, user_name, user_image, user_password, user_xup', $where))
{
$user = $sql->fetch();
@@ -1722,6 +1722,10 @@ class e_user extends e_user_model
e107::getLog()->add('User Profile Update Failed', $userdata, E_LOG_WARNING, "XUP_LOGIN", LOG_TO_ADMIN, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name']));
}
}
unset($user['user_password']);
e107::getLog()->user_audit(USER_AUDIT_LOGIN,'', $user['user_id'], $user['user_name']);
// e107::getLog()->add('XUP Login', $user, E_LOG_INFORMATIVE, "LOGIN", LOG_TO_ROLLING, array('user_id'=>$user['user_id'],'user_name'=>$user['user_name']));
}
return $this;