-const char killpopup_rcs[] = "$Id: killpopup.c,v 1.6 2001/07/19 19:11:35 haroon Exp $";
+const char killpopup_rcs[] = "$Id: killpopup.c,v 1.10 2001/09/22 16:34:44 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $
*
* Revisions :
* $Log: killpopup.c,v $
+ * Revision 1.10 2001/09/22 16:34:44 jongfoster
+ * Removing unneeded #includes
+ *
+ * Revision 1.9 2001/07/31 14:44:22 oes
+ * Deleted unused size parameter from filter_popups()
+ *
+ * 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(
#include "project.h"
#include "killpopup.h"
-#include "jcc.h"
#include "errlog.h"
const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION;
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
/*********************************************************************
*
* Function : filter_popups
*
- * Description : Filter the block of data that's been read from the server.
- * Caller is responsible for checking permissons list
- * to determine if this function should be called.
- * Remember not to change the content length (substitute char by char)
+ * Description : Filter the block of data that's been read from the server
+ * for javascript popup code and replace by syntactically
+ * neutral code of the same size.
+ * Raise the CSP_FLAG_MODIFIED flag on success.
*
* Parameters :
* 1 : buff = Buffer to scan and modify. Null terminated.
- * 2 : size = Buffer size, excluding null terminator.
+ * 2 : csp = Client state pointer
*
* Returns : void
*
*********************************************************************/
-void filter_popups(char *buff, int size)
+void filter_popups(char *buff, struct client_state *csp)
{
char *popup = NULL;
char *close = NULL;
*/
strncpy(popup, "1;''.concat(", 12);
log_error(LOG_LEVEL_POPUPS, "Blocked popup window open");
+ csp->flags |= CSP_FLAG_MODIFIED;
}
}
*/
strncpy(popup, ".scrollTo(", 10);
log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize");
+ csp->flags |= CSP_FLAG_MODIFIED;
}
}
- /* Filter all other crap like onUnload onExit etc. (by BREITENB) NEW!*/
+ /* Filter onUnload and onExit */
popup=strstr( buff, "<body");
if (!popup) popup=strstr( buff, "<BODY");
if (!popup) popup=strstr( buff, "<Body");
close=strchr(popup,'>');
if (close)
{
- /* we are now between <body and the ending > FIXME: No, we're anywhere! --oes*/
+ /* we are now between <body and the ending > FIXME: No, we're anywhere! --oes */
p=strstr(popup, "onUnload");
if (p)
{
strncpy(p,"_nU_",4);
+ csp->flags |= CSP_FLAG_MODIFIED;
}
p=strstr(popup, "onExit");
if (p)
{
strncpy(p,"_nE_",4);
+ csp->flags |= CSP_FLAG_MODIFIED;
}
}
}
}
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
/*
Local Variables:
projects / privoxy.git / blobdiff