[eGroupWare-svn] r55969 - in /branches/14.2/mail: inc/class.mail_ui.inc.php templates/default/display.xet templates/default/index.xet

Author: leithoff
Date: Mon May  2 12:30:21 2016
New Revision: 55969

URL: http://svn.stylite.de/viewvc/egroupware?rev=55969&view=rev
Log:
fix for: VCARD not opening in popup

Modified:
    branches/14.2/mail/inc/class.mail_ui.inc.php
    branches/14.2/mail/templates/default/display.xet
    branches/14.2/mail/templates/default/index.xet

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=55969&r1=55968&r2=55969&view=diff
==============================================================================
--- branches/14.2/mail/inc/class.mail_ui.inc.php (original)
+++ branches/14.2/mail/inc/class.mail_ui.inc.php Mon May  2 12:30:21 2016
@@ -1858,7 +1858,7 @@
 		$attachments	= $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages,true,true,$mailbox);
 		//error_log(__METHOD__.__LINE__.array2string($attachments));
 		$attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox);
-
+		//error_log(__METHOD__.__LINE__.array2string($attachmentHTMLBlock));
 		$nonDisplayAbleCharacters = array('[\016]','[\017]',
 				'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
 				'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
@@ -2046,11 +2046,13 @@
 						{
 							$windowName = 'displayEvent_'. $rowID;
 							$reg2 = egw_link::get_registry('calendar','view_popup');
+							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
 						}
 						if (strtoupper($value['mimeType'])=='TEXT/X-VCARD' || strtoupper($value['mimeType'])=='TEXT/VCARD')
 						{
 							$windowName = 'displayContact_'. $rowID;
 							$reg2 = egw_link::get_registry('addressbook','add_popup');
+							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
 						}
 						// apply to action
 						list($width,$height) = explode('x',(!empty($reg2) ? $reg2 : $reg));
@@ -2139,6 +2141,7 @@
 		{
 			foreach ((array)$attachmentHTML as $ikey => $value)
 			{
+				//error_log(__METHOD__.__LINE__.array2string($attachmentHTML[$ikey]));
 				unset($attachmentHTML[$ikey]['link_view']);
 				unset($attachmentHTML[$ikey]['link_save']);
 			}

Modified: branches/14.2/mail/templates/default/display.xet
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/mail/templates/default/display.xet?rev=55969&r1=55968&r2=55969&view=diff
==============================================================================
--- branches/14.2/mail/templates/default/display.xet (original)
+++ branches/14.2/mail/templates/default/display.xet Mon May  2 12:30:21 2016
@@ -72,7 +72,7 @@
 								<description id="${row}[partID]" />
 								<description id="${row}[type]" />
 								<description id="${row}[winmailFlag]" />
-								<description class="useEllipsis et2_link" id="${row}[filename]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
+								<description class="useEllipsis et2_link" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]" />
 								<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
 								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>

Modified: branches/14.2/mail/templates/default/index.xet
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/mail/templates/default/index.xet?rev=55969&r1=55968&r2=55969&view=diff
==============================================================================
--- branches/14.2/mail/templates/default/index.xet (original)
+++ branches/14.2/mail/templates/default/index.xet Mon May  2 12:30:21 2016
@@ -51,7 +51,7 @@
 								<description id="${row}[partID]" />
 								<description id="${row}[type]" />
 								<description id="${row}[winmailFlag]" />
-								<description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
+								<description class="et2_link useEllipsis" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]"/>
 								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachment"/>
 								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z