June 2009 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add confirmation to package deletion from packages page
by Callan Barrett 10 Jul '09

10 Jul '09

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 4 ++++ web/template/actions_form.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index a4a2dfc..80775a2 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -649,6 +649,10 @@ function pkg_delete ($atype, $ids) { return __("You must be logged in before you can disown packages."); } + if ($_POST['form_type'] == 'bar' && empty($_POST['confirm_del'])) { + return __("You need to confirm the deletion of this package."); + } + if (empty($ids)) { return __("You did not select any packages to delete."); } diff --git a/web/template/actions_form.php b/web/template/actions_form.php index de77645..c8a9964 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -1,5 +1,6 @@ <div class="pgbox"> <form action="packages.php?ID=<?php echo $row['ID'] ?>" method="post"> + <input type="hidden" name="form_type" value="bar"> <input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1'> <input type='hidden' name='ID' value="<?php echo $row['ID'] ?>"> <?php @@ -46,7 +47,8 @@ if ($row["MaintainerUID"] == 0) { if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Delete'"; - echo " value='".__("Delete Packages")."'>\n"; + echo " value='".__("Delete Packages")."'>"; + echo " <input type='checkbox' name='confirm_del'> <span class='f5'>" . __("Confirm delete?") . "</span>"; } ?> -- 1.6.0.4

2 1

[aur-dev] Moving the AUR/community
by Aaron Griffin 25 Jun '09

25 Jun '09

Hey all, This is part informational, and part not. We have a donated server from SevenL networks that has sat mostly unused up until now. What we would like to do is more the AUR and community on to that machine, so that TUs can get real (limited) shell accounts and the people managing this side of the project get a bit more control. As far as I know, things are almost ready to go, but what we need to do is setup a good time to "freeze" the AUR and community so we can switch over the DNS and change checkout locations. Once this is complete, we can move forward with switching community to SVN and using the official dbscripts for managing the repo. This way you guys can get your own testing repo too! Sooo... the list, as I see it: * Decide on a date and time for the move * Get SSH keys from all TUs * Switch DNS over * Disable the AUR/community on gerolde Anything I'm missing? Suggestions as to a good date?

2 1

[aur-dev] AUR Search
by Andrei Thorp 24 Jun '09

24 Jun '09

Hello there! Today, I'd like to be all complainy about the AUR search feature. I haven't really looked around, but are there plans to improve it? Or is the solution just "use google with site://"? It seems to be kind of bad at finding stuff. Some examples: - Can't search by description (well, it does search by description by default, but it's not in the advanced options anywhere) - Can't really do any decent multi-word searches afaik. To take an example from the other argument thread, try searching for "java gstreamer". It finds neither gstreamer-java nor java-gstreamer. It actually finds nothing at all. - Similarly, wildcards seem to not work. "java*gstreamer" has no results. - It seems to not even do exact matches first. For example, search for my package, "sup". There is a package in AUR that's exactly named "sup", but if you search for that, you get 658 results, sorted alphabetically! - Which reminds me, what about sorting by relevance somehow? Perhaps sort by a weighting of votes, age, downloads, etc. I'm sorry if I'm bringing this up as someone's already writing improvements for AUR and this is just a waste of time :) Anyway, thanks! Note: This is a forward of an e-mail that I sent to Arch-General previously. -- Andrei Thorp, Developer: Xandros Corp. (http://www.xandros.com) Anybody who doesn't cut his speed at the sight of a police car is probably parked.

2 1

[aur-dev] [patch] TU page submit button i18n and russian translation update
by Sergej Pupykin 18 Jun '09

18 Jun '09

Hi, Here are two patches: - Submit button i18n on add voting page - Russian translation small update

2 1

[aur-dev] [PATCH] Turn on package notification by default for new packages
by Callan Barrett 18 Jun '09

18 Jun '09

