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

[aur-dev] [PATCH] Don't change tables manually before deleting a user
by Marcel Korpel 12 Jul '15

12 Jul '15

All this is correctly taken care of by the database. This fixes several bugs where records should be deleted instead of NULLified. For example, when a comment deleter's account was deleted, DelUsersID of the comment was (re)set to NULL, causing the comment to appear again. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/lib/acctfuncs.inc.php | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index edd38ee..e3cba37 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -927,39 +927,6 @@ 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.4.5

1 0

[aur-dev] [PATCH] use rel="nofollow" for links in comments
by Daniel Micay 12 Jul '15

12 Jul '15

This removes the incentive for spammers to post links by asking search engines to ignore them. Signed-off-by: Daniel Micay <danielmicay(a)gmail.com> --- web/lib/aur.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 7a455c6..b410db5 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -595,7 +595,7 @@ function parse_comment($comment) { if ($i % 2) { # convert links $html .= '<a href="' . htmlspecialchars($matches[$i]) . - '">' . htmlspecialchars($matches[$i]) . '</a>'; + '" rel="nofollow">' . htmlspecialchars($matches[$i]) . '</a>'; } else { # convert everything else -- 2.4.5

2 1

[aur-dev] [PATCH v2 0/3] Add support for markdown code blocks and inline code
by Marcel Korpel 12 Jul '15

12 Jul '15

Only a subset of markdown is support, i.e.: ``` code blocks ``` and `inline code`. Marcel Korpel (3): Add horizontal scrollbar to code blocks when necessary Use a normal font size for code blocks Convert markdown codeblocks and inline code to HTML web/html/css/aurweb.css | 5 ++++ web/lib/aur.inc.php | 74 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 14 deletions(-) -- 2.4.5

1 5

[aur-dev] [PATCH 0/4] Add support for markdown code blocks and inline code
by Marcel Korpel 11 Jul '15

11 Jul '15

Only a subset of markdown is support, i.e.: ``` code blocks ``` and `inline code`. Marcel Korpel (4): Convert markdown codeblocks to HTML code blocks Add support for markdown inline code Add horizontal scrollbar to code blocks when necessary Use a normal font size for code blocks web/html/css/aurweb.css | 5 ++++ web/lib/aur.inc.php | 78 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 73 insertions(+), 10 deletions(-) -- 2.4.5

2 7

[aur-dev] [PATCH 1/2] Create missing foreign key for comments
by Marcel Korpel 11 Jul '15

11 Jul '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- schema/aur-schema.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 3aef7a3..444cb5e 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -261,6 +261,7 @@ CREATE TABLE PackageComments ( INDEX (UsersID), INDEX (PackageBaseID), FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE SET NULL, + FOREIGN KEY (EditedUsersID) REFERENCES Users(ID) ON DELETE SET NULL, FOREIGN KEY (DelUsersID) REFERENCES Users(ID) ON DELETE CASCADE, FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE CASCADE ) ENGINE = InnoDB; -- 2.4.5

1 2

[aur-dev] [PATCH] Jump to latest comments after adding a comment
by Marcel Korpel 11 Jul '15

11 Jul '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/pkgbase.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 65077b3..1581869 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -109,6 +109,7 @@ if (check_token()) { $uid = uid_from_sid($_COOKIE["AURSID"]); pkgbase_add_comment($base_id, $uid, $_REQUEST['comment']); $ret = true; + $fragment = '#news'; } elseif (current_action("do_EditComment")) { list($ret, $output) = pkgbase_edit_comment($_REQUEST['comment']); if ($ret && isset($_POST["comment_id"])) { -- 2.4.5

1 0

[aur-dev] [PATCH] Fix bug where a user could not edit their own comment
by Marcel Korpel 11 Jul '15

11 Jul '15

commentedit.php checked if the user was the package owner, instead of checking if the user is the comment owner. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/commentedit.php | 4 ++-- web/lib/aur.inc.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/html/commentedit.php b/web/html/commentedit.php index c7dda63..83d86dd 100644 --- a/web/html/commentedit.php +++ b/web/html/commentedit.php @@ -9,9 +9,9 @@ set_lang(); check_sid(); $comment_id = intval($_REQUEST['comment_id']); -$comment = comment_by_id($comment_id); +list($user_id, $comment) = comment_by_id($comment_id); -if (!isset($base_id) || !has_credential(CRED_COMMENT_EDIT, array(pkgbase_maintainer_uid($base_id))) || is_null($comment)) { +if (!isset($base_id) || !has_credential(CRED_COMMENT_EDIT, array($user_id)) || is_null($comment)) { header('Location: /'); exit(); } diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 411d5ee..2d9f56e 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -581,18 +581,18 @@ function salted_hash($passwd, $salt) { * * @param int $comment_id The ID of the comment * - * @return string The comment + * @return array The user ID and comment OR null, null in case of an error */ function comment_by_id($comment_id) { $dbh = DB::connect(); - $q = "SELECT Comments FROM PackageComments "; + $q = "SELECT UsersID, Comments FROM PackageComments "; $q.= "WHERE ID = " . intval($comment_id); $result = $dbh->query($q); if (!$result) { - return null; + return array(null, null); } - return $result->fetchColumn(0); + return $result->fetch(PDO::FETCH_NUM); } /** -- 2.4.5

1 0

[aur-dev] [PATCH v4 0/6] Add comment edit functionality
by Marcel Korpel 10 Jul '15

10 Jul '15

Implements FS#34690. Marcel Korpel (6): Add comment edit icon and form Edit a comment in the backend Show dateline when a comment is edited or deleted Only autofocus search field on the package search page Add IDs to comments Jump to comment after editing schema/aur-schema.sql | 2 ++ web/html/commentedit.php | 21 +++++++++++++++ web/html/css/aurweb.css | 18 ++++++++++--- web/html/images/pencil.min.svg | 3 +++ web/html/images/pencil.svg | 55 +++++++++++++++++++++++++++++++++++++++ web/html/index.php | 4 +++ web/html/pkgbase.php | 16 +++++++----- web/lib/aur.inc.php | 19 ++++++++++++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 43 +++++++++++++++++++++++++++--- web/lib/pkgfuncs.inc.php | 40 ++++++++++++++++++++++++++++ web/template/pkg_comment_form.php | 10 ++++--- web/template/pkg_comments.php | 19 ++++++++++---- web/template/pkg_search_form.php | 2 +- 14 files changed, 232 insertions(+), 22 deletions(-) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.min.svg create mode 100644 web/html/images/pencil.svg -- 2.4.5

3 9

[aur-dev] [PATCH v3 0/6] Add comment edit functionality
by Marcel Korpel 10 Jul '15

10 Jul '15

Implements FS#34690. Marcel Korpel (6): Add comment edit icon and form Edit a comment in the backend Show dateline when a comment is edited or deleted Only autofocus search field on the package search page Add IDs to comments Jump to comment after editing schema/aur-schema.sql | 2 ++ web/html/commentedit.php | 21 +++++++++++++++ web/html/css/aurweb.css | 19 +++++++++++--- web/html/images/pencil.min.svg | 3 +++ web/html/images/pencil.svg | 55 +++++++++++++++++++++++++++++++++++++++ web/html/index.php | 4 +++ web/html/pkgbase.php | 16 +++++++----- web/lib/aur.inc.php | 19 ++++++++++++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 43 +++++++++++++++++++++++++++--- web/lib/pkgfuncs.inc.php | 40 ++++++++++++++++++++++++++++ web/template/pkg_comment_form.php | 10 ++++--- web/template/pkg_comments.php | 22 +++++++++++++--- web/template/pkg_search_form.php | 2 +- 14 files changed, 237 insertions(+), 21 deletions(-) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.min.svg create mode 100644 web/html/images/pencil.svg -- 2.4.5

1 6

[aur-dev] [PATCH v2 0/6] Add comment edit functionality
by Marcel Korpel 10 Jul '15

10 Jul '15

Implements FS#34690. Marcel Korpel (6): Add comment edit icon and form Edit a comment in the backend Show dateline when a comment is edited or deleted Only autofocus search field on the package search page Add IDs to comments Jump to comment after editing schema/aur-schema.sql | 2 ++ web/html/commentedit.php | 21 +++++++++++++++ web/html/css/aurweb.css | 19 +++++++++++--- web/html/images/pencil.min.svg | 3 +++ web/html/images/pencil.svg | 55 +++++++++++++++++++++++++++++++++++++++ web/html/index.php | 4 +++ web/html/pkgbase.php | 16 +++++++----- web/lib/aur.inc.php | 19 ++++++++++++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 43 +++++++++++++++++++++++++++--- web/lib/pkgfuncs.inc.php | 40 ++++++++++++++++++++++++++++ web/template/pkg_comment_form.php | 10 ++++--- web/template/pkg_comments.php | 21 ++++++++++++--- web/template/pkg_search_form.php | 2 +- 14 files changed, 237 insertions(+), 20 deletions(-) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.min.svg create mode 100644 web/html/images/pencil.svg -- 2.4.5

1 6