July 2012 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/7] Add virtual path support for package actions
by Lukas Fleischer 17 Jul '12

17 Jul '12

This allows for using following URLs: * /package/$pkg_name/flag: Flag a package out-of-date * /package/$pkg_name/unflag: Unflag a package * /package/$pkg_name/notify: Enable comment notifications * /package/$pkg_name/unnotify: Disable comment notifications * /package/$pkg_name/vote: Vote for the package * /package/$pkg_name/unvote: Remove vote Note that this code is very hackish and should be refactored once we drop support for legacy URLs. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/web/html/index.php b/web/html/index.php index de38178..0af3f2d 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -3,14 +3,44 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include_once("config.inc.php"); include_once("routing.inc.php"); +include_once("aur.inc.php"); +include_once("pkgfuncs.inc.php"); $path = rtrim($_SERVER['PATH_INFO'], '/'); $tokens = explode('/', $path); -if (isset($tokens[1]) &&'/' . $tokens[1] == get_pkg_route()) { +if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { if (isset($tokens[2])) { unset($_GET['ID']); $_GET['N'] = $tokens[2]; + + if (isset($tokens[3])) { + /* TODO: Remove support for legacy URIs and move these + * actions to separate modules. */ + switch ($tokens[3]) { + case "vote": + $_POST['do_Vote'] = __('Vote'); + break; + case "unvote": + $_POST['do_UnVote'] = __('UnVote'); + break; + case "notify": + $_POST['do_Notify'] = __('Notify'); + break; + case "unnotify": + $_POST['do_UnNotify'] = __('UnNotify'); + break; + case "flag": + $_POST['do_Flag'] = __('Flag'); + break; + case "unflag": + $_POST['do_UnFlag'] = __('UnFlag'); + break; + } + + $_POST['token'] = $_COOKIE['AURSID']; + $_POST['IDs'] = array(pkgid_from_name($tokens[2]) => '1'); + } } include get_route('/' . $tokens[1]); -- 1.7.11.2

1 6

[aur-dev] [PATCH 1/2] pkg_details.php: Fix link to voters if ID is unset
by Lukas Fleischer 17 Jul '12

17 Jul '12

When a package is requested by name, the "ID" request parameter might be unset. Use the "ID" field of the query result instead. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b4b52d5..6e19b3b 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -2,7 +2,7 @@ $atype = account_from_sid($SID); $uid = uid_from_sid($SID); -$pkgid = intval($_REQUEST['ID']); +$pkgid = intval($row['ID']); $catarr = pkgCategories(); -- 1.7.11.2

1 1

[aur-dev] [PATCH] pkgsubmit.php: Refactor source processing to fix PHP notice
by canyonknight 14 Jul '12

14 Jul '12

A foreach() being run without checking to see if the uploaded PKGBUILD had any sources now no longer causes an undefined index notice when there are no sources. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/pkgsubmit.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index c2a7191..737812e 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -379,9 +379,9 @@ if ($uid): } # Insert sources - $sources = explode(" ", $new_pkgbuild['source']); - foreach ($sources as $src) { - if ($src != "" ) { + if (!empty($new_pkgbuild['source'])) { + $sources = explode(" ", $new_pkgbuild['source']); + foreach ($sources as $src) { add_pkg_src($packageID, $src, $dbh); } } -- 1.7.11.2

1 0

[aur-dev] [PATCH] aur.inc.php: Use delete_session_id() where appropriate
by canyonknight 14 Jul '12

14 Jul '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/aur.inc.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index f82a96a..5a70e77 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -52,9 +52,7 @@ function check_sid($dbh=NULL) { } elseif ($failed == 2) { # session id timeout was reached and they must login again. # - $q = "DELETE FROM Sessions WHERE SessionID = '"; - $q.= db_escape_string($_COOKIE["AURSID"]) . "'"; - db_query($q, $dbh); + delete_session_id($_COOKIE["AURSID"], $dbh); setcookie("AURSID", "", 1, "/", null, !empty($_SERVER['HTTPS']), true); unset($_COOKIE['AURSID']); -- 1.7.11.2

1 0

[aur-dev] [PATCH] tu.php: Fix PHP notice for "hasvoted" variable
by canyonknight 11 Jul '12

11 Jul '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/tu.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/html/tu.php b/web/html/tu.php index 5537d3a..48cd6c1 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -34,6 +34,7 @@ if ($atype == "Trusted User" || $atype == "Developer") { $whovoted = voter_list($row['ID']); $canvote = 1; + $hasvoted = 0; $errorvote = ""; if ($isrunning == 0) { $canvote = 0; -- 1.7.11.1

2 1

[aur-dev] [PATCH] pkgsubmit.php: Remove stray "</div>" tag
by canyonknight 11 Jul '12

11 Jul '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/pkgsubmit.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 2fd21e6..c2a7191 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -477,7 +477,6 @@ else: endif; ?> - </div> </div> <?php -- 1.7.11.1

2 1

[aur-dev] [PATCH 1/2] pkg_details.php: Fix dependency links
by Lukas Fleischer 09 Jul '12

09 Jul '12

Remove an erroneous quote from the destination URL of links to officially supported package dependencies on archweb. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 05a20fe..67110fa 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -138,7 +138,7 @@ if ($atype == "Developer" || $atype == "Trusted User"): ?> <li><a href="packages.php?ID=<?php echo $darr[2]?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1]?>"><?php echo $darr[0].$darr[1]?></a></li> <?php else: ?> - <li><a href="http://www.archlinux.org/packages/?q="<?php echo urlencode($darr[0])?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1] ?>"><?php echo $darr[0].$darr[1] ?></a></li> + <li><a href="http://www.archlinux.org/packages/?q=<?php echo urlencode($darr[0])?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1] ?>"><?php echo $darr[0].$darr[1] ?></a></li> <?php endif; ?> <?php endwhile; ?> </ul> -- 1.7.11.1

