extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

is_a compatibility vs. php5.3.8 resolving to instanceof operator

Browse Source
This commit is contained in:
Klaus Leithoff 2011-09-12 13:28:14 +00:00
parent f861383d4a
commit 74524a9be1
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emailadmin/inc/class.ea_preferences.inc.php
View File

@ -97,7 +97,7 @@
function setIdentity($_identityObject, $_id = false)
{
//error_log(__METHOD__.__LINE__.' called with ID '.$_id.' ->'.array2string($_identityObject).function_backtrace());
if(is_a($_identityObject, 'ea_identity'))
if(($_identityObject instanceof ea_identity))
{
if($_id !== false)
{
@ -124,7 +124,7 @@
function setIncomingServer($_serverObject, $_id = false)
{
if(is_a($_serverObject, 'defaultimap'))
if(($_serverObject instanceof defaultimap))
{
if($_id !== false)
{
@ -144,7 +144,7 @@
function setOutgoingServer($_serverObject, $_id = false)
{
if(is_a($_serverObject, 'defaultsmtp'))
if(($_serverObject instanceof defaultsmtp))
{
if($_id !== false)
{

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

@ -724,14 +724,14 @@ class emailadmin_bo extends so_sql
$icServerKeys = array_keys((array)$userProfile->ic_server);
$profileID = array_shift($icServerKeys);
$icServer = $userProfile->getIncomingServer($profileID);
if(is_a($icServer, 'defaultimap') && $username = $GLOBALS['egw']->accounts->id2name($_accountID)) {
if(($icServer instanceof defaultimap) && $username = $GLOBALS['egw']->accounts->id2name($_accountID)) {
$icUserData = $icServer->getUserData($username);
}
$ogServerKeys = array_keys((array)$userProfile->og_server);
$profileID = array_shift($ogServerKeys);
$ogServer = $userProfile->getOutgoingServer($profileID);
if(is_a($ogServer, 'defaultsmtp')) {
if(($ogServer instanceof defaultsmtp)) {
$ogUserData = $ogServer->getUserData($_accountID);
}
@ -875,7 +875,7 @@ class emailadmin_bo extends so_sql
$ogServerKeys = array_keys((array)$userProfile->og_server);
$profileID = array_shift($ogServerKeys);
$ogServer = $userProfile->getOutgoingServer($profileID);
if(is_a($ogServer, 'defaultsmtp')) {
if(($ogServer instanceof defaultsmtp)) {
$ogServer->setUserData($_accountID,
(array)$_formData['mailAlternateAddress'],
(array)$_formData['mailForwardingAddress'],
@ -888,7 +888,7 @@ class emailadmin_bo extends so_sql
$icServerKeys = array_keys((array)$userProfile->ic_server);
$profileID = array_shift($icServerKeys);
$icServer = $userProfile->getIncomingServer($profileID);
if(is_a($icServer, 'defaultimap') && $username = $GLOBALS['egw']->accounts->id2name($_accountID)) {
if(($icServer instanceof defaultimap) && $username = $GLOBALS['egw']->accounts->id2name($_accountID)) {
$icServer->setUserData($username, $_formData['quotaLimit']);
}

2
emailadmin/inc/class.emailadmin_sieve.inc.php
View File

@ -68,7 +68,7 @@ class emailadmin_sieve extends Net_Sieve
function _connect($_icServer,$euser='')
{
if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.array2string($euser));
if(is_a($_icServer,'defaultimap') && $_icServer->enableSieve) {
if(($_icServer instanceof defaultimap) && $_icServer->enableSieve) {
if (!empty($_icServer->sieveHost))
{
$sieveHost = $_icServer->sieveHost;

1
emailadmin/inc/class.emailadmin_ui.inc.php
View File

@ -224,6 +224,7 @@ class emailadmin_ui extends emailadmin_bo
$applications = array(
'calendar' => $GLOBALS['egw_info']['apps']['calendar']['title'],
'felamimail' => $GLOBALS['egw_info']['apps']['felamimail']['title'],
// 'notifications' => $GLOBALS['egw_info']['apps']['notifications']['title'],
);
asort($applications);
return $applications = array_merge(array('' => lang('any application')),$applications);