From: Duck (Jakob Munih) <duck@obala.net>
Date: Tue, 28 Apr 2009 17:52:36 +0000 (+0200)
Subject: fix admins
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=52c108c899b94d27c71f8bfd304be78091583e64;p=horde.git

fix admins
---

diff --git a/folks/lib/Notification.php b/folks/lib/Notification.php
index 436c02aa8..17f94ce3a 100644
--- a/folks/lib/Notification.php
+++ b/folks/lib/Notification.php
@@ -169,10 +169,11 @@ class Folks_Notification {
             if ($permission instanceof PEAR_Error) {
                 return $permission;
             } else {
-                $admins = $permission->getUserPermissions(PERM_DELETE);
+                $admins = $permission->getUserPermissions(PERMS_DELETE);
                 if ($admins instanceof PEAR_Error) {
                     return $admins;
                 }
+                $admins = array_keys($admins);
             }
         }
 
@@ -186,9 +187,11 @@ class Folks_Notification {
     /**
      * Returns all avaiable methods
      *
+     * @param string $type Type of notification to check
+     *
      * @return true on succes, PEAR_Error on failure
      */
-    public function getMethods()
+    public function getMethods($type = 'user')
     {
         $methods = array();
 
@@ -198,10 +201,12 @@ class Folks_Notification {
             }
             $instance = $this->singleton($driver, $params);
             if ($instance instanceof PEAR_Error) {
-                Horde::logMessage($instance, __FILE__, __LINE__, PEAR_LOG_ERR);
-            } else {
-                $methods[$driver] = $instance->getName();
+                return $instance;
+            }
+            if (!$instance->isAvailable($type)) {
+                continue;
             }
+            $methods[$driver] = $instance->getName();
         }
 
         return $methods;
@@ -270,4 +275,4 @@ class Folks_Notification {
 
         return self::$instances[$driver];
     }
-}
\ No newline at end of file
+}