X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5e96402c6242327e1c918bb8069e021a7526c7e9..refs/heads/master:/mutt/dmarc.xsl

diff --git a/mutt/dmarc.xsl b/mutt/dmarc.xsl
index 25bd7df..4573b05 100644
--- a/mutt/dmarc.xsl
+++ b/mutt/dmarc.xsl
@@ -36,12 +36,15 @@
 						margin: 1em;
 						padding: 4pt;
 						background-color: #ffeeaa;
-						border: 3pt solid #776633; 
+						border: 3pt solid #776633;
+					}
+					table.report_metadata th {
+						text-align: right;
 					}
 					td, th {
 						margin: 2pt;
 						padding: 2pt;
-						border: 1pt solid #776633; 
+						border: 1pt solid #776633;
 					}
 					.pass {
 						background-color: #11bb00;
@@ -77,9 +80,10 @@
 					<xsl:value-of select="$title"/>
 				</h1>
 				<p>
-					<xsl:apply-templates select="report_metadata"/>
-					<br/>
-					<xsl:apply-templates select="policy_published"/>
+					<table>
+						<xsl:apply-templates select="report_metadata"/>
+						<xsl:apply-templates select="policy_published"/>
+					</table>
 				</p>
 				<table>
 					<tr>
@@ -87,15 +91,13 @@
 							Relaying IP
 						</th>
 						<th>
-							message count
+							msg count
 						</th>
 						<th>
-							reason and disposition
+							reason/dispo
 						</th>
 						<th>
-							From header
-							<br/>
-							(opt. envelope)
+							From: hdr
 						</th>
 						<th>
 							SPF
@@ -148,21 +150,42 @@
 		</html>
 	</xsl:template>
 	<xsl:template match="policy_published">
-		<span class="field">Domain: </span>
-		<xsl:value-of select="domain"/>
-		<xsl:text>; </xsl:text>
-		<span class="field">DKIM: </span>
-		<xsl:apply-templates select="adkim"/>
-		<xsl:text>; </xsl:text>
-		<span class="field">SPF: </span>
-		<xsl:apply-templates select="aspf"/>
-		<xsl:text>; </xsl:text>
-		<span class="field">policy published: </span>
-		<xsl:value-of select="p"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="sp"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="pct"/>
+			<tr>
+				<th align="right">
+					<span class="field">Domain: </span>
+				</th>
+				<td>
+					<xsl:value-of select="domain"/>
+				</td>
+			</tr>
+			<tr>
+				<th align="right">
+					<span class="field">DKIM: </span>
+				</th>
+				<td>
+					<xsl:apply-templates select="adkim"/>
+				</td>
+			</tr>
+			<tr>
+				<th align="right">
+					<span class="field">SPF: </span>
+				</th>
+				<td>
+					<xsl:apply-templates select="aspf"/>
+				</td>
+			</tr>
+			<tr>
+				<th align="right">
+					<span class="field">policy published: </span>
+				</th>
+				<td>
+					<xsl:value-of select="p"/>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="sp"/>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="pct"/>
+				</td>
+			</tr>
 	</xsl:template>
 	<xsl:template match="adkim|aspf">
 		<xsl:variable name="alignment">
@@ -181,18 +204,28 @@
 		</xsl:choose>
 	</xsl:template>
 	<xsl:template match="report_metadata">
-		<span class="field">Id: </span>
-		<xsl:value-of select="report_id"/>
-		<xsl:text>; </xsl:text>
-		<span class="field">begin: </span>
-		<xsl:call-template name="date-range">
-			<xsl:with-param name="utime" select="date_range/begin"/>
-		</xsl:call-template>
-		<xsl:text>; </xsl:text>
-		<span class="field">end: </span>
-		<xsl:call-template name="date-range">
-			<xsl:with-param name="utime" select="date_range/end"/>
-		</xsl:call-template>
+		<tr>
+			<th align="right">Id:</th>
+			<td>
+				<xsl:value-of select="report_id"/>
+			</td>
+		</tr>
+		<tr>
+			<th align="right">begin:</th>
+			<td>
+				<xsl:call-template name="date-range">
+					<xsl:with-param name="utime" select="date_range/begin"/>
+				</xsl:call-template>
+			</td>
+		</tr> 
+		<tr> 
+			<th align="right">end:</th>
+			<td>
+				<xsl:call-template name="date-range">
+					<xsl:with-param name="utime" select="date_range/end"/>
+				</xsl:call-template>
+			</td>
+		</tr>
 		<xsl:for-each select="error">
 			<xsl:if test="position()=1">
 				<br/>
@@ -257,6 +290,10 @@
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
+                        <xsl:value-of select="policy_evaluated/disposition"/> <br />
+                        dkim: <xsl:value-of select="policy_evaluated/dkim"/> <br />
+                        spf : <xsl:value-of select="policy_evaluated/spf"/> <br />
+
 			<xsl:for-each select="policy_evaluated/reason">
 				<xsl:value-of select="type"/>
 				<xsl:text> </xsl:text>
@@ -308,6 +345,8 @@
 	<xsl:template match="spf">
 		<td>
 			<xsl:call-template name="class_attribute" />
+			<xsl:value-of select="result"/>
+			<br/>
 			<xsl:value-of select="domain"/>
 			<br/>
 			<xsl:value-of select="scope"/>
@@ -318,6 +357,8 @@
 	<xsl:template match="dkim">
 		<td>
 			<xsl:call-template name="class_attribute" />
+			<xsl:value-of select="result"/>
+			<br/>
 			<xsl:value-of select="domain"/>
 			<br/>
 			<xsl:value-of select="selector"/>