SOURCES: imp-auth.patch - now it works without any config (servers.php) hac...

[baggins]

Author: baggins                      Date: Thu Oct 16 18:51:07 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- now it works without any config (servers.php) hacking

---- Files affected:
SOURCES:
   imp-auth.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/imp-auth.patch
diff -u SOURCES/imp-auth.patch:1.1 SOURCES/imp-auth.patch:1.2
--- SOURCES/imp-auth.patch:1.1	Thu Oct 16 18:17:10 2008
+++ SOURCES/imp-auth.patch	Thu Oct 16 20:51:02 2008
@@ -9,3 +9,27 @@
  }
  
  /**
+--- imp-h3-4.3/lib/Session.php~	2008-06-30 22:11:36.000000000 +0200
++++ imp-h3-4.3/lib/Session.php	2008-10-16 20:41:42.000000000 +0200
+@@ -102,9 +102,9 @@
+          * environment-wide settings. Do NOT use the global $servers variable
+          * as it may not exist. */
+         if (is_callable(array('Horde', 'loadConfiguration'))) {
+-            $result = Horde::loadConfiguration('servers.php', array('servers'));
+-            if (!is_a($result, 'PEAR_Error')) {
+-                extract($result);
++            $servers = Horde::loadConfiguration('servers.php', 'servers');
++            if (is_a($servers, 'PEAR_Error')) {
++                $servers = array();
+             }
+         } else {
+             require IMP_BASE . '/config/servers.php';
+@@ -190,7 +190,7 @@
+ 
+             /* Set the maildomain. */
+             $maildomain = $GLOBALS['prefs']->getValue('mail_domain');
+-            $_SESSION['imp']['maildomain'] = ($maildomain) ? $maildomain : $args['maildomain'];
++            $_SESSION['imp']['maildomain'] = ($maildomain) ? $maildomain : $ptr['maildomain'];
+         }
+ 
+         /* Determine the base protocol. */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/imp-auth.patch?r1=1.1&r2=1.2&f=u