diff options
| -rw-r--r-- | UPGRADING | 4 | ||||
| -rw-r--r-- | web/lib/aurjson.class.php | 2 | ||||
| -rw-r--r-- | web/template/pkg_details.php | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -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. 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\"", 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> <input type='submit' value='Change category' />"; + $edit_cat.= "</select> <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"]) { |