January 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Tweaks of various page layouts and handling of data
by Callan Barrett 13 Jan '08

13 Jan '08

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. -- Callan 'wizzomafizzo' Barrett

3 3

[aur-dev] [PATCH] Support for verbose page titles
by Callan Barrett 12 Jan '08

12 Jan '08

Verbose page titles again -- Callan 'wizzomafizzo' Barrett

1 0

[aur-dev] [PATCH] Support for verbose page titles
by Callan Barrett 12 Jan '08

12 Jan '08

Adds support for more verbose page titles based on current page and action by user and removes sort by options from search form as they're obsolete by column links. Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/account.php | 2 +- web/html/index.php | 5 +-- web/html/packages.php | 19 ++++++++++++- web/html/pkgsubmit.php | 2 +- web/lib/aur.inc | 4 ++- web/lib/pkgfuncs.inc | 71 ++++++++++++----------------------------------- web/template/header.php | 2 +- 7 files changed, 43 insertions(+), 62 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index 9caada4..9c1eb31 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -8,7 +8,7 @@ include("pkgfuncs_po.inc"); # Add to handle the i18n of My Packages include("account_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(); # print out the HTML header +html_header(__("Accounts")); # print out the HTML header # Main page processing here diff --git a/web/html/index.php b/web/html/index.php index 99cccbc..617b16a 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -7,10 +7,7 @@ include("pkgfuncs_po.inc"); # Add to handle the i18n of My Packages include("aur.inc"); set_lang(); check_sid(); - -# Any cookies have been sent, can now display HTML -# -html_header(); +html_header(__("Home")); # Big Top Level Table (Table 1) echo "<div class=\"pgbox\">\n"; diff --git a/web/html/packages.php b/web/html/packages.php index bc398ee..1600e41 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -7,7 +7,24 @@ include("pkgfuncs.inc"); # package specific functions include("search_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(); # print out the HTML header + +# set the title to something useful depending on +# what "page" we're on +# +if (isset($_GET['ID'])) { + $id = pkgname_from_id($_GET['ID']); + if (!empty($id)) { + $title = $id; + } +} else if (isset($_GET['K'])) { + $title = "Search: " . $_GET['K']; +} else if (isset($_GET['do_MyPackages'])) { + $title = __("My Packages"); +} else { + $title = __("Packages"); +} + +html_header($title); # print out the HTML header # enable debugging # diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 638654b..801348b 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -8,7 +8,7 @@ include("pkgfuncs.inc"); # package functions include("config.inc"); # configuration file with dir locations set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(); # print out the HTML header +html_header("Submit"); # print out the HTML header echo "<div class=\"pgbox\">\n"; echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Submit")."</span></div>\n"; echo " <div class=\"pgboxbody\">\n"; diff --git a/web/lib/aur.inc b/web/lib/aur.inc index c18365c..a9095cd 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -334,7 +334,7 @@ function set_lang() { # common header # -function html_header() { +function html_header($title="") { global $_SERVER; global $_COOKIE; global $_POST; @@ -405,6 +405,8 @@ function html_header() { } } + $title = htmlspecialchars($title, ENT_QUOTES); + include('header.php'); return; } diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 46bc522..d4f3ae7 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -250,6 +250,23 @@ function pkgnotify_from_sid($sid="") { return $pkgs; } +# get name of package based on pkgid +# +function pkgname_from_id($id="") { + if (!empty($id)) { + $dbh = db_connect(); + $id = intval($id); + $q = "SELECT Name FROM Packages WHERE ID = " . mysql_real_escape_string($id); + $result = db_query($q, $dbh); + if (mysql_num_rows($result) > 0) { + $id = mysql_result($result, 0); + } else { + $id = ""; + } + } + return $id; +} + # display package details # function package_details($id=0, $SID="") { @@ -638,7 +655,7 @@ function pkg_search_page($SID="") { # The search form # - print "<form action='/packages.php' method='post'>\n"; + print "<form action='/packages.php' method='get'>\n"; print "<input type='hidden' name='O' value='".$O."'>\n"; print "<center>\n"; @@ -714,58 +731,6 @@ function pkg_search_page($SID="") { print " </select>\n"; print "</td>\n"; - /* Sort by */ - - print "<td align='right'>\n"; - print " <span class='f5'><span class='blue'>".__("Sort by"); - print "</span></span><br />\n"; - print " <select name='SB'>\n"; - - print " <option value=n"; - $_REQUEST["SB"] == "n" ? print " selected> " : print "> "; - print __("Name")."</option>\n"; - - print " <option value=c"; - $_REQUEST["SB"] == "c" ? print " selected> " : print "> "; - print __("Category")."</option>\n"; - - print " <option value=l"; - $_REQUEST["SB"] == "l" ? print " selected> " : print "> "; - print __("Location")."</option>\n"; - - print " <option value=v"; - $_REQUEST["SB"] == "v" ? print " selected> " : print "> "; - print __("Votes")."</option>\n"; - - print " <option value=m"; - $_REQUEST["SB"] == "m" ? print " selected> " : print "> "; - print __("Maintainer")."</option>\n"; - - print " <option value=a"; - $_REQUEST["SB"] == "a" ? print " selected> " : print "> "; - print __("Age")."</option>\n"; - - print " </select>\n"; - print "</td>\n"; - - print "<td align='right'>\n"; - print " <span class='f5'><span class='blue'>".__("Sort order"); - print "</span></span><br />\n"; - print " <select name='SO'>\n"; - - print " <option value=a"; - $_REQUEST["SO"] == "a" ? print " selected> " : print "> "; - print __("Ascending")."</option>\n"; - - print " <option value=d"; - $_REQUEST["SO"] == "d" ? print " selected> " : print "> "; - print __("Descending")."</option>\n"; - - print " </select>\n"; - print "</td>\n"; - - /* End of Sort by */ - print "<td align='right'>\n"; print " <span class='f5'><span class='blue'>".__("Per page"); print "</span></span><br />\n"; diff --git a/web/template/header.php b/web/template/header.php index 8e02211..b27015a 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print "$LANG\" lang=\"$LANG"; ?>"> <head> - <title>AUR (<?php print $LANG; ?>)</title> + <title>AUR (<?php print $LANG; ?>)<?php if ($title != "") { print " - " . $title; } ?></title> <link rel='stylesheet' type='text/css' href='/css/fonts.css' /> <link rel='stylesheet' type='text/css' href='/css/containers.css' /> <link rel='stylesheet' type='text/css' href='/css/arch.css' /> -- 1.5.3.7

