Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fixed is_a() usage for PHP >= 5.3.7

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-09-10 13:40:56 +02:00
parent d544babefc
commit 1470b800a4
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -370,17 +370,17 @@ class kolab_calendar
$session = &Horde_Kolab_Session::singleton(); $session = &Horde_Kolab_Session::singleton();
$imap = &$session->getImap(); $imap = &$session->getImap();
if (is_a($imap, 'PEAR_Error')) { if (is_object($imap) && is_a($imap, 'PEAR_Error')) {
$error = $imap; $error = $imap;
} }
else { else {
$result = $imap->select($this->imap_folder); $result = $imap->select($this->imap_folder);
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
$error = $result; $error = $result;
} }
else { else {
$result = $imap->undeleteMessages($imap_uid); $result = $imap->undeleteMessages($imap_uid);
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
$error = $result; $error = $result;
} }
else { else {

2
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -936,7 +936,7 @@ class kolab_driver extends calendar_driver
// trigger updates on folder // trigger updates on folder
$folder = $storage->get_folder(); $folder = $storage->get_folder();
$trigger = $folder->trigger(); $trigger = $folder->trigger();
if (is_a($trigger, 'PEAR_Error')) { if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) {
raise_error(array( raise_error(array(
'code' => 900, 'type' => 'php', 'code' => 900, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__, 'file' => __FILE__, 'line' => __LINE__,

6
plugins/calendar/lib/Horde_Date_Recurrence.php
View file

@ -407,7 +407,7 @@ class Horde_Date {
*/ */
function compareDate($date) function compareDate($date)
{ {
if (!is_a($date, 'Horde_Date')) { if (!is_object($date) || !is_a($date, 'Horde_Date')) {
$date = new Horde_Date($date); $date = new Horde_Date($date);
} }
@ -434,7 +434,7 @@ class Horde_Date {
*/ */
function compareTime($date) function compareTime($date)
{ {
if (!is_a($date, 'Horde_Date')) { if (!is_object($date) || !is_a($date, 'Horde_Date')) {
$date = new Horde_Date($date); $date = new Horde_Date($date);
} }
@ -461,7 +461,7 @@ class Horde_Date {
*/ */
function compareDateTime($date) function compareDateTime($date)
{ {
if (!is_a($date, 'Horde_Date')) { if (!is_object($date) || !is_a($date, 'Horde_Date')) {
$date = new Horde_Date($date); $date = new Horde_Date($date);
} }

2
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -280,7 +280,7 @@ class kolab_addressbook extends rcube_plugin
public function contact_form($p) public function contact_form($p)
{ {
// none of our business // 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; return $p;
// extend the list of contact fields to be displayed in the 'personal' section // extend the list of contact fields to be displayed in the 'personal' section

6
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -664,17 +664,17 @@ class rcube_kolab_contacts extends rcube_addressbook
$session = &Horde_Kolab_Session::singleton(); $session = &Horde_Kolab_Session::singleton();
$imap = &$session->getImap(); $imap = &$session->getImap();
if (is_a($imap, 'PEAR_Error')) { if (is_object($imap) && is_a($imap, 'PEAR_Error')) {
$error = $imap; $error = $imap;
} }
else { else {
$result = $imap->select($this->imap_folder); $result = $imap->select($this->imap_folder);
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
$error = $result; $error = $result;
} }
else { else {
$result = $imap->undeleteMessages(implode(',', $uids)); $result = $imap->undeleteMessages(implode(',', $uids));
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
$error = $result; $error = $result;
} }
else { else {

6
plugins/kolab_core/rcube_kolab.php
View file

@ -281,7 +281,7 @@ class rcube_kolab
$folder = $kolab->getFolder($name); $folder = $kolab->getFolder($name);
$result = $folder->delete(); $result = $folder->delete();
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
self::$last_error = $result->getMessage(); self::$last_error = $result->getMessage();
return false; return false;
} }
@ -311,7 +311,7 @@ class rcube_kolab
'default' => $default, 'default' => $default,
)); ));
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
self::$last_error = $result->getMessage(); self::$last_error = $result->getMessage();
return false; return false;
} }
@ -335,7 +335,7 @@ class rcube_kolab
$folder->setFolder($newname); $folder->setFolder($newname);
$result = $kolab->rename($folder); $result = $kolab->rename($folder);
if (is_a($result, 'PEAR_Error')) { if (is_object($result) && is_a($result, 'PEAR_Error')) {
self::$last_error = $result->getMessage(); self::$last_error = $result->getMessage();
return false; return false;
} }