+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<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);
-#error_reporting(E_ALL);
-
-// 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.1 2002/03/30 03:20:30 oes Exp $
-//
-// $Log: step3.php,v $
-// Revision 1.1 2002/03/30 03:20:30 oes
-// Added Feedback mechanism for actions file
-//
-//
-// Written by and Copyright (C) 2001 the SourceForge
-// Privoxy team. http://www.privoxy.org/
-//
-// Based on the Internet Junkbuster originally written
-// by and Copyright (C) 1997 Anonymous Coders and
-// Junkbusters Corporation. http://www.junkbusters.com
-//
-// 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.
-//
-//
+
+/*
+ * 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))
{
- echo ("<html><head><title>Invalid Feedback Submission</title>
- <link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\">
- </head>
- <body><h2>Invalid Feedback Submission</h2>
- <p>When submitting your feedback please start with
- <a href=\"test.php\">step 1</a>.</p>
- </body>
- </html>");
- exit;
+ 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))
{
- echo ("<html><head><title>Invalid Feedback Submission</title>
- <link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\">
- </head>
- <body><h2>Invalid Feedback Submission</h2>
- <p>You need to select the nature of the problem in
- <a href=\"test.php\">step 1</a>.</p>
- </body>
- </html>");
- exit;
+ 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))
+if (!isset($name) || ($name == ""))
{
$name = "anonymous";
}
+/*
+ * Assign unique ID:
+ */
+$item_id = date("U");
+
+
/*
- * Open the logfile:
+ * Open the logfile or fail:
*/
-$logfile = "feedback-data.txt";
$fp = fopen($logfile, "a");
if(!$fp)
{
- echo ("<html><head><title>Internal Script Error</title>
- <link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\">
- </head>
- <body><h2>Internal Script Error</h2>
- <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>
- </body>
+ 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 and remarks field:
+ * Write Head (type, severity, user, client-ip)
+ * and remarks field:
*/
-fwrite($fp, "#FEEDBACK TYPE $problem SEVERITY $severity FROM $name ON $REMOTE_ADDR\n");
+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, "#REMARKS: $line\n");
+ 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, "#BLOCK-REFERRER: $referrer_url\n");
+ 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, "#BLOCK-URL: $image_url[$i]\n");
+ 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, "#BLOCK-URL: $manual_image_url\n");
+ 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, "#UNBLOCK-REFERRER: $referrer_url\n");
- if (isset($manual_image_url) && ($manual_image_url != ""))
+ fwrite($fp, "#MASTER# UNBLOCK-REFERRER: $referrer_url\n");
+ if (isset($image_url) && ($image_url != ""))
{
- fwrite($fp, "#UNBLOCK-URL: image_url\n");
+ 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);
+
?>
-<html>
- <head>
- <title>Privoxy Action List Feedback - Result</title>
- <link rel="stylesheet" type="text/css" href="../p_web.css">
-</head>
+ <title>Privoxy Action List Feedback - Result</title>
+ </head>
+
+ <body>
+ <div class="title">
+ <h1>
+ <a href="http://www.privoxy.org" target="_blank">Privoxy</a> Action List Feedback - Result
+ </h1>
+ </div>
-<h2><a href="http://www.privoxy.org" target="_blank">Privoxy</a> Action List Feedback - Result</h2>
+ <div class="box">
+ <p>
+ <b>Thank you very much for taking the time to submit your feedback!</b>
+ </p>
-<p><b>Thank you very much for taking the time to submit your feedback!</b></p>
+ <p>
+ The developers will review and use your submission to improve the
+ distribution actions file.
+ </p>
+
+ <p align=center>
+ <input type="submit" value="Close this window" onclick="window.close();">
+ </p>
-<p>It will be reviewed by the developers and used to improve the
-distribution actions file.</p>
+ </div>
-<input type="submit" value="Close this window" onClick="window.close()">
+ <p>Valid <a href="http://validator.w3.org/">HTML 4.01 Transitional</a></p>
-</body>
+ </body>
</html>
projects / privoxy.git / blobdiff