From ff58181d5b4ddd10b34062a0ad2204435e698cae Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Wed, 10 Oct 2007 07:30:15 +0000
Subject: fixed acls, fixed transcoding issues

---
 lib/ui.lib.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lib/ui.lib.php')

diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index efdaa736..d785431f 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -891,19 +891,22 @@ function show_user_select($name,$selected='',$style='') {
 	echo "<select name=\"$name\" style=\"$style\">\n";
 	echo "\t<option value=\"\">" . _('None') . "</option>\n";
 
-	$sql = "SELECT username as id,fullname FROM user ORDER BY fullname";
-	$db_results = mysql_query($sql, dbh());
+	$sql = "SELECT `id`,`username`,`fullname` FROM `user` ORDER BY `fullname`";
+	$db_results = Dba::query($sql);
 
-	while ($r = mysql_fetch_assoc($db_results)) { 
+	while ($row = Dba::fetch_assoc($db_results)) { 
 		$select_txt = '';
-		if ($r['id'] == $selected) { 
+		if ($row['id'] == $selected) { 
 			$select_txt = 'selected="selected"';
 		}
+		// If they don't have a full name, revert to the username
+		$row['fullname'] = $row['fullname'] ? $row['fullname'] : $row['username']; 
 
-		echo "\t<option value=\"" . $r['id'] . "\" $select_txt>" . scrub_out($r['fullname']) . "</option>\n";
-		
+		echo "\t<option value=\"" . $row['id'] . "\" $select_txt>" . scrub_out($row['fullname']) . "</option>\n";
 	} // end while users
 
+	echo "</select>\n";
+
 } // show_user_select
 
 /**
-- 
cgit