From 70034f364a081cdeb4b1dd3296b59fbbde7394c6 Mon Sep 17 00:00:00 2001
From: jongfoster <jongfoster@users.sourceforge.net>
Date: Thu, 22 Nov 2001 21:58:41 +0000
Subject: [PATCH] Adding action +no-cookies-keep

---
 actionlist.h                   |  4 +++
 templates/edit-actions-for-url | 66 ++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/actionlist.h b/actionlist.h
index e0a6d489..faf919e8 100644
--- a/actionlist.h
+++ b/actionlist.h
@@ -39,6 +39,9 @@
  *
  * Revisions   :
  *    $Log: actionlist.h,v $
+ *    Revision 1.8  2001/10/10 16:42:52  oes
+ *    Fixed a bug, Added +limit-connect string action
+ *
  *    Revision 1.7  2001/10/07 15:33:59  oes
  *    Introduced a +no-compression action
  *    Introduced a +downgrade action
@@ -99,6 +102,7 @@ DEFINE_CGI_PARAM_CUSTOM  ("image-blocker",   ACTION_IMAGE_BLOCKER,   ACTION_STRI
 DEFINE_ACTION_STRING     ("limit-connect",   ACTION_LIMIT_CONNECT,   ACTION_STRING_LIMIT_CONNECT)
 DEFINE_CGI_PARAM_NO_RADIO("limit-connect",   ACTION_LIMIT_CONNECT,   ACTION_STRING_LIMIT_CONNECT,  "443")
 DEFINE_ACTION_BOOL       ("no-compression",  ACTION_NO_COMPRESSION)
+DEFINE_ACTION_BOOL       ("no-cookies-keep", ACTION_NO_COOKIE_KEEP)
 DEFINE_ACTION_BOOL       ("no-cookies-read", ACTION_NO_COOKIE_READ)
 DEFINE_ACTION_BOOL       ("no-cookies-set",  ACTION_NO_COOKIE_SET)
 DEFINE_ACTION_BOOL       ("no-popups",       ACTION_NO_POPUPS)
diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index df5d796c..8752ea47 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -32,6 +32,10 @@
 #
 # Revisions   :
 #    $Log: edit-actions-for-url,v $
+#    Revision 1.5  2001/11/13 21:12:17  jongfoster
+#    Added support for the following actions:
+#    +downgrade, +limit-connect, +no-compression
+#
 #    Revision 1.4  2001/11/13 00:58:18  jongfoster
 #    New version of actions file editor templates
 #
@@ -595,72 +599,90 @@ function show_wafer_opts(tf)
         ></td>
     </tr>
     <tr class="bg1" align="left" valign="top">
-      <td class="action">+no-cookies-read</td>
-      <td>Prevent the website from reading cookies</td>
+      <td class="action">+no-cookies-keep</td>
+      <td>Any cookies set by the website are changed to temporary
+        ("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 <b><i>no-cookies-read</i></b> and
+        <b><i>no-cookies-set</i></b>.</td>
       <td class="en1" align="center" valign="middle"><input type="radio"
-        name="no_cookies_read" value="Y" @no-cookies-read-y@
+        name="no_cookies_keep" value="Y" @no-cookies-keep-y@
         ></td>
       <td class="dis1" align="center" valign="middle"><input type="radio"
-        name="no_cookies_read" value="N" @no-cookies-read-n@
+        name="no_cookies_keep" value="N" @no-cookies-keep-n@
         ></td>
       <td class="noc1" align="center" valign="middle"><input type="radio"
-        name="no_cookies_read" value="X" @no-cookies-read-x@
+        name="no_cookies_keep" value="X" @no-cookies-keep-x@
         ></td>
     </tr>
     <tr class="bg2" align="left" valign="top">
-      <td class="action">+no-cookies-set</td>
-      <td>Prevent the website from setting cookies</td>
+      <td class="action">+no-cookies-read</td>
+      <td>Prevent the website from reading cookies.</td>
       <td class="en2" align="center" valign="middle"><input type="radio"
-        name="no_cookies_set" value="Y" @no-cookies-set-y@
+        name="no_cookies_read" value="Y" @no-cookies-read-y@
         ></td>
       <td class="dis2" align="center" valign="middle"><input type="radio"
-        name="no_cookies_set" value="N" @no-cookies-set-n@
+        name="no_cookies_read" value="N" @no-cookies-read-n@
         ></td>
       <td class="noc2" align="center" valign="middle"><input type="radio"
-        name="no_cookies_set" value="X" @no-cookies-set-x@
+        name="no_cookies_read" value="X" @no-cookies-read-x@
         ></td>
     </tr>
     <tr class="bg1" align="left" valign="top">
+      <td class="action">+no-cookies-set</td>
+      <td>Prevent the website from setting cookies.</td>
+      <td class="en1" align="center" valign="middle"><input type="radio"
+        name="no_cookies_set" value="Y" @no-cookies-set-y@
+        ></td>
+      <td class="dis1" align="center" valign="middle"><input type="radio"
+        name="no_cookies_set" value="N" @no-cookies-set-n@
+        ></td>
+      <td class="noc1" align="center" valign="middle"><input type="radio"
+        name="no_cookies_set" value="X" @no-cookies-set-x@
+        ></td>
+    </tr>
+    <tr class="bg2" align="left" valign="top">
       <td class="action">+no-popups</td>
       <td>Filter the website through a built-in filter to disable JavaScript
         pop-up windows.</td>
-      <td class="en1" align="center" valign="middle"><input type="radio"
+      <td class="en2" align="center" valign="middle"><input type="radio"
         name="no_popups" value="Y" @no-popups-y@
         ></td>
-      <td class="dis1" align="center" valign="middle"><input type="radio"
+      <td class="dis2" align="center" valign="middle"><input type="radio"
         name="no_popups" value="N" @no-popups-n@
         ></td>
-      <td class="noc1" align="center" valign="middle"><input type="radio"
+      <td class="noc2" align="center" valign="middle"><input type="radio"
         name="no_popups" value="X" @no-popups-x@
         ></td>
     </tr>
-    <tr class="bg2" align="left" valign="top">
+    <tr class="bg1" align="left" valign="top">
       <td class="action">+vanilla-wafer</td>
       <td>If you use a jarfile, automatically adds a special wafer.</td>
-      <td class="en2" align="center" valign="middle"><input type="radio"
+      <td class="en1" align="center" valign="middle"><input type="radio"
         name="vanilla_wafer" value="Y" @vanilla-wafer-y@
         ></td>
-      <td class="dis2" align="center" valign="middle"><input type="radio"
+      <td class="dis1" align="center" valign="middle"><input type="radio"
         name="vanilla_wafer" value="N" @vanilla-wafer-n@
         ></td>
-      <td class="noc2" align="center" valign="middle"><input type="radio"
+      <td class="noc1" align="center" valign="middle"><input type="radio"
         name="vanilla_wafer" value="X" @vanilla-wafer-x@
         ></td>
     </tr>
-    <tr class="bg1" align="left" valign="top">
+    <tr class="bg2" align="left" valign="top">
       <td class="action">+wafer</td>
       <td>Adds user-specified cookies.</td>
-      <td class="en1" align="center" valign="middle"><input type="radio"
+      <td class="en2" align="center" valign="middle"><input type="radio"
         name="wafer" id="wafer_y" value="Y" @wafer-y@
         onclick="show_wafer_opts(true)"></td>
-      <td class="dis1" align="center" valign="middle"><input type="radio"
+      <td class="dis2" align="center" valign="middle"><input type="radio"
         name="wafer" id="wafer_n" value="N" @wafer-n@
         onclick="show_wafer_opts(false)"></td>
-      <td class="noc1" align="center" valign="middle"><input type="radio"
+      <td class="noc2" align="center" valign="middle"><input type="radio"
         name="wafer" id="wafer_x" value="X" @wafer-x@
         onclick="show_wafer_opts(false)"></td>
     </tr>
-    <tr class="bg1" align="left" valign="top" id="wafer_opts">
+    <tr class="bg2" align="left" valign="top" id="wafer_opts">
       <td>&nbsp;</td>
       <td colspan="4">Editing the settings for this option, or turning
         it on if it was off, is not yet supported using this web-based
-- 
2.39.2