Commit a2f79eb2 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Refactor code for printing account links


Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 19ee2689
......@@ -181,10 +181,19 @@ function username_from_sid($sid="") {
*
* @param string $username The user name to format
*
* @return void
* @return string The generated HTML code for the account link
*/
function html_format_username($username) {
return $username ? htmlspecialchars($username) : __("None");
$username_fmt = $username ? htmlspecialchars($username, ENT_QUOTES) : __("None");
if ($username && $_COOKIE["AURSID"]) {
$link = '<a href="' . get_uri('/account/') . $username_fmt;
$link .= '" title="' . __('View account information for %s', $username_fmt);
$link .= '">' . $username_fmt . '</a>';
return $link;
} else {
return $username_fmt;
}
}
/**
......
......@@ -289,33 +289,15 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))):
<?php endif; ?>
<tr>
<th><?= __('Submitter') .': ' ?></th>
<?php if ($row["SubmitterUID"] && $SID): ?>
<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 elseif ($row["SubmitterUID"] && !$SID): ?>
<td><?= html_format_username($submitter) ?></td>
<?php else: ?>
<td><?= __('None') ?></td>
<?php endif; ?>
</tr>
<tr>
<th><?= __('Maintainer') .': ' ?></th>
<?php if ($row["MaintainerUID"] && $SID): ?>
<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 elseif ($row["MaintainerUID"] && !$SID): ?>
<td><?= html_format_username($maintainer) ?></td>
<?php else: ?>
<td><?= __('None') ?></td>
<?php endif; ?>
</tr>
<tr>
<th><?= __('Last Packager') .': ' ?></th>
<?php if ($row["PackagerUID"] && $SID): ?>
<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 elseif ($row["PackagerUID"] && !$SID): ?>
<td><?= html_format_username($packager) ?></td>
<?php else: ?>
<td><?= __('None') ?></td>
<?php endif; ?>
</tr>
<tr>
<th><?= __('Votes') . ': ' ?></th>
......
......@@ -148,33 +148,15 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))):
<?php endif; ?>
<tr>
<th><?= __('Submitter') .': ' ?></th>
<?php if ($row["SubmitterUID"] && $SID): ?>
<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 elseif ($row["SubmitterUID"] && !$SID): ?>
<td><?= html_format_username($submitter) ?></td>
<?php else: ?>
<td><?= __('None') ?></td>
<?php endif; ?>
</tr>
<tr>
<th><?= __('Maintainer') .': ' ?></th>
<?php if ($row["MaintainerUID"] && $SID): ?>
<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 elseif ($row["MaintainerUID"] && !$SID): ?>
<td><?= html_format_username($maintainer) ?></td>
<?php else: ?>
<td><?= __('None') ?></td>
<?php endif; ?>
</tr>
<tr>
<th><?= __('Last Packager') .': ' ?></th>
<?php if ($row["PackagerUID"] && $SID): ?>
<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 elseif ($row["PackagerUID"] && !$SID): ?>
<td><?= html_format_username($packager) ?></td>
<?php else: ?>
<td><?= __('None') ?></td>
<?php endif; ?>
</tr>
<tr>
<th><?= __('Votes') . ': ' ?></th>
......
......@@ -21,7 +21,7 @@
?>
<tr class="<?= $c ?>">
<td>
<a href="<?= get_uri('/account/') . html_format_username($username) ?>" title="<?= __('View account information for %s', html_format_username($username)) ?>"><?= html_format_username($username) ?></a>
<?= html_format_username($username) ?>
</td>
<td>
<a href="<?= get_uri('/tu/'); ?>?id=<?= $row['LastVote'] ?>"><?= intval($row["LastVote"]) ?></a>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment