Ticket #1890: authentic.patch

templates/attachment.cs

@@ -14 +14 @@
   </div>
   <fieldset>
    <legend>Attachment Info</legend>
-   <div class="field">
-    <label>Your email or username:<br />
-    <input type="text" name="author" size="30" value="<?cs
-      var:attachment.author?>" /></label>
-   </div>
+   <?cs if:trac.authname == "anonymous" ?>
+    <div class="field">
+     <label>Your email or username:<br />
+     <input type="text" name="author" size="30" value="<?cs
+       var:attachment.author?>" /></label>
+    </div>
+   <?cs /if ?>
    <div class="field">
     <label>Description of the file (optional):<br />
     <input type="text" name="description" size="60" /></label>

templates/newticket.cs

@@ -11 +11 @@
 <?cs include:"site_newticket.cs" ?>
 <form id="newticket" method="post" action="<?cs
   var:trac.href.newticket ?>#preview">
- <div class="field">
-  <label for="reporter">Your email or username:</label><br />
-  <input type="text" id="reporter" name="reporter" size="40" value="<?cs
-    var:newticket.reporter ?>" /><br />
- </div>
+ <?cs if:trac.authname == "anonymous" ?>
+  <div class="field">
+   <label for="reporter">Your email or username:</label><br />
+   <input type="text" id="reporter" name="reporter" size="40" value="<?cs
+     var:newticket.reporter ?>" /><br />
+  </div>
+ <?cs /if ?>
  <div class="field">
   <label for="summary">Short summary:</label><br />
   <input id="summary" type="text" name="summary" size="80" value="<?cs

templates/ticket.cs

@@ -126 +126 @@
  <hr />
  <h3><a name="edit" onfocus="document.getElementById('comment').focus()">Add/Change #<?cs
    var:ticket.id ?> (<?cs var:ticket.summary ?>)</a></h3>
- <div class="field">
-  <label for="author">Your email or username:</label><br />
-  <input type="text" id="author" name="author" size="40"
-    value="<?cs var:ticket.reporter_id ?>" /><br />
- </div>
+ <?cs if:trac.authname == "anonymous" ?>
+  <div class="field">
+   <label for="author">Your email or username:</label><br />
+   <input type="text" id="author" name="author" size="40"
+     value="<?cs var:ticket.reporter_id ?>" /><br />
+  </div>
+ <?cs /if ?>
  <div class="field">
   <fieldset class="iefix">
    <label for="comment">Comment (you may use <a tabindex="42" href="<?cs

templates/wiki.cs

@@ -235 +235 @@
     </div>
     <fieldset id="changeinfo">
      <legend>Change information</legend>
-     <div class="field">
-      <label>Your email or username:<br />
-      <input id="author" type="text" name="author" size="30" value="<?cs
-        var:wiki.author ?>" /></label>
-     </div>
+     <?cs if:trac.authname == "anonymous" ?>
+      <div class="field">
+       <label>Your email or username:<br />
+       <input id="author" type="text" name="author" size="30" value="<?cs
+         var:wiki.author ?>" /></label>
+      </div>
+     <?cs /if ?>
      <div class="field">
       <label>Comment about this change (optional):<br />
       <input id="comment" type="text" name="comment" size="60" value="<?cs

trac/attachment.py

@@ -318 +318 @@
                                                     'utf-8')).encode('utf-8')
 
         attachment.description = req.args.get('description', '')
-        attachment.author = req.args.get('author', '')
+        attachment.author = util.get_authentic_id(req, 'author')
         attachment.ipnr = req.remote_addr
         if req.args.get('replace'):
             try:
@@ -376 +376 @@
         text, link = self._get_parent_link(attachment)
         req.hdf['attachment'] = {
             'mode': 'new',
-            'author': util.get_reporter_id(req),
+            'author': util.get_reporter_id(req, 'author'),
             'parent': {'type': attachment.parent_type,
                        'id': attachment.parent_id, 'name': text, 'href': link}
         }

trac/ticket/web_ui.py

@@ -84 +84 @@
 
         ticket = Ticket(self.env, db=db)
         ticket.populate(req.args)
