Merge branch 'master' into maint

7 files changed, 44 insertions, 5 deletions

diff --git a/web/template/account_details.php b/web/template/account_details.php
index 59a6a63b..024bd9c3 100644
--- a/web/template/account_details.php
+++ b/web/template/account_details.php
@@ -42,6 +42,10 @@
 					<td><?= htmlspecialchars($row["RealName"], ENT_QUOTES) ?></td>
 				</tr>
 				<tr>
+					<th><?= __("Homepage") . ":" ?></th>
+					<td><a href="<?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?>" rel="nofollow"><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></a></td>
+				</tr>
+				<tr>
 					<th><?= __("IRC Nick") . ":" ?></th>
 					<td><?= htmlspecialchars($row["IRCNick"], ENT_QUOTES) ?></td>
 				</tr>
@@ -55,6 +59,14 @@
 					<?= $row["InactivityTS"] ? __("Inactive since") . ' ' . date("Y-m-d H:i", $row["InactivityTS"]) : __("Active"); ?>
 					</td>
 				</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>
 					<th><?= __("Last Login") . ":" ?></th>
diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index b9affd64..19821a0b 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">
@@ -99,6 +100,11 @@
 		</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) ?>" />
 		</p>
@@ -143,6 +149,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>
diff --git a/web/template/footer.php b/web/template/footer.php
index f5dc2d06..572dbb26 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>
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 3046c253..37a90328 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>
diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php
index 237e712f..d3f05921 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"]))): ?>
diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
index 4fd7851d..35dbef57 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>
diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php
index 24ee877a..b27963be 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 {