From 8d8f7a7b8e7ea8464aa807611b3db320fab12156 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 05 Apr 2012 03:51:20 -0400
Subject: [PATCH] - Larry skin support
---
plugins/http_authentication/http_authentication.php | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index 57422a7..6c87371 100644
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -5,22 +5,31 @@
*
* Make use of an existing HTTP authentication and perform login with the existing user credentials
*
- * @version 1.0
+ * Configuration:
+ * // redirect the client to this URL after logout. This page is then responsible to clear HTTP auth
+ * $rcmail_config['logout_url'] = 'http://server.tld/logout.html';
+ *
+ * See logout.html (in this directory) for an example how HTTP auth can be cleared.
+ *
+ * @version @package_version@
+ * @license GNU GPLv3+
* @author Thomas Bruederli
*/
class http_authentication extends rcube_plugin
{
+ public $task = 'login|logout';
function init()
{
$this->add_hook('startup', array($this, 'startup'));
$this->add_hook('authenticate', array($this, 'authenticate'));
+ $this->add_hook('logout_after', array($this, 'logout'));
}
function startup($args)
{
// change action to login
- if ($args['task'] == 'mail' && empty($args['action']) && empty($_SESSION['user_id'])
+ if (empty($args['action']) && empty($_SESSION['user_id'])
&& !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW']))
$args['action'] = 'login';
@@ -29,13 +38,30 @@
function authenticate($args)
{
+ // Allow entering other user data in login form,
+ // e.g. after log out (#1487953)
+ if (!empty($args['user'])) {
+ return $args;
+ }
+
if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
$args['user'] = $_SERVER['PHP_AUTH_USER'];
$args['pass'] = $_SERVER['PHP_AUTH_PW'];
}
-
+
+ $args['cookiecheck'] = false;
+ $args['valid'] = true;
+
return $args;
}
+
+ function logout($args)
+ {
+ // redirect to configured URL in order to clear HTTP auth credentials
+ if (!empty($_SERVER['PHP_AUTH_USER']) && $args['user'] == $_SERVER['PHP_AUTH_USER'] && ($url = rcmail::get_instance()->config->get('logout_url'))) {
+ header("Location: $url", true, 307);
+ }
+ }
}
--
Gitblit v1.9.1