From 857b501cc2a642abd462b5ab30b84d83e66421f9 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 14 Jun 2012 12:39:14 +0000
Subject: [PATCH] * eMail: restructure sidebar, group sieve stuff as own
 section (if enabled AND available to the user)

---
 felamimail/inc/class.felamimail_hooks.inc.php | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/felamimail/inc/class.felamimail_hooks.inc.php b/felamimail/inc/class.felamimail_hooks.inc.php
index 5c6bbc092c..485a68c3a4 100644
--- a/felamimail/inc/class.felamimail_hooks.inc.php
+++ b/felamimail/inc/class.felamimail_hooks.inc.php
@@ -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'])
 		{