- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Unmark out-of-date on update [for community]
by Andrea Scarpino 13 Apr '09

13 Apr '09

unflag manually annoying me -- Andrea `BaSh` Scarpino Arch Linux Developer

2 1

[aur-dev] [PATCH] Don't hit the database twice per comment on package
by Dan McGee 12 Apr '09

12 Apr '09

It's performance improvement day today. For non-superusers, we were hitting the database twice per comment on a package- once to get the UID, and once to check the owner of the comment. The best part is we already knew the owner of the comment, and we only need to get our own UID once. For viewing a package like yaourt, this cuts a single pageview from over 700 queries to around 18, which is still not great but a pretty big improvement. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/html/pkgedit.php | 4 ++-- web/lib/pkgfuncs.inc | 18 +++++++++++++++--- web/template/pkg_comments.php | 3 ++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index 3b1c825..5a711d0 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -35,9 +35,9 @@ if (!$_REQUEST["ID"]) { # if ($_REQUEST["del_Comment"]) { if ($_REQUEST["comment_id"]) { - if (canDeleteComment($_REQUEST["comment_id"], $atype, $_COOKIE["AURSID"])) { + $uid = uid_from_sid($_COOKIE["AURSID"]); + if (canDeleteComment($_REQUEST["comment_id"], $atype, $uid)) { $dbh = db_connect(); - $uid = uid_from_sid($_COOKIE["AURSID"]); $q = "UPDATE PackageComments "; $q.= "SET DelUsersID = ".$uid." "; $q.= "WHERE ID = ".intval($_REQUEST["comment_id"]); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 1c467ba..a4a2dfc 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -8,13 +8,11 @@ $pkgsearch_vars = array("O", "L", "C", "K", "SB", "SO", "PP", "do_Orphans", "SeB # Make sure this visitor can delete the requested package comment # They can delete if they were the comment submitter, or if they are a TU/Dev # -function canDeleteComment($comment_id=0, $atype="", $SID="") { +function canDeleteComment($comment_id=0, $atype="", $uid=0) { if ($atype == "Trusted User" || $atype == "Developer") { # A TU/Dev can delete any comment - # return TRUE; } - $uid = uid_from_sid($SID); $dbh = db_connect(); $q = "SELECT COUNT(ID) AS CNT "; $q.= "FROM PackageComments "; @@ -30,6 +28,20 @@ function canDeleteComment($comment_id=0, $atype="", $SID="") { return FALSE; } +# Make sure this visitor can delete the requested package comment +# They can delete if they were the comment submitter, or if they are a TU/Dev +# +function canDeleteCommentArray($comment, $atype="", $uid=0) { + if ($atype == "Trusted User" || $atype == "Developer") { + # A TU/Dev can delete any comment + return TRUE; + } else if ($comment['UsersID'] == $uid) { + # User's own comment + return TRUE; + } + return FALSE; +} + # see if this Users.ID can manage the package # function canManagePackage($uid=0,$AURMUID=0, $MUID=0, $SUID=0, $managed=0) { diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 20cd278..7c42ac1 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -1,8 +1,9 @@ <div class="pgbox"> <?php +$uid = uid_from_sid($SID); while (list($indx, $carr) = each($comments)) { ?> <div class="comment-header"><?php - if (canDeleteComment($carr['ID'], $atype, $SID)) { + if (canDeleteCommentArray($carr, $atype, $uid)) { $durl = '<a href="pkgedit.php?del_Comment=1'; $durl.= '&comment_id=' . $carr['ID'] . '&ID=' . $row['ID']; $durl.= '"><img src="images/x.png" border="0"'; -- 1.6.2.2

1 0

[aur-dev] [PATCH] Don't hit the database twice per comment on package
by Dan McGee 12 Apr '09

12 Apr '09

