From 6da64ac76ebdb0cff990ad9049de3fdfc5f8360d Mon Sep 17 00:00:00 2001
From: neysx <neysx>
Date: Tue, 3 Nov 2009 21:48:48 +0000
Subject: #291062 Allow several <pgpkey> element in userinfo.xml

---
 xml/htdocs/dtd/userinfo.dtd |  2 +-
 xml/htdocs/xsl/devlist.xsl  | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/xml/htdocs/dtd/userinfo.dtd b/xml/htdocs/dtd/userinfo.dtd
index e91e40b8..d6f973bd 100644
--- a/xml/htdocs/dtd/userinfo.dtd
+++ b/xml/htdocs/dtd/userinfo.dtd
@@ -1,5 +1,5 @@
 <!ELEMENT userlist (user+)>
-<!ELEMENT user (realname, pgpkey, alias*, email+, joined, retired?, status?, roles?, location?) >
+<!ELEMENT user (realname, pgpkey+, alias*, email+, joined, retired?, status?, roles?, location?) >
   <!ATTLIST user username ID #REQUIRED>
   <!ELEMENT realname (firstname,familyname)>
     <!ATTLIST realname fullname CDATA #IMPLIED>
diff --git a/xml/htdocs/xsl/devlist.xsl b/xml/htdocs/xsl/devlist.xsl
index 0ba06d6b..832f0224 100644
--- a/xml/htdocs/xsl/devlist.xsl
+++ b/xml/htdocs/xsl/devlist.xsl
@@ -24,7 +24,9 @@
      </xsl:otherwise>
    </xsl:choose>
    </name>
-   <pgpkey><xsl:value-of select="pgpkey"/></pgpkey>
+   <xsl:for-each select="pgpkey">
+    <pgpkey><xsl:value-of select="."/></pgpkey>
+   </xsl:for-each>
    <location>
      <xsl:if test="location/@longitude and location/@latitude">
        <xsl:attribute name="lon"><xsl:value-of select="location/@longitude"/></xsl:attribute>
@@ -75,7 +77,15 @@
 </xsl:template>
 
 <xsl:template match="user">
- <xsl:value-of select="concat(@nick, ':', name, ':', location, ':', location/@lat, ':', location/@lon, ':', pgpkey, ':', status, '&#xA;')"/>
+ <xsl:variable name="pgpkeys">
+  <xsl:for-each select="pgpkey">
+   <xsl:value-of select="."/>
+   <xsl:if test="not(position()=last())">
+    <xsl:text>,</xsl:text>
+   </xsl:if>
+  </xsl:for-each>
+ </xsl:variable>
+ <xsl:value-of select="concat(@nick, ':', name, ':', location, ':', location/@lat, ':', location/@lon, ':', $pgpkeys, ':', status, '&#xA;')"/>
 </xsl:template>
 
 
@@ -137,7 +147,9 @@
    <xsl:element name="user">
     <xsl:attribute name="username"><xsl:value-of select="@nick"/></xsl:attribute>
     <realname><xsl:attribute name="fullname"><xsl:value-of select="name/text()"/></xsl:attribute></realname>
-    <pgpkey><xsl:value-of select="pgpkey"/></pgpkey>
+    <xsl:for-each select="pgpkey">
+     <pgpkey><xsl:value-of select="."/></pgpkey>
+    </xsl:for-each>
     <location>
      <xsl:if test="location/@lon and location/@lat">
        <xsl:attribute name="longitude"><xsl:value-of select="location/@lon"/></xsl:attribute>
-- 
cgit v1.2.3-65-gdbad