holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow/support the call of function meeting by ExecMethod AND passing the ical in question via session

Browse Source
This commit is contained in:
Klaus Leithoff 2013-06-03 09:57:00 +00:00
parent d328af7cff
commit 8ff56b1d5f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1705,19 +1705,27 @@ function replace_eTemplate_onsubmit()
* Display for FMail an iCal meeting request and allow to accept, tentative or reject it or a reply and allow to apply it * Display for FMail an iCal meeting request and allow to accept, tentative or reject it or a reply and allow to apply it
* *
* @todo Handle situation when user is NOT invited, but eg. can view that mail ... * @todo Handle situation when user is NOT invited, but eg. can view that mail ...
* @param array $event=null * @param array $event=null; special usage if $event is array('event'=>null,'msg'=>'','useSession'=>true) we
* are called by new mail-app; and we intend to use the stuff passed on by session
* @param string $msg='' * @param string $msg=''
*/ */
function meeting(array $event=null, $msg='') function meeting(array $event=null, $msg='')
{ {
$user = $GLOBALS['egw_info']['user']['account_id']; $user = $GLOBALS['egw_info']['user']['account_id'];
$readonlys['button[apply]'] = true; $readonlys['button[apply]'] = true;
$_usesession=!is_array($event);
//special usage if $event is array('event'=>null,'msg'=>'','useSession'=>true) we
//are called by new mail-app; and we intend to use the stuff passed on by session
if ($event == array('event'=>null,'msg'=>'','useSession'=>true))
{
$event=null; // set to null
$_usesession=true; // trigger session read
}
if (!is_array($event)) if (!is_array($event))
{ {
$ical_charset = 'utf-8'; $ical_charset = 'utf-8';
$ical_string = $_GET['ical']; $ical_string = $_GET['ical'];
if ($ical_string == 'session') if ($ical_string == 'session' || $_usesession)
{ {
$session_data = egw_cache::getSession('calendar', 'ical'); $session_data = egw_cache::getSession('calendar', 'ical');
$ical_string = $session_data['attachment']; $ical_string = $session_data['attachment'];