Identity:: -> Horde_Prefs_Identity::
authorMichael M Slusarz <slusarz@curecanti.org>
Fri, 12 Feb 2010 04:44:43 +0000 (21:44 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 15 Feb 2010 20:29:37 +0000 (13:29 -0700)
whups/lib/Mail.php

index 07dc633..f7c3dc3 100644 (file)
@@ -211,13 +211,11 @@ class Whups_Mail {
     {
         global $conf;
 
-        require_once 'Horde/Identity.php';
+        $auth = Horde_Auth::singleton($conf['auth']['driver'], Horde::getDriverConfig('auth', $conf['auth']['driver']));
 
-        $params = Horde::getDriverConfig('auth', $conf['auth']['driver']);
-        $auth = Horde_Auth::singleton($conf['auth']['driver'], $params);
         if ($auth->hasCapability('list')) {
             foreach ($auth->listUsers() as $user) {
-                $identity = &Identity::singleton('none', $user);
+                $identity = Horde_Prefs_Identity::singleton('none', $user);
                 $addrs = $identity->getAll('from_addr');
                 foreach ($addrs as $addr) {
                     if (strcasecmp($from, $addr) == 0) {