Imple -> IMP_Imple

diff --git a/imp/imple.php b/imp/imple.php
index 6724b91..4888274 100644 (file)
--- a/imp/imple.php
+++ b/imp/imple.php
@@ -11,7 +11,6 @@
 @define('IMP_BASE', dirname(__FILE__));
 $authentication = 'horde';
 require_once IMP_BASE . '/lib/base.php';
-require_once IMP_BASE . '/lib/Imple.php';
 
 if (!($path = Util::getFormData('imple'))) {
     exit;
@@ -22,7 +21,7 @@ if ($path[0] == '/') {
 $path = explode('/', $path);
 $impleName = array_shift($path);
 
-if (!($imple = Imple::factory($impleName))) {
+if (!($imple = IMP_Imple::factory($impleName))) {
     exit;
 }
 

diff --git a/imp/lib/Imple.php b/imp/lib/Imple.php
index 7cd809d..559c58a 100644 (file)
--- a/imp/lib/Imple.php
+++ b/imp/lib/Imple.php
@@ -10,7 +10,7 @@
  * @author  Michael Slusarz <slusarz@horde.org>
  * @package IMP
  */
-class Imple
+class IMP_Imple
 {
     /**
      * Parameters needed by the subclasses.
@@ -20,15 +20,14 @@ class Imple
     protected $_params = array();
 
     /**
-     * Attempts to return a concrete Imple instance based on $imple.
+     * Attempts to return a concrete IMP_Imple instance based on $imple.
      *
-     * @param string $imple  The type of concrete Imple subclass to return based
+     * @param string $imple  The type of concrete subclass to return based
      *                       on the imple type indicated. The code is
      *                       dynamically included.
      * @param array $params  The configuration parameter array.
      *
-     * @return mixed  The newly created concrete Imple instance, or false on
-     *                error.
+     * @return mixed  The newly created concrete instance, or false on error.
      */
     static public function factory($imple, $params = array())
     {
@@ -37,7 +36,7 @@ class Imple
             return false;
         }
 
-        $class = 'Imple_' . $imple;
+        $class = 'IMP_Imple_' . $imple;
         if (!class_exists($class)) {
             include_once dirname(__FILE__) . '/Imple/' . $imple . '.php';
             if (!class_exists($class)) {
@@ -60,7 +59,7 @@ class Imple
     }
 
     /**
-     * Attach the Imple object to a javascript event.
+     * Attach the object to a javascript event.
      */
     public function attach()
     {

diff --git a/imp/lib/Imple/ContactAutoCompleter.php b/imp/lib/Imple/ContactAutoCompleter.php
index 523b9ca..c04f762 100644 (file)
--- a/imp/lib/Imple/ContactAutoCompleter.php
+++ b/imp/lib/Imple/ContactAutoCompleter.php
@@ -8,7 +8,7 @@
  * @author  Michael Slusarz <slusarz@horde.org>
  * @package IMP
  */
-class Imple_ContactAutoCompleter extends Imple
+class IMP_Imple_ContactAutoCompleter extends IMP_Imple
 {
     /**
      * The URL to use in attach().
@@ -39,7 +39,7 @@ class Imple_ContactAutoCompleter extends Imple
     }
 
     /**
-     * Attach the Imple object to a javascript event.
+     * Attach the object to a javascript event.
      */
     public function attach()
     {

diff --git a/imp/lib/Imple/SpellChecker.php b/imp/lib/Imple/SpellChecker.php
index 5bf13e7..966c555 100644 (file)
--- a/imp/lib/Imple/SpellChecker.php
+++ b/imp/lib/Imple/SpellChecker.php
@@ -8,7 +8,7 @@
  * @author  Michael Slusarz <slusarz@horde.org>
  * @package IMP
  */
-class Imple_SpellChecker extends Imple
+class IMP_Imple_SpellChecker extends IMP_Imple
 {
     /**
      * Constructor.

diff --git a/imp/lib/UI/Compose.php b/imp/lib/UI/Compose.php
index 057526c..9a82b4e 100644 (file)
--- a/imp/lib/UI/Compose.php
+++ b/imp/lib/UI/Compose.php
@@ -151,7 +151,7 @@ class IMP_UI_Compose {
                 'Error' => $spell_img . $br . _("Spell Check Failed")
             )
         );
-        call_user_func_array(array($mode == 'dimp' ? 'Dimple' : 'Imple', 'factory'), array('SpellChecker', $args));
+        call_user_func_array(array($mode == 'dimp' ? 'Dimple' : 'IMP_Imple', 'factory'), array('SpellChecker', $args));
     }
 
     /**