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

first step to new Horde_Imap_Client based eMailAdmin classes for new mail app

Browse Source
This commit is contained in:
Ralf Becker 2013-10-22 15:30:25 +00:00
parent c799aad6be
commit fe2ef3ac1c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_bo.inc.php
View File

@ -759,7 +759,7 @@ class mail_bo
$foldersNameSpace = array(); $foldersNameSpace = array();
$delimiter = $this->getHierarchyDelimiter(); $delimiter = $this->getHierarchyDelimiter();
// TODO: cache by $this->icServer->ImapServerId // TODO: cache by $this->icServer->ImapServerId
if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaces(); if (is_null($nameSpace)) $nameSpace = $this->icServer->getNameSpaceArray();
if (is_array($nameSpace)) { if (is_array($nameSpace)) {
foreach($nameSpace as $type => $singleNameSpace) { foreach($nameSpace as $type => $singleNameSpace) {
$prefix_present = false; $prefix_present = false;

4
mail/inc/class.mail_bopreferences.inc.php
View File

@ -110,7 +110,7 @@ class mail_bopreferences extends mail_sopreferences
$accountData = array_shift($accountData); $accountData = array_shift($accountData);
//_debug_array($accountData); //_debug_array($accountData);
$icServer = CreateObject('emailadmin.defaultimap'); $icServer = new emailadmin_oldimap();
$icServer->ImapServerId = $accountData['id']; $icServer->ImapServerId = $accountData['id'];
$icServer->encryption = isset($accountData['ic_encryption']) ? $accountData['ic_encryption'] : 1; $icServer->encryption = isset($accountData['ic_encryption']) ? $accountData['ic_encryption'] : 1;
$icServer->host = $accountData['ic_hostname']; $icServer->host = $accountData['ic_hostname'];
@ -166,7 +166,7 @@ class mail_bopreferences extends mail_sopreferences
#_debug_array($accountData); #_debug_array($accountData);
foreach ($AllAccountData as $key => $accountData) foreach ($AllAccountData as $key => $accountData)
{ {
$icServer = CreateObject('emailadmin.defaultimap'); $icServer = new emailadmin_oldimap();
$icServer->ImapServerId = $accountData['id']; $icServer->ImapServerId = $accountData['id'];
$icServer->encryption = isset($accountData['ic_encryption']) ? $accountData['ic_encryption'] : 1; $icServer->encryption = isset($accountData['ic_encryption']) ? $accountData['ic_encryption'] : 1;
$icServer->host = $accountData['ic_hostname']; $icServer->host = $accountData['ic_hostname'];

6
mail/inc/class.mail_ui.inc.php
View File

@ -61,7 +61,7 @@ class mail_ui
/** /**
* instance of mail_bo * instance of mail_bo
* *
* @var object * @var mail_bo
*/ */
var $mail_bo; var $mail_bo;
@ -86,7 +86,7 @@ class mail_ui
*/ */
var $statusTypes = array( var $statusTypes = array(
'any' => 'any status',// lang('any status') 'any' => 'any status',// lang('any status')
'flagged' => 'flagged', // lang('flagged') 'flagged' => 'flagged', // lang('flagged')
'unseen' => 'unread', // lang('unread') 'unseen' => 'unread', // lang('unread')
'answered' => 'replied', // lang('replied') 'answered' => 'replied', // lang('replied')
'seen' => 'read', // lang('read') 'seen' => 'read', // lang('read')
@ -1959,7 +1959,7 @@ unset($query['actions']);
); );
*/ */
$decodedPersonalName = $realName; $decodedPersonalName = $realName;
/* /*
if (!empty($decodedPersonalName)) { if (!empty($decodedPersonalName)) {
if($spacePos = strrpos($decodedPersonalName, ' ')) { if($spacePos = strrpos($decodedPersonalName, ' ')) {
$linkData['presets[n_family]'] = substr($decodedPersonalName, $spacePos+1); $linkData['presets[n_family]'] = substr($decodedPersonalName, $spacePos+1);