- tor-commits - lists.torproject.org

[tor/master] Make the Log configuration option expand ~
by nickm＠torproject.org 25 Apr '11

25 Apr '11

commit 91aa6f08bcf0acbdfa038aaffe73e327ddd87c67 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 22 16:06:52 2011 +0200 Make the Log configuration option expand ~ --- changes/bug2971 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug2971 b/changes/bug2971 new file mode 100644 index 0000000..8b71ce0 --- /dev/null +++ b/changes/bug2971 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Be more consistent in our treatment of file system paths. ~ should + get expanded to the user's home directory in the Log config option. + Bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and + --DataDirectory options. + diff --git a/src/or/config.c b/src/or/config.c index 5000f5d..3770301 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4382,11 +4382,13 @@ options_init_logs(or_options_t *options, int validate_only) if (smartlist_len(elts) == 2 && !strcasecmp(smartlist_get(elts,0), "file")) { if (!validate_only) { - if (add_file_log(severity, smartlist_get(elts, 1)) < 0) { + char *fname = expand_filename(smartlist_get(elts, 1)); + if (add_file_log(severity, fname) < 0) { log_warn(LD_CONFIG, "Couldn't open file for 'Log %s': %s", opt->value, strerror(errno)); ok = 0; } + tor_free(fname); } goto cleanup; }

1 0

[tor/master] Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2
by nickm＠torproject.org 25 Apr '11

25 Apr '11

commit f3b58dfa53d87656f558a97bc28a333bdea06017 Merge: a0514ba 91aa6f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 25 19:03:15 2011 -0400 Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2 changes/bug2971 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Make the Log configuration option expand ~
by nickm＠torproject.org 25 Apr '11

25 Apr '11

commit 91aa6f08bcf0acbdfa038aaffe73e327ddd87c67 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 22 16:06:52 2011 +0200 Make the Log configuration option expand ~ --- changes/bug2971 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug2971 b/changes/bug2971 new file mode 100644 index 0000000..8b71ce0 --- /dev/null +++ b/changes/bug2971 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Be more consistent in our treatment of file system paths. ~ should + get expanded to the user's home directory in the Log config option. + Bugfix on 0.2.0.1-alpha, which introduced the feature for the -f and + --DataDirectory options. + diff --git a/src/or/config.c b/src/or/config.c index 5000f5d..3770301 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4382,11 +4382,13 @@ options_init_logs(or_options_t *options, int validate_only) if (smartlist_len(elts) == 2 && !strcasecmp(smartlist_get(elts,0), "file")) { if (!validate_only) { - if (add_file_log(severity, smartlist_get(elts, 1)) < 0) { + char *fname = expand_filename(smartlist_get(elts, 1)); + if (add_file_log(severity, fname) < 0) { log_warn(LD_CONFIG, "Couldn't open file for 'Log %s': %s", opt->value, strerror(errno)); ok = 0; } + tor_free(fname); } goto cleanup; }

1 0

[tor/maint-0.2.2] Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2
by nickm＠torproject.org 25 Apr '11

25 Apr '11

commit f3b58dfa53d87656f558a97bc28a333bdea06017 Merge: a0514ba 91aa6f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 25 19:03:15 2011 -0400 Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2 changes/bug2971 | 6 ++++++ src/or/config.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Fix a bug in removing DNSPort requests from their circular list
by arma＠torproject.org 25 Apr '11

25 Apr '11

