Changeset 3140

Timestamp:

05/14/2016 12:27:03 PM (9 years ago)

Author:

ocean90

Message:

Trac: Use user's nicename for gravatars and profile links.

Adds wporg_sanitize_user_nicename() which simulates bb_sanitize_with_dashes() from bbPress.

See #1462.

Location:

sites/trunk/trac.wordpress.org/templates

Files:

• site-ticket.html (modified) (2 diffs)
• site.html (modified) (1 diff)
• ticket_change.html (modified) (2 diffs)

sites/trunk/trac.wordpress.org/templates/site-ticket.html

@@ -34 +34 @@
 
 <!--! Gravatars for the ticket reporter -->
-<td py:match="td[@headers='h_reporter']" py:attrs="select('@*')">
-  <a href="${profile_link + ticket.reporter}">
-    <img class="avatar" src="https://wordpress.org/grav-redirect.php?user=${ticket.reporter}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${ticket.reporter}&amp;s=96 2x" height="48" width="48" />
+<td py:match="td[@headers='h_reporter']" py:attrs="select('@*')" py:with="wporg_user = wporg_sanitize_user_nicename(ticket.reporter)">
+  <a href="${profile_link + wporg_user}">
+    <img class="avatar" src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" />
   </a>
     ${select('*|comment()|text()')}
@@ -43 +43 @@
 <!--! Gravatars for the ticket owner -->
 <td py:match="td[@headers='h_owner']" py:attrs="select('@*')">
-  <a href="${profile_link + ticket.owner}" py:if="ticket.owner">
-    <img class="avatar" src="https://wordpress.org/grav-redirect.php?user=${ticket.owner}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${ticket.owner}&amp;s=96 2x" height="48" width="48" />
+  <a py:if="ticket.owner" py:with="wporg_user = wporg_sanitize_user_nicename(ticket.owner)" href="${profile_link + wporg_user}">
+    <img class="avatar" src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" />
   </a>
     ${select('*|comment()|text()')}

sites/trunk/trac.wordpress.org/templates/site.html

@@ -31 +31 @@
     except (IndexError, KeyError):
         pass
+
+    import re
+    def wporg_sanitize_user_nicename(str):
+        str = str.lower()
+        str = re.sub(r'[^%a-z0-9\x80-\xff _-]', '', str)
+        str = str.strip()
+        str = re.sub(r'\s+', '-', str)
+        str = re.sub(r'-+', '-', str)
+        str = re.sub(r'_+', '_', str)
+        return str;
+
 ?>
 

sites/trunk/trac.wordpress.org/templates/ticket_change.html

@@ -33 +33 @@
 
 <py:choose>
-<py:when test="'author' in change and ('slackbot' == change.author or 'ircbot' == change.author)">
+<py:when test="'author' in change and ('slackbot' == change.author or 'ircbot' == change.author)"
+         py:with="wporg_user = wporg_sanitize_user_nicename(change.author)"  >
   <h3 class="change chat-bot">
     <span class="avatar" py:if="change">
       <span class="username-line">
-        <img src="https://wordpress.org/grav-redirect.php?user=${authorinfo(change.author)}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${authorinfo(change.author)}&amp;s=96 2x" height="48" width="48" />
+        <img src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" />
         ${wiki_to_html(context, change.comment, escape_newlines=preserve_newlines)}
       </span>
@@ -74 +75 @@
     </span>
     <py:choose>
-      <py:when test="'author' in change">
+      <py:when test="'author' in change" py:with="wporg_user = wporg_sanitize_user_nicename(change.author)">
         <span class="avatar" py:if="change">
-          <span class="username-line"><a href="https://profiles.wordpress.org/${authorinfo(change.author)}" class="profile-link">
-            <img src="https://wordpress.org/grav-redirect.php?user=${authorinfo(change.author)}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${authorinfo(change.author)}&amp;s=96 2x" height="48" width="48" /> @<span class="username" data-username="${change.author}">${authorinfo(change.author)}</span></a></span>
+          <span class="username-line"><a href="https://profiles.wordpress.org/${wporg_user}" class="profile-link">
+            <img src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" /> @<span class="username" data-username="${change.author}">${authorinfo(change.author)}</span></a></span>
           <py:if test="'date' in change">
             <br /><span class="time-ago">${dateinfo(change.date)} ago</span>