From 3c6406b7e0431bfac8206b6558d29d28051458e8 Mon Sep 17 00:00:00 2001 From: oes Date: Wed, 10 Apr 2002 13:33:20 +0000 Subject: [PATCH] Made templates modular --- templates/cgi-error-404 | 60 ++----- templates/cgi-error-bad-param | 58 ++----- templates/cgi-error-disabled | 58 ++----- templates/cgi-error-file | 58 ++----- templates/cgi-error-modified | 54 ++---- templates/cgi-error-parse | 54 ++---- templates/connect-failed | 58 ++----- templates/default | 58 ++----- templates/edit-actions-add-url-form | 61 ++----- templates/edit-actions-for-url | 61 ++----- templates/edit-actions-list | 57 ++---- templates/edit-actions-remove-url-form | 63 ++----- templates/edit-actions-url-form | 63 ++----- templates/mod-local-help | 12 ++ templates/mod-support-and-service | 24 +++ templates/mod-title | 4 + templates/mod-unstable-warning | 6 + templates/no-such-domain | 58 ++----- templates/show-request | 58 ++----- templates/show-status | 231 +++++++++++-------------- templates/show-status-file | 61 ++----- templates/show-url-info | 61 ++----- templates/show-version | 57 ++---- templates/toggle | 61 ++----- templates/untrusted | 60 ++----- 25 files changed, 391 insertions(+), 1065 deletions(-) create mode 100644 templates/mod-local-help create mode 100644 templates/mod-support-and-service create mode 100644 templates/mod-title create mode 100644 templates/mod-unstable-warning diff --git a/templates/cgi-error-404 b/templates/cgi-error-404 index c2631bf5..ee70d494 100644 --- a/templates/cgi-error-404 +++ b/templates/cgi-error-404 @@ -85,10 +85,9 @@ 404 -

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title + @@ -96,12 +95,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in -

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning + @@ -130,50 +126,18 @@ -

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service + -

Local Privoxy support:

- - -

You can consult the online documentation for more - information about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help + diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param index 82dc93d8..a9803dba 100644 --- a/templates/cgi-error-bad-param +++ b/templates/cgi-error-bad-param @@ -82,10 +82,9 @@ @@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -137,48 +133,18 @@ diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled index 29f6e78e..fd7f01f9 100644 --- a/templates/cgi-error-disabled +++ b/templates/cgi-error-disabled @@ -82,10 +82,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -124,48 +120,18 @@ diff --git a/templates/cgi-error-file b/templates/cgi-error-file index 7349300b..dab262a5 100644 --- a/templates/cgi-error-file +++ b/templates/cgi-error-file @@ -82,10 +82,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -120,48 +116,18 @@ diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified index 8ffe55ef..c42bc691 100644 --- a/templates/cgi-error-modified +++ b/templates/cgi-error-modified @@ -82,10 +82,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -138,48 +134,18 @@ diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse index fdd1d496..723eb677 100644 --- a/templates/cgi-error-parse +++ b/templates/cgi-error-parse @@ -82,10 +82,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- -

You can consult the online documentation for more information about this Privoxy installation.

- +#include mod-local-help - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

-
@@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -157,48 +153,18 @@ diff --git a/templates/connect-failed b/templates/connect-failed index 550274ca..8e6de608 100644 --- a/templates/connect-failed +++ b/templates/connect-failed @@ -93,10 +93,9 @@ 503 @@ -104,12 +103,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -135,48 +131,18 @@ diff --git a/templates/default b/templates/default index c227e3b4..f11c3f69 100644 --- a/templates/default +++ b/templates/default @@ -82,10 +82,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- -

You can consult the online documentation for more information about this Privoxy installation.

- +#include mod-local-help - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

