From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 3 Oct 2010 01:27:28 +0000 (-0400)
Subject: Get rid of unnecessary binder for ajax and imple factories
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6600cef25a20902e7cf54a772cf24aaed39f9a7d;p=horde.git

Get rid of unnecessary binder for ajax and imple factories
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index d86bd0e09..fd678e9ac 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -915,7 +915,7 @@ class Ansel
             $domid = $options['container'];
         }
 
-        $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'Embed'), $options);
+        $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'Embed'), $options);
 
        return '<script type="text/javascript" src="' . $imple->getUrl() . '"></script><div id="' . $domid . '"></div>';
     }
diff --git a/ansel/lib/Tile/Image.php b/ansel/lib/Tile/Image.php
index 358e32955..9187b2127 100644
--- a/ansel/lib/Tile/Image.php
+++ b/ansel/lib/Tile/Image.php
@@ -119,11 +119,11 @@ class Ansel_Tile_Image
         if ($option_edit) {
             // @TODO: passing thumbstyle here doesn't look right to me.
             $geometry = $image->getDimensions($thumbstyle);
-            $GLOBALS['injector']->createInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'EditCaption'), array(
-                'domid' => $image->id . 'caption',
-                'id' => $image->id,
-                'width' => $geometry['width']
-            ));
+            $GLOBALS['injector']->createInstance('Horde_Core_Factory_Imple')->create(
+                array('ansel', 'EditCaption'),
+                array('domid' => $image->id . 'caption',
+                      'id' => $image->id,
+                      'width' => $geometry['width']));
         }
         include ANSEL_BASE . '/templates/tile/image.inc';
 
diff --git a/ansel/lib/View/GalleryProperties.php b/ansel/lib/View/GalleryProperties.php
index 52ced6e29..8718361f7 100644
--- a/ansel/lib/View/GalleryProperties.php
+++ b/ansel/lib/View/GalleryProperties.php
@@ -112,7 +112,7 @@ class Ansel_View_GalleryProperties
         Horde::addScriptFile('popup.js', 'horde');
 
         /* Attach the slug check action to the form */
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'GallerySlugCheck'), array(
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'GallerySlugCheck'), array(
             'bindTo' => 'gallery_slug',
             'slug' => $this->_properties['slug']
         ));
diff --git a/ansel/lib/View/Image.php b/ansel/lib/View/Image.php
index 2f02e3a89..3aecaaf3b 100644
--- a/ansel/lib/View/Image.php
+++ b/ansel/lib/View/Image.php
@@ -364,7 +364,7 @@ class Ansel_View_Image extends Ansel_View_Base
             /* In line caption editing */
             if ($this->gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
                 $geometry = $this->resource->getDimensions();
-                $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'EditCaption'), array(
+                $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'EditCaption'), array(
                     'width' => $geometry['width'],
                     'domid' => "Caption",
                     'id' => $this->resource->id
diff --git a/ansel/lib/Widget/Actions.php b/ansel/lib/Widget/Actions.php
index 016c4c763..000b8daed 100644
--- a/ansel/lib/Widget/Actions.php
+++ b/ansel/lib/Widget/Actions.php
@@ -106,7 +106,7 @@ class Ansel_Widget_Actions extends Ansel_Widget_Base
 
         /* Attach the ajax action */
         Horde::startBuffer();
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'ToggleGalleryActions'), array(
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'ToggleGalleryActions'), array(
             'bindTo' => 'gallery-actions'
         ));
         $html .= Horde::endBuffer();
diff --git a/ansel/lib/Widget/Geotag.php b/ansel/lib/Widget/Geotag.php
index 9d2de0053..d93ca8616 100644
--- a/ansel/lib/Widget/Geotag.php
+++ b/ansel/lib/Widget/Geotag.php
@@ -75,7 +75,7 @@ class Ansel_Widget_Geotag extends Ansel_Widget_Base
         $rtext = _("Relocate this image");
         $dtext = _("Delete geotag");
 
-        $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'ImageSaveGeotag'));
+        $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'ImageSaveGeotag'));
         $impleUrl = $imple->getUrl();
 
         $permsEdit = $this->_view->gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT);
diff --git a/ansel/lib/Widget/ImageFaces.php b/ansel/lib/Widget/ImageFaces.php
index 12fffe356..8cb4a7b1e 100644
--- a/ansel/lib/Widget/ImageFaces.php
+++ b/ansel/lib/Widget/ImageFaces.php
@@ -75,7 +75,7 @@ class Ansel_Widget_ImageFaces extends Ansel_Widget_Base
 
             // Attach the ajax edit actions
             Horde::startBuffer();
-            $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'EditFaces'), array(
+            $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'EditFaces'), array(
                 'domid' => 'edit_faces',
                 'image_id' => $this->_view->resource->id,
                 'selfUrl' => $this->_params['selfUrl']
diff --git a/ansel/lib/Widget/OtherGalleries.php b/ansel/lib/Widget/OtherGalleries.php
index 5113d5e43..c1b503fed 100644
--- a/ansel/lib/Widget/OtherGalleries.php
+++ b/ansel/lib/Widget/OtherGalleries.php
@@ -101,7 +101,7 @@ class Ansel_Widget_OtherGalleries extends Ansel_Widget_Base
         }
 
         Horde::startBuffer();
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'ToggleOtherGalleries'), array(
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'ToggleOtherGalleries'), array(
             'bindTo' => 'othergalleries'
         ));
 
diff --git a/ansel/lib/Widget/Tags.php b/ansel/lib/Widget/Tags.php
index b8468b95c..07e0f4aaf 100644
--- a/ansel/lib/Widget/Tags.php
+++ b/ansel/lib/Widget/Tags.php
@@ -40,7 +40,7 @@ class Ansel_Widget_Tags extends Ansel_Widget_Base
         if ($this->_view->gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
             Horde::startBuffer();
             /* Attach the Ajax action */
-            $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'TagActions'), array(
+            $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'TagActions'), array(
                 'bindTo' => array('add' => 'tagbutton'),
                 'gallery' => $this->_view->gallery->id,
                 'image' => $image_id
diff --git a/ansel/map_edit.php b/ansel/map_edit.php
index 3b9d95b46..855bb993e 100644
--- a/ansel/map_edit.php
+++ b/ansel/map_edit.php
@@ -66,7 +66,7 @@ $returnLink = Ansel::getUrlFor('view', array('view' => 'Image',
                                              'gallery' => $gallery->id));
 $image_tag = '<img src="' . Ansel::getImageUrl($image_id, 'thumb', true) . '" alt="[thumbnail]" />';
 /* Url for geotag ajax helper */
-$gt = $injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'ImageSaveGeotag'));
+$gt = $injector->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'ImageSaveGeotag'));
 $gtUrl = $gt->getUrl();
 
 $loadingImg = Horde::img('loading.gif', _("Loading..."));
@@ -139,7 +139,7 @@ $html = <<<EOT
 </script>
 EOT;
 /* Autocompleter for locations we already have in our DB */
-$injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('ansel', 'LocationAutoCompleter'), array(
+$injector->getInstance('Horde_Core_Factory_Imple')->create(array('ansel', 'LocationAutoCompleter'), array(
     'map' => 'mapEdit',
     'resultsId' => 'locationInput_results',
     'triggerId' => 'locationInput'
diff --git a/framework/Core/lib/Horde/Core/Binder/AjaxFactory.php b/framework/Core/lib/Horde/Core/Binder/AjaxFactory.php
deleted file mode 100644
index 84e67cac4..000000000
--- a/framework/Core/lib/Horde/Core/Binder/AjaxFactory.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_AjaxFactory implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Ajax($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
diff --git a/framework/Core/lib/Horde/Core/Binder/ImpleFactory.php b/framework/Core/lib/Horde/Core/Binder/ImpleFactory.php
deleted file mode 100644
index 6b9e9ed2b..000000000
--- a/framework/Core/lib/Horde/Core/Binder/ImpleFactory.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_ImpleFactory implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Imple($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
diff --git a/framework/Core/lib/Horde/Core/Factory/Ajax.php b/framework/Core/lib/Horde/Core/Factory/Ajax.php
index daa0aa287..936a23622 100644
--- a/framework/Core/lib/Horde/Core/Factory/Ajax.php
+++ b/framework/Core/lib/Horde/Core/Factory/Ajax.php
@@ -54,7 +54,7 @@ class Horde_Core_Factory_Ajax
      * @return Horde_Core_Ajax_Application  The requested instance.
      * @throws Horde_Exception
      */
-    public function getAjax($app, $vars, $action = null)
+    public function create($app, $vars, $action = null)
     {
         $class = $app . '_Ajax_Application';
 
diff --git a/framework/Core/lib/Horde/Core/Factory/Imple.php b/framework/Core/lib/Horde/Core/Factory/Imple.php
index c119524c2..fd24ce5e3 100644
--- a/framework/Core/lib/Horde/Core/Factory/Imple.php
+++ b/framework/Core/lib/Horde/Core/Factory/Imple.php
@@ -58,7 +58,7 @@ class Horde_Core_Factory_Imple
      * @return Horde_Core_Ajax_Imple  The newly created instance.
      * @throws Horde_Exception
      */
-    public function getImple($driver, array $params = array(),
+    public function create($driver, array $params = array(),
                              $noattach = false)
     {
         if (is_array($driver)) {
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 7ed77f6ec..08ee18c72 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -264,8 +264,6 @@ class Horde_Registry
 
         /* Define binders. */
         $binders = array(
-            'Horde_Ajax_Factory' => 'Horde_Core_Binder_AjaxFactory',
-            'Horde_Ajax_Imple_Factory' => 'Horde_Core_Binder_ImpleFactory',
             'Horde_Alarm' => 'Horde_Core_Binder_Alarm',
             'Horde_Auth_Factory' => 'Horde_Core_Binder_AuthFactory',
             // 'Horde_Browser' - initialized below
@@ -303,6 +301,7 @@ class Horde_Registry
             'Horde_Token' => 'Horde_Core_Binder_Token',
             'Horde_Vfs' => 'Horde_Core_Binder_Vfs',
             'Net_DNS_Resolver' => 'Horde_Core_Binder_Dns',
+            'Horde_Rpc_ActiveSync' => 'Horde_Core_Binder_ActiveSync'
         );
 
         /* Define factories. */
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 241d8b31e..165a08443 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -109,7 +109,6 @@ Application Framework.</description>
        </dir> <!-- /lib/Horde/Core/Autoloader/Callback -->
       </dir> <!-- /lib/Horde/Core/Autoloader -->
       <dir name="Binder">
-       <file name="AjaxFactory.php" role="php" />
        <file name="Alarm.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
@@ -125,7 +124,6 @@ Application Framework.</description>
        <file name="History.php" role="php" />
        <file name="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
-       <file name="ImpleFactory.php" role="php" />
        <file name="Ldap.php" role="php" />
        <file name="Lock.php" role="php" />
        <file name="Logger.php" role="php" />
diff --git a/horde/services/ajax.php b/horde/services/ajax.php
index d331549ca..a11007f54 100644
--- a/horde/services/ajax.php
+++ b/horde/services/ajax.php
@@ -37,7 +37,7 @@ try {
     if ($action != 'logOut') {
         /* Handle session timeouts when they come from an AJAX request. */
         if ($e->getCode() == Horde_Registry::AUTH_FAILURE) {
-            $ajax = $injector->getInstance('Horde_Ajax_Factory')->getAjax($app, Horde_Variables::getDefaultVariables());
+            $ajax = $injector->getInstance('Horde_Core_Factory_Ajax')->create($app, Horde_Variables::getDefaultVariables());
             $notification->push(str_replace('&amp;', '&', $registry->getLogoutUrl(array('reason' => Horde_Auth::REASON_SESSION))), 'horde.ajaxtimeout', array('content.raw'));
             Horde::sendHTTPResponse(Horde::prepareResponse(null, $ajax->notify), $ajax->responseType());
             exit;
@@ -55,7 +55,7 @@ try {
 // encoding.
 ob_start();
 
-$ajax = $injector->getInstance('Horde_Ajax_Factory')->getAjax($app, Horde_Variables::getDefaultVariables(), $action);
+$ajax = $injector->getInstance('Horde_Core_Factory_Ajax')->create($app, Horde_Variables::getDefaultVariables(), $action);
 try {
     $result = $ajax->doAction();
 } catch (Exception $e) {
diff --git a/horde/services/imple.php b/horde/services/imple.php
index 04925cc95..67afccd70 100644
--- a/horde/services/imple.php
+++ b/horde/services/imple.php
@@ -65,7 +65,7 @@ if (isset($args['impleApp'])) {
     $impleargs = array($args['impleApp'], $impleName);
 }
 
-$imple = $injector->getInstance('Horde_Ajax_Imple_Factory')->getImple($impleargs, array(), true);
+$imple = $injector->getInstance('Horde_Core_Factory_Imple')->create($impleargs, array(), true);
 $result = $imple->handle($args, $post);
 
 $ct = empty($_SERVER['Content-Type'])
diff --git a/imp/lib/Mime/Viewer/Pgp.php b/imp/lib/Mime/Viewer/Pgp.php
index 728c506a6..25bb9e6aa 100644
--- a/imp/lib/Mime/Viewer/Pgp.php
+++ b/imp/lib/Mime/Viewer/Pgp.php
@@ -205,7 +205,7 @@ class IMP_Mime_Viewer_Pgp extends Horde_Mime_Viewer_Base
 
                     /* Ask for the correct passphrase if this is encrypted
                      * symmetrically. */
-                    $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'PassphraseDialog'), array(
+                    $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'PassphraseDialog'), array(
                         'params' => array(
                             'symmetricid' => $symmetric_id
                         ),
@@ -240,7 +240,7 @@ class IMP_Mime_Viewer_Pgp extends Horde_Mime_Viewer_Base
                     if (is_null($personal_pass)) {
                         /* Ask for the private key's passphrase if this is
                          * encrypted asymmetrically. */
-                        $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'PassphraseDialog'), array(
+                        $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'PassphraseDialog'), array(
                             'type' => 'pgpPersonal'
                         ));
                         $status[] = Horde::link('#', '', '', '', '', '', '', array('id' => $imple->getPassphraseId())) . _("You must enter the passphrase for your PGP private key to view this message.") . '</a>';
diff --git a/imp/lib/Mime/Viewer/Smime.php b/imp/lib/Mime/Viewer/Smime.php
index 9e73089c0..905f9c4ba 100644
--- a/imp/lib/Mime/Viewer/Smime.php
+++ b/imp/lib/Mime/Viewer/Smime.php
@@ -197,7 +197,7 @@ class IMP_Mime_Viewer_Smime extends Horde_Mime_Viewer_Base
         /* Make sure we have a passphrase. */
         $passphrase = $this->_impsmime->getPassphrase();
         if (is_null($passphrase)) {
-            $imple = $GLOBALS['registry']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'PassphraseDialog'), array(
+            $imple = $GLOBALS['registry']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'PassphraseDialog'), array(
                 'type' => 'smimePersonal'
             ));
             $status[] = Horde::link('#', '', '', '', '', '', '', array('id' => $imple->getPassphraseId())) . _("You must enter the passphrase for your S/MIME private key to view this data.") . '</a>';
diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index a8a940f33..0ef32ee2e 100644
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -1081,7 +1081,7 @@ class IMP_Prefs_Ui
                 $t->set('sendkey', Horde::link($ui->selfUrl(array('special' => true))->add('send_pgp_key', 1), _("Send Key to Public Keyserver")));
                 $t->set('personalkey-public-help', Horde_Help::link('imp', 'pgp-personalkey-public'));
 
-                $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'PassphraseDialog'), array(
+                $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'PassphraseDialog'), array(
                     'type' => 'pgpPersonal'
                 ));
 
@@ -1479,7 +1479,7 @@ class IMP_Prefs_Ui
                 $t->set('viewpublic', Horde::link($smime_url->copy()->add('actionID', 'view_personal_public_key'), _("View Personal Public Certificate"), null, 'view_key'));
                 $t->set('infopublic', Horde::link($smime_url->copy()->add('actionID', 'info_personal_public_key'), _("Information on Personal Public Certificate"), null, 'info_key'));
 
-                $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'PassphraseDialog'), array(
+                $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'PassphraseDialog'), array(
                     'type' => 'smimePersonal'
                 ));
 
diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php
index 3b279ec6f..7538b2f35 100644
--- a/imp/lib/Ui/Compose.php
+++ b/imp/lib/Ui/Compose.php
@@ -81,7 +81,7 @@ class IMP_Ui_Compose
     {
         /* Attach autocompleters to the compose form elements. */
         foreach ($fields as $val) {
-            $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'ContactAutoCompleter'), array('triggerId' => $val));
+            $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'ContactAutoCompleter'), array('triggerId' => $val));
         }
     }
 
@@ -113,7 +113,7 @@ class IMP_Ui_Compose
             )
         );
 
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple('SpellChecker', $args);
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create('SpellChecker', $args);
     }
 
     /**
@@ -312,7 +312,7 @@ class IMP_Ui_Compose
             break;
         }
 
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('imp', 'PassphraseDialog'), array(
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('imp', 'PassphraseDialog'), array(
             'onload' => true,
             'params' => $params,
             'type' => $type
diff --git a/kronolith/attendees.php b/kronolith/attendees.php
index e6337e4d0..63404fb3c 100644
--- a/kronolith/attendees.php
+++ b/kronolith/attendees.php
@@ -266,7 +266,7 @@ $end =  new Horde_Date(Horde_Util::getFormData('enddate', date('Ymd') . '000000'
 $vfb_html = $attendee_view->render($date);
 
 // Add the ContactAutoCompleter
-$injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'ContactAutoCompleter'), array(
+$injector->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'ContactAutoCompleter'), array(
     'triggerId' => 'newAttendees'
 ));
 
diff --git a/kronolith/calendars/edit.php b/kronolith/calendars/edit.php
index e5f00cf48..5a5bd9689 100644
--- a/kronolith/calendars/edit.php
+++ b/kronolith/calendars/edit.php
@@ -61,7 +61,7 @@ $vars->set('tags', implode(',', array_values($tagger->getTags($calendar->getName
 $vars->set('system', is_null($calendar->get('owner')));
 $title = $form->getTitle();
 
-$injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'TagAutoCompleter'), array(
+$injector->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'TagAutoCompleter'), array(
     'triggerId' => 'tags'
 ));
 
diff --git a/kronolith/index.php b/kronolith/index.php
index f1e044aa6..45e73c632 100644
--- a/kronolith/index.php
+++ b/kronolith/index.php
@@ -93,7 +93,7 @@ foreach ($injector->getInstance('Horde_Alarm')->handlers() as $method => $handle
     $taskAlarmParams = substr($taskAlarmParams, 0, - 6) . '</div>';
 }
 
-$injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(
+$injector->getInstance('Horde_Core_Factory_Imple')->create(
     array('kronolith', 'TagAutoCompleter'),
     array(
         'box' => 'kronolithEventACBox',
@@ -103,7 +103,7 @@ $injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(
     )
 );
 
-$injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(
+$injector->getInstance('Horde_Core_Factory_Imple')->create(
     array('kronolith', 'TagAutoCompleter'),
     array(
         'box' => 'kronolithCalendarinternalACBox',
@@ -114,7 +114,7 @@ $injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(
     )
 );
 
-$injector->getInstance('Horde_Ajax_Imple_Factory')->getImple(
+$injector->getInstance('Horde_Core_Factory_Imple')->create(
     array('kronolith', 'ContactAutoCompleter'),
     array(
         'box' => 'kronolithAttendeesACBox',
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 965f243ee..a2546d5e2 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -2090,7 +2090,7 @@ class Kronolith
     public static function embedCode($calendar)
     {
         /* Get the base url */
-        $imple = $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'Embed'), array(
+        $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'Embed'), array(
             'calendar' => $calendar,
             'container' => 'kronolithCal',
             'view' => 'month'
diff --git a/kronolith/templates/edit/edit.inc b/kronolith/templates/edit/edit.inc
index 0b1a353f1..398b7f50b 100644
--- a/kronolith/templates/edit/edit.inc
+++ b/kronolith/templates/edit/edit.inc
@@ -420,7 +420,7 @@ if ($event->alarm) {
  <td colspan="4">
    <input type="text" name="tags" id="tags" value="<?php echo (!empty($tags) ? htmlspecialchars($tags) : '')?>" size="40" />
    <span id="tags_loading_img" style="display:none;"><?php echo Horde::img('loading.gif', _("Loading...")) ?></span>
-   <?php $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'TagAutoCompleter'), array('triggerId' => 'tags', 'id' => $event->uid)); ?>
+   <?php $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'TagAutoCompleter'), array('triggerId' => 'tags', 'id' => $event->uid)); ?>
  </td>
 </tr>
 <!-- spacer -->
diff --git a/kronolith/templates/panel.inc b/kronolith/templates/panel.inc
index efa05c9b5..099ed7dd0 100644
--- a/kronolith/templates/panel.inc
+++ b/kronolith/templates/panel.inc
@@ -87,7 +87,7 @@ if ($cal->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
         . Horde::img('delete-small.png', _("Remove Tag"))
         . '</a>';
 }
-$GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'TagActions'), array(
+$GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'TagActions'), array(
     'action' => 'delete',
     'resource' => $id,
     'tagId' => $tag_id,
@@ -102,11 +102,11 @@ $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('k
       <input type="text" name="newtags-input_<?php echo $id?>" id="newtags-input_<?php echo $id?>" size="10" /><input type="button" class="button" value="add" name="newtags-button_<?php echo $id?>" id="newtags-button_<?php echo $id?>" />
       <span id="newtags-input_<?php echo $id?>_loading_img" style="display:none;"><?php echo Horde::img('loading.gif', _("Loading...")) ?></span>
      <?php
-      $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'TagAutoCompleter'), array(
+      $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'TagAutoCompleter'), array(
           'id' => $id,
           'triggerId' => 'newtags-input_' . $id
       ));
-      $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('kronolith', 'TagActions'), array(
+      $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('kronolith', 'TagActions'), array(
           'action' => 'add',
           'resource' => $id,
           'triggerId' => 'newtags-button',
diff --git a/mnemo/lib/Block/note.php b/mnemo/lib/Block/note.php
index 165fd0d85..769613713 100644
--- a/mnemo/lib/Block/note.php
+++ b/mnemo/lib/Block/note.php
@@ -45,7 +45,7 @@ class Horde_Block_Mnemo_note extends Horde_Block
             $body = Horde::callHook('format_description', array($body), 'mnemo', $body);
         } catch (Horde_Exception_HookNotSet $e) {}
         $html .= $body . '</div>';
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('mnemo', 'EditNote'), array(
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('mnemo', 'EditNote'), array(
             'domid' => 'noteBody' . $memo['memo_id'],
             'id' => $this->_params['note_uid'],
             'rows' => substr_count($memo['body'], "\n"),
diff --git a/whups/lib/Forms/VarRenderer.php b/whups/lib/Forms/VarRenderer.php
index f4c1474c9..47aa20608 100644
--- a/whups/lib/Forms/VarRenderer.php
+++ b/whups/lib/Forms/VarRenderer.php
@@ -25,7 +25,7 @@ class Horde_Core_Ui_VarRenderer_whups extends Horde_Core_Ui_VarRenderer_Html {
     {
         $name = $var->getVarName();
 
-        $GLOBALS['injector']->getInstance('Horde_Ajax_Imple_Factory')->getImple(array('whups', 'ContactAutoCompleter'), array(
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create(array('whups', 'ContactAutoCompleter'), array(
             'triggerId' => $name
         ));