From 6ec4a3589e327ded693ab0c741828fc5ec66b840 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Sun, 21 Feb 2016 19:44:38 +0100
Subject: Send notifications when changing ownership

Add a new option that makes it possible to subscribe to package
ownership changes (adoption/disownment).

Fixes FS#15412.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/account_edit_form.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'web/template')

diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index b9affd6..b4f0192 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -143,6 +143,10 @@
 			<label for="id_updatenotify"><?= __("Notify of package updates") ?>:</label>
 			<input type="checkbox" name="UN" id="id_updatenotify" <?= $UN ? 'checked="checked"' : '' ?> />
 		</p>
+		<p>
+			<label for="id_ownershipnotify"><?= __("Notify of ownership changes") ?>:</label>
+			<input type="checkbox" name="ON" id="id_ownershipnotify" <?= $ON ? 'checked="checked"' : '' ?> />
+		</p>
 	</fieldset>
 
 	<fieldset>
-- 
cgit v1.2.3-54-g00ecf


From 2ef5f8a5ff23ee0b45a67f1d2ca3f646f09c2ff5 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com>
Date: Thu, 17 Mar 2016 15:58:14 -0400
Subject: Change text of enable notifications link

Since notifications are sent for more than just comments, change the notify
link to more generic text.

Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/pkgbase_actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php
index 237e712..d3f0592 100644
--- a/web/template/pkgbase_actions.php
+++ b/web/template/pkgbase_actions.php
@@ -24,7 +24,7 @@
 			<?php if (pkgbase_user_notify($uid, $base_id)): ?>
 			<li><?= html_action_form($base_uri . 'unnotify/', "do_UnNotify", __('Disable notifications')) ?></li>
 			<?php else: ?>
-			<li><?= html_action_form($base_uri . 'notify/', "do_Notify", __('Notify of new comments')) ?></li>
+			<li><?= html_action_form($base_uri . 'notify/', "do_Notify", __('Enable notifications')) ?></li>
 			<?php endif; ?>
 
 			<?php if (has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array($row["MaintainerUID"]))): ?>
-- 
cgit v1.2.3-54-g00ecf


From e17e88a2e20531914cda220543c55d991b99721c Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Mon, 23 May 2016 22:53:12 +0200
Subject: Add request type hints

Add a text that explains when the currently selected request type should
be used.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/pkgreq_form.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
index 4fd7851..639326e 100644
--- a/web/template/pkgreq_form.php
+++ b/web/template/pkgreq_form.php
@@ -16,7 +16,7 @@
 			<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 			<p>
 				<label for="id_type"><?= __("Request type") ?>:</label>
-				<select name="type" id="id_type" onchange="showHideMergeSection()">
+				<select name="type" id="id_type" onchange="showHideMergeSection(); showHideRequestHints()">
 					<option value="deletion"><?= __('Deletion') ?></option>
 					<option value="merge"><?= __('Merge') ?></option>
 					<?php if (pkgbase_maintainer_uid($base_id)): ?>
@@ -35,8 +35,16 @@
 				}
 			}
 
