X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Factions%2Findex.php;h=660f7be36b24b705fee84fe1de4bb8209d64480d;hb=5a5807409ae15a99c2e7365f292a6de0054257e3;hp=30b56c242f7a8b5019b0033d9798d20c3670a47b;hpb=3a5e13625a997ca598d03ee308f96d88e7471b46;p=privoxy.git

diff --git a/doc/webserver/actions/index.php b/doc/webserver/actions/index.php
index 30b56c24..660f7be3 100755
--- a/doc/webserver/actions/index.php
+++ b/doc/webserver/actions/index.php
@@ -8,9 +8,24 @@
               This file belongs in
               ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
-  $Id: index.php,v 1.19 2002/04/09 13:06:29 oes Exp $
+  $Id: index.php,v 1.24 2002/04/28 16:56:47 swa Exp $
 
   $Log: index.php,v $
+  Revision 1.24  2002/04/28 16:56:47  swa
+  bookmarklet text
+
+  Revision 1.23  2002/04/13 14:13:19  oes
+  Require exact AF version; Added hint where to go for BRs, FRs and SRs
+
+  Revision 1.22  2002/04/11 10:11:04  oes
+  Actionsfile Version 1.2
+
+  Revision 1.21  2002/04/10 13:51:19  oes
+  Updated to new Bookmarklet
+
+  Revision 1.20  2002/04/10 00:07:35  oes
+  Moved window sizing and positioning code to Bookmarklet
+
   Revision 1.19  2002/04/09 13:06:29  oes
   Resize and jump to the right on load
 
@@ -108,7 +123,7 @@
 /*
  * Config:
  */
-$required_actions_file_version = "1.1";
+$required_actions_file_version = "1.2";
 $required_privoxy_version = "2.9.14";
 $actions_file_download = "http://www.privoxy.org/actions/testdrive.action";
 $submit_target = "http://www.oesterhelt.org/actions/step2.php";
@@ -156,9 +171,9 @@ function error_abort($title, $message)
  * Bookmarklet that leads here:
  */
 $my_address = "http://" . $HTTP_SERVER_VARS["HTTP_HOST"] . $PHP_SELF;
-$bookmarklet = "javascript:void(window.open('$my_address?url='+escape(location.href), 'Feedback', " .
-               "'width=600,scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no').focus());";
-
+$bookmarklet = "javascript:w=Math.floor(screen.width/2);h=Math.floor(screen.height*0.9);void(window.open('$my_address?url='+escape(location.href)," .
+               "'Feedback','screenx='+w+',width='+w+',height='+h+',scrollbars=yes,toolbar=no,location=no,directories=no,status=no,menubar=no," .
+               "copyhistory=no').focus());";
 
 /* 
  * Provide default if URL unset
@@ -178,7 +193,7 @@ else
  */
 $headers = getallheaders();
 
-if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Version"] < $required_actions_file_version)
+if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Version"] != $required_actions_file_version)
 {
 
    error_abort("invalid", "<p>As much as we welcome your feedback, please note that
@@ -186,7 +201,7 @@ if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Versi
                </p>
                <ul>
                 <li><a href=\"http://www.privoxy.org/\" target=\"_blank\">Privoxy</a> version $required_privoxy_version or later</li>
-                <li><a href=\"$actions_file_download\">Actionsfile</a> version  version $required_actions_file_version or later</li>
+                <li><a href=\"$actions_file_download\">Actionsfile</a> version  version $required_actions_file_version</li>
                </ul>
                <p>We hope you will understand that we feel unable to maintain concurrent versions of the file.</p>
                <p><i>Hint: To upgrade your actions file, just right-click the above link, then save as default.action in
@@ -215,6 +230,14 @@ if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Versi
     The Privoxy team relies on <b>your</b> feedback to maintain an efficient actions file!
     <br>Please fill the below form and click to proceed to step 2.
    </p>
+
+   <p>
+    Please keep in mind that this is <b>not</b> the place for
+    <a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=211118" target="_blank">support requests</a>,
+    <br><a href="http://sourceforge.net/tracker/?group_id=11118&amp;atid=111118" target="_blank">bug reports</a> or
+    <a href="http://sourceforge.net/tracker/?atid=361118&amp;group_id=11118" target="_blank">feature requests</a>.
+   </p>
+
   </div>
 
   <div class="box">
@@ -263,7 +286,7 @@ if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Versi
     </p>
     <p>
      Please right-click the following link and choose "Add to Favorites" (IE) or "Add Bookmark for Link" (Netscape): 
-     <a href="<?php echo($bookmarklet); ?>">Privoxy-Submit</a>
+     <a href="<?php echo($bookmarklet); ?>">Privoxy - Submit Actions File Feedback</a>
     </p>
 
     <p>