- Aur-dev - lists.archlinux.org

[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

[aur-dev] [patch] Russian translation update
by Sergej Pupykin 28 May '09

28 May '09

Hi, This is russian translation update for aur

1 0

[aur-dev] Inactivity
by Loui Chang 29 Apr '09

29 Apr '09

Hey everyone. Next week I'm leaving for Taiwan for a month. I don't expect to be doing much for Arch for around two months though. So, I'll mark myself as inactive in the wiki. Of course, don't be afraid to poke at my packages if there's a need. Cheers!

2 1

[aur-dev] web lang patch
by supern lee 13 Apr '09

13 Apr '09

hi,all i have add the chinese text:cn.po the attachment is path. best regards. -Supern Lee

2 2

[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