Adding action +no-cookies-keep

diff --git a/actionlist.h b/actionlist.h
index e0a6d48..faf919e 100644 (file)
--- a/actionlist.h
+++ b/actionlist.h
@@ -39,6 +39,9 @@
  *
  * Revisions   :
  *    $Log: actionlist.h,v $
  *
  * 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
  *    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_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)
 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 df5d796..8752ea4 100644 (file)
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -32,6 +32,10 @@
 #\r
 # Revisions   :\r
 #    $Log: edit-actions-for-url,v $\r
 #\r
 # Revisions   :\r
 #    $Log: edit-actions-for-url,v $\r

+#    Revision 1.5  2001/11/13 21:12:17  jongfoster\r
+#    Added support for the following actions:\r
+#    +downgrade, +limit-connect, +no-compression\r
+#\r

 #    Revision 1.4  2001/11/13 00:58:18  jongfoster\r
 #    New version of actions file editor templates\r
 #\r
 #    Revision 1.4  2001/11/13 00:58:18  jongfoster\r
 #    New version of actions file editor templates\r
 #\r


@@ -595,72 +599,90 @@ function show_wafer_opts(tf)
         ></td>\r
     </tr>\r
     <tr class="bg1" align="left" valign="top">\r
         ></td>\r
     </tr>\r
     <tr class="bg1" align="left" valign="top">\r

-      <td class="action">+no-cookies-read</td>\r
-      <td>Prevent the website from reading cookies</td>\r
+      <td class="action">+no-cookies-keep</td>\r
+      <td>Any cookies set by the website are changed to temporary\r
+        ("per-session") ones, which only last until you close your web\r
+        browser.  This will allow you to use sites that require cookies, but\r
+        sites will not be able to track you across sessions.  For this to\r
+        be useful, you should disable <b><i>no-cookies-read</i></b> and\r
+        <b><i>no-cookies-set</i></b>.</td>\r

       <td class="en1" align="center" valign="middle"><input type="radio"\r
       <td class="en1" align="center" valign="middle"><input type="radio"\r

-        name="no_cookies_read" value="Y" @no-cookies-read-y@\r
+        name="no_cookies_keep" value="Y" @no-cookies-keep-y@\r

         ></td>\r
       <td class="dis1" align="center" valign="middle"><input type="radio"\r
         ></td>\r
       <td class="dis1" align="center" valign="middle"><input type="radio"\r

-        name="no_cookies_read" value="N" @no-cookies-read-n@\r
+        name="no_cookies_keep" value="N" @no-cookies-keep-n@\r

         ></td>\r
       <td class="noc1" align="center" valign="middle"><input type="radio"\r
         ></td>\r
       <td class="noc1" align="center" valign="middle"><input type="radio"\r

-        name="no_cookies_read" value="X" @no-cookies-read-x@\r
+        name="no_cookies_keep" value="X" @no-cookies-keep-x@\r

         ></td>\r
     </tr>\r
     <tr class="bg2" align="left" valign="top">\r
         ></td>\r
     </tr>\r
     <tr class="bg2" align="left" valign="top">\r

-      <td class="action">+no-cookies-set</td>\r
-      <td>Prevent the website from setting cookies</td>\r
+      <td class="action">+no-cookies-read</td>\r
+      <td>Prevent the website from reading cookies.</td>\r

       <td class="en2" align="center" valign="middle"><input type="radio"\r
       <td class="en2" align="center" valign="middle"><input type="radio"\r

-        name="no_cookies_set" value="Y" @no-cookies-set-y@\r
+        name="no_cookies_read" value="Y" @no-cookies-read-y@\r

         ></td>\r
       <td class="dis2" align="center" valign="middle"><input type="radio"\r
         ></td>\r
       <td class="dis2" align="center" valign="middle"><input type="radio"\r

-        name="no_cookies_set" value="N" @no-cookies-set-n@\r
+        name="no_cookies_read" value="N" @no-cookies-read-n@\r

         ></td>\r
       <td class="noc2" align="center" valign="middle"><input type="radio"\r
         ></td>\r
       <td class="noc2" align="center" valign="middle"><input type="radio"\r

-        name="no_cookies_set" value="X" @no-cookies-set-x@\r
+        name="no_cookies_read" value="X" @no-cookies-read-x@\r

         ></td>\r
     </tr>\r
     <tr class="bg1" align="left" valign="top">\r
         ></td>\r
     </tr>\r
     <tr class="bg1" align="left" valign="top">\r

+      <td class="action">+no-cookies-set</td>\r
+      <td>Prevent the website from setting cookies.</td>\r
+      <td class="en1" align="center" valign="middle"><input type="radio"\r
+        name="no_cookies_set" value="Y" @no-cookies-set-y@\r
+        ></td>\r
+      <td class="dis1" align="center" valign="middle"><input type="radio"\r
+        name="no_cookies_set" value="N" @no-cookies-set-n@\r
+        ></td>\r
+      <td class="noc1" align="center" valign="middle"><input type="radio"\r
+        name="no_cookies_set" value="X" @no-cookies-set-x@\r
+        ></td>\r
+    </tr>\r
+    <tr class="bg2" align="left" valign="top">\r

       <td class="action">+no-popups</td>\r
       <td>Filter the website through a built-in filter to disable JavaScript\r
         pop-up windows.</td>\r
       <td class="action">+no-popups</td>\r
       <td>Filter the website through a built-in filter to disable JavaScript\r
         pop-up windows.</td>\r

