From 7edae8d7680b1a1474ebdd851a23b1d90c6e4951 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 17 Jul 2009 15:33:59 -0600
Subject: [PATCH] phpdoc, don't throw exception when gc'ing

---
 imp/lib/Sentmail.php     |  1 -
 imp/lib/Sentmail/Sql.php | 41 +++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/imp/lib/Sentmail.php b/imp/lib/Sentmail.php
index 565c18cb0..3cd71c19d 100644
--- a/imp/lib/Sentmail.php
+++ b/imp/lib/Sentmail.php
@@ -149,7 +149,6 @@ class IMP_Sentmail
      *
      * @param integer $before  Unix timestamp before that all log entries
      *                         should be deleted.
-     * @throws Horde_Exception
      */
     protected function _deleteOldEntries($before)
     {
diff --git a/imp/lib/Sentmail/Sql.php b/imp/lib/Sentmail/Sql.php
index 467389234..b09553af9 100644
--- a/imp/lib/Sentmail/Sql.php
+++ b/imp/lib/Sentmail/Sql.php
@@ -2,19 +2,23 @@
 /**
  * IMP_Sentmail implementation for PHP's PEAR database abstraction layer.
  *
- * Required values for $params:<pre>
- *      'phptype'       The database type (e.g. 'pgsql', 'mysql', etc.).
- *      'table'         The name of the foo table in 'database'.</pre>
+ * Required values for $params:
+ * <pre>
+ * 'phptype'       The database type (e.g. 'pgsql', 'mysql', etc.).
+ * 'table'         The name of the foo table in 'database'.
+ * </pre>
  *
- * Required by some database implementations:<pre>
- *      'database'      The name of the database.
- *      'hostspec'      The hostname of the database server.
- *      'protocol'      The communication protocol ('tcp', 'unix', etc.).
- *      'username'      The username with which to connect to the database.
- *      'password'      The password associated with 'username'.
- *      'options'       Additional options to pass to the database.
- *      'tty'           The TTY on which to connect to the database.
- *      'port'          The port on which to connect to the database.</pre>
+ * Required by some database implementations:
+ * <pre>
+ * 'database'      The name of the database.
+ * 'hostspec'      The hostname of the database server.
+ * 'protocol'      The communication protocol ('tcp', 'unix', etc.).
+ * 'username'      The username with which to connect to the database.
+ * 'password'      The password associated with 'username'.
+ * 'options'       Additional options to pass to the database.
+ * 'tty'           The TTY on which to connect to the database.
+ * 'port'          The port on which to connect to the database.
+ * </pre>
  *
  * The table structure can be created by the scripts/sql/imp_sentmail.sql
  * script.
@@ -96,7 +100,7 @@ class IMP_Sentmail_Sql extends IMP_Sentmail
                         (int)$success);
 
         /* Log the query at a DEBUG log level. */
-        Horde::logMessage(sprintf('IMP_Sentmail_sql::_log(): %s', $query),
+        Horde::logMessage(sprintf('IMP_Sentmail_Sql::_log(): %s', $query),
                           __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         /* Execute the query. */
@@ -135,7 +139,7 @@ class IMP_Sentmail_Sql extends IMP_Sentmail
                          $limit);
 
         /* Log the query at a DEBUG log level. */
-        Horde::logMessage(sprintf('IMP_Sentmail_sql::favouriteRecipients(): %s', $query),
+        Horde::logMessage(sprintf('IMP_Sentmail_Sql::favouriteRecipients(): %s', $query),
                           __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         /* Execute the query. */
@@ -148,7 +152,7 @@ class IMP_Sentmail_Sql extends IMP_Sentmail
         /* Extract email addresses. */
         $favourites = array();
         foreach ($recipients as $recipient) {
-            $favourites[] = $recipient[0];
+            $favourites[] = reset($recipient);
         }
 
         return $favourites;
@@ -174,7 +178,7 @@ class IMP_Sentmail_Sql extends IMP_Sentmail
         }
 
         /* Log the query at a DEBUG log level. */
-        Horde::logMessage(sprintf('IMP_Sentmail_sql::numberOfRecipients(): %s', $query),
+        Horde::logMessage(sprintf('IMP_Sentmail_Sql::numberOfRecipients(): %s', $query),
                           __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         /* Execute the query. */
@@ -192,8 +196,6 @@ class IMP_Sentmail_Sql extends IMP_Sentmail
      *
      * @param integer $before  Unix timestamp before that all log entries
      *                         should be deleted.
-     *
-     * @throw Horde_Exception
      */
     protected function _deleteOldEntries($before)
     {
@@ -202,14 +204,13 @@ class IMP_Sentmail_Sql extends IMP_Sentmail
                          $this->_params['table']);
 
         /* Log the query at a DEBUG log level. */
-        Horde::logMessage(sprintf('IMP_Sentmail_sql::_deleteOldEntries(): %s', $query),
+        Horde::logMessage(sprintf('IMP_Sentmail_Sql::_deleteOldEntries(): %s', $query),
                           __FILE__, __LINE__, PEAR_LOG_DEBUG);
 
         /* Execute the query. */
         $result = $this->_db->query($query, array($before));
         if ($result instanceof PEAR_Error) {
             Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
-            throw new Horde_Exception($result);
         }
     }
 
-- 
2.11.0