* eMail: restructure sidebar, group sieve stuff as own section (if enabled AND available to the user)

This commit is contained in:
Klaus Leithoff 2012-06-14 12:39:14 +00:00
parent d82ebe015c
commit 857b501cc2

View File

@ -895,7 +895,21 @@ class felamimail_hooks
if(empty($preferences->preferences['prefpreventmanagefolders']) || $preferences->preferences['prefpreventmanagefolders'] == 0) {
$file['Manage Folders'] = egw::link('/index.php',array('menuaction'=>'felamimail.uipreferences.listFolder'));
}
if (is_object($preferences)) $ogServer = $preferences->getOutgoingServer(0);
if(($ogServer instanceof defaultsmtp)) {
if($ogServer->editForwardingAddress)
{
$linkData = array
(
'menuaction' => 'felamimail.uipreferences.editForwardingAddress',
);
//if(empty($preferences->preferences['prefpreventforwarding']) || $preferences->preferences['prefpreventforwarding'] == 0)
$file['Forwarding'] = egw::link('/index.php',$linkData);
}
}
display_sidebox($appname,$menu_title,$file);
unset($file);
$menu_title = 'Sieve';
if (is_object($preferences)) $icServer = $preferences->getIncomingServer($profileID);
if(($icServer instanceof defaultimap)) {
if($icServer->enableSieve)
@ -916,28 +930,14 @@ class felamimail_hooks
$file['vacation notice'] = egw::link('/index.php',$linkData);
}
if((empty($preferences->preferences['prefpreventnotificationformailviaemail']) ||
$preferences->preferences['prefpreventnotificationformailviaemail'] == 0) &&
(empty($preferences->preferences['prefpreventforwarding']) ||
$preferences->preferences['prefpreventforwarding'] == 0) )
$preferences->preferences['prefpreventnotificationformailviaemail'] == 0))
{
$file['email notification'] = egw::link('/index.php','menuaction=felamimail.uisieve.editEmailNotification'); //Added email notifications
}
if (count($file)) display_sidebox($appname,$menu_title,$file);
unset($file);
}
}
if (is_object($preferences)) $ogServer = $preferences->getOutgoingServer(0);
if(($ogServer instanceof defaultsmtp)) {
if($ogServer->editForwardingAddress)
{
$linkData = array
(
'menuaction' => 'felamimail.uipreferences.editForwardingAddress',
);
if(empty($preferences->preferences['prefpreventforwarding']) || $preferences->preferences['prefpreventforwarding'] == 0)
$file['Forwarding'] = egw::link('/index.php',$linkData);
}
}
display_sidebox($appname,$menu_title,$file);
}
if ($GLOBALS['egw_info']['user']['apps']['admin'])
{