summaryrefslogtreecommitdiffstats
path: root/web/lib
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-06-05 14:47:38 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-06-05 15:12:10 +0200
commit0a66f48aa1293f93579b7de9bc5d080cf5f3105e (patch)
treeb2e3712776bb21e2bdacc99bbb76f2488c3339e6 /web/lib
parent7a5bfd83c4baec41bf8aa9015ef46eca5d629716 (diff)
downloadaur-0a66f48aa1293f93579b7de9bc5d080cf5f3105e.tar.gz
aur-0a66f48aa1293f93579b7de9bc5d080cf5f3105e.tar.xz
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>
Diffstat (limited to 'web/lib')
-rw-r--r--web/lib/acctfuncs.inc.php2
-rw-r--r--web/lib/aur.inc.php44
2 files changed, 25 insertions, 21 deletions
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 51ffec63..a9965619 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -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.
diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php
index 99f5ae4a..33686968 100644
--- a/web/lib/aur.inc.php
+++ b/web/lib/aur.inc.php
@@ -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];
}
@@ -178,6 +177,17 @@ function username_from_sid($sid="") {
}
/**
+ * 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
*
* @param string $sid User's 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];
}