From 1470b800a47263be3d4844df83be960534f09a54 Mon Sep 17 00:00:00 2001
From: "Aleksander Machniak (Kolab Systems)" <machniak@kolabsys.com>
Date: Sat, 10 Sep 2011 13:40:56 +0200
Subject: [PATCH] - Fixed is_a() usage for PHP >= 5.3.7

---
 plugins/calendar/drivers/kolab/kolab_calendar.php      | 6 +++---
 plugins/calendar/drivers/kolab/kolab_driver.php        | 2 +-
 plugins/calendar/lib/Horde_Date_Recurrence.php         | 6 +++---
 plugins/kolab_addressbook/kolab_addressbook.php        | 2 +-
 plugins/kolab_addressbook/lib/rcube_kolab_contacts.php | 6 +++---
 plugins/kolab_core/rcube_kolab.php                     | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index bd8e37fb..5f171337 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -370,17 +370,17 @@ class kolab_calendar
     $session = &Horde_Kolab_Session::singleton();
     $imap    = &$session->getImap();
 
-    if (is_a($imap, 'PEAR_Error')) {
+    if (is_object($imap) && is_a($imap, 'PEAR_Error')) {
       $error = $imap;
     }
     else {
       $result = $imap->select($this->imap_folder);
-      if (is_a($result, 'PEAR_Error')) {
+      if (is_object($result) && is_a($result, 'PEAR_Error')) {
         $error = $result;
       }
       else {
         $result = $imap->undeleteMessages($imap_uid);
-        if (is_a($result, 'PEAR_Error')) {
+        if (is_object($result) && is_a($result, 'PEAR_Error')) {
           $error = $result;
         }
         else {
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 77611a34..c0a5efb2 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -936,7 +936,7 @@ class kolab_driver extends calendar_driver
     // trigger updates on folder
     $folder = $storage->get_folder();
     $trigger = $folder->trigger();
-    if (is_a($trigger, 'PEAR_Error')) {
+    if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) {
       raise_error(array(
         'code' => 900, 'type' => 'php',
         'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/calendar/lib/Horde_Date_Recurrence.php b/plugins/calendar/lib/Horde_Date_Recurrence.php
index 2d14128a..68340ba3 100644
--- a/plugins/calendar/lib/Horde_Date_Recurrence.php
+++ b/plugins/calendar/lib/Horde_Date_Recurrence.php
@@ -407,7 +407,7 @@ class Horde_Date {
      */
     function compareDate($date)
     {
-        if (!is_a($date, 'Horde_Date')) {
+        if (!is_object($date) || !is_a($date, 'Horde_Date')) {
             $date = new Horde_Date($date);
         }
 
@@ -434,7 +434,7 @@ class Horde_Date {
      */
     function compareTime($date)
     {
-        if (!is_a($date, 'Horde_Date')) {
+        if (!is_object($date) || !is_a($date, 'Horde_Date')) {
             $date = new Horde_Date($date);
         }
 
@@ -461,7 +461,7 @@ class Horde_Date {
      */
     function compareDateTime($date)
     {
-        if (!is_a($date, 'Horde_Date')) {
+        if (!is_object($date) || !is_a($date, 'Horde_Date')) {
             $date = new Horde_Date($date);
         }
 
diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index d0f81555..55ae83bd 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -280,7 +280,7 @@ class kolab_addressbook extends rcube_plugin
     public function contact_form($p)
     {
         // none of our business
-        if (!is_a($GLOBALS['CONTACTS'], 'rcube_kolab_contacts'))
+        if (!is_object($GLOBALS['CONTACTS']) || !is_a($GLOBALS['CONTACTS'], 'rcube_kolab_contacts'))
             return $p;
 
         // extend the list of contact fields to be displayed in the 'personal' section
diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index 39ad7335..3917543c 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -664,17 +664,17 @@ class rcube_kolab_contacts extends rcube_addressbook
             $session = &Horde_Kolab_Session::singleton();
             $imap = &$session->getImap();
 
-            if (is_a($imap, 'PEAR_Error')) {
+            if (is_object($imap) && is_a($imap, 'PEAR_Error')) {
                 $error = $imap;
             }
             else {
                 $result = $imap->select($this->imap_folder);
-                if (is_a($result, 'PEAR_Error')) {
+                if (is_object($result) && is_a($result, 'PEAR_Error')) {
                     $error = $result;
                 }
                 else {
                     $result = $imap->undeleteMessages(implode(',', $uids));
-                    if (is_a($result, 'PEAR_Error')) {
+                    if (is_object($result) && is_a($result, 'PEAR_Error')) {
                         $error = $result;
                     }
                     else {
diff --git a/plugins/kolab_core/rcube_kolab.php b/plugins/kolab_core/rcube_kolab.php
index 394d2184..a54776f5 100644
--- a/plugins/kolab_core/rcube_kolab.php
+++ b/plugins/kolab_core/rcube_kolab.php
@@ -281,7 +281,7 @@ class rcube_kolab
         $folder = $kolab->getFolder($name);
         $result = $folder->delete();
 
-        if (is_a($result, 'PEAR_Error')) {
+        if (is_object($result) && is_a($result, 'PEAR_Error')) {
             self::$last_error = $result->getMessage();
             return false;
         }
@@ -311,7 +311,7 @@ class rcube_kolab
             'default' => $default,
         ));
 
-        if (is_a($result, 'PEAR_Error')) {
+        if (is_object($result) && is_a($result, 'PEAR_Error')) {
             self::$last_error = $result->getMessage();
             return false;
         }
@@ -335,7 +335,7 @@ class rcube_kolab
         $folder->setFolder($newname);
 
         $result = $kolab->rename($folder);
-        if (is_a($result, 'PEAR_Error')) {
+        if (is_object($result) && is_a($result, 'PEAR_Error')) {
             self::$last_error = $result->getMessage();
             return false;
         }