diff options
| author |   neysx <neysx> | 2009-11-03 21:48:48 +0000 |
|---|---|---|
| committer | neysx <neysx> | 2009-11-03 21:48:48 +0000 |
| commit | 6da64ac76ebdb0cff990ad9049de3fdfc5f8360d (patch) | |
| tree | b79929aea9bc879fae41f9e4da9ff9c9c68aa847 | |
| parent | New ad image for SevenL. (diff) | |
| download | www-redesign-6da64ac76ebdb0cff990ad9049de3fdfc5f8360d.tar.gz www-redesign-6da64ac76ebdb0cff990ad9049de3fdfc5f8360d.tar.bz2 www-redesign-6da64ac76ebdb0cff990ad9049de3fdfc5f8360d.zip | |
#291062 Allow several <pgpkey> element in userinfo.xml
| -rw-r--r-- | xml/htdocs/dtd/userinfo.dtd | 2 | ||||
| -rw-r--r-- | 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, '
')"/> + <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, '
')"/> </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> |