From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 16:48:56 +0000 (-0400)
Subject: Use Horde_Core_Factory_Identity directly, change name of factory method
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ec604b28b431054f96ce346520e8b98de031102a;p=horde.git

Use Horde_Core_Factory_Identity directly, change name of factory method
---

diff --git a/agora/messages/abuse.php b/agora/messages/abuse.php
index 24740b473..4f6b9ab14 100644
--- a/agora/messages/abuse.php
+++ b/agora/messages/abuse.php
@@ -54,7 +54,7 @@ if ($form->validate()) {
     /* Collect moderators emails, and send them the notify */
     $emails = array();
     foreach ($forum['moderators'] as $moderator) {
-        $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($moderator);
+        $identity = $injector->getInstance('Horde_Core_Factory_Identity')->create($moderator);
         $address = $identity->getValue('from_addr');
         if (!empty($address)) {
             $emails[] = $address;
diff --git a/agora/messages/index.php b/agora/messages/index.php
index 991c608ee..0fe04b485 100644
--- a/agora/messages/index.php
+++ b/agora/messages/index.php
@@ -74,7 +74,7 @@ $view = new Agora_View();
 if (!$view_bodies) {
     /* Get the author's avatar. */
     if ($conf['avatar']['allow_avatars']) {
-        $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($message['message_author']);
+        $identity = $injector->getInstance('Horde_Core_Factory_Identity')->create($message['message_author']);
         $avatar_path = $identity->getValue('avatar_path');
         $message_author_avatar = Agora::validateAvatar($avatar_path) ? Agora::getAvatarUrl($avatar_path) : false;
         $view->message_author_avatar = $message_author_avatar;
diff --git a/ansel/image.php b/ansel/image.php
index d9d577828..51993efed 100644
--- a/ansel/image.php
+++ b/ansel/image.php
@@ -28,7 +28,7 @@ $date = Ansel::getDateParameter();
 
 /* Are we watermarking the image? */
 if ($watermark) {
-    $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
+    $identity = $injector->getInstance('Horde_Core_Factory_Identity')->create();
     $name = $identity->getValue('fullname');
     if (empty($name)) {
         $name = $registry->getAuth();
diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index dae0b1796..7f84bd9ba 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -586,7 +586,7 @@ class Ansel
                 ));
                 $fullname = $uprefs->getValue('grouptitle');
                 if (!$fullname) {
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($owner);
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($owner);
                     $fullname = $identity->getValue('fullname');
                     if (!$fullname) {
                         $fullname = $owner;
diff --git a/ansel/lib/Form/Ecard.php b/ansel/lib/Form/Ecard.php
index aeb80c174..e498c0e48 100644
--- a/ansel/lib/Form/Ecard.php
+++ b/ansel/lib/Form/Ecard.php
@@ -23,7 +23,7 @@ class Ansel_Form_Ecard extends Horde_Form {
         if (empty($user)) {
             $this->addVariable(_("Use the following return address:"), 'ecard_retaddr', 'text', true);
         } else {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             $from_addr = $identity->getDefaultFromAddress();
             $vars->set('ecard_retaddr', $from_addr);
             $this->addHidden('', 'ecard_retaddr', 'text', true);
diff --git a/ansel/lib/Gallery.php b/ansel/lib/Gallery.php
index e9274318e..5a664b798 100644
--- a/ansel/lib/Gallery.php
+++ b/ansel/lib/Gallery.php
@@ -465,7 +465,7 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical
      */
     public function getIdentity()
     {
-        return $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($this->data['share_owner']);
+        return $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($this->data['share_owner']);
     }
 
     /**
diff --git a/ansel/lib/Image.php b/ansel/lib/Image.php
index 2e780df20..e85ac121e 100644
--- a/ansel/lib/Image.php
+++ b/ansel/lib/Image.php
@@ -982,7 +982,7 @@ class Ansel_Image Implements Iterator
             $font = $GLOBALS['prefs']->getValue('watermark_font');
         }
         if (empty($watermark)) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             $name = $identity->getValue('fullname');
             if (empty($name)) {
                 $name = $GLOBALS['registry']->getAuth();
diff --git a/ansel/lib/Report.php b/ansel/lib/Report.php
index d599250d9..55994bbdd 100644
--- a/ansel/lib/Report.php
+++ b/ansel/lib/Report.php
@@ -55,7 +55,7 @@ class Ansel_Report {
      */
     function _getUserEmail($user = null)
     {
-        return $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user)->getValue('from_addr');
+        return $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user)->getValue('from_addr');
     }
 
     /**
diff --git a/ansel/lib/View/List.php b/ansel/lib/View/List.php
index ae41a8498..b7f3bdea4 100644
--- a/ansel/lib/View/List.php
+++ b/ansel/lib/View/List.php
@@ -155,7 +155,7 @@ class Ansel_View_List extends Ansel_View_Base
                 ));
                 $fullname = $uprefs->getValue('grouptitle');
                 if (!$fullname) {
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($this->_owner);
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($this->_owner);
                     $fullname = $identity->getValue('fullname');
                     if (!$fullname) {
                         $fullname = $this->_owner;
diff --git a/ansel/rss.php b/ansel/rss.php
index 573976a82..4008a51e7 100644
--- a/ansel/rss.php
+++ b/ansel/rss.php
@@ -147,7 +147,7 @@ if (empty($rss)) {
                  Horde::logMessage($e->getMessage(), 'ERR');
             }
             if (count($images)) {
-                $owner = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($id);
+                $owner = $injector->getInstance('Horde_Core_Factory_Identity')->create($id);
                 $name = $owner->getValue('fullname');
                 $author = $owner->getValue('from_addr');
                 if (!$name) {
diff --git a/folks/lib/Notification.php b/folks/lib/Notification.php
index 710de6703..2f6c4d407 100644
--- a/folks/lib/Notification.php
+++ b/folks/lib/Notification.php
@@ -221,7 +221,7 @@ class Folks_Notification {
      */
     protected function _getUserFromAddr($user)
     {
-        return $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user)->getValue('from_addr');
+        return $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user)->getValue('from_addr');
     }
 
     /**
diff --git a/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php b/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php
index 4668214ec..dc5da334e 100644
--- a/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php
+++ b/framework/Alarm/lib/Horde/Alarm/Handler/Mail.php
@@ -47,7 +47,7 @@ class Horde_Alarm_Handler_Mail extends Horde_Alarm_Handler
                 throw new Horde_Alarm_Exception('Parameter \'' . $param . '\' missing.');
             }
         }
-        if (!method_exists($params['identity'], 'getIdentity')) {
+        if (!method_exists($params['identity'], 'create')) {
             throw new Horde_Alarm_Exception('Parameter \'identity\' does not implement getIdentity().');
         }
         if (!($params['mail'] instanceof Horde_Mail_Transport)) {
diff --git a/framework/Core/lib/Horde/Core/Binder/Identity.php b/framework/Core/lib/Horde/Core/Binder/Identity.php
deleted file mode 100644
index 55167172c..000000000
--- a/framework/Core/lib/Horde/Core/Binder/Identity.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Identity implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Identity($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
diff --git a/framework/Core/lib/Horde/Core/Factory/Alarm.php b/framework/Core/lib/Horde/Core/Factory/Alarm.php
index a4e6a909b..ee6e22c2e 100644
--- a/framework/Core/lib/Horde/Core/Factory/Alarm.php
+++ b/framework/Core/lib/Horde/Core/Factory/Alarm.php
@@ -68,7 +68,7 @@ class Horde_Core_Factory_Alarm
         */
 
         $handler_params = array(
-            'identity' => $injector->getInstance('Horde_Prefs_Identity'),
+            'identity' => $injector->getInstance('Horde_Core_Factory_Identity'),
             'mail' => $injector->getInstance('Horde_Mail'),
         );
         $alarm->addHandler('mail', new Horde_Alarm_Handler_Mail($handler_params));
diff --git a/framework/Core/lib/Horde/Core/Factory/Identity.php b/framework/Core/lib/Horde/Core/Factory/Identity.php
index b838fdb61..038a9842e 100644
--- a/framework/Core/lib/Horde/Core/Factory/Identity.php
+++ b/framework/Core/lib/Horde/Core/Factory/Identity.php
@@ -61,7 +61,7 @@ class Horde_Core_Factory_Identity
      * @return Horde_Identity  The singleton identity instance.
      * @throws Horde_Exception
      */
-    public function getIdentity($user = null, $driver = null)
+    public function create($user = null, $driver = null)
     {
         global $injector, $prefs, $registry;
 
diff --git a/framework/Core/lib/Horde/Core/Prefs/Ui.php b/framework/Core/lib/Horde/Core/Prefs/Ui.php
index 8577ba6e9..b6ee271ca 100644
--- a/framework/Core/lib/Horde/Core/Prefs/Ui.php
+++ b/framework/Core/lib/Horde/Core/Prefs/Ui.php
@@ -735,7 +735,7 @@ class Horde_Core_Prefs_Ui
      */
     protected function _identityHeader($members)
     {
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity(null, $this->app);
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create(null, $this->app);
         $default_identity = $identity->getDefault();
 
         $t = $GLOBALS['injector']->createInstance('Horde_Template');
@@ -807,7 +807,7 @@ class Horde_Core_Prefs_Ui
     {
         global $conf, $notification, $prefs;
 
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity(null, $this->app);
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create(null, $this->app);
 
         if ($this->vars->delete_identity) {
             $id = intval($this->vars->id);
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index e14a346a0..1bc8f49ce 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="Identity.php" role="php" />
        <file name="Logger.php" role="php" />
        <file name="Mail.php" role="php" />
        <file name="Mapper.php" role="php" />
@@ -426,7 +425,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/Identity.php" name="lib/Horde/Core/Binder/Identity.php" />
    <install as="Horde/Core/Binder/Logger.php" name="lib/Horde/Core/Binder/Logger.php" />
    <install as="Horde/Core/Binder/Mail.php" name="lib/Horde/Core/Binder/Mail.php" />
    <install as="Horde/Core/Binder/Mapper.php" name="lib/Horde/Core/Binder/Mapper.php" />
diff --git a/hermes/lib/Hermes.php b/hermes/lib/Hermes.php
index d2f0f5dac..a39bea0dd 100644
--- a/hermes/lib/Hermes.php
+++ b/hermes/lib/Hermes.php
@@ -137,7 +137,7 @@ class Hermes {
             if (isset($namecache[$emp])) {
                 $emp = $namecache[$emp];
             } else {
-                $ident = $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($emp);
+                $ident = $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($emp);
                 $fullname = $ident->getValue('fullname');
                 if ($fullname) {
                     $namecache[$emp] = $emp = $fullname;
@@ -176,7 +176,7 @@ class Hermes {
 
         $employees = array();
         foreach ($users as $user) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
             $label = $identity->getValue('fullname');
             if (empty($label)) {
                 $label = $user;
diff --git a/horde/admin/user.php b/horde/admin/user.php
index 2f857eed0..b340f17b7 100644
--- a/horde/admin/user.php
+++ b/horde/admin/user.php
@@ -176,7 +176,7 @@ case 'update':
         }
     }
 
-    $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($user_name_1);
+    $identity = $injector->getInstance('Horde_Core_Factory_Identity')->create($user_name_1);
     $identity->setValue('fullname', $fullname);
     $identity->setValue('from_addr', $email);
     $identity->save();
@@ -226,7 +226,7 @@ require HORDE_TEMPLATES . '/common-header.inc';
 require HORDE_TEMPLATES . '/admin/menu.inc';
 
 if (isset($update_form) && $auth->hasCapability('list')) {
-    $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($f_user_name);
+    $identity = $injector->getInstance('Horde_Core_Factory_Identity')->create($f_user_name);
     require HORDE_TEMPLATES . '/admin/user/update.inc';
 } elseif (isset($remove_form) &&
           $auth->hasCapability('list') &&
diff --git a/horde/scripts/import_squirrelmail_prefs.php b/horde/scripts/import_squirrelmail_prefs.php
index 54ad658eb..34e8ac7cc 100644
--- a/horde/scripts/import_squirrelmail_prefs.php
+++ b/horde/scripts/import_squirrelmail_prefs.php
@@ -26,7 +26,7 @@ function savePrefs($user, $basename, $prefs_cache)
 
     // Import identities
     if (isset($prefs_cache['identities']) && $prefs_cache['identities'] > 1) {
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user, 'imp');
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user, 'imp');
         // Intentionally off-by-one
         for ($i = 1; $i < $prefs_cache['identities']; $i++) {
             $new_identity = array('id' => 'Identity #' . ($i + 1),
diff --git a/horde/services/confirm.php b/horde/services/confirm.php
index 827b1caf2..ee4aeea30 100644
--- a/horde/services/confirm.php
+++ b/horde/services/confirm.php
@@ -14,6 +14,6 @@
 require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('horde', array('nologintasks' => true));
 
-$identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity()->confirmIdentity(Horde_Util::getFormData('h'));
+$identity = $injector->getInstance('Horde_Core_Factory_Identity')->create()->confirmIdentity(Horde_Util::getFormData('h'));
 
 Horde::getServiceLink('prefs')->add('group', 'identities')->redirect();
diff --git a/horde/services/portal/index.php b/horde/services/portal/index.php
index 6531b964e..b63dd00c1 100644
--- a/horde/services/portal/index.php
+++ b/horde/services/portal/index.php
@@ -63,7 +63,7 @@ $title = _("My Portal");
 require HORDE_TEMPLATES . '/common-header.inc';
 echo Horde::menu();
 echo '<div id="menuBottom">';
-echo htmlspecialchars($injector->getInstance('Horde_Prefs_Identity')->getIdentity()->getName());
+echo htmlspecialchars($injector->getInstance('Horde_Core_Factory_Identity')->create()->getName());
 if (!$prefs->isLocked('portal_layout')) {
     echo ' | <a href="' . Horde::url('services/portal/edit.php') . '">' . _("Add Content") . '</a>';
 }
diff --git a/horde/services/portal/mobile.php b/horde/services/portal/mobile.php
index ea1cf310f..0b85f6747 100644
--- a/horde/services/portal/mobile.php
+++ b/horde/services/portal/mobile.php
@@ -13,7 +13,7 @@
 require_once dirname(__FILE__) . '/../../lib/Application.php';
 Horde_Registry::appInit('horde');
 
-$identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
+$identity = $injector->getInstance('Horde_Core_Factory_Identity')->create();
 $fullname = $identity->getValue('fullname');
 if (empty($fullname)) {
     $fullname = $registry->getAuth();
diff --git a/horde/services/problem.php b/horde/services/problem.php
index a8229389b..62d2c1d1f 100644
--- a/horde/services/problem.php
+++ b/horde/services/problem.php
@@ -22,7 +22,7 @@ if (!Horde_Menu::showService('problem')) {
     _returnToPage();
 }
 
-$identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
+$identity = $injector->getInstance('Horde_Core_Factory_Identity')->create();
 $email = $identity->getValue('from_addr');
 if (!$email) {
     $email = Horde_Util::getFormData('email', $registry->getAuth());
diff --git a/imp/attachment.php b/imp/attachment.php
index 72ba93b70..791f7c501 100644
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -75,7 +75,7 @@ if ($conf['compose']['link_attachments_notify']) {
                 'user' => $mail_user
             ));
 
-            $mail_identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($mail_user);
+            $mail_identity = $injector->getInstance('Horde_Core_Factory_Identity')->create($mail_user);
             $mail_address = $mail_identity->getDefaultFromAddress();
 
             /* Ignore missing addresses, which are returned as <>. */
diff --git a/imp/lib/Ui/Message.php b/imp/lib/Ui/Message.php
index 2da9534ed..afbdc7d8e 100644
--- a/imp/lib/Ui/Message.php
+++ b/imp/lib/Ui/Message.php
@@ -133,7 +133,7 @@ class IMP_Ui_Message
                 $GLOBALS['injector']->getInstance('IMP_Mail'),
                 array(
                     'charset' => 'UTF-8',
-                    'from_addr' => $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity()->getDefaultFromAddress()
+                    'from_addr' => $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create()->getDefaultFromAddress()
                 )
             );
             IMP_Maillog::log('mdn', $msg_id, 'displayed');
diff --git a/ingo/lib/Api.php b/ingo/lib/Api.php
index 4756b8228..c47bf0b77 100644
--- a/ingo/lib/Api.php
+++ b/ingo/lib/Api.php
@@ -127,7 +127,7 @@ class Ingo_Api extends Horde_Registry_Api
 
         /* Make sure we have at least one address. */
         if (empty($info['addresses'])) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             /* Remove empty lines. */
             $info['addresses'] = preg_replace('/\n{2,}/', "\n", implode("\n", $identity->getAll('from_addr')));
             if (empty($addresses)) {
diff --git a/ingo/lib/Application.php b/ingo/lib/Application.php
index e2735761f..47e859c72 100644
--- a/ingo/lib/Application.php
+++ b/ingo/lib/Application.php
@@ -70,7 +70,7 @@ class Ingo_Application extends Horde_Registry_Application
             /* If personal share doesn't exist then create it. */
             $signature = $_SESSION['ingo']['backend']['id'] . ':' . $GLOBALS['registry']->getAuth();
             if (!$GLOBALS['ingo_shares']->exists($signature)) {
-                $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+                $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
                 $name = $identity->getValue('fullname');
                 if (trim($name) == '') {
                     $name = $GLOBALS['registry']->getAuth('original');
diff --git a/ingo/vacation.php b/ingo/vacation.php
index 71a8f74a5..e3321d3da 100644
--- a/ingo/vacation.php
+++ b/ingo/vacation.php
@@ -103,7 +103,7 @@ $form->appendButtons(_("Return to Rules List"));
 
 /* Make sure we have at least one address. */
 if (!$vacation->getVacationAddresses()) {
-    $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
+    $identity = $injector->getInstance('Horde_Core_Factory_Identity')->create();
     $addresses = implode("\n", $identity->getAll('from_addr'));
     /* Remove empty lines. */
     $addresses = preg_replace('/\n+/', "\n", $addresses);
diff --git a/jonah/stories/share.php b/jonah/stories/share.php
index 16de655ea..e52ac1995 100644
--- a/jonah/stories/share.php
+++ b/jonah/stories/share.php
@@ -83,7 +83,7 @@ $form->addHidden('', 'channel_id', 'int', false);
 $form->addHidden('', 'id', 'int', false);
 $v = &$form->addVariable(_("From"), 'from', 'email', true, false);
 if ($GLOBALS['registry']->getAuth()) {
-    $v->setDefault($injector->getInstance('Horde_Prefs_Identity')->getIdentity()->getValue('from_addr'));
+    $v->setDefault($injector->getInstance('Horde_Core_Factory_Identity')->create()->getValue('from_addr'));
 }
 $form->addVariable(_("To"), 'recipients', 'email', true, false, _("Separate multiple email addresses with commas."), true);
 $form->addVariable(_("Subject"), 'subject', 'text', true);
diff --git a/kronolith/attendees.php b/kronolith/attendees.php
index 63404fb3c..6ee693bcf 100644
--- a/kronolith/attendees.php
+++ b/kronolith/attendees.php
@@ -182,7 +182,7 @@ $view = Horde_Util::getFormData('view', 'Day');
 // Pre-format our delete image/link.
 $delimg = Horde::img('delete.png', _("Remove Attendee"));
 
-$ident = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
+$ident = $injector->getInstance('Horde_Core_Factory_Identity')->create();
 $identities = $ident->getAll('id');
 $vars = Horde_Variables::getDefaultVariables();
 $tabs = new Horde_Core_Ui_Tabs(null, $vars);
diff --git a/kronolith/feed/index.php b/kronolith/feed/index.php
index 259827c50..ae9f25c89 100644
--- a/kronolith/feed/index.php
+++ b/kronolith/feed/index.php
@@ -86,7 +86,7 @@ if (isset($conf['urls']['pretty']) && $conf['urls']['pretty'] == 'rewrite') {
 }
 
 $owner = $share->get('owner');
-$identity = $injectory->getInstance('Horde_Prefs_Identity')->getIdentity($owner);
+$identity = $injectory->getInstance('Horde_Core_Factory_Identity')->create($owner);
 $history = $injector->getInstance('Horde_History');
 $now = new Horde_Date(time());
 
diff --git a/kronolith/lib/FreeBusy.php b/kronolith/lib/FreeBusy.php
index 31ee39652..62a80240b 100644
--- a/kronolith/lib/FreeBusy.php
+++ b/kronolith/lib/FreeBusy.php
@@ -68,7 +68,7 @@ class Kronolith_FreeBusy
         }
 
         /* Get the Identity for the owner of the share. */
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
         $email = $identity->getValue('from_addr');
         $cn = $identity->getValue('fullname');
         if (empty($mail) && empty($cn)) {
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index dbadc0093..a47b873ea 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1150,7 +1150,7 @@ class Kronolith
         if ($GLOBALS['registry']->getAuth() &&
             !count($GLOBALS['display_calendars']) &&
             !$GLOBALS['kronolith_shares']->exists($GLOBALS['registry']->getAuth())) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             $name = $identity->getValue('fullname');
             if (trim($name) == '') {
                 $name = $GLOBALS['registry']->getAuth('original');
@@ -1271,7 +1271,7 @@ class Kronolith
         static $names = array();
 
         if (!isset($names[$uid])) {
-            $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($uid);
+            $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($uid);
             $ident->setDefault($ident->getDefault());
             $names[$uid] = $ident->getValue('fullname');
             if (empty($names[$uid])) {
@@ -1290,7 +1290,7 @@ class Kronolith
         static $emails = array();
 
         if (!isset($emails[$uid])) {
-            $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($uid);
+            $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($uid);
             $emails[$uid] = $ident->getValue('from_addr');
             if (empty($emails[$uid])) {
                 $emails[$uid] = $uid;
@@ -1308,7 +1308,7 @@ class Kronolith
         static $emails = array();
 
         if (!isset($emails[$uid])) {
-            $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($uid);
+            $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($uid);
 
             $addrs = $ident->getAll('from_addr');
             $addrs[] = $uid;
@@ -1731,8 +1731,8 @@ class Kronolith
 
         if ($GLOBALS['conf']['share']['notify']) {
             $identity = $GLOBALS['injector']
-                ->getInstance('Horde_Prefs_Identity')
-                ->getIdentity();
+                ->getInstance('Horde_Core_Factory_Identity')
+                ->create();
             $userName = $identity->getName();
             $mail = new Horde_Mime_Mail(
                 array('from' => $identity->getDefaultFromAddress(true),
@@ -1755,8 +1755,8 @@ class Kronolith
                 $share->save();
                 if ($GLOBALS['conf']['share']['notify']) {
                     $to = $GLOBALS['injector']
-                        ->getInstance('Horde_Prefs_Identity')
-                        ->getIdentity($new_owner)
+                        ->getInstance('Horde_Core_Factory_Identity')
+                        ->create($new_owner)
                         ->getDefaultFromAddress(true);
                     try {
                         $message = Horde::callHook('shareOwnerNotification', array($new_owner, $share));
@@ -1910,8 +1910,8 @@ class Kronolith
             if ($GLOBALS['conf']['share']['notify'] &&
                 !isset($current[$user]) && $has_perms) {
                 $to = $GLOBALS['injector']
-                    ->getInstance('Horde_Prefs_Identity')
-                    ->getIdentity($user)
+                    ->getInstance('Horde_Core_Factory_Identity')
+                    ->create($user)
                     ->getDefaultFromAddress(true);
                 try {
                     $message = Horde::callHook('shareUserNotification', array($user, $share));
@@ -2247,7 +2247,7 @@ class Kronolith
             return;
         }
 
-        $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($event->creator);
+        $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($event->creator);
         if (!$ident->getValue('from_addr')) {
             $notification->push(sprintf(_("You do not have an email address configured in your Personal Information Preferences. You must set one %shere%s before event notifications can be sent."), Horde::getServiceLink('prefs', 'kronolith')->add(array('app' => 'horde', 'group' => 'identities'))->link(), '</a>'), 'horde.error', array('content.raw'));
             return;
@@ -2403,7 +2403,7 @@ class Kronolith
             throw new Kronolith_Exception($e);
         }
 
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
 
         $owner = $share->get('owner');
         if ($owner) {
@@ -2437,7 +2437,7 @@ class Kronolith
             if (!$vals) {
                 continue;
             }
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
             $email = $identity->getValue('from_addr');
             if (strpos($email, '@') === false) {
                 continue;
diff --git a/kronolith/lib/View/EditEvent.php b/kronolith/lib/View/EditEvent.php
index 3f41b1d86..ad2985dad 100644
--- a/kronolith/lib/View/EditEvent.php
+++ b/kronolith/lib/View/EditEvent.php
@@ -45,7 +45,7 @@ class Kronolith_View_EditEvent {
             exit;
         }
 
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
 
         if ($this->event->hasPermission(Horde_Perms::EDIT)) {
             $calendar_id = $this->event->calendarType . '_' . $this->event->calendar;
diff --git a/kronolith/scripts/agenda.php b/kronolith/scripts/agenda.php
index ad9a62398..fe926c7f9 100755
--- a/kronolith/scripts/agenda.php
+++ b/kronolith/scripts/agenda.php
@@ -69,7 +69,7 @@ function send_agendas()
         }
 
         // Try to find an email address for the user.
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
         $email = $identity->getDefaultFromAddress(true);
 
         // Check if user has a timezone pref, and set it. Otherwise, make
diff --git a/mnemo/lib/Forms/DeleteNotepad.php b/mnemo/lib/Forms/DeleteNotepad.php
index 167a951c3..5fe7d4f74 100644
--- a/mnemo/lib/Forms/DeleteNotepad.php
+++ b/mnemo/lib/Forms/DeleteNotepad.php
@@ -74,7 +74,7 @@ class Mnemo_DeleteNotepadForm extends Horde_Form {
             // If the default share doesn't exist then create it.
             if (!$GLOBALS['mnemo_shares']->exists($GLOBALS['registry']->getAuth())) {
 
-                $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+                $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
                 $name = $identity->getValue('fullname');
                 if (trim($name) == '') {
                     $name = $GLOBALS['registry']->getAuth();
diff --git a/mnemo/lib/Mnemo.php b/mnemo/lib/Mnemo.php
index 7675f1a5b..1538f2b37 100644
--- a/mnemo/lib/Mnemo.php
+++ b/mnemo/lib/Mnemo.php
@@ -213,7 +213,7 @@ class Mnemo {
         static $names = array();
 
         if (!isset($names[$uid])) {
-            $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($uid);
+            $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($uid);
             $ident->setDefault($ident->getDefault());
             $names[$uid] = $ident->getValue('fullname');
             if (empty($names[$uid])) {
@@ -443,7 +443,7 @@ class Mnemo {
 
                 /* If the user's personal notepad doesn't exist, then create it. */
                 if (!$GLOBALS['mnemo_shares']->exists($GLOBALS['registry']->getAuth())) {
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
                     $name = $identity->getValue('fullname');
                     if (trim($name) == '') {
                         $name = $GLOBALS['registry']->getAuth();
diff --git a/nag/lib/Forms/task.php b/nag/lib/Forms/task.php
index f190e5493..fa10a7ccb 100644
--- a/nag/lib/Forms/task.php
+++ b/nag/lib/Forms/task.php
@@ -63,7 +63,7 @@ class Nag_TaskForm extends Horde_Form {
 
         if (count($users)) {
             foreach (array_keys($users) as $user) {
-                $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+                $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
                 $fullname = $identity->getValue('fullname');
                 $users[$user] = strlen($fullname) ? $fullname : $user;
             }
diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
index d9bd32030..15b700cef 100644
--- a/nag/lib/Nag.php
+++ b/nag/lib/Nag.php
@@ -661,7 +661,7 @@ class Nag
             return '';
         }
 
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($assignee);
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($assignee);
         $fullname = $identity->getValue('fullname');
         if (!strlen($fullname)) {
             $fullname = $assignee;
@@ -733,7 +733,7 @@ class Nag
 
                 /* If the user's personal tasklist doesn't exist, then create it. */
                 if (!$GLOBALS['nag_shares']->exists($GLOBALS['registry']->getAuth())) {
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
                     $name = $identity->getValue('fullname');
                     if (trim($name) == '') {
                         $name = $GLOBALS['registry']->getAuth('original');
@@ -824,7 +824,7 @@ class Nag
 
         $groups = $GLOBALS['injector']->getInstance('Horde_Group');
         $recipients = array();
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
         $from = $identity->getDefaultFromAddress(true);
 
         $owner = $share->get('owner');
@@ -858,7 +858,7 @@ class Nag
             if (!$vals) {
                 continue;
             }
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
             $email = $identity->getValue('from_addr');
             if (strpos($email, '@') === false) {
                 continue;
@@ -937,12 +937,12 @@ class Nag
                                   $old_task->category, $task->category);
                 }
                 if ($old_task->assignee != $task->assignee) {
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($old_task->assignee);
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($old_task->assignee);
                     $old_name = $identity->getValue('fullname');
                     if (!strlen($old_name)) {
                         $old_name = $old_task->assignee;
                     }
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($task->assignee);
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($task->assignee);
                     $new_name = $identity->getValue('fullname');
                     if (!strlen($new_name)) {
                         $new_name = $new_task->assignee;
@@ -1034,7 +1034,7 @@ class Nag
         static $names = array();
 
         if (!isset($names[$uid])) {
-            $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($uid);
+            $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($uid);
             $ident->setDefault($ident->getDefault());
             $names[$uid] = $ident->getValue('fullname');
             if (empty($names[$uid])) {
diff --git a/nag/tasklists/info.php b/nag/tasklists/info.php
index 474dfeab5..ed5d82e6f 100644
--- a/nag/tasklists/info.php
+++ b/nag/tasklists/info.php
@@ -24,7 +24,7 @@ $subscribe_url = Horde::url($registry->get('webroot', 'horde') . '/rpc.php/nag/'
     . ($tasklist->get('owner') ? $tasklist->get('owner') : '')
     . '/' . $tasklist->getName() . '.ics';
 
-$identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity($tasklist->get('owner'));
+$identity = $injector->getInstance('Horde_Core_Factory_Identity')->create($tasklist->get('owner'));
 $owner_name = $identity->getValue('fullname');
 if (trim($owner_name) == '') {
     $owner_name = $registry->getAuth('original');
diff --git a/trean/lib/Trean.php b/trean/lib/Trean.php
index ae7f725d9..03bffb40a 100644
--- a/trean/lib/Trean.php
+++ b/trean/lib/Trean.php
@@ -18,7 +18,7 @@ class Trean
     {
         // Make sure "My Bookmarks" folder exists
         if ($GLOBALS['registry']->getAuth() && !$GLOBALS['trean_shares']->exists($GLOBALS['registry']->getAuth())) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             $name = $identity->getValue('fullname');
             if (trim($name) == '') {
                 $name = $GLOBALS['registry']->getAuth();
diff --git a/turba/lib/Driver/Group.php b/turba/lib/Driver/Group.php
index 16d1b6c4d..ff6d091d1 100644
--- a/turba/lib/Driver/Group.php
+++ b/turba/lib/Driver/Group.php
@@ -138,7 +138,7 @@ class Turba_Driver_Group extends Turba_Driver
         $members = $groups->listAllUsers($this->_gid);
         $addressbook = array();
         foreach ($members as $member) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($member);
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($member);
             $name = $identity->getValue('fullname');
             $email = $identity->getValue('from_addr');
             // We use the email as the key since we could have multiple users
diff --git a/turba/lib/Turba.php b/turba/lib/Turba.php
index c57cdb187..ce6db80a7 100644
--- a/turba/lib/Turba.php
+++ b/turba/lib/Turba.php
@@ -285,7 +285,7 @@ class Turba {
         static $names = array();
 
         if (!isset($names[$uid])) {
-            $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($uid);
+            $ident = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($uid);
             $ident->setDefault($ident->getDefault());
             $names[$uid] = $ident->getValue('fullname');
             if (empty($names[$uid])) {
@@ -560,7 +560,7 @@ class Turba {
     {
         if (!isset($params['name'])) {
             /* Sensible default for empty display names */
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             $name = $identity->getValue('fullname');
             if (trim($name) == '') {
                 $name = $GLOBALS['registry']->getAuth('original');
diff --git a/whups/lib/Mail.php b/whups/lib/Mail.php
index 9d7ce238d..8a40f5fa1 100644
--- a/whups/lib/Mail.php
+++ b/whups/lib/Mail.php
@@ -212,7 +212,7 @@ class Whups_Mail {
 
         if ($auth->hasCapability('list')) {
             foreach ($auth->listUsers() as $user) {
-                $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+                $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
                 $addrs = $identity->getAll('from_addr');
                 foreach ($addrs as $addr) {
                     if (strcasecmp($from, $addr) == 0) {
diff --git a/whups/lib/Ticket.php b/whups/lib/Ticket.php
index 867af66a9..f0f5e4c00 100644
--- a/whups/lib/Ticket.php
+++ b/whups/lib/Ticket.php
@@ -725,7 +725,7 @@ class Whups_Ticket {
         }
 
         /* Build message template. */
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
         $name = $identity->getValue('fullname');
         if (empty($name)) {
             $name = $GLOBALS['registry']->getAuth('bare');
diff --git a/whups/lib/Whups.php b/whups/lib/Whups.php
index ce0180bfd..9bf2451aa 100644
--- a/whups/lib/Whups.php
+++ b/whups/lib/Whups.php
@@ -569,7 +569,7 @@ class Whups {
                         }
                     } catch (Horde_Mime_Exception $e) {}
                 } else {
-                    $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($user);
+                    $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($user);
 
                     $results[$user]['name'] = $identity->getValue('fullname');
                     $results[$user]['email'] = $identity->getValue('from_addr');
diff --git a/wicked/lib/Page.php b/wicked/lib/Page.php
index b1dbd4ca5..be925d006 100644
--- a/wicked/lib/Page.php
+++ b/wicked/lib/Page.php
@@ -257,7 +257,7 @@ class Wicked_Page {
             return _("Guest");
         }
 
-        $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($modify);
+        $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create($modify);
         $name = $identity->getValue('fullname');
         if (!empty($name)) {
             $modify = $name;
diff --git a/wicked/lib/Page/StandardPage.php b/wicked/lib/Page/StandardPage.php
index abb6978ec..182769dcb 100644
--- a/wicked/lib/Page/StandardPage.php
+++ b/wicked/lib/Page/StandardPage.php
@@ -265,8 +265,8 @@ class StandardPage extends Wicked_Page {
         $requestor = $this->_lock['lock_owner'];
         if ($requestor) {
             $name = $GLOBALS['injector']
-                ->getInstance('Horde_Prefs_Identity')
-                ->getIdentity($requestor)
+                ->getInstance('Horde_Core_Factory_Identity')
+                ->create($requestor)
                 ->getValue('fullname');
             if (!strlen($name)) {
                 $name = $requestor;
diff --git a/wicked/lib/Wicked.php b/wicked/lib/Wicked.php
index f4e5efbd2..4122db8a7 100644
--- a/wicked/lib/Wicked.php
+++ b/wicked/lib/Wicked.php
@@ -160,7 +160,7 @@ class Wicked
             $conf['wicked']['guest_address'] :
             $conf['wicked']['notify_address'];
         if ($GLOBALS['registry']->getAuth()) {
-            $identity = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity();
+            $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create();
             $from = $identity->getValue('fullname');
             if (empty($from)) {
                 $from = $registry->get('name');