1 1

[aur-dev] [PATCH] Update archweb stylesheet
by Lukas Fleischer 09 Jul '12

09 Jul '12

Pull in the latest changes from the archweb Git repository. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/archweb.css | 170 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 119 insertions(+), 51 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index 303173f..cafae77 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -85,6 +85,10 @@ input[type=submit] { clear: both; } +.hide { + display: none; +} + hr { border: none; border-top: 1px solid #888; @@ -122,6 +126,16 @@ a { color: #e90; } +/* special anchor elements */ +a.headerlink { + visibility: hidden; + padding-left: 0.5em; +} + +h3:hover > a.headerlink { + visibility: visible; +} + /* headings */ h2 { font-size: 1.5em; @@ -258,6 +272,23 @@ table.pretty2 { border: 1px solid #bbb; } + /* additional styles for JS sorting */ + table.pretty2 th.header { + padding-right: 20px; + background-image: url(nosort.gif); + background-repeat: no-repeat; + background-position: center right; + cursor: pointer; + } + + table.pretty2 th.headerSortDown { + background-image: url(desc.gif); + } + + table.pretty2 th.headerSortUp { + background-image: url(asc.gif); + } + table.pretty2 td { padding: 0.35em; border: 1px dotted #bbb; @@ -481,15 +512,11 @@ h3 span.arrow { text-align: right; } - #pkg-updates span.testing, - #pkg-updates span.community-testing, - span.multilib-testing { + #pkg-updates span.testing { font-style: italic; } - #pkg-updates span.staging, - #pkg-updates span.community-staging, - span.multilib-staging { + #pkg-updates span.staging { font-style: italic; color: #ff8040; } @@ -575,25 +602,6 @@ table#download-torrents .cpu-arch { text-align: center; } -table#download-mirrors { - width: auto; - margin-bottom: 1em; -} - - table#download-mirrors td.mirror-country { - padding-top: 1em; - } - - table#download-mirrors td.mirror-server { - padding-right: 1em; - } - - table#download-mirrors a { - display: block; - float: right; - width: 4em; - } - /* pkglists/devlists */ table.results { font-size: 0.846em; @@ -649,8 +657,7 @@ div#pkglist-about { } /* pkglist: results navigation */ -#pkglist-stats-top, -#pkglist-stats-bottom { +.pkglist-stats { font-size: 0.85em; } @@ -668,9 +675,13 @@ div#pkglist-about { } /* search fields and other filter selections */ +.filter-criteria { + margin-bottom: 1em; +} + .filter-criteria h3 { font-size: 1em; - margin-top:0; + margin-top: 0; } .filter-criteria div { @@ -728,6 +739,11 @@ div#pkglist-about { padding: 0.25em 0 0.25em 1.5em; } + #pkgdetails #pkginfo .userdata { + font-size: 0.85em; + padding: 0.5em; + } + /* pkgdetails: flag package */ form#flag-pkg-form label { width: 10em; @@ -795,6 +811,28 @@ form#flag-pkg-form input[type=text] { padding-top: 1em; } + #pkgdetails #pkgfiles li.d { + color: #666; + } + + #pkgdetails #pkgfiles li.f { + } + +/* mirror stuff */ +table td.country { + white-space: normal; +} + +form#list-generator div ul { + list-style: none; + display: inline; + padding-left: 0; +} + + form#list-generator div ul li { + display: inline; + } + /* dev/TU biographies */ div#arch-bio-toc { width: 75%; @@ -802,33 +840,50 @@ div#arch-bio-toc { text-align: center; } -table.arch-bio-entry td.pic { - vertical-align: top; - padding-right: 15px; - padding-top: 10px; -} - - table.arch-bio-entry td.pic img { - padding: 4px; - border: 1px solid #ccc; + div#arch-bio-toc a { + white-space: nowrap; } -table.arch-bio-entry table.bio { - margin-bottom: 2em; +table.arch-bio-entry { + width: 75%; + min-width: 640px; + margin: 0 auto; } - table.arch-bio-entry table.bio th { - text-align: left; - padding-right: 0.5em; + table.arch-bio-entry td.pic { vertical-align: top; - white-space: nowrap; + padding-right: 15px; + padding-top: 2.25em; + } + + table.arch-bio-entry td.pic img { + padding: 4px; + border: 1px solid #ccc; + } + + table.arch-bio-entry td h3 { + border-bottom: 1px dotted #ccc; + margin-bottom: 0.5em; } - table.arch-bio-entry table.bio td { - width: 100%; - padding-bottom: 0.25em; + table.arch-bio-entry table.bio { + margin-bottom: 2em; } + table.arch-bio-entry table.bio th { + color: #666; + font-weight: normal; + text-align: right; + padding-right: 0.5em; + vertical-align: top; + white-space: nowrap; + } + + table.arch-bio-entry table.bio td { + width: 100%; + padding-bottom: 0.25em; + } + /* dev: login/out */ table#dev-login { width: auto; @@ -899,26 +954,26 @@ ul.admin-actions { background: #ffd; } -#dev-signoffs ul { +ul.signoff-list { list-style: none; margin: 0; padding: 0; } -#dev-signoffs .signoff-yes { +.signoff-yes { color: green; font-weight: bold; } -#dev-signoffs .signoff-no { +.signoff-no { color: red; } -#dev-signoffs .signoff-bad { +.signoff-bad { color: darkorange; } -#dev-signoffs .signoff-disabled { +.signoff-disabled { color: gray; } @@ -949,6 +1004,14 @@ ul.admin-actions { color: red; } +#key-status .signed-yes { + color: green; +} + +#key-status .signed-no { + color: red; +} + /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a, #archnavbar.anb-packages ul li#anb-packages a, @@ -982,3 +1045,8 @@ ul.admin-actions { font-size: 0.85em; line-height: 1em; } + +#visualize-keys svg { + width: 100%; + height: 100%; +} -- 1.7.11.1

1 0

[aur-dev] archweb branch merged into master
by Lukas Fleischer 08 Jul '12

08 Jul '12

Hi, guys! This turned out to take much longer than expected, but the archweb branch (>50 patches, that is) has finally been merged into master. There's a few things that still need some fine tuning but it basically pretty much looks like archweb already. Special thanks fly out to canyonknight, who contributed several patches and helped a lot with merging our work together! Cheers, Lukas

1 0