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

[aur-dev] [PATCH v6] pkg_details.php: Show keywords
by Marcel Korpel 18 Jun '15

18 Jun '15

Keywords are hyperlinked so a user can search for other packages with the same name and/or keyword. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- Small improvement to make the focus border stick out of the focused element. web/html/css/aurweb.css | 23 +++++++++++++++++++++++ web/template/pkg_details.php | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..7f63abb 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,29 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword:link, .keyword:visited { + float: left; + margin: 1px 2px 1px 0; + border: 1px solid transparent; + padding: 2px .5em; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + +.keyword:hover { + color: #FFF; + cursor: pointer; +} + +.keyword:focus { + border: 1px dotted #000; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..8cae135 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> - <td> + <td id="keywords"> +<?php + if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,18 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php + else: + foreach ($keywords as $kw) { + echo ' <a class="keyword" href="'; + /* Several default search parameters are hard-coded, + perhaps this should be changed/configured somewhere */ + echo get_uri('/packages/') . '?O=0&SeB=nd&K=' . urlencode($kw); + echo '&outdated=&SB=p&SO=a&PP=50&do_Search=Go'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } + endif; +?> </td> </tr> <?php endif; ?> -- 2.4.4

2 2

[aur-dev] 4.0.0 string freeze
by Lukas Fleischer 18 Jun '15

18 Jun '15

Dear translators, I just submitted the final message catalog for the 4.0.0 release. Please upload your translations until the end of July. Regards, Lukas

1 0

[aur-dev] [PATCH v2] Improve INSTALL details for nginx and config
by Leonidas Spyropoulos 18 Jun '15

18 Jun '15

Signed-off-by: Leonidas Spyropoulos <artafinde(a)gmail.com> --- INSTALL | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 9040c17..b090789 100644 --- a/INSTALL +++ b/INSTALL @@ -9,11 +9,29 @@ Setup on Arch Linux 2) Setup a web server with PHP and MySQL. Configure the web server to redirect all URLs to /index.php/foo/bar/. The following block can be used with nginx: - location ~ .* { - rewrite ^/(.*)$ /index.php/$1 last; + server { + listen 80; + server_name aur.local aur; + + root /srv/http/aurweb/web/html; + index index.php; + + location ~ ^/[^/]+\.php($|/) { + fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; + fastcgi_index index.php; + fastcgi_split_path_info ^(/[^/]+\.php)(/.*)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include fastcgi_params; + } + + location ~ .* { + rewrite ^/(.*)$ /index.php/$1 last; + } } -3) Copy conf/config.proto to conf/config and adjust the configuration. +3) Copy conf/config.proto to conf/config and adjust the configuration (pay + attention to disable_http_login, enable_maintenance and aur_location). 4) Create a new MySQL database and a user and import the AUR SQL schema: -- 2.4.4

2 1

[aur-dev] [PATCH] Improve INSTALL details for nginx and config
by Leonidas Spyropoulos 18 Jun '15

18 Jun '15

Signed-off-by: Leonidas Spyropoulos <artafinde(a)gmail.com> --- INSTALL | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 9040c17..78d041a 100644 --- a/INSTALL +++ b/INSTALL @@ -9,11 +9,29 @@ Setup on Arch Linux 2) Setup a web server with PHP and MySQL. Configure the web server to redirect all URLs to /index.php/foo/bar/. The following block can be used with nginx: - location ~ .* { - rewrite ^/(.*)$ /index.php/$1 last; - } - -3) Copy conf/config.proto to conf/config and adjust the configuration. + server { + listen 80; + server_name aur.local aur; + + root /srv/http/aurweb/web/html; + index index.php; + + location ~ ^/[^/]+\.php($|/) { + fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; + fastcgi_index index.php; + fastcgi_split_path_info ^(/[^/]+\.php)(/.*)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include fastcgi_params; + } + + location ~ .* { + rewrite ^/(.*)$ /index.php/$1 last; + } + } + +3) Copy conf/config.proto to conf/config and adjust the configuration (pay + attention to disable_http_login, enable_maintenance and aur_location) 4) Create a new MySQL database and a user and import the AUR SQL schema: -- 2.4.3

2 1

[aur-dev] [PATCH v5] pkg_details.php: Show keywords
by Marcel Korpel 17 Jun '15

17 Jun '15