Version using package functions Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 78d6e50..450e9b6 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -328,6 +328,7 @@ if ($_COOKIE["AURSID"]): header('Location: packages.php?ID=' . $pdata['ID']); } else { + $uid = uid_from_sid($_COOKIE["AURSID"]); # This is a brand new package $q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, LocationID, SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', 2, UNIX_TIMESTAMP(), %d, %d, '%s', '%s')", @@ -338,8 +339,8 @@ if ($_COOKIE["AURSID"]): mysql_real_escape_string($_REQUEST['category']), mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), - uid_from_sid($_COOKIE["AURSID"]), - uid_from_sid($_COOKIE["AURSID"]), + $uid, + $uid, mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"), mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")); @@ -370,6 +371,8 @@ if ($_COOKIE["AURSID"]): $q .= $packageID . ", '" . mysql_real_escape_string($src) . "')"; db_query($q, $dbh); } + + pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID)); header('Location: packages.php?ID=' . $packageID); -- 1.6.0.2

2 1

[aur-dev] [patch] Advanced search i18n
by Sergej Pupykin 18 Jun '09

18 Jun '09

Hi, this is patch which internationalize "Advanced" link in package search.

2 3

[aur-dev] [PATCH 1/2] Add multicolumn indexes on votes and notifications tables
by Dan McGee 18 Jun '09

18 Jun '09

To put a long story short, when we do joins on these tables in our pkg_search_page() function, we always join on both the user ID and package ID columns. By creating multicolumn indices, we can always get the exact row we are looking for in the table. The benefits of adding a unique index should also speak for themselves, as we previously did not have this on either of these tables. This is part one of a two-part series to address the fact that this query was often showing up in our slow query logs. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- support/schema/aur-schema.sql | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 2a2a1a7..8d5c427 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -168,7 +168,7 @@ CREATE TABLE PackageVotes ( FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE ); - +CREATE UNIQUE INDEX VoteUsersIDPackageID ON PackageVotes (UsersID, PackageID); -- The individual files and their file system location. -- @@ -206,6 +206,7 @@ CREATE TABLE CommentNotify ( FOREIGN KEY (PkgID) REFERENCES Packages(ID) ON DELETE CASCADE, FOREIGN KEY (UserID) REFERENCES Users(ID) ON DELETE CASCADE ); +CREATE UNIQUE INDEX NotifyUserIDPkgID ON CommentNotify (UserID, PkgID); -- Vote information -- -- 1.6.2.2

4 9

[aur-dev] patch: FS#13122 - Comments are parsed during upload
by Gergely Imreh 18 Jun '09

18 Jun '09

Hi, Checking out the FS#13122 bug report (once again), it seems that the comments weren't removed early enough during package submission. That caused problem with the bracket matching. This should solve the issue. I tested with a few commented PKGBUILDs (and with the ones mentioned in the bug report), and seems to work. Cheers, Greg >From 72ff00dd84902802b43b2dd4859803a3ccc76334 Mon Sep 17 00:00:00 2001 From: Gergely Imreh <imrehg(a)gmail.com> Date: Sat, 30 May 2009 14:35:08 +0800 Subject: [PATCH] fix FS#13122 (again): removing comment removal as early as possible comments need to be removed before concatenating lines, otherwise not matched brackets can cause problems on submit Signed-off-by: Gergely Imreh <imrehg(a)gmail.com> --- web/html/pkgsubmit.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 383a769..b2c7c0e 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -77,6 +77,9 @@ if ($_COOKIE["AURSID"]): $paren_depth = 0; while (!feof($fp)) { $line = trim(fgets($fp)); + # 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) == "\\") { @@ -119,9 +122,6 @@ if ($_COOKIE["AURSID"]): # Neutralize parameter substitution $line = preg_replace('/\${(\w+)#(\w*)}?/', '$1$2', $line); - # Remove comments - $line = preg_replace('/\s*#.*/', '', $line); - $lparts = Array(); # Match variable assignment only. if (preg_match('/^\s*[_\w]+=[^=].*/', $line, $matches)) { -- 1.6.3.1

2 1