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

* email: Sort FunctionFolders to the top of the FolderTree in MainView (all MailBox FolderTree Views are affected)

Browse Source
This commit is contained in:
Klaus Leithoff 2010-11-02 14:03:31 +00:00
parent c3bd75e917
commit 6b6ddacd0a
3 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
felamimail/inc/class.bofelamimail.inc.php
View File

@ -61,7 +61,7 @@
* foldernames are subject to translation, keep that in mind too, if you change names here. * foldernames are subject to translation, keep that in mind too, if you change names here.
* @var array * @var array
*/ */
var $autoFolders = array('Drafts', 'Junk', 'Sent', 'Trash', 'Templates'); static $autoFolders = array('Drafts', 'Templates', 'Sent', 'Trash', 'Junk');
/** /**
* Autoload classes from emailadmin, 'til they get autoloading conform names * Autoload classes from emailadmin, 'til they get autoloading conform names
@ -1277,7 +1277,7 @@
$retValue['shortDisplayName'] = lang('INBOX'); $retValue['shortDisplayName'] = lang('INBOX');
} }
// translate the automatic Folders (Sent, Drafts, ...) like the INBOX // translate the automatic Folders (Sent, Drafts, ...) like the INBOX
elseif (in_array($retValue['shortName'],$this->autoFolders)) elseif (in_array($retValue['shortName'],self::$autoFolders))
{ {
$retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']); $retValue['displayName'] = $retValue['shortDisplayName'] = lang($retValue['shortName']);
} }
@ -1350,7 +1350,7 @@
$_subscribedOnly = false; $_subscribedOnly = false;
} }
#$inboxData->attributes = 64; #$inboxData->attributes = 64;
$folders = array('INBOX' => $inboxData); $inboxFolderObject = array('INBOX' => $inboxData);
#_debug_array($folders); #_debug_array($folders);
$nameSpace = $this->icServer->getNameSpaces(); $nameSpace = $this->icServer->getNameSpaces();
@ -1458,9 +1458,9 @@
} }
if ($this->mailPreferences->preferences['notavailableautofolders'] && !empty($this->mailPreferences->preferences['notavailableautofolders'])) if ($this->mailPreferences->preferences['notavailableautofolders'] && !empty($this->mailPreferences->preferences['notavailableautofolders']))
{ {
$foldersToCheck = array_diff($this->autoFolders,explode(',',$this->mailPreferences->preferences['notavailableautofolders'])); $foldersToCheck = array_diff(self::$autoFolders,explode(',',$this->mailPreferences->preferences['notavailableautofolders']));
} else { } else {
$foldersToCheck = $this->autoFolders; $foldersToCheck = self::$autoFolders;
} }
#echo "foldersToCheck:";_debug_array($foldersToCheck); #echo "foldersToCheck:";_debug_array($foldersToCheck);
foreach($foldersToCheck as $personalFolderName) { foreach($foldersToCheck as $personalFolderName) {
@ -1550,8 +1550,9 @@
$folderObject->displayName = lang('INBOX'); $folderObject->displayName = lang('INBOX');
$folderObject->shortDisplayName = lang('INBOX'); $folderObject->shortDisplayName = lang('INBOX');
$folderObject->subscribed = true; $folderObject->subscribed = true;
// translate the automatic Folders (Sent, Drafts, ...) like the INBOX // translate the automatic Folders (Sent, Drafts, ...) like the INBOX
} elseif (in_array($shortName,$this->autoFolders)) { } elseif (in_array($shortName,self::$autoFolders)) {
$tmpfolderparts = explode($delimiter,$folderObject->folderName); $tmpfolderparts = explode($delimiter,$folderObject->folderName);
array_pop($tmpfolderparts); array_pop($tmpfolderparts);
$folderObject->displayName = $this->encodeFolderName(implode($delimiter,$tmpfolderparts).$delimiter.lang($shortName)); $folderObject->displayName = $this->encodeFolderName(implode($delimiter,$tmpfolderparts).$delimiter.lang($shortName));
@ -1562,13 +1563,21 @@
$folderObject->shortDisplayName = $this->encodeFolderName($shortName); $folderObject->shortDisplayName = $this->encodeFolderName($shortName);
} }
$folderName = $folderName; $folderName = $folderName;
$folders[$folderName] = $folderObject; if (in_array($shortName,self::$autoFolders)) {
$autoFolderObjects[$folderName] = $folderObject;
} else {
$folders[$folderName] = $folderObject;
}
} }
} }
} }
uasort($folders,array($this,"sortByDisplayName")); if (is_array($autoFolderObjects)) {
//_debug_array($folders); #exit; uasort($autoFolderObjects,array($this,"sortByAutoFolderPos"));
return $folders; }
if (is_array($folders)) uasort($folders,array($this,"sortByDisplayName"));
$folders2return = array_merge($autoFolderObjects,$folders);
//_debug_array($folders2return); #exit;
return array_merge($inboxFolderObject,(array)$autoFolderObjects,(array)$folders);
} }
function sortByDisplayName($a,$b) function sortByDisplayName($a,$b)
@ -1577,6 +1586,15 @@
return strcasecmp($a->displayName,$b->displayName); return strcasecmp($a->displayName,$b->displayName);
} }
function sortByAutoFolderPos($a,$b)
{
// 0, 1 und -1
$pos1 = array_search($a->shortFolderName,self::$autoFolders);
$pos2 = array_search($b->shortFolderName,self::$autoFolders);
if ($pos1 == $pos2) return 0;
return ($pos1 < $pos2) ? -1 : 1;
}
function getMailBoxCounters($folderName) function getMailBoxCounters($folderName)
{ {
$folderStatus = $this->icServer->getStatus($folderName); $folderStatus = $this->icServer->getStatus($folderName);

2
felamimail/inc/class.felamimail_hooks.inc.php
View File

@ -56,7 +56,7 @@ class felamimail_hooks
} }
$availableAutoFolders['none'] = lang('none, create all'); $availableAutoFolders['none'] = lang('none, create all');
foreach($bofelamimail->autoFolders as $aname) { foreach(bofelamimail::$autoFolders as $aname) {
$availableAutoFolders[$aname] = lang($aname); $availableAutoFolders[$aname] = lang($aname);
} }

20
felamimail/inc/class.uiwidgets.inc.php
View File

@ -147,9 +147,23 @@
#_debug_array($allFolders); #_debug_array($allFolders);
foreach($allFolders as $longName => $obj) { foreach($allFolders as $longName => $obj) {
$messageCount = ''; $messageCount = '';
$image1 = "'folderClosed.gif'";
$image2 = "0"; if (in_array($obj->shortFolderName,bofelamimail::$autoFolders))
$image3 = "0"; {
//echo $obj->shortFolderName.'<br>';
$image1 = $image2 = $image3 = "'MailFolder".$obj->shortFolderName.".png'";
//$image2 = "'MailFolderPlain.png'";
//$image3 = "'MailFolderPlain.png'";
}
elseif (in_array($longName,$userDefinedFunctionFolders))
{
$key = array_search($longName,$userDefinedFunctionFolders);
$image1 = $image2 = $image3 = "'MailFolder".$key.".png'";
}
else
{
$image1 = $image2 = $image3 = "'folderClosed.gif'";
}
$folderParts = explode($obj->delimiter, $longName); $folderParts = explode($obj->delimiter, $longName);