X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Factions%2Fstep3.php;h=e75678cebc41344a6f35a70d27331b007ab4c103;hb=60cbbc5f5d7514135bc5afc02d24e77a231c47f4;hp=3b884eb6d2ea48e031f0217a51816acd27e0cfce;hpb=5ea7c19fcca768ef811e314583fc0e150cef7e82;p=privoxy.git diff --git a/doc/webserver/actions/step3.php b/doc/webserver/actions/step3.php index 3b884eb6..e75678ce 100644 --- a/doc/webserver/actions/step3.php +++ b/doc/webserver/actions/step3.php @@ -8,9 +8,32 @@ This file belongs in ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: step3.php,v 1.11 2002/04/06 15:54:08 swa Exp $ + $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. @@ -18,18 +41,39 @@ 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 - Written by and Copyright (C) 2002 the SourceForge - Privoxy team. http://www.privoxy.org/ + 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 @@ -54,9 +98,9 @@
+ -This script was unable to open its logfile.
@@ -185,13 +222,13 @@ if(!$fp) * Write Head (type, severity, user, client-ip) * and remarks field: */ -fwrite($fp, "\n#FEEDBACK TYPE $problem SEVERITY $severity FROM $name ON $REMOTE_ADDR VERIFIED $url_verified TIME " . date("r") ."\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"); } } @@ -206,20 +243,22 @@ 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; @@ -227,10 +266,11 @@ switch ($problem) * Innocent image blocked: */ case "P2": - fwrite($fp, "#UNBLOCK-REFERRER: $referrer_url\n"); + 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; @@ -238,171 +278,49 @@ switch ($problem) * All other problems: */ default: - fwrite($fp, "#PROBLEM-URL: $referrer_url\n"); + fwrite($fp, "#MASTER# PROBLEM-URL: $referrer_url\n"); break; } fclose($fp); -// now fill the tracker on sf with all the necessary values: -// -//