[aur-dev] [PATCH 1/6] Add support for filing package requests

Florian Pritz bluewind at xinu.at
Tue Jul 1 12:50:33 EDT 2014


On 25.06.2014 11:44, Lukas Fleischer wrote:
> Add a new entry to the package actions box that allows for filing
> deletion and orphan requests. When choosing that action, the user is
> redirected to a new page that allows for selecting a request type and
> entering a comment. When submitting the request, a new entry in the
> request database is created and an email is sent to a configurable
> mailing list (defaults to aur-general).
> 
> Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
> ---
>  UPGRADING                        | 31 ++++++++++++++
>  schema/aur-schema.sql            | 28 +++++++++++++
>  web/html/index.php               |  3 ++
>  web/html/pkgbase.php             |  2 +
>  web/html/pkgreq.php              | 55 +++++++++++++++++++++++++
>  web/lib/config.inc.php.proto     |  3 ++
>  web/lib/pkgbasefuncs.inc.php     | 88 ++++++++++++++++++++++++++++++++++++++++
>  web/template/pkg_details.php     |  1 +
>  web/template/pkgbase_details.php |  1 +
>  9 files changed, 212 insertions(+)
>  create mode 100644 web/html/pkgreq.php
> 
> [..]
>
> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
> index 9f80ef2..a9fe949 100644
> --- a/web/lib/pkgbasefuncs.inc.php
> +++ b/web/lib/pkgbasefuncs.inc.php
> @@ -962,3 +962,91 @@ function pkgbase_update_category($base_id, $category_id) {
>  		$category_id, $base_id);
>  	$dbh->exec($q);
>  }
> +
> +/**
> + * File a deletion/orphan request against a package base
> + *
> + * @global string $AUR_LOCATION The AUR's URL used for notification e-mails
> + * @global string $AUR_REQUEST_ML The request notification mailing list
> + * @param string $ids The package base IDs to file the request against
> + * @param string $type The type of the request
> + * @param string $comments The comments to be added to the request
> + *
> + * @return void
> + */
> +function pkgbase_file_request($ids, $type, $comments) {
> +	global $AUR_LOCATION;
> +	global $AUR_REQUEST_ML;
> +
> +	if (empty($comments)) {
> +		return array(false, __("The comment field must not be empty."));
> +	}
> +
> +	$dbh = DB::connect();
> +	$uid = uid_from_sid($_COOKIE["AURSID"]);
> +
> +	/* TODO: Allow for filing multiple requests at once. */
> +	$base_id = $ids[0];
> +	$pkgbase_name = pkgbase_name_from_id($base_id);
> +
> +	$q = "SELECT ID FROM RequestTypes WHERE Name = " . $dbh->quote($type);
> +	$result = $dbh->query($q);
> +	if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
> +		$type_id = $row['ID'];
> +	} else {
> +		return array(false, __("Invalid request type."));
> +	}
> +
> +	$q = "INSERT INTO PackageRequests ";
> +	$q.= "(ReqTypeID, PackageBaseID, PackageBaseName, UsersID, ";
> +	$q.= "Comments, RequestTS) VALUES (" . $type_id . ", ";
> +	$q.= intval($base_id) . ", " .  $dbh->quote($pkgbase_name) . ", ";
> +	$q.= $uid . ", " . $dbh->quote($comments) . ", UNIX_TIMESTAMP())";
> +	$dbh->exec($q);
> +
> +	/*
> +	 * Send e-mail notifications.
> +	 * TODO: Move notification logic to separate function where it belongs.
> +	 */
> +	$q = "SELECT Users.Email ";
> +	$q.= "FROM Users INNER JOIN PackageBases ";
> +	$q.= "ON PackageBases.MaintainerUID = Users.ID ";
> +	$q.= "WHERE PackageBases.ID = " . intval($base_id);
> +	$result = $dbh->query($q);
> +	if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
> +		$bcc = $row['Email'];
> +	} else {
> +		unset($bcc);
> +	}
> +
> +	$q = "SELECT Name FROM PackageBases WHERE ID = ";
> +	$q.= intval($base_id);
> +	$result = $dbh->query($q);
> +	$row = $result->fetch(PDO::FETCH_ASSOC);
> +
> +	/*
> +	 * TODO: Add native language emails for users, based on their
> +	 * preferences. Simply making these strings translatable won't
> +	 * work, users would be getting emails in the language that the
> +	 * user who posted the comment was in.
> +	 */
> +	$username = username_from_sid($_COOKIE['AURSID']);
> +	$body =
> +		$username . " [1] filed a " . $type . " request for " .
> +		$row['Name'] . " [2]:\n\n" . $comments . "\n\n" .
> +		"[1] " . $AUR_LOCATION . get_user_uri($username) . "\n" .
> +		"[2] " . $AUR_LOCATION . get_pkgbase_uri($row['Name']) . "\n";
> +	$body = wordwrap($body, 70);
> +	$headers = "MIME-Version: 1.0\r\n" .
> +		   "Content-type: text/plain; charset=UTF-8\r\n";
> +	if (!empty($bcc)) {
> +		$headers .= "Bcc: $bcc\r\n";
> +	}
> +	$headers .= "Reply-to: noreply at aur.archlinux.org\r\n" .
> +		    "From: notify at aur.archlinux.org\r\n" .
> +		    "X-Mailer: AUR";

Can you set a References header here so accept requests generated via
the webui will be able to thread properly? Something like "References:
<request-$request_id at aur.archlinux.org>".

> +	@mail($AUR_REQUEST_ML, "AUR " . ucfirst($type) . " Request for " .
> +			       $row['Name'], $body, $headers);
> +
> +	return array(true, __("Added request successfully."));
> +}

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://mailman.archlinux.org/pipermail/aur-dev/attachments/20140701/497e0621/attachment-0001.asc>


More information about the aur-dev mailing list