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

Tweaks of various page layouts and handling of data

Browse source 
This is a patch that fixes a lot of little things:
* We no longer have pkgsearch or pkgdetails link functions and all
references to them are gone, that's what a back button is for and if
we really need it we can come up with something better
* No longer have do_Details variable, this means links on the package
search are simply ?ID=foo
* On the pkgdetails pages when there are either no deps, deps by,
sources or comments for a package the list for each will display
"None" instead of nothing at all (ruining the layout)
* Fixed a bug where if a package had no sources or no deps
pkgsubmit.php would submit an empty one
* Translation of the word "Search'" has been changed to "Search"

Most of these relate to each other.

Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
This commit is contained in:
Callan Barrett 2008-01-12 18:18:43 +09:00 • committed by Dan McGee
parent dbbf50ac90
commit d4b07f2b33
15 changed files with 189 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
web/html/packages.php
View file

@ -92,9 +92,6 @@ if (isset($_REQUEST["do_Flag"])) {
print __("You did not select any packages to flag.");
print "</p>\n";
}
pkgsearch_results_link();
}
} elseif (isset($_REQUEST["do_UnFlag"])) {
@ -131,7 +128,6 @@ if (isset($_REQUEST["do_Flag"])) {
print "</p>\n";
}
pkgsearch_results_link();
}
@ -187,7 +183,6 @@ if (isset($_REQUEST["do_Flag"])) {
print "</p>\n";
}
pkgsearch_results_link();
}
@ -295,7 +290,6 @@ if (isset($_REQUEST["do_Flag"])) {
print __("You did not select any packages to delete.");
print "</p>\n";
} # end if (!empty($ids))
pkgsearch_results_link();
} # end if (!atype)
} elseif (isset($_REQUEST["do_Adopt"])) {
@ -353,9 +347,6 @@ if (isset($_REQUEST["do_Flag"])) {
print __("You did not select any packages to adopt.");
print "</p>\n";
}
pkgsearch_results_link();
}
@ -414,13 +405,6 @@ if (isset($_REQUEST["do_Flag"])) {
print __("You did not select any packages to vote for.");
print "</p>\n";
}
if (isset($_REQUEST["ID"])) {
pkgdetails_link($_REQUEST["ID"]);
} else {
pkgsearch_results_link();
}
}
@ -471,28 +455,19 @@ if (isset($_REQUEST["do_Flag"])) {
print __("You did not select any packages to un-vote for.");
print "</p>\n";
}
if (isset($_REQUEST["ID"])) {
pkgdetails_link($_REQUEST["ID"]);
} else {
pkgsearch_results_link();
}
}
} elseif (isset($_REQUEST["do_Details"])) {
} elseif (isset($_REQUEST["ID"])) {
if (!isset($_REQUEST["ID"]) || !intval($_REQUEST["ID"])) {
if (!intval($_REQUEST["ID"])) {
print __("Error trying to retrieve package details.")."<br />\n";
} else {
package_details($_REQUEST["ID"], $_COOKIE["AURSID"]);
}
print "<br />\n";
# FIXME: If someone hits the detail page's vote button, this link dies
pkgsearch_results_link();
} elseif (isset($_REQUEST["do_Notify"])) {
# I realize that the implementation here seems a bit convoluted, but we want to
@ -532,7 +507,6 @@ if (isset($_REQUEST["do_Flag"])) {
print '<br /></p>';
}
}
pkgdetails_link($pid);
} else {
print '<p>';
print __("Couldn't add to notification list.");

11
web/html/pkgedit.php
View file

@ -58,7 +58,6 @@ if ($_REQUEST["del_Comment"]) {
} else {
print __("Missing comment ID.")."<br />\n";
}
pkgdetails_link($_REQUEST["ID"]);
html_footer(AUR_VERSION);
exit();
}
@ -76,8 +75,7 @@ if ($_REQUEST["add_Comment"]) {
$q.= "'".mysql_real_escape_string($_REQUEST["comment"])."', ";
$q.= "UNIX_TIMESTAMP())";
db_query($q, $dbh);
print __("Comment has been added.")."<br />&nbsp;<br />\n";
pkgdetails_link($_REQUEST["ID"]);
print __("Comment has been added.");
# Send email notifications
#
@ -144,8 +142,6 @@ if ($_REQUEST["change_Category"]) {
} else {
print __("Invalid category ID.")."<br />\n";
}
pkgdetails_link($_REQUEST["ID"]);
} else {
# Prompt visitor for new category_id
#
@ -179,10 +175,7 @@ if ($_REQUEST["change_Category"]) {
print __("You've found a bug if you see this....")."<br />\n";
html_footer(AUR_VERSION); # Use the $Id$ keyword
# NOTE: when checking in a new file, use
# 'svn propset svn:keywords "Id" filename.php'
# to tell svn to expand the "Id" keyword.
html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>

8
web/html/pkgsubmit.php
View file

@ -421,12 +421,16 @@ if ($_COOKIE["AURSID"]) {
db_query($q, $dbh);
}
# Insert sources, if they don't exist don't inser them
#
if ($new_pkgbuild['source'] != "") {
$sources = explode(" ", $new_pkgbuild['source']);
while (list($k, $v) = each($sources)) {
$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
$q .= $pdata["ID"].", '".mysql_real_escape_string($v)."')";
db_query($q, $dbh);
}
}
} else {
# this is a brand new package
#
@ -483,6 +487,9 @@ if ($_COOKIE["AURSID"]) {
db_query($q, $dbh);
}
# insert sources
#
if ($new_pkgbuild['source'] != "") {
$sources = explode(" ", $new_pkgbuild['source']);
while (list($k, $v) = each($sources)) {
$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
@ -491,6 +498,7 @@ if ($_COOKIE["AURSID"]) {
}
}
}
}
# must chdir because include dirs are relative!
chdir($_SERVER['DOCUMENT_ROOT']);

2
web/lang/ca/acctfuncs_po.inc
View file

@ -7,7 +7,7 @@ global $_t;
$_t["ca"]["Missing a required field."] = "Manca un camp requerit.";
$_t["ca"]["Search'"] = "Cerca'";
$_t["ca"]["Search"] = "Cerca'";
$_t["ca"]["The account, %h%s%h, has been successfully created."] = "El compte, %h%s%h, s'ha creat satisfactòriament.";

2
web/lang/de/acctfuncs_po.inc
View file

@ -7,7 +7,7 @@ global $_t;
$_t["de"]["Missing a required field."] = "Ein benötigtes Feld fehlt.";
$_t["de"]["Search'"] = "Suche'";
$_t["de"]["Search"] = "Suche'";
$_t["de"]["The account, %h%s%h, has been successfully created."] = "Das Konto %h%s%h wurde erfolgreich angelegt.";

2
web/lang/en/acctfuncs_po.inc
View file

@ -13,7 +13,7 @@ global $_t;
$_t["en"]["Missing a required field."] = "Missing a required field.";
$_t["en"]["Search'"] = "Search'";
$_t["en"]["Search"] = "Search";
$_t["en"]["The account, %h%s%h, has been successfully created."] = "The account, %h%s%h, has been successfully created.";

2
web/lang/es/acctfuncs_po.inc
View file

@ -7,7 +7,7 @@ global $_t;
$_t["es"]["Missing a required field."] = "Falta un campo obligatorio.";
$_t["es"]["Search'"] = "Buscar'";
$_t["es"]["Search"] = "Buscar'";
$_t["es"]["The account, %h%s%h, has been successfully created."] = "La cuenta, %h%s%h, se creó correctamente.";

2
web/lang/fr/acctfuncs_po.inc
View file

@ -7,7 +7,7 @@ global $_t;
$_t["fr"]["Missing a required field."] = "Il manque un champ requis.";
$_t["fr"]["Search'"] = "Rechercher'";
$_t["fr"]["Search"] = "Rechercher'";
$_t["fr"]["The account, %h%s%h, has been successfully created."] = "Le compte, %h%s%h, a été créé avec succès.";

2
web/lang/it/acctfuncs_po.inc
View file

@ -7,7 +7,7 @@ global $_t;
$_t["it"]["Missing a required field."] = "Manca un campo obbligatorio.";
$_t["it"]["Search'"] = "Cerca'";
$_t["it"]["Search"] = "Cerca'";
$_t["it"]["The account, %h%s%h, has been successfully created."] = "L'account %h%s%h è stato creato con successo.";

2
web/lang/pl/acctfuncs_po.inc
View file

@ -27,7 +27,7 @@ $_t["pl"]["Re-type password"] = "Hasło (ponownie)";
$_t["pl"]["Language is not currently supported."] = "Język nie jest obecnie obsługiwany.";
$_t["pl"]["Missing User ID"] = "Brakuje ID użytkownika";
$_t["pl"]["Developer"] = "Developer";
$_t["pl"]["Search'"] = "Szukaj'";
$_t["pl"]["Search"] = "Szukaj'";
$_t["pl"]["Status"] = "Status";
$_t["pl"]["No results matched your search criteria."] = "Wyszukiwanie nie przyniosło rezultatu.";
$_t["pl"]["Never"] = "Nigdy";

2
web/lang/pt/acctfuncs_po.inc
View file

@ -13,7 +13,7 @@ global $_t;
$_t["pt"]["Missing a required field."] = "Um campo requerido não foi informado.";
$_t["pt"]["Search'"] = "Pesquisa'";
$_t["pt"]["Search"] = "Pesquisa'";
$_t["pt"]["The account, %h%s%h, has been successfully created."] = "A conta, %h%s%h, foi criada com sucesso.";

2
web/lang/ru/acctfuncs_po.inc
View file

@ -7,7 +7,7 @@ global $_t;
$_t["ru"]["Missing a required field."] = "Отсутствует обязательное значение.";
$_t["ru"]["Search'"] = "Поиск'";
$_t["ru"]["Search"] = "Поиск'";
$_t["ru"]["The account, %h%s%h, has been successfully created."] = "Учетная запись %h%s%h успешно создана.";

121
web/lib/pkgfuncs.inc
View file

@ -6,42 +6,6 @@ include_once("config.inc");
#
$pkgsearch_vars = array("O", "L", "C", "K", "SB", "SO", "PP", "do_MyPackages", "do_Orphans", "SeB");
# print out the 'return to package details' link
#
function pkgdetails_link($id=0) {
$url_data = "<a href='/packages.php?do_Details=1&ID=".intval($id)."'>";
print __("Go back to %hpackage details view%h.",
array($url_data, "</a>"));
print "\n<br />\n";
return;
}
# print out the 'return to search results' link
#
function pkgsearch_results_link() {
global $_REQUEST;
global $pkgsearch_vars;
$url_data = "<a href='/packages.php?do_Search=1";
while (list($k, $var) = each($pkgsearch_vars)) {
if (($var == "do_MyPackages" || $var == "do_Orphans") && $_REQUEST[$var]) {
$url_data.="&".$var."=1";
} else {
$url_data.="&".$var."=".rawurlencode(stripslashes($_REQUEST[$var]));
}
}
$url_data .= "'>";
print "<center>";
print __("Go back to %hsearch results%h.",
array($url_data, "</a>"));
print "</center>";
print "\n<br />\n";
return;
}
# Make sure this visitor can delete the requested package comment
# They can delete if they were the comment submitter, or if they are a TU/Dev
#
@ -387,6 +351,9 @@ function package_details($id=0, $SID="") {
echo __("Dependencies")."</span></td></tr>\n";
echo " <tr><td class='boxSoft'>";
$deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name', 'dummy');
if (count($deps) == 0) {
print "None\n";
} else {
while (list($k, $darr) = each($deps)) {
$url = "<a href='/packages.php?do_Details=1&ID=".$darr[0];
while(list($k, $var) = each($pkgsearch_vars)) {
@ -403,6 +370,7 @@ function package_details($id=0, $SID="") {
if ($darr[2] == 0) echo $url."'>".$darr[1].$darr[3]."</a><br />\n";
else echo "<a href='http://archlinux.org/packages/search/".$darr[1]."'>".$darr[1].$darr[3]."</a><br />\n";
}
}
echo "</td></tr>\n";
echo "</table></td>";
@ -413,6 +381,9 @@ function package_details($id=0, $SID="") {
echo __("Required by")."</span></td></tr>\n";
echo "<tr><td class='boxSoft'>";
$deps = package_required($row["ID"]);
if (count($deps) == 0) {
print "None\n";
} else {
while (list($k, $darr) = each($deps)) {
$url = "<a href='/packages.php?do_Details=1&ID=".$darr[0];
while(list($k, $var) = each($pkgsearch_vars)) {
@ -429,6 +400,7 @@ function package_details($id=0, $SID="") {
if ($darr[2] == 0) print $url."'>".$darr[1].$darr[3]."</a><br />\n";
else print "<a href='http://archlinux.org/packages/search/".$darr[1]."'>".$darr[1].$darr[3]."</a><br />\n";
}
}
echo "</td></tr>\n";
echo " </table>\n";
echo " </td>\n";
@ -438,6 +410,9 @@ function package_details($id=0, $SID="") {
echo __("Sources")."</span></td></tr>\n";
echo " <tr><td class='boxSoft'>";
$sources = package_sources($row["ID"]); # $sources[0] = 'src';
if (count($sources) == 0) {
print "None\n";
} else {
while (list($k, $src) = each($sources)) {
$parsed_url = parse_url($src);
if ($parsed_url['scheme'])
@ -457,6 +432,7 @@ function package_details($id=0, $SID="") {
}
}
}
}
echo "</td></tr>\n";
echo " </table>\n";
echo " </td>\n";
@ -538,15 +514,16 @@ function package_details($id=0, $SID="") {
echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Comments")."</span></div>\n";
echo " <div class=\"pgboxbody-comment\">\n";
echo " <table width='100%'>\n";
echo " <tr>\n";
echo " <td colspan='2'>\n";
if (isset($_COOKIE['AURSID'])) {
echo "<tr><td>";
echo " <form action='/pkgedit.php' method='post'>\n";
echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n";
echo " <input type='submit' class='button' name='add_Comment' value=\"";
echo __("Add Comment")."\">\n";
echo " </form>\n";
echo " </td>\n";
echo " </tr>\n";
echo "</tr></td>";
//echo "<br />\n";
}
$comments = package_comments($row["ID"]);
if (!empty($comments)) {
while (list($indx, $carr) = each($comments)) {
@ -585,12 +562,12 @@ function package_details($id=0, $SID="") {
echo " </td>\n";
echo " </tr>\n";
}
} else {
print "<tr><td>None</td></tr>\n";
}
echo " </table>\n";
echo " </div>\n";
echo "</div>\n";
}
}
return;
@ -942,19 +919,10 @@ function pkg_search_page($SID="") {
$q.= "ORDER BY Name ".$order.", LocationID ASC, CategoryID DESC ";
break;
}
$qnext = $q."LIMIT ".($O+$PP).", ".$PP; //next page's worth
$q.= "LIMIT ".$O.", ".$PP;
print "<!-- Query: ".$q." -->\n";
$result = db_query($q, $dbh);
if (!$result) {
print __("Error retrieving package list.");
} elseif (!mysql_num_rows($result)) {
print __("No packages matched your search criteria.");
} else {
if ($SID) {
# The 'Actions' table
#
@ -997,15 +965,10 @@ function pkg_search_page($SID="") {
print "<br />\n";
}
# print out package search results
#
// Why?
// print "<!-- Query: ".$q." -->\n";
# SO_next used to change sort order on header click
if ($_REQUEST["SO"] == "d"){
$SO_next="a";
} else {
$SO_next="d";
}
$result = db_query($q, $dbh);
print "<center>\n";
print "<table cellspacing='3' class='boxSoft'>\n";
@ -1017,6 +980,25 @@ function pkg_search_page($SID="") {
print "<tr>\n";
print " <td class='boxSoft'>\n";
print "<table width='100%' cellspacing='0' cellpadding='2'>\n";
if (!$result) {
print "<div class='pgboxbody'>";
print __("Error retrieving package list.");
print "</div>";
} elseif (!mysql_num_rows($result)) {
print "<div class='pgboxbody'>";
print __("No packages matched your search criteria.");
print "</div>";
} else {
# print out package search results
#
# SO_next used to change sort order on header click
if ($_REQUEST["SO"] == "d"){
$SO_next="a";
} else {
$SO_next="d";
}
print "<tr>\n";
if ($SID) {
print " <th style='border-bottom: #666 1px solid; vertical-align:";
@ -1064,10 +1046,10 @@ function pkg_search_page($SID="") {
(($i % 2) == 0) ? $c = "data1" : $c = "data2";
print "<tr>\n";
if ($SID) {
print " <td class='".$c."'>";
if ($row["OutOfDate"]) {
$c = "outofdate";
}
print " <td class='".$c."'>";
print "<input type='checkbox' name='IDs[".$row["ID"]."]' value='1'>";
# if ($i == 0) {
# $all_ids = $row["ID"];
@ -1085,20 +1067,8 @@ function pkg_search_page($SID="") {
print $cats[$row["CategoryID"]]."</span></span></td>\n";
print " <td class='".$c."'><span class='f4'>";
$url = "<a href='/packages.php?";
$url .= "do_Details=1&ID=";
$url .= "ID=";
$url .= $row["ID"];
while (list($k, $var) = each($pkgsearch_vars)) {
# I'm never convinced how to do this encoding/decoding properly.
# php.net recommends htmlentities(urlencode(data)), but that
# doesn't work!
#
if (($var == "do_MyPackages" || $var == "do_Orphans") && $_REQUEST[$var]) {
$url .= "&".$var."=1";
} else {
$url .= "&".$var."=".rawurlencode(stripslashes($_REQUEST[$var]));
}
}
reset($pkgsearch_vars);
$url.= "'>";
$url.="<span class='black'>";
$url.=$row["Name"];
@ -1210,13 +1180,12 @@ function pkg_search_page($SID="") {
}
print " </td>\n";
print " </tr>\n";
}
print " </table>\n";
print " </td>\n";
print "</tr>\n";
print "</table>\n";
print "</center>\n";
}
print "</form>\n";
return;

2
web/template/header.php
View file

@ -43,7 +43,7 @@ if (isset($_COOKIE["AURSID"])) {
.__("My Packages")."</a></li>\n";
}
?>
<li><a href="http://www.archlinux.org/mailman/listinfo/tur-users/">
<li><a href="http://archlinux.org/mailman/listinfo/aur-general">
<?php print __("Discussion"); ?></a></li>
<li><a href="http://bugs.archlinux.org/index.php?tasks=all&project=2"><?php print __("Bugs"); ?></a></li>
<li><a href="packages.php"><?php print __("Packages"); ?></a></li>

2
web/template/search_accounts_form.php
View file

@ -58,7 +58,7 @@
<td>&nbsp;</td>
<td align='left'>&nbsp;<br/>
<input type='submit' class='button'
value="<?php print __("Search'"); ?>">
value="<?php print __("Search"); ?>">
<input type='reset' class='button'
value="<?php print __("Reset"); ?>"></td>
</tr>