gunnar: server/kolab-webclient/imp/patches/imp-4.3.6 t_imp_HK_UV_fix_login_by_uid.diff, NONE, 1.1 series, 1.5, 1.6

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6
In directory doto:/tmp/cvs-serv1680/kolab-webclient/imp/patches/imp-4.3.6

Modified Files:
	series 
Added Files:
	t_imp_HK_UV_fix_login_by_uid.diff 
Log Message:
kolab/issue4174 (Patch for imp/dimp login by uid)

--- NEW FILE: t_imp_HK_UV_fix_login_by_uid.diff ---
--- a/lib/Auth/imp.php.orig	2010-02-26 20:20:36.000000000 +0100
+++ b/lib/Auth/imp.php	2010-02-26 20:20:40.000000000 +0100
@@ -134,7 +134,7 @@ class Auth_imp extends Auth {
 
         /* Open an IMAP stream. */
         require_once IMP_BASE . '/lib/IMAP.php';
-        $imp_imap = &IMP_IMAP::singleton($_SESSION['imp']['user'], $credentials['password']);
+        $imp_imap = &IMP_IMAP::singleton($_SESSION['imp']['uniquser'], $credentials['password']);
         if (!$imp_imap->changeMbox(null, IMP_IMAP_PEEK)) {
             Horde::logMessage(IMP::loginLogMessage('failed'), __FILE__, __LINE__, PEAR_LOG_ERR);
 
--- a/lib/Session.php	2010-02-26 19:26:11.000000000 +0100
+++ b/lib/Session.php	2010-02-26 19:26:26.000000000 +0100
@@ -275,7 +275,7 @@ class IMP_Session {
                     }
                 } else {
                     /* Auto-detect namespace parameters from IMAP server. */
-                    $res = $imapclient->login($_SESSION['imp']['user'], $password);
+                    $res = $imapclient->login($_SESSION['imp']['uniquser'], $password);
                     if (is_a($res, 'PEAR_Error')) {
                         $auth_imp->IMPsetAuthErrorMsg($res->getMessage());
                         unset($_SESSION['imp']);

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/patches/imp-4.3.6/series,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- series	22 Jan 2010 17:20:02 -0000	1.5
+++ series	4 Mar 2010 20:30:32 -0000	1.6
@@ -3,3 +3,4 @@
 t_imp_H_GW_AclView.diff
 t_imp_H_GW_FoldersView.diff
 t_imp_HK_GW_ItipHandling.diff
+t_imp_HK_UV_fix_login_by_uid.diff