From e5d12892a309484ff6d37012d2e515fbdd647af5 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 20 Jan 2007 15:31:31 +0000 Subject: [PATCH] Display warning if show-url-info CGI page is used while Privoxy is toggled off. --- cgisimple.c | 20 ++++++++++++++++++-- templates/show-url-info | 21 ++++++++++++++------- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/cgisimple.c b/cgisimple.c index 4b0e78e3..545bedc0 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.46 2007/01/02 12:49:46 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.47 2007/01/12 15:07:10 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -9,7 +9,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.46 2007/01/02 12:49:46 fabian * Functions declared include: * * - * Copyright : Written by and Copyright (C) 2001-2006 the SourceForge + * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.46 2007/01/02 12:49:46 fabian * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.47 2007/01/12 15:07:10 fabiankeil + * Use zalloc in cgi_send_user_manual. + * * Revision 1.46 2007/01/02 12:49:46 fabiankeil * Add FEATURE_ZLIB to the list of conditional * defines at the show-status page. @@ -1244,6 +1247,19 @@ jb_err cgi_show_url_info(struct client_state *csp, url_param = url_param_prefixed; } + /* + * Hide "toggle off" warning if Privoxy is toggled on. + */ + if ( +#ifdef FEATURE_TOGGLE + (global_toggle_state == 1) && +#endif /* def FEATURE_TOGGLE */ + map_block_killer(exports, "privoxy-is-toggled-off") + ) + { + free_map(exports); + return JB_ERR_MEMORY; + } if (url_param[0] == '\0') { diff --git a/templates/show-url-info b/templates/show-url-info index 913a45a4..86d03e87 100644 --- a/templates/show-url-info +++ b/templates/show-url-info @@ -93,7 +93,7 @@ - +

+ + + + + + + - - - -

@@ -137,6 +137,19 @@

Warning:

+ Privoxy is currently toggled off. Matching actions will not apply + unless you toggle Privoxy on first. +

Look up the actions for a @@ -175,13 +188,7 @@

Valid HTML 4.01 Strict

-- 2.39.2