projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
516bb37
)
Adapted to master file format (sync from stable branch)
author
oes
<oes@users.sourceforge.net>
Wed, 4 Sep 2002 11:12:42 +0000
(11:12 +0000)
committer
oes
<oes@users.sourceforge.net>
Wed, 4 Sep 2002 11:12:42 +0000
(11:12 +0000)
doc/webserver/actions/step3.php
patch
|
blob
|
history
diff --git
a/doc/webserver/actions/step3.php
b/doc/webserver/actions/step3.php
index
d3b6068
..
5949a7e
100644
(file)
--- a/
doc/webserver/actions/step3.php
+++ b/
doc/webserver/actions/step3.php
@@
-2,15
+2,18
@@
<html>
<!--
<html>
<!--
- File : $Source: /cvsroot/ijbswa/current/doc/webserver/actions/step3.php,v $
+ 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/
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
5 2002/04/09 15:08:10
oes Exp $
+ $Id: step3.php,v 1.1
6.2.2 2002/08/23 16:46:05
oes Exp $
$Log: step3.php,v $
$Log: step3.php,v $
+ 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.15 2002/04/09 15:08:10 oes
Restoring lost text change
@@
-219,7
+222,7
@@
if (isset($remarks))
$lines = explode("\n", $remarks);
foreach ($lines as $line)
{
$lines = explode("\n", $remarks);
foreach ($lines as $line)
{
- fwrite($fp, "#REMARKS: $line\n");
+ fwrite($fp, "#
MASTER#
REMARKS: $line\n");
}
}
}
}
@@
-234,21
+237,21
@@
switch ($problem)
* Banner not blocked:
*/
case "P1":
* 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]))
{
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 != ""))
{
$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;
$trackertext .= "Block image: $manual_image_url\n\n";
}
break;
@@
-257,10
+260,10
@@
switch ($problem)
* Innocent image blocked:
*/
case "P2":
* 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 != ""))
{
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;
$trackertext .= "Unblock image: $image_url\n\n";
}
break;
@@
-269,7
+272,7
@@
switch ($problem)
* All other problems:
*/
default:
* All other problems:
*/
default:
- fwrite($fp, "#PROBLEM-URL: $referrer_url\n");
+ fwrite($fp, "#
MASTER#
PROBLEM-URL: $referrer_url\n");
break;
}
break;
}
@@
-283,7
+286,7
@@
switch($problem)
{
case "P1": $category_id="412811"; $summary = "Ad not blocked "; break;
case "P2": $category_id="412810"; $summary = "Image blocked ";break;
{
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
p
locked ";break;
+ case "P3": $category_id="412812"; $summary = "Page
b
locked ";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;
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;