From ab2f6ba16e90a00b7a64cbcdaf17dc5371ff8866 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 18 Dec 2009 11:53:26 -0700
Subject: [PATCH] Make singleton/factory classname agnostic

---
 imp/lib/Accounts.php   | 2 +-
 imp/lib/Compose.php    | 2 +-
 imp/lib/Contents.php   | 2 +-
 imp/lib/Folder.php     | 2 +-
 imp/lib/Imap/Acl.php   | 2 +-
 imp/lib/Imap/Flags.php | 2 +-
 imp/lib/Imap/Tree.php  | 2 +-
 imp/lib/Mailbox.php    | 2 +-
 imp/lib/Message.php    | 2 +-
 imp/lib/Quota.php      | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/imp/lib/Accounts.php b/imp/lib/Accounts.php
index 483bcffaa..ca9b7addc 100644
--- a/imp/lib/Accounts.php
+++ b/imp/lib/Accounts.php
@@ -36,7 +36,7 @@ class IMP_Accounts
     static public function singleton()
     {
         if (!isset(self::$_instance)) {
-            self::$_instance = new IMP_Accounts();
+            self::$_instance = new self();
         }
 
         return self::$_instance;
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 3b17326f4..5efe298fe 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -105,7 +105,7 @@ class IMP_Compose
 
         if (is_null($cacheid) || empty(self::$_instances[$cacheid])) {
             $cacheid = is_null($cacheid) ? uniqid(mt_rand()) : $cacheid;
-            self::$_instances[$cacheid] = new IMP_Compose($cacheid);
+            self::$_instances[$cacheid] = new self($cacheid);
         }
 
         return self::$_instances[$cacheid];
diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index d2f635940..535b16bba 100644
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -112,7 +112,7 @@ class IMP_Contents
             : $in;
 
         if (empty(self::$_instances[$sig])) {
-            self::$_instances[$sig] = new IMP_Contents($in);
+            self::$_instances[$sig] = new self($in);
         }
 
         return self::$_instances[$sig];
diff --git a/imp/lib/Folder.php b/imp/lib/Folder.php
index ece5b71b0..b42f80976 100644
--- a/imp/lib/Folder.php
+++ b/imp/lib/Folder.php
@@ -49,7 +49,7 @@ class IMP_Folder
     static public function singleton()
     {
         if (is_null(self::$_instance)) {
-            self::$_instance = new IMP_Folder();
+            self::$_instance = new self();
         }
 
         return self::$_instance;
diff --git a/imp/lib/Imap/Acl.php b/imp/lib/Imap/Acl.php
index 9f11d8264..3cc1bcb69 100644
--- a/imp/lib/Imap/Acl.php
+++ b/imp/lib/Imap/Acl.php
@@ -45,7 +45,7 @@ class IMP_Imap_Acl
     static public function singleton()
     {
         if (!self::$_instance) {
-            self::$_instance = new IMP_Imap_Acl();
+            self::$_instance = new self();
         }
 
         return self::$_instance;
diff --git a/imp/lib/Imap/Flags.php b/imp/lib/Imap/Flags.php
index 21e3fd71c..5a2e496ab 100644
--- a/imp/lib/Imap/Flags.php
+++ b/imp/lib/Imap/Flags.php
@@ -39,7 +39,7 @@ class IMP_Imap_Flags
     static public function singleton()
     {
         if (!isset(self::$_instance)) {
-            self::$_instance = new IMP_Imap_Flags();
+            self::$_instance = new self();
         }
 
         return self::$_instance;
diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index d1db49284..5c8fd2f20 100644
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -221,7 +221,7 @@ class IMP_Imap_Tree
             }
 
             if (empty(self::$_instance)) {
-                self::$_instance = new IMP_Imap_Tree();
+                self::$_instance = new self();
             }
         }
 
diff --git a/imp/lib/Mailbox.php b/imp/lib/Mailbox.php
index 338eabc9a..9236877a3 100644
--- a/imp/lib/Mailbox.php
+++ b/imp/lib/Mailbox.php
@@ -84,7 +84,7 @@ class IMP_Mailbox
     static public function singleton($mailbox, $uid = null)
     {
         if (!isset(self::$_instances[$mailbox])) {
-            self::$_instances[$mailbox] = new IMP_Mailbox($mailbox, $uid);
+            self::$_instances[$mailbox] = new self($mailbox, $uid);
         } elseif (!is_null($uid)) {
             self::$_instances[$mailbox]->setIndex($uid);
         }
diff --git a/imp/lib/Message.php b/imp/lib/Message.php
index 1195139b4..2beae887a 100644
--- a/imp/lib/Message.php
+++ b/imp/lib/Message.php
@@ -42,7 +42,7 @@ class IMP_Message
     public static function singleton()
     {
         if (!self::$_instance) {
-            self::$_instance = new IMP_Message();
+            self::$_instance = new self();
         }
 
         return self::$_instance;
diff --git a/imp/lib/Quota.php b/imp/lib/Quota.php
index f5aeb5bdb..4aa7c7c01 100644
--- a/imp/lib/Quota.php
+++ b/imp/lib/Quota.php
@@ -68,7 +68,7 @@ class IMP_Quota
     static public function factory($driver, $params = array())
     {
         $driver = basename($driver);
-        $class = 'IMP_Quota_' . ucfirst($driver);
+        $class = __CLASS__ . '_' . ucfirst($driver);
 
         if (class_exists($class)) {
             return new $class($params);
-- 
2.11.0