Remove lastLogin use last_login instead.

Fix PHP warnings
1.10.x
jmontoya 10 years ago
parent 3acf899995
commit 72d8aae519
  1. 1
      main/admin/user_list.php
  2. 7
      main/inc/lib/api.lib.php
  3. 2
      main/inc/lib/events.lib.php
  4. 1
      main/inc/lib/login.lib.php
  5. 7
      main/inc/local.inc.php
  6. 1
      main/session/session_user_import.php

@ -326,7 +326,6 @@ function loginUser($userId)
$_user['firstName'] = $userInfo['firstname'];
$_user['lastName'] = $userInfo['lastname'];
$_user['mail'] = $userInfo['email'];
//$_user['lastLogin'] = $user_data['login_date'];
$_user['official_code'] = $userInfo['official_code'];
$_user['picture_uri'] = $userInfo['picture_uri'];
$_user['user_id'] = $userId;

@ -1428,7 +1428,8 @@ function _api_format_user($user, $add_password = false)
'creator_id',
'registration_date',
'hr_dept_id',
'expiration_date'
'expiration_date',
'last_login'
);
foreach ($attributes as $attribute) {
@ -1445,12 +1446,8 @@ function _api_format_user($user, $add_password = false)
$user_id = intval($user['user_id']);
// Maintain the user_id index for backwards compatibility
$result['user_id'] = $result['id'] = $user_id;
$result['last_login'] = $user['last_login'];
// Kept for historical reasons
$result['lastLogin'] = $user['last_login'];
// Getting user avatar.
$originalFile = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_ORIGINAL, $result);
$smallFile = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_SMALL, $result);

@ -678,7 +678,7 @@ class Event
unset($event_value['avatar']);
unset($event_value['mail']);
unset($event_value['password']);
unset($event_value['lastLogin']);
unset($event_value['last_login']);
unset($event_value['picture_uri']);
$event_value = serialize($event_value);
}

@ -304,7 +304,6 @@ class Login
$_user['firstName'] = $uData['firstname'];
$_user['lastName'] = $uData['lastname'];
$_user['mail'] = $uData['email'];
$_user['lastLogin'] = $uData['login_date'];
$_user['official_code'] = $uData['official_code'];
$_user['picture_uri'] = $uData['picture_uri'];
$_user['user_id'] = $uData['user_id'];

@ -811,11 +811,8 @@ if (isset($uidReset) && $uidReset) {
// Extracting the user data
$uData = Database::fetch_array($result);
$_user = _api_format_user($uData, false);
$_user['lastLogin'] = api_strtotime($uData['login_date'], 'UTC');
$is_platformAdmin = (bool) (! is_null($uData['is_admin']));
$_user = _api_format_user($uData, false);
$is_platformAdmin = (bool) (!is_null($uData['is_admin']));
$is_allowedCreateCourse = (bool) (($uData ['status'] == COURSEMANAGER) || (api_get_setting('drhCourseManagerRights') && $uData['status'] == DRH));
ConditionalLogin::check_conditions($uData);

@ -50,6 +50,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
null,
false
);
foreach ($user_list as & $user_id) {
$user_info = api_get_user_info($user_id);
$user_id = $user_info['complete_name'];

Loading…
Cancel
Save