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

use autoloading to be able to load smpt and imap plugins from other apps

Browse Source
This commit is contained in:
Ralf Becker 2010-08-19 09:50:59 +00:00
parent 80fff2e714
commit a805a849dd
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,6 +543,13 @@
return $retData;
}
/**
* Get EMailAdmin profile for a user
*
* @param string $_appName=''
* @param int|array $_groups=''
* @return ea_preferences
*/
function getUserProfile($_appName='', $_groups='')
{
if (!(is_array(self::$sessionData) && (count(self::$sessionData)>0))) $this->restoreSessionData();
@ -565,14 +572,20 @@
$groups = $_groups;
}
if($data = $this->soemailadmin->getUserProfile($appName, $groups,$GLOBALS['egw_info']['user']['account_id'])) {
if($data = $this->soemailadmin->getUserProfile($appName, $groups,$GLOBALS['egw_info']['user']['account_id']))
{
$eaPreferences = CreateObject('emailadmin.ea_preferences');
// fetch the IMAP / incomming server data
$icClass = isset(self::$IMAPServerType[$data['imapType']]) ? self::$IMAPServerType[$data['imapType']]['classname'] : 'defaultimap';
$icServer = CreateObject('emailadmin.'.$icClass);
if (!class_exists($icClass=$data['imapType']))
{
if (!file_exists($file=EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$icClass.'.inc.php'))
{
$file = EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.($icClass='defaultimap').'.inc.php';
}
include_once($file);
}
$icServer = new $icClass;
$icServer->encryption = ($data['imapTLSEncryption'] == 'yes' ? 1 : (int)$data['imapTLSEncryption']);
$icServer->host = $data['imapServer'];
$icServer->port = $data['imapPort'];
@ -599,10 +612,13 @@
$eaPreferences->setIncomingServer($icServer);
// fetch the SMTP / outgoing server data
$ogClass = isset(self::$SMTPServerType[$data['smtpType']]) ? self::$SMTPServerType[$data['smtpType']]['classname'] : 'defaultsmtp';
if (!class_exists($ogClass))
if (!class_exists($ogClass=$data['smtpType']))
{
include_once(EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$ogClass.'.inc.php');
if (!file_exists($file=EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$ogClass.'.inc.php'))
{
$file = EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.($ogClass='defaultsmtp').'.inc.php';
}
include_once($file);
}
$ogServer = new $ogClass($icServer->domainName);
$ogServer->host = $data['smtpServer'];
@ -672,7 +688,7 @@
$ogUserData = $ogServer->getUserData($_accountID);
}
return $icUserData + $ogUserData;
return (array)$icUserData + (array)$ogUserData;
}