X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Funtrusted;h=1a552619b46232f380cd4432b68bd4aaea171e72;hp=19e73dcb6df41284fa25e76e027ba85a175344b1;hb=41bcde325feaf65a42fe2c4ab21cee5771ac60ad;hpb=e348466ccffa0b8a7bad7efef9d60d75f610f0c2 diff --git a/templates/untrusted b/templates/untrusted index 19e73dcb..1a552619 100644 --- a/templates/untrusted +++ b/templates/untrusted @@ -1,6 +1,6 @@ ########################################################## # -# "Untrusted" Error Output template for junkbuster 2.9.x. +# "Untrusted" Error Output template for Privoxy. # # # USING HTML TEMPLATES: @@ -8,14 +8,14 @@ # # Template files are written win plain HTML, with a few # additions: -# +# # - Lines that start with a '#' character like this one # are ignored # # - Each item in the below list of exported symbols will # be replaced by dynamically generated text, if they # are enclosed in '@'-characters. E.g. The string @version@ -# will be replaced by the version number of Junkbuster. +# will be replaced by the version number of Privoxy. # # - One special application of this is to make whole blocks # of the HTML template disappear if the condition @@ -23,7 +23,7 @@ # strings @if-start and if--end@. The strings # should be placed in HTML comments (), so the # html structure won't be messed when the magic happens. -# +# # USABLE SYMBOLS IN THIS TEMPLATE: # -------------------------------- # @@ -32,7 +32,7 @@ # my-hostname: # The hostname associated with my-ip-addr # admin-address: -# The email address of the pxoxy's administrator, as configured +# The email address of the proxy administrator, as configured # in the config file # default-cgi: # The URL for the "main menu" builtin CGI of this proxy @@ -44,21 +44,14 @@ # The development status of the proxy software: "alpha", "beta", # or "stable". # homepage: -# The URL of the SourceForge ijbswa project, who maintains this -# software. +# The URL of the Privoxy project, which maintains this software. # # hostport: # The host and port part of the request that lead to this problem -# hostport-html: -# The host and port part of the request that lead to this problem, HTML-encoded # path: # The path part of the request that lead to this problem -# path-html: -# The path part of the request that lead to this problem, HTML-encoded # referrer: # The referrer of the request that lead to this problem -# referrer-html: -# The referrer of the request that lead to this problem, HTML-encoded # trusted-referrers: # An HTML-formatted list of referrers that are marked as trusted in # the trustfile @@ -69,77 +62,82 @@ # # unstable: # This is an alpha or beta release of the proxy software +# have-adminaddr-info: +# An e-mail address for the local Privoxy administrator has +# been specified and is available through the "admin-address" +# symbol # have-proxy-info: # A URL for online documentation about this proxy has been # specified and is available through the "proxy-info-url" # symbol +# have-help-info: +# If either have-proxy-info is true or have-adminaddr-info is +# true, have-help-info is true. Used to conditionally include +# a grey box for any and all help info. # force-support: -# Junkbuster has been compiled with support for forced loading +# Privoxy has been compiled with support for forced loading # of blocked content. In that case, the symbol "force-prefix" is -# avaiable, which translates to the FORCE_PREFIX +# avaiable, which translates to the FORCE_PREFIX # have-trust-info: # There were URLs with info on the trust policy defined in the config # file. In this case the list of URLs is available through the # "trust-info" symbol. - # - +# + - Untrusted request (Junkbuster@@my-hostname@) + Untrusted request (Privoxy@@my-hostname@) + + + + + - - + - +
- - # This will only appear if CODE_STATUS is "alpha" or "beta". See configure.in - - - - - - + - + + + + +
-

UNTRUSTED

+ 		+ UNTRUSTED -

This is the Internet JUNKBUSTER - @version@ on @my-hostname@ (@my-ip-address@), port @my-port@

+ 		+ +#include mod-title +
-

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

+ 		+ +#include mod-unstable-warning -

Feel free to mail the developers - with any problems you might have -

+

Request for untrusted URL

-
-

Your request for @hostport-html@@path-html@ was blocked, - because neither the request URL itself, nor its referrer - (@referrer-html@) were trusted. -

+

Your request for @protocol@@hostport@@path@ was blocked, + because neither the request URL itself, nor its referrer + (@referrer@) were trusted. +

-

(You can go there anyway.)

+

(You can go there anyway.)

-
+

The following referrers are trusted:

    @trusted-referrers@ @@ -149,41 +147,44 @@
+

More information on the trust policy:

-
-

You can learn more about what this means and what you may be able to do about it by - reading the following documents:

-
    +

    You can learn more about what this means and what you may be able to do about it by + reading the following documents: +

    +
      @trust-info@ -
    -
+
-

More Junkbuster:

-
    @menu@
+ 		+

More Privoxy:

+
-

If you have any questions about this service, +

- - consult the online documentation or - +#include mod-local-help + +
+ +#include mod-support-and-service - send mail to @admin-address@ - who will be glad to help you. -

- \ No newline at end of file +