-
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -93,12 +92,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -112,48 +108,18 @@ diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form index 8bda9722..9b701614 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.12 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.11 2002/04/05 16:01:33 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -123,10 +126,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -134,12 +136,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -171,48 +170,18 @@ diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url index e58aa17d..4c6d7597 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.21 2002/04/08 17:05:18 oes +# Inline a style exception +# # Revision 1.20 2002/04/05 16:01:30 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -338,10 +341,9 @@ function show_wafer_opts(tf)
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -349,12 +351,9 @@ function show_wafer_opts(tf) # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -789,48 +788,18 @@ function show_wafer_opts(tf) diff --git a/templates/edit-actions-list b/templates/edit-actions-list index 5c15076e..683a806b 100644 --- a/templates/edit-actions-list +++ b/templates/edit-actions-list @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list,v $ +# Revision 1.16 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.15 2002/04/05 16:01:32 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -215,10 +218,9 @@ function rm_p(pattern,curtext)
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -226,12 +228,9 @@ function rm_p(pattern,curtext) # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -261,48 +260,18 @@ function rm_p(pattern,curtext) diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form index cdfda304..ad9b359b 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.12 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.11 2002/04/05 16:01:30 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -113,10 +116,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- -

You can consult the online documentation for more information about this Privoxy installation.

- +#include mod-local-help - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

-
@@ -124,12 +126,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -156,50 +155,18 @@ diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form index b2d7ff82..6efed8e6 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.12 2002/04/08 17:08:14 oes +# Cosmetic: make status in title lowercase +# # Revision 1.11 2002/04/05 16:01:32 oes # Correct HTML, external Stylesheets, eye candy, some fixes # @@ -126,10 +129,9 @@ function validate(text)
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information - about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -137,12 +139,9 @@ function validate(text) # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -174,50 +173,18 @@ function validate(text) diff --git a/templates/mod-local-help b/templates/mod-local-help new file mode 100644 index 00000000..21d65963 --- /dev/null +++ b/templates/mod-local-help @@ -0,0 +1,12 @@ +

Local Privoxy support:

+ + +

You can consult the online documentation for more information about this Privoxy installation.

+ + + +

Address e-mail questions about this service to + @admin-address@, + who will be glad to help you. +

+ diff --git a/templates/mod-support-and-service b/templates/mod-support-and-service new file mode 100644 index 00000000..52769478 --- /dev/null +++ b/templates/mod-support-and-service @@ -0,0 +1,24 @@ +

Support and Service via Sourceforge:

+

+ We value your feedback. To provide you with the best support, + we ask that you: +

+ diff --git a/templates/mod-title b/templates/mod-title new file mode 100644 index 00000000..18296044 --- /dev/null +++ b/templates/mod-title @@ -0,0 +1,4 @@ +

+ This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, + @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ +

diff --git a/templates/mod-unstable-warning b/templates/mod-unstable-warning new file mode 100644 index 00000000..bb35ccf7 --- /dev/null +++ b/templates/mod-unstable-warning @@ -0,0 +1,6 @@ +

Warning:

+

+ Please note that this @code-status@ release + of the proxy software is not intended for production systems! +
Use at your own risk. See the license for details. +

diff --git a/templates/no-such-domain b/templates/no-such-domain index d27b1294..f220b5c9 100644 --- a/templates/no-such-domain +++ b/templates/no-such-domain @@ -95,10 +95,9 @@ 404 @@ -106,12 +105,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -137,48 +133,18 @@ diff --git a/templates/show-request b/templates/show-request index e476bbc7..0871a114 100644 --- a/templates/show-request +++ b/templates/show-request @@ -87,10 +87,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information - about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -98,12 +97,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -135,48 +131,18 @@ diff --git a/templates/show-status b/templates/show-status index 5336d850..7108722c 100644 --- a/templates/show-status +++ b/templates/show-status @@ -122,10 +122,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more information about this Privoxy installation.

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -133,12 +132,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -169,7 +165,7 @@ There haven't been any requests so far. -

+

@@ -193,91 +189,93 @@ @@ -290,51 +288,18 @@ diff --git a/templates/show-status-file b/templates/show-status-file index dfe4df0e..04e085ff 100644 --- a/templates/show-status-file +++ b/templates/show-status-file @@ -90,10 +90,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +

