- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Use virtual paths for voters page
by Lukas Fleischer 18 Jul '12

18 Jul '12

Link to "/packages/$pkgname/voters/" instead of using "/voters/" and a get parameter to request a specific package by ID. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 6 ++++++ web/lib/routing.inc.php | 1 - web/template/pkg_details.php | 10 ++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 3539c5a..df0d133 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -13,6 +13,12 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { $_GET['N'] = $tokens[2]; if (isset($tokens[3])) { + if ($tokens[3] == 'voters') { + $_GET['ID'] = pkgid_from_name($tokens[2]); + include('voters.php'); + return; + } + /* TODO: Remove support for legacy URIs and move these * actions to separate modules. */ switch ($tokens[3]) { diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index 5cffe81..4ca1150 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -14,7 +14,6 @@ $ROUTES = array( '/rss' => 'rss.php', '/submit' => 'pkgsubmit.php', '/tu' => 'tu.php', - '/voters' => 'voters.php', '/addvote' => 'addvote.php', ); diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 774d670..67cb5d1 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -143,10 +143,12 @@ if ($row["MaintainerUID"]): </tr> <tr> <th><?php echo __('Votes') . ': ' ?></th> -<?php -if ($atype == "Developer" || $atype == "Trusted User"): -?> - <td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo$pkgid ?>"><?php echo $votes ?></a> +<?php if ($atype == "Developer" || $atype == "Trusted User"): ?> +<?php if ($USE_VIRTUAL_URLS): ?> + <td><a href="<?php echo get_pkg_uri($row['Name']); ?>voters/"><?php echo $votes ?></a> +<?php else: ?> + <td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo $pkgid ?>"><?php echo $votes ?></a> +<?php endif; ?> <?php else: ?> <td><?php echo $votes ?></td> <?php endif; ?> -- 1.7.11.2

1 0

[aur-dev] [PATCH 1/2] voters.php: Use "<ul></ul>" for the list of voters
by Lukas Fleischer 18 Jul '12

18 Jul '12

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/voters.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/html/voters.php b/web/html/voters.php index c7c59a2..0ec77ec 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -17,11 +17,11 @@ if ($atype == 'Trusted User' || $atype== 'Developer'): <div class="box"> <h2>Votes for <a href="<?php echo get_pkg_uri(pkgname_from_id($pkgid)); ?>"><?php echo pkgname_from_id($pkgid) ?></a></h2> <div class="boxbody"> - -<?php - while (list($indx, $row) = each($votes)): ?> - <a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&ID=<?php echo $row['UsersID'] ?>"><?php echo htmlspecialchars($row['Username']) ?></a><br /> - <?php endwhile; ?> + <ul> + <?php while (list($indx, $row) = each($votes)): ?> + <li><a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&ID=<?php echo $row['UsersID'] ?>"><?php echo htmlspecialchars($row['Username']) ?></a></li> + <?php endwhile; ?> + </ul> </div> </div> -- 1.7.11.2

1 1

[aur-dev] [PATCH 1/5] routing.inc.php: Add missing "/account" route
by Lukas Fleischer 18 Jul '12

18 Jul '12

Minor oversight when adding the routing back end in commit eb22bcc7548d1b1025a3832aa4555792729d11b0. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/routing.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index bbcb9e2..5cffe81 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -5,6 +5,7 @@ $ROUTES = array( '/index.php' => 'home.php', '/packages' => 'packages.php', '/register' => 'account.php', + '/account' => 'account.php', '/accounts' => 'account.php', '/login' => 'login.php', '/logout' => 'logout.php', -- 1.7.11.2

1 4

[aur-dev] [PATCH 1/2] aur.inc.php: Include routing backend
by Lukas Fleischer 17 Jul '12

17 Jul '12

This needs to be available on every page since it is needed for get_uri() and get_pkg_uri() and "web/html/index.php" isn't executed if the virtual path feature is disabled. Reported-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 2 -- web/lib/aur.inc.php | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 0af3f2d..1561168 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -1,8 +1,6 @@ <?php 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"); diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 1a6164e..6dcbb34 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -11,6 +11,7 @@ include_once('translator.inc.php'); set_lang(); include_once("config.inc.php"); +include_once("routing.inc.php"); include_once("version.inc.php"); include_once("acctfuncs.inc.php"); include_once("cachefuncs.inc.php"); -- 1.7.11.2

1 1

[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