From 959fae6ad9420cdb6fa2dd49c91c87562d9efaef Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Fri, 24 Dec 2010 11:37:12 -0500
Subject: [PATCH] some more low hanging fruit found by CI

---
 .../Core/lib/Horde/Core/ActiveSync/Driver.php      | 26 ++++++++++------------
 framework/Core/lib/Horde/Core/Auth/Signup/Base.php | 10 ++++++---
 framework/Core/lib/Horde/Core/Browser.php          |  3 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Driver.php b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
index 07b18f91f..1ede776ff 100644
--- a/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
+++ b/framework/Core/lib/Horde/Core/ActiveSync/Driver.php
@@ -108,7 +108,7 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
     }
 
     /**
-     * @TODO
+     * Get the wastebasket folder
      *
      * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#getWasteBasket()
      */
@@ -139,15 +139,15 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
         }
         $folders = array();
 
-        if (array_search('calendar', $supported)){
+        if (array_search('calendar', $supported)) {
             $folders[] = $this->statFolder(self::APPOINTMENTS_FOLDER);
         }
 
-        if (array_search('contacts', $supported)){
+        if (array_search('contacts', $supported)) {
             $folders[] = $this->statFolder(self::CONTACTS_FOLDER);
         }
 
-        if (array_search('tasks', $supported)){
+        if (array_search('tasks', $supported)) {
             $folders[] = $this->statFolder(self::TASKS_FOLDER);
         }
 
@@ -257,12 +257,11 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
             try {
                 $tasks = $this->_connector->tasks_listUids();
             } catch (Horde_Exception $e) {
-               $this->_logger->err($e->getMessage());
-               $this->_endBuffer();
-               return array();
+                $this->_logger->err($e->getMessage());
+                $this->_endBuffer();
+                return array();
             }
-            foreach ($tasks as $task)
-            {
+            foreach ($tasks as $task) {
                 $messages[] = $this->_smartStatMessage($folderid, $task, false);
             }
             break;
@@ -414,7 +413,7 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
                 $message = $this->_connector->calendar_export($id);
                 // Nokia MfE requires the optional UID element.
                 if (!$message->getUid()) {
-                    $message->setUid(pack("H*" , md5($id)));
+                    $message->setUid(pack("H*", md5($id)));
                 }
             } catch (Horde_Exception $e) {
                 $this->_logger->err($e->getMessage());
@@ -685,13 +684,12 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
      * Currently only used when meeting requests are sent from the PIM.
      *
      * @param string $rfc822    The rfc822 mime message
-     * @param boolean $forward  @TODO
-     * @param boolean $reply    @TODO
-     * @param boolean $parent   @TODO
+     * @param boolean $forward  Indicates if this is a forwarded message
+     * @param boolean $reply    Indicates if this is a reply
      *
      * @return boolean
      */
-    public function sendMail($rfc822, $forward = false, $reply = false, $parent = false)
+    public function sendMail($rfc822, $forward = false, $reply = false)
     {
         $headers = Horde_Mime_Headers::parseHeaders($rfc822);
         $part = Horde_Mime_Part::parseMessage($rfc822);
diff --git a/framework/Core/lib/Horde/Core/Auth/Signup/Base.php b/framework/Core/lib/Horde/Core/Auth/Signup/Base.php
index 0ea1651be..bf278e77d 100644
--- a/framework/Core/lib/Horde/Core/Auth/Signup/Base.php
+++ b/framework/Core/lib/Horde/Core/Auth/Signup/Base.php
@@ -37,7 +37,8 @@ abstract class Horde_Core_Auth_Signup_Base
         if (!empty($info['extra'])) {
             try {
                 Horde::callHook('signup_addextra', array($info['user_name'], $info['extra'], $info['password']));
-            } catch (Horde_Exception_HookNotSet $e) {}
+            } catch (Horde_Exception_HookNotSet $e) {
+            }
         }
     }
 
@@ -71,7 +72,9 @@ abstract class Horde_Core_Auth_Signup_Base
 
         try {
             Horde::callHook('signup_queued', array($info['user_name'], $info));
-        } catch (Horde_Exception_HookNotSet $e) {}
+        } catch (Horde_Exception_HookNotSet $e) {
+        }
+
 
         if (!empty($conf['signup']['email'])) {
             $link = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/admin/signup_confirm.php', true, -1)->setRaw(true)->add(array(
@@ -105,7 +108,8 @@ abstract class Horde_Core_Auth_Signup_Base
     {
         try {
             $info = Horde::callHook('signup_preprocess', array($info));
-        } catch (Horde_Exception_HookNotSet $e) {}
+        } catch (Horde_Exception_HookNotSet $e) {
+        }
 
         // Check to see if the username already exists in the auth backend or
         // the signup queue.
diff --git a/framework/Core/lib/Horde/Core/Browser.php b/framework/Core/lib/Horde/Core/Browser.php
index edb657eeb..907fd4132 100644
--- a/framework/Core/lib/Horde/Core/Browser.php
+++ b/framework/Core/lib/Horde/Core/Browser.php
@@ -54,7 +54,8 @@ class Horde_Core_Browser extends Horde_Browser
 
         try {
             Horde::callHook('browser_modify', array($this), 'horde');
-        } catch (Horde_Exception_HookNotSet $e) {}
+        } catch (Horde_Exception_HookNotSet $e) {
+        }
     }
 
     /**
-- 
2.11.0