projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4cbcbd2
)
Adapted comments to new built-in images
author
oes
<oes@users.sourceforge.net>
Thu, 7 Mar 2002 03:50:54 +0000
(
03:50
+0000)
committer
oes
<oes@users.sourceforge.net>
Thu, 7 Mar 2002 03:50:54 +0000
(
03:50
+0000)
ijb.action
patch
|
blob
|
history
re_filterfile
patch
|
blob
|
history
diff --git
a/ijb.action
b/ijb.action
index
ba38496
..
3bb1fd0
100644
(file)
--- a/
ijb.action
+++ b/
ijb.action
@@
-3,7
+3,7
@@
#
# For information, see http://ijbswa.sourceforge.net/
#
#
# For information, see http://ijbswa.sourceforge.net/
#
-# $Id: ijb.action,v 1.
3 2002/03/05 14:35:39 morcego
Exp $
+# $Id: ijb.action,v 1.
4 2002/03/06 21:08:00 oes
Exp $
#
#############################################################################
# Syntax
#
#############################################################################
# Syntax
@@
-222,15
+222,16
@@
#
# +image-blocker{logo}
# +image-blocker{blank}
#
# +image-blocker{logo}
# +image-blocker{blank}
-# +image-blocker{http://i.j.b/send-banner}
+# +image-blocker{pattern}
+# +image-blocker{<URL>} with <url> being any valid image URL
# Decides what to do with URLs that end up tagged with {+block +image}.
# Decides what to do with URLs that end up tagged with {+block +image}.
-# There are
4
options. "-image-blocker" will send a HTML "blocked" page,
+# There are
5
options. "-image-blocker" will send a HTML "blocked" page,
# usually resulting in a "broken image" icon. "+image-blocker{logo}"
# will send a "JunkBuster" image. "+image-blocker{blank}" will send
# usually resulting in a "broken image" icon. "+image-blocker{logo}"
# will send a "JunkBuster" image. "+image-blocker{blank}" will send
-# a 1x1 transparent
GIF. And finally, "+image-blocker{http://xyz.com}"
-#
will send a HTTP temporary redirect to the specified image - this
-#
has the advantage of the icon being beeing cached by the browser,
-# w
hich will speed up the display.
+# a 1x1 transparent
PNG, "+image-blocker{pattern}" will send a 4x4
+#
grey/white pattern which is less intrusive than the logo but easier
+#
to recognize than the transparent one. And finally, "+image-blocker{<URL>}"
+# w
ill send a HTTP temporary redirect to the specified image URL.
#
#
# +limit-connect{portlist}
#
#
# +limit-connect{portlist}
diff --git
a/re_filterfile
b/re_filterfile
index
1912ad2
..
7c0f452
100644
(file)
--- a/
re_filterfile
+++ b/
re_filterfile
@@
-27,6
+27,11
@@
#
# Revisions :
# $Log: re_filterfile,v $
#
# Revisions :
# $Log: re_filterfile,v $
+# Revision 1.16 2002/02/21 00:12:19 jongfoster
+# Modifying the banner regexps to use long URLS and to autodetect
+# whether to show a logo or a transparent GIF, based on actionsfile
+# setting.
+#
# Revision 1.15 2001/12/28 23:54:20 steudten
# Fix for feature Req #495374: http-equiv problem
#
# Revision 1.15 2001/12/28 23:54:20 steudten
# Fix for feature Req #495374: http-equiv problem
#
@@
-138,13
+143,14
@@
s|(document\.cookie)([ \t\r\n]*=)|documenZapCooky$2|g
#
# Kill *all* popups a la popup.c. (But for *all* sites, so I wouldn't do that.)
#
#
# Kill *all* popups a la popup.c. (But for *all* sites, so I wouldn't do that.)
#
-# JavaScript: s/window\.open\(/
who_wants_this_to.open
(/ig
+# JavaScript: s/window\.open\(/
1;''\.concat\
(/ig
# HTML : s/target=['"]?_blank['"]?/target_who/g
#
# Kill banners by size:
# (Sizes from http://www.iab.net/iab_banner_standards/bannersizes.html)
# HTML : s/target=['"]?_blank['"]?/target_who/g
#
# Kill banners by size:
# (Sizes from http://www.iab.net/iab_banner_standards/bannersizes.html)
-# Note: Use http://ijbswa.sourceforge.net/config/send-banner?type=trans for a transparent 1x1 gif
-# Use http://ijbswa.sourceforge.net/config/send-banner?type=logo for the logo gif
+# Note: Use http://ijbswa.sourceforge.net/config/send-banner?type=trans for a transparent 1x1 PNG
+# Use http://ijbswa.sourceforge.net/config/send-banner?type=logo for the logo PNG
+# Use http://ijbswa.sourceforge.net/config/send-banner?type=logo for a grey/white pattern PNG
# Use http://ijbswa.sourceforge.net/config/send-banner?type=auto to auto-select.
# ********************************************************************/
s|<img\s+[^>]*?(width=['"]?468\D)[^>]*(height=['"]?60[^>]*?)>|<img src=http://ijbswa.sourceforge.net/config/send-banner?type=auto $1 $2>|sig
# Use http://ijbswa.sourceforge.net/config/send-banner?type=auto to auto-select.
# ********************************************************************/
s|<img\s+[^>]*?(width=['"]?468\D)[^>]*(height=['"]?60[^>]*?)>|<img src=http://ijbswa.sourceforge.net/config/send-banner?type=auto $1 $2>|sig