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
Download patch file Download diff file Expand all files Collapse all files

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

@ -642,7 +642,7 @@ function send_resetkey($email, $subject, $body) {
global $AUR_LOCATION;
$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
* string.

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

@ -135,20 +135,19 @@ function new_sid() {
*
* @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="") {
if (!$id) {
return "";
}
function username_from_id($id) {
$id = intval($id);
$dbh = DB::connect();
$q = "SELECT Username FROM Users WHERE ID = " . $dbh->quote($id);
$result = $dbh->query($q);
if (!$result) {
return "None";
return null;
}
$row = $result->fetch(PDO::FETCH_NUM);
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0];
}
@ -177,6 +176,17 @@ function username_from_sid($sid="") {
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
*
@ -363,20 +373,17 @@ function rm_tree($dirname) {
*
* @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="") {
if (!$username) {
return "";
}
function uid_from_username($username) {
$dbh = DB::connect();
$q = "SELECT ID FROM Users WHERE Username = " . $dbh->quote($username);
$result = $dbh->query($q);
if (!$result) {
return "None";
return null;
}
$row = $result->fetch(PDO::FETCH_NUM);
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0];
}
@ -387,18 +394,15 @@ function uid_from_username($username="") {
*
* @return string The user's ID
*/
function uid_from_email($email="") {
if (!$email) {
return "";
}
function uid_from_email($email) {
$dbh = DB::connect();
$q = "SELECT ID FROM Users WHERE Email = " . $dbh->quote($email);
$result = $dbh->query($q);
if (!$result) {
return "None";
return null;
}
$row = $result->fetch(PDO::FETCH_NUM);
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0];
}