From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 20 Oct 2010 18:03:13 +0000 (-0600)
Subject: phpdoc
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a15d03a56193fc3b68cef8360b9a7a402f1b0c84;p=horde.git

phpdoc
---

diff --git a/framework/Prefs/lib/Horde/Prefs/Identity.php b/framework/Prefs/lib/Horde/Prefs/Identity.php
index 92b3909c4..5928a5f3c 100644
--- a/framework/Prefs/lib/Horde/Prefs/Identity.php
+++ b/framework/Prefs/lib/Horde/Prefs/Identity.php
@@ -69,28 +69,26 @@ class Horde_Prefs_Identity
      * Constructor.
      *
      * @param array $params  Parameters:
-     *                       - 'default_identity': (string) The preference name
-     *                                             for the default identity.
-     *                                             DEFAULT: 'default_identity'
-     *                       - 'from_addr': (string) The preference name for
-     *                                      the user's from e-mail address.
-     *                                      DEFAULT: 'from_addr'
-     *                       - 'fullname': (string) The preference name for the
-     *                                     user's full name. DEFAULT: 'fullname'
-     *                       - 'id': (string) The preference name for the
-     *                               identity name. DEFAULT: 'id'
-     *                       - 'identities': (string) The preference name for
-     *                                       the identity store.
-     *                                       DEFAULT: 'identities'
-     *                       - 'prefs': (Horde_Prefs) [REQUIRED] The prefs
-     *                                  object to use.
-     *                       - 'properties': (array) The list of properties for
-                                             the identity.
-     *                                       DEFAULT: array('from_addr', 'fullname', 'id')
-     *                       - 'user': (string) [REQUIRED] The user whose prefs
-     *                                 we are handling.
-     *                       - 'translation': (object) A translation handler
-     *                                        implementing Horde_Translation.
+     * <pre>
+     * default_identity: (string) The preference name for the default
+     *                   identity.
+     *                   DEFAULT: 'default_identity'
+     * from_addr: (string) The preference name for the user's from e-mail
+     *            address.
+     *            DEFAULT: 'from_addr'
+     * fullname: (string) The preference name for the user's full name.
+     *           DEFAULT: 'fullname'
+     * id: (string) The preference name for the identity name.
+     *     DEFAULT: 'id'
+     * identities: (string) The preference name for the identity store.
+     *             DEFAULT: 'identities'
+     * prefs: (Horde_Prefs) [REQUIRED] The prefs object to use.
+     * properties: (array) The list of properties for the identity.
+     *             DEFAULT: array('from_addr', 'fullname', 'id')
+     * translation: (object) A translation handler implementing
+     *              Horde_Translation.
+     * user: (string) [REQUIRED] The user whose prefs we are handling.
+     * </pre>
      */
     public function __construct($params = array())
     {
@@ -102,11 +100,9 @@ class Horde_Prefs_Identity
         $this->_prefs = $params['prefs'];
         $this->_user = $params['user'];
 
-        if (isset($params['translation'])) {
-            $this->_dict = $params['translation'];
-        } else {
-            $this->_dict = new Horde_Translation_Gettext('Horde_Prefs', dirname(__FILE__) . '/../../../locale');
-        }
+        $this->_dict = isset($params['translation'])
+            ? $params['translation']
+            : new Horde_Translation_Gettext('Horde_Prefs', dirname(__FILE__) . '/../../../locale');
 
         if (!($this->_identities = @unserialize($this->_prefs->getValue($this->_prefnames['identities'], false)))) {
             $this->_identities = $this->_prefs->getDefault($this->_prefnames['identities']);