From 0871fbdf5b76c9e9bc17f6bed6d6186f3d2b9bbb Mon Sep 17 00:00:00 2001
From: David Schmidt <david__schmidt@users.sourceforge.net>
Date: Thu, 1 Nov 2001 14:18:57 +0000
Subject: [PATCH] Show enablement/disablement status in almost all templates.
There is a little trickiness here: apparent recursive resolution of
@if-enabled-then@ caused the toggle template to show status out-of-phase with
the actual enablement status. So a similar construct,
@if-enabled-display-then@, is used to resolve the status display on
non-'toggle' templates.
---
templates/blocked | 2 +-
templates/cgi-error-404 | 2 +-
templates/cgi-error-bad-param | 2 +-
templates/cgi-error-disabled | 2 +-
templates/cgi-error-file | 2 +-
templates/cgi-error-modified | 2 +-
templates/cgi-error-parse | 2 +-
templates/connect-failed | 2 +-
templates/default | 2 +-
templates/no-such-domain | 2 +-
templates/show-request | 2 +-
templates/show-status | 2 +-
templates/show-status-file | 2 +-
templates/show-url-info | 2 +-
templates/show-version | 4 ++--
templates/toggle | 4 ++--
templates/untrusted | 2 +-
17 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/templates/blocked b/templates/blocked
index 35d70538..9752d39e 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -97,7 +97,7 @@
</td>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index 2b70d5fa..c4adafa5 100644
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -83,7 +83,7 @@
</td>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index 1ce2048c..2a79b0d9 100644
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -80,7 +80,7 @@
<tr>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled
index d4bc239a..ea07bd37 100644
--- a/templates/cgi-error-disabled
+++ b/templates/cgi-error-disabled
@@ -80,7 +80,7 @@
<tr>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/cgi-error-file b/templates/cgi-error-file
index 02282173..ffd0b703 100644
--- a/templates/cgi-error-file
+++ b/templates/cgi-error-file
@@ -80,7 +80,7 @@
<tr>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index 7702c625..77a65da1 100644
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -80,7 +80,7 @@
<tr>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index 0b636543..a86cfb1d 100644
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -80,7 +80,7 @@
<tr>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/connect-failed b/templates/connect-failed
index 17f4c557..25f001b9 100644
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -95,7 +95,7 @@
</td>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/default b/templates/default
index 82c2560c..59deed89 100644
--- a/templates/default
+++ b/templates/default
@@ -80,7 +80,7 @@
<tr>
<td bgcolor=#dddddd>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/no-such-domain b/templates/no-such-domain
index 8f0c728a..90d51d04 100644
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -97,7 +97,7 @@
</td>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/show-request b/templates/show-request
index 0ed97043..f7fe4b87 100644
--- a/templates/show-request
+++ b/templates/show-request
@@ -85,7 +85,7 @@
<tr>
<td bgcolor=#dddddd>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/show-status b/templates/show-status
index d413b34e..1aea2b03 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -120,7 +120,7 @@
<tr>
<td bgcolor=#dddddd>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/show-status-file b/templates/show-status-file
index 35ba9be5..48d16603 100644
--- a/templates/show-status-file
+++ b/templates/show-status-file
@@ -88,7 +88,7 @@
<tr>
<td bgcolor=#dddddd>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/show-url-info b/templates/show-url-info
index 23160397..9e3250d3 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -96,7 +96,7 @@
<tr>
<td bgcolor=#dddddd>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
diff --git a/templates/show-version b/templates/show-version
index 37367363..a4fbe1ba 100644
--- a/templates/show-version
+++ b/templates/show-version
@@ -96,7 +96,7 @@
<tr>
<td bgcolor=#dddddd>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
@@ -119,7 +119,7 @@
<tr>
<td bgcolor=#eeeeee>
<h2>Source code versions:</h2>
- <p><i>(Note: This information is only relevent if you checked out JunkBuster from CVS
+ <p><i>(Note: This information is only relevant if you checked out JunkBuster from CVS
and compiled it yourself. If you downloaded a binary, .exe, RPM, or a .tgz file,
then when you ask for support just mention the version number <b>@version@</b>
and the type of download you got.)</i></p>
diff --git a/templates/toggle b/templates/toggle
index 41cecad5..25278403 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -82,7 +82,7 @@
<tr>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</b></font></p>
</td>
</tr>
@@ -106,7 +106,7 @@
<td bgcolor=#eeeeee>
<h2>JunkBuster is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</h2>
<blockquote>
- <p>When enabled, JunkBuster performs it's magic - blocking
+ <p>When enabled, JunkBuster performs its magic - blocking
adverts, filtering cookies, regex-filtering, etc.</p>
<p>When disabled, JunkBuster behaves as a normal HTTP proxy,
and will not affect your web browsing.</p>
diff --git a/templates/untrusted b/templates/untrusted
index 4f9d7abe..0ecde242 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -110,7 +110,7 @@
</td>
<td bgcolor=#dddddd width=100%>
<p><font size=+2><b>This is the Internet J</b></font><font size=+1><b>UNK<i></font><font color="red">BUSTER</font></i></b>
- <font size=+2><b>@version@ on @my-hostname@ (@my-ip-address@), port @my-port@</b></font></p>
+ <font size=+2><b> @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b></font></p>
</td>
</tr>
--
2.49.0