banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #141 from rasky/http_without_pwd

Browse Source 
Allow HTTP authentication without password.
pull/154/head
Aleksander Machniak 11 years ago
parent 29b2937f7b 35533c3622
commit a96a22cc3e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

10
plugins/http_authentication/http_authentication.php
Unescape Escape View File

@ -29,7 +29,7 @@ class http_authentication extends rcube_plugin
function startup($args) function startup($args)
{ {
if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { if (!empty($_SERVER['PHP_AUTH_USER'])) {
$rcmail = rcmail::get_instance(); $rcmail = rcmail::get_instance();
$rcmail->add_shutdown_function(array('http_authentication', 'shutdown')); $rcmail->add_shutdown_function(array('http_authentication', 'shutdown'));
@ -38,7 +38,8 @@ class http_authentication extends rcube_plugin
$args['action'] = 'login'; $args['action'] = 'login';
} }
// Set user password in session (see shutdown() method for more info) // Set user password in session (see shutdown() method for more info)
else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])) { else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])
&& !empty($_SERVER['PHP_AUTH_PW'])) {
$_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']); $_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']);
} }
} }
@ -61,9 +62,10 @@ class http_authentication extends rcube_plugin
return $args; return $args;
} }
if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { if (!empty($_SERVER['PHP_AUTH_USER'])) {
$args['user'] = $_SERVER['PHP_AUTH_USER']; $args['user'] = $_SERVER['PHP_AUTH_USER'];
$args['pass'] = $_SERVER['PHP_AUTH_PW']; if (!empty($_SERVER['PHP_AUTH_PW']))
$args['pass'] = $_SERVER['PHP_AUTH_PW'];
} }
$args['cookiecheck'] = false; $args['cookiecheck'] = false;

Write Preview
Loading…
Cancel
Save