- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] config.proto: Do not use the ssh+git scheme
by Lukas Fleischer 06 Feb '16

06 Feb '16

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- Quoting Linus: This is stupid, but we support it for hysterical raisins. conf/config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.proto b/conf/config.proto index 2390dfa..560c705 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -19,7 +19,7 @@ max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org git_clone_uri_anon = https://aur.archlinux.org/%s.git -git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git +git_clone_uri_priv = ssh://aur@aur.archlinux.org/%s.git max_rpc_results = 5000 aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 -- 2.7.0

1 0

[aur-dev] [PATCH] Remove 'new' tag from updates table
by Marcel Korpel 31 Jan '16

31 Jan '16

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 8 -------- web/lib/stats.inc.php | 2 +- web/template/stats/updates_table.php | 5 ----- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 4c3fbe5..56158d2 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -16,10 +16,6 @@ margin: 0 .25em; } -#pkg-updates td.pkg-new { - padding: 0 .5em; -} - #pkg-stats td.stat-desc { white-space: normal; } @@ -45,10 +41,6 @@ text-overflow: ellipsis; } -#pkg-updates td.pkg-new { - width: 16px; -} - #pkg-updates td.pkg-date { text-align:right; } diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 5a24591..80619fe 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -11,7 +11,7 @@ function updates_table() { $dbh = DB::connect(); $key = 'recent_updates'; if(!($newest_packages = get_cache_value($key))) { - $q = 'SELECT Packages.Name, Version, ModifiedTS, SubmittedTS '; + $q = 'SELECT Packages.Name, Version, ModifiedTS '; $q.= 'FROM Packages INNER JOIN PackageBases ON '; $q.= 'Packages.PackageBaseID = PackageBases.ID '; $q.= 'WHERE PackageBases.PackagerUID IS NOT NULL '; diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index cecfb9f..9c295c0 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -9,11 +9,6 @@ <td class="pkg-name"> <a href="<?= get_pkg_uri($row["Name"]); ?>" title="<?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> </td> - <td class="pkg-new"> - <?php if ($row["ModifiedTS"] - $row["SubmittedTS"] < 3600): ?> - <img src="images/new.svg" alt="New!" /> - <?php endif; ?> - </td> <td class="pkg-date"> <span><?= gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span> </td> -- 2.7.0

2 3

[aur-dev] [PATCH] Correctly encode ampersand in query string within HTML attribute
by Marcel Korpel 31 Jan '16

31 Jan '16

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/stats/updates_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 9c295c0..4e2d39d 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -1,4 +1,4 @@ -<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&SO=d"><?= _('more') ?></a>)</span></h3> +<h3><?= __("Recent Updates") ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SB=l&SO=d"><?= _('more') ?></a>)</span></h3> <a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/rss.svg" alt="RSS Feed" /></a> -- 2.7.0

2 1

[aur-dev] [PATCH] Make RSS icon dark gray and only blue on hover
by Marcel Korpel 31 Jan '16

31 Jan '16

The other new icons (in package comments) behave the same way. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 56158d2..f5e1037 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -104,13 +104,13 @@ top: 1px; } -.delete-comment, .undelete-comment, .edit-comment, .pin-comment { +.rss-icon, .delete-comment, .undelete-comment, .edit-comment, .pin-comment { -webkit-filter: grayscale(100%); filter: grayscale(100%); opacity: 0.6; } -.delete-comment:hover, .undelete-comment:hover, .edit-comment:hover, .pin-comment:hover { +.rss-icon:hover, .delete-comment:hover, .undelete-comment:hover, .edit-comment:hover, .pin-comment:hover { -webkit-filter: none; filter: none; opacity: 1; -- 2.7.0

2 1

[aur-dev] rpc versions?
by Xyne 30 Jan '16

30 Jan '16

Hi, The RPC interface [1] returns different results depending on the requested version via the "v" GET parameter but it isn't even mentioned on the page and it still defaults to v=1 which lacks dependency information. Would you please add information about that parameter along with some information about the currently supported versions and their differences (or at least a link to relevant information such as changelogs)? Thanks! [1] https://aur.archlinux.org/rpc.php

2 4

[aur-dev] [PATCH] Shorten maxlength of email input fields to 254 characters
by Marcel Korpel 30 Jan '16

30 Jan '16

After 24734d0 (Shorten Email column to 254 characters, 2015-11-12) the maximum length of the input fields should be shortened, too. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/login.php | 2 +- web/template/account_edit_form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/login.php b/web/html/login.php index 0a2a1c9..7345439 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -29,7 +29,7 @@ html_header('AUR ' . __("Login")); <?php endif; ?> <p> <label for="id_username"><?= __('User name or email address') . ':'; ?></label> - <input id="id_username" type="text" name="user" size="30" maxlength="<?= max(config_get_int('options', 'username_max_len'), 256); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" /> + <input id="id_username" type="text" name="user" size="30" maxlength="<?= max(config_get_int('options', 'username_max_len'), 254); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" /> </p> <p> <label for="id_password"><?= __('Password') . ':'; ?></label> diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 28da203..cb0fa33 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -69,7 +69,7 @@ <p> <label for="id_email"><?= __("Email Address") ?>:</label> - <input type="text" size="30" maxlength="256" name="E" id="id_email" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>) + <input type="text" size="30" maxlength="254" name="E" id="id_email" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>) </p> <p> -- 2.7.0

2 1

[aur-dev] [PATCH] Include parentheses in translatable string
by Lukas Fleischer 28 Jan '16

28 Jan '16

This string is easier to understand with the extra parentheses. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgbase_actions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php index 85b1c3b..237e712 100644 --- a/web/template/pkgbase_actions.php +++ b/web/template/pkgbase_actions.php @@ -8,7 +8,7 @@ </li> <li><a href="<?= $snapshot_uri ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> - <li><span class="flagged"><?= $row["OutOfDateTS"] !== NULL ? html_action_link($base_uri . 'flag-comment/', __('Flagged out-of-date %s', "(${out_of_date_time})")) : "" ?></span></li> + <li><span class="flagged"><?= $row["OutOfDateTS"] !== NULL ? html_action_link($base_uri . 'flag-comment/', __('Flagged out-of-date (%s)', "$out_of_date_time")) : "" ?></span></li> <?php if ($row["OutOfDateTS"] === NULL): ?> <li><?= html_action_link($base_uri . 'flag/', __('Flag package out-of-date')) ?></li> <?php elseif (($row["OutOfDateTS"] !== NULL) && has_credential(CRED_PKGBASE_UNFLAG, $unflaggers)): ?> -- 2.7.0

1 0

[aur-dev] [PATCH] autofocus on search input
by Juan M. Uys 23 Jan '16

23 Jan '16

When loading the home page, it would be quite convenient for the search input box to receive focus. Other possible enhancements: - set the search input box's tabindex to the lowest value - implement a JS-based keyboard shortcut mechanism bound to '/', and upon pressing key '/', the search input box receives focus. --- web/html/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/home.php b/web/html/home.php index 475370b..90abeac 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -130,7 +130,7 @@ html_header( __("Home") ); <fieldset> <label for="pkgsearch-field"><?= __('Package Search') ?>:</label> <input type="hidden" name="O" value="0" /> - <input id="pkgsearch-field" type="text" name="K" size="30" value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength="35" /> + <input id="pkgsearch-field" type="text" name="K" size="30" value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength="35" autofocus="" /> </fieldset> </form> </div> -- 2.6.4

4 4

[aur-dev] [PATCH] Fix duplicate ids from pinned comments
by Mark Weiman 23 Jan '16

23 Jan '16

Fixed duplicate ids caused from pinned comments introduced in 7d4c0c9 (Implement capability to pin comments above others, 2012-12-12). Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- web/template/pkg_comments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index d05c512..3178552 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -51,7 +51,7 @@ if (!isset($count)) { $heading .= ')</span>'; } ?> - <h4 id="comment-<?= $row['ID'] ?>"<?php if ($is_deleted): ?> class="comment-deleted"<?php endif; ?>> + <h4 id="<?= isset($pinned) ? "pinned-" : "comment-" ?><?= $row['ID'] ?>"<?php if ($is_deleted): ?> class="comment-deleted"<?php endif; ?>> <?= $heading ?> <?php if (!$is_deleted && can_delete_comment_array($row)): ?> <form class="delete-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> -- 2.7.0

2 1

[aur-dev] [PATCH v2] Add comment undeletion functionality
by Marcel Korpel 20 Jan '16

20 Jan '16

Only Developers and Trusted Users can undelete comments. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- Changes from v1: * General clean-up of code * Placed button at the same position as the delete/edit/pin icons * Added missing PHPDoc for parameter web/html/css/aurweb.css | 6 +++++- web/html/pkgbase.php | 5 +++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 22 ++++++++++++++++++---- web/template/pkg_comments.php | 11 +++++++++++ 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 92ff898..526e876 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -101,11 +101,15 @@ color: #999; } -.delete-comment-form, .pin-comment-form, .edit-comment { +.delete-comment-form, .undelete-comment-form, .pin-comment-form, .edit-comment { float: right; margin-left: 8px; } +.undelete-comment { + font-size: 75%; +} + .edit-comment { height: 11px; position: relative; diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 45b8084..11fdf74 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -99,6 +99,11 @@ if (check_token()) { list($ret, $output) = pkgbase_notify($ids, false); } elseif (current_action("do_DeleteComment")) { list($ret, $output) = pkgbase_delete_comment(); + } elseif (current_action("do_UndeleteComment")) { + list($ret, $output) = pkgbase_delete_comment(true); + if ($ret && isset($_POST["comment_id"])) { + $fragment = '#comment-' . intval($_POST["comment_id"]); + } } elseif (current_action("do_PinComment")) { list($ret, $output) = pkgbase_pin_comment(); } elseif (current_action("do_UnpinComment")) { diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index 71bf5ff..d8698a8 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -6,6 +6,7 @@ define("CRED_ACCOUNT_EDIT_DEV", 3); define("CRED_ACCOUNT_LAST_LOGIN", 4); define("CRED_ACCOUNT_SEARCH", 5); define("CRED_COMMENT_DELETE", 6); +define("CRED_COMMENT_UNDELETE", 27); define("CRED_COMMENT_VIEW_DELETED", 22); define("CRED_COMMENT_EDIT", 25); define("CRED_COMMENT_PIN", 26); @@ -59,6 +60,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_ACCOUNT_LAST_LOGIN: case CRED_ACCOUNT_SEARCH: case CRED_COMMENT_DELETE: + case CRED_COMMENT_UNDELETE: case CRED_COMMENT_VIEW_DELETED: case CRED_COMMENT_EDIT: case CRED_COMMENT_PIN: diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 2b1201d..20f5bb4 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -932,9 +932,10 @@ function pkgbase_notify ($base_ids, $action=true) { /** * Delete a package comment * + * @param boolean $undelete True if undeleting rather than deleting * @return array Tuple of success/failure indicator and error message */ -function pkgbase_delete_comment() { +function pkgbase_delete_comment($undelete=false) { $uid = uid_from_sid($_COOKIE["AURSID"]); if (!$uid) { return array(false, __("You must be logged in before you can edit package information.")); @@ -947,15 +948,28 @@ function pkgbase_delete_comment() { } $dbh = DB::connect(); - if (can_delete_comment($comment_id)) { + if ($undelete) { + if (!has_credential(CRED_COMMENT_UNDELETE)) { + return array(false, __("You are not allowed to undelete this comment.")); + } + + $q = "UPDATE PackageComments "; + $q.= "SET DelUsersID = NULL, "; + $q.= "DelTS = NULL "; + $q.= "WHERE ID = ".intval($comment_id); + $dbh->exec($q); + return array(true, __("Comment has been undeleted.")); + } else { + if (!can_delete_comment($comment_id)) { + return array(false, __("You are not allowed to delete this comment.")); + } + $q = "UPDATE PackageComments "; $q.= "SET DelUsersID = ".$uid.", "; $q.= "DelTS = UNIX_TIMESTAMP() "; $q.= "WHERE ID = ".intval($comment_id); $dbh->exec($q); return array(true, __("Comment has been deleted.")); - } else { - return array(false, __("You are not allowed to delete this comment.")); } } diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index d05c512..3f1f728 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -53,6 +53,17 @@ if (!isset($count)) { ?> <h4 id="comment-<?= $row['ID'] ?>"<?php if ($is_deleted): ?> class="comment-deleted"<?php endif; ?>> <?= $heading ?> + <?php if ($is_deleted && has_credential(CRED_COMMENT_UNDELETE)): ?> + <form class="undelete-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> + <fieldset style="display:inline;"> + <input type="hidden" name="action" value="do_UndeleteComment" /> + <input type="hidden" name="comment_id" value="<?= $row['ID'] ?>" /> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <input type="submit" class="undelete-comment" value="<?= __('Undelete') ?>" name="submit" /> + </fieldset> + </form> + <?php endif;?> + <?php if (!$is_deleted && can_delete_comment_array($row)): ?> <form class="delete-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> -- 2.7.0

2 2