external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Lukas Fleischer 2011-08-22 08:35:18 +02:00
commit e411ef1d80
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UPGRADING
View file

@ -28,13 +28,13 @@ container or optionally create a ".htaccess" file in the upload directory):
---- ----
RewriteEngine on 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: 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. If you use a non-standard URL_DIR, slight modifications might be necessary.

2
web/lib/aurjson.class.php
View file

@ -203,7 +203,7 @@ class AurJSON {
// just using sprintf to coerce the pqd to an int // just using sprintf to coerce the pqd to an int
// should handle sql injection issues, since sprintf will // should handle sql injection issues, since sprintf will
// bork if not an int, or convert the string to a number 0 // bork if not an int, or convert the string to a number 0
$where_condition = "ID={$pqdata}"; $where_condition = "Packages.ID={$pqdata}";
} }
else { else {
$where_condition = sprintf("Name=\"%s\"", $where_condition = sprintf("Name=\"%s\"",

6
web/template/pkg_details.php
View file

@ -10,7 +10,7 @@ if ($uid == $row["MaintainerUID"] or
$edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n"; $edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n";
$edit_cat.= "<p>"; $edit_cat.= "<p>";
$edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />"; $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"; $edit_cat.= "<select name='category_id'>\n";
foreach ($catarr as $cid => $catname) { foreach ($catarr as $cid => $catname) {
$edit_cat.= "<option value='$cid'"; $edit_cat.= "<option value='$cid'";
@ -19,13 +19,13 @@ if ($uid == $row["MaintainerUID"] or
} }
$edit_cat.=">".$catname."</option>"; $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.= "</p>";
$edit_cat.= "</form>"; $edit_cat.= "</form>";
} }
else { else {
$edit_cat = "<span class='f3'>Category: " . $row['Category'] . "</span>"; $edit_cat = "<span class='f3'>" . __("Category") . ": " . $row['Category'] . "</span>";
} }
if ($row["SubmitterUID"]) { if ($row["SubmitterUID"]) {