diff options
| -rw-r--r-- | apps/files/css/files.scss | 1 | ||||
| -rw-r--r-- | lib/private/Server.php | 4 | ||||
| -rw-r--r-- | lib/private/User/Session.php | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 5e1f15c1cc1..579cf36e15b 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -342,6 +342,7 @@ table td.filename .nametext { padding: 0; overflow: hidden; text-overflow: ellipsis; + width: 70%; max-width: 800px; height: 100%; } diff --git a/lib/private/Server.php b/lib/private/Server.php index ac69122d0b2..75e9d911632 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -361,6 +361,10 @@ class Server extends ServerContainer implements IServerContainer { /** @var $user \OC\User\User */ \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password)); }); + $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password)); + }); $userSession->listen('\OC\User', 'logout', function () { \OC_Hook::emit('OC_User', 'logout', array()); }); diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index ac0150ff611..f818666c374 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -792,7 +792,13 @@ class Session implements IUserSession, Emitter { $this->setToken($token->getId()); $this->lockdownManager->setToken($token); $user->updateLastLoginTimestamp(); - $this->manager->emit('\OC\User', 'postRememberedLogin', [$user]); + $password = null; + try { + $password = $this->tokenProvider->getPassword($token, $sessionId); + } catch (PasswordlessTokenException $ex) { + // Ignore + } + $this->manager->emit('\OC\User', 'postRememberedLogin', [$user, $password]); return true; } |