1 0

[aur-dev] AUR2 New feature: Package Requests
by Sebastian Nowicki 12 Jan '08

12 Jan '08

This morning I was looking for package requests, that I may be able to fill, on the bbs. After a few minutes of flipping through threads, I realised that nobody maintains the forum. These threads do not get edited properly to indicate that a request was filled. Every thread I looked at which seemed to be a request, was in fact already filled. Searching for a valid request seemed impossible. Who know how many threads spanning those 99 pages are actually filled or not? So I figured I may as well make a special section for it on the AUR site. The templates are a bit ugly still, and there's no searching implemented, nor do requests get marked as filled when a package gets submitted, but there's time for that. Here are some screenshots of what's done so far: http://img134.imageshack.us/img134/8855/200801120136181679x759sqm8.png http://img341.imageshack.us/img341/1507/200801120137081679x520seo8.png * http://img521.imageshack.us/img521/6889/200801120137171679x772ste9.png I discussed it with wizzo a bit and decided that comments weren't neccessary, but a "pkgbuild attempt" field would be useful. Any comments/discussion that people may have about the request can reside on the ML or bbs. * Request listing will have an "added" or "requested on" field

3 3

[aur-dev] [PATCH] Removes need for name, overwrite and comment fields from pkgsubmit.php
by Callan Barrett 11 Jan '08

11 Jan '08

Alright, this patch gets rid of some fields in the pkgbuild submit form leaving just the category select and file select fields. As far as I can tell it works fine but I think this is an important patch that other people should test if possible, so if anyone reads these emails aside from cactus can you please try this out. -- Callan 'wizzomafizzo' Barrett

