class.mail_ui.inc.php

leithoff 2016-03-03 14:27:05 UTC #1

Author: leithoff
New Revision: 55237

URL: http://svn.stylite.de/viewvc/egroupware?rev=55237&view=rev
Log:

Mail: fix for problem when retrieving and displaying an event from winmail.dat attachment

Modified:
trunk/mail/inc/class.mail_ui.inc.php

Modified: trunk/mail/inc/class.mail_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_ui.inc.php?rev=55237&r1=55236&r2=55237&view=diff

— trunk/mail/inc/class.mail_ui.inc.php (original)
+++ trunk/mail/inc/class.mail_ui.inc.php Thu Mar 3 15:27:05 2016
@@ -2755,30 +2755,20 @@
{
if (strtolower($attach[‘mimeType’]) == ‘text/calendar’ &&
isset($GLOBALS[‘egw_info’][‘user’][‘apps’][‘calendar’]) &&

  		($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'],0,(strtolower($attach['mimeType']) == 'text/calendar'?false:true))))

```
  	{
```
```
  		$ical = new calendar_ical();
```

  		$ical_charset = $attach['charset'] ? $attach['charset'] : 'utf-8';

  		if (($events = $ical->icaltoegw($attachment['attachment'], '', $ical_charset)))

```
  		{
```

  			//error_log(__METHOD__.__LINE__.array2string($attachment));

  			egw_cache::setSession('calendar', 'ical', array(

  				'charset' => $attach['charset'] ? $attach['charset'] : 'utf-8',

  				'attachment' => $attachment['attachment'],

```
  				'method' => $attach['method'],
```
```
  				'sender' => $mailbox,
```
```
  			));
```

  			$this->mail_bo->htmlOptions = $bufferHtmlOptions;

```
  			translation::add_app('calendar');
```

  			return ExecMethod( 'calendar.calendar_uiforms.meeting',

  				array('event'=>null,'msg'=>'','useSession'=>true)

```
  			);
```
```
  		}
```
```
  		else
```
```
  		{
```

  			error_log(__METHOD__.__LINE__.'Cannot import the following as ical:'.array2string($attachment));

  			//$bodyParts[] = array('body'=>$attachment['attachment'], 'charSet'=>$attach['charset'] ? $attach['charset'] : 'utf-8');

```
  		}
```

  		($attachment = $this->mail_bo->getAttachment($uid, $attach['partID'],$attach['is_winmail'],(strtolower($attach['mimeType']) == 'text/calendar'?false:true))))

```
  	{
```

  		//error_log(__METHOD__.__LINE__.array2string($attachment));

  		egw_cache::setSession('calendar', 'ical', array(

  			'charset' => $attach['charset'] ? $attach['charset'] : 'utf-8',

  			'attachment' => $attachment['attachment'],

```
  			'method' => $attach['method'],
```
```
  			'sender' => $mailbox,
```
```
  		));
```

  		$this->mail_bo->htmlOptions = $bufferHtmlOptions;

```
  		translation::add_app('calendar');
```

  		return ExecMethod( 'calendar.calendar_uiforms.meeting',

  			array('event'=>null,'msg'=>'','useSession'=>true)

  		);
  	}
  }
  // Compose the content of the frame

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs