- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add typeahead suggest to the merge request form
by Lukas Fleischer 23 Jul '14

23 Jul '14

Add the typeahead implementation we already use for the package search to the merge target text field. Instead of suggesting packages, suggest package base names. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgmerge.php | 17 +++++++++++++++++ web/lib/aurjson.class.php | 28 ++++++++++++++++++++++++++-- web/template/pkgreq_form.php | 13 +++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index 6a3b3c5..df97a2a 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -36,6 +36,23 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?php if (isset($_GET['via'])): ?> <input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" /> <?php endif; ?> + <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> + <script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script> + <script type="text/javascript"> + $(document).ready(function() { + $('#merge_Into').typeahead({ + source: function(query, callback) { + $.getJSON('<?= get_uri('/rpc'); ?>', {type: "suggest-pkgbase", arg: query}, function(data) { + callback(data); + }); + }, + matcher: function(item) { return true; }, + sorter: function(items) { return items; }, + menu: '<ul class="pkgsearch-typeahead"></ul>', + items: 20 + }).attr('autocomplete', 'off'); + }); + </script> <p><label for="merge_Into" ><?= __("Merge into:") ?></label> <input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" /></p> <p><input type="checkbox" name="confirm_Delete" value="1" /> diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 8187bef..b31143e 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -13,7 +13,8 @@ class AurJSON { private $dbh = false; private $version = 1; private static $exposed_methods = array( - 'search', 'info', 'multiinfo', 'msearch', 'suggest' + 'search', 'info', 'multiinfo', 'msearch', 'suggest', + 'suggest-pkgbase' ); private static $fields_v1 = array( 'Packages.ID', 'Packages.Name', @@ -74,7 +75,8 @@ class AurJSON { $this->dbh = DB::connect(); - $json = call_user_func(array(&$this, $http_data['type']), $http_data['arg']); + $type = str_replace('-', '_', $http_data['type']); + $json = call_user_func(array(&$this, $type), $http_data['arg']); $etag = md5($json); header("Etag: \"$etag\""); @@ -404,5 +406,27 @@ class AurJSON { return json_encode($result_array); } + + /* + * Get all package base names that start with $search. + * + * @param string $search Search string. + * + * @return string The JSON formatted response data. + */ + private function suggest_pkgbase($search) { + $query = 'SELECT Name FROM PackageBases WHERE Name LIKE ' . + $this->dbh->quote(addcslashes($search, '%_') . '%') . + ' ORDER BY Name ASC LIMIT 20'; + + $result = $this->dbh->query($query); + $result_array = array(); + + if ($result) { + $result_array = $result->fetchAll(PDO::FETCH_COLUMN, 0); + } + + return json_encode($result_array); + } } diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php index cc45f29..623c247 100644 --- a/web/template/pkgreq_form.php +++ b/web/template/pkgreq_form.php @@ -23,6 +23,7 @@ </select> </p> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> + <script type="text/javascript" src="/js/bootstrap-typeahead.min.js"></script> <script type="text/javascript"> function showHideMergeSection() { if ($('#id_type').val() == 'merge') { @@ -34,6 +35,18 @@ $(document).ready(function() { showHideMergeSection(); + + $('#id_merge_into').typeahead({ + source: function(query, callback) { + $.getJSON('<?= get_uri('/rpc'); ?>', {type: "suggest-pkgbase", arg: query}, function(data) { + callback(data); + }); + }, + matcher: function(item) { return true; }, + sorter: function(items) { return items; }, + menu: '<ul class="pkgsearch-typeahead"></ul>', + items: 20 + }).attr('autocomplete', 'off'); }); </script> <p id="merge_section"> -- 2.0.2

1 0

[aur-dev] [PATCH] pkgreq_results.php: Only show non-empty merge targets
by Lukas Fleischer 23 Jul '14

23 Jul '14

In the column that contains the merge target, only display the parentheses if the merge target is a non-empty string. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkgreq_results.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 2898bd5..5e64476 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -40,7 +40,12 @@ <td><?= htmlspecialchars($row["Name"]) ?></td> <?php endif; ?> <?php if ($row['Type'] == 'merge'): ?> - <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?> (<?= htmlspecialchars($row['MergeInto'], ENT_QUOTES); ?>)</td> + <td> + <?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?> + <?php if (!empty($row['MergeInto'])): ?> + (<?= htmlspecialchars($row['MergeInto'], ENT_QUOTES); ?>) + <?php endif; ?> + </td> <?php else: ?> <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?></td> <?php endif; ?> -- 2.0.2

1 0

[aur-dev] [PATCH] Verify that the target of merge operations exists
by Lukas Fleischer 23 Jul '14

23 Jul '14

Make sure that the target of a merge operation is either empty or an existing package base name. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgreqfuncs.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 5b86eaa..41d1515 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -95,6 +95,10 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { return array(false, __("Invalid name: only lowercase letters are allowed.")); } + if (!empty($merge_into) && !pkgbase_from_name($merge_into)) { + return array(false, __("Cannot find package to merge votes and comments into.")); + } + if (empty($comments)) { return array(false, __("The comment field must not be empty.")); } -- 2.0.2

1 0

[aur-dev] Fix for some plural strings
by Safa Alfulaij 23 Jul '14

23 Jul '14

This is a patch to fix some strings that are not in plural. Hope you can add some comments to "It must be between %s and %s characters long" string parts so that the translator can understand whats going on. Also I didn't check if the var. is a number or a string. Patch attached. Regards, Safa

5 10

[aur-dev] [PATCH] Drop support for source packages without .AURINFO
by Lukas Fleischer 23 Jul '14

23 Jul '14

Disallow uploading source tarballs that do not contain .AURINFO. Also, drop the PKGBUILD parser which is no longer needed. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 30 ++------- web/lib/pkgbuild-parser.inc.php | 139 ---------------------------------------- 2 files changed, 4 insertions(+), 165 deletions(-) delete mode 100644 web/lib/pkgbuild-parser.inc.php diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index f07580b..7d89425 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -24,7 +24,6 @@ if ($uid): # Track upload errors $error = ""; - $ignore_missing_aurinfo = 0; if (isset($_REQUEST['pkgsubmit'])) { @@ -117,18 +116,14 @@ if ($uid): $error = __("Error - source tarball may not contain files outside a directory."); } - if (empty($pkgbuild_raw)) { - $pkgbuild_raw = ''; - if (!$error) { - $error = __("Error trying to unpack upload - PKGBUILD does not exist."); - } + if (empty($pkgbuild_raw) && !$error) { + $error = __("Error trying to unpack upload - PKGBUILD does not exist."); } if (empty($srcinfo_raw)) { $srcinfo_raw = ''; - if (!$error && (!isset($_POST['ignore_missing_aurinfo']) || $_POST['ignore_missing_aurinfo'] != 1)) { - $ignore_missing_aurinfo = 1; - $error = __("The source package does not contain any meta data. Please use `mkaurball` to create AUR source packages. Support for source packages without .AURINFO entries will be removed in an upcoming release! You can resubmit the package if you want to proceed anyway."); + if (!$error) { + $error = __("The source package does not contain any meta data. Please use `mkaurball` to create AUR source packages."); } } @@ -193,22 +188,6 @@ if ($uid): } elseif (isset($section_info['pkgname'])) { $pkginfo[] = array_pkgbuild_merge($pkgbase_info, $section_info); } - } else { - /* Use data from the PKGBUILD parser (deprecated!) */ - include('pkgbuild-parser.inc.php'); - - $pkgbase_info = $new_pkgbuild; - if (!isset($pkgbase_info['pkgbase'])) { - $pkgbase_info['pkgbase'] = $pkgbase_info['pkgname']; - } - foreach (array('license', 'groups', 'source', 'depends', 'makedepends', 'checkdepends', 'optdepends', 'conflicts', 'provides', 'replaces') as $array_opt) { - if (empty($pkgbase_info[$array_opt])) { - $pkgbase_info[$array_opt] = array(); - } else { - $pkgbase_info[$array_opt] = explode(" ", $pkgbase_info[$array_opt]); - } - } - $pkginfo[] = $pkgbase_info; } /* Validate package base name. */ @@ -437,7 +416,6 @@ html_header("Submit"); <fieldset> <div> <input type="hidden" name="pkgsubmit" value="1" /> - <input type="hidden" name="ignore_missing_aurinfo" value="<?= $ignore_missing_aurinfo ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> <p> diff --git a/web/lib/pkgbuild-parser.inc.php b/web/lib/pkgbuild-parser.inc.php deleted file mode 100644 index e112a55..0000000 --- a/web/lib/pkgbuild-parser.inc.php +++ /dev/null @@ -1,139 +0,0 @@ -<?php -if (!$error) { - # process PKGBUILD - remove line concatenation - # - $pkgbuild = array(); - $line_no = 0; - $lines = array(); - $continuation_line = 0; - $current_line = ""; - $paren_depth = 0; - foreach (explode("\n", $pkgbuild_raw) as $line) { - $line = trim($line); - # Remove comments - $line = preg_replace('/\s*#.*/', '', $line); - - $char_counts = count_chars($line, 0); - $paren_depth += $char_counts[ord('(')] - $char_counts[ord(')')]; - if (substr($line, strlen($line)-1) == "\\") { - # continue appending onto existing line_no - # - $current_line .= substr($line, 0, strlen($line)-1); - $continuation_line = 1; - } elseif ($paren_depth > 0) { - # assumed continuation - # continue appending onto existing line_no - # - $current_line .= $line . " "; - $continuation_line = 1; - } else { - # maybe the last line in a continuation, or a standalone line? - # - if ($continuation_line) { - # append onto existing line_no - # - $current_line .= $line; - $lines[$line_no] = $current_line; - $current_line = ""; - } else { - # it's own line_no - # - $lines[$line_no] = $line; - } - $continuation_line = 0; - $line_no++; - } - } - - # Now process the lines and put any var=val lines into the - # 'pkgbuild' array. - while (list($k, $line) = each($lines)) { - # Neutralize parameter substitution - $line = preg_replace('/\${(\w+)#(\w*)}?/', '$1$2', $line); - - $lparts = Array(); - # Match variable assignment only. - if (preg_match('/^\s*[_\w]+=[^=].*/', $line, $matches)) { - $lparts = explode("=", $matches[0], 2); - } - - if (!empty($lparts)) { - # this is a variable/value pair, strip - # out array parens and any quoting, - # except in pkgdesc for pkgname or - # pkgdesc, only remove start/end pairs - # of " or ' - if ($lparts[0] == "pkgname" || $lparts[0] == "pkgdesc") { - if ($lparts[1]{0} == '"' && - $lparts[1]{strlen($lparts[1])-1} == '"') { - $pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1); - } - elseif - ($lparts[1]{0} == "'" && - $lparts[1]{strlen($lparts[1])-1} == "'") { - $pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1); - } else { - $pkgbuild[$lparts[0]] = $lparts[1]; - } - } else { - $pkgbuild[$lparts[0]] = str_replace(array("(",")","\"","'"), "", - $lparts[1]); - } - } - } - - # some error checking on PKGBUILD contents - just make sure each - # variable has a value. This does not do any validity checking - # on the values, or attempts to fix line continuation/wrapping. - $req_vars = array("url", "pkgdesc", "license", "pkgrel", "pkgver", "arch", "pkgname"); - foreach ($req_vars as $var) { - if (!array_key_exists($var, $pkgbuild)) { - $error = __('Missing %s variable in PKGBUILD.', $var); - break; - } - } -} - -# Now, run through the pkgbuild array, and do "eval" and simple substituions. -$new_pkgbuild = array(); -if (!$error) { - while (list($k, $v) = each($pkgbuild)) { - if (strpos($k,'eval ') !== false) { - $k = preg_replace('/^eval[\s]*/', "", $k); - ##"eval" replacements - $pattern_eval = '/{\$({?)([\w]+)(}?)}/'; - while (preg_match($pattern_eval,$v,$regs)) { - $pieces = explode(",",$pkgbuild["$regs[2]"]); - ## nongreedy matching! - preserving the order of "eval" - $pattern = '/([\S]*?){\$'.$regs[1].$regs[2].$regs[3].'}([\S]*)/'; - while (preg_match($pattern,$v,$regs_replace)) { - $replacement = ""; - for ($i = 0; $i < sizeof($pieces); $i++) { - $replacement .= $regs_replace[1].$pieces[$i].$regs_replace[2]." "; - } - $v=preg_replace($pattern, $replacement, $v, 1); - } - } - } - - # Simple variable replacement - $pattern_var = '/\$({?)([_\w]+)(}?)/'; - $offset = 0; - while (preg_match($pattern_var, $v, $regs, PREG_OFFSET_CAPTURE, $offset)) { - $var = $regs[2][0]; - $pos = $regs[0][1]; - $len = strlen($regs[0][0]); - - if (isset($new_pkgbuild[$var])) { - $replacement = substr($new_pkgbuild[$var], strpos($new_pkgbuild[$var], " ")); - } - else { - $replacement = ''; - } - - $v = substr_replace($v, $replacement, $pos, $len); - $offset = $pos + strlen($replacement); - } - $new_pkgbuild[$k] = $v; - } -} -- 2.0.2

1 0

[aur-dev] [PATCH] Automatically accept orphan requests for old packages
by Lukas Fleischer 17 Jul '14

17 Jul '14

If an orphan request is filed for a package that has been flagged out-of-date for at least 180 days, it is disowned automatically. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/config.inc.php.proto | 5 +++++ web/lib/pkgreqfuncs.inc.php | 49 +++++++++++++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/web/lib/config.inc.php.proto b/web/lib/config.inc.php.proto index cb71fa5..62421ec 100644 --- a/web/lib/config.inc.php.proto +++ b/web/lib/config.inc.php.proto @@ -65,3 +65,8 @@ $AUR_REQUEST_ML = "aur-requests(a)archlinux.org"; # Time to wait until a package request is due. $REQUEST_IDLE_TIME = 60 * 60 * 24 * 14; + +# When an orphan request is filed for a package that has been flagged +# out-of-date for the following number of seconds, it is disowned +# automatically. +$AUTO_ORPHAN_AGE = 60 * 60 * 24 * 180; diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index fcab648..5b86eaa 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -78,6 +78,7 @@ function pkgreq_get_creator_email($id) { * * @global string $AUR_LOCATION The AUR's URL used for notification e-mails * @global string $AUR_REQUEST_ML The request notification mailing list + * @global int $AUTO_ORPHAN_AGE The time to wait until auto-closing a request * @param string $ids The package base IDs to file the request against * @param string $type The type of the request * @param string $merge_into The target of a merge operation @@ -88,6 +89,7 @@ function pkgreq_get_creator_email($id) { function pkgreq_file($ids, $type, $merge_into, $comments) { global $AUR_LOCATION; global $AUR_REQUEST_ML; + global $AUTO_ORPHAN_AGE; if (!empty($merge_into) && !preg_match("/^[a-z0-9][a-z0-9\.+_-]*$/", $merge_into)) { return array(false, __("Invalid name: only lowercase letters are allowed.")); @@ -101,7 +103,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $uid = uid_from_sid($_COOKIE["AURSID"]); /* TODO: Allow for filing multiple requests at once. */ - $base_id = $ids[0]; + $base_id = intval($ids[0]); $pkgbase_name = pkgbase_name_from_id($base_id); $q = "SELECT ID FROM RequestTypes WHERE Name = " . $dbh->quote($type); @@ -115,7 +117,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $q = "INSERT INTO PackageRequests "; $q.= "(ReqTypeID, PackageBaseID, PackageBaseName, MergeBaseName, "; $q.= "UsersID, Comments, RequestTS) VALUES (" . $type_id . ", "; - $q.= intval($base_id) . ", " . $dbh->quote($pkgbase_name) . ", "; + $q.= $base_id . ", " . $dbh->quote($pkgbase_name) . ", "; $q.= $dbh->quote($merge_into) . ", " . $uid . ", "; $q.= $dbh->quote($comments) . ", UNIX_TIMESTAMP())"; $dbh->exec($q); @@ -130,14 +132,13 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $q = "SELECT Users.Email "; $q.= "FROM Users INNER JOIN PackageBases "; $q.= "ON PackageBases.MaintainerUID = Users.ID "; - $q.= "WHERE PackageBases.ID = " . intval($base_id); + $q.= "WHERE PackageBases.ID = " . $base_id; $result = $dbh->query($q); if ($row = $result->fetch(PDO::FETCH_ASSOC)) { $cc[] = $row['Email']; } - $q = "SELECT Name FROM PackageBases WHERE ID = "; - $q.= intval($base_id); + $q = "SELECT Name FROM PackageBases WHERE ID = " . $base_id; $result = $dbh->query($q); $row = $result->fetch(PDO::FETCH_ASSOC); @@ -175,6 +176,19 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { " Request for " . $row['Name'], $body, $headers); + $details = pkgbase_get_details($base_id); + if ($type == 'orphan' && $details['OutOfDateTS'] > 0 && + time() - $details['OutOfDateTS'] >= $AUTO_ORPHAN_AGE && + $AUTO_ORPHAN_AGE > 0) { + $q = "UPDATE PackageBases SET MaintainerUID = NULL "; + $q.= "WHERE ID = " . $base_id; + $dbh->exec($q); + $out_of_date_time = gmdate("Y-m-d", intval($details["OutOfDateTS"])); + pkgreq_close($request_id, "accepted", + "The package base has been flagged out-of-date " . + "since " . $out_of_date_time . ".", true); + } + return array(true, __("Added request successfully.")); } @@ -186,10 +200,11 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { * @param int $id The package request to close * @param string $reason Whether the request was accepted or rejected * @param string $comments Comments to be added to the notification email + * @param boolean $auto_close (optional) Whether the request is auto-closed * * @return array Tuple of success/failure indicator and error message */ -function pkgreq_close($id, $reason, $comments) { +function pkgreq_close($id, $reason, $comments, $auto_close=false) { global $AUR_LOCATION; global $AUR_REQUEST_ML; @@ -238,15 +253,25 @@ function pkgreq_close($id, $reason, $comments) { * 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 = "Request #" . intval($id) . " has been " . $reason . " by " . - $username . " [1]"; + if ($auto_close) { + $body = "Request #" . intval($id) . " has been " . $reason . + " automatically by the Arch User Repository package " . + "request system"; + } else { + $username = username_from_sid($_COOKIE['AURSID']); + $body = "Request #" . intval($id) . " has been " . $reason . + " by " . $username . " [1]"; + } if (!empty(trim($comments))) { - $body .= ":\n\n" . $comments . "\n\n"; + $body .= ":\n\n" . $comments . "\n"; } else { - $body .= ".\n\n"; + $body .= ".\n"; + } + if (!$auto_close) { + $body .= "\n"; + $body .= "[1] " . $AUR_LOCATION . get_user_uri($username); + $body .= "\n"; } - $body .= "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n"; $body = wordwrap($body, 70); $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/plain; charset=UTF-8\r\n" . -- 2.0.1

1 0

[aur-dev] [PATCH] Fix pkgbase_votes_from_name()
by Lukas Fleischer 16 Jul '14

16 Jul '14

In 676595f (Prefix package functions with pkg_/pkgbase_, 2014-04-05), votes_for_pkgname() was renamed to pkgbase_votes_from_name() without changing the semantics. Slightly adapt the implementation and interpret the argument as a package base name instead of a package name. Also fix the call site. Reported-by: Felix Yan <felixonmars(a)gmail.com> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/voters.php | 8 ++++---- web/lib/pkgbasefuncs.inc.php | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/web/html/voters.php b/web/html/voters.php index 8766fa7..b0753b9 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -1,11 +1,11 @@ <?php set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include_once('aur.inc.php'); -include_once('pkgfuncs.inc.php'); +include_once('pkgbasefuncs.inc.php'); $SID = $_COOKIE['AURSID']; -$pkgname = htmlspecialchars($_GET['N']); -$votes = pkgbase_votes_from_name($pkgname); +$pkgbase_name = htmlspecialchars($_GET['N']); +$votes = pkgbase_votes_from_name($pkgbase_name); html_header(__("Voters")); @@ -13,7 +13,7 @@ if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?> <div class="box"> - <h2>Votes for <a href="<?= get_pkg_uri($pkgname); ?>"><?= $pkgname ?></a></h2> + <h2>Votes for <a href="<?= get_pkgbase_uri($pkgbase_name); ?>"><?= $pkgbase_name ?></a></h2> <div class="boxbody"> <ul> <?php while (list($indx, $row) = each($votes)): ?> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 176b144..0d6b22b 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -683,19 +683,20 @@ function pkgbase_vote ($base_ids, $action=true) { } /** - * Get all usernames and IDs that voted for a specific package + * Get all usernames and IDs that voted for a specific package base * - * @param string $pkgname The name of the package to retrieve votes for + * @param string $pkgbase_name The package base to retrieve votes for * - * @return array User IDs and usernames that voted for a specific package + * @return array User IDs and usernames that voted for a specific package base */ -function pkgbase_votes_from_name($pkgname) { +function pkgbase_votes_from_name($pkgbase_name) { $dbh = DB::connect(); - $q = "SELECT UsersID,Username,Name FROM PackageVotes "; - $q.= "LEFT JOIN Users on (UsersID = Users.ID) "; - $q.= "LEFT JOIN Packages on (PackageVotes.PackageBaseID = Packages.PackageBaseID) "; - $q.= "WHERE Name = ". $dbh->quote($pkgname) . " "; + $q = "SELECT UsersID, Username, Name FROM PackageVotes "; + $q.= "LEFT JOIN Users ON UsersID = Users.ID "; + $q.= "LEFT JOIN PackageBases "; + $q.= "ON PackageVotes.PackageBaseID = PackageBases.ID "; + $q.= "WHERE PackageBases.Name = ". $dbh->quote($pkgbase_name) . " "; $q.= "ORDER BY Username"; $result = $dbh->query($q); -- 2.0.1

1 0

[aur-dev] [PATCH 1/3] Bcc notification emails to the request creator
by Lukas Fleischer 16 Jul '14

16 Jul '14

Add both the request creator and the current package maintainer to the Bcc list of notification emails for package requests. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgreqfuncs.inc.php | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 09047eb..61d619b 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -57,6 +57,23 @@ function pkgreq_get_pkgbase_name($id) { } /** + * Obtain the email address of the creator of a package request + * + * @param int $id Package request ID to retrieve the creator for + * + * @return int The email address of the creator + */ +function pkgreq_get_creator_email($id) { + $dbh = DB::connect(); + + $q = "SELECT Email FROM Users INNER JOIN PackageRequests "; + $q.= "ON Users.ID = PackageRequests.UsersID "; + $q.= "WHERE PackageRequests.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 @@ -108,15 +125,15 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { * Send e-mail notifications. * TODO: Move notification logic to separate function where it belongs. */ + $bcc = array(pkgreq_get_creator_email($request_id)); + $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); + $bcc[] = $row['Email']; } $q = "SELECT Name FROM PackageBases WHERE ID = "; @@ -138,10 +155,8 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { "[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"; - } + "Content-type: text/plain; charset=UTF-8\r\n" . + "Bcc: " . implode(', ', $bcc) . "\r\n"; $thread_id = "<pkg-request-" . $request_id . "@aur.archlinux.org>"; $headers .= "From: notify(a)aur.archlinux.org\r\n" . "Message-ID: $thread_id\r\n" . @@ -194,6 +209,8 @@ function pkgreq_close($id, $reason, $comments) { * Send e-mail notifications. * TODO: Move notification logic to separate function where it belongs. */ + $bcc = array(pkgreq_get_creator_email($id)); + $q = "SELECT Users.Email "; $q.= "FROM Users INNER JOIN PackageBases "; $q.= "ON PackageBases.MaintainerUID = Users.ID "; @@ -202,9 +219,7 @@ function pkgreq_close($id, $reason, $comments) { $q.= "WHERE PackageRequests.ID = " . $id; $result = $dbh->query($q); if ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $bcc = $row['Email']; - } else { - unset($bcc); + $bcc[] = $row['Email']; } /* @@ -224,10 +239,8 @@ function pkgreq_close($id, $reason, $comments) { $body .= "[1] " . $AUR_LOCATION . get_user_uri($username) . "\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"; - } + "Content-type: text/plain; charset=UTF-8\r\n" . + "Bcc: " . implode(', ', $bcc) . "\r\n"; $thread_id = "<pkg-request-" . $id . "@aur.archlinux.org>"; $headers .= "From: notify(a)aur.archlinux.org\r\n" . "In-Reply-To: $thread_id\r\n" . -- 2.0.1

1 2

[aur-dev] [PATCH] Remove unused function pkg_details_by_name()
by Lukas Fleischer 16 Jul '14

16 Jul '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 29da97b..8c2a67d 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -729,30 +729,6 @@ function sanitize_ids($ids) { } /** - * Get all package information in the database for a specific package - * - * @param string $pkgname The name of the package to get details for - * - * @return array All package details for a specific package - */ -function pkg_details_by_name($pkgname) { - $dbh = DB::connect(); - $q = "SELECT Packages.*, PackageBases.Name AS BaseName, "; - $q.= "PackageBases.CategoryID, PackageBases.NumVotes, "; - $q.= "PackageBases.OutOfDateTS, PackageBases.SubmittedTS, "; - $q.= "PackageBases.ModifiedTS, PackageBases.SubmitterUID, "; - $q.= "PackageBases.MaintainerUID FROM Packages "; - $q.= "INNER JOIN PackageBases "; - $q.= "ON PackageBases.ID = Packages.PackageBaseID WHERE "; - $q.= "Packages.Name = " . $dbh->quote($pkgname); - $result = $dbh->query($q); - if ($result) { - $row = $result->fetch(PDO::FETCH_ASSOC); - } - return $row; -} - -/** * Add package information to the database for a specific package * * @param int $base_id ID of the package base -- 2.0.1

1 0

[aur-dev] [PATCH] mention aur-requests in home
by Johannes Dewender 15 Jul '14

15 Jul '14

According to [1] the ML aur-requests should be used for requests now and not aur-general. However, aur.archlinux.org still tells to use aur-general for requests. I am personally subscribed to aur-general, but I disable emails 1-2 weeks after my requests are accepted and enable only right before making a new request. According to [2] I am not the only package maintainer doing it like that. So my point is, that many people will only learn about this change when they are told after making a request on aur-general. [1]: https://mailman.archlinux.org/pipermail/aur-general/2014-June/028973.html [2]: https://bugs.archlinux.org/task/40982 web/html/home.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

3 9