From: jongfoster <jongfoster@users.sourceforge.net>
Date: Thu, 17 Jan 2002 21:33:00 +0000 (+0000)
Subject: Replacing all references to the URL of the config interface
X-Git-Tag: v_2_9_11~28
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/%22javascript:back()/@default-cgi@show-url-info?a=commitdiff_plain;h=f59e5426741b023569aa06bccbb20a86850e0651;p=privoxy.git
Replacing all references to the URL of the config interface
with @default-cgi@
---
diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index 2a79b0d9..38a17860 100644
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -109,6 +109,9 @@
"?" mark) are wrong or missing.</p>
<p>Possible causes:</p>
<ul>
+ <li>If you just typed a URL pattern into a form, then you got
+ something wrong. Press the "back" button on your browser
+ once and correct what you typed.</li>
<li>If you tried to type in the URL, then you've found a
page where you can't do that. You can only view this
page by following links from elsewhere in the configuration
diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index 77a65da1..97494e4d 100644
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -123,7 +123,7 @@
</ul>
<p>You can go back into the edit interface using the menu below,
or by clicking <a
- href="http://ijbswa.sourceforge.net/config/edit-actions-list?filename=@filename@"
+ href="@default-cgi@edit-actions-list?filename=@filename@"
>here</a>.</p>
</blockquote>
</td>
diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index a86cfb1d..969f1703 100644
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -112,7 +112,7 @@
badly using the web-based editor, please file a bug report!</p>
<p>When you've fixed the problem, you can go back into the edit
interface using the menu below, or by clicking <a
- href="http://ijbswa.sourceforge.net/config/edit-actions-list?filename=@filename@"
+ href="@default-cgi@edit-actions-list?filename=@filename@"
>here</a>.</p>
</blockquote>
</td>
diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form
index a0604e93..73512986 100644
--- a/templates/edit-actions-add-url-form
+++ b/templates/edit-actions-add-url-form
@@ -31,6 +31,9 @@
#
# Revisions :
# $Log: edit-actions-add-url-form,v $
+# Revision 1.2 2002/01/17 21:21:03 jongfoster
+# DOS->Unix line endings
+#
# Revision 1.1 2001/11/13 00:58:18 jongfoster
# New version of actions file editor templates
#
@@ -121,7 +124,7 @@ function validate(text)
<tr>
<td class="light">
<h2>Add URL Pattern</h2>
- <form method="GET" action="http://i.j.b/edit-actions-add-url"
+ <form method="GET" action="@default-cgi@edit-actions-add-url"
onSubmit="return validate(newval.value);">
<p>
<input type="hidden" name="filename" value="@filename@">
@@ -130,7 +133,7 @@ function validate(text)
<input type="text" name="newval" value="" size="78"><br>
<input type="submit" value="Submit">
<input type="reset" value="Reset">
- <a href="http://i.j.b/edit-actions-list?filename=@filename@">Cancel</a>
+ <a href="@default-cgi@edit-actions-list?filename=@filename@">Cancel</a>
</p>
</form>
</td>
diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 034de523..2004c16e 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -32,6 +32,9 @@
#
# Revisions :
# $Log: edit-actions-for-url,v $
+# Revision 1.7 2002/01/17 21:21:03 jongfoster
+# DOS->Unix line endings
+#
# Revision 1.6 2001/11/22 21:58:41 jongfoster
# Adding action +no-cookies-keep
#
@@ -283,7 +286,7 @@ function show_wafer_opts(tf)
<body>
-<form method="GET" action="http://i.j.b/edit-actions-submit" id="myform" name="myform">
+<form method="GET" action="@default-cgi@edit-actions-submit" id="myform" name="myform">
<table cellpadding="20" cellspacing="10" border="0" width="100%">
<tr>
diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 36a7d642..863cd1cb 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -31,6 +31,9 @@
#
# Revisions :
# $Log: edit-actions-list,v $
+# Revision 1.5 2002/01/17 21:21:05 jongfoster
+# DOS->Unix line endings
+#
# Revision 1.4 2001/11/13 00:58:18 jongfoster
# New version of actions file editor templates
#
@@ -139,7 +142,7 @@ function not_yet()
function remove_pattern(section,pattern,curtext)
{
if (window.confirm("Are you sure you want to delete this URL pattern?\nPattern is: "+unescape(curtext)))
- { window.location.href="http://i.j.b/edit-actions-remove-url?filename=@filename@&ver=@ver@§ion="+section+"&pattern="+pattern+"#s"+section+"urls"; }
+ { window.location.href="@default-cgi@edit-actions-remove-url?filename=@filename@&ver=@ver@§ion="+section+"&pattern="+pattern+"#s"+section+"urls"; }
return false;
}
@@ -180,7 +183,7 @@ function remove_pattern(section,pattern,curtext)
<td class="light">
<h2>Editing Actions File - @filename@.action</h2>
<p>
- <span><a class="cmd" href="http://i.j.b/edit-actions-section-add?filename=@filename@&ver=@ver@&section=0">Insert new section at top</a></span>
+ <span><a class="cmd" href="@default-cgi@edit-actions-section-add?filename=@filename@&ver=@ver@&section=0">Insert new section at top</a></span>
</p>
</td>
</tr>
diff --git a/templates/edit-actions-list-section b/templates/edit-actions-list-section
index 68c07bf9..68ea8145 100644
--- a/templates/edit-actions-list-section
+++ b/templates/edit-actions-list-section
@@ -1,6 +1,6 @@
##############################################################################
#
-# File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
+# File : $Source: /cvsroot/ijbswa/current/templates/edit-actions-list-section,v $
#
# Purpose : Template which forms part of edit-actions-list
#
@@ -30,7 +30,10 @@
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Revisions :
-# $Log$
+# $Log: edit-actions-list-section,v $
+# Revision 1.3 2001/11/13 00:58:18 jongfoster
+# New version of actions file editor templates
+#
#
#############################################################################
#
@@ -45,17 +48,17 @@
<table border="0" width="100%" cellspacing="0" cellpadding="3" class="wide">
<tr class="actions" valign="top">
<td class="header" align="right"><a name="s@sectionid@"></a>Actions:</td>
- <td align="center"><a class="cmd" href="http://i.j.b/edit-actions-for-url?filename=@filename@&ver=@ver@&section=@sectionid@"
+ <td align="center"><a class="cmd" href="@default-cgi@edit-actions-for-url?filename=@filename@&ver=@ver@&section=@sectionid@"
>Edit</a></td>
<td class="action" align="left">@actions@</td>
</tr>
<tr class="rule">
- <td colspan="3"><img src="http://i.j.b/send-banner?type=trans" width="2"
+ <td colspan="3"><img src="@default-cgi@send-banner?type=trans" width="2"
height="1" alt="----"></td>
</tr>
<tr class="url1" valign="top">
<td class="header" align="right"><a name="s@sectionid@urls">URLs:</a></td>
- <td align="center"><a class="cmd" href="http://i.j.b/edit-actions-add-url-form?filename=@filename@&ver=@ver@&section=@sectionid@"
+ <td align="center"><a class="cmd" href="@default-cgi@edit-actions-add-url-form?filename=@filename@&ver=@ver@&section=@sectionid@"
>Add</a></td>
<td align="left"> </td>
</tr>
@@ -63,7 +66,7 @@
@urls@
<tr class="rule">
- <td colspan="3"><img src="http://i.j.b/send-banner?type=trans" width="2"
+ <td colspan="3"><img src="@default-cgi@send-banner?type=trans" width="2"
height="1" alt="-"></td>
</tr>
<tr class="adv" valign="top">
@@ -73,13 +76,13 @@
<tr valign="middle" align="center">
<td class="nobreak"> <a class="cmd" href="javascript:not_yet()">Move section up</a> </td>
<td class="nobreak">
- <a class="cmd" href="http://i.j.b/edit-actions-section-add?filename=@filename@&ver=@ver@&section=@sectionid@"
+ <a class="cmd" href="@default-cgi@edit-actions-section-add?filename=@filename@&ver=@ver@&section=@sectionid@"
>Insert new section below</a> </td>
</tr>
<tr valign="middle" align="center">
<td class="nobreak"> <a class="cmd" href="javascript:not_yet()">Move section down</a> </td>
<td class="nobreak"><!-- @if-empty-section-start -->
- <a class="cmd" href="http://i.j.b/edit-actions-section-remove?filename=@filename@&ver=@ver@&section=@sectionid@"
+ <a class="cmd" href="@default-cgi@edit-actions-section-remove?filename=@filename@&ver=@ver@&section=@sectionid@"
>Delete whole section</a><!-- if-empty-section-end@ --> </td>
</tr>
</table>
diff --git a/templates/edit-actions-list-url b/templates/edit-actions-list-url
index 389317ed..c3a99dd4 100644
--- a/templates/edit-actions-list-url
+++ b/templates/edit-actions-list-url
@@ -1,6 +1,6 @@
##############################################################################
#
-# File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
+# File : $Source: /cvsroot/ijbswa/current/templates/edit-actions-list-url,v $
#
# Purpose : Template which forms part of edit-actions-list
#
@@ -30,7 +30,10 @@
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Revisions :
-# $Log$
+# $Log: edit-actions-list-url,v $
+# Revision 1.3 2001/11/13 00:58:18 jongfoster
+# New version of actions file editor templates
+#
#
#############################################################################
#
@@ -45,9 +48,9 @@
<tr class="url@url-1-2@" valign="top">
<td align="left"> </td>
<td align="center" class="nobreak"><a name="s@sectionid@url@urlid@"></a
-><a class="cmd" href="http://i.j.b/edit-actions-remove-url-form?filename=@filename@&ver=@ver@&section=@sectionid@&pattern=@urlid@&oldval=@url@"
+><a class="cmd" href="@default-cgi@edit-actions-remove-url-form?filename=@filename@&ver=@ver@&section=@sectionid@&pattern=@urlid@&oldval=@url@"
onclick="return remove_pattern(@sectionid@,@urlid@,'@url@');">Remove</a> <a
-class="cmd" href="http://i.j.b/edit-actions-url-form?filename=@filename@&ver=@ver@&section=@sectionid@&pattern=@urlid@&oldval=@url@">Edit</a> </td>
+class="cmd" href="@default-cgi@edit-actions-url-form?filename=@filename@&ver=@ver@&section=@sectionid@&pattern=@urlid@&oldval=@url@">Edit</a> </td>
<td class="url" align="left">@url-html@</td>
</tr>
diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index 0b5a2c6f..c7e9de74 100644
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -33,6 +33,9 @@
#
# Revisions :
# $Log: edit-actions-remove-url-form,v $
+# Revision 1.2 2002/01/17 21:21:05 jongfoster
+# DOS->Unix line endings
+#
# Revision 1.1 2001/11/13 00:58:18 jongfoster
# New version of actions file editor templates
#
@@ -113,9 +116,9 @@ td.dark { background-color: #dddddd }
<p>Are you sure you want to delete this URL pattern? The pattern is:</p>
<p><b>@oldval@</b></p>
<p>
- <a href="http://i.j.b/edit-actions-remove-url?filename=@filename@&ver=@ver@&section=@section@&pattern=@pattern@">OK</a>
+ <a href="@default-cgi@edit-actions-remove-url?filename=@filename@&ver=@ver@&section=@section@&pattern=@pattern@">OK</a>
- <a href="http://i.j.b/edit-actions-list?filename=@filename@">Cancel</a>
+ <a href="@default-cgi@edit-actions-list?filename=@filename@">Cancel</a>
</p>
</td>
</tr>
diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index 724a889a..0bec38f6 100644
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -31,6 +31,9 @@
#
# Revisions :
# $Log: edit-actions-url-form,v $
+# Revision 1.2 2002/01/17 21:21:05 jongfoster
+# DOS->Unix line endings
+#
# Revision 1.1 2001/11/13 00:58:18 jongfoster
# New version of actions file editor templates
#
@@ -123,7 +126,7 @@ function validate(text)
<tr>
<td class="light">
<h2>Edit URL Pattern</h2>
- <form method="GET" action="http://i.j.b/edit-actions-url"
+ <form method="GET" action="@default-cgi@edit-actions-url"
onSubmit="return validate(newval.value);">
<p>
<input type="hidden" name="filename" value="@filename@">
@@ -133,7 +136,7 @@ function validate(text)
<input type="text" name="newval" value="@oldval@" size="78"><br>
<input type="submit" value="Submit">
<input type="reset" value="Reset">
- <a href="http://i.j.b/edit-actions-list?filename=@filename@">Cancel</a>
+ <a href="@default-cgi@edit-actions-list?filename=@filename@">Cancel</a>
</p>
</form>
</td>
diff --git a/templates/show-status b/templates/show-status
index 00edc58a..2517178e 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -202,7 +202,7 @@
<td><code>FEATURE_CGI_EDIT_ACTIONS</code></td>
<td>@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@</td>
<td>Allows the use of the web-based actions file
- editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is <a href="http://i.j.b/edit-actions">here</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td>
+ editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is <a href="@default-cgi@edit-actions">here</a>@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.</td>
</tr>
<tr>
<td><code>FEATURE_COOKIE_JAR</code></td>
diff --git a/templates/toggle b/templates/toggle
index 25278403..6f10fff2 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -110,7 +110,7 @@
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>
- <p><a href="@default-cgi@/toggle?set=@if-enabled-then@disable@else-not-enabled@enable@endif-enabled@">Click
+ <p><a href="@default-cgi@toggle?set=@if-enabled-then@disable@else-not-enabled@enable@endif-enabled@">Click
here</a> to @if-enabled-then@disable@else-not-enabled@enable@endif-enabled@ JunkBuster.</p>
</blockquote>
</td>
@@ -137,11 +137,11 @@
(Netscape), and run them with a single click.</p>
<ul>
- <li><a href="javascript:void(window.open('@default-cgi@/toggle?mini=y&set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Enable JunkBuster</a></li>
- <li><a href="javascript:void(window.open('@default-cgi@/toggle?mini=y&set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Disable JunkBuster</a></li>
- <li><a href="javascript:void(window.open('@default-cgi@/toggle?mini=y&set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Toggle JunkBuster</a>
+ <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&set=enabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Enable JunkBuster</a></li>
+ <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&set=disabled','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Disable JunkBuster</a></li>
+ <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y&set=toggle','ijbstatus','width=250,height=100,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">Toggle JunkBuster</a>
(Toggles between enabled and disabled)</li>
- <li><a href="javascript:void(window.open('@default-cgi@/toggle?mini=y','ijbstatus','width=250,height=2,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">View JunkBuster Status</a></li>
+ <li><a href="javascript:void(window.open('@default-cgi@toggle?mini=y','ijbstatus','width=250,height=2,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());">View JunkBuster Status</a></li>
</ul>
<p><b>Credit:</b> The site which gave me the general idea for these
diff --git a/templates/toggle-mini b/templates/toggle-mini
index f2156bf2..f45f3ad0 100644
--- a/templates/toggle-mini
+++ b/templates/toggle-mini
@@ -79,9 +79,9 @@
<body bgcolor="#eeeeee" marginwidth="3" marginheight="3"
leftmargin="3" rightmargin="3" topmargin="3" bottommargin="3">
<center>
-<a href="@default-cgi@/" target="_blank">JunkBuster</a> is
+<a href="@default-cgi@" target="_blank">JunkBuster</a> is
<b>@if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</b>.
-<a href="@default-cgi@/toggle?mini=y&set=@if-enabled-then@disable@else-not-enabled@enable@endif-enabled@"
+<a href="@default-cgi@toggle?mini=y&set=@if-enabled-then@disable@else-not-enabled@enable@endif-enabled@"
>@if-enabled-then@[Disable]@else-not-enabled@[Enable]@endif-enabled@</a>
<br>
<a href="" onclick="window.close();">[Close]</a>