1 1

[aur-dev] [PATCH] Bug in uploading PKGBUILDs and aur schema
by Callan Barrett 10 Jan '08

10 Jan '08

This fixes a bug where TUs and devs couldn't upload packages because the query would have an extra column in it to mark the pkgbuild safe automatically, guessing it got missed when the safe flags were removed. Also fixes a screw up I made with the schema file when I added the tables for the voting app. -- Callan 'wizzomafizzo' Barrett

1 0

[aur-dev] aur for x86_64
by Eduard Warkentin 08 Jan '08

08 Jan '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: RIPEMD160 Hi! I really would like to help aur to be usable for x86_64 packages too. I have no idea whats the current develop on that issue, but I really want to use it for x86_64 too. So if someone please can help me with the main issues at that point, i would be very happy :) Thx and greetings - -- Eduard "bekks" Warkentin GPG key id: 0x32217597 GPG fingerprint: 501B E562 2AF4 65FD EB85 A752 D07B D83D 3221 7597 GPG key server: hkp://subkeys.pgp.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEAREDAAYFAkeCum0ACgkQ0HvYPTIhdZdB/wCgvjezTkJzLAl4lcuuRRk6sUn1 YK4Anii4U1a9Tc/jkdWma/UOPFZDIv+s =815+ -----END PGP SIGNATURE-----

2 2

[aur-dev] AUR2 API
by Sebastian Nowicki 07 Jan '08

07 Jan '08

We have most of what we need to implement the API, and I'm kind of eager to start on it. I thought it may be a good idea to start some discussion about how the API would work. I know there's an implementation in the works for the current AUR, in PHP, so it would be great if we got some implementation ideas from that too. Was there any discussions about that before? The two major functions of the API will be to search and retrieve information about a package. A utility may also want to retrieve comments and vote for package (if that feature was to be implemented). These are the "methods" I can think of: # Returns a tuple of package names that match (name and description is # searched), sorted by relevance # Regex may be used if implemented search(keywords) # Returns all info about the package, excluding dependencies and # such get_package_info(package_name) # Returns a tuple (array) of package names that the package depends on get_package_dependencies(package_name) # Returns a tuple of package comments (dictionary) get_package_comments(package_name) # Not sure about this one, I guess a url returned in get_package_info() # would suffice to use wget. I don't know how one would use JSON to # download a tarball get_package_tarball(package_name)

1 0

[aur-dev] AUR2 directory structure
by Sebastian Nowicki 07 Jan '08

07 Jan '08

I'd like to implement saving files to disk, but to do so I first need to decide on the directory structure. Django's FileField model field wants to upload files relative to MEDIA_ROOT[1]. Since I'm currently using the main site's CSS and images directly, MEDIA_ROOT hasn't been used yet. To simplify the problem I think it's best to simply ignore the fact that there may be an SCM backend. We should just focus on the relative directory structure. The easy way to go would be dumping everything into MEDIA_ROOT/repository/package_name/ (possible using MEDIA_ROOT/packages/...). It's simple and easy to navigate. The directory would hold the PKGBUILD, and source or install files and the tarball. The files would be accessible via MEDIA_URL/[packages/]repository/package_name/, with packages/ being optional. I'm not sure that using MEDIA_ROOT is a good idea since, if we eventually get some, images and CSS files, etc. would also go into it, so it seems a bit odd. Also if we do choose to go with an SCM like subversion then it would most likely have to be separated from the MEDIA_ROOT. I'm not sure if overloading this behaviour of the FileField is possible, so we may simply need to use a CharField and do anything, that FileField does for us, manually. For those familiar with the current AUR code, how does AUR do it? Does it even store the source file separately? And how does the main site handle it? [1] http://www.djangoproject.com/documentation/model-api/#filefield

1 1

[aur-dev] [PATCH] Add notify column in search results and notify button
by Callan Barrett 07 Jan '08

07 Jan '08

Lets you toggle notification for many packages at once and tells of their status from the search results (like the voted column). Works for me. -- Callan 'wizzomafizzo' Barrett

1 0