+			function showHideRequestHints() {
+				$('#deletion_hint').hide();
+				$('#merge_hint').hide();
+				$('#orphan_hint').hide();
+				$('#' + $('#id_type').val() + '_hint').show();
+			}
+
 			$(document).ready(function() {
 				showHideMergeSection();
+				showHideRequestHints();
 
 				$('#id_merge_into').typeahead({
 					source: function(query, callback) {
@@ -59,6 +67,15 @@
 				<label for="id_comments"><?= __("Comments") ?>:</label>
 				<textarea name="comments" id="id_comments" rows="5" cols="50"></textarea>
 			</p>
+			<p id="deletion_hint">
+				<?= 'By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.' ?>
+			</p>
+			<p id="merge_hint">
+				<?= 'By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.' ?>
+			</p>
+			<p id="orphan_hint">
+				<?= 'By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.' ?>
+			</p>
 			<p>
 				<input type="submit" class="button" name="do_FileRequest" value="<?= __("Submit Request") ?>" />
 			</p>
-- 
cgit v1.2.3-54-g00ecf


From 333596ab4aca12bd9444196066f1511f07650f3f Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Wed, 8 Jun 2016 22:02:03 +0200
Subject: Update Arch Linux projects subdomain

The projects.archlinux.org subdomain was moved to git.archlinux.org.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 INSTALL                 | 2 +-
 README                  | 2 +-
 doc/i18n.txt            | 2 +-
 web/template/footer.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'web/template')

diff --git a/INSTALL b/INSTALL
index 8b0cd29..dab48cc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Setup on Arch Linux
 1) Clone the AUR project:
 
    $ cd /srv/http/
-   $ git clone git://projects.archlinux.org/aurweb.git
+   $ git clone git://git.archlinux.org/aurweb.git
 
 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:
diff --git a/README b/README
index 71e8481..1988186 100644
--- a/README
+++ b/README
@@ -42,7 +42,7 @@ web::
 Links
 -----
 
-* The repository is hosted at git://projects.archlinux.org/aurweb.git -- see
+* The repository is hosted at git://git.archlinux.org/aurweb.git -- see
   doc/CodingGuidelines for information on submitting patches.
 
 * Discovered bugs can be submitted to the aurweb bug tracker:
diff --git a/doc/i18n.txt b/doc/i18n.txt
index d5b6764..a1c21fe 100644
--- a/doc/i18n.txt
+++ b/doc/i18n.txt
@@ -21,7 +21,7 @@ strings for the translation to be usable, and it may have to be disabled.
 
 1. Check out the aurweb source using git:
 
-$ git clone git://projects.archlinux.org/aurweb.git aurweb-git
+$ git clone git://git.archlinux.org/aurweb.git aurweb-git
 
 2. Go into the "po/" directory in the aurweb source and run msginit(1) to
    create a initial translation file from our translation catalog:
diff --git a/web/template/footer.php b/web/template/footer.php
index f5dc2d0..572dbb2 100644
--- a/web/template/footer.php
+++ b/web/template/footer.php
@@ -3,7 +3,7 @@
 
 			<div id="footer">
 				<?php if ($ver): ?>
-				<p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p>
+				<p>aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p>
 				<?php endif; ?>
 				<p><?= __('Copyright %s 2004-%d aurweb Development Team.', '&copy;', date('Y')) ?></p>
 				<p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p>
-- 
cgit v1.2.3-54-g00ecf


From e3670ef1888a3f030452b229e8d48b83bb83b240 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Thu, 2 Jun 2016 08:51:29 +0200
Subject: Add a homepage field to accounts

Allow users to add a link to their homepage to their profile.

Implements FS#22774.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 schema/aur-schema.sql              |  1 +
 upgrading/4.3.0.txt                |  6 +++++
 web/html/account.php               | 53 +++++++++++++++++++++++++++-----------
 web/lib/acctfuncs.inc.php          | 12 ++++++---
 web/template/account_details.php   |  4 +++
 web/template/account_edit_form.php |  5 ++++
 6 files changed, 62 insertions(+), 19 deletions(-)

(limited to 'web/template')

diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql
index ea19d46..7edf94c 100644
--- a/schema/aur-schema.sql
+++ b/schema/aur-schema.sql
@@ -32,6 +32,7 @@ CREATE TABLE Users (
 	ResetKey CHAR(32) NOT NULL DEFAULT '',
 	RealName VARCHAR(64) NOT NULL DEFAULT '',
 	LangPreference VARCHAR(5) NOT NULL DEFAULT 'en',
+	Homepage TEXT NULL DEFAULT NULL,
 	IRCNick VARCHAR(32) NOT NULL DEFAULT '',
 	PGPKey VARCHAR(40) NULL DEFAULT NULL,
 	LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0,
diff --git a/upgrading/4.3.0.txt b/upgrading/4.3.0.txt
index f7f3e08..6c1753d 100644
--- a/upgrading/4.3.0.txt
+++ b/upgrading/4.3.0.txt
@@ -15,3 +15,9 @@ ALTER TABLE Users MODIFY LastLoginIPAddress VARCHAR(45) NULL DEFAULT NULL;
 ----
 ALTER TABLE OfficialProviders ADD COLUMN Repo VARCHAR(64) NOT NULL;
 ----
+
+4. Add a column to store users' homepages:
+
+----
+ALTER TABLE Users ADD COLUMN Homepage TEXT NULL DEFAULT NULL;
+----
diff --git a/web/html/account.php b/web/html/account.php
index 9007ace..8d92b2c 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -78,12 +78,25 @@ if (isset($_COOKIE["AURSID"])) {
 		} else {
 			/* Verify user has permission to edit the account */
 			if (can_edit_account($row)) {
-				display_account_form("UpdateAccount", $row["Username"],
-					$row["AccountTypeID"], $row["Suspended"], $row["Email"],
-					$row["HideEmail"], "", "", $row["RealName"],
-					$row["LangPreference"], $row["IRCNick"], $row["PGPKey"], $PK,
-					$row["InactivityTS"] ? 1 : 0, $row["CommentNotify"],
-					$row["UpdateNotify"], $row["ID"], $row["Username"]);
+				display_account_form("UpdateAccount",
+					$row["Username"],
+					$row["AccountTypeID"],
+					$row["Suspended"],
+					$row["Email"],
+					$row["HideEmail"],
+					"",
+					"",
+					$row["RealName"],
+					$row["LangPreference"],
+					$row["Homepage"],
+					$row["IRCNick"],
+					$row["PGPKey"],
+					$PK,
+					$row["InactivityTS"] ? 1 : 0,
+					$row["CommentNotify"],
+					$row["UpdateNotify"],
+					$row["ID"],
+					$row["Username"]);
 			} else {
 				print __("You do not have permission to edit this account.");
 			}
@@ -116,15 +129,25 @@ if (isset($_COOKIE["AURSID"])) {
 		print $update_account_message;
 
 		if (!$success) {
-			display_account_form("UpdateAccount", in_request("U"),
-				in_request("T"), in_request("S"),
-				in_request("E"), in_request("H"),
-				in_request("P"), in_request("C"),
-				in_request("R"), in_request("L"),
-				in_request("I"), in_request("K"),
-				in_request("PK"), in_request("J"),
-				in_request("CN"), in_request("UN"),
-				in_request("ID"), $row["Username"]);
+			display_account_form("UpdateAccount",
+				in_request("U"),
+				in_request("T"),
+				in_request("S"),
+				in_request("E"),
+				in_request("H"),
+				in_request("P"),
+				in_request("C"),
+				in_request("R"),
+				in_request("L"),
+				in_request("HP"),
+				in_request("I"),
+				in_request("K"),
+				in_request("PK"),
+				in_request("J"),
+				in_request("CN"),
+				in_request("UN"),
+				in_request("ID"),
+				$row["Username"]);
 		}
 
 	} else {
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 0eb021e..172b962 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -52,6 +52,7 @@ function html_format_pgp_fingerprint($fingerprint) {
  * @param string $C The confirmed password value of the displayed user
  * @param string $R The real name of the displayed user
  * @param string $L The language preference of the displayed user
+ * @param string $HP The homepage of the displayed user
  * @param string $I The IRC nickname of the displayed user
  * @param string $K The PGP key fingerprint of the displayed user
  * @param string $PK The list of SSH public keys
@@ -65,7 +66,7 @@ function html_format_pgp_fingerprint($fingerprint) {
  * @return void
  */
 function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="",
-		$L="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="") {
+		$L="",$HP="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="") {
 	global $SUPPORTED_LANGS;
 
 	include("account_edit_form.php");
@@ -87,6 +88,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R=""
  * @param string $C The confirmed password for the user
  * @param string $R The real name of the user
  * @param string $L The language preference of the user
+ * @param string $HP The homepage of the displayed user
  * @param string $I The IRC nickname of the user
  * @param string $K The PGP fingerprint of the user
  * @param string $PK The list of public SSH keys
@@ -100,7 +102,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R=""
  * @return array Boolean indicating success and message to be printed
  */
 function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",
-		$R="",$L="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="") {
+		$R="",$L="",$HP="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="") {
 	global $SUPPORTED_LANGS;
 
 	$error = '';
@@ -276,13 +278,14 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C=""
 		$salt = $dbh->quote($salt);
 		$R = $dbh->quote($R);
 		$L = $dbh->quote($L);
+		$HP = $dbh->quote($HP);
 		$I = $dbh->quote($I);
 		$K = $dbh->quote(str_replace(" ", "", $K));
 		$q = "INSERT INTO Users (AccountTypeID, Suspended, ";
 		$q.= "InactivityTS, Username, Email, Passwd, Salt, ";
-		$q.= "RealName, LangPreference, IRCNick, PGPKey) ";
+		$q.= "RealName, LangPreference, Homepage, IRCNick, PGPKey) ";
 		$q.= "VALUES (1, 0, 0, $U, $E, $P, $salt, $R, $L, ";
-		$q.= "$I, $K)";
+		$q.= "$HP, $I, $K)";
 		$result = $dbh->exec($q);
 		if (!$result) {
 			$message = __("Error trying to create account, %s%s%s.",
@@ -344,6 +347,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C=""
 		}
 		$q.= ", RealName = " . $dbh->quote($R);
 		$q.= ", LangPreference = " . $dbh->quote($L);
+		$q.= ", Homepage = " . $dbh->quote($HP);
 		$q.= ", IRCNick = " . $dbh->quote($I);
 		$q.= ", PGPKey = " . $dbh->quote(str_replace(" ", "", $K));
 		$q.= ", InactivityTS = " . $inactivity_ts;
diff --git a/web/template/account_details.php b/web/template/account_details.php
index 59a6a63..0ac85a5 100644
--- a/web/template/account_details.php
+++ b/web/template/account_details.php
@@ -41,6 +41,10 @@
 					<th><?= __("Real Name") . ":" ?></th>
 					<td><?= htmlspecialchars($row["RealName"], ENT_QUOTES) ?></td>
 				</tr>
+				<tr>
+					<th><?= __("Homepage") . ":" ?></th>
+					<td><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></td>
+				</tr>
 				<tr>
 					<th><?= __("IRC Nick") . ":" ?></th>
 					<td><?= htmlspecialchars($row["IRCNick"], ENT_QUOTES) ?></td>
diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index b4f0192..6c2b8fb 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -98,6 +98,11 @@
 			<input type="text" size="30" maxlength="32" name="R" id="id_realname" value="<?= htmlspecialchars($R,ENT_QUOTES) ?>" />
 		</p>
 
+		<p>
+			<label for="id_homepage"><?= __("Homepage") ?>:</label>
+			<input type="text" size="30" name="HP" id="id_homepage" value="<?= htmlspecialchars($HP,ENT_QUOTES) ?>" />
+		</p>
+
 		<p>
 			<label for="id_irc"><?= __("IRC Nick") ?>:</label>
 			<input type="text" size="30" maxlength="32" name="I" id="id_irc" value="<?= htmlspecialchars($I,ENT_QUOTES) ?>" />
-- 
cgit v1.2.3-54-g00ecf


From 16674e4c9d226446a8e6f2189858ab4d3b77ece0 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Wed, 22 Jun 2016 23:28:43 +0200
Subject: Linkify user homepage URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/account_details.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/account_details.php b/web/template/account_details.php
index 0ac85a5..8b76382 100644
--- a/web/template/account_details.php
+++ b/web/template/account_details.php
@@ -43,7 +43,7 @@
 				</tr>
 				<tr>
 					<th><?= __("Homepage") . ":" ?></th>
-					<td><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></td>
+					<td><a href="<?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?>" rel="nofollow"><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></a></td>
 				</tr>
 				<tr>
 					<th><?= __("IRC Nick") . ":" ?></th>
-- 
cgit v1.2.3-54-g00ecf


From 7d42d3fc1c60e9354efb44a8a5a494ede8ddeadd Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Sat, 25 Jun 2016 16:09:16 +0200
Subject: Make request type hints translatable

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/pkgreq_form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web/template')

diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
index 639326e..35dbef5 100644
--- a/web/template/pkgreq_form.php
+++ b/web/template/pkgreq_form.php
@@ -68,13 +68,13 @@
 				<textarea name="comments" id="id_comments" rows="5" cols="50"></textarea>
 			</p>
 			<p id="deletion_hint">
-				<?= 'By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.' ?>
+				<?= __('By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.') ?>
 			</p>
 			<p id="merge_hint">
-				<?= 'By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.' ?>
+				<?= __('By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.') ?>
 			</p>
 			<p id="orphan_hint">
-				<?= 'By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.' ?>
+				<?= __('By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.') ?>
 			</p>
 			<p>
 				<input type="submit" class="button" name="do_FileRequest" value="<?= __("Submit Request") ?>" />
-- 
cgit v1.2.3-54-g00ecf


From fbf3e5405781f0f7ded67e99ab83bebc0737499d Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Thu, 28 Apr 2016 19:28:23 +0200
Subject: Add hard limit for the length of dependency lists

Introduce a configuration option max_depends which can be used to
specify a maximum number of (reverse) dependencies to display on the
package details pages.

Fixes FS#49059.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 conf/config.proto            |  1 +
 web/lib/pkgfuncs.inc.php     | 10 ++++++----
 web/template/pkg_details.php |  5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'web/template')

diff --git a/conf/config.proto b/conf/config.proto
index 560c705..64af774 100644
--- a/conf/config.proto
+++ b/conf/config.proto
@@ -21,6 +21,7 @@ aur_location = https://aur.archlinux.org
 git_clone_uri_anon = https://aur.archlinux.org/%s.git
 git_clone_uri_priv = ssh://aur@aur.archlinux.org/%s.git
 max_rpc_results = 5000
+max_depends = 1000
 aur_request_ml = aur-requests@archlinux.org
 request_idle_time = 1209600
 auto_orphan_age = 15552000
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index eaea318..4b0fdba 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -230,10 +230,11 @@ function pkg_providers($name) {
  * Get package dependencies for a specific package
  *
  * @param int $pkgid The package to get dependencies for
+ * @param int $limit An upper bound for the number of packages to retrieve
  *
  * @return array All package dependencies for the package
  */
-function pkg_dependencies($pkgid) {
+function pkg_dependencies($pkgid, $limit) {
 	$deps = array();
 	$pkgid = intval($pkgid);
 	if ($pkgid > 0) {
@@ -243,7 +244,7 @@ function pkg_dependencies($pkgid) {
 		$q.= "OR SUBSTRING(pd.DepName FROM 1 FOR POSITION(': ' IN pd.DepName) - 1) = p.Name ";
 		$q.= "LEFT JOIN DependencyTypes dt ON dt.ID = pd.DepTypeID ";
 		$q.= "WHERE pd.PackageID = ". $pkgid . " ";
-		$q.= "ORDER BY pd.DepName";
+		$q.= "ORDER BY pd.DepName LIMIT " . intval($limit);
 		$result = $dbh->query($q);
 		if (!$result) {
 			return array();
@@ -505,10 +506,11 @@ function pkg_source_link($url, $arch) {
  *
  * @param string $name The package name for the dependency search
  * @param array $provides A list of virtual provisions of the package
+ * @param int $limit An upper bound for the number of packages to retrieve
  *
  * @return array All packages that depend on the specified package name
  */
-function pkg_required($name="", $provides) {
+function pkg_required($name="", $provides, $limit) {
 	$deps = array();
 	if ($name != "") {
 		$dbh = DB::connect();
@@ -523,7 +525,7 @@ function pkg_required($name="", $provides) {
 		$q.= "LEFT JOIN DependencyTypes dt ON dt.ID = pd.DepTypeID ";
 		$q.= "WHERE pd.DepName IN (" . $name_list . ") ";
 		$q.= "OR SUBSTRING(pd.DepName FROM 1 FOR POSITION(': ' IN pd.DepName) - 1) IN (" . $name_list . ") ";
-		$q.= "ORDER BY p.Name";
+		$q.= "ORDER BY p.Name LIMIT " . intval($limit);
 		$result = $dbh->query($q);
 		if (!$result) {return array();}
 		while ($row = $result->fetch(PDO::FETCH_NUM)) {
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 8b038b9..b9c66d4 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -5,6 +5,7 @@ $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']));
+$max_depends = config_get_int('options', 'max_depends');
 
 $uid = uid_from_sid($SID);
 
@@ -40,7 +41,7 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($
 $lics = pkg_licenses($row["ID"]);
 $grps = pkg_groups($row["ID"]);
 
-$deps = pkg_dependencies($row["ID"]);
+$deps = pkg_dependencies($row["ID"], $max_depends);
 
 usort($deps, function($x, $y) {
 	if ($x[1] != $y[1]) {
@@ -82,7 +83,7 @@ foreach ($rels as $rel) {
 	}
 }
 
-$requiredby = pkg_required($row["Name"], $rels_p);
+$requiredby = pkg_required($row["Name"], $rels_p, $max_depends);
 
 # $sources[0] = 'src';
 $sources = pkg_sources($row["ID"]);
-- 
cgit v1.2.3-54-g00ecf


From 2160678f9bfb4ff5403086e202cc24e8e0d4cf69 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Fri, 15 Jul 2016 16:21:35 +0200
Subject: Remove wearout factor from translatable string

Even though that number is hardcoded in the source code, it is better to
make it not appear in the message catalog such that it can be made
configurable easily later.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/pkg_search_results.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 3046c25..37a9032 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -35,7 +35,7 @@ if (!$result): ?>
 					<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 0.98 per day since its creation.') ?>" class="hover-help"><sup>?</sup></span></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 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>
-- 
cgit v1.2.3-54-g00ecf


From b089747774b495126bf4e2b4ec0b63bd0c2af5c4 Mon Sep 17 00:00:00 2001
From: Safa AlFulaij <safa1996alfulaij@gmail.com>
Date: Thu, 14 Jul 2016 09:52:26 +0300
Subject: Fix plural string

Even though the singular form never occurs, we need to use _n() here to
obtain the correct behavior for languages with multiple plural forms.

Signed-off-by: Safa AlFulaij <safa1996alfulaij@gmail.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/pkgreq_results.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php
index 24ee877..b27963b 100644
--- a/web/template/pkgreq_results.php
+++ b/web/template/pkgreq_results.php
@@ -39,7 +39,7 @@
 		if (!$due) {
 			$time_left = $idle_time - (time() - intval($row['RequestTS']));
 			if ($time_left > 48 * 3600) {
-				$time_left_fmt = __("~%d days left", round($time_left / (24 * 3600)));
+				$time_left_fmt = _n("~%d day left", "~%d days left", round($time_left / (24 * 3600)));
 			} elseif ($time_left > 3600) {
 				$time_left_fmt = _n("~%d hour left", "~%d hours left", round($time_left / 3600));
 			} else {
-- 
cgit v1.2.3-54-g00ecf


From 573e0c662bd5684b13cfc59eaa29db467831c078 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Thu, 11 Aug 2016 20:52:53 +0200
Subject: Display registration date on account details page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/account_details.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'web/template')

diff --git a/web/template/account_details.php b/web/template/account_details.php
index 8b76382..b79685b 100644
--- a/web/template/account_details.php
+++ b/web/template/account_details.php
@@ -59,6 +59,10 @@
 					<?= $row["InactivityTS"] ? __("Inactive since") . ' ' . date("Y-m-d H:i", $row["InactivityTS"]) : __("Active"); ?>
 					</td>
 				</tr>
+				<tr>
+					<th><?= __("Registration date:") ?></th>
+					<td><?= (new DateTime($row["RegistrationTS"]))->format('Y-m-d') ?></td>
+				</tr>
 				<?php if (has_credential(CRED_ACCOUNT_LAST_LOGIN)): ?>
 				<tr>
 					<th><?= __("Last Login") . ":" ?></th>
-- 
cgit v1.2.3-54-g00ecf


From 4a355c71cb21d21db2d7d6dec5746a432e47aaea Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Thu, 11 Aug 2016 20:52:54 +0200
Subject: Add details link from account edit form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/account_edit_form.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/template')

diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index 6c2b8fb..19821a0 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -1,6 +1,7 @@
 <?php if ($A == "UpdateAccount"): ?>
 <p>
 	<?= __('Click %shere%s if you want to permanently delete this account.', '<a href="' . get_user_uri($N) . 'delete/' . '">', '</a>') ?>
+	<?= __('Click %shere%s for user details.', '<a href="' . get_user_uri($N) . '">', '</a>') ?>
 </p>
 
 <form id="edit-profile-form" action="<?= get_user_uri($N) . 'update/'; ?>" method="post">
-- 
cgit v1.2.3-54-g00ecf


From 1e9735972a3cc210e282695faeed88febc0be99f Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@archlinux.org>
Date: Mon, 17 Oct 2016 14:45:27 +0200
Subject: Do not show current day if registration date is unknown

The registration date field on the account details page currently
defaults to the current day if the user's registration date is unknown.
To avoid confusion, show "unknown" in these cases instead.

Fixes FS#51405.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/account_details.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'web/template')

diff --git a/web/template/account_details.php b/web/template/account_details.php
index b79685b..024bd9c 100644
--- a/web/template/account_details.php
+++ b/web/template/account_details.php
@@ -61,7 +61,11 @@
 				</tr>
 				<tr>
 					<th><?= __("Registration date:") ?></th>
+					<?php if ($row["RegistrationTS"]): ?>
 					<td><?= (new DateTime($row["RegistrationTS"]))->format('Y-m-d') ?></td>
+					<?php else: ?>
+					<td><?= __("unknown") ?></td>
+					<?php endif; ?>
 				</tr>
 				<?php if (has_credential(CRED_ACCOUNT_LAST_LOGIN)): ?>
 				<tr>
-- 
cgit v1.2.3-54-g00ecf