From: cyeh%bluemartini.com <>
Date: Sat, 22 Apr 2000 01:45:48 +0000 (+0000)
Subject: Add conditional support to display users real name in bug reports if user
X-Git-Tag: bugzilla-2.12~312
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ea507b3a467385d5f1c34e64b3c56e15167aff;p=thirdparty%2Fbugzilla.git

Add conditional support to display users real name in bug reports if user
entered in that information. Thanks to
Chris Baldwin <cbaldwin@redback.com>
for providing the patch.
---

diff --git a/bug_form.pl b/bug_form.pl
index 1402a1a470..735dd2f1d0 100644
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -118,6 +118,9 @@ my $assignedtoid = $bug{'assigned_to'};
 my $reporterid = $bug{'reporter'};
 my $qacontactid =  $bug{'qa_contact'};
 
+
+$bug{'assigned_name'} = DBID_to_real_name($bug{'assigned_to'});
+$bug{'reporter_name'} = DBID_to_real_name($bug{'reporter'});
 $bug{'assigned_to'} = DBID_to_name($bug{'assigned_to'});
 $bug{'reporter'} = DBID_to_name($bug{'reporter'});
 
@@ -183,8 +186,8 @@ print "
     <TD ALIGN=RIGHT><B>OS:</B></TD>
     <TD><SELECT NAME=op_sys>" .
     make_options(\@::legal_opsys, $bug{'op_sys'}) .
-    "</SELECT><TD ALIGN=RIGHT><B>Reporter:</B></TD><TD>$bug{'reporter'}</TD>
-  </TR><TR>
+    "</SELECT><TD ALIGN=RIGHT><B>Reporter:</B></TD><TD>$bug{'reporter'} $bug{'reporter_name'}</TD>
+     </TDTR><TR>
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html\">Status:</A></B></TD>
       <TD>$bug{'bug_status'}</TD>
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html#priority\">Priority:</A></B></TD>
@@ -202,7 +205,7 @@ print "
   </TR><TR>
     <TD ALIGN=RIGHT><B><A HREF=\"bug_status.html#assigned_to\">Assigned&nbsp;To:
         </A></B></TD>
-      <TD>$bug{'assigned_to'}</TD>";
+      <TD>$bug{'assigned_to'} $bug{'assigned_name'}</TD>";
 
 if (Param("usetargetmilestone")) {
     my $url = "";
diff --git a/globals.pl b/globals.pl
index 2d22038a3d..948fa7feb6 100644
--- a/globals.pl
+++ b/globals.pl
@@ -546,6 +546,16 @@ sub InsertNewUser {
     return $password;
 }
 
+sub DBID_to_real_name {
+    my ($id) = (@_);
+    SendSQL("SELECT realname FROM profiles WHERE userid = $id");
+    my ($r) = FetchSQLData();
+    if ($r eq "") {
+        return;
+    } else {
+        return "($r)";
+    }
+}
 
 sub DBID_to_name {
     my ($id) = (@_);
@@ -721,7 +731,7 @@ sub GetLongDescriptionAsHTML {
         $knownattachments{FetchOneColumn()} = 1;
     }
 
-    my ($query) = ("SELECT profiles.login_name, longdescs.bug_when, " .
+    my ($query) = ("SELECT profiles.realname, profiles.login_name, longdescs.bug_when, " .
                    "       longdescs.thetext " .
                    "FROM longdescs, profiles " .
                    "WHERE profiles.userid = longdescs.who " .
@@ -740,12 +750,18 @@ sub GetLongDescriptionAsHTML {
     $query .= "ORDER BY longdescs.bug_when";
     SendSQL($query);
     while (MoreSQLData()) {
-        my ($who, $when, $text) = (FetchSQLData());
+        my ($who, $email, $when, $text) = (FetchSQLData());
         if ($count) {
-            $result .= "<BR><BR><I>------- Additional Comments From " .
-                qq{<A HREF="mailto:$who">$who</A> } .
-                    time2str("%Y-%m-%d %H:%M", str2time($when)) .
-                        " -------</I><BR>\n";
+            $result .= "<BR><BR><I>------- Additional Comments From ";
+              if ($who) {
+                  $result .= qq{<A HREF="mailto:$email">$who</A> } .
+                      time2str("%Y-%m-%d %H:%M", str2time($when)) .
+                          " -------</I><BR>\n";
+              } else {
+                  $result .= qq{<A HREF="mailto:$email">$email</A> } .
+                      time2str("%Y-%m-%d %H:%M", str2time($when)) .
+                          " -------</I><BR>\n";
+              }
         }
         $result .= "<PRE>" . quoteUrls(\%knownattachments, $text) . "</PRE>\n";
         $count++;