commit e98583594d897ac32745061143e565c6f4b45f97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 21 13:39:00 2011 -0400 Fix a bug in removing DNSPort requests from their circular list Under heavy load, this could result in an assertion failure. Fix for bug 2933; bugfix on 0.2.0.10-alpha. --- changes/bug2933 | 4 ++++ src/or/eventdns.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug2933 b/changes/bug2933 new file mode 100644 index 0000000..7aaf526 --- /dev/null +++ b/changes/bug2933 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Fix an uncommon assertion failure when running with DNSPort under + heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. + diff --git a/src/or/eventdns.c b/src/or/eventdns.c index a889e80..2777f90 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1949,7 +1949,7 @@ server_request_free(struct server_request *req) if (req->port) { if (req->port->pending_replies == req) { - if (req->next_pending) + if (req->next_pending && req->next_pending != req) req->port->pending_replies = req->next_pending; else req->port->pending_replies = NULL;

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 25 Apr '11

25 Apr '11

commit a0514ba531e78bc464ab57e58a443e4d21783718 Merge: 3f7f96d e985835 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 21 13:40:00 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2933 | 4 ++++ src/or/eventdns.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 25 Apr '11

25 Apr '11

commit d6b5caa40413ad697b54e959873bd0947f71bd61 Merge: caa44c9 a0514ba Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 25 18:42:01 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug2933 | 4 ++++ src/or/eventdns.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

r24667: {website} but back the business phone number as it appears global voip (website/trunk/press/en)
by Andrew Lewman 25 Apr '11

25 Apr '11

Author: phobos Date: 2011-04-25 15:35:23 +0000 (Mon, 25 Apr 2011) New Revision: 24667 Modified: website/trunk/press/en/2008-12-19-roadmap-press-release.wml website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml website/trunk/press/en/2010-03-25-tor-store-press-release.wml website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml website/trunk/press/en/info.wmi Log: but back the business phone number as it appears global voip isn't so global when you actually leave the US borders. Modified: website/trunk/press/en/2008-12-19-roadmap-press-release.wml =================================================================== --- website/trunk/press/en/2008-12-19-roadmap-press-release.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2008-12-19-roadmap-press-release.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -82,7 +82,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> - <p>Tel: +1-406-356-6475</p> + <p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> </div> Modified: website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml =================================================================== --- website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -65,7 +65,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> - <p>Tel: +1-406-356-6475</p> + <p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> </div> Modified: website/trunk/press/en/2010-03-25-tor-store-press-release.wml =================================================================== --- website/trunk/press/en/2010-03-25-tor-store-press-release.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2010-03-25-tor-store-press-release.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -82,7 +82,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> - <p>Tel: +1-406-356-6475</p> + <p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> </div> Modified: website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml =================================================================== --- website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -64,7 +64,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> -<p>Tel: +1-406-356-6475</p> +<p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> <div align=center>###</div> Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/info.wmi 2011-04-25 15:35:23 UTC (rev 24667) @@ -9,7 +9,7 @@ <b>Andrew Lewman</b><br> Executive Director<br> execdir(a)torproject.org<br> - +1-406-356-6475<br> + +1-781-352-0568<br> </p> </div>

1 0

[arm/master] fix: Workaround for autogenerated Nickname config
by atagar＠torproject.org 24 Apr '11

24 Apr '11

commit 9b653e81ba24b154510e8fc39222de5c96478bc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 24 12:21:34 2011 -0700 fix: Workaround for autogenerated Nickname config As discussed in ticket 2362 (https://trac.torproject.org/projects/tor/ticket/2362) the "GETINFO config-text" results provide an autogenerated Nickname field if running as a relay and one wasn't provided. --- src/util/torConfig.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 2e70f5a..030a169 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -3,6 +3,7 @@ Helper functions for working with tor's configuration file. """ import os +import socket import threading from util import enum, log, sysTools, torTools, uiTools @@ -367,13 +368,16 @@ def getCustomOptions(includeValue = False): configLines = list(set(configLines)) # The "GETINFO config-text" query only provides options that differ - # from Tor's defaults with the exception of its Log entry which, even - # if undefined, returns "Log notice stdout" as per: + # from Tor's defaults with the exception of its Log and Nickname entries + # which, even if undefined, returns "Log notice stdout" as per: # https://trac.torproject.org/projects/tor/ticket/2362 try: configLines.remove("Log notice stdout") except ValueError: pass + try: configLines.remove("Nickname %s" % socket.gethostname()) + except ValueError: pass + if includeValue: return configLines else: return [line[:line.find(" ")] for line in configLines]

1 0

[metrics-web/master] Show default start and end dates for graphs.
by karsten＠torproject.org 24 Apr '11

24 Apr '11

commit adc0de62d3d406eb46968f40fc9647818866be5e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 24 16:05:05 2011 +0200 Show default start and end dates for graphs. --- .../ernie/web/GraphsSubpagesServlet.java | 12 ++++++++ web/WEB-INF/network.jsp | 28 ++++++++++---------- web/WEB-INF/packages.jsp | 4 +- web/WEB-INF/performance.jsp | 12 ++++---- web/WEB-INF/users.jsp | 9 +++--- 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java index 2de2eac..f8dfba4 100644 --- a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java @@ -3,6 +3,7 @@ package org.torproject.ernie.web; import javax.servlet.*; import javax.servlet.http.*; import java.io.*; +import java.text.*; import java.util.*; public class GraphsSubpagesServlet extends HttpServlet { @@ -77,6 +78,17 @@ public class GraphsSubpagesServlet extends HttpServlet { /* Pass list of known countries in case we want to display them. */ request.setAttribute("countries", this.knownCountries); + /* Pass the default start and end dates. */ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + Date defaultEndDate = new Date(); + Date defaultStartDate = new Date(defaultEndDate.getTime() + - 90L * 24L * 60L * 60L * 1000L); + request.setAttribute("default_start_date", + dateFormat.format(defaultStartDate)); + request.setAttribute("default_end_date", + dateFormat.format(defaultEndDate)); + /* Forward the request to the JSP that does all the hard work. */ request.getRequestDispatcher(jsp).forward(request, response); } diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 28a7c34..a1a5efe 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -27,10 +27,10 @@ bridges in the network.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${networksize_start[0]}"> + value="<c:choose><c:when test="${fn:length(networksize_start) == 0}">${default_start_date}</c:when><c:otherwise>${networksize_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${networksize_end[0]}"> + value="<c:choose><c:when test="${fn:length(networksize_end) == 0}">${default_end_date}</c:when><c:otherwise>${networksize_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${networksize_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -58,10 +58,10 @@ country.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${relaycountries_start[0]}"> + value="<c:choose><c:when test="${fn:length(relaycountries_start) == 0}">${default_start_date}</c:when><c:otherwise>${relaycountries_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${relaycountries_end[0]}"> + value="<c:choose><c:when test="${fn:length(relaycountries_end) == 0}">${default_end_date}</c:when><c:otherwise>${relaycountries_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <select name="country"> <option value="all"<c:if test="${relaycountries_country[0] eq 'all'}"> selected</c:if>>All relays</option> @@ -97,10 +97,10 @@ average number of relays with these flags assigned.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${relayflags_start[0]}"> + value="<c:choose><c:when test="${fn:length(relayflags_start) == 0}">${default_start_date}</c:when><c:otherwise>${relayflags_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${relayflags_end[0]}"> + value="<c:choose><c:when test="${fn:length(relayflags_end) == 0}">${default_end_date}</c:when><c:otherwise>${relayflags_end[0]}</c:otherwise></c:choose>"> </p><p> <label>Relay flags: </label> <input type="checkbox" name="flag" value="Running"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Running')}"> checked</c:if>> Running @@ -140,10 +140,10 @@ version.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${versions_start[0]}"> + value="<c:choose><c:when test="${fn:length(versions_start) == 0}">${default_start_date}</c:when><c:otherwise>${versions_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${versions_end[0]}"> + value="<c:choose><c:when test="${fn:length(versions_end) == 0}">${default_end_date}</c:when><c:otherwise>${versions_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${versions_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -174,10 +174,10 @@ platform.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${platforms_start[0]}"> + value="<c:choose><c:when test="${fn:length(platforms_start) == 0}">${default_start_date}</c:when><c:otherwise>${platforms_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${platforms_end[0]}"> + value="<c:choose><c:when test="${fn:length(platforms_end) == 0}">${default_end_date}</c:when><c:otherwise>${platforms_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${platforms_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -209,10 +209,10 @@ in the network.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${bandwidth_start[0]}"> + value="<c:choose><c:when test="${fn:length(bandwidth_start) == 0}">${default_start_date}</c:when><c:otherwise>${bandwidth_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${bandwidth_end[0]}"> + value="<c:choose><c:when test="${fn:length(bandwidth_end) == 0}">${default_end_date}</c:when><c:otherwise>${bandwidth_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${bandwidth_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -243,10 +243,10 @@ the number of written and read dir bytes by all relays.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${dirbytes_start[0]}"> + value="<c:choose><c:when test="${fn:length(dirbytes_start) == 0}">${default_start_date}</c:when><c:otherwise>${dirbytes_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${dirbytes_end[0]}"> + value="<c:choose><c:when test="${fn:length(dirbytes_end) == 0}">${default_end_date}</c:when><c:otherwise>${dirbytes_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${dirbytes_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp index b4ecb5f..9a19aca 100644 --- a/web/WEB-INF/packages.jsp +++ b/web/WEB-INF/packages.jsp @@ -28,10 +28,10 @@ graph shows the number of packages requested from GetTor per day.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${gettor_start[0]}"> + value="<c:choose><c:when test="${fn:length(gettor_start) == 0}">${default_start_date}</c:when><c:otherwise>${gettor_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${gettor_end[0]}"> + value="<c:choose><c:when test="${fn:length(gettor_end) == 0}">${default_end_date}</c:when><c:otherwise>${gettor_end[0]}</c:otherwise></c:choose>"> </p><p> Packages: <input type="radio" name="bundle" value="all" <c:if test="${fn:length(gettor_bundle) == 0 or gettor_bundle[0] eq 'all'}"> checked</c:if>> Total packages diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index 939beec..095bda2 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -29,10 +29,10 @@ quartile of request times.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${torperf_start[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_start) == 0}">${default_start_date}</c:when><c:otherwise>${torperf_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${torperf_end[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_end) == 0}">${default_end_date}</c:when><c:otherwise>${torperf_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <input type="radio" name="source" value="all"<c:if test="${fn:length(torperf_source) == 0 or torperf_source[0] eq 'all'}"> checked</c:if>> all @@ -75,10 +75,10 @@ than 50 KiB (1 MiB, 5 MiB).</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${torperf_failures_start[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_failures_start) == 0}">${default_start_date}</c:when><c:otherwise>${torperf_failures_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${torperf_failures_end[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_failures_end) == 0}">${default_end_date}</c:when><c:otherwise>${torperf_failures_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <input type="radio" name="source" value="all"<c:if test="${fn:length(torperf_failures_source) == 0 or torperf_failures_source[0] eq 'all'}"> checked</c:if>> all @@ -126,10 +126,10 @@ classifying connections, read and write counters are reset for the next <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${connbidirect_start[0]}"> + value="<c:choose><c:when test="${fn:length(connbidirect_start) == 0}">${default_start_date}</c:when><c:otherwise>${connbidirect_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${connbidirect_end[0]}"> + value="<c:choose><c:when test="${fn:length(connbidirect_end) == 0}">${default_end_date}</c:when><c:otherwise>${connbidirect_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${connbidirect_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 7ea45a5..60be8ab 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -1,4 +1,5 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -30,10 +31,10 @@ based on the requests seen by a few dozen directory mirrors.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${direct_users_start[0]}"> + value="<c:choose><c:when test="${fn:length(direct_users_start) == 0}">${default_start_date}</c:when><c:otherwise>${direct_users_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${direct_users_end[0]}"> + value="<c:choose><c:when test="${fn:length(direct_users_end) == 0}">${default_end_date}</c:when><c:otherwise>${direct_users_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <select name="country"> <option value="all"<c:if test="${direct_users_country[0] eq 'all'}"> selected</c:if>>All users</option> @@ -74,10 +75,10 @@ by a few hundred bridges.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${bridge_users_start[0]}"> + value="<c:choose><c:when test="${fn:length(bridge_users_start) == 0}">${default_start_date}</c:when><c:otherwise>${bridge_users_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${bridge_users_end[0]}"> + value="<c:choose><c:when test="${fn:length(bridge_users_end) == 0}">${default_end_date}</c:when><c:otherwise>${bridge_users_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <select name="country"> <option value="all"<c:if test="${bridge_users_country[0] eq 'all'}"> selected</c:if>>All users</option>

1 0