Attachment 290675 Details for Bug 427268 – Patch for showdependencytree.cgi to hide email addresses if non-logged in user is viewing (v1)

[patch] Patch for showdependencytree.cgi to hide email addresses if non-logged in user is viewing (v1)

dependency_tree_safe_email.patch (text/plain), 5.32 KB, created by David Lawrence on 2008-01-02 18:39:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lawrence

Created: 2008-01-02 18:39:47 UTC

Size: 5.32 KB

patch

obsolete

>Index: showdependencytree.cgi
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/showdependencytree.cgi,v
>retrieving revision 1.12
>diff -u -r1.12 showdependencytree.cgi
>--- showdependencytree.cgi	5 Jan 2007 21:14:58 -0000	1.12
>+++ showdependencytree.cgi	2 Jan 2008 18:32:42 -0000
>@@ -168,6 +168,7 @@
>                         $milestone_column, 
>                         assignee.userid, 
>                         assignee.login_name,
>+                        assignee.realname,
>                         delta_ts,
>                         status_whiteboard,
>                         estimated_time,
>@@ -187,6 +188,7 @@
>          $bug->{'milestone'}, 
>          $bug->{'assignee_id'}, 
>          $bug->{'assignee_email'},
>+         $bug->{'assignee_name'},
>          $bug->{'delta_ts'},
>          $bug->{'status_whiteboard'},
>          $bug->{'estimated_time'},
>@@ -208,15 +210,17 @@
> 
>     # Show requestee info if status is NEEDINFO and user is logged in
>     if ($bug->{'status'} eq 'NEEDINFO' && $::userid) {
>-        SendSQL("SELECT profiles.login_name FROM profiles, flags, flagtypes " .
>-                        "WHERE flags.type_id = flagtypes.id " .
>-                        "AND flagtypes.name = 'needinfo' " .
>-                        "AND flags.status = '?' AND flags.is_active = 1 " .
>-                        "AND flags.requestee_id = profiles.userid " .
>-                        "AND flags.bug_id = $id");
>-        my $needinfo_requestee = FetchOneColumn();
>+        SendSQL("SELECT profiles.login_name, profiles.realname " .
>+                "  FROM profiles, flags, flagtypes " .
>+                " WHERE flags.type_id = flagtypes.id " .
>+                "       AND flagtypes.name = 'needinfo' " .
>+                "       AND flags.status = '?' AND flags.is_active = 1 " .
>+                "       AND flags.requestee_id = profiles.userid " .
>+                "       AND flags.bug_id = $id");
>+        my ($needinfo_requestee, $needinfo_requestee_name) = FetchSQLData();
>         if ($needinfo_requestee) {
>             $bug->{'needinfo_requestee'} = $needinfo_requestee;
>+            $bug->{'needinfo_requestee_name'} = $needinfo_requestee_name;
>         }
>     }
>     
>Index: template/en/default/bug/dependency-tree.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/template/en/default/bug/dependency-tree.html.tmpl,v
>retrieving revision 1.9
>diff -u -r1.9 dependency-tree.html.tmpl
>--- template/en/default/bug/dependency-tree.html.tmpl	9 Feb 2007 17:01:59 -0000	1.9
>+++ template/en/default/bug/dependency-tree.html.tmpl	2 Jan 2008 18:32:42 -0000
>@@ -113,10 +113,10 @@
>         [% FILTER inprogress(inprogress) %]
>           [% FILTER onhold(onhold) %]
>             <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %]
>-            [[% dep.status FILTER html %] [% IF dep.needinfo_requestee %] from [% dep.needinfo_requestee FILTER html %][% END %] - 
>+            [[% dep.status FILTER html %] [% IF dep.needinfo_requestee %] from [% IF user.login %][% dep.needinfo_requestee FILTER html %][% ELSE %][% dep.needinfo_requestee_name FILTER html %][% END %][% END %] - 
>             [% IF dep.status == 'CLOSED' %][% dep.resolution FILTER html %] - [% END %]
>             [% dep.severity FILTER html %] - 
>-            [% dep.assignee_email FILTER html %] - 
>+            [% IF user.login %][% dep.assignee_email FILTER html %][% ELSE %][% dep.assignee_name FILTER html %][% END %] - 
>             [% IF dep.milestone %][% dep.milestone FILTER html %] - [% END %]
>             [% IF dep.keywords %][% dep.keywords FILTER html %][% END %]]&nbsp;
>             [% IF dep.seen %]
>Index: template/en/default/bug/dependency-tree.xml.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/template/en/default/bug/dependency-tree.xml.tmpl,v
>retrieving revision 1.5
>diff -u -r1.5 dependency-tree.xml.tmpl
>--- template/en/default/bug/dependency-tree.xml.tmpl	7 Jul 2006 18:00:00 -0000	1.5
>+++ template/en/default/bug/dependency-tree.xml.tmpl	2 Jan 2008 18:32:42 -0000
>@@ -37,7 +37,7 @@
>     <bug_status>[% parent.bug_status FILTER xml %]</bug_status>
>     <resolution>[% parent.resolution FILTER xml %]</resolution>
>     <bug_severity>[% parent.bug_severity FILTER xml %]</bug_severity>
>-    <assigned_to>[% parent.assigned_to.email FILTER xml %]</assigned_to>
>+    <assigned_to>[% IF user.login %][% parent.assigned_to.email FILTER xml %][% ELSE %][% parent.assigned_to.name FILTER xml %][% END %]</assigned_to>
>     <delta_ts>[% parent.delta_ts FILTER xml %]</delta_ts>
>     <status_whiteboard>[% parent.status_whiteboard FILTER xml %]</status_whiteboard>
>     <estimated_time>[% parent.estimated_time FILTER xml %]</estimated_time>
>@@ -68,7 +68,7 @@
>       <bug_status>[% dep.status FILTER xml %]</bug_status>
>       <resolution>[% dep.resolution FILTER xml %]</resolution>
>       <bug_severity>[% dep.severity FILTER xml %]</bug_severity>
>-      <assigned_to>[% dep.assignee_email FILTER xml %]</assigned_to>
>+      <assigned_to>[% IF user.login %][% dep.assignee_email FILTER xml %][% ELSE %][% dep.assignee_name FILTER xml %][% END %]</assigned_to>
>       <delta_ts>[% dep.delta_ts FILTER xml %]</delta_ts>
>       <status_whiteboard>[% dep.status_whiteboard FILTER xml %]</status_whiteboard>
>       <estimated_time>[% dep.estimated_time FILTER xml %]</estimated_time>

Actions: View | Diff

Attachments on bug 427268: 290675