From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 21 Oct 2014 15:30:27 +0000 (+0000)
Subject: Formally declare the scripts in doc/webserver/actions/ out of action
X-Git-Tag: v_3_0_22~29
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@edit-actions-url-form?a=commitdiff_plain;h=44aaef55d80fab64fe3ebf54dc6a4a5e88616051;p=privoxy.git
Formally declare the scripts in doc/webserver/actions/ out of action
They haven't worked in years and the docs no longer reference them.
---
diff --git a/doc/webserver/actions/index.php b/doc/webserver/actions/index.php
index c6ba857c..0d189aa0 100755
--- a/doc/webserver/actions/index.php
+++ b/doc/webserver/actions/index.php
@@ -1,328 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
- <!--
-
- File : $Source: /cvsroot/ijbswa/current/doc/webserver/actions/index.php,v $
-
- Purpose : Submit form for actions file feedback (step 1)
- This file belongs in
- ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
-
- $Id: index.php,v 1.25.2.7 2004/01/30 17:16:44 oes Exp $
-
- $Log: index.php,v $
- Revision 1.25.2.7 2004/01/30 17:16:44 oes
- Require AF 1.8
-
- Revision 1.25.2.6 2003/11/30 11:39:52 oes
- Fixed typo
-
- Revision 1.25.2.5 2003/09/01 15:20:45 oes
- Require AF 1.7
-
- Revision 1.25.2.4 2003/03/19 14:00:20 oes
- Require AF 1.6
-
- Revision 1.25.2.3 2002/08/27 16:33:39 oes
- Require AF 1.5 & Privoxy 3.0
-
- Revision 1.25.2.2 2002/08/06 08:39:09 oes
- Require AF 1.4; link to new AF download location
-
- Revision 1.25.2.1 2002/07/27 18:47:49 oes
- Require Privoxy 2.9.16 and AF 1.3
-
- Revision 1.25 2002/04/29 17:30:20 oes
- Fixed BML link text
-
- 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
-
- Revision 1.18 2002/04/08 17:03:29 oes
- - Fixed problem with spaces in URLs
- - Adapt to unified stylesheet
-
- Revision 1.17 2002/04/08 10:32:00 oes
- cosmetics again
-
- Revision 1.16 2002/04/08 08:11:04 oes
- Bumped up actions file number
-
- Revision 1.15 2002/04/07 17:13:08 oes
- Ooops: fixing submit target url
-
- Revision 1.14 2002/04/07 15:10:12 oes
- Restoring CVS history
-
- Revision 1.13 2002/04/06 15:19:35 oes
- Clean-up, smarter handling of unreachable URLs
-
- Revision 1.12 2002/04/06 11:34:44 oes
- Cosmetics
-
- Revision 1.11 2002/04/04 19:48:11 oes
- Reactivating the scripts ,-)
-
- Revision 1.10 2002/04/03 19:36:04 swa
- consistent look
-
- Revision 1.9 2002/04/02 19:32:45 oes
- Adding temporary fix for missing curl support on SF (step 2 + 3 on oesterhelt.org)
-
- Revision 1.8 2002/04/02 08:45:22 oes
- Made script location indepandant
-
- Revision 1.7 2002/04/02 07:21:34 oes
- Using relative link for step2
-
- Revision 1.6 2002/04/02 06:14:22 oes
- Fixed bookmarklet
-
- Revision 1.5 2002/04/01 19:13:47 oes (based on 1.2)
- Extended, fixed bugs, beefed up design, made IE-safe
-
- Revision 1.4 2002/03/30 20:44:44 swa
- have consistent look and feel. part 2.
- use correct urls.
-
- Revision 1.3 2002/03/30 19:49:34 swa
- have consistent look and feel
-
- Revision 1.2 2002/03/30 03:35:48 oes
- Updated bookmarklet
-
- Revision 1.1 2002/03/30 03:20:30 oes
- Added Feedback mechanism for actions file
-
-
- Copyright (C) 2002 the SourceForge Privoxy team.
- http://www.privoxy.org/
-
- Written by Andreas Oesterhelt
-
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General
- Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will
- be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
-
- The GNU General Public License should be included with
- this file. If not, you can view it at
- http://www.gnu.org/copyleft/gpl.html
- or write to the Free Software Foundation, Inc., 59
- Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- -->
-
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <meta http-equiv="Content-Script-Type" content="text/javascript">
<link rel="stylesheet" type="text/css" href="../privoxy.css">
<link rel="stylesheet" type="text/css" href="../p_feedback.css">
-
-<?php
-
-/*
- * Config:
- */
-$required_actions_file_version = "1.8";
-$required_privoxy_version = "3.0";
-$actions_file_download = "http://sourceforge.net/project/showfiles.php?group_id=11118&release_id=147447";
-$submit_target = "http://www.oesterhelt.org/actions/step2.php";
-
-
-/*
- * Debug:
- */
-//phpinfo();
-//error_reporting(E_ALL);
-error_reporting(E_NONE);
-
-/*
- * Function: error_abort
- * Purpose: Return an error page with $title and $message
- */
-function error_abort($title, $message)
-{
- if ($title == "invalid") /* shortcut */
- {
- $title = "Invalid Feedback Submission";
- }
-
- echo (" <title>Privoxy: $title</title>
- </head>
- <body>
- <div class=\"title\">
- <h1>
- <a href=\"http://www.privoxy.org/\">Privoxy</a>: $title
- </h1>
- </div>
- <center>
- <div class=\"warning\">
- $message
- </div>
- </center>
- <p>Valid <a href=\"http://validator.w3.org/\">HTML 4.01 Transitional</a></p>
- </body>
- </html>\n");
- exit;
-}
-
-
-/*
- * Bookmarklet that leads here:
- */
-$my_address = "http://" . $HTTP_SERVER_VARS["HTTP_HOST"] . $PHP_SELF;
-$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
- */
-if (!isset($url))
-{
- $url = "http://www.example.com/";
-}
-else
-{
- $url = strtr($url, " ", "+");
-}
-
-/*
- * Deny feedback which is not based on our latest
- * distribution:
- */
-$headers = getallheaders();
-
-if (!isset($headers["X-Actions-File-Version"]) || $headers["X-Actions-File-Version"] != $required_actions_file_version)
-{
-
- error_abort("invalid", "<p><b>Thank you for using <a href=\"http://www.privoxy.org/\" target=\"_blank\">Privoxy</a>'s
- feedback reporting mechanism!</b> However, in order to make optimal use of our limited development resources,
- we regret that we can at this time only accept problem reports based on:
- </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</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, follow the above link to download the file, then save as
- default.action in your Privoxy config directory</i>
- </p>");
-}
-
-?>
-
- <title>Privoxy Action List Feedback - Step 1 of 2</title>
+ <title>Out of action!</title>
</head>
-
<body>
- <div class="title">
- <h1>
- <a href="http://www.privoxy.org" target="_blank">Privoxy</a> Action List Feedback - Step 1 of 2
- </h1>
- </div>
-
- <div class="box">
- <p>
- <b>Thank you for reporting a missing or invalid action!</b>
- </p>
-
+ <div class="title">
+ <h1>Out of action!</h1>
+ </div>
<p>
- 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.
+ If you want to report a problem, please
+ <a href="http://www.privoxy.org/faq/contact.html">follow these instructions</a>.
</p>
-
<p>
- Please keep in mind that this is <b>not</b> the place for
- <a href="http://sourceforge.net/tracker/?group_id=11118&atid=211118" target="_blank">support requests</a>,
- <br><a href="http://sourceforge.net/tracker/?group_id=11118&atid=111118" target="_blank">bug reports</a> or
- <a href="http://sourceforge.net/tracker/?atid=361118&group_id=11118" target="_blank">feature requests</a>.
+ Note that if your are reading this text, you are probably using an obsolete Privoxy version
+ and the problem may already be fixed in a more recent release.
</p>
-
- </div>
-
- <div class="box">
- <form action="<?php echo($submit_target); ?>" method="post">
-
- <table border="0" cellpadding="0" cellspacing="4">
-
- <tr>
- <td align="right">URL:</td>
- <td>
- <input name="referrer_url" value="<?php echo($url); ?>" type="text" size="45" maxlength="255">
- </td>
- </tr>
-
- <tr>
- <td align="right">Nature of the problem:</td>
- <td>
- <select name="problem" size="1">
- <option selected value="INVALID">Please select...</option>
- <option value="P1">An advertisment was NOT blocked</option>
- <option value="P2">An innocent image WAS blocked</option>
- <option value="P3">The whole page was erroneously blocked</option>
- <option value="P4">The page needs popups but they don't work</option>
- <option value="P5">Other problem</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- <td>
- <input type=submit value="Proceed to step 2">
- </td>
- </tr>
-
- </table>
- </form>
- </div>
-
- <center>
- <div class="info">
- <h2>Using <a href="http://www.bookmarklets.com" target="_blank">Bookmarklets</a> for Feedback</h2>
- <p>
- To make it even easier for you, we provide a bookmarklet which will not only take you here from
- any troubled page you might be surfing, but also pre-fill the form!
- </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 Actions File Feedback</a>
- </p>
-
- <p>
- <i>You might get a warning that the bookmark "may not be safe" (IE) - just click OK.
- For even faster access, you can put it on the "Links" bar (IE) or the "Personal Toolbar" (Netscape),
- and submit feedback with a single click!</i>
- </p>
- </div>
- </center>
-
- <p>Valid <a href="http://validator.w3.org/">HTML 4.01 Transitional</a></p>
-
</body>
</html>
diff --git a/doc/webserver/actions/step2.php b/doc/webserver/actions/step2.php
index bdc08cd3..0d189aa0 100644
--- a/doc/webserver/actions/step2.php
+++ b/doc/webserver/actions/step2.php
@@ -1,518 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
- <!--
-
- File : $Source: /cvsroot/ijbswa/current/doc/webserver/actions/step2.php,v $
-
- Purpose : Submit form for actions file feedback (step 2)
- This file belongs in
- ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
-
- $Id: step2.php,v 1.13 2002/04/09 13:08:21 oes Exp $
-
- $Log: step2.php,v $
- Revision 1.13 2002/04/09 13:08:21 oes
- declare script type
-
- Revision 1.12 2002/04/08 17:04:05 oes
- Adapt to unified stylesheet
-
- Revision 1.11 2002/04/07 15:00:20 oes
- Descand into framesets to harvest all image URLs
-
- Revision 1.10 2002/04/06 15:19:35 oes
- Cosmetics Clean-up, smarter handling of unreachable URLs
-
- Revision 1.9 2002/04/06 11:34:44 oes
- Reactivating the scripts ,-) Cosmetics
-
- Revision 1.7 2002/04/03 19:36:04 swa
- consistent look
-
- Revision 1.6 2002/04/02 07:22:19 oes
- Elimnating duplicate images; using relative link for step3
-
- Revision 1.5 2002/04/02 06:14:47 oes
- Follow redirects
-
- Revision 1.4 2002/04/01 19:13:47 oes (based on 1.2)
- Extended, fixed bugs, beefed up design, made IE-safe
-
- Revision 1.3 2002/03/30 20:44:46 swa
- have consistent look and feel. part 2.
- use correct urls.
-
- Revision 1.2 2002/03/30 19:49:34 swa
- have consistent look and feel
-
- Revision 1.1 2002/03/30 03:20:30 oes
- Added Feedback mechanism for actions file
-
-
- Copyright (C) 2002 the SourceForge Privoxy team.
- http://www.privoxy.org/
-
- Written by Andreas Oesterhelt
-
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General
- Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will
- be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
-
- The GNU General Public License should be included with
- this file. If not, you can view it at
- http://www.gnu.org/copyleft/gpl.html
- or write to the Free Software Foundation, Inc., 59
- Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- -->
-
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <meta http-equiv="Content-Script-Type" content="text/javascript">
<link rel="stylesheet" type="text/css" href="../privoxy.css">
<link rel="stylesheet" type="text/css" href="../p_feedback.css">
-
- <script language="javascript" type="text/javascript">
- <!--
- //
- // Could be as easy as style="max-wdith: 300px; max-height..." inside the
- // <img> tag, but IE doesn't understand that. Setting the values directly also
- // screws IE for some weird reason. All praise MS.
- //
-
- function prettyscale(image)
- {
- newwidth = 0
- newheight = 0
-
- if (image.width > 300)
- {
- newwidth = 300
- }
-
- if (image.height > 50)
- {
- newheight = 50
- }
-
- if (image.width < 20)
- {
- newwidth = 20
- }
-
- if (image.height < 20)
- {
- newheight = 20
- }
-
- if (newwidth != 0)
- {
- image.width = newwidth
- }
-
- if (newheight != 0)
- {
- image.height = newheight
- }
- }
- //-->
- </script>
-
-<?php
-
-/*
- * For testing:
- */
-//phpinfo();
-//error_reporting(E_ALL);
-error_reporting(E_NONE);
-
-/*
- * Function: link_to_absolute
- * Purpose: Make $link from $base absolute
- */
-function link_to_absolute($base, $link)
-{
- /*
- * If $link already is absolute, we're done:
- */
- if (!strncmp("http://", $link, 7) || !strncmp("https://", $link, 8))
- {
- return $link;
- }
-
- /*
- * Cut the base to it's proto://host/ or to its proto://host/dir/,
- * depending whether $link is host-relative or path-relative.
- */
- if ($link{0} == "/")
- {
- /*
- * host-relative:
- */
- preg_match('|^(https?://[^/]+)|i', $base, $results);
- $base = $results[1];
- }
- else
- {
- /*
- * path-relative:
- */
- if (strpos($base, '/') != strlen($base))
- {
- preg_match('|(.*/)|i', $base, $results);
- $base = $results[1];
- }
- }
- return $base.$link;
-}
-
-
-/*
- * Function: slurp_page
- *
- * Purpose: Retrieve a URL with curl, and return the contents
- * or "FAILED" if it fails.
- */
-
-function slurp_page($url)
-{
- $ch = curl_init ($url);
-
- curl_setopt ($ch, CURLOPT_HEADER, 0);
- curl_setopt ($ch, CURLOPT_FAILONERROR, 1);
- curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
- curl_setopt ($ch, CURLOPT_TIMEOUT, 20);
-
- ob_start();
- $success = curl_exec ($ch);
- $page = ob_get_contents();
- ob_end_clean();
-
- curl_close ($ch);
-
- return $success ? $page : "FAILED";
-}
-
-/*
- * Function: get_image_urls_sp
- *
- * Purpose: Return the image URLs from a single page
- */
-function get_image_urls_sp($page, $url)
-{
- preg_match_all('|<img\s+[^>]*?src=[\'"]?(.*?)[\'" >]|i', $page, $matches);
-
- foreach (array_unique($matches[1]) as $image_link)
- {
- $result[] = link_to_absolute($url, $image_link);
- }
-
- return count($result) ? $result : 0;
-}
-
-/*
- * Function: get_image_urls
- *
- * Purpose: If the page is a frameset, rerurn the image URLs from all
- * its frame SRCes, else from the page itself.
- */
-function get_image_urls($page, $url)
-{
-
- preg_match_all('|<frame\s+[^>]*?src=[\'"]?(.*?)[\'" >]|i', $page, $matches);
-
- if (count($matches[1]))
- {
- foreach(array_unique($matches[1]) as $frame_link)
- {
- $framebuf = slurp_page(link_to_absolute($url, $frame_link));
- $result = array_merge($result, get_image_urls_sp($framebuf, link_to_absolute($url, $frame_link)));
- }
- }
- else
- {
- $result = get_image_urls_sp($page, $url);
- }
-
- return array_values(array_unique($result));
-}
-
-
-/*
- * Function: error_abort
- * Purpose: Return an error page with $title and $message
- */
-function error_abort($title, $message)
-{
- if ($title == "invalid") /* shortcut */
- {
- $title = "Invalid Feedback Submission";
- }
-
- echo (" <title>Privoxy: $title</title>
- </head>
- <body>
- <div class=\"title\">
- <h1>
- <a href=\"http://www.privoxy.org/\">Privoxy</a>: $title
- </h1>
- </div>
- <center>
- <div class=\"warning\">
- $message
- </div>
- </center>
- <p>Valid <a href=\"http://validator.w3.org/\">HTML 4.01 Transitional</a></p>
- </body>
- </html>\n");
- exit;
-}
-
-/*
- * Cannot start with step 2:
- */
-if (!isset($referrer_url))
-{
- error_abort("invalid", "When submitting your feedback please start with
- <a href=\"index.php\">step 1</a>.");
-}
-
-
-/*
- * Cannot work on unknown problem:
- */
-if (!isset($problem) || $problem == "INVALID")
-{
- error_abort("invalid", "You need to select the nature of the problem in
- <a href=\"javascript:history.back();\">step 1</a>.");
-}
-
-
-/*
- * If the protocol is missing from $referrer_url, prepend "http://"
- */
-if (!preg_match('|^https?://|i', $referrer_url, $dummy))
-{
- $referrer_url = "http://" . $referrer_url;
-}
-
-
-/*
- * Check if URL really exists and buffer its contents:
- */
-if (($page = slurp_page($referrer_url)) == "FAILED")
-{
- $url_confirm = "
- <dt>
- <p><b>Confirm the URL:</b></p>
- </dt>
- <dd>
- <p>
- The URL that you entered could not be retrieved. Please make sure that
- </p>
- <p class=\"important\">
- <a href=\"$referrer_url\">$referrer_url</a>
- </p>
- <p>
- is correct and publicly accssible.
- </p>
- <p>
- <input type=\"checkbox\" name=\"url_confirmed\" value=\"user\"> Yes, I'm sure.
- </p>
- </dd>";
-}
-else
-{
- $url_confirm = "<input type=\"hidden\" name=\"url_confirmed\" value=\"automatic\">";
-}
-
-/*
- * Create description from problem code:
- */
-switch($problem)
-{
- case "P1": $problem_description="an advertisment was not blocked"; break;
- case "P2": $problem_description="an innocent image was blocked"; break;
- case "P3": $problem_description="the whole page was erraneously blocked"; break;
- case "P4": $problem_description="the page needs popups but they don't work"; break;
- case "P5": $problem_description="a problem occured"; break;
- default: $problem_description="AN UNPROCESSABLE PROBLEM OCCURED";
-}
-
-?>
-
- <title>Privoxy Action List Feedback - Step 2 of 2</title>
+ <title>Out of action!</title>
</head>
<body>
-
- <div class="title">
- <h1>
- <a href="http://www.privoxy.org" target="_blank">Privoxy</a> Action List Feedback - Step 2 of 2
- </h1>
- </div>
-
- <div class="box">
- <b>You are about to report that <?php echo ($problem_description) ?> on
- <a href="<?php echo ($referrer_url) ?>"><?php echo ($referrer_url) ?></a>.</b>
- </div>
-
- <div class="box">
- <form action="step3.php" method="post">
- <p>
- <input type="hidden" name="problem" value="<?php echo ($problem) ?>">
- <input type="hidden" name="referrer_url" value="<?php echo ($referrer_url) ?>">
- </p>
-
- <dl>
-
-<?php
-
-/*
- * Include the confirmation for an unretrievable URL if
- * necessary
- */
-echo ($url_confirm);
-
-/*
- * Create / suppress form elements depending on type of
- * problem
- */
-if ($problem != "P1")
-{
- echo ("<!--");
-}
-else
-{
- $image_urls = get_image_urls($page, $referrer_url);
- $count = count($image_urls);
-
- if ($count > 0)
- {
- /*
- * Open section in <dl>; Open table:
- */
- echo (" <dt><b>Choose the images you want blocked from the following list:</b></dt>
- <dd>
- <p>
- <input type=\"hidden\" name=\"num_images\" value=\"$count\">
- <table border=\"0\" cellpadding=\"0\" cellspacing=\"4\">\n");
- /*
- * Print one table row for each image found:
- */
- for ($i=0; $i< $count; $i++)
- {
- $image_url = link_to_absolute($referrer_url, $image_urls[$i]);
-
- /*
- * Print the row(s):
- */
- echo (" <tr>
- <td rowspan=\"2\">
- <input type=\"checkbox\" name=\"block_image[$i]\" value=\"off\">
- </td>
- <td>
- <a href=\"$image_url\">$image_url</a>:
- </td>
- <td>
- <input type=\"hidden\" name=\"image_url[$i]\" value=\"$image_url\">
- </td>
- </tr>
- <tr>
- <td>
- <img onload=\"prettyscale(this);\" src=\"$image_url\" alt=\"banner or not?\">
- </td>
- </tr>\n");
- }
- echo (" </table>
- </dd>
-
- <dt>
- <b>If the banner that you saw is not listed above, enter the URL here</b>\n");
- }
- else
- {
- echo (" <dt>
- <b>URL of the advertisment image:</b>\n");
- }
-}
-
-?>
-
- <br><i>Hint: right-click the image, select "Copy image location" and paste the URL here.</i>
- </dt>
- <dd>
- <p>
- <input name="manual_image_url" type="text" size="45" maxlength="255">
- </p>
- </dd>
-
-<?php if($problem != "P1") echo ("-->") ?>
-
-<?php if($problem != "P2") echo ("<!--") ?>
-
- <dt>
- <p><b>URL of the innocent image:</b>
- <br><i>Hint: right-click the image, select "Copy image location" and paste the URL here.
- <br>This may not work if the image was blocked by size or if +image-blocker is set to redirect.</i>
- </p>
- </dt>
- <dd>
- <p>
- <input name="image_url" value="unknown" type="text" size="45" maxlength="255">
- </p>
- </dd>
-
-<?php if($problem != "P2") echo ("-->") ?>
-
- <dt><b>Severity:</b></dt>
- <dd>
- <p>
- <select name="severity">
- <option value="3">drives me crazy</option>
- <option selected value="2">normal</option>
- <option value="1">cosmetic</option>
- </select>
- </p>
- </dd>
-
- <dt>
- <b>Remarks:</b> <i>(optional)</i>
- </dt>
- <dd>
- <p>
- <textarea wrap="hard" style="font-size: 10px" name="remarks" cols="35" rows="3">None.</textarea>
- </p>
- </dd>
-
- <dt>
- <b>Your Name:</b> <i>(optional, public)</i>
- </dt>
- <dd>
- <p>
- <input name="name" size="45">
- </p>
- </dd>
-
- <dt> </dt>
- <dd>
- <input type="submit" value="Submit">
- </dd>
-
- </dl>
- </form>
- </div>
-
- <p>Valid <a href="http://validator.w3.org/">HTML 4.01 Transitional</a></p>
-
+ <div class="title">
+ <h1>Out of action!</h1>
+ </div>
+ <p>
+ If you want to report a problem, please
+ <a href="http://www.privoxy.org/faq/contact.html">follow these instructions</a>.
+ </p>
+ <p>
+ Note that if your are reading this text, you are probably using an obsolete Privoxy version
+ and the problem may already be fixed in a more recent release.
+ </p>
</body>
</html>
diff --git a/doc/webserver/actions/step3.php b/doc/webserver/actions/step3.php
index e75678ce..0d189aa0 100644
--- a/doc/webserver/actions/step3.php
+++ b/doc/webserver/actions/step3.php
@@ -1,354 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
- <!--
-
- File : $Source: /cvsroot/ijbswa/current/doc/webserver/actions/step3.php,v $
-
- Purpose : Submit form for actions file feedback (step 1)
- This file belongs in
- ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
-
- $Id: step3.php,v 1.16.2.2 2002/08/23 16:46:05 oes Exp $
-
- $Log: step3.php,v $
- Revision 1.16.2.2 2002/08/23 16:46:05 oes
- Adapt to master file format
-
- Revision 1.16.2.1 2002/08/23 12:25:31 oes
- Fixed Typo
-
- Revision 1.16 2002/04/13 14:34:59 oes
- Include unique ID in tracker and log; Include URL in tracker summary; add more newlines in tracker
-
- Revision 1.15 2002/04/09 15:08:10 oes
- Restoring lost text change
-
- Revision 1.14 2002/04/08 17:04:05 oes
- Adapt to unified stylesheet
-
- Revision 1.13 2002/04/07 17:11:40 oes
- Tracker submit via curl (no need for user to see), fixing problems, removing monster comments
-
- Revision 1.12 2002/04/06 18:57:38 swa
- first version of the script that writes the
- logfile with all submissions and additionally
- submits the entries to our tracker.
-
- Revision 1.11 2002/04/06 15:54:08 swa
- prework: list of what needs to
- be submitted to the tracker.
-
- Revision 1.10 2002/04/06 15:19:35 oes
- Clean-up, smarter handling of unreachable URLs
-
- Revision 1.9 2002/04/06 11:34:44 oes
- Cosmetics
-
- Revision 1.8 2002/04/04 19:48:11 oes
- Reactivating the scripts ,-)
-
- Revision 1.7 2002/04/04 10:29:58 oes
- Keeping feedback confidential
-
- Revision 1.6 2002/04/03 19:36:04 swa
- consistent look
-
- Revision 1.5 2002/04/02 07:22:43 oes
- Cosmetics
-
- Revision 1.4 2002/04/01 19:13:47 oes
- Extended, fixed bugs, beefed up design, made IE-safe
-
- Revision 1.3 2002/03/30 20:44:46 swa
- have consistent look and feel. part 2.
- use correct urls.
-
- Revision 1.2 2002/03/30 19:49:34 swa
- have consistent look and feel
-
- Revision 1.1 2002/03/30 03:20:30 oes
- Added Feedback mechanism for actions file
-
-
- Copyright (C) 2002 the SourceForge Privoxy team.
- http://www.privoxy.org/
-
- Written by Andreas Oesterhelt
-
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General
- Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will
- be useful, but WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public
- License for more details.
-
- The GNU General Public License should be included with
- this file. If not, you can view it at
- http://www.gnu.org/copyleft/gpl.html
- or write to the Free Software Foundation, Inc., 59
- Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- -->
-
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" type="text/css" href="../privoxy.css">
<link rel="stylesheet" type="text/css" href="../p_feedback.css">
-
-<?php
-
-/*
- * Config:
- */
-$logfile = "results/actions-feedback.txt";
-
-
-/*
- * Debug:
- */
-//phpinfo();
-//error_reporting(E_ALL);
-error_reporting(E_NONE);
-
-/*
- * Function: error_abort
- * Purpose: Return an error page with $title and $message
- */
-function error_abort($title, $message)
-{
- if ($title == "invalid") /* shortcut */
- {
- $title = "Invalid Feedback Submission";
- }
-
- echo (" <title>Privoxy: $title</title>
- </head>
- <body>
- <div class=\"title\">
- <h1>
- <a href=\"http://www.privoxy.org/\">Privoxy</a>: $title
- </h1>
- </div>
- <center>
- <div class=\"warning\">
- $message
- </div>
- </center>
- <p>Valid <a href=\"http://validator.w3.org/\">HTML 4.01 Transitional</a></p>
- </body>
- </html>\n");
- exit;
-}
-
-
-/*
- * Cannot start with step 3:
- */
-if (!isset($referrer_url))
-{
- error_abort("invalid", "When submitting your feedback please start with <a href=\"index.php\">step 1</a>.");
-}
-
-
-/*
- * Cannot work on unknown problem:
- */
-if (!isset($problem))
-{
- error_abort("invalid", "You need to select the nature of the problem in <a href=\"index.php\">step 1</a>.");
-}
-
-
-/*
- * Don't accept unconfirmed URLs
- */
-if (!isset($url_confirmed))
-{
- error_abort("invalid", "When submitting URLs that this script can't retrieve, you need to check \"Yes, I'm sure\"
- <a href=\"javascript:history.back();\">step 2</a>.");
-}
-
-
-/*
- * Handle optional text fields:
- */
-if (!isset($name) || ($name == ""))
-{
- $name = "anonymous";
-}
-
-/*
- * Assign unique ID:
- */
-$item_id = date("U");
-
-
-/*
- * Open the logfile or fail:
- */
-$fp = fopen($logfile, "a");
-
-if(!$fp)
-{
- echo (" <title>Internal Script Error</title>
- </head>
- <body>
- <div class=\"title\">
- <h1><a href=\"http://www.privoxy.org/\">Privoxy</a>: Internal Script Error</h1>
- </div>
- <center>
- <div class=\"warning\">
- <p>
- This script was unable to open its logfile.
- </p>
- <p>
- Please <a href=\"mailto:info@privoxy.org?SUBJECT=Feedback-Script-Broken\">mail its owner</a>!
- </p>
- </div>
- </center>
- </body>
- </html>");
- exit;
-}
-
-
-/*
- * Write Head (type, severity, user, client-ip)
- * and remarks field:
- */
-fwrite($fp, "\n#FEEDBACK ID $item_id TYPE $problem SEVERITY $severity FROM $name ON $REMOTE_ADDR VERIFIED $url_confirmed TIME " . date("r") ."\n");
-if (isset($remarks))
-{
- $lines = explode("\n", $remarks);
- foreach ($lines as $line)
- {
- fwrite($fp, "#MASTER# REMARKS: $line\n");
- }
-}
-
-
-/*
- * Depending on the type of problem reported,
- * we need to write additional data:
- */
-switch ($problem)
-{
- /*
- * Banner not blocked:
- */
- case "P1":
- fwrite($fp, "#MASTER# BLOCK-REFERRER: $referrer_url\n");
- if (isset($num_images))
- {
- for($i=0; $i < $num_images; $i++)
- {
- if (isset($block_image[$i]))
- {
- fwrite($fp, "#MASTER# BLOCK-URL: $image_url[$i]\n");
- $trackertext .= "Block image: $image_url[$i]\n\n";
- }
- }
- }
- if (isset($manual_image_url) && ($manual_image_url != ""))
- {
- fwrite($fp, "#MASTER# BLOCK-URL: $manual_image_url\n");
- $trackertext .= "Block image: $manual_image_url\n\n";
- }
- break;
-
- /*
- * Innocent image blocked:
- */
- case "P2":
- fwrite($fp, "#MASTER# UNBLOCK-REFERRER: $referrer_url\n");
- if (isset($image_url) && ($image_url != ""))
- {
- fwrite($fp, "#MASTER# UNBLOCK-URL: $image_url\n");
- $trackertext .= "Unblock image: $image_url\n\n";
- }
- break;
-
- /*
- * All other problems:
- */
- default:
- fwrite($fp, "#MASTER# PROBLEM-URL: $referrer_url\n");
- break;
-}
-
-fclose($fp);
-
-/*
- * Notify our SF tracker that new data is waiting to be
- * processed
- */
-switch($problem)
-{
- case "P1": $category_id="412811"; $summary = "Ad not blocked "; break;
- case "P2": $category_id="412810"; $summary = "Image blocked ";break;
- case "P3": $category_id="412812"; $summary = "Page blocked ";break;
- case "P4": $category_id="412813"; $summary = "Popups blocked ";break;
- case "P5": $category_id="412814"; $summary = "Other problem ";break;
- default: $category_id="412814"; $summary = "IMPOSSIBLE ";break;
-}
-
-$summary .= "on " . $referrer_url . " (" .$item_id . ")";
-$priority = 3 * $severity;
-
-$details = urlencode("On " . date("r") . " new data was received from $name:\n\n"
- ."URL: $referrer_url\n\n$trackertext\nRemarks:\n$remarks");
-
-$postfields = ( "group_id=11118&atid=460288&func=postadd&category_id=$category_id&artifact_group_id=195890" .
- "&priority=$priority&summary=$summary&details=$details" );
-
-$ch = curl_init ("http://sourceforge.net/tracker/index.php");
-curl_setopt($ch, CURLOPT_HEADER, 0);
-curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-curl_setopt($ch, CURLOPT_TIMEOUT, 20);
-curl_setopt($ch, CURLOPT_POST, 1);
-curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields);
-
-ob_start();
-curl_exec($ch);
-ob_end_clean();
-
-curl_close ($ch);
-
-?>
-
- <title>Privoxy Action List Feedback - Result</title>
+ <title>Out of action!</title>
</head>
-
<body>
- <div class="title">
- <h1>
- <a href="http://www.privoxy.org" target="_blank">Privoxy</a> Action List Feedback - Result
- </h1>
- </div>
-
- <div class="box">
+ <div class="title">
+ <h1>Out of action!</h1>
+ </div>
<p>
- <b>Thank you very much for taking the time to submit your feedback!</b>
+ If you want to report a problem, please
+ <a href="http://www.privoxy.org/faq/contact.html">follow these instructions</a>.
</p>
-
<p>
- The developers will review and use your submission to improve the
- distribution actions file.
+ Note that if your are reading this text, you are probably using an obsolete Privoxy version
+ and the problem may already be fixed in a more recent release.
</p>
-
- <p align=center>
- <input type="submit" value="Close this window" onclick="window.close();">
- </p>
-
- </div>
-
- <p>Valid <a href="http://validator.w3.org/">HTML 4.01 Transitional</a></p>
-
</body>
</html>