From 0a66f48aa1293f93579b7de9bc5d080cf5f3105e Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Thu, 5 Jun 2014 14:47:38 +0200
Subject: Do not return "None" in user functions

Return null instead of the string "None" in username_from_id(),
uid_from_email() and uid_from_username().

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/template/pkg_details.php        | 18 +++++++++---------
 web/template/pkgbase_details.php    | 18 +++++++++---------
 web/template/tu_details.php         |  2 +-
 web/template/tu_last_votes_list.php |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'web/template')

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index c813e35a..6326d4e3 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -261,12 +261,12 @@ if ($row["SubmitterUID"]):
 	if ($SID):
 		if (!$USE_VIRTUAL_URLS):
 ?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($submitter) ?>"><?= htmlspecialchars($submitter) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($submitter) ?>"><?= html_format_username($submitter) ?></a></td>
 		<?php else: ?>
-			<td><a href="<?= get_uri('/account/') . htmlspecialchars($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($submitter)) ?>"><?= htmlspecialchars($submitter) ?></a></td>
+			<td><a href="<?= get_uri('/account/') . html_format_username($submitter) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td>
 		<?php endif; ?>
 <?php else: ?>
-		<td><?= htmlspecialchars($submitter) ?></td>
+		<td><?= html_format_username($submitter) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td><?= __('None') ?></td>
@@ -279,12 +279,12 @@ if ($row["MaintainerUID"]):
 	if ($SID):
 		if (!$USE_VIRTUAL_URLS):
 ?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($maintainer) ?>"><?= htmlspecialchars($maintainer) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($maintainer) ?>"><?= html_format_username($maintainer) ?></a></td>
 		<?php else: ?>
-			<td><a href="<?= get_uri('/account/') . htmlspecialchars($maintainer, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($maintainer)) ?>"><?= htmlspecialchars($maintainer) ?></a></td>
+			<td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td>
 		<?php endif; ?>
 	<?php else: ?>
-		<td><?= htmlspecialchars($maintainer) ?></td>
+		<td><?= html_format_username($maintainer) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td><?= __('None') ?></td>
@@ -297,12 +297,12 @@ if ($row["PackagerUID"]):
 	if ($SID):
 		if (!$USE_VIRTUAL_URLS):
 ?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($packager) ?>"><?= htmlspecialchars($packager) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($packager) ?>"><?= html_format_username($packager) ?></a></td>
 		<?php else: ?>
-			<td><a href="<?= get_uri('/account/') . htmlspecialchars($packager, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($packager)) ?>"><?= htmlspecialchars($packager) ?></a></td>
+			<td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td>
 		<?php endif; ?>
 	<?php else: ?>
-		<td><?= htmlspecialchars($packager) ?></td>
+		<td><?= html_format_username($packager) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td><?= __('None') ?></td>
diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php
index da9a9629..6c617bf5 100644
--- a/web/template/pkgbase_details.php
+++ b/web/template/pkgbase_details.php
@@ -144,12 +144,12 @@ if ($row["SubmitterUID"]):
 	if ($SID):
 		if (!$USE_VIRTUAL_URLS):
 ?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($submitter) ?>"><?= htmlspecialchars($submitter) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($submitter) ?>"><?= html_format_username($submitter) ?></a></td>
 		<?php else: ?>
-			<td><a href="<?= get_uri('/account/') . htmlspecialchars($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($submitter)) ?>"><?= htmlspecialchars($submitter) ?></a></td>
+			<td><a href="<?= get_uri('/account/') . html_format_username($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td>
 		<?php endif; ?>
 <?php else: ?>
-		<td><?= htmlspecialchars($submitter) ?></td>
+		<td><?= html_format_username($submitter) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td><?= __('None') ?></td>
@@ -162,12 +162,12 @@ if ($row["MaintainerUID"]):
 	if ($SID):
 		if (!$USE_VIRTUAL_URLS):
 ?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($maintainer) ?>"><?= htmlspecialchars($maintainer) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($maintainer) ?>"><?= html_format_username($maintainer) ?></a></td>
 		<?php else: ?>
-			<td><a href="<?= get_uri('/account/') . htmlspecialchars($maintainer, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($maintainer)) ?>"><?= htmlspecialchars($maintainer) ?></a></td>
+			<td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td>
 		<?php endif; ?>
 	<?php else: ?>
-		<td><?= htmlspecialchars($maintainer) ?></td>
+		<td><?= html_format_username($maintainer) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td><?= __('None') ?></td>
@@ -180,12 +180,12 @@ if ($row["PackagerUID"]):
 	if ($SID):
 		if (!$USE_VIRTUAL_URLS):
 ?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($packager) ?>"><?= htmlspecialchars($packager) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($packager) ?>"><?= html_format_username($packager) ?></a></td>
 		<?php else: ?>
-			<td><a href="<?= get_uri('/account/') . htmlspecialchars($packager, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($packager)) ?>"><?= htmlspecialchars($packager) ?></a></td>
+			<td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td>
 		<?php endif; ?>
 	<?php else: ?>
-		<td><?= htmlspecialchars($packager) ?></td>
+		<td><?= html_format_username($packager) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td><?= __('None') ?></td>
diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index fca18151..38f6c0d0 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -39,7 +39,7 @@ if ($yes > $active_tus / 2) {
 			<?php endif; ?>
 		</strong>
 		<br />
-		<?= __("Submitted: %s by %s", gmdate("Y-m-d H:i", $row['Submitted']), username_from_id($row['SubmitterID'])) ?>
+		<?= __("Submitted: %s by %s", gmdate("Y-m-d H:i", $row['Submitted']), html_format_username(username_from_id($row['SubmitterID']))) ?>
 		<br />
 		<?= __("End") ?>:
 		<strong><?= gmdate("Y-m-d H:i", $row['End']) ?></strong>
diff --git a/web/template/tu_last_votes_list.php b/web/template/tu_last_votes_list.php
index 090ce8d0..e897a6a1 100644
--- a/web/template/tu_last_votes_list.php
+++ b/web/template/tu_last_votes_list.php
@@ -22,9 +22,9 @@
 			<tr class="<?= $c ?>">
 				<td>
 					<?php if (!$USE_VIRTUAL_URLS): ?>
-					<a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['UserID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($username) ?>"><?= htmlspecialchars($username) ?></a></td>
+					<a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['UserID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($username) ?>"><?= html_format_username($username) ?></a></td>
 					<?php else: ?>
-					<a href="<?= get_uri('/account/') . htmlspecialchars($username, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($username)) ?>"><?= htmlspecialchars($username) ?></a>
+					<a href="<?= get_uri('/account/') . html_format_username($username) ?>" title="<?= __('View account information for %s', html_format_username($username)) ?>"><?= html_format_username($username) ?></a>
 					<?php endif; ?>
 				</td>
 				<td>
-- 
cgit v1.2.3-24-g4f1b