X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=templates%2Fedit-actions-for-url;h=2d84af8f4fe92aba331ae27af2ee2fa4aaa4c64e;hb=c374b4059fb38a0555f9eb7f6b15a42fc7045df1;hp=3addecb97e50427709c830a65b52d6a47d7be361;hpb=fd572179022cb19988ca1db5394921ad973f36fe;p=privoxy.git

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 3addecb9..2d84af8f 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -4,10 +4,10 @@
 #
 # Purpose     :  Template used to edit the actions associated with a
 #                particular section in an actions file.
-# 
 #
-# Copyright   :  Written by and Copyright (C) 2001-2008 the SourceForge
-#                Privoxy team. http://www.privoxy.org/
+#
+# Copyright   :  Written by and Copyright (C) 2001-2014 the
+#                Privoxy team. https://www.privoxy.org/
 #
 #                Original Author: Copyright (C) 2001 Jonathan Foster
 #                http://www.jon-foster.co.uk/
@@ -69,7 +69,7 @@
 <head>
   <meta http-equiv="Content-Style-Type" content="text/css">
   <meta http-equiv="Content-Script-Type" content="text/javascript">
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="robots" content="noindex,nofollow">
   <link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
   <link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
@@ -351,7 +351,7 @@ function show_limit_connect_opts(tf)
         id="change_x_forwarded_for_mode_block" @change-x-forwarded-for-param-block@><label
         for="change_x_forwarded_for_mode_block">Block the header.</label><br>
         <input type="radio" name="change_x_forwarded_for_mode" value="add"
-        id="change_x_forwarded_for_mode_add" @change-x-forwarded-for-param-add@><label 
+        id="change_x_forwarded_for_mode_add" @change-x-forwarded-for-param-add@><label
         for="change_x_forwarded_for_mode_add">Add the header.</label><br>
     </tr>
     <tr class="bg1" align="left" valign="top">
@@ -511,7 +511,7 @@ function show_limit_connect_opts(tf)
       <td>Use the <input type="radio" name="deanimate_gifs_mode"
         value="first" id="deanimate_first" @deanimate-gifs-param-first@><label
         for="deanimate_first">first frame</label>&nbsp;&nbsp; <input
-        type="radio" name="deanimate_gifs_mode" value="last" 
+        type="radio" name="deanimate_gifs_mode" value="last"
         id="deanimate_last" @deanimate-gifs-param-last@><label
         for="deanimate_last">last frame</label></td>
     </tr>
@@ -527,6 +527,24 @@ function show_limit_connect_opts(tf)
       <td>Change HTTP/1.1 requests to HTTP/1.0.  Only change if you know
         what you're doing!</td>
     </tr>
+
+<!-- @if-external-content-filters-start -->
+    <tr class="bg1" align="left" valign="top">
+      <td class="en1">&nbsp;</td>
+      <td class="dis1" align="center" valign="middle"><input type="radio"
+        name="external_content_filter_all" id="external_content_filter_all_n" value="N" @external-content-filter-all-n@ ></td>
+      <td class="noc1" align="center" valign="middle"><input type="radio"
+        name="external_content_filter_all" id="external_content_filter_all_x" value="X" @external-content-filter-all-x@ ></td>
+      <td class="action"><a href="@user-manual@@actions-help-prefix@EXTERNAL_FILTER">external-filter</a> *</td>
+      <td>Filter the website through external scripts or programs.
+        You can use the radio buttons on this line to disable
+        all filters applied by previous rules, and/or you can enable or
+        disable the filters individually below.</td>
+    </tr>
+
+@external-content-filter-params@
+<!-- if-external-content-filters-end@ -->
+
     <tr class="bg1" align="left" valign="top">
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="fast_redirects" value="Y" @fast-redirects-y@
@@ -550,7 +568,7 @@ function show_limit_connect_opts(tf)
         value="simple-check" id="fast_redirects_simple_check" @fast-redirects-param-simple-check@><label
         for="fast_redirects_simple_check">Simple check.</label>
        <br>
-       <input type="radio" name="fast_redirects_mode" value="check-decoded-url" 
+       <input type="radio" name="fast_redirects_mode" value="check-decoded-url"
         id="fast_redirects_check_decoded_url" @fast-redirects-param-check-decoded-url@><label
         for="fast_redirects_check_decoded_url">Decode URL before checking.</label></td>
     </tr>
@@ -652,7 +670,7 @@ function show_limit_connect_opts(tf)
       <td>&nbsp;</td>
       <td>
         Overriding forward directive:<br>
-        <input type="text" name="forward_override_param" 
+        <input type="text" name="forward_override_param"
         id="forward_override_param" size="40"
         value="@forward-override-param@"><br>
      </td>
@@ -718,7 +736,7 @@ function show_limit_connect_opts(tf)
         onclick="hide_accept_language_param_disable(false)"
         @hide-accept-language-param-custom@ id="hide_accept_language_mode_set"><label
         for="hide_accept_language_mode_set">Fake these language settings:</label><br>
-        <input type="text" name="hide_accept_language_param" 
+        <input type="text" name="hide_accept_language_param"
         id="hide_accept_language_param" size="40"
         value="@hide-accept-language-param@"><br>
      </td>
@@ -752,7 +770,7 @@ function show_limit_connect_opts(tf)
         onclick="hide_content_disposition_param_disable(false)"
         @hide-content-disposition-param-custom@ id="hide_content_disposition_mode_set"><label
         for="hide_content_disposition_mode_set">Overwrite content-dispostion header with:</label><br>
-        <input type="text" name="hide_content_disposition_param" 
+        <input type="text" name="hide_content_disposition_param"
         id="hide_content_disposition_param" size="40"
         value="@hide-content-disposition-param@"><br>
      </td>
@@ -780,7 +798,7 @@ function show_limit_connect_opts(tf)
         onclick="hide_from_header_param_disable(true);"
         @hide-from-header-param-block@ id="hide_from_header_mode_block"><label
         for="hide_from_header_mode_block">Remove completely</label><br>
-        <input type="radio" name="hide_from_header_mode" value="CUSTOM" 
+        <input type="radio" name="hide_from_header_mode" value="CUSTOM"
         onclick="hide_from_header_param_disable(false);"
         @hide-from-header-param-custom@ id="hide_from_header_mode_set"><label
         for="hide_from_header_mode_set">Fake e-mail address:</label><br>
@@ -815,7 +833,7 @@ function show_limit_connect_opts(tf)
         onclick="hide_if_modified_since_param_disable(true)"
         @hide-if-modified-since-param-custom@ id="hide_if_modified_since_mode_set"><label
         for="hide_if_modified_since_mode_set">Add random amount of seconds in the range of</label>
-        <input type="text" name="hide_if_modified_since_param" 
+        <input type="text" name="hide_if_modified_since_param"
         id="hide_if_modified_since_param" size="4"
         value="@hide-if-modified-since-param@"> minute(s).
         To appreciate this option a small amount of paranoia is required,
@@ -879,7 +897,7 @@ function show_limit_connect_opts(tf)
         onclick="hide_referrer_param_disable(false)"
         @hide-referrer-param-custom@ id="hide_referrer_mode_set"><label
         for="hide_referrer_mode_set">Fake as this web address:</label><br>
-        <input type="text" name="hide_referrer_param" 
+        <input type="text" name="hide_referrer_param"
         id="hide_referrer_param" size="40"
         value="@hide-referrer-param@"><br>
         <input type="radio" name="hide_referrer_mode" value="conditional-block"
@@ -940,6 +958,29 @@ function show_limit_connect_opts(tf)
         <input type="text" name="limit_connect_mode" size="40"
         value="@limit-connect-param@"></td>
     </tr>
+    <tr class="bg1" align="left" valign="top">
+      <td class="en1" align="center" valign="middle"><input type="radio"
+        name="limit_cookie_lifetime" id="limit_cookie_lifetime_y" value="Y" @limit-cookie-lifetime-y@
+        onclick="show_limit_cookie_lifetime_opts(true)"></td>
+      <td class="dis1" align="center" valign="middle"><input type="radio"
+        name="limit_cookie_lifetime" value="N" @limit-cookie-lifetime-n@
+        onclick="show_limit_cookie_lifetime_opts(false)"></td>
+      <td class="noc1" align="center" valign="middle"><input type="radio"
+        name="limit_cookie_lifetime" value="X" @limit-cookie-lifetime-x@
+        onclick="show_limit_cookie_lifetime_opts(false)"></td>
+      <td class="action"><a href="@user-manual@@actions-help-prefix@LIMIT-COOKIE-LIFETIME">limit-cookie-lifetime</a></td>
+      <td>Limit the cookie lifetime specified in Set-Cookie headers.</td>
+    </tr>
+    <tr class="bg1" align="left" valign="top" id="limit_cookie_lifetime_opts">
+      <td class="en1">&nbsp;</td>
+      <td class="dis1">&nbsp;</td>
+      <td class="noc1">&nbsp;</td>
+      <td>&nbsp;</td>
+      <td>Lifetime limit in minutes (or 0 to behave like
+        <a href="@user-manual@@actions-help-prefix@LIMIT-COOKIE-LIFETIME">session-cookies-only</a>):<br>
+        <input type="text" name="limit_cookie_lifetime_mode" size="40"
+        value="@limit-cookie-lifetime-param@"></td>
+    </tr>
     <tr class="bg1" align="left" valign="top">
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="overwrite_last_modified" value="Y" @overwrite-last-modified-y@
@@ -1058,7 +1099,7 @@ function show_limit_connect_opts(tf)
         ("per-session") ones, which only last until you close your web
         browser.  This will allow you to use sites that require cookies, but
         sites will not be able to track you across sessions.  For this to
-        be useful, you should disable 
+        be useful, you should disable
         <a href="@user-manual@@actions-help-prefix@CRUNCH-OUTGOING-COOKIES"><b>crunch-outgoing-cookies</b></a> and
         <a href="@user-manual@@actions-help-prefix@CRUNCH-INCOMING-COOKIES"><b>crunch-incoming-cookies</b></a>.</td>
     </tr>
@@ -1089,7 +1130,7 @@ function show_limit_connect_opts(tf)
         alt="pattern">)</label><br>
         <input type="radio" name="set_image_blocker_mode" value="blank"
         onclick="set_image_blocker_param_disable(true)"
-        id="set_image_blocker_mode_blank" @set-image-blocker-param-blank@><label 
+        id="set_image_blocker_mode_blank" @set-image-blocker-param-blank@><label
         for="set_image_blocker_mode_blank">Send a 1x1 transparent GIF</label><br>
         <input type="radio" name="set_image_blocker_mode" value="CUSTOM"
         onclick="set_image_blocker_param_disable(false)"
@@ -1125,23 +1166,23 @@ function show_limit_connect_opts(tf)
       </td>
     </tr>
 
+<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-support-and-service
+#include mod-local-help
 
       </td>
     </tr>
+<!-- if-have-help-info-end@ -->
 
-<!-- @if-have-help-info-start -->
     <tr>
       <td class="info">
 
-#include mod-local-help
+#include mod-support-and-service
 
       </td>
     </tr>
-<!-- if-have-help-info-end@ -->
 
   </table>
 <!-- @if-one-form-only-start -->
