From 72d8aae5190bef81a90b74f18b6a62fe6b27c6a3 Mon Sep 17 00:00:00 2001
From: jmontoya <gugli100@gmail.com>
Date: Tue, 9 Feb 2016 13:03:01 +0100
Subject: [PATCH] Remove lastLogin use last_login instead.

Fix PHP warnings
---
 main/admin/user_list.php             | 1 -
 main/inc/lib/api.lib.php             | 7 ++-----
 main/inc/lib/events.lib.php          | 2 +-
 main/inc/lib/login.lib.php           | 1 -
 main/inc/local.inc.php               | 7 ++-----
 main/session/session_user_import.php | 1 +
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index d988230628..0af645f4df 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.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;
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 33b32bd98d..2fe4ac50ef 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -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);
 
diff --git a/main/inc/lib/events.lib.php b/main/inc/lib/events.lib.php
index ac57c14990..362bead02e 100644
--- a/main/inc/lib/events.lib.php
+++ b/main/inc/lib/events.lib.php
@@ -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);
             }
diff --git a/main/inc/lib/login.lib.php b/main/inc/lib/login.lib.php
index 54802c8635..152b2fde5b 100755
--- a/main/inc/lib/login.lib.php
+++ b/main/inc/lib/login.lib.php
@@ -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'];
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 9e781e4d89..e61c1be983 100755
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -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);
 
diff --git a/main/session/session_user_import.php b/main/session/session_user_import.php
index cb628e8954..6e56565718 100644
--- a/main/session/session_user_import.php
+++ b/main/session/session_user_import.php
@@ -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'];