Browse Source

Fix #296

pull/305/head
Jaussoin Timothée 9 years ago
parent
commit
beb57b01d5
  1. 2
      app/widgets/Login/Login.php
  2. 1
      app/widgets/Login/locales.ini

2
app/widgets/Login/Login.php

@ -183,10 +183,8 @@ class Login extends \Movim\Widget\Base
$here = $sd->getHash(sha1($username.$password.$host));
if($here) {
//if($s->get('hash') == sha1($username.$password.$host)) {
RPC::call('Login.setCookie', $here->session);
RPC::call('MovimUtils.redirect', $this->route('main'));
$this->showErrorBlock('conflict');
return;
}

1
app/widgets/Login/locales.ini

@ -16,7 +16,6 @@ default = Unknown error
login_format = Invalid username format
password_format = Invalid password format
unauthorized = Your XMPP server is unauthorized
conflict = A Movim session is already open on an other device
wrong_account = Movim failed to authenticate. You entered wrong data
mechanism = Authentication mechanism not supported by Movim
fail_auth = The XMPP authentification failed

Loading…
Cancel
Save