Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- always call logout action as task (#1485919)

  • Loading branch information...
commit 3a2b270c9d1f531c2e2d1c422a4756afd639ef47 1 parent 9d147c8
@alecpl alecpl authored
View
2  index.php
@@ -121,7 +121,7 @@
}
// end session
-else if (($RCMAIL->task=='logout' || $RCMAIL->action=='logout') && isset($_SESSION['user_id'])) {
+else if ($RCMAIL->task=='logout' && isset($_SESSION['user_id'])) {
$OUTPUT->show_message('loggedout');
$RCMAIL->logout_actions();
$RCMAIL->kill_session();
View
2  program/include/rcube_template.php
@@ -969,7 +969,7 @@ private function login_form($attrib)
// save original url
$url = get_input_value('_url', RCUBE_INPUT_POST);
- if (empty($url) && !preg_match('/_action=logout/', $_SERVER['QUERY_STRING']))
+ if (empty($url) && !preg_match('/_(task|action)=logout/', $_SERVER['QUERY_STRING']))
$url = $_SERVER['QUERY_STRING'];
$input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'size' => 30) + $attrib);
View
8 program/js/app.js
@@ -367,9 +367,6 @@ function rcube_webmail()
break;
}
- // enable basic commands
- this.enable_command('logout', true);
-
// flag object as complete
this.loaded = true;
@@ -551,14 +548,11 @@ function rcube_webmail()
this.gui_objects.loginform.submit();
break;
- case 'logout':
- this.goto_url('logout', '', true);
- break;
-
// commands to switch task
case 'mail':
case 'addressbook':
case 'settings':
+ case 'logout':
this.switch_task(command);
break;
Please sign in to comment.
Something went wrong with that request. Please try again.