Conditional #defines:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#define Enabled? Effects when enabled
FEATURE_ACL@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@Allows the use of an ACL to control access to the proxy by IP address.
FEATURE_CGI_EDIT_ACTIONS@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@Allows the use of the web-based actions file - editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is here@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.
FEATURE_COOKIE_JAR@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@Allows the use of a "cookie jar" file to capture cookies.
FEATURE_FAST_REDIRECTS@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@Allows the +fast-redirects action, to bypass redirect and logging scripts.
FEATURE_FORCE_LOAD@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@Allows bypassing all filtering for a single page using the prefix "@FORCE_PREFIX@".
FEATURE_IMAGE_BLOCKING@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@Allows the +image ation, to send "blocked" images instead of HTML.
FEATURE_IMAGE_DETECT_MSIE@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@Enables automatic detection of image and HTML requests from - Microsoft Internet Explorer users, overriding the setting of - +image in the actions file.
FEATURE_KILL_POPUPS@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@Allows the +no-popups action, to block JavaScript popups.
FEATURE_NO_GIFS@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@Use PNG instead of GIF for the built-in images.
FEATURE_PTHREAD@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@Use POSIX threads rather than native threads
FEATURE_STATISTICS@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@Enables the statistics function.
FEATURE_TOGGLE@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.
FEATURE_TRUST@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@Allows the use of trust files.
STATIC_PCRE@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@Use the supplied statically-linked PCRE library. This is set automatically - by ./configure if you do not have the libpcre installed.
STATIC_PCRS@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@Use the supplied statically-linked PCRS library. This is set automatically - by ./configure if you do not have the libpcrs installed.
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#define Enabled? Effects when enabled
FEATURE_ACL@if-FEATURE_ACL-then@ Yes @else-not-FEATURE_ACL@ No @endif-FEATURE_ACL@Allows the use of an ACL to control access to the proxy by IP address.
FEATURE_CGI_EDIT_ACTIONS@if-FEATURE_CGI_EDIT_ACTIONS-then@ Yes @else-not-FEATURE_CGI_EDIT_ACTIONS@ No @endif-FEATURE_CGI_EDIT_ACTIONS@Allows the use of the web-based actions file + editor@if-FEATURE_CGI_EDIT_ACTIONS-then@, which is here@else-not-FEATURE_CGI_EDIT_ACTIONS@@endif-FEATURE_CGI_EDIT_ACTIONS@.
FEATURE_COOKIE_JAR@if-FEATURE_COOKIE_JAR-then@ Yes @else-not-FEATURE_COOKIE_JAR@ No @endif-FEATURE_COOKIE_JAR@Allows the use of a "cookie jar" file to capture cookies.
FEATURE_FAST_REDIRECTS@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@Allows the +fast-redirects action, to bypass redirect and logging scripts.
FEATURE_FORCE_LOAD@if-FEATURE_FORCE_LOAD-then@ Yes @else-not-FEATURE_FORCE_LOAD@ No @endif-FEATURE_FORCE_LOAD@Allows bypassing all filtering for a single page using the prefix "@FORCE_PREFIX@".
FEATURE_IMAGE_BLOCKING@if-FEATURE_IMAGE_BLOCKING-then@ Yes @else-not-FEATURE_IMAGE_BLOCKING@ No @endif-FEATURE_IMAGE_BLOCKING@Allows the +image ation, to send "blocked" images instead of HTML.
FEATURE_IMAGE_DETECT_MSIE@if-FEATURE_IMAGE_DETECT_MSIE-then@ Yes @else-not-FEATURE_IMAGE_DETECT_MSIE@ No @endif-FEATURE_IMAGE_DETECT_MSIE@Enables automatic detection of image and HTML requests from + Microsoft Internet Explorer users, overriding the setting of + +image in the actions file.
FEATURE_KILL_POPUPS@if-FEATURE_KILL_POPUPS-then@ Yes @else-not-FEATURE_KILL_POPUPS@ No @endif-FEATURE_KILL_POPUPS@Allows the +no-popups action, to block JavaScript popups.
FEATURE_NO_GIFS@if-FEATURE_NO_GIFS-then@ Yes @else-not-FEATURE_NO_GIFS@ No @endif-FEATURE_NO_GIFS@Use PNG instead of GIF for the built-in images.
FEATURE_PTHREAD@if-FEATURE_PTHREAD-then@ Yes @else-not-FEATURE_PTHREAD@ No @endif-FEATURE_PTHREAD@Use POSIX threads rather than native threads
FEATURE_STATISTICS@if-FEATURE_STATISTICS-then@ Yes @else-not-FEATURE_STATISTICS@ No @endif-FEATURE_STATISTICS@Enables the statistics function.
FEATURE_TOGGLE@if-FEATURE_TOGGLE-then@ Yes @else-not-FEATURE_TOGGLE@ No @endif-FEATURE_TOGGLE@Allow Privoxy to be "disabled" so it is just a normal non-blocking non-anonymizing proxy.
FEATURE_TRUST@if-FEATURE_TRUST-then@ Yes @else-not-FEATURE_TRUST@ No @endif-FEATURE_TRUST@Allows the use of trust files.
STATIC_PCRE@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@Use the supplied statically-linked PCRE library. This is set automatically + by ./configure if you do not have the libpcre installed.
STATIC_PCRS@if-STATIC_PCRS-then@ Yes @else-not-STATIC_PCRS@ No @endif-STATIC_PCRS@Use the supplied statically-linked PCRS library. This is set automatically + by ./configure if you do not have the libpcrs installed.
+

