From 2d84e0b5594af4f0fa2b943be45218449a01ce14 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Sat, 17 Jan 2009 11:10:49 -0500
Subject: [PATCH] use Horde_Date instead of DateTime here, since Horde_Date
 supports timestamps in the constructor

---
 imp/lib/Maintenance/Task/purge_sentmail.php | 11 +++++------
 imp/lib/Maintenance/Task/purge_spam.php     |  6 +++---
 imp/lib/Maintenance/Task/purge_trash.php    |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/imp/lib/Maintenance/Task/purge_sentmail.php b/imp/lib/Maintenance/Task/purge_sentmail.php
index 4062b5cad..7399831cc 100644
--- a/imp/lib/Maintenance/Task/purge_sentmail.php
+++ b/imp/lib/Maintenance/Task/purge_sentmail.php
@@ -23,15 +23,15 @@ class Maintenance_Task_purge_sentmail extends Maintenance_Task
     {
         global $prefs, $notification;
 
-        $imp_folder = &IMP_Folder::singleton();
-        $imp_message = &IMP_Message::singleton();
+        $imp_folder = IMP_Folder::singleton();
+        $imp_message = IMP_Message::singleton();
 
         $mbox_list = Maintenance_Task_purge_sentmail::_getFolders();
 
         /* Get the current UNIX timestamp minus the number of days specified
          * in 'purge_sentmail_keep'.  If a message has a timestamp prior to
          * this value, it will be deleted. */
-        $del_time = new DateTime(time() - ($prefs->getValue('purge_sentmail_keep') * 86400));
+        $del_time = new Horde_Date(time() - ($prefs->getValue('purge_sentmail_keep') * 86400));
         $month = $del_time->format('n');
         $day = $del_time->format('j');
         $year = $del_time->format('Y');
@@ -87,9 +87,8 @@ class Maintenance_Task_purge_sentmail extends Maintenance_Task
      */
     function _getFolders()
     {
-        include_once 'Horde/Identity.php';
-        $identity = &Identity::singleton(array('imp', 'imp'));
-        return $identity->getAllSentmailfolders();
+        require_once 'Horde/Identity.php';
+        return Identity::singleton(array('imp', 'imp'))->getAllSentmailfolders();
     }
 
 }
diff --git a/imp/lib/Maintenance/Task/purge_spam.php b/imp/lib/Maintenance/Task/purge_spam.php
index e7aa14b99..2ee177fdb 100644
--- a/imp/lib/Maintenance/Task/purge_spam.php
+++ b/imp/lib/Maintenance/Task/purge_spam.php
@@ -29,7 +29,7 @@ class Maintenance_Task_purge_spam extends Maintenance_Task
         }
 
         /* Make sure the Spam folder exists. */
-        $imp_folder = &IMP_Folder::singleton();
+        $imp_folder = IMP_Folder::singleton();
         if (!$imp_folder->exists($spam_folder)) {
             return false;
         }
@@ -37,7 +37,7 @@ class Maintenance_Task_purge_spam extends Maintenance_Task
         /* Get the current UNIX timestamp minus the number of days
            specified in 'purge_spam_keep'.  If a message has a
            timestamp prior to this value, it will be deleted. */
-        $del_time = new DateTime(time() - ($prefs->getValue('purge_spam_keep') * 86400));
+        $del_time = new Horde_Date(time() - ($prefs->getValue('purge_spam_keep') * 86400));
         $month = $del_time->format('n');
         $day = $del_time->format('j');
         $year = $del_time->format('Y');
@@ -51,7 +51,7 @@ class Maintenance_Task_purge_spam extends Maintenance_Task
         }
 
         /* Go through the message list and delete the messages. */
-        $imp_message = &IMP_Message::singleton();
+        $imp_message = IMP_Message::singleton();
         if ($imp_message->delete(array($spam_folder => $msg_ids), true)) {
             $msgcount = count($msg_ids);
             if ($msgcount == 1) {
diff --git a/imp/lib/Maintenance/Task/purge_trash.php b/imp/lib/Maintenance/Task/purge_trash.php
index 12369e130..40d32a0a0 100644
--- a/imp/lib/Maintenance/Task/purge_trash.php
+++ b/imp/lib/Maintenance/Task/purge_trash.php
@@ -29,7 +29,7 @@ class Maintenance_Task_purge_trash extends Maintenance_Task
         }
 
         /* Make sure the Trash folder exists. */
-        $imp_folder = &IMP_Folder::singleton();
+        $imp_folder = IMP_Folder::singleton();
         if (!$imp_folder->exists($trash_folder)) {
             return false;
         }
@@ -37,7 +37,7 @@ class Maintenance_Task_purge_trash extends Maintenance_Task
         /* Get the current UNIX timestamp minus the number of days
            specified in 'purge_trash_keep'.  If a message has a
            timestamp prior to this value, it will be deleted. */
-        $del_time = new DateTime(time() - ($prefs->getValue('purge_trash_keep') * 86400));
+        $del_time = new Horde_Date(time() - ($prefs->getValue('purge_trash_keep') * 86400));
         $month = $del_time->format('n');
         $day = $del_time->format('j');
         $year = $del_time->format('Y');
@@ -51,7 +51,7 @@ class Maintenance_Task_purge_trash extends Maintenance_Task
         }
 
         /* Go through the message list and delete the messages. */
-        $imp_message = &IMP_Message::singleton();
+        $imp_message = IMP_Message::singleton();
         if ($imp_message->delete(array($trash_folder => $msg_ids), true)) {
             $msgcount = count($msg_ids);
             if ($msgcount == 1) {
-- 
2.11.0