external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not return "None" in user functions

Browse source 
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>
This commit is contained in:
Lukas Fleischer 2014-06-05 14:47:38 +02:00
parent 7a5bfd83c4
commit 0a66f48aa1
7 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/html/passreset.php
View file

@ -25,7 +25,7 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir
$error = __('Missing a required field.'); $error = __('Missing a required field.');
} elseif ($password != $confirm) { } elseif ($password != $confirm) {
$error = __('Password fields do not match.'); $error = __('Password fields do not match.');
} elseif ($uid == NULL || $uid == 'None') { } elseif ($uid == null) {
$error = __('Invalid e-mail.'); $error = __('Invalid e-mail.');
} }

2
web/lib/acctfuncs.inc.php
View file

@ -642,7 +642,7 @@ function send_resetkey($email, $subject, $body) {
global $AUR_LOCATION; global $AUR_LOCATION;
$uid = uid_from_email($email); $uid = uid_from_email($email);
if ($uid != NULL && $uid != 'None') { if ($uid != null) {
/* /*
* We (ab)use new_sid() to get a random 32 characters long * We (ab)use new_sid() to get a random 32 characters long
* string. * string.

44
web/lib/aur.inc.php
View file

@ -135,20 +135,19 @@ function new_sid() {
* *
* @param string $id User's ID * @param string $id User's ID
* *
* @return string Username if it exists, otherwise "None" * @return string Username if it exists, otherwise null
*/ */
function username_from_id($id="") { function username_from_id($id) {
if (!$id) { $id = intval($id);
return "";
}
$dbh = DB::connect(); $dbh = DB::connect();
$q = "SELECT Username FROM Users WHERE ID = " . $dbh->quote($id); $q = "SELECT Username FROM Users WHERE ID = " . $dbh->quote($id);
$result = $dbh->query($q); $result = $dbh->query($q);
if (!$result) { if (!$result) {
return "None"; return null;
} }
$row = $result->fetch(PDO::FETCH_NUM);
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0]; return $row[0];
} }
@ -177,6 +176,17 @@ function username_from_sid($sid="") {
return $row[0]; return $row[0];
} }
/**
* Format a user name for inclusion in HTML data
*
* @param string $username The user name to format
*
* @return void
*/
function html_format_username($username) {
return $username ? htmlspecialchars($username) : __("None");
}
/** /**
* Determine the user's e-mail address in the database using a session ID * Determine the user's e-mail address in the database using a session ID
* *
@ -363,20 +373,17 @@ function rm_tree($dirname) {
* *
* @param string $username The username of an account * @param string $username The username of an account
* *
* @return string Return user ID if exists for username, otherwise "None" * @return string Return user ID if exists for username, otherwise null
*/ */
function uid_from_username($username="") { function uid_from_username($username) {
if (!$username) {
return "";
}
$dbh = DB::connect(); $dbh = DB::connect();
$q = "SELECT ID FROM Users WHERE Username = " . $dbh->quote($username); $q = "SELECT ID FROM Users WHERE Username = " . $dbh->quote($username);
$result = $dbh->query($q); $result = $dbh->query($q);
if (!$result) { if (!$result) {
return "None"; return null;
} }
$row = $result->fetch(PDO::FETCH_NUM);
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0]; return $row[0];
} }
@ -387,18 +394,15 @@ function uid_from_username($username="") {
* *
* @return string The user's ID * @return string The user's ID
*/ */
function uid_from_email($email="") { function uid_from_email($email) {
if (!$email) {
return "";
}
$dbh = DB::connect(); $dbh = DB::connect();
$q = "SELECT ID FROM Users WHERE Email = " . $dbh->quote($email); $q = "SELECT ID FROM Users WHERE Email = " . $dbh->quote($email);
$result = $dbh->query($q); $result = $dbh->query($q);
if (!$result) { if (!$result) {
return "None"; return null;
} }
$row = $result->fetch(PDO::FETCH_NUM);
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0]; return $row[0];
} }

18
web/template/pkg_details.php
View file

@ -261,12 +261,12 @@ if ($row["SubmitterUID"]):
if ($SID): if ($SID):
if (!$USE_VIRTUAL_URLS): 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: ?> <?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 endif; ?>
<?php else: ?> <?php else: ?>
<td><?= htmlspecialchars($submitter) ?></td> <td><?= html_format_username($submitter) ?></td>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<td><?= __('None') ?></td> <td><?= __('None') ?></td>
@ -279,12 +279,12 @@ if ($row["MaintainerUID"]):
if ($SID): if ($SID):
if (!$USE_VIRTUAL_URLS): 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: ?> <?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 endif; ?>
<?php else: ?> <?php else: ?>
<td><?= htmlspecialchars($maintainer) ?></td> <td><?= html_format_username($maintainer) ?></td>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<td><?= __('None') ?></td> <td><?= __('None') ?></td>
@ -297,12 +297,12 @@ if ($row["PackagerUID"]):
if ($SID): if ($SID):
if (!$USE_VIRTUAL_URLS): 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: ?> <?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 endif; ?>
<?php else: ?> <?php else: ?>
<td><?= htmlspecialchars($packager) ?></td> <td><?= html_format_username($packager) ?></td>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<td><?= __('None') ?></td> <td><?= __('None') ?></td>

18
web/template/pkgbase_details.php
View file

@ -144,12 +144,12 @@ if ($row["SubmitterUID"]):
if ($SID): if ($SID):
if (!$USE_VIRTUAL_URLS): 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: ?> <?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 endif; ?>
<?php else: ?> <?php else: ?>
<td><?= htmlspecialchars($submitter) ?></td> <td><?= html_format_username($submitter) ?></td>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<td><?= __('None') ?></td> <td><?= __('None') ?></td>
@ -162,12 +162,12 @@ if ($row["MaintainerUID"]):
if ($SID): if ($SID):
if (!$USE_VIRTUAL_URLS): 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: ?> <?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 endif; ?>
<?php else: ?> <?php else: ?>
<td><?= htmlspecialchars($maintainer) ?></td> <td><?= html_format_username($maintainer) ?></td>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<td><?= __('None') ?></td> <td><?= __('None') ?></td>
@ -180,12 +180,12 @@ if ($row["PackagerUID"]):
if ($SID): if ($SID):
if (!$USE_VIRTUAL_URLS): 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: ?> <?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 endif; ?>
<?php else: ?> <?php else: ?>
<td><?= htmlspecialchars($packager) ?></td> <td><?= html_format_username($packager) ?></td>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>
<td><?= __('None') ?></td> <td><?= __('None') ?></td>

2
web/template/tu_details.php
View file

@ -39,7 +39,7 @@ if ($yes > $active_tus / 2) {
<?php endif; ?> <?php endif; ?>
</strong> </strong>
<br /> <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 /> <br />
<?= __("End") ?>: <?= __("End") ?>:
<strong><?= gmdate("Y-m-d H:i", $row['End']) ?></strong> <strong><?= gmdate("Y-m-d H:i", $row['End']) ?></strong>

4
web/template/tu_last_votes_list.php
View file

@ -22,9 +22,9 @@
<tr class="<?= $c ?>"> <tr class="<?= $c ?>">
<td> <td>
<?php if (!$USE_VIRTUAL_URLS): ?> <?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: ?> <?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; ?> <?php endif; ?>
</td> </td>
<td> <td>