projects / privoxy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Renerate for 3.0.21 UNRELEASED
[privoxy.git] / doc / webserver / actions / step3.php
diff --git a/doc/webserver/actions/step3.php b/doc/webserver/actions/step3.php
index 319404b..e75678c 100644 (file)
--- a/doc/webserver/actions/step3.php
+++ b/doc/webserver/actions/step3.php
@@ -8,9 +8,27 @@
               This file belongs in
               ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
-  $Id: step3.php,v 1.12 2002/04/06 18:57:38 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
@@ -80,9 +98,9 @@
  <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
 
 /* 
@@ -118,7 +136,7 @@ function error_abort($title, $message)
               </h1>
              </div>
             <center>
-             <div class=\"errorbox\">
+             <div class=\"warning\">
               $message
              </div>
             </center>
@@ -165,6 +183,11 @@ if (!isset($name) || ($name == ""))
    $name = "anonymous";
 }
 
+/*
+ * Assign unique ID:
+ */
+$item_id = date("U");
+
 
 /* 
  * Open the logfile or fail:
@@ -180,7 +203,7 @@ if(!$fp)
               <h1><a href=\"http://www.privoxy.org/\">Privoxy</a>: Internal Script Error</h1>
             </div>
             <center>
-             <div class=\"errorbox\">
+             <div class=\"warning\">
               <p>
                This script was unable to open its logfile.
               </p>
@@ -199,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_confirmed 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");
    }
 }
 
@@ -220,22 +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");
-                $trackertext .= "Block image: $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");
-         $trackertext .= "Block image: $manual_image_url\n";
+         fwrite($fp, "#MASTER# BLOCK-URL: $manual_image_url\n");
+         $trackertext .= "Block image: $manual_image_url\n\n";
       }
       break;
 
@@ -243,11 +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");
-         $trackertext .= "Unblock image: $image_url\n";
+         fwrite($fp, "#MASTER# UNBLOCK-URL: $image_url\n");
+         $trackertext .= "Unblock image: $image_url\n\n";
       }
       break;
 
@@ -255,7 +278,7 @@ switch ($problem)
     * All other problems:
     */
    default:
-      fwrite($fp, "#PROBLEM-URL: $referrer_url\n");
+      fwrite($fp, "#MASTER# PROBLEM-URL: $referrer_url\n");
       break;
 }        
             
@@ -269,17 +292,17 @@ 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 plocked ";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 .= date("U"); /* Must be unique */
+$summary .= "on " . $referrer_url . " (" .$item_id . ")";
 $priority = 3 * $severity;
 
-$details = urlencode("On " . date("r") . " new data was received from $name:\n"
-                    ."URL: $referrer_url\n$trackertext\nRemarks:\n\n$remarks");
+$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" );
@@ -315,7 +338,7 @@ curl_close ($ch);
    </p>
 
    <p>
-    It will be reviewed by the developers and used to improve the
+    The developers will review and use your submission to improve the
     distribution actions file.
    </p>
    
The official Privoxy git repository