From 5f560ee7a08a0cc79a78cbf58ed1442b5f8d0d17 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 29 Nov 2010 08:23:53 +0000
Subject: - Plugin API: Add 'pass' argument in 'authenticate' hook (#1487134)

---
 index.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index f1e5ac1d0..6e774f8d4 100644
--- a/index.php
+++ b/index.php
@@ -77,16 +77,14 @@ $RCMAIL->action = $startup['action'];
 if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
   // purge the session in case of new login when a session already exists 
   $RCMAIL->kill_session();
-  
+
   $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
     'host' => $RCMAIL->autoselect_host(),
     'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
+    'pass' => get_input_value('_pass', RCUBE_INPUT_POST, true,
+       $RCMAIL->config->get('password_charset', 'ISO-8859-1')),
     'cookiecheck' => true,
   ));
-  
-  if (!isset($auth['pass']))
-    $auth['pass'] = get_input_value('_pass', RCUBE_INPUT_POST, true,
-        $RCMAIL->config->get('password_charset', 'ISO-8859-1'));
 
   // check if client supports cookies
   if ($auth['cookiecheck'] && empty($_COOKIE)) {
-- 
cgit v1.2.3