October 2012 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Return 404 for invalid account/package subpages
by Lukas Fleischer 30 Oct '12

30 Oct '12

Display an error page and return a 404 status code in the following cases: * An invalid package name is passed to the "packages" action. * An invalid user name is passed to the "account" action. * An invalid package action is passed. * An invalid account action is passed. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/index.php | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 422c0e5..3b46ab9 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -7,15 +7,21 @@ include_once("pkgfuncs.inc.php"); $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); -if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { - if (isset($tokens[2])) { +if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { + if (!empty($tokens[2])) { /* TODO: Create a proper data structure to pass variables from * the routing framework to the individual pages instead of * initializing arbitrary variables here. */ $pkgname = $tokens[2]; $pkgid = pkgid_from_name($pkgname); - if (isset($tokens[3])) { + if (!$pkgid) { + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; + } + + if (!empty($tokens[3])) { if ($tokens[3] == 'voters') { $_GET['ID'] = pkgid_from_name($tokens[2]); include('voters.php'); @@ -49,6 +55,10 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "merge": include('pkgmerge.php'); return; + default: + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; } if (isset($_COOKIE['AURSID'])) { @@ -60,17 +70,25 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } include get_route('/' . $tokens[1]); -} elseif (isset($tokens[1]) && '/' . $tokens[1] == get_user_route()) { - if (isset($tokens[2])) { - $_REQUEST['U'] = $tokens[2]; +} elseif (!empty($tokens[1]) && '/' . $tokens[1] == get_user_route()) { + if (!empty($tokens[2])) { + $_REQUEST['ID'] = uid_from_username($tokens[2]); - if (isset($tokens[3])) { + if (!$_REQUEST['ID']) { + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; + } + + if (!empty($tokens[3])) { if ($tokens[3] == 'edit') { $_REQUEST['Action'] = "DisplayAccount"; } elseif ($tokens[3] == 'update') { $_REQUEST['Action'] = "UpdateAccount"; } else { - $_REQUEST['Action'] = "AccountInfo"; + header("HTTP/1.0 404 Not Found"); + include "./404.php"; + return; } } else { $_REQUEST['Action'] = "AccountInfo"; -- 1.8.0

1 0

[aur-dev] [PATCH] pkgsubmit.php: Check that there is one directory in a tarball
by canyonknight 28 Oct '12

28 Oct '12

Users are able to upload tarballs without a directory. The directory count for a tarball is available, so use it to display an error when there is not a single directory. This patch has no effect on users who generate their uploaded tarballs using makepkg. All other users must include a directory in their tarball. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- The error message isn't great. But this avoids messing up the string freeze. web/html/pkgsubmit.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index efd90e1..885c44f 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -106,6 +106,10 @@ if ($uid): } } + if (!$error && $dircount !== 1) { + $error = __("Error - source tarball may not contain files outside a directory."); + } + if (!$error && empty($pkgbuild_raw)) { $error = __("Error trying to unpack upload - PKGBUILD does not exist."); } -- 1.8.0

2 1

[aur-dev] [PATCH] home.php: Remove unneeded tables
by Lukas Fleischer 28 Oct '12

28 Oct '12

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/home.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/web/html/home.php b/web/html/home.php index 40ad5fe..97de8bb 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -100,22 +100,10 @@ $dbh = db_connect(); </form> </div> <div id="pkg-updates" class="widget box"> - <table> - <tr> - <td class="pkg-name"> - <?php updates_table($dbh); ?> - </td> - </tr> - </table> + <?php updates_table($dbh); ?> </div> <div id="pkg-stats" class="widget box"> - <table> - <tr> - <td class="pkg-name"> - <?php general_stats_table($dbh); ?> - </td> - </tr> - </table> + <?php general_stats_table($dbh); ?> </div> </div> -- 1.8.0

1 0

[aur-dev] AUR 2.0.0-rc2 released
by Lukas Fleischer 28 Oct '12

28 Oct '12

2.0.0-rc2 has been released. The demo setup [1] is already up-to-date. The final release is scheduled for next week, please report any bugs to the bug tracker [2]. [1] https://dev.aur.archlinux.org/ [2] https://bugs.archlinux.org/index.php?project=2

3 4

[aur-dev] 2.0.0 string freeze
by Lukas Fleischer 28 Oct '12

28 Oct '12

Strings are frozen for one week [1]. 2.0.0 is expected to be released on next Sunday (04 Feb 2012). A lot of languages still need to be updated. These include: * German * French * Catalan * Greek * Spanish * Hungarian * Italian * Norwegian Bokmål * Polish * Portuguese (Portugal) * Romanian * Serbian * Turkish * Finnish * Russian * Chinese (China) All of these were ~100% complete before the new strings were pushed and need some additions for 2.0.0. Thanks in advance to all translation contributors! [1] https://www.transifex.com/projects/p/aur/r/2-0-0/

2 2

[aur-dev] [HEADS-UP] API changes in 2.0.0
by Lukas Fleischer 27 Oct '12

27 Oct '12

Just another reminder to all users of the RPC interface. As I mentioned before [1], 2.0.0 introduces a couple of API changes: * 0557f7705ab12c84e53a5f2dc352557b908af511 [2] * 168a51431bda11d2250a26e8acb8b05c0876092e [3] * e53b91fe52be262d94a45769814c1e87c796988b [4] * 47c5167acb0a4a2c809c03dc664fea1d130d0c8b [5] * 795971bc806776ad48de6f0135736cbaaefa5fcd [6] * 04a0fd47482f513c24645eb3f8b88b07303f9ec4 [7] * 53a31865f41db7315dc5c99e1b100f397ef80b1a [8] Please make sure to fix your RPC clients. AUR 2.0.0 will be released in one week. Also make sure you use the "URLPath" parameter included in RPC responses to locate source tarballs instead of hardcoding paths (no helpers should rely on the existence of a "/packages/" subdirectory -- this might be changed in the future)! [1] https://mailman.archlinux.org/pipermail/aur-dev/2012-October/002175.html [2] https://projects.archlinux.org/aur.git/commit/?id=43a69e71 [3] https://projects.archlinux.org/aur.git/commit/?id=0557f770 [4] https://projects.archlinux.org/aur.git/commit/?id=168a5143 [5] https://projects.archlinux.org/aur.git/commit/?id=e53b91fe [6] https://projects.archlinux.org/aur.git/commit/?id=47c5167a [7] https://projects.archlinux.org/aur.git/commit/?id=795971bc [8] https://projects.archlinux.org/aur.git/commit/?id=04a0fd47

1 1

[aur-dev] [PATCH] Implement word-wrap for package statistics
by Lukas Fleischer 27 Oct '12

27 Oct '12

Word-wrap labels in the package statistics box, just as we wrap package names in the "Recent Updates" box. Addresses FS#32160. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 4 ++++ web/template/stats/general_stats_table.php | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index dada258..bae8e21 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -10,3 +10,7 @@ #pkg-updates td.pkg-new { padding: 0 .5em; } + +#pkg-stats td.stat-desc { + white-space: normal; +} diff --git a/web/template/stats/general_stats_table.php b/web/template/stats/general_stats_table.php index 6a92c3b..5b59832 100644 --- a/web/template/stats/general_stats_table.php +++ b/web/template/stats/general_stats_table.php @@ -2,35 +2,35 @@ <table> <tr> - <td><?= __("Packages"); ?></td> + <td class="stat-desc"><?= __("Packages"); ?></td> <td><?= $unsupported_count; ?></td> </tr> <tr> - <td><?= __("Orphan Packages"); ?></td> + <td class="stat-desc"><?= __("Orphan Packages"); ?></td> <td><?= $orphan_count; ?></td> </tr> <tr> - <td><?= __("Packages added in the past 7 days"); ?></td> + <td class="stat-desc"><?= __("Packages added in the past 7 days"); ?></td> <td><?= $add_count; ?></td> </tr> <tr> - <td><?= __("Packages updated in the past 7 days"); ?></td> + <td class="stat-desc"><?= __("Packages updated in the past 7 days"); ?></td> <td><?= $update_count; ?></td> </tr> <tr> - <td><?= __("Packages updated in the past year"); ?></td> + <td class="stat-desc"><?= __("Packages updated in the past year"); ?></td> <td><?= $update_year_count; ?></td> </tr> <tr> - <td><?= __("Packages never updated"); ?></td> + <td class="stat-desc"><?= __("Packages never updated"); ?></td> <td><?= $never_update_count; ?></td> </tr> <tr> - <td><?= __("Registered Users"); ?></td> + <td class="stat-desc"><?= __("Registered Users"); ?></td> <td><?= $user_count; ?></td> </tr> <tr> - <td><?= __("Trusted Users"); ?></td> + <td class="stat-desc"><?= __("Trusted Users"); ?></td> <td><?= $tu_count; ?></td> </tr> </table> -- 1.8.0

1 0

[aur-dev] [PATCH v2] aurjson.class.php: Limit number of RPC results
by canyonknight 22 Oct '12

22 Oct '12

With no limit to the number of results, memory_limit set to 32M can easily be exceeded for searches that have a large number of results. This results in an HTTP error 500 for those queries. Limit results to an amount set within config.inc.php to avoid exceeding memory_limit. Introduce new JSON error code for when the result limit is hit. Fixes FS#31849 Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/aurjson.class.php | 22 +++++++++++++++++----- web/lib/config.inc.php.proto | 4 ++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index fbdc711..949c34f 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -117,6 +117,7 @@ class AurJSON { } private function process_query($type, $where_condition) { + global $MAX_RPC_RESULTS; $fields = implode(',', self::$fields); $query = "SELECT Users.Username as Maintainer, {$fields} " . "FROM Packages LEFT JOIN Users " . @@ -149,6 +150,10 @@ class AurJSON { } } + if ($resultcount === $MAX_RPC_RESULTS) { + return $this->json_error('Too many package results.'); + } + return $this->json_results($type, $resultcount, $search_data); } else { @@ -191,6 +196,7 @@ class AurJSON { * @return mixed Returns an array of package matches. **/ private function search($keyword_string) { + global $MAX_RPC_RESULTS; if (strlen($keyword_string) < 2) { return $this->json_error('Query arg too small'); } @@ -198,7 +204,8 @@ class AurJSON { $keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%"); $where_condition = "(Name LIKE {$keyword_string} OR "; - $where_condition.= "Description LIKE {$keyword_string})"; + $where_condition.= "Description LIKE {$keyword_string}) "; + $where_condition.= "LIMIT {$MAX_RPC_RESULTS}"; return $this->process_query('search', $where_condition); } @@ -227,6 +234,7 @@ class AurJSON { * @return mixed Returns an array of results containing the package data **/ private function multiinfo($pqdata) { + global $MAX_RPC_RESULTS; $args = $this->parse_multiinfo_args($pqdata); $ids = $args['ids']; $names = $args['names']; @@ -238,17 +246,19 @@ class AurJSON { $where_condition = ""; if ($ids) { $ids_value = implode(',', $args['ids']); - $where_condition .= "ID IN ({$ids_value})"; + $where_condition .= "ID IN ({$ids_value}) "; } if ($ids && $names) { - $where_condition .= " OR "; + $where_condition .= "OR "; } if ($names) { // individual names were quoted in parse_multiinfo_args() $names_value = implode(',', $args['names']); - $where_condition .= "Name IN ({$names_value})"; + $where_condition .= "Name IN ({$names_value}) "; } + $where_condition .= "LIMIT {$MAX_RPC_RESULTS}"; + return $this->process_query('multiinfo', $where_condition); } @@ -258,9 +268,11 @@ class AurJSON { * @return mixed Returns an array of value data containing the package data **/ private function msearch($maintainer) { + global $MAX_RPC_RESULTS; $maintainer = $this->dbh->quote($maintainer); - $where_condition = "Users.Username = {$maintainer}"; + $where_condition = "Users.Username = {$maintainer} "; + $where_condition .= "LIMIT {$MAX_RPC_RESULTS}"; return $this->process_query('msearch', $where_condition); } diff --git a/web/lib/config.inc.php.proto b/web/lib/config.inc.php.proto index f132445..1fe7dbc 100644 --- a/web/lib/config.inc.php.proto +++ b/web/lib/config.inc.php.proto @@ -55,3 +55,7 @@ $AUR_LOCATION = "http://localhost"; # Use virtual URLs -- to enable this feature, you also need to tell your web # server to redirect all requests to "/index.php/$uri". $USE_VIRTUAL_URLS = true; + +# Maximum number of package results to return through an RPC connection. +# Avoid setting this too high and having a PHP too much memory error. +$MAX_RPC_RESULTS = 5000; -- 1.7.12.4

2 1

[aur-dev] [PATCH] Use HTTPS links everywhere for Arch sites
by Dan McGee 22 Oct '12

22 Oct '12

The main site, wiki, and BBS are using HTTPS exclusively, so link directly to the correct protocol rather than forcing a redirect. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- HACKING | 2 +- README | 2 +- TRANSLATING | 2 +- UPGRADING | 2 +- support/schema/aur-schema.sql | 2 +- web/html/home.php | 10 +++++----- web/html/passreset.php | 2 +- web/template/header.php | 8 ++++---- web/template/pkg_details.php | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/HACKING b/HACKING index 4f0831c..291da1f 100644 --- a/HACKING +++ b/HACKING @@ -32,7 +32,7 @@ Submitting patches Submit uncompressed git-formatted patches to aur-dev(a)archlinux.org. You will need to register on the mailing list before submitting: -http://mailman.archlinux.org/mailman/listinfo/aur-dev +https://mailman.archlinux.org/mailman/listinfo/aur-dev Base your patches on the master branch as forward development is done there. When writing patches please keep unnecessary changes to a minimum. diff --git a/README b/README index 805e0ce..8f6892a 100644 --- a/README +++ b/README @@ -64,4 +64,4 @@ Contact: ======== Questions, comments, and patches related to the AUR can be sent to the AUR development mailing list: aur-dev(a)archlinux.org -Mailing list archives: http://mailman.archlinux.org/mailman/listinfo/aur-dev +Mailing list archives: https://mailman.archlinux.org/mailman/listinfo/aur-dev diff --git a/TRANSLATING b/TRANSLATING index d8f1bd4..8f729c8 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -2,7 +2,7 @@ AUR Translation ================ This document describes how to create and maintain AUR translations. It was -originally derived from http://wiki.archlinux.org/index.php/AUR_Translation +originally derived from https://wiki.archlinux.org/index.php/AUR_Translation Creating an AUR translation requires a Transifex (http://www.transifex.net/) account. You will need to register with a translation team on the AUR project diff --git a/UPGRADING b/UPGRADING index a0d4a95..dcf9169 100644 --- a/UPGRADING +++ b/UPGRADING @@ -170,7 +170,7 @@ ALTER TABLE PackageCategories MODIFY Category VARCHAR(32) NOT NULL; ALTER TABLE Packages MODIFY Name VARCHAR(64) NOT NULL, MODIFY Version VARCHAR(32) NOT NULL DEFAULT '', MODIFY Description VARCHAR(255) NOT NULL DEFAULT "An Arch Package", - MODIFY URL VARCHAR(255) NOT NULL DEFAULT "http://www.archlinux.org", + MODIFY URL VARCHAR(255) NOT NULL DEFAULT "https://www.archlinux.org", MODIFY License VARCHAR(40) NOT NULL DEFAULT ''; ALTER TABLE PackageSources MODIFY Source VARCHAR(255) NOT NULL DEFAULT "/dev/null"; diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 726fd2f..d55cf1a 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -97,7 +97,7 @@ CREATE TABLE Packages ( Version VARCHAR(32) NOT NULL DEFAULT '', CategoryID TINYINT UNSIGNED NOT NULL DEFAULT 1, Description VARCHAR(255) NOT NULL DEFAULT "An Arch Package", - URL VARCHAR(255) NOT NULL DEFAULT "http://www.archlinux.org", + URL VARCHAR(255) NOT NULL DEFAULT "https://www.archlinux.org", License VARCHAR(40) NOT NULL DEFAULT '', NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0, OutOfDateTS BIGINT UNSIGNED NULL DEFAULT NULL, diff --git a/web/html/home.php b/web/html/home.php index 4d5b699..40ad5fe 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -22,9 +22,9 @@ $dbh = db_connect(); <?php echo __( 'Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information.', - '<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">', + '<a href="https://wiki.archlinux.org/index.php/AUR_User_Guidelines">', '</a>', - '<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', + '<a href="https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', '</a>' ); ?> @@ -34,7 +34,7 @@ $dbh = db_connect(); echo __( 'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!', '<strong>', '</strong>', - '<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', + '<a href="https://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '</a>' ); ?> @@ -48,9 +48,9 @@ $dbh = db_connect(); <?php echo __( 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. This list can be used for package orphan requests, merge requests, and deletion requests. For discussion relating to the development of the AUR, use the %saur-dev%s mailing list.', - '<a href="http://mailman.archlinux.org/mailman/listinfo/aur-general">', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>', - '<a href="http://mailman.archlinux.org/mailman/listinfo/aur-dev">', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', '</a>' ); ?> diff --git a/web/html/passreset.php b/web/html/passreset.php index 42dfc86..064e3de 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -100,7 +100,7 @@ html_header(__("Password Reset")); } else { ?> <p><?= __('If you have forgotten the e-mail address you used to register, please send a message to the %saur-general%s mailing list.', - '<a href="http://mailman.archlinux.org/mailman/listinfo/aur-general">', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>'); ?></p> <form action="" method="post"> <p><?= __("Enter your e-mail address:"); ?> diff --git a/web/template/header.php b/web/template/header.php index 265d638..a60174b 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -13,16 +13,16 @@ </head> <body> <div id="archnavbar" class="anb-aur"> - <div id="archnavbarlogo"><h1><a href="http://www.archlinux.org" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarlogo"><h1><a href="https://www.archlinux.org/" title="Return to the main page">Arch Linux</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> - <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> - <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> + <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> + <li id="anb-packages"><a href="https://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li> <li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li> - <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> + <li id="anb-download"><a href="https://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> </ul> </div> </div> diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 74f9257..1c76557 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -192,7 +192,7 @@ if ($row["MaintainerUID"]): ?> <li><a href="<?= htmlspecialchars(get_pkg_uri($darr[0]), ENT_QUOTES); ?>" title="<?= __('View packages details for').' '.$darr[0].$darr[1]?>"><?= $darr[0].$darr[1]?></a></li> <?php else: ?> - <li><a href="http://www.archlinux.org/packages/?q=<?= urlencode($darr[0])?>" title="<?= __('View packages details for').' '.$darr[0].$darr[1] ?>"><?= $darr[0].$darr[1] ?></a></li> + <li><a href="https://www.archlinux.org/packages/?q=<?= urlencode($darr[0])?>" title="<?= __('View packages details for').' '.$darr[0].$darr[1] ?>"><?= $darr[0].$darr[1] ?></a></li> <?php endif; ?> <?php endwhile; ?> </ul> -- 1.7.12.4

2 1

[aur-dev] [PATCH] Link to the HTTPs login page in the header
by Lukas Fleischer 20 Oct '12

20 Oct '12

Change the login link so that it points directly to the HTTPs version of the login page if "$DISABLE_HTTP_LOGIN" is set and if HTTP is used. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aur.inc.php | 2 ++ web/template/header.php | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 93ae23b..018d5c8 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -298,6 +298,8 @@ function db_connect() { * @return void */ function html_header($title="") { + global $AUR_LOCATION; + global $DISABLE_HTTP_LOGIN; global $LANG; global $SUPPORTED_LANGS; diff --git a/web/template/header.php b/web/template/header.php index c78f1e3..265d638 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -63,7 +63,11 @@ <li><a href="<?= get_uri('/logout/'); ?>"><?= __("Logout"); ?></a></li> <?php else: ?> <li><a href="<?= get_uri('/register/'); ?>"><?= __("Register"); ?></a></li> + <?php if ($DISABLE_HTTP_LOGIN && empty($_SERVER['HTTPS'])): ?> + <li><a href="<?= $AUR_LOCATION . get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> + <?php else: ?> <li><a href="<?= get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> + <?php endif; ?> <?php endif; ?> </ul> </div> -- 1.7.12.4

1 0