[tor-commits] [metrics-web/master] Make "Any PT" the default for bridge users by transport.

[karsten at torproject.org]

commit d4a1c31f2b3020858202400348aa2429912d9a4e
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Nov 18 09:28:01 2015 +0100

    Make "Any PT" the default for bridge users by transport.
    
    Requested by asn.
---
 .../org/torproject/metrics/web/graphs/GraphParameterChecker.java   |    2 +-
 website/web/WEB-INF/userstats-bridge-transport.jsp                 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java
index deb6972..5c3f3e1 100644
--- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java
+++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java
@@ -255,7 +255,7 @@ public class GraphParameterChecker {
           }
         }
       } else {
-        transportParameters = new String[] { "<OR>" };
+        transportParameters = new String[] { "!<OR>" };
       }
       recognizedGraphParameters.put("transport", transportParameters);
     }
diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp
index 9ca1543..c638cdf 100644
--- a/website/web/WEB-INF/userstats-bridge-transport.jsp
+++ b/website/web/WEB-INF/userstats-bridge-transport.jsp
@@ -37,7 +37,7 @@ so that graphs are available for different transports.</p>
              value="<c:choose><c:when test="${fn:length(userstats_bridge_transport_end) == 0}">${default_end_date}</c:when><c:otherwise>${userstats_bridge_transport_end[0]}</c:otherwise></c:choose>">
     </p><p>
       <label>Source: </label>
-      <input type="checkbox" name="transport" value="<OR>"<c:if test="${fn:length(userstats_bridge_transport_transport) == 0 or fn:contains(fn:join(userstats_bridge_transport_transport, ','), '<OR>')}"> checked</c:if>> Default OR protocol
+      <input type="checkbox" name="transport" value="!<OR>"<c:if test="${fn:length(userstats_bridge_transport_transport) == 0 or fn:contains(fn:join(userstats_bridge_transport_transport, ','), '!<OR>')}"> checked</c:if>> Any pluggable transport
       <input type="checkbox" name="transport" value="obfs2"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'obfs2')}"> checked</c:if>> obfs2
       <input type="checkbox" name="transport" value="obfs3"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'obfs3')}"> checked</c:if>> obfs3
       <input type="checkbox" name="transport" value="obfs4"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'obfs4')}"> checked</c:if>> obfs4
@@ -46,7 +46,7 @@ so that graphs are available for different transports.</p>
       <input type="checkbox" name="transport" value="meek"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'meek')}"> checked</c:if>> meek
       <input type="checkbox" name="transport" value="scramblesuit"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), 'scramblesuit')}"> checked</c:if>> scramblesuit
       <input type="checkbox" name="transport" value="<??>"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), '<??>')}"> checked</c:if>> Unknown pluggable transport(s)
-      <input type="checkbox" name="transport" value="!<OR>"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), '!<OR>')}"> checked</c:if>> Any pluggable transport
+      <input type="checkbox" name="transport" value="<OR>"<c:if test="${fn:length(userstats_bridge_transport_transport) > 0 and fn:contains(fn:join(userstats_bridge_transport_transport, ','), '<OR>')}"> checked</c:if>> Default OR protocol
     </p><p>
     <input class="submit" type="submit" value="Update graph">
     </p>