[eGroupWare-svn] r52882 - in /branches/14.2/mail: ./ inc/class.mail_ui.inc.php

[<hn...@us...>]

Author: hnategh
Date: Wed Jun  3 10:45:25 2015
New Revision: 52882

URL: http://svn.stylite.de/viewvc/egroupware?rev=52882&view=rev
Log:
Add mail integration calendar action into preview toolbar

Modified:
    branches/14.2/mail/   (props changed)
    branches/14.2/mail/inc/class.mail_ui.inc.php

Propchange: branches/14.2/mail/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  3 10:45:25 2015
@@ -1,1 +1,1 @@
-/trunk/mail:51376,51407,51521,51526-51528,51564,51608,51615,51676,51716-51717,51725,51728,51742,51779,51782,51788,51812,51817,51851,51853,51890,51915,51956,51969-51970,51995,52003,52026,52040,52044,52084,52162,52185-52186,52208,52214,52225,52227,52252,52255,52268,52295,52303,52305,52308,52326,52355,52358,52360,52362,52386,52445,52475,52506-52509,52516,52536,52545,52549,52553,52577,52581,52627-52628,52638,52640,52643,52668,52722-52723,52741,52743,52745,52760,52770,52772,52775,52778,52812,52860,52870
+/trunk/mail:51376,51407,51521,51526-51528,51564,51608,51615,51676,51716-51717,51725,51728,51742,51779,51782,51788,51812,51817,51851,51853,51890,51915,51956,51969-51970,51995,52003,52026,52040,52044,52084,52162,52185-52186,52208,52214,52225,52227,52252,52255,52268,52295,52303,52305,52308,52326,52355,52358,52360,52362,52386,52445,52475,52506-52509,52516,52536,52545,52549,52553,52577,52581,52627-52628,52638,52640,52643,52668,52722-52723,52741,52743,52745,52760,52770,52772,52775,52778,52812,52860,52870,52881

Modified: branches/14.2/mail/inc/class.mail_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/mail/inc/class.mail_ui.inc.php?rev=52882&r1=52881&r2=52882&view=diff
==============================================================================
--- branches/14.2/mail/inc/class.mail_ui.inc.php (original)
+++ branches/14.2/mail/inc/class.mail_ui.inc.php Wed Jun  3 10:45:25 2015
@@ -1436,6 +1436,10 @@
 		{
 			unset($actions['tracker']);
 		}
+		if (!isset($GLOBALS['egw_info']['user']['apps']['calendar']))
+		{
+			unset($actions['calendar']);
+		}
 		return $actions;
 	}
 
@@ -1688,7 +1692,7 @@
 	function get_toolbar_actions()
 	{
 		$actions = $this->get_actions();
-		$arrActions = array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','save','view');
+		$arrActions = array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','calendar','save','view');
 		foreach( $arrActions as &$act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));