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

[aur-dev] [PATCH] Do not allow regular users to edit all accounts
by Lukas Fleischer 25 Jul '14

25 Jul '14

Fixes a regression introduced in 03c6304 (Rework permission handling, 2014-07-15). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 943e80b..6232f83 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -1123,6 +1123,6 @@ function can_edit_account($acctinfo) { return has_credential(CRED_ACCOUNT_EDIT_DEV); } - $uid = uid_from_sid($_COOKIE['AURSID']); + $uid = $acctinfo['ID']; return has_credential(CRED_ACCOUNT_EDIT, array($uid)); } -- 2.0.2

1 0

[aur-dev] [PATCH 1/2] Clean up user references in user_delete()
by Lukas Fleischer 25 Jul '14

25 Jul '14

Explicitly clean up all references before deleting a user. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/acctfuncs.inc.php | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 73d01a5..943e80b 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -829,6 +829,41 @@ function user_suspended($id) { */ function user_delete($id) { $dbh = DB::connect(); + $id = intval($id); + + /* + * These are normally already taken care of by propagation constraints + * but it is better to be explicit here. + */ + $fields_delete = array( + array("Sessions", "UsersID"), + array("PackageVotes", "UsersID"), + array("CommentNotify", "UsersID") + ); + + $fields_set_null = array( + array("PackageBases", "SubmitterUID"), + array("PackageBases", "MaintainerUID"), + array("PackageBases", "SubmitterUID"), + array("PackageComments", "UsersID"), + array("PackageComments", "DelUsersID"), + array("PackageRequests", "UsersID"), + array("TU_VoteInfo", "SubmitterID"), + array("TU_Votes", "UserID") + ); + + foreach($fields_delete as list($table, $field)) { + $q = "DELETE FROM " . $table . " "; + $q.= "WHERE " . $field . " = " . $id; + $dbh->query($q); + } + + foreach($fields_set_null as list($table, $field)) { + $q = "UPDATE " . $table . " SET " . $field . " = NULL "; + $q.= "WHERE " . $field . " = " . $id; + $dbh->query($q); + } + $q = "DELETE FROM Users WHERE ID = " . $id; $dbh->query($q); return; -- 2.0.2

1 1

[aur-dev] [PATCH] po/POTFILES: Remove pkgbuild-parser.inc.php
by Lukas Fleischer 23 Jul '14

23 Jul '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- po/POTFILES | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES b/po/POTFILES index a37384e..1b4d6a6 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -27,7 +27,6 @@ lib/DB.class.php lib/feedcreator.class.php lib/gettext.php lib/pkgbasefuncs.inc.php -lib/pkgbuild-parser.inc.php lib/pkgfuncs.inc.php lib/pkgreqfuncs.inc.php lib/routing.inc.php -- 2.0.2

1 0

[aur-dev] [PATCH] Prevent from merging a package base with itself
by Lukas Fleischer 23 Jul '14

23 Jul '14

Instead of deleting the package, show an error message if a user tries to merge a package base with itself. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgbase.php | 11 +++++++---- web/lib/pkgreqfuncs.inc.php | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 4f35a67..691639c 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -69,12 +69,15 @@ if (check_token()) { } else { $merge_base_id = pkgbase_from_name($_POST['merge_Into']); - if ($merge_base_id) { - list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); - unset($_GET['ID']); - } else { + if (!$merge_base_id) { $output = __("Cannot find package to merge votes and comments into."); $ret = false; + } elseif (in_array($merge_base_id, $ids)) { + $output = __("Cannot merge a package base with itself."); + $ret = false; + } else { + list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); + unset($_GET['ID']); } } } diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 41d1515..8fba838 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -110,6 +110,10 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $base_id = intval($ids[0]); $pkgbase_name = pkgbase_name_from_id($base_id); + if ($merge_into == $pkgbase_name) { + return array(false, __("Cannot merge a package base with itself.")); + } + $q = "SELECT ID FROM RequestTypes WHERE Name = " . $dbh->quote($type); $result = $dbh->query($q); if ($row = $result->fetch(PDO::FETCH_ASSOC)) { -- 2.0.2

1 0

[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