From c1a1f4fe49f1098299e3ae2b6f083e814befce4b Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Mon, 28 Nov 2011 15:11:35 +0000
Subject: Minor fixes and much improved .htaccess rules (fixes issues with .s
 in requests)

---
 gentoobrowse/.htaccess                     | 6 ++++--
 gentoobrowse/emails/newpackageversions.xml | 2 +-
 gentoobrowse/xslt/atomebuilds.xslt         | 6 +++---
 gentoobrowse/xslt/search.xslt              | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gentoobrowse/.htaccess b/gentoobrowse/.htaccess
index bcd3d7f..ca0c9be 100644
--- a/gentoobrowse/.htaccess
+++ b/gentoobrowse/.htaccess
@@ -3,9 +3,11 @@ SetEnv filter-errordocs
 	sethandler fcgid-script
 </Files>
 RewriteEngine on
-RewriteCond %{REQUEST_URI} !\.
+RewriteCond %{REQUEST_URI} !^/css/
+RewriteCond %{REQUEST_URI} !^/js/
+RewriteCond %{REQUEST_URI} !^/images/
+RewriteCond %{REQUEST_URI} !^/[^/]+\.[^/]+$
 RewriteCond %{REQUEST_URI} !^/p2web
-RewriteCond %{REQUEST_URI} !^/env
 RewriteRule ^(.*) /p2web/\1 [L]
 
 FilterDeclare XSLT
diff --git a/gentoobrowse/emails/newpackageversions.xml b/gentoobrowse/emails/newpackageversions.xml
index f187632..679641c 100644
--- a/gentoobrowse/emails/newpackageversions.xml
+++ b/gentoobrowse/emails/newpackageversions.xml
@@ -20,7 +20,7 @@
 	</project2:sqlrows>
 	<project2:view name="newpackageversionsforuser" source="newpackageversions" rootname="newpackageversions" recordname="version">
 		<parameters>
-			<userid source="parent" name="userid" depth="2" />
+			<userid source="parent" name="userid" depth="1" />
 		</parameters>
 	</project2:view>
 </view>
diff --git a/gentoobrowse/xslt/atomebuilds.xslt b/gentoobrowse/xslt/atomebuilds.xslt
index aa7e911..7e75329 100644
--- a/gentoobrowse/xslt/atomebuilds.xslt
+++ b/gentoobrowse/xslt/atomebuilds.xslt
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:project2="http://project2.randomdan.homeip.net" exclude-result-prefixes="project2" >
-  <xsl:output  encoding="utf-8" method="html" media-type="text/xml" indent="yes"/>
+  <xsl:output  encoding="utf-8" method="xml" media-type="text/xml" indent="yes"/>
   <xsl:template match="/gentoo">
 	<rss version="2.0">
-		<xsl:apply-templates match="/gentoo/newebuilds" />
+		<xsl:apply-templates select="/gentoo/newebuilds" />
 	</rss>	
   </xsl:template>
   <xsl:template match="/gentoo/newebuilds">
@@ -16,7 +16,7 @@
 		<lastBuildDate>Wed, 16 Jun 2010 14:52:43 GMT</lastBuildDate>
 		<copyright>Copyright: (C) Gentoo Foundation, Inc.</copyright>
 		<ttl>15</ttl>
-		<xsl:apply-templates match="/gentoo/newebuilds/ebuild" />
+		<xsl:apply-templates select="/gentoo/newebuilds/ebuild" />
 	  </channel>	
   </xsl:template>
   <xsl:template match="/gentoo/newebuilds/ebuild">
diff --git a/gentoobrowse/xslt/search.xslt b/gentoobrowse/xslt/search.xslt
index feb3bfa..d37f45e 100644
--- a/gentoobrowse/xslt/search.xslt
+++ b/gentoobrowse/xslt/search.xslt
@@ -4,7 +4,7 @@
   <xsl:import href="base.xslt" />
   <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" />
   <xsl:template name="head">
-		<title>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/project2:param[@name='criteria']/@value"/>&quot; - Gentoo Browse</title>
+		<title>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/param[@name='criteria']/@value"/>&quot; - Gentoo Browse</title>
 		<script type="text/javascript">
 			$(function() {
 				$("article#content").accordion({ autoHeight: false, header: 'h3', collapsible: true });
@@ -12,7 +12,7 @@
 		</script>
   </xsl:template>
   <xsl:template name="content">
-		<h2>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/project2:param[@name='criteria']/@value"/>&quot;</h2>
+		<h2>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/param[@name='criteria']/@value"/>&quot;</h2>
 		<xsl:apply-templates select="/gentoo/searchResults" />
 		<xsl:apply-templates select="/gentoo/bugSearchResults" />
   </xsl:template>
-- 
cgit v1.2.3