extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 20:51:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

use is_callable("parent::__get") to avoid fatal error for not existing attributes with pre 2.24.1 Horde_Imap_Client

Browse Source
This commit is contained in:
Ralf Becker 2014-08-12 07:33:23 +00:00
parent 8d8b7b6d4a
commit 3c0942c825
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emailadmin/inc/class.emailadmin_imap.inc.php
View File

@ -212,6 +212,7 @@ class emailadmin_imap extends Horde_Imap_Client_Socket implements defaultimap
* Allow read access to former public attributes * Allow read access to former public attributes
* *
* @param type $name * @param type $name
* @return mixed null for an unknown attribute
*/ */
public function __get($name) public function __get($name)
{ {
@ -242,7 +243,7 @@ class emailadmin_imap extends Horde_Imap_Client_Socket implements defaultimap
return $this->getParam($name); return $this->getParam($name);
} }
// calling Horde_Imap_Client's __get() method available since 2.24.1 // calling Horde_Imap_Client's __get() method available since 2.24.1
return parent::__get($name); return is_callable('parent::__get') ? parent::__get($name) : null;
} }
} }
@ -478,6 +479,7 @@ class emailadmin_imap extends Horde_Imap_Client_Socket implements defaultimap
} }
catch (Exception $e) catch (Exception $e)
{ {
unset($e);
return false; return false;
} }
} }
@ -588,11 +590,11 @@ class emailadmin_imap extends Horde_Imap_Client_Socket implements defaultimap
//but then allMailboxes are not all, .... //but then allMailboxes are not all, ....
//if (!empty($mailbox) && !isset($ret[$mailbox])) //if (!empty($mailbox) && !isset($ret[$mailbox]))
{ {
$mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options); $unsub_mailboxes = $this->listMailboxes($searchstring,Horde_Imap_Client::MBOX_UNSUBSCRIBED, $options);
//$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes); //$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
//_debug_array($mboxes->count()); //_debug_array($mboxes->count());
//error_log(__METHOD__.__LINE__.' '.$mailbox.':'.count((array)$mailboxes).'->'.function_backtrace()); //error_log(__METHOD__.__LINE__.' '.$mailbox.':'.count((array)$mailboxes).'->'.function_backtrace());
foreach ((array)$mailboxes as $k =>$box) foreach ((array)$unsub_mailboxes as $k =>$box)
{ {
//error_log(__METHOD__.__LINE__.' Box:'.$k.' already In?'.array_key_exists($k,$boxexists).'->'.array2string($box)); //error_log(__METHOD__.__LINE__.' Box:'.$k.' already In?'.array_key_exists($k,$boxexists).'->'.array2string($box));
if(!array_key_exists($k,$ret)) if(!array_key_exists($k,$ret))