- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Auto-generate po/POTFILES
by Lukas Fleischer 27 Jul '14

27 Jul '14

Reduce maintenance costs by auto-generating po/POTFILES in the Makefile. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- .gitignore | 1 + po/Makefile | 7 +++++-- po/POTFILES | 58 ---------------------------------------------------------- 3 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 po/POTFILES diff --git a/.gitignore b/.gitignore index 11e9b7e..ed22497 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ dummy-data.sql* web/locale/*/ po/*.mo po/*.po~ +po/POTFILES diff --git a/po/Makefile b/po/Makefile index 97e1822..49eab32 100644 --- a/po/Makefile +++ b/po/Makefile @@ -44,7 +44,10 @@ all: ${MOFILES} lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ msgmerge -U --no-location --lang="$$lang" $< aur.pot -update-pot: +POTFILES: + find ../web -type f -name '*.php' -printf '%P\n' | sort >POTFILES + +update-pot: POTFILES pkgname=AUR; \ pkgver=`sed -n 's/.*"AUR_VERSION", "$.*$".*/\1/p' ../web/lib/version.inc.php`; \ xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \ @@ -57,7 +60,7 @@ update-po: ${MAKE} ${UPDATEPOFILES} clean: - rm -f *.mo *.po\~ + rm -f *.mo *.po\~ POTFILES install: all for l in ${LOCALES}; do mkdir -p ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/; done diff --git a/po/POTFILES b/po/POTFILES deleted file mode 100644 index 2b9322b..0000000 --- a/po/POTFILES +++ /dev/null @@ -1,58 +0,0 @@ -html/404.php -html/account.php -html/addvote.php -html/home.php -html/index.php -html/login.php -html/logout.php -html/packages.php -html/passreset.php -html/pkgbase.php -html/pkgdel.php -html/pkgmerge.php -html/pkgreq.php -html/pkgsubmit.php -html/rpc.php -html/rss.php -html/tu.php -html/voters.php -lib/acctfuncs.inc.php -lib/Archive/PEAR5.php -lib/Archive/PEAR.php -lib/Archive/Tar.php -lib/aur.inc.php -lib/aurjson.class.php -lib/cachefuncs.inc.php -lib/DB.class.php -lib/feedcreator.class.php -lib/gettext.php -lib/pkgbasefuncs.inc.php -lib/pkgfuncs.inc.php -lib/pkgreqfuncs.inc.php -lib/routing.inc.php -lib/stats.inc.php -lib/streams.php -lib/translator.inc.php -lib/version.inc.php -template/account_delete.php -template/account_details.php -template/account_edit_form.php -template/account_search_results.php -template/actions_form.php -template/footer.php -template/header.php -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 -template/stats/general_stats_table.php -template/stats/updates_table.php -template/stats/user_table.php -template/tu_details.php -template/tu_last_votes_list.php -template/tu_list.php -- 2.0.3

1 0

[aur-dev] [HEADS-UP] Meta data and split package support in the AUR
by Lukas Fleischer 27 Jul '14

27 Jul '14

Hello, I plan to do the next major AUR release by late May or June and I thought this might be a good time to let people know what is going on behind the scenes. AUR 3.0.0 will be able to read metadata from source packages. These metadata will be read from a file called .AURINFO (contained in the source tarball). Dave wrote several tools [1], including mkaurball which can be used to automatically build a source tarball with metadata so you don't need to worry about creating this file on your own. Having this information available means that: 1. We can drop the PKGBUILD parser from the AUR. The parser will still be available in the upcoming release but it will be marked as deprecated and a warning will be displayed whenever someone tries to upload a source tarball without metadata. 2. We can implement other things that were blocked by the AUR PKGBUILD parser being incomplete and inaccurate. Specifically, the next release will support split packages. Things that are on our TODO list: * Test the new AUR code. The split package code is still experimental. * Fix and extend the AUR RPC interface. * Test Dave's pkgbuild-introspection. * Move pkgbuild-introspection (or at least mkaurball) to [community]. It would also be nice to get metadata generation integrated into makepkg so that people no longer need to install mkaurball to generate source tarballs for the AUR. Regards, Lukas [1] https://github.com/falconindy/pkgbuild-introspection

1 1

[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