From fdddd76cbf1fa70962e6f2e674570b6b8283dd69 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Sat, 20 Aug 2011 20:29:56 +0200
Subject: UPGRADING: Fix rewrite rules

Do not attempt to rewrite "/packages/fo/foo/foo.tar.gz".

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 UPGRADING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index dad4adff..c0866e5e 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -28,13 +28,13 @@ container or optionally create a ".htaccess" file in the upload directory):
 
 ----
 RewriteEngine on
-RewriteRule ^/packages/([^/]{1,2})([^/]*/(PKGBUILD|.*\.tar\.gz|))$ /packages/$1/$1$2
+RewriteRule ^/packages/([^/]{1,2})([^/]*/(PKGBUILD|[^/]*\.tar\.gz|))$ /packages/$1/$1$2
 ----
 
 The following equivalent rule can be used for lighttpd setups:
 
 ----
-url.rewrite-once = ( "^/packages/([^/]{1,2})([^/]*/(PKGBUILD|.*\.tar\.gz|))$" => "/packages/$1/$1$2" )
+url.rewrite-once = ( "^/packages/([^/]{1,2})([^/]*/(PKGBUILD|[^/]*\.tar\.gz|))$" => "/packages/$1/$1$2" )
 ----
 
 If you use a non-standard URL_DIR, slight modifications might be necessary.
-- 
cgit v1.2.3-24-g4f1b


From dad42297c7fe5404b2b7c65cd350b7ea4a8ac865 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Sun, 21 Aug 2011 01:31:28 +0200
Subject: Add missing __() to category info in package details

This makes the "Category" label as well as "Change category" button on
the package details page translatable. Fixes FS#25692.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/template/pkg_details.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index c03493d8..880a6758 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -10,7 +10,7 @@ if ($uid == $row["MaintainerUID"] or
 	$edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n";
 	$edit_cat.= "<p>";
 	$edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />";
-	$edit_cat.= "<span class='f3'>Category:</span> ";
+	$edit_cat.= "<span class='f3'>" . __("Category") . ":</span> ";
 	$edit_cat.= "<select name='category_id'>\n";
 	foreach ($catarr as $cid => $catname) {
 		$edit_cat.= "<option value='$cid'";
@@ -19,13 +19,13 @@ if ($uid == $row["MaintainerUID"] or
 		}
 		$edit_cat.=">".$catname."</option>";
 	}
-	$edit_cat.= "</select>&nbsp;<input type='submit' value='Change category' />";
+	$edit_cat.= "</select>&nbsp;<input type='submit' value='" . __("Change category") . "' />";
 	$edit_cat.= "</p>";
 	$edit_cat.= "</form>";
 
 }
 else {
-	$edit_cat = "<span class='f3'>Category: " . $row['Category'] . "</span>";
+	$edit_cat = "<span class='f3'>" . __("Category") . ": " . $row['Category'] . "</span>";
 }
 
 if ($row["SubmitterUID"]) {
-- 
cgit v1.2.3-24-g4f1b


From 53a31865f41db7315dc5c99e1b100f397ef80b1a Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Mon, 22 Aug 2011 08:17:26 +0200
Subject: RPC: Fix info queries when using package IDs

Info queries using package IDs were no longer working due to commit
c6d84b3a8df10c522d79c754d4f73cb2a352586f, which introduced a table join
in process_query(), thus making the "ID" column ambiguous. Fix this by
explicitly specifying the table to use. Fixes FS#25696.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/lib/aurjson.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index 277c824e..b5963595 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -203,7 +203,7 @@ class AurJSON {
             // just using sprintf to coerce the pqd to an int
             // should handle sql injection issues, since sprintf will
             // bork if not an int, or convert the string to a number 0
-            $where_condition = "ID={$pqdata}";
+            $where_condition = "Packages.ID={$pqdata}";
         }
         else {
             $where_condition = sprintf("Name=\"%s\"",
-- 
cgit v1.2.3-24-g4f1b