X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=6a30577caeb4355c387bfaeb922fb1cfeea24e71;hp=7320850b774c09ff7ebf681643eef2f37a3cd6ae;hb=a2f8296e90e9bc3c4e4fa50c9b42e3f12bce24ca;hpb=f67b3326138f428863c21c7738e0c8db87fa6f5c diff --git a/actions.c b/actions.c index 7320850b..6a30577c 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,3 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.97 2016/05/03 13:20:37 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.c,v $ @@ -6,7 +5,7 @@ const char actions_rcs[] = "$Id: actions.c,v 1.97 2016/05/03 13:20:37 fabiankeil * Purpose : Declares functions to work with actions files * * Copyright : Written by and Copyright (C) 2001-2016 the - * Privoxy team. http://www.privoxy.org/ + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -57,9 +56,6 @@ const char actions_rcs[] = "$Id: actions.c,v 1.97 2016/05/03 13:20:37 fabiankeil #include "ssplit.h" #include "filters.h" -const char actions_h_rcs[] = ACTIONS_H_VERSION; - - /* * We need the main list of options. * @@ -551,6 +547,12 @@ jb_err get_actions(char *line, return JB_ERR_PARSE; } } +#ifdef FEATURE_EXTENDED_STATISTICS + if (0 == strcmpic(action->name, "+block")) + { + register_block_reason_for_statistics(value); + } +#endif /* FIXME: should validate option string here */ freez (cur_action->string[action->index]); cur_action->string[action->index] = strdup(value); @@ -1113,6 +1115,10 @@ static const char *filter_type_to_string(enum filter_type filter_type) case FT_EXTERNAL_CONTENT_FILTER: return "external content filter"; #endif + case FT_SUPPRESS_TAG: + return "suppress tag filter"; + case FT_CLIENT_BODY_FILTER: + return "client body filter"; case FT_INVALID_FILTER: return "invalid filter type"; } @@ -1183,7 +1189,8 @@ static int action_spec_is_valid(struct client_state *csp, const struct action_sp {ACTION_MULTI_CLIENT_HEADER_FILTER, FT_CLIENT_HEADER_FILTER}, {ACTION_MULTI_SERVER_HEADER_FILTER, FT_SERVER_HEADER_FILTER}, {ACTION_MULTI_CLIENT_HEADER_TAGGER, FT_CLIENT_HEADER_TAGGER}, - {ACTION_MULTI_SERVER_HEADER_TAGGER, FT_SERVER_HEADER_TAGGER} + {ACTION_MULTI_SERVER_HEADER_TAGGER, FT_SERVER_HEADER_TAGGER}, + {ACTION_MULTI_CLIENT_BODY_FILTER, FT_CLIENT_BODY_FILTER} }; int errors = 0; int i; @@ -1830,7 +1837,7 @@ char * actions_to_html(const struct client_state *csp, * * Function : current_actions_to_html * - * Description : Converts a curren action spec to a
separated HTML + * Description : Converts a current action spec to a
separated HTML * text in which each action is linked to its chapter in * the user manual. *