It's performance improvement day today. For non-superusers, we were hitting the database twice per comment on a package- once to get the UID, and once to check the owner of the comment. The best part is we already knew the owner of the comment, and we only need to get our own UID once. For viewing a package like yaourt, this cuts a single pageview from over 700 queries to around 18, which is still not great but a pretty big improvement. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/html/pkgedit.php | 4 ++-- web/lib/pkgfuncs.inc | 18 +++++++++++++++--- web/template/pkg_comments.php | 3 ++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index 3b1c825..b0ce1b2 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -35,9 +35,9 @@ if (!$_REQUEST["ID"]) { # if ($_REQUEST["del_Comment"]) { if ($_REQUEST["comment_id"]) { - if (canDeleteComment($_REQUEST["comment_id"], $atype, $_COOKIE["AURSID"])) { + $uid = uid_from_sid($_COOKIE["AURSID"]); + if (canDeleteComment($_REQUEST["comment_id"], $atype, $uid) { $dbh = db_connect(); - $uid = uid_from_sid($_COOKIE["AURSID"]); $q = "UPDATE PackageComments "; $q.= "SET DelUsersID = ".$uid." "; $q.= "WHERE ID = ".intval($_REQUEST["comment_id"]); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 1c467ba..faf3871 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -8,13 +8,11 @@ $pkgsearch_vars = array("O", "L", "C", "K", "SB", "SO", "PP", "do_Orphans", "SeB # Make sure this visitor can delete the requested package comment # They can delete if they were the comment submitter, or if they are a TU/Dev # -function canDeleteComment($comment_id=0, $atype="", $SID="") { +function canDeleteComment($comment_id=0, $atype="", $uid=0) { if ($atype == "Trusted User" || $atype == "Developer") { # A TU/Dev can delete any comment - # return TRUE; } - $uid = uid_from_sid($SID); $dbh = db_connect(); $q = "SELECT COUNT(ID) AS CNT "; $q.= "FROM PackageComments "; @@ -30,6 +28,20 @@ function canDeleteComment($comment_id=0, $atype="", $SID="") { return FALSE; } +# Make sure this visitor can delete the requested package comment +# They can delete if they were the comment submitter, or if they are a TU/Dev +# +function canDeleteCommentArray($comment, $atype="", $uid=0) { + if ($atype == "Trusted User" || $atype == "Developer") { + # A TU/Dev can delete any comment + return TRUE; + } else if ($comment['UsersID'] == $uid) { + # User's own comment + return TRUE: + } + return FALSE; +} + # see if this Users.ID can manage the package # function canManagePackage($uid=0,$AURMUID=0, $MUID=0, $SUID=0, $managed=0) { diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 20cd278..7c42ac1 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -1,8 +1,9 @@ <div class="pgbox"> <?php +$uid = uid_from_sid($SID); while (list($indx, $carr) = each($comments)) { ?> <div class="comment-header"><?php - if (canDeleteComment($carr['ID'], $atype, $SID)) { + if (canDeleteCommentArray($carr, $atype, $uid)) { $durl = '<a href="pkgedit.php?del_Comment=1'; $durl.= '&comment_id=' . $carr['ID'] . '&ID=' . $row['ID']; $durl.= '"><img src="images/x.png" border="0"'; -- 1.6.2.2

1 1

[aur-dev] [PATCH] Workaround for xml tag
by Andrea Scarpino 11 Apr '09

11 Apr '09

Hi again, if you enable short_open_tags in your php.ini, when you try to start AUR you will get an error: "Parse error: syntax error, unexpected T_STRING in ../aur/web/template/header.php on line 1" this because the server believes that <?xml is really <?php so it elaborates the code as php. A simple workaround for this problem is to add the xml code in a print() instruction. I'm sending this patch but I know probably this will be swerve because few people enable short_open_tags, anyway why not try ;) -- Andrea `BaSh` Scarpino Arch Linux Developer

4 3

[aur-dev] [PATCH] Added reCAPTCHA into registration form
by Andrea Scarpino 09 Apr '09

09 Apr '09

Hi, spam is starting a "war" again AUR [1], so we can reply with a captcha. I did a search, and the best captcha seems to be reCAPTCHA [2]. It's free code, but to use it we must register an user. I did it and patched AUR to use reCAPTCHA. Patch is attached (recaptcha php library also). I think we need a captcha for registration but absolute not for comments, we can suspend the account who do spam. [1] http://www.archlinux.org/pipermail/aur-general/2009-April/004540.html [2] http://recaptcha.net/ -- Andrea `BaSh` Scarpino Arch Linux Developer

1 0

Re: [aur-dev] Removing category field from AUR.
by Chris Giles 05 Apr '09

05 Apr '09

Hi Guys I only just joined this mailing list and I'm not sure that I can opt to receive past threads. Let's hope the server knows what to do with this email, which is a reply to earlier ones with the same subject. Loui Chang wrote: > In light of recent discussions I've been thinking of removing the category > data from AUR. I agree completely: the 'category' feature is a major pain in the arse, as there aren't enough of them and I dislike being stalled by something so unessential when updating a package. Sebastian Nowicki wrote: > A much better alternative is to use a tag style system. The tags would be > defined by the PKGBUILD, so it's much more flexible, and a single package > can have multiple tags. I changed categories to tags in AUR2. This is a great idea, but perhaps make it optional for PKGBUILDs. If each must have at least one tag, rebellious package maintainers might add a line like: tags=('screw-tags'). Chris

2 1

[aur-dev] Removing category field from AUR.
by Loui Chang 16 Mar '09

16 Mar '09

In light of recent discussions I've been thinking of removing the category data from AUR. My view is that descriptions should be sufficient for users to search to find what they need. If a description isn't sufficient then it should be rewritten until it works. The category just adds another search option that really only complicates things. Sorting by category is the only semi-useful contribution that it makes. Any opinions or examples where category actually can exceed a well written description is appreciated. Thanks!

2 1

[aur-dev] [PATCH] Fixed some errors/omissions in setup docs
by Mark Taylor 12 Mar '09

12 Mar '09

While setting up a local AUR branch for development, I noticed some problems in web/README. Here's a patch.

3 6

[aur-dev] Embed AUR on other website
by LTSMash . 03 Mar '09

03 Mar '09

Hi! I'm working on a new Arch-based distro, and I'd like to know if it's possible to embed AUR into another webpage, so that users of our distro have access to the same packages as Arch users do without having to show directly this website... this would be cool because all of our users would be somehow contributing directly to Arch without doubling efforts... Any suggestions will do. Thanks [image: big_smile] -- LTSmash

4 4

[aur-dev] [PATCH] added links at My Statistic values
by Andrea Scarpino 02 Mar '09

02 Mar '09

Code is more clear than my bad English. This need my previous[1] patch. [1] http://www.archlinux.org/pipermail/aur-dev/2009-February/000732.html -- Andrea `BaSh` Scarpino Arch Linux Developer

2 1