-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- -

- You can consult the online documentation for more information - about this Privoxy installation. -

- +#include mod-local-help - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

-
@@ -101,12 +100,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -127,51 +123,18 @@ diff --git a/templates/show-url-info b/templates/show-url-info index 1acab1c7..fa2e1241 100644 --- a/templates/show-url-info +++ b/templates/show-url-info @@ -96,10 +96,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

- You can consult the online documentation for more information - about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -107,12 +106,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -164,51 +160,18 @@ diff --git a/templates/show-version b/templates/show-version index ab98fc3e..bc7890a1 100644 --- a/templates/show-version +++ b/templates/show-version @@ -98,10 +98,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

- You can consult the online documentation for more information - about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
@@ -109,12 +108,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -140,51 +136,18 @@ diff --git a/templates/toggle b/templates/toggle index e1534504..72fafd26 100644 --- a/templates/toggle +++ b/templates/toggle @@ -83,10 +83,9 @@
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- -

- You can consult the online documentation for more information - about this Privoxy installation. -

- +#include mod-local-help - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

-
@@ -94,12 +93,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -162,51 +158,18 @@ diff --git a/templates/untrusted b/templates/untrusted index dbdfe894..d9c45294 100644 --- a/templates/untrusted +++ b/templates/untrusted @@ -104,10 +104,9 @@ UNTRUSTED @@ -115,12 +114,9 @@ # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in @@ -170,50 +166,18 @@ -- 2.39.2
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

- You can consult the online documentation for more information - about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +
-

- This is Privoxy @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, - @if-enabled-display-then@enabled@else-not-enabled-display@disabled@endif-enabled-display@ -

+ +#include mod-title +
-

Warning:

-

- Please note that this @code-status@ release - of the proxy software is not intended for production systems! -
Use at your own risk. See the license for details. -

+ +#include mod-unstable-warning +
-

Support and Service via Sourceforge:

-

- We value your feedback. To provide you with the best support, - we ask that you: -

- + +#include mod-support-and-service +
-

Local Privoxy support:

- - -

You can consult the online documentation for more - information about this Privoxy installation. -

- - - -

Address e-mail questions about this service to - @admin-address@, - who will be glad to help you. -

- + +#include mod-local-help +