From f35649d1f75861bc5f860591b95b5e1a3077c565 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Tue, 2 Dec 2008 13:54:24 -0500
Subject: [PATCH] make this file autoloadable

---
 .../lib/Horde/Imap/Client/{Cclient-pop3.php => Cclient/Pop3.php}   | 7 ++-----
 framework/Imap_Client/package.xml                                  | 6 ++++--
 framework/Imap_Client/test/Horde/Imap/test_client.php              | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename framework/Imap_Client/lib/Horde/Imap/Client/{Cclient-pop3.php => Cclient/Pop3.php} (98%)

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Cclient-pop3.php b/framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php
similarity index 98%
rename from framework/Imap_Client/lib/Horde/Imap/Client/Cclient-pop3.php
rename to framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php
index ebfc542ff..222a7bf1b 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Cclient-pop3.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php
@@ -1,9 +1,6 @@
 <?php
-
-require_once dirname(__FILE__) . '/Cclient.php';
-
 /**
- * Horde_Imap_Client_Cclient_pop3 provides an interface to a POP3 server (RFC
+ * Horde_Imap_Client_Cclient_Pop3 provides an interface to a POP3 server (RFC
  * 1939) via the PHP imap (c-client) module.  This driver is an abstraction
  * layer allowing POP3 commands to be used based on its IMAP equivalents.
  *
@@ -20,7 +17,7 @@ require_once dirname(__FILE__) . '/Cclient.php';
  * @category Horde
  * @package  Horde_Imap_Client
  */
-class Horde_Imap_Client_Cclient_pop3 extends Horde_Imap_Client_Cclient
+class Horde_Imap_Client_Cclient_Pop3 extends Horde_Imap_Client_Cclient
 {
     /**
      * Constructs a new Horde_Imap_Client_Cclient object.
diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
index a88d2e8d7..bc014eed6 100644
--- a/framework/Imap_Client/package.xml
+++ b/framework/Imap_Client/package.xml
@@ -40,10 +40,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <dir name="Imap">
       <dir name="Client">
+       <dir name="Cclient">
+        <file name="Pop3.php" role="php" />
+       </dir>
        <file name="Base.php" role="php" />
        <file name="Cache.php" role="php" />
        <file name="Cclient.php" role="php" />
-       <file name="Cclient-pop3.php" role="php" />
        <file name="Exception.php" role="php" />
        <file name="Socket.php" role="php" />
        <file name="Sort.php" role="php" />
@@ -97,8 +99,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <filelist>
    <install name="lib/Horde/Imap/Client/Base.php" as="Horde/Imap/Client/Base.php" />
    <install name="lib/Horde/Imap/Client/Cache.php" as="Horde/Imap/Client/Cache.php" />
+   <install name="lib/Horde/Imap/Client/Cclient/Pop3.php" as="Horde/Imap/Client/Cclient/Pop3.php" />
    <install name="lib/Horde/Imap/Client/Cclient.php" as="Horde/Imap/Client/Cclient.php" />
-   <install name="lib/Horde/Imap/Client/Cclient-pop3.php" as="Horde/Imap/Client/Cclient-pop3.php" />
    <install name="lib/Horde/Imap/Client/Exception.php" as="Horde/Imap/Client/Exception.php" />
    <install name="lib/Horde/Imap/Client/Socket.php" as="Horde/Imap/Client/Socket.php" />
    <install name="lib/Horde/Imap/Client/Sort.php" as="Horde/Imap/Client/Sort.php" />
diff --git a/framework/Imap_Client/test/Horde/Imap/test_client.php b/framework/Imap_Client/test/Horde/Imap/test_client.php
index c21e5cc7d..e921af91b 100644
--- a/framework/Imap_Client/test/Horde/Imap/test_client.php
+++ b/framework/Imap_Client/test/Horde/Imap/test_client.php
@@ -22,7 +22,7 @@
  */
 
 /** Configuration **/
-$driver = 'Socket'; // 'Socket', 'Cclient', or 'Cclient-pop3'
+$driver = 'Socket'; // 'Socket', 'Cclient', or 'Cclient_Pop3'
 $params = array(
     'username' => '',
     'password' => '',
@@ -104,7 +104,7 @@ if (@require_once 'Benchmark/Timer.php') {
 $params['id'] = array('name' => 'Horde_Imap_Client test program');
 
 $imap_client = Horde_Imap_Client::getInstance($driver, $params);
-if ($driver == 'Cclient-pop3') {
+if ($driver == 'Cclient_Pop3') {
     $test_mbox = $test_mbox_utf8 = 'INBOX';
 }
 
@@ -711,7 +711,7 @@ try {
     print "Fetch: FAILED\n";
 
     // If POP3, try easier fetch criteria
-    if ($driver == 'Cclient-pop3') {
+    if ($driver == 'Cclient_Pop3') {
         try {
             print_r($imap_client->fetch('INBOX', array(
                 Horde_Imap_Client::FETCH_FULLMSG => array(
-- 
2.11.0