diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2015-06-11 13:31:40 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2015-06-11 13:36:27 +0200 |
| commit | d1fd6f4897b1e7891375c3b170e2cd8854836517 (patch) | |
| tree | 96cc0a3f418f5b3ac2a853c273d280d4c2d23077 | |
| parent | ef142b23127c910f20b3321c051619f475580797 (diff) | |
| download | aur-d1fd6f4897b1e7891375c3b170e2cd8854836517.tar.gz aur-d1fd6f4897b1e7891375c3b170e2cd8854836517.tar.xz | |
Make URIs to the individual cgit pages configurable
Make the locations of the PKGBUILD preview, the log and the snapshot
tarball configurable. This increases flexibility and simplifies the code
a bit.
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
| -rw-r--r-- | conf/config.proto | 4 | ||||
| -rw-r--r-- | web/template/pkg_details.php | 10 | ||||
| -rw-r--r-- | web/template/pkgbase_details.php | 10 |
3 files changed, 15 insertions, 9 deletions
diff --git a/conf/config.proto b/conf/config.proto index 94ef8e61..1d3e3291 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -18,7 +18,6 @@ persistent_cookie_timeout = 2592000 max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org -cgit_uri = https://aur.archlinux.org/cgit/aur.git git_clone_uri_anon = https://aur.archlinux.org/%s.git/ git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/ max_rpc_results = 5000 @@ -26,6 +25,9 @@ aur_request_ml = aur-requests@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 +log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s +snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 7c68c308..e50f0293 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,6 +1,8 @@ <?php -$cgit_uri = config_get('options', 'cgit_uri'); +$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), 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'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['BaseName'])); @@ -82,10 +84,10 @@ $sources = pkg_sources($row["ID"]); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['BaseName']) ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['BaseName']) ?>"><?= __('View Changes') ?></a> + <a href="<?= $pkgbuild_uri ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $log_uri ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['BaseName']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <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"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index a425c4c1..2ef8788a 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -1,6 +1,8 @@ <?php -$cgit_uri = config_get('options', 'cgit_uri'); +$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['Name'])); +$log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['Name'])); +$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['Name'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); @@ -33,10 +35,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['Name']) ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['Name']) ?>"><?= __('View Changes') ?></a> + <a href="<?= $pkgbuild_uri ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $log_uri ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['Name']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <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"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> |