Keywords are hyperlinked so a user can search for other packages with the same name and/or keyword. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 23 +++++++++++++++++++++++ web/template/pkg_details.php | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..5691042 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,29 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword:link, .keyword:visited { + float: left; + margin: 1px 2px 1px 0; + padding: 2px 6px; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + +.keyword:hover { + color: #FFF; + cursor: pointer; +} + +.keyword:focus { + padding: 1px 5px; + border: 1px dotted #000; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..8cae135 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> - <td> + <td id="keywords"> +<?php + if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,18 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php + else: + foreach ($keywords as $kw) { + echo ' <a class="keyword" href="'; + /* Several default search parameters are hard-coded, + perhaps this should be changed/configured somewhere */ + echo get_uri('/packages/') . '?O=0&SeB=nd&K=' . urlencode($kw); + echo '&outdated=&SB=p&SO=a&PP=50&do_Search=Go'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } + endif; +?> </td> </tr> <?php endif; ?> -- 2.4.3

1 0

[aur-dev] [PATCH v4] pkg_details.php: Show keywords
by Marcel Korpel 17 Jun '15

17 Jun '15

Keywords are hyperlinked so a user can search for other packages with the same name and/or keyword. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 18 ++++++++++++++++++ web/template/pkg_details.php | 19 +++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..10243da 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,24 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword:link, .keyword:visited { + float: left; + margin: 1px 2px 1px 0; + padding: 2px .5em; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + +.keyword:hover { + color: #FFF; + cursor: pointer; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..8cae135 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> - <td> + <td id="keywords"> +<?php + if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,18 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php + else: + foreach ($keywords as $kw) { + echo ' <a class="keyword" href="'; + /* Several default search parameters are hard-coded, + perhaps this should be changed/configured somewhere */ + echo get_uri('/packages/') . '?O=0&SeB=nd&K=' . urlencode($kw); + echo '&outdated=&SB=p&SO=a&PP=50&do_Search=Go'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } + endif; +?> </td> </tr> <?php endif; ?> -- 2.4.3

1 0

[aur-dev] [PATCH v3] pkg_details.php: Show keywords
by Marcel Korpel 17 Jun '15

17 Jun '15

Keywords are hyperlinked so a user can search for other packages with the same name and/or keyword. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 18 ++++++++++++++++++ web/template/pkg_details.php | 19 +++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..10243da 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,24 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword:link, .keyword:visited { + float: left; + margin: 1px 2px 1px 0; + padding: 2px .5em; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + +.keyword:hover { + color: #FFF; + cursor: pointer; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..88c3f03 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> - <td> + <td id="keywords"> +<?php + if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,18 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php + else: + foreach ($keywords as $kw) { + echo ' <a class="keyword" href="'; + /* Several default search parameters are hard-coded, + perhaps this should be changed/configured somewhere */ + echo get_uri('/packages/') . '?O=0&SeB=d&K=' . urlencode($kw); + echo '&outdated=&SB=p&SO=a&PP=50&do_Search=Go'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } + endif; +?> </td> </tr> <?php endif; ?> -- 2.4.3

1 1

[aur-dev] [PATCH] pkg_details.php: Show keywords
by Marcel Korpel 17 Jun '15

17 Jun '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 13 +++++++++++++ web/template/pkg_details.php | 12 ++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..dfa97bd 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,19 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword { + float: left; + margin: 1px 2px 1px 0; + padding: 2px .5em; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..51a1029 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -189,12 +189,12 @@ $sources = pkg_sources($row["ID"]); <th><?= __('Upstream URL') . ': ' ?></th> <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> + <tr> + <th><?= __('Keywords') . ': ' ?></th> + <td id="keywords"> <?php if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): ?> - <tr> - <th><?= __('Keywords') . ': ' ?></th> - <td> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,9 +205,13 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php else: + foreach ($keywords as $kw) { + echo ' <span class="keyword">' . htmlspecialchars($kw) . "</span>\n"; + } + endif; ?> </td> </tr> -<?php endif; ?> <?php if (count($lics) > 0): ?> <tr> <th><?= __('Licenses') . ': ' ?></th> -- 2.4.3

2 2

[aur-dev] [PATCH v2] pkg_details.php: Show keywords
by Marcel Korpel 17 Jun '15

17 Jun '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/css/aurweb.css | 13 +++++++++++++ web/template/pkg_details.php | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..dfa97bd 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,19 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword { + float: left; + margin: 1px 2px 1px 0; + padding: 2px .5em; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..dd07b47 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> - <td> + <td id="keywords"> +<?php + if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,13 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php + else: + foreach ($keywords as $kw) { + echo ' <span class="keyword">' . htmlspecialchars($kw) . "</span>\n"; + } + endif; +?> </td> </tr> <?php endif; ?> -- 2.4.3

1 0

[aur-dev] [PATCH] Clarify that HTTPs clone URIs are for read-only access
by Lukas Fleischer 17 Jun '15

17 Jun '15

Fixes FS#45335. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_details.php | 2 +- web/template/pkgbase_details.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..90e5729 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -171,7 +171,7 @@ $sources = pkg_sources($row["ID"]); <tr> <th><?= __('Git Clone URL') . ': ' ?></th> <td> - <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> + <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> (<?= __('read-only') ?>) <?php if ($uid == $row["MaintainerUID"]): ?> <br /> <a href="<?= $git_clone_uri_priv ?>"><?= $git_clone_uri_priv ?></a> <?php endif; ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index fa24e12..9989369 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -122,7 +122,7 @@ $pkgs = pkgbase_get_pkgnames($base_id); <tr> <th><?= __('Git Clone URL') . ': ' ?></th> <td> - <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> + <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> (<?= __('read-only') ?>) <?php if ($uid == $row["MaintainerUID"]): ?> <br /> <a href="<?= $git_clone_uri_priv ?>"><?= $git_clone_uri_priv ?></a> <?php endif; ?> -- 2.4.3

1 0