From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 30 Nov 2009 22:40:34 +0000 (-0700)
Subject: Fix credentials UI display
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9ef7e2cf0b0f040f7f3f676599d81731cccbd34d;p=horde.git

Fix credentials UI display
---

diff --git a/framework/Prefs/lib/Horde/Prefs/Credentials.php b/framework/Prefs/lib/Horde/Prefs/Credentials.php
index 898e68054..02a3417c3 100644
--- a/framework/Prefs/lib/Horde/Prefs/Credentials.php
+++ b/framework/Prefs/lib/Horde/Prefs/Credentials.php
@@ -21,6 +21,13 @@ class Horde_Prefs_Credentials
     static protected $_instance = null;
 
     /**
+     * Cache for getCredentials().
+     *
+     * @var array
+     */
+    static protected $_credentialsCache = null;
+
+    /**
      * The Horde application currently processed.
      *
      * @see singleton()
@@ -36,13 +43,6 @@ class Horde_Prefs_Credentials
     protected $_credentials = array();
 
     /**
-     * Cache for getCredentials().
-     *
-     * @var array
-     */
-    protected $_credentialsCache = null;
-
-    /**
      * Constructor.
      */
     public function __construct()
@@ -81,13 +81,13 @@ class Horde_Prefs_Credentials
      *
      * @return array  A list of Horde applications and their credentials.
      */
-    public function getCredentials()
+    static public function getCredentials()
     {
-        if (!is_null($this->_credentialsCache)) {
-            return $this->_credentialsCache;
+        if (!is_null(self::$_credentialsCache)) {
+            return self::$_credentialsCache;
         }
 
-        $credentials_prefs = array();
+        self::$_credentialsCache = array();
         foreach ($GLOBALS['registry']->listApps() as $app) {
             try {
                 $credentials = $GLOBALS['registry']->callAppMethod($app, 'authCredentials');
@@ -99,24 +99,24 @@ class Horde_Prefs_Credentials
                 continue;
             }
 
-            $credentials_prefs[$app] = array();
+            self::$_credentialsCache[$app] = array();
             foreach ($credentials as $name => $credential) {
                 $pref = 'credentials[' . $app . '][' . $name . ']';
                 $credential['shared'] = true;
-                $credentials_prefs[$app][$pref] = $credential;
+                self::$_credentialsCache[$app][$pref] = $credential;
             }
         }
 
-        return $credentials_prefs;
+        return self::$_credentialsCache;
     }
 
     /**
      * Displays the preference interface for setting all available
      * credentials.
      */
-    public function showUi()
+    static public function showUi()
     {
-        $credentials = $this->getCredentials();
+        $credentials = self::getCredentials();
         $vspace = '';
         foreach ($credentials as $app => $_prefs) {
             $prefs = Horde_Prefs_Credentials::singleton($app);