From 3c75a440a65055a071bdc01c39a8e64d88b3a2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 16 Feb 2015 17:41:44 +0100 Subject: [PATCH 1/2] Return milliseconds instead of seconds for lastLogin - refs #14005 --- settings/controller/userscontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index 80fb81600d..a20cbb4050 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -154,7 +154,7 @@ class UsersController extends Controller { 'subadmin' => \OC_SubAdmin::getSubAdminsGroups($user->getUID()), 'quota' => $this->config->getUserValue($user->getUID(), 'files', 'quota', 'default'), 'storageLocation' => $user->getHome(), - 'lastLogin' => $user->getLastLogin(), + 'lastLogin' => $user->getLastLogin() * 1000, 'backend' => $user->getBackendClassName(), 'email' => $this->config->getUserValue($user->getUID(), 'settings', 'email', ''), 'isRestoreDisabled' => !$restorePossible, From 4910f3e2027c1521e8468a0b0273fec89804ca1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 16 Feb 2015 19:45:09 +0100 Subject: [PATCH 2/2] fixing unit tests in UsersControllerTest --- .../controller/userscontrollertest.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php index 53a42de62a..b813da038a 100644 --- a/tests/settings/controller/userscontrollertest.php +++ b/tests/settings/controller/userscontrollertest.php @@ -162,7 +162,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => 1024, 'storageLocation' => '/home/foo', - 'lastLogin' => 500, + 'lastLogin' => 500000, 'backend' => 'OC_User_Database', 'email' => 'foo@bar.com', 'isRestoreDisabled' => false, @@ -174,7 +174,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => 404, 'storageLocation' => '/home/admin', - 'lastLogin' => 12, + 'lastLogin' => 12000, 'backend' => 'OC_User_Dummy', 'email' => 'admin@bar.com', 'isRestoreDisabled' => false, @@ -186,7 +186,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => 2323, 'storageLocation' => '/home/bar', - 'lastLogin' => 3999, + 'lastLogin' => 3999000, 'backend' => 'OC_User_Dummy', 'email' => 'bar@dummy.com', 'isRestoreDisabled' => false, @@ -330,7 +330,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => [], 'quota' => 1024, 'storageLocation' => '/home/foo', - 'lastLogin' => 500, + 'lastLogin' => 500000, 'backend' => 'OC_User_Database', 'email' => 'foo@bar.com', 'isRestoreDisabled' => false, @@ -342,7 +342,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => [], 'quota' => 404, 'storageLocation' => '/home/admin', - 'lastLogin' => 12, + 'lastLogin' => 12000, 'backend' => 'OC_User_Dummy', 'email' => 'admin@bar.com', 'isRestoreDisabled' => false, @@ -354,7 +354,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => [], 'quota' => 2323, 'storageLocation' => '/home/bar', - 'lastLogin' => 3999, + 'lastLogin' => 3999000, 'backend' => 'OC_User_Dummy', 'email' => 'bar@dummy.com', 'isRestoreDisabled' => false, @@ -461,7 +461,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => 1024, 'storageLocation' => '/home/foo', - 'lastLogin' => 500, + 'lastLogin' => 500000, 'backend' => 'OC_User_Database', 'email' => 'foo@bar.com', 'isRestoreDisabled' => false, @@ -473,7 +473,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => 404, 'storageLocation' => '/home/admin', - 'lastLogin' => 12, + 'lastLogin' => 12000, 'backend' => 'OC_User_Dummy', 'email' => 'admin@bar.com', 'isRestoreDisabled' => false, @@ -485,7 +485,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => 2323, 'storageLocation' => '/home/bar', - 'lastLogin' => 3999, + 'lastLogin' => 3999000, 'backend' => 'OC_User_Dummy', 'email' => 'bar@dummy.com', 'isRestoreDisabled' => false, @@ -545,7 +545,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => null, 'storageLocation' => '/home/foo', - 'lastLogin' => 500, + 'lastLogin' => 500000, 'backend' => 'OC_User_Database', 'email' => null, 'isRestoreDisabled' => false, @@ -1239,7 +1239,7 @@ class UsersControllerTest extends \Test\TestCase { 'subadmin' => array(), 'quota' => null, 'storageLocation' => $home, - 'lastLogin' => $lastLogin, + 'lastLogin' => $lastLogin * 1000, 'backend' => $backend, 'email' => null, 'isRestoreDisabled' => false,