- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/5] Allow for selecting a reason when closing a request
by Lukas Fleischer 04 Jul '14

04 Jul '14

When closing a package request, Trusted Users can now pick a reason ("Accepted" or "Rejected"). This allows for marking a request as accepted, even if the corresponding package base has already been deleted. Also, the notification email now always explicitly states whether a request has been accepted or closed in the message body. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 19 +++++++++++++++++++ web/html/pkgbase.php | 2 +- web/html/pkgreq.php | 12 ++++++++---- web/lib/pkgbasefuncs.inc.php | 4 ++-- web/lib/pkgreqfuncs.inc.php | 27 +++++++++++++++++++++++---- web/template/pkgreq_close_form.php | 24 ++++++++++++++++++++++++ web/template/pkgreq_results.php | 14 +++----------- 7 files changed, 80 insertions(+), 22 deletions(-) create mode 100644 web/template/pkgreq_close_form.php diff --git a/web/html/index.php b/web/html/index.php index 40063f0..554e86c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -89,6 +89,25 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } include get_route('/' . $tokens[1]); +} elseif (!empty($tokens[1]) && '/' . $tokens[1] == get_pkgreq_route()) { + if (!empty($tokens[2])) { + /* TODO: Create a proper data structure to pass variables from + * the routing framework to the individual pages instead of + * initializing arbitrary variables here. */ + if (!empty($tokens[3]) && $tokens[3] == 'close') { + $pkgreq_id = $tokens[2]; + } else { + $pkgreq_id = null; + } + + if (!$pkgreq_id) { + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; + } + } + + include get_route('/' . $tokens[1]); } elseif (!empty($tokens[1]) && '/' . $tokens[1] == get_user_route()) { if (!empty($tokens[2])) { $_REQUEST['ID'] = uid_from_username($tokens[2]); diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 5e27e4e..6202180 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -105,7 +105,7 @@ if (check_token()) { $ret = false; } } elseif (current_action("do_CloseRequest")) { - list($ret, $output) = pkgreq_close($_POST['reqid'], false); + list($ret, $output) = pkgreq_close($_POST['reqid'], $_POST['reason']); } if (isset($_REQUEST['comment'])) { diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php index 4b7d6cf..9dec1f6 100644 --- a/web/html/pkgreq.php +++ b/web/html/pkgreq.php @@ -8,7 +8,14 @@ include_once("pkgfuncs.inc.php"); set_lang(); check_sid(); -if (!isset($base_id)) { +if (isset($base_id)) { + html_header(__("File Request")); + include('pkgreq_form.php'); +} elseif (isset($pkgreq_id)) { + html_header(__("Close Request")); + $pkgbase_name = pkgreq_get_pkgbase_name($pkgreq_id); + include('pkgreq_close_form.php'); +} else { if (!check_user_privileges()) { header('Location: /'); exit(); @@ -63,9 +70,6 @@ if (!isset($base_id)) { html_header(__("Requests")); include('pkgreq_results.php'); -} else { - html_header(__("File Request")); - include('pkgreq_form.php'); } html_footer(AUR_VERSION); diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 0ee2c31..4c1f452 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -540,7 +540,7 @@ function pkgbase_delete ($atype, $base_ids, $merge_base_id, $via) { $dbh->exec($q); if ($via) { - pkgreq_close(intval($via), true); + pkgreq_close(intval($via), 'accepted'); } return array(true, __("The selected packages have been deleted.")); @@ -598,7 +598,7 @@ function pkgbase_adopt ($atype, $base_ids, $action=true, $via) { $dbh->exec($q); if ($via) { - pkgreq_close(intval($via), true); + pkgreq_close(intval($via), 'accepted'); } if ($action) { diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index a79677e..0309bc3 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -41,6 +41,22 @@ function pkgreq_list($offset, $limit) { } /** + * Obtain the package base that belongs to a package request. + * + * @param int $id Package request ID to retrieve the package base for + * + * @return int The name of the corresponding package base + */ +function pkgreq_get_pkgbase_name($id) { + $dbh = DB::connect(); + + $q = "SELECT PackageBaseName FROM PackageRequests "; + $q.= "WHERE ID = " . intval($id); + $result = $dbh->query($q); + return $result->fetch(PDO::FETCH_COLUMN, 0); +} + +/** * File a deletion/orphan request against a package base * * @global string $AUR_LOCATION The AUR's URL used for notification e-mails @@ -139,14 +155,18 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { * @global string $AUR_LOCATION The AUR's URL used for notification e-mails * @global string $AUR_REQUEST_ML The request notification mailing list * @param int $id The package request to close - * @param bool $accepted True if the request has been accepted, false otherwise + * @param string $reason Whether the request was accepted or rejected * * @return array Tuple of success/failure indicator and error message */ -function pkgreq_close($id, $accepted) { +function pkgreq_close($id, $reason) { global $AUR_LOCATION; global $AUR_REQUEST_ML; + if ($reason != 'accepted' && $reason != 'rejected') { + return array(false, __("Invalid reason.")); + } + $dbh = DB::connect(); $id = intval($id); @@ -181,8 +201,7 @@ function pkgreq_close($id, $accepted) { * user who posted the comment was in. */ $username = username_from_sid($_COOKIE['AURSID']); - $body = "Request #" . intval($id) . " has been " . - ($accepted ? "accepted" : "closed") . " by " . + $body = "Request #" . intval($id) . " has been " . $reason . " by " . $username . " [1].\n\n" . "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n"; $body = wordwrap($body, 70); diff --git a/web/template/pkgreq_close_form.php b/web/template/pkgreq_close_form.php new file mode 100644 index 0000000..be36aef --- /dev/null +++ b/web/template/pkgreq_close_form.php @@ -0,0 +1,24 @@ +<div class="box"> + <h2><?= __('Close Request: %s', htmlspecialchars($pkgbase_name)) ?></h2> + <p> + <?= __('Use this form to close the request for package base %s%s%s.', + '<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?> + </p> + <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <fieldset> + <input type="hidden" name="reqid" value="<?= $pkgreq_id ?>" /> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <p> + <label for="id_reason"><?= __("Reason") ?>:</label> + <select name="reason" id="id_reason"> + <option value="accepted"><?= __('Accepted') ?></option> + <option value="rejected"><?= __('Rejected') ?></option> + </select> + </p> + <p> + <input type="submit" class="button" name="do_CloseRequest" value="<?= __("Close Request") ?>" /> + </p> + </fieldset> + </form> +</div> + diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 9cd6faf..b5e1177 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -51,8 +51,10 @@ <?php if ($row['BaseID']): ?> <?php if ($row['Type'] == 'deletion'): ?> <a href="<?= get_pkgbase_uri($row['Name']) ?>delete/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> + <br/ > <?php elseif ($row['Type'] == 'merge'): ?> <a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> + <br /> <?php elseif ($row['Type'] == 'orphan'): ?> <form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> @@ -61,17 +63,7 @@ </form> <?php endif; ?> <?php endif; ?> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> - <fieldset> - <input type="hidden" name="IDs[<?= $row['BaseID'] ?>]" value="1" /> - <input type="hidden" name="ID" value="<?= $row['BaseID'] ?>" /> - <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> - <input type="hidden" name="reqid" value="<?= $row['ID'] ?>" /> - <div> - <input type="submit" class="button text-button" name="do_CloseRequest" value="<?= __("Close") ?>" /> - </div> - </fieldset> - </form> + <a href="<?= get_pkgreq_route() . '/' . intval($row['ID']) ?>/close/"><?= __('Close') ?></a> </td> <?php else: ?> <td><?= __("Closed") ?></td> -- 2.0.1

1 4

[aur-dev] [PATCH] Do not ucfirst() merge base name in request list
by Lukas Fleischer 02 Jul '14

02 Jul '14

Make sure the first character of the merge base name is not capitalized in the package request list. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkgreq_results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 7933964..9cd6faf 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -37,7 +37,7 @@ <td><?= htmlspecialchars($row["Name"]) ?></td> <?php endif; ?> <?php if ($row['Type'] == 'merge'): ?> - <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?> (<?= htmlspecialchars(ucfirst($row['MergeInto']), ENT_QUOTES); ?>)</td> + <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?> (<?= htmlspecialchars($row['MergeInto'], ENT_QUOTES); ?>)</td> <?php else: ?> <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?></td> <?php endif; ?> -- 2.0.1

1 0

[aur-dev] [PATCH] Remove extra space from text buttons in Firefox
by Lukas Fleischer 02 Jul '14

02 Jul '14

Fixes FS#41052. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index cbebb30..9435e22 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -63,3 +63,8 @@ text-decoration: underline; color: #666; } + +.text-button::-moz-focus-inner { + padding: 0; + border: none; +} -- 2.0.1

1 0

[aur-dev] [PATCH] po/POTFILES: Add missing files
by Lukas Fleischer 02 Jul '14

02 Jul '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- po/POTFILES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/POTFILES b/po/POTFILES index 6ca17e7..a37384e 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -10,6 +10,7 @@ html/passreset.php html/pkgbase.php html/pkgdel.php html/pkgmerge.php +html/pkgreq.php html/pkgsubmit.php html/rpc.php html/rss.php @@ -28,6 +29,7 @@ lib/gettext.php lib/pkgbasefuncs.inc.php lib/pkgbuild-parser.inc.php lib/pkgfuncs.inc.php +lib/pkgreqfuncs.inc.php lib/routing.inc.php lib/stats.inc.php lib/streams.php @@ -43,6 +45,8 @@ template/pkgbase_details.php template/pkg_comment_form.php template/pkg_comments.php template/pkg_details.php +template/pkgreq_form.php +template/pkgreq_results.php template/pkg_search_form.php template/pkg_search_results.php template/search_accounts_form.php -- 2.0.1

1 0

[aur-dev] [PATCH 1/4] Fix title in package requests list
by Lukas Fleischer 02 Jul '14

02 Jul '14

Use "Requests" instead of "File Request" as title for the package request list. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgreq.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php index 401b60c..674f1c1 100644 --- a/web/html/pkgreq.php +++ b/web/html/pkgreq.php @@ -8,8 +8,6 @@ include_once("pkgfuncs.inc.php"); set_lang(); check_sid(); -html_header(__("File Request")); - if (!isset($base_id)) { if (!check_user_privileges()) { header('Location: /'); @@ -62,8 +60,11 @@ if (!isset($base_id)) { } $SID = $_COOKIE['AURSID']; + + html_header(__("Requests")); include('pkgreq_results.php'); } else { + html_header(__("File Request")); include('pkgreq_form.php'); } -- 2.0.1

1 3

[aur-dev] [PATCH 1/2] Remove Reply-To header from package request emails
by Lukas Fleischer 01 Jul '14

01 Jul '14

These notification emails are sent to a public mailing list for discussion. Make sure that people can reply. Reported-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgreqfuncs.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 26d543e..748b849 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -108,8 +108,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $headers .= "Bcc: $bcc\r\n"; } $thread_id = "<pkg-request-" . $request_id . "@aur.archlinux.org>"; - $headers .= "Reply-to: noreply(a)aur.archlinux.org\r\n" . - "From: notify(a)aur.archlinux.org\r\n" . + $headers .= "From: notify(a)aur.archlinux.org\r\n" . "In-Reply-To: $thread_id\r\n" . "References: $thread_id\r\n" . "X-Mailer: AUR"; @@ -179,8 +178,7 @@ function pkgreq_close($id, $accepted) { $headers .= "Bcc: $bcc\r\n"; } $thread_id = "<pkg-request-" . $id . "@aur.archlinux.org>"; - $headers .= "Reply-to: noreply(a)aur.archlinux.org\r\n" . - "From: notify(a)aur.archlinux.org\r\n" . + $headers .= "From: notify(a)aur.archlinux.org\r\n" . "In-Reply-To: $thread_id\r\n" . "References: $thread_id\r\n" . "X-Mailer: AUR"; -- 2.0.1

1 1

[aur-dev] [PATCH] Move user statistics table to the right
by Lukas Fleischer 01 Jul '14

01 Jul '14

Display user statistics under the general package statistics table. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/home.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/web/html/home.php b/web/html/home.php index 62c246a..2757c06 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -71,20 +71,6 @@ html_header( __("Home") ); <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> </div> </div> - <?php if (!empty($_COOKIE["AURSID"])): ?> - <div id="pkg-updates" class="widget box"> - <table> - <tr> - <td class="pkg-name"> - <?php - $userid = uid_from_sid($_COOKIE["AURSID"]); - user_table($userid); - ?> - </td> - </tr> - </table> - </div> - <?php endif; ?> </div> </div> <div id="content-right"> @@ -103,6 +89,11 @@ html_header( __("Home") ); <div id="pkg-stats" class="widget box"> <?php general_stats_table(); ?> </div> + <?php if (!empty($_COOKIE["AURSID"])): ?> + <div id="pkg-stats" class="widget box"> + <?php user_table(uid_from_sid($_COOKIE["AURSID"])); ?> + </div> + <?php endif; ?> </div> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> -- 2.0.1

1 0

[aur-dev] [PATCH] Fix "File Request" link in package base details
by Lukas Fleischer 01 Jul '14

01 Jul '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkgbase_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 1b40b84..2b92152 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -81,7 +81,7 @@ $pkgs = pkgbase_get_pkgnames($base_id); </form> </li> <?php endif; ?> - <li><a href="<?= get_pkgbase_uri($row['BaseName']) . 'request/'; ?>"><?= __('File Request'); ?></a></li> + <li><a href="<?= get_pkgbase_uri($row['Name']) . 'request/'; ?>"><?= __('File Request'); ?></a></li> <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <li><a href="<?= get_pkgbase_uri($row['Name']) . 'delete/'; ?>"><?= __('Delete Package'); ?></a></li> <li><a href="<?= get_pkgbase_uri($row['Name']) . 'merge/'; ?>"><?= __('Merge Package'); ?></a></li> -- 2.0.1

1 0

[aur-dev] [PATCH] Fix documentation of pkgreq_*() return types
by Lukas Fleischer 01 Jul '14

01 Jul '14

Reported-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgreqfuncs.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 47758c3..69ba08d 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -35,7 +35,7 @@ function pkgreq_list() { * @param string $merge_into The target of a merge operation * @param string $comments The comments to be added to the request * - * @return void + * @return array Tuple of success/failure indicator and error message */ function pkgreq_file($ids, $type, $merge_into, $comments) { global $AUR_LOCATION; @@ -127,7 +127,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { * @global string $AUR_REQUEST_ML The request notification mailing list * @param int $id The package request to close * - * @return void + * @return array Tuple of success/failure indicator and error message */ function pkgreq_close($id) { global $AUR_LOCATION; -- 2.0.1

1 1

[aur-dev] [PATCH] Be explicit about accepted requests in emails
by Lukas Fleischer 01 Jul '14

01 Jul '14

When sending notification emails after closing a request, be explicit about whether the request has been accepted or not. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgbase.php | 2 +- web/lib/pkgbasefuncs.inc.php | 4 ++-- web/lib/pkgreqfuncs.inc.php | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 6fdaf40..adc6118 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -99,7 +99,7 @@ if (check_token()) { } elseif (current_action("do_FileRequest")) { list($ret, $output) = pkgreq_file($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']); } elseif (current_action("do_CloseRequest")) { - list($ret, $output) = pkgreq_close($_POST['reqid']); + list($ret, $output) = pkgreq_close($_POST['reqid'], false); } if (isset($_REQUEST['comment'])) { diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 32c2d9b..0ee2c31 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -540,7 +540,7 @@ function pkgbase_delete ($atype, $base_ids, $merge_base_id, $via) { $dbh->exec($q); if ($via) { - pkgreq_close(intval($via)); + pkgreq_close(intval($via), true); } return array(true, __("The selected packages have been deleted.")); @@ -598,7 +598,7 @@ function pkgbase_adopt ($atype, $base_ids, $action=true, $via) { $dbh->exec($q); if ($via) { - pkgreq_close(intval($via)); + pkgreq_close(intval($via), true); } if ($action) { diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 69ba08d..26d543e 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -126,10 +126,11 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { * @global string $AUR_LOCATION The AUR's URL used for notification e-mails * @global string $AUR_REQUEST_ML The request notification mailing list * @param int $id The package request to close + * @param bool $accepted True if the request has been accepted, false otherwise * * @return array Tuple of success/failure indicator and error message */ -function pkgreq_close($id) { +function pkgreq_close($id, $accepted) { global $AUR_LOCATION; global $AUR_REQUEST_ML; @@ -167,7 +168,9 @@ function pkgreq_close($id) { * user who posted the comment was in. */ $username = username_from_sid($_COOKIE['AURSID']); - $body = $username . " [1] closed request #" . intval($id) . ".\n\n" . + $body = "Request #" . intval($id) . " has been " . + ($accepted ? "accepted" : "closed") . " by " . + $username . " [1].\n\n" . "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n"; $body = wordwrap($body, 70); $headers = "MIME-Version: 1.0\r\n" . -- 2.0.1

1 0