- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] git-update: Fix error when printing SRCINFO errors
by Johannes Löthberg 08 Jul '15

08 Jul '15

This commit fixes a bug introduced by ae2907a where passing the errar tuple to .format wasn't prefixed with an asterisk. Fixes FS#45545. Reported-by: Marty <vadmium+al(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 592f127..ba65cab 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -242,7 +242,7 @@ for commit in walker: "when parsing .SRCINFO in commit\n") sys.stderr.write("error: {:s}:\n".format(str(commit.id))) for error in errors: - sys.stderr.write("error: line {:d}: {:s}\n".format(error)) + sys.stderr.write("error: line {:d}: {:s}\n".format(*error)) exit(1) srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] -- 2.4.5

2 1

[aur-dev] [PATCH/RFC 0/3] Add comment edit functionality
by Marcel Korpel 08 Jul '15

08 Jul '15

Implements FS#34690. Marcel Korpel (3): Add comment edit icon and form Edit a comment in the backend Show dateline when a comment is edited or deleted schema/aur-schema.sql | 2 ++ web/html/commentedit.php | 21 +++++++++++++ web/html/css/aurweb.css | 10 ++++++ web/html/images/pencil.png | Bin 0 -> 429 bytes web/html/index.php | 4 +++ web/html/pkgbase.php | 14 ++++++--- web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 62 +++++++++++++++++++++++++++++++++++--- web/lib/pkgfuncs.inc.php | 40 ++++++++++++++++++++++++ web/template/pkg_comment_form.php | 10 ++++-- web/template/pkg_comments.php | 30 ++++++++++++++++-- 11 files changed, 180 insertions(+), 15 deletions(-) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.png -- 2.4.5

1 3

[aur-dev] [PATCH] Remove superfluous close tags
by Marcel Korpel 08 Jul '15

08 Jul '15

These are already output by html_action_link. --- web/template/pkgbase_actions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php index 61ad18f..c7428ee 100644 --- a/web/template/pkgbase_actions.php +++ b/web/template/pkgbase_actions.php @@ -28,15 +28,15 @@ <?php endif; ?> <?php if (has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($row["MaintainerUID"]))): ?> - <li><?= html_action_link($base_uri . 'comaintainers/', __('Manage Co-Maintainers')) ?></a></li> + <li><?= html_action_link($base_uri . 'comaintainers/', __('Manage Co-Maintainers')) ?></li> <?php endif; ?> <li><span class="flagged"><?php if ($row["RequestCount"] > 0) { echo _n('%d pending request', '%d pending requests', $row["RequestCount"]); } ?></span></li> - <li><?= html_action_link($base_uri . 'request/', __('File Request')) ?></a></li> + <li><?= html_action_link($base_uri . 'request/', __('File Request')) ?></li> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?> - <li><?= html_action_link($base_uri . 'delete/', __('Delete Package')) ?></a></li> - <li><?= html_action_link($base_uri . 'merge/', __('Merge Package')) ?></a></li> + <li><?= html_action_link($base_uri . 'delete/', __('Delete Package')) ?></li> + <li><?= html_action_link($base_uri . 'merge/', __('Merge Package')) ?></li> <?php endif; ?> <?php if ($uid && $row["MaintainerUID"] === NULL): ?> -- 2.4.5

2 1

[aur-dev] [RFC] Show dateline when a comment is edited or deleted
by Marcel Korpel 08 Jul '15

08 Jul '15

--- web/html/css/aurweb.css | 6 ++++++ web/lib/pkgbasefuncs.inc.php | 9 ++++++--- web/template/pkg_comments.php | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 47166d3..a9f1514 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -100,6 +100,12 @@ float: left; } +.edited { + font-size: 0.9em; + font-style: italic; + color: #666; +} + legend { padding: 1em 0; } diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index b7bef2c..01f5ace 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -47,9 +47,12 @@ function pkgbase_comments($base_id, $limit, $include_deleted) { } $dbh = DB::connect(); - $q = "SELECT PackageComments.ID, UserName, UsersID, Comments, "; - $q.= "CommentTS, DelUsersID FROM PackageComments LEFT JOIN Users "; - $q.= "ON PackageComments.UsersID = Users.ID "; + $q = "SELECT PackageComments.ID, A.UserName AS UserName, UsersID, Comments, "; + $q.= "CommentTS, EditedTS, B.UserName AS EditUserName, "; + $q.= "DelUsersID, C.UserName AS DelUserName FROM PackageComments "; + $q.= "LEFT JOIN Users A ON PackageComments.UsersID = A.ID "; + $q.= "LEFT JOIN Users B ON PackageComments.EditedUsersID = B.ID "; + $q.= "LEFT JOIN Users C ON PackageComments.DelUsersID = C.ID "; $q.= "WHERE PackageBaseID = " . $base_id . " "; if (!$include_deleted) { $q.= "AND DelUsersID IS NULL "; diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 938f620..79e08d2 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -18,6 +18,12 @@ $count = pkgbase_comments_count($base_id, $include_deleted); <?php while (list($indx, $row) = each($comments)): ?> <?php if ($row['UserName'] && $SID): $row['UserName'] = "<a href=\"" . get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>"; + endif; + if ($row['DelUserName'] && $SID): + $row['DelUserName'] = "<a href=\"" . get_user_uri($row['DelUserName']) . "\">{$row['DelUserName']}</a>"; + endif; + if ($row['EditUserName'] && $SID): + $row['EditUserName'] = "<a href=\"" . get_user_uri($row['EditUserName']) . "\">{$row['EditUserName']}</a>"; endif; ?> <h4<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>> <?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?> @@ -53,6 +59,15 @@ $count = pkgbase_comments_count($base_id, $include_deleted); <p> <?= parse_comment($row['Comments']) ?> </p> + <?php if ($row['EditedTS']): ?> + <p class="edited"> + <?php if ($row['DelUsersID']) { + echo __('Deleted %s by %s', gmdate('Y-m-d H:i', $row['EditedTS']), $row['DelUserName']); + } else { + echo __('Last edited %s by %s', gmdate('Y-m-d H:i', $row['EditedTS']), $row['EditUserName']); + }?> + </p> + <?php endif; ?> </div> <?php endwhile; ?> </div> -- 2.4.5

1 0

[aur-dev] [RFC] Edit a comment in the backend
by Marcel Korpel 08 Jul '15

08 Jul '15

Implements FS#34690. Also, when deleting a comment, a timestamp is added (so, in the future, the page could display something like: "Edited/Deleted <TS> by <Name>"). --- schema/aur-schema.sql | 2 ++ web/html/pkgbase.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 34 +++++++++++++++++++++++++++++++++- web/lib/pkgfuncs.inc.php | 26 ++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 594a804..3aef7a3 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -254,6 +254,8 @@ CREATE TABLE PackageComments ( UsersID INTEGER UNSIGNED NULL DEFAULT NULL, Comments TEXT NOT NULL DEFAULT '', CommentTS BIGINT UNSIGNED NOT NULL DEFAULT 0, + EditedTS BIGINT UNSIGNED NULL DEFAULT NULL, + EditedUsersID INTEGER UNSIGNED NULL DEFAULT NULL, DelUsersID INTEGER UNSIGNED NULL DEFAULT NULL, PRIMARY KEY (ID), INDEX (UsersID), diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 51eb4b1..018cfca 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -112,6 +112,8 @@ if (check_token()) { } else { $ret = false; /* Bogus input. This shouldn't happen, unless the site is under attack. */ } + } elseif (current_action("do_EditComment")) { + list($ret, $output) = pkgbase_edit_comment($_REQUEST['comment']); } if ($ret) { diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index cff25c4..b7bef2c 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -849,7 +849,8 @@ function pkgbase_delete_comment() { $dbh = DB::connect(); if (can_delete_comment($comment_id)) { $q = "UPDATE PackageComments "; - $q.= "SET DelUsersID = ".$uid." "; + $q.= "SET DelUsersID = ".$uid.", "; + $q.= "EditedTS = UNIX_TIMESTAMP() "; $q.= "WHERE ID = ".intval($comment_id); $dbh->exec($q); return array(true, __("Comment has been deleted.")); @@ -859,6 +860,37 @@ function pkgbase_delete_comment() { } /** + * Edit a package comment + * + * @return array Tuple of success/failure indicator and error message + */ +function pkgbase_edit_comment($comment) { + $uid = uid_from_sid($_COOKIE["AURSID"]); + if (!$uid) { + return array(false, __("You must be logged in before you can edit package information.")); + } + + if (isset($_POST["comment_id"])) { + $comment_id = $_POST["comment_id"]; + } else { + return array(false, __("Missing comment ID.")); + } + + $dbh = DB::connect(); + if (can_edit_comment($comment_id)) { + $q = "UPDATE PackageComments "; + $q.= "SET EditedUsersID = ".$uid.", "; + $q.= "Comments = ".$dbh->quote($comment).", "; + $q.= "EditedTS = UNIX_TIMESTAMP() "; + $q.= "WHERE ID = ".intval($comment_id); + $dbh->exec($q); + return array(true, __("Comment has been edited.")); + } else { + return array(false, __("You are not allowed to edit this comment.")); + } +} + +/** * Get a list of package base keywords * * @param int $base_id The package base ID to retrieve the keywords for diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 7cb2ffc..de57c3e 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -43,6 +43,32 @@ function can_delete_comment_array($comment) { } /** + * Determine if the user can edit a specific package comment + * + * Only the comment submitter, Trusted Users, and Developers can edit + * comments. This function is used for the backend side of comment editing. + * + * @param string $comment_id The comment ID in the database + * + * @return bool True if the user can edit the comment, otherwise false + */ +function can_edit_comment($comment_id=0) { + $dbh = DB::connect(); + + $q = "SELECT UsersID FROM PackageComments "; + $q.= "WHERE ID = " . intval($comment_id); + $result = $dbh->query($q); + + if (!$result) { + return false; + } + + $uid = $result->fetch(PDO::FETCH_COLUMN, 0); + + return has_credential(CRED_COMMENT_EDIT, array($uid)); +} + +/** * Determine if the user can edit a specific package comment using an array * * Only the comment submitter, Trusted Users, and Developers can edit -- 2.4.5

1 0

[aur-dev] [RFC v2] Add comment edit icon and form
by Marcel Korpel 07 Jul '15

07 Jul '15

Partly implements FS#34690. --- Changes from v1: * The same template pkg_comment_form.php is now used for adding new comments and editing existing comments (I don't know I like it this way). * In pkg_comments.php a missing test has been added to check the user's credentials (it assumes someone cannot edit a comment who is not allowed to delete the same). web/html/commentedit.php | 21 +++++++++++++++++++++ web/html/css/aurweb.css | 4 ++++ web/html/images/pencil.png | Bin 0 -> 429 bytes web/html/index.php | 4 ++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 19 +++++++++++++++++++ web/lib/pkgfuncs.inc.php | 14 ++++++++++++++ web/template/pkg_comment_form.php | 8 ++++---- web/template/pkg_comments.php | 3 +++ 9 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.png diff --git a/web/html/commentedit.php b/web/html/commentedit.php new file mode 100644 index 0000000..a8b1819 --- /dev/null +++ b/web/html/commentedit.php @@ -0,0 +1,21 @@ +<?php + +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); + +include_once("aur.inc.php"); +include_once("pkgbasefuncs.inc.php"); + +set_lang(); +check_sid(); + +$comment_id = intval($_REQUEST['comment_id']); +$comment = pkgbase_get_comment($comment_id); + +if (!isset($base_id) || !has_credential(CRED_COMMENT_EDIT, array(pkgbase_maintainer_uid($base_id))) || is_null($comment)) { + header('Location: /'); + exit(); +} + +html_header(__("Edit comment")); +include('pkg_comment_form.php'); +html_footer(AURWEB_VERSION); diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index d67877a..47166d3 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -96,6 +96,10 @@ color: #999; } +.edit-comment { + float: left; +} + legend { padding: 1em 0; } diff --git a/web/html/images/pencil.png b/web/html/images/pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..4f0377684842064b2f990663d6de73313c8227e9 GIT binary patch literal 429 zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000vJ000sQ0{{R3j?xud0002JP)t-s<hn23 zq&1jhAi9e?!h$i<oiE#}Ps@{2$&gRVlTcVd6IntMUP2X<Z62IyC8}T+w011DeKfg= zCcls;!HY=3XBESlF~@^6$dFFRsb|TNPs)`-&zwroomteJUD%~+*^fKfs8HO*ZQZML z-L7om%dq6SFXpse=$Jt4s$uNUsq*2-^5(wt&u{e4rS#ON^wvc6&!+X+X!YD+_uIYq z;mP>n#rWc=_~Xm??Zf%w%lYHX`sdO5?vDKQvqhM@VE_OC0d!JMQvg8b*k%9#00Cl4 zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2$=023iC&9OfK003!8 zL_t&-(_>(u7GUF)U_}#BlsC1IW<e2B(>JrWHsL@KvNTuG(=%a55wbJVl~tBP6*4xk zRad|-B#bE}q=PA>Dv2({t8F7FrX(Yd>@Z#{O$||g0TlOh%Nc5kpb9Z?@$d;S69^pu XUcC;B&HZ$A00000NkvXXu0mjfYBaqK literal 0 HcmV?d00001 diff --git a/web/html/index.php b/web/html/index.php index 27d897c..58e425c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -89,6 +89,9 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "comaintainers": include('comaintainers.php'); return; + case "edit-comment": + include('commentedit.php'); + return; default: header("HTTP/1.0 404 Not Found"); include "./404.php"; @@ -169,6 +172,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/images/favicon.ico": case "/images/feed-icon-14x14.png": case "/images/titlelogo.png": + case "/images/pencil.png": case "/images/x.png": header("Content-Type: image/png"); readfile("./$path"); diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index cf1fcca..648d78c 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -7,6 +7,7 @@ define("CRED_ACCOUNT_LAST_LOGIN", 4); define("CRED_ACCOUNT_SEARCH", 5); define("CRED_COMMENT_DELETE", 6); define("CRED_COMMENT_VIEW_DELETED", 22); +define("CRED_COMMENT_EDIT", 25); define("CRED_PKGBASE_ADOPT", 7); define("CRED_PKGBASE_SET_KEYWORDS", 8); define("CRED_PKGBASE_DELETE", 9); @@ -58,6 +59,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_ACCOUNT_SEARCH: case CRED_COMMENT_DELETE: case CRED_COMMENT_VIEW_DELETED: + case CRED_COMMENT_EDIT: case CRED_PKGBASE_ADOPT: case CRED_PKGBASE_SET_KEYWORDS: case CRED_PKGBASE_DELETE: diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5d191eb..cff25c4 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -67,6 +67,25 @@ function pkgbase_comments($base_id, $limit, $include_deleted) { } /** + * Get a package comment + * + * @param int $comment_id The ID of the comment + * + * @return string The comment + */ +function pkgbase_get_comment($comment_id) { + $dbh = DB::connect(); + $q = "SELECT Comments FROM PackageComments "; + $q.= "WHERE ID = " . $comment_id; + $result = $dbh->query($q); + if (!$result) { + return null; + } + + return $result->fetchColumn(0); +} + +/** * Add a comment to a package page and send out appropriate notifications * * @param string $base_id The package base ID to add the comment on diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 110290b..7cb2ffc 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -43,6 +43,20 @@ function can_delete_comment_array($comment) { } /** + * Determine if the user can edit a specific package comment using an array + * + * Only the comment submitter, Trusted Users, and Developers can edit + * comments. This function is used for the frontend side of comment editing. + * + * @param array $comment All database information relating a specific comment + * + * @return bool True if the user can edit the comment, otherwise false + */ +function can_edit_comment_array($comment) { + return has_credential(CRED_COMMENT_EDIT, array($comment['UsersID'])); +} + +/** * Check to see if the package name already exists in the database * * @param string $name The package name to check diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 8a74dc1..7eecd2c 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -1,5 +1,5 @@ <div id="generic-form" class="box"> - <h2><?= __("Add Comment"); ?></h2> + <h2><?= (isset($comment_id)) ? __('Edit comment for: %s', htmlspecialchars($pkgbase_name)) : __("Add Comment"); ?></h2> <form action="<?= get_pkgbase_uri($pkgbase_name) ?>" method="post"> <fieldset> <?php @@ -8,14 +8,14 @@ if (isset($_REQUEST['comment']) && check_token()) { } ?> <div> - <input type="hidden" name="ID" value="<?= intval($base_id) ?>" /> + <input type="hidden" name="ID" value="<?= (isset($comment_id)) ? $comment_id : intval($base_id) ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> <p> - <textarea id="id_comment" name="comment" cols="80" rows="10"></textarea> + <textarea id="id_comment" name="comment" cols="80" rows="10"><?= (isset($comment_id)) ? htmlspecialchars($comment) : "" ?></textarea> </p> <p> - <input type="submit" value="<?= __("Add Comment") ?>" /> + <input type="submit" value="<?= (isset($comment_id)) ? __("Save") : __("Add Comment") ?>" /> </p> </fieldset> </form> diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 3e99d9b..938f620 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -21,6 +21,9 @@ $count = pkgbase_comments_count($base_id, $include_deleted); endif; ?> <h4<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>> <?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?> + <?php if (can_edit_comment_array($row)): ?> + <a href="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name) . 'edit-comment/?comment_id=' . $row['ID'], ENT_QUOTES) ?>" class="edit-comment" title="<?= __('Edit comment') ?>"><img src="/images/pencil.png" alt="<?= __('Edit comment') ?>" width="19" height="18"></a> + <?php endif; ?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_DeleteComment" /> -- 2.4.5

1 0

[aur-dev] [RFC] Add comment edit icon and form
by Marcel Korpel 07 Jul '15

07 Jul '15

Partly implements FS#34690. --- web/html/commentedit.php | 21 +++++++++++++++++++++ web/html/css/aurweb.css | 4 ++++ web/html/images/pencil.png | Bin 0 -> 429 bytes web/html/index.php | 4 ++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 19 +++++++++++++++++++ web/lib/pkgfuncs.inc.php | 14 ++++++++++++++ web/template/pkg_comment_editform.php | 15 +++++++++++++++ web/template/pkg_comments.php | 1 + 9 files changed, 80 insertions(+) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.png create mode 100644 web/template/pkg_comment_editform.php diff --git a/web/html/commentedit.php b/web/html/commentedit.php new file mode 100644 index 0000000..7a5829a --- /dev/null +++ b/web/html/commentedit.php @@ -0,0 +1,21 @@ +<?php + +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); + +include_once("aur.inc.php"); +include_once("pkgbasefuncs.inc.php"); + +set_lang(); +check_sid(); + +$comment_id = intval($_REQUEST['comment']); +$comment = pkgbase_get_comment($comment_id); + +if (!isset($base_id) || !has_credential(CRED_COMMENT_EDIT, array(pkgbase_maintainer_uid($base_id))) || is_null($comment)) { + header('Location: /'); + exit(); +} + +html_header(__("Edit comment")); +include('pkg_comment_editform.php'); +html_footer(AURWEB_VERSION); diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index d67877a..47166d3 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -96,6 +96,10 @@ color: #999; } +.edit-comment { + float: left; +} + legend { padding: 1em 0; } diff --git a/web/html/images/pencil.png b/web/html/images/pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..4f0377684842064b2f990663d6de73313c8227e9 GIT binary patch literal 429 zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000vJ000sQ0{{R3j?xud0002JP)t-s<hn23 zq&1jhAi9e?!h$i<oiE#}Ps@{2$&gRVlTcVd6IntMUP2X<Z62IyC8}T+w011DeKfg= zCcls;!HY=3XBESlF~@^6$dFFRsb|TNPs)`-&zwroomteJUD%~+*^fKfs8HO*ZQZML z-L7om%dq6SFXpse=$Jt4s$uNUsq*2-^5(wt&u{e4rS#ON^wvc6&!+X+X!YD+_uIYq z;mP>n#rWc=_~Xm??Zf%w%lYHX`sdO5?vDKQvqhM@VE_OC0d!JMQvg8b*k%9#00Cl4 zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2$=023iC&9OfK003!8 zL_t&-(_>(u7GUF)U_}#BlsC1IW<e2B(>JrWHsL@KvNTuG(=%a55wbJVl~tBP6*4xk zRad|-B#bE}q=PA>Dv2({t8F7FrX(Yd>@Z#{O$||g0TlOh%Nc5kpb9Z?@$d;S69^pu XUcC;B&HZ$A00000NkvXXu0mjfYBaqK literal 0 HcmV?d00001 diff --git a/web/html/index.php b/web/html/index.php index 27d897c..58e425c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -89,6 +89,9 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "comaintainers": include('comaintainers.php'); return; + case "edit-comment": + include('commentedit.php'); + return; default: header("HTTP/1.0 404 Not Found"); include "./404.php"; @@ -169,6 +172,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/images/favicon.ico": case "/images/feed-icon-14x14.png": case "/images/titlelogo.png": + case "/images/pencil.png": case "/images/x.png": header("Content-Type: image/png"); readfile("./$path"); diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index cf1fcca..648d78c 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -7,6 +7,7 @@ define("CRED_ACCOUNT_LAST_LOGIN", 4); define("CRED_ACCOUNT_SEARCH", 5); define("CRED_COMMENT_DELETE", 6); define("CRED_COMMENT_VIEW_DELETED", 22); +define("CRED_COMMENT_EDIT", 25); define("CRED_PKGBASE_ADOPT", 7); define("CRED_PKGBASE_SET_KEYWORDS", 8); define("CRED_PKGBASE_DELETE", 9); @@ -58,6 +59,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_ACCOUNT_SEARCH: case CRED_COMMENT_DELETE: case CRED_COMMENT_VIEW_DELETED: + case CRED_COMMENT_EDIT: case CRED_PKGBASE_ADOPT: case CRED_PKGBASE_SET_KEYWORDS: case CRED_PKGBASE_DELETE: diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5d191eb..cff25c4 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -67,6 +67,25 @@ function pkgbase_comments($base_id, $limit, $include_deleted) { } /** + * Get a package comment + * + * @param int $comment_id The ID of the comment + * + * @return string The comment + */ +function pkgbase_get_comment($comment_id) { + $dbh = DB::connect(); + $q = "SELECT Comments FROM PackageComments "; + $q.= "WHERE ID = " . $comment_id; + $result = $dbh->query($q); + if (!$result) { + return null; + } + + return $result->fetchColumn(0); +} + +/** * Add a comment to a package page and send out appropriate notifications * * @param string $base_id The package base ID to add the comment on diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 110290b..7cb2ffc 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -43,6 +43,20 @@ function can_delete_comment_array($comment) { } /** + * Determine if the user can edit a specific package comment using an array + * + * Only the comment submitter, Trusted Users, and Developers can edit + * comments. This function is used for the frontend side of comment editing. + * + * @param array $comment All database information relating a specific comment + * + * @return bool True if the user can edit the comment, otherwise false + */ +function can_edit_comment_array($comment) { + return has_credential(CRED_COMMENT_EDIT, array($comment['UsersID'])); +} + +/** * Check to see if the package name already exists in the database * * @param string $name The package name to check diff --git a/web/template/pkg_comment_editform.php b/web/template/pkg_comment_editform.php new file mode 100644 index 0000000..8815da0 --- /dev/null +++ b/web/template/pkg_comment_editform.php @@ -0,0 +1,15 @@ +<div class="box"> + <h2><?= __('Edit comment for: %s', htmlspecialchars($pkgbase_name)) ?></h2> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> + <fieldset> + <input type="hidden" name="ID" value="<?= $comment_id ?>" /> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <p> + <textarea id="id_comment" name="comment" cols="80" rows="10"><?= htmlspecialchars($comment) ?></textarea> + </p> + <p> + <input type="submit" class="button" name="do_EditComment" value="<?= __("Save") ?>" /> + </p> + </fieldset> + </form> +</div> diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 3e99d9b..d124676 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -21,6 +21,7 @@ $count = pkgbase_comments_count($base_id, $include_deleted); endif; ?> <h4<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>> <?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?> + <a href="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name) . 'edit-comment?comment=' . $row['ID'], ENT_QUOTES) ?>" class="edit-comment" title="<?= __('Edit comment') ?>"><img src="/images/pencil.png" alt="<?= __('Edit comment') ?>" width="19" height="18"></a> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_DeleteComment" /> -- 2.4.5

2 1

[aur-dev] AUR4: Missing Tags
by kachelaqa 05 Jul '15

05 Jul '15

Hello I just migrated a package to AUR4, and managed to push most of the history I had from an existing repo. However, all my annotated tags are missing. Is there a deliberate policy to reject tags? Or do I need to do something else to get them accepted? Here's the (abbreviated) output from the original push: $ git push origin master Counting objects: 191, done. Delta compression using up to 2 threads. Compressing objects: 100% (191/191), done. Writing objects: 100% (191/191), 20.97 KiB | 0 bytes/s, done. Total 191 (delta 74), reused 0 (delta 0) remote: error: pushing to a branch other than master is restricted remote: error: hook declined to update refs/tags/0.1-1 ... [snip] ... To ssh://aur@aur4.archlinux.org/pkgbrowser.git * [new branch] master -> master ! [remote rejected] 0.1-1 -> 0.1-1 (hook declined) ... [snip] ... error: failed to push some refs to 'ssh://aur@aur4.archlinux.org/pkgbrowser.git'

2 1

[aur-dev] [PATCH] Show number of selected packages on search page
by Johannes Löthberg 04 Jul '15

04 Jul '15

Fixes FS#45379. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- This is an initial version, so might not be perfect. Note that since we have to do it through JS we have to use strings like "1 package(s) selected" instead of properly gettext'ed ones. web/html/packages.php | 11 +++++++++++ web/template/pkg_search_results.php | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/web/html/packages.php b/web/html/packages.php index 75a574e..b4c5c39 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -67,10 +67,21 @@ function collapseDependsList(list) { }); } +function checkboxes() { + document.getElementById("pkglist-checked-count").innerHTML = document.querySelectorAll('input[type="checkbox"]:checked').length; +} + $(document).ready(function() { collapseDependsList("#pkgdepslist"); collapseDependsList("#pkgreqslist"); collapseDependsList("#pkgsrcslist"); + checkboxes(); // Set initial value + + var elements = document.getElementsByClassName('package-checkbox'); + + for (var i = 0, len = elements.length; i < len; i++) { + elements[i].onchange = checkboxes; + } }); </script> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index cce533c..b40c87d 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -9,6 +9,8 @@ if (!$result): ?> <p> <?= _n('%d package found.', '%d packages found.', $total) ?> <?= __('Page %d of %d.', $current, $pages) ?> + <?= __('%s%s%s package(s) selected.', + '<span id="pkglist-checked-count">', '0', '</span>') ?> </p> <?php if (count($templ_pages) > 1): ?> <p class="pkglist-nav"> @@ -49,7 +51,7 @@ if (!$result): ?> <?php while (list($indx, $row) = each($searchresults)): ?> <tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>"> <?php if ($SID): ?> - <td><input type="checkbox" name="IDs[<?= $row["PackageBaseID"] ?>]" value="1" /></td> + <td><input class="package-checkbox" type="checkbox" name="IDs[<?= $row["PackageBaseID"] ?>]" value="1" /></td> <?php endif; ?> <td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) ?></a></td> <td<?php if ($row["OutOfDateTS"]): ?> class="flagged"<?php endif; ?>><?= htmlspecialchars($row["Version"]) ?></td> @@ -89,6 +91,8 @@ if (!$result): ?> <p> <?= _n('%d package found.', '%d packages found.', $total) ?> <?= __('Page %d of %d.', $current, $pages) ?> + <?= __('%s%s%s package(s) selected.', + '<span id="pkglist-checked-count">', '0', '</span>') ?> </p> <?php if (count($templ_pages) > 1): ?> <p class="pkglist-nav"> -- 2.4.4

4 11

[aur-dev] [PATCH] RPC: Add decimal_fields array for floating-point fields
by Johannes Löthberg 04 Jul '15

04 Jul '15

Fixes FS#45537. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Another take on fixing FS#45537, makes <1435960231-22737-1-git-send-email-johannes(a)kyriasis.com> obsolete web/lib/aurjson.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 7b77da4..f73d0c0 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -45,6 +45,9 @@ class AurJSON { 'ID', 'PackageBaseID', 'NumVotes', 'OutOfDate', 'FirstSubmitted', 'LastModified' ); + private static $decimal_fields = array( + 'Popularity' + ); /* * Handles post data, and routes the request. @@ -255,6 +258,10 @@ class AurJSON { $row[$field] = intval($row[$field]); } + foreach (self::$decimal_fields as $field) { + $row[$field] = floatval($row[$field]); + } + if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { $row = array_merge($row, $this->get_extended_fields($row['ID'])); } -- 2.4.5

1 0