-        ticket.values.setdefault('reporter', util.get_reporter_id(req))
+        ticket.values['reporter'] = util.get_reporter_id(req, 'reporter')
 
         if ticket.values.has_key('description'):
             description = wiki_to_html(ticket['description'], self.env, req, db)
@@ -133 +133 @@
             raise TracError('Tickets must contain a summary.')
 
         ticket = Ticket(self.env, db=db)
-        ticket.values.setdefault('reporter', util.get_reporter_id(req))
         ticket.populate(req.args)
+        ticket.values['reporter'] = util.get_authentic_id(req, 'reporter')
         ticket.insert(db=db)
         db.commit()
 
@@ -182 +182 @@
         id = int(req.args.get('id'))
 
         ticket = Ticket(self.env, id, db=db)
-        reporter_id = util.get_reporter_id(req)
 
         if req.method == 'POST':
             if not req.args.has_key('preview'):
@@ -195 +194 @@
                 req.hdf['ticket.reassign_owner'] = req.args.get('reassign_owner') \
                                                    or req.authname
                 req.hdf['ticket.resolve_resolution'] = req.args.get('resolve_resolution')
-                reporter_id = req.args.get('author')
                 comment = req.args.get('comment')
                 if comment:
                     req.hdf['ticket.comment'] = comment
@@ -208 +206 @@
             # Store a timestamp in order to detect "mid air collisions"
             req.hdf['ticket.ts'] = ticket.time_changed
 
-        self._insert_ticket_data(req, db, ticket, reporter_id)
+        self._insert_ticket_data(req, db, ticket,
+                                 util.get_reporter_id(req, 'author'))
 
         # If the ticket is being shown in the context of a query, add
         # links to help navigate in the query result set
@@ -343 +342 @@
             ticket['resolution'] = ''
 
         now = int(time.time())
-        ticket.save_changes(req.args.get('author', req.authname),
+        ticket.save_changes(util.get_authentic_id(req, 'author'),
                             req.args.get('comment'), when=now, db=db)
         db.commit()
 

trac/util.py

@@ -381 +381 @@
                 raise Exception('Failed to create unique name: ' + path)
             path = '%s.%d%s' % (parts[0], idx, parts[1])
 
-def get_reporter_id(req):
-    name = req.session.get('name', None)
-    email = req.session.get('email', None)
-    
+def get_reporter_id(req, argname):
     if req.authname != 'anonymous':
         return req.authname
-    elif name and email:
+
+    r = req.args.get(argname)
+    if r:
+        return r
+    name = req.session.get('name', None)
+    email = req.session.get('email', None)
+    if name and email:
         return '%s <%s>' % (name, email)
     elif not name and email:
         return email
     else:
         return req.authname
 
+def get_authentic_id(req, argname):
+    if req.authname != 'anonymous':
+        return req.authname
+    r = get_reporter_id(req, argname)
+    if r == 'anonymous':
+        return r
+    return r + ' [unauthenticated]'
+
 # Date/time utilities
 
 def format_datetime(t=None, format='%x %X', gmt=False):

trac/wiki/web_ui.py

@@ -26 +26 @@
 from trac.Search import ISearchSource, query_to_sql, shorten_result
 from trac.Timeline import ITimelineEventProvider
 from trac.util import enum, format_datetime, get_reporter_id, \
+                      get_authentic_id, \
                       pretty_timedelta, shorten_line, Markup
 from trac.versioncontrol.diff import get_diff_options, hdf_diff
 from trac.web.chrome import add_link, add_stylesheet, INavigationContributor
@@ -183 +184 @@
             # WIKI_ADMIN
             page.readonly = int(req.args.has_key('readonly'))
 
-        page.save(req.args.get('author'), req.args.get('comment'),
+        page.save(get_authentic_id(req, 'author'), req.args.get('comment'),
                   req.remote_addr)
         req.redirect(self.env.href.wiki(page.name))
 
@@ -283 +284 @@
         if preview:
             page.readonly = req.args.has_key('readonly')
 
-        author = req.args.get('author', get_reporter_id(req))
+        author = get_reporter_id(req, 'author')
         comment = req.args.get('comment', '')
         editrows = req.args.get('editrows')
         if editrows: