February 2017 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/3] Hide the table sorting links on the dashboard
by Lukas Fleischer 08 Feb '17

08 Feb '17

The tables on the dashboard always show the 50 most recent packages, ordered by last update. Do not make the table headers of these tables clickable. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_search_results.php | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index d596ec2..8a2e8d3 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,4 +1,17 @@ <?php +function fmtth($title, $sb=false, $so=false, $hint=false) { + echo '<th>'; + if ($sb) { + echo '<a href="' . mkurl('SB=' . $sb . '&SO = ' . $so) . '">' . $title . '</a>'; + } else { + echo $title; + } + if ($hint) { + echo '<span title="' . $hint . '" class="hover-help"><sup>?</sup></span>'; + } + echo '</th>'; +} + if (!$result): ?> <p><?= __("Error retrieving package list.") ?></p> <?php elseif ($total == 0): ?> @@ -33,16 +46,16 @@ if (!$result): ?> <?php if ($SID && $show_headers): ?> <th> </th> <?php endif; ?> - <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> - <th><?= __("Version") ?></th> - <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> - <th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a><span title="<?= __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98) ?>" class="hover-help"><sup>?</sup></span></th> + <?php fmtth(__('Name'), $show_headers ? 'n' : false, $SO_next) ?> + <?php fmtth(__('Version')) ?> + <?php fmtth(__('Votes'), $show_headers ? 'v' : false, $SO_next) ?> + <?php fmtth(__('Popularity'), $show_headers ? 'p' : false, $SO_next, __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98)) ?> <?php if ($SID): ?> - <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> - <th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th> + <?php fmtth(__('Voted'), $show_headers ? 'w' : false, $SO_next) ?> + <?php fmtth(__('Notify'), $show_headers ? 'o' : false, $SO_next) ?> <?php endif; ?> - <th><?= __("Description") ?></th> - <th><a href="?<?= mkurl('SB=m&SO=' . $SO_next) ?>"><?= __("Maintainer") ?></a></th> + <?php fmtth(__('Description')) ?> + <?php fmtth(__('Maintainer'), $show_headers ? 'm' : false, $SO_next) ?> </tr> </thead> <tbody> -- 2.11.1

2 4

[aur-dev] [PATCH] Add direct links to each source file
by Janne Heß 08 Feb '17

08 Feb '17

Currently, each source file which is an external link (http://, https://, ...) is a clickable link. This commit extends the behaviour by making files from the repository clickable as well. The link brings the user to the corresponding cgit page. Also, the link to the PKGBUILD was altered to make the configuration more consistent. --- conf/config.proto | 2 +- web/lib/pkgfuncs.inc.php | 6 ++++-- web/template/pkg_details.php | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 63e2458..4cc294f 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -26,7 +26,7 @@ aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 auto_orphan_age = 15552000 auto_delete_age = 86400 -pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s +source_file_uri = https://aur.archlinux.org/cgit/aur.git/tree/%s?h=%s log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 4b0fdba..d4b3465 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -481,17 +481,19 @@ function pkg_rel_html($name, $cond, $arch) { * * @param string $url The URL of the source * @param string $arch The source architecture + * @param string $package The name of the package * * @return string The HTML code of the label to display */ -function pkg_source_link($url, $arch) { +function pkg_source_link($url, $arch, $package) { $url = explode('::', $url); $parsed_url = parse_url($url[0]); if (isset($parsed_url['scheme']) || isset($url[1])) { $link = '<a href="' . htmlspecialchars((isset($url[1]) ? $url[1] : $url[0]), ENT_QUOTES) . '">' . htmlspecialchars($url[0]) . '</a>'; } else { - $link = htmlspecialchars($url[0]); + $file_url = sprintf(config_get('options', 'source_file_uri'), htmlspecialchars($url[0]), $package); + $link = '<a href="' . $file_url . '">' . htmlspecialchars($url[0]) . '</a>'; } if ($arch) { diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b9c66d4..69f37e9 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,6 +1,6 @@ <?php -$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['BaseName'])); +$pkgbuild_uri = sprintf(config_get('options', 'source_file_uri'), 'PKGBUILD', urlencode($row['BaseName'])); $log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['BaseName'])); $snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['BaseName'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['BaseName'])); @@ -299,7 +299,7 @@ endif; <div> <ul id="pkgsrcslist"> <?php while (list($k, $src) = each($sources)): ?> - <li><?= pkg_source_link($src[0], $src[1]) ?></li> + <li><?= pkg_source_link($src[0], $src[1], urlencode($row['BaseName'])) ?></li> <?php endwhile; ?> </ul> </div> -- 2.11.0

3 2

[aur-dev] [PATCH] Move my packages to separate dashboard sections
by Lukas Fleischer 07 Feb '17

07 Feb '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/home.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/web/html/home.php b/web/html/home.php index 381cb71..1652541 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -18,8 +18,8 @@ if (isset($_COOKIE["AURSID"])) { <div id="content-left-wrapper"> <div id="content-left"> + <?php if (isset($_COOKIE["AURSID"])): ?> <div id="intro" class="box"> - <?php if (isset($_COOKIE["AURSID"])): ?> <h2><?= __("Dashboard"); ?></h2> <h3><?= __("My Flagged Packages"); ?></h3> <?php @@ -39,7 +39,9 @@ if (isset($_COOKIE["AURSID"])) { $show_headers = false; include('pkgreq_results.php'); ?> - <h3><?= __("My Packages"); ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SeB=m&K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __('more') ?></a>)</span></h3> + </div> + <div id="intro" class="box"> + <h2><?= __("My Packages"); ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SeB=m&K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __('more') ?></a>)</span></h2> <?php $params = array( 'PP' => 50, @@ -50,7 +52,9 @@ if (isset($_COOKIE["AURSID"])) { ); pkg_search_page($params, false, $_COOKIE["AURSID"]); ?> - <h3><?= __("Co-Maintained Packages"); ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SeB=c&K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __('more') ?></a>)</span></h3> + </div> + <div id="intro" class="box"> + <h2><?= __("Co-Maintained Packages"); ?> <span class="more">(<a href="<?= get_uri('/packages/') ?>?SeB=c&K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __('more') ?></a>)</span></h2> <?php $params = array( 'PP' => 50, @@ -61,7 +65,9 @@ if (isset($_COOKIE["AURSID"])) { ); pkg_search_page($params, false, $_COOKIE["AURSID"]); ?> - <?php else: ?> + </div> + <?php else: ?> + <div id="intro" class="box"> <h2>AUR <?= __("Home"); ?></h2> <p> <?php @@ -89,9 +95,7 @@ if (isset($_COOKIE["AURSID"])) { <?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.'); ?> </p> <p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR"><?= __('Learn more...') ?></a></p> - <?php endif; ?> </div> - <?php if (!isset($_COOKIE["AURSID"])): ?> <div id="news"> <h3><a><?= __('Support') ?></a><span class="arrow"></span></h3> <h4><?= __('Package Requests') ?></h4> -- 2.11.1

1 0

[aur-dev] [PATCH 1/4] Add an option to filter by user to pkgreq_list()
by Lukas Fleischer 07 Feb '17

07 Feb '17

When a user is specified, the function only returns package requests which are either opened by the given user or affecting packages maintained by the given user. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgreqfuncs.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 7a171ed..7dcab13 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -19,10 +19,11 @@ function pkgreq_count() { * * @param int $offset The index of the first request to return * @param int $limit The maximum number of requests to return + * @param int $uid Only return packages affecting the given user * * @return array List of pacakge requests with details */ -function pkgreq_list($offset, $limit) { +function pkgreq_list($offset, $limit, $uid=false) { $dbh = DB::connect(); $q = "SELECT PackageRequests.ID, "; @@ -35,6 +36,12 @@ function pkgreq_list($offset, $limit) { $q.= "FROM PackageRequests INNER JOIN RequestTypes ON "; $q.= "RequestTypes.ID = PackageRequests.ReqTypeID "; $q.= "INNER JOIN Users ON Users.ID = PackageRequests.UsersID "; + + if ($uid) { + $q.= "WHERE PackageRequests.UsersID = " . intval($uid). " "; + $q.= "OR Users.ID = " . intval($uid) . " "; + } + $q.= "ORDER BY Open DESC, RequestTS DESC "; $q.= "LIMIT " . $limit . " OFFSET " . $offset; -- 2.11.1

1 3

[aur-dev] [PATCH 1/2] Allow to search for both maintainer and co-maintainer
by Lukas Fleischer 07 Feb '17

07 Feb '17

As a follow-up to commit 6cb8c04 (Implement co-maintainer search, 2017-01-26), add an option to search for both maintainers and co-maintainers at the same time. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 8 ++++++++ web/template/pkg_search_form.php | 1 + 2 files changed, 9 insertions(+) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 063cc93..030ec9a 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -717,6 +717,14 @@ function pkg_search_page($params, $show_headers=true, $SID="") { $q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID "; $q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . ")"; } + elseif (isset($params["SeB"]) && $params["SeB"] == "M") { + /* Search by maintainer and co-maintainer. */ + $q_where .= "AND (Users.Username = " . $dbh->quote($params['K']) . " "; + $q_where .= "OR EXISTS (SELECT * FROM PackageComaintainers "; + $q_where .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; + $q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID "; + $q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . "))"; + } elseif (isset($params["SeB"]) && $params["SeB"] == "s") { /* Search by submitter. */ $q_where .= "AND SubmitterUID = " . intval(uid_from_username($params['K'])) . " "; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 688cfcc..3d0cde6 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -10,6 +10,7 @@ $searchby = array( 'k' => __('Keywords'), 'm' => __('Maintainer'), 'c' => __('Co-maintainer'), + 'M' => __('Maintainer, Co-maintainer'), 's' => __('Submitter') ); -- 2.11.1

1 1

[aur-dev] [PATCH] confparser.inc.php: Support alternative config path
by Lukas Fleischer 04 Feb '17

04 Feb '17

Add a AUR_CONFIG environment variable that can be used to specify an alternative configuration file, similar to the feature introduced in ecbf32f (git-interface: Add AUR_CONFIG environment variable, 2016-08-03). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/confparser.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 789300e..e7128be 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -4,7 +4,11 @@ function config_load() { global $AUR_CONFIG; if (!isset($AUR_CONFIG)) { - $AUR_CONFIG = parse_ini_file("/etc/aurweb/config", true, INI_SCANNER_RAW); + $path = getenv('AUR_CONFIG'); + if (!$path) { + $path = "/etc/aurweb/config"; + } + $AUR_CONFIG = parse_ini_file($path, true, INI_SCANNER_RAW); } } -- 2.11.1

1 0

[aur-dev] [PATCH 1/3] Hide the table sorting links on the dashboard
by Lukas Fleischer 04 Feb '17

04 Feb '17

The tables on the dashboard always show the 50 most recent packages, ordered by last update. Do not make the table headers of these tables clickable. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_search_results.php | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index d596ec2..264d35b 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,4 +1,23 @@ <?php +if ($show_headers) { + $fmtth = function($title, $sb=false, $so=false, $hint=false) { + echo '<th>'; + if ($sb) { + echo '<a href="' . mkurl('SB=' . $sb . '&SO = ' . $so) . '">' . $title . '</a>'; + } else { + echo $title; + } + if ($hint) { + echo '<span title="' . $hint . '" class="hover-help"><sup>?</sup></span>'; + } + echo '</th>'; + }; +} else { + $fmtth = function($title, $sb=false, $so=false, $hint=false) { + echo '<th>' . $title . '</th>'; + }; +} + if (!$result): ?> <p><?= __("Error retrieving package list.") ?></p> <?php elseif ($total == 0): ?> @@ -33,16 +52,16 @@ if (!$result): ?> <?php if ($SID && $show_headers): ?> <th> </th> <?php endif; ?> - <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> - <th><?= __("Version") ?></th> - <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> - <th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a><span title="<?= __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98) ?>" class="hover-help"><sup>?</sup></span></th> + <?php $fmtth(__('Name'), 'n', $SO_next) ?> + <?php $fmtth(__('Version')) ?> + <?php $fmtth(__('Votes'), 'v', $SO_next) ?> + <?php $fmtth(__('Popularity'), 'p', $SO_next, __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98)) ?> <?php if ($SID): ?> - <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> - <th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th> + <?php $fmtth(__('Voted'), 'w', $SO_next) ?> + <?php $fmtth(__('Notify'), 'o', $SO_next) ?> <?php endif; ?> - <th><?= __("Description") ?></th> - <th><a href="?<?= mkurl('SB=m&SO=' . $SO_next) ?>"><?= __("Maintainer") ?></a></th> + <?php $fmtth(__('Description')) ?> + <?php $fmtth(__('Maintainer'), 'm', $SO_next) ?> </tr> </thead> <tbody> -- 2.11.1

1 2

[aur-dev] [PATCH 1/4] Split out the search form from pkg_search_page()
by Lukas Fleischer 04 Feb '17

04 Feb '17

This makes it easier to display search results without showing the search form. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/packages.php | 3 ++- web/lib/pkgfuncs.inc.php | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 1b89278..8fd3266 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -80,8 +80,9 @@ $(document).ready(function() { </script> <?php +include('pkg_search_form.php'); + if (isset($pkgid)) { - include('pkg_search_form.php'); if ($pkgid) { if (isset($_COOKIE["AURSID"])) { pkg_display_details($pkgid, $details, $_COOKIE["AURSID"]); diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8ca8835..8a5cf57 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -888,8 +888,6 @@ function pkg_search_page($SID="") { $templ_pages[__('Last') . ' »'] = ($pages - 1) * $per_page; } - include('pkg_search_form.php'); - $searchresults = array(); if ($result) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) { -- 2.11.1

1 4