X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.c;h=8a36e5847a02ae65d2f755289813beaf02d8a10c;hp=3ad443717d0b080c211dd41063d2a0c626f71ff8;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hpb=4bb8225677e05ca9fe842f6343479fd4f875a022 diff --git a/killpopup.c b/killpopup.c index 3ad44371..8a36e584 100644 --- a/killpopup.c +++ b/killpopup.c @@ -1,4 +1,4 @@ -const char killpopup_rcs[] = "$Id: killpopup.c,v 1.5 2001/07/18 15:02:52 haroon Exp $"; +const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $ @@ -32,6 +32,22 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.5 2001/07/18 15:02:52 haroon * * Revisions : * $Log: killpopup.c,v $ + * Revision 1.8 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.7 2001/07/20 19:29:25 haroon + * - In v1.5 forgot to add that I implemented LOG_LEVEL_POPUPS in errlog.c, + * errlog.h and killpopup.c. In that case, it is superfluous to have define for + * POPUP_VERBOSE, so I removed the defines and logging is now done + * via log_error(LOG_LEVEL_POPUPS, ....) + * + * Revision 1.6 2001/07/19 19:11:35 haroon + * - Implemented Guy's idea of replacing window.open( with 1;''.concat( + * - Implemented Guy's idea of replacing .resizeTo( with .scrollTo( + * * Revision 1.5 2001/07/18 15:02:52 haroon * improved nuking of window.open * @@ -83,12 +99,7 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.5 2001/07/18 15:02:52 haroon const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; -#ifdef KILLPOPUPS - -/* Change these for debug output. *lots*. */ -/*#define POPUP_VERBOSE 1*/ -#undef POPUP_VERBOSE - +#ifdef FEATURE_KILL_POPUPS /********************************************************************* * @@ -101,12 +112,11 @@ const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; * * Parameters : * 1 : buff = Buffer to scan and modify. Null terminated. - * 2 : size = Buffer size, excluding null terminator. * * Returns : void * *********************************************************************/ -void filter_popups(char *buff, int size) +void filter_popups(char *buff) { char *popup = NULL; char *close = NULL; @@ -121,9 +131,7 @@ void filter_popups(char *buff, int size) * Guy's idea (thanks) */ strncpy(popup, "1;''.concat(", 12); -#ifdef POPUP_VERBOSE log_error(LOG_LEVEL_POPUPS, "Blocked popup window open"); -#endif } } @@ -136,13 +144,11 @@ void filter_popups(char *buff, int size) * Guy's idea (thanks) */ strncpy(popup, ".scrollTo(", 10); -#ifdef POPUP_VERBOSE log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize"); -#endif } } - /* Filter all other crap like onUnload onExit etc. (by BREITENB) NEW!*/ + /* Filter onUnload and onExit */ popup=strstr( buff, "'); if (close) { - /* we are now between FIXME: No, we're anywhere! --oes*/ + /* we are now between FIXME: No, we're anywhere! --oes */ p=strstr(popup, "onUnload"); if (p) { @@ -168,7 +174,7 @@ void filter_popups(char *buff, int size) } -#endif /* def KILLPOPUPS */ +#endif /* def FEATURE_KILL_POPUPS */ /* Local Variables: