From 29aa1048fe66f2ab6ca379e1356448964d6f929b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 23 Jan 2017 09:47:45 +0100
Subject: [PATCH] W.I.P of SMIME support for mail application: - Add smime
 digital signature icon - Add handler for smime certificate to be able to see
 the attached certificate

---
 mail/inc/class.mail_ui.inc.php                   |   8 --------
 mail/js/app.js                                   |  15 +++++++++++++--
 mail/templates/default/display.xet               |   2 +-
 mail/templates/default/index.xet                 |   3 ++-
 .../templates/pixelegg/images/smimeSignature.png | Bin 0 -> 602 bytes
 5 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 mail/templates/pixelegg/images/smimeSignature.png

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 23339ff9cf..f387dcee0a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2124,14 +2124,6 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 		return $data;
 	}
 
-	function getSmimeCert ()
-	{
-		if (isset($_GET['id'])) $id = $_GET['id'];
-		if (isset($_GET['partID'])) $partID = $_GET['partid'];
-		$cert = $this->resolveSmimeAttachment($attachments, $id, $partID, $mailbox);
-		echo ($cert);
-	}
-
 	/**
 	 * Build actions for display toolbar
 	 */
diff --git a/mail/js/app.js b/mail/js/app.js
index b0f75ae9a6..c4812b1497 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -940,6 +940,8 @@ app.classes.mail = AppJS.extend(
 		// Not applied to mobile preview
 		if (!egwIsMobile())
 		{
+			var smimeSigBtn = this.et2.getWidgetById('previewSmimeSigBtn');
+			if (smimeSigBtn) smimeSigBtn.set_disabled(dataElem.data['smimeSigUrl']?false:true);
 
 			// Widget ID:data key map of widgets we can directly set from cached data
 			var data_widgets = {
@@ -5508,14 +5510,23 @@ app.classes.mail = AppJS.extend(
 
 	/**
 	 * Open smime certificate
-	 * 
+	 *
 	 * @param {type} egw
 	 * @param {type} widget
 	 * @returns {undefined}
 	 */
 	smimeSigBtn: function (egw, widget)
 	{
-		var url = this.et2.getArrayMgr("content").getEntry('smimeSigUrl');
+		var url = '';
+		if (this.mail_isMainWindow)
+		{
+			var content = this.egw.dataGetUIDdata(this.mail_currentlyFocussed);
+			url = content.data.smimeSigUrl;
+		}
+		else
+		{
+			url = this.et2.getArrayMgr("content").getEntry('smimeSigUrl');
+		}
 		window.egw.openPopup(url,'700','400');
 	}
 });
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 3f6b133d68..a1291f92b4 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -17,7 +17,7 @@
 				<hbox class="mailDisplayHeaders" align="right" width="30%">
 					<description value="Date"/>
 					<date-time id="mail_displaydate" readonly="true"/>
-					<buttononly id="smimeSigBtn" image="smimeSignature" onclick="app.mail.smimeSigBtn"/>
+					<buttononly id="smimeSigBtn" image="smimeSignature" statustext="This message is signed" onclick="app.mail.smimeSigBtn" disabled="!@smimeSigUrl"/>
 				</hbox>
 			</hbox>
 
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 9d498ced4a..854caae656 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -17,6 +17,7 @@
 				<hbox id="mailPreviewHeadersDate" class="mailPreviewHeaders">
 					<description value="Date"/>
 					<date-time align="left" id="previewDate" readonly="true"/>
+					<button id="previewSmimeSigBtn" image="smimeSignature" statustext="This message is signed" onclick="app.mail.smimeSigBtn"/>
 				</hbox>
 				<hbox width="100%" id="mailPreviewHeadersTo" class="mailPreviewHeaders">
 					<description value="To"/>
@@ -113,7 +114,7 @@
 					<url-email id="${row}[fromaddress]" contact_plus = "true" readonly="true"/>
 					<vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/>
 					<vbox>
-						<buttononly id="smimeSigBtn" image="smimeSignature" disabled="!@$row_cont[smimeSigUrl]"/>
+						<buttononly id="${row}[smimeSigBtn]" image="smimeSignature" disabled="!@$row_cont[smimeSigUrl]"/>
 					</vbox>
 				</row>
 			</rows>
diff --git a/mail/templates/pixelegg/images/smimeSignature.png b/mail/templates/pixelegg/images/smimeSignature.png
new file mode 100644
index 0000000000000000000000000000000000000000..398b9e71d7e2905a8d9d6a2db0ad52efb34d0b68
GIT binary patch
literal 602
zcmV-g0;T<lP)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0q03X
zK~#9!>{mNZ!$1&qAVPHH0ukl}7%o6K0p<ia(C{ge8{nKEra)9E;RKk5hJsMiIVT|8
zAZd|Mcq2VatH{optXBlVNKb38*1OL$<2U2VbUJlZJ2|`XF!+u=i*IkP6Lq4Ru_yxe
zERtvtb4iGGz&0%Vba*+OB_OuqEP*WriE05Cx)@x8Ge!vQ$cThwGq7zyVhDJqBtqRL
z8cU4B0awQK#*gNNZ|VuYh;cYfb0RhkhxaFR;-AFtlI?=B9so6tW1uf1k~*^P2@t4J
z5ifxjr#E@uW$Cs@f*sfZ*Z{7i2VtQ*1e(A^$Y5P$GaL~`>_x7XN*R-6Ds(MeOG`Jf
zL83-6YvhPrpW*82T7i`XL(!lYhPqyYW7|efxHE^$E8`O@o?zT%^8?MgfQj2Lodn`N
zPMZ~kCYYlio|>#SbRyljmqX-{o_g1XZQ-v&)DVZu=JzDh!}tK~0(CC?5O2_Pb`+Bx
z(<^U3`Q~+H$y$+L$}$SrI>%Mu3D^hjR8gZ|<XR=;hd3^f^{H(EZ_53S{OmF*)%gx3
z{#inXHNGw<f^RgoK0j55RWo6jMj#^II8wx_M=vGX#AFf;3M%KALX<^3B#9==dnLDi
oNI1&C@#(pnG1o5g?3Vxo03;p!YB6H=AOHXW07*qoM6N<$g4~b#lK=n!

literal 0
HcmV?d00001