-      <td class="en1" align="center" valign="middle"><input type="radio"\r
+      <td class="en2" align="center" valign="middle"><input type="radio"\r

         name="no_popups" value="Y" @no-popups-y@\r
         ></td>\r
         name="no_popups" value="Y" @no-popups-y@\r
         ></td>\r

-      <td class="dis1" align="center" valign="middle"><input type="radio"\r
+      <td class="dis2" align="center" valign="middle"><input type="radio"\r

         name="no_popups" value="N" @no-popups-n@\r
         ></td>\r
         name="no_popups" value="N" @no-popups-n@\r
         ></td>\r

-      <td class="noc1" align="center" valign="middle"><input type="radio"\r
+      <td class="noc2" align="center" valign="middle"><input type="radio"\r

         name="no_popups" value="X" @no-popups-x@\r
         ></td>\r
     </tr>\r
         name="no_popups" value="X" @no-popups-x@\r
         ></td>\r
     </tr>\r

-    <tr class="bg2" align="left" valign="top">\r
+    <tr class="bg1" align="left" valign="top">\r

       <td class="action">+vanilla-wafer</td>\r
       <td>If you use a jarfile, automatically adds a special wafer.</td>\r
       <td class="action">+vanilla-wafer</td>\r
       <td>If you use a jarfile, automatically adds a special wafer.</td>\r

-      <td class="en2" align="center" valign="middle"><input type="radio"\r
+      <td class="en1" align="center" valign="middle"><input type="radio"\r

         name="vanilla_wafer" value="Y" @vanilla-wafer-y@\r
         ></td>\r
         name="vanilla_wafer" value="Y" @vanilla-wafer-y@\r
         ></td>\r

-      <td class="dis2" align="center" valign="middle"><input type="radio"\r
+      <td class="dis1" align="center" valign="middle"><input type="radio"\r

         name="vanilla_wafer" value="N" @vanilla-wafer-n@\r
         ></td>\r
         name="vanilla_wafer" value="N" @vanilla-wafer-n@\r
         ></td>\r

-      <td class="noc2" align="center" valign="middle"><input type="radio"\r
+      <td class="noc1" align="center" valign="middle"><input type="radio"\r

         name="vanilla_wafer" value="X" @vanilla-wafer-x@\r
         ></td>\r
     </tr>\r
         name="vanilla_wafer" value="X" @vanilla-wafer-x@\r
         ></td>\r
     </tr>\r

-    <tr class="bg1" align="left" valign="top">\r
+    <tr class="bg2" align="left" valign="top">\r

       <td class="action">+wafer</td>\r
       <td>Adds user-specified cookies.</td>\r
       <td class="action">+wafer</td>\r
       <td>Adds user-specified cookies.</td>\r

-      <td class="en1" align="center" valign="middle"><input type="radio"\r
+      <td class="en2" align="center" valign="middle"><input type="radio"\r

         name="wafer" id="wafer_y" value="Y" @wafer-y@\r
         onclick="show_wafer_opts(true)"></td>\r
         name="wafer" id="wafer_y" value="Y" @wafer-y@\r
         onclick="show_wafer_opts(true)"></td>\r

-      <td class="dis1" align="center" valign="middle"><input type="radio"\r
+      <td class="dis2" align="center" valign="middle"><input type="radio"\r

         name="wafer" id="wafer_n" value="N" @wafer-n@\r
         onclick="show_wafer_opts(false)"></td>\r
         name="wafer" id="wafer_n" value="N" @wafer-n@\r
         onclick="show_wafer_opts(false)"></td>\r

-      <td class="noc1" align="center" valign="middle"><input type="radio"\r
+      <td class="noc2" align="center" valign="middle"><input type="radio"\r

         name="wafer" id="wafer_x" value="X" @wafer-x@\r
         onclick="show_wafer_opts(false)"></td>\r
     </tr>\r
         name="wafer" id="wafer_x" value="X" @wafer-x@\r
         onclick="show_wafer_opts(false)"></td>\r
     </tr>\r

-    <tr class="bg1" align="left" valign="top" id="wafer_opts">\r
+    <tr class="bg2" align="left" valign="top" id="wafer_opts">\r

       <td>&nbsp;</td>\r
       <td colspan="4">Editing the settings for this option, or turning\r
         it on if it was off, is not yet supported using this web-based\r
       <td>&nbsp;</td>\r
       <td colspan="4">Editing the settings for this option, or turning\r
         it on if it was off, is not yet supported using this web-based\r