From: jongfoster Date: Tue, 26 Mar 2002 23:06:04 +0000 (+0000) Subject: Removing duplicate @ifs on the toggle page X-Git-Tag: v_2_9_5~20 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=eb2b971234dbc52efa3958f92a7b8b28f66a0330 Removing duplicate @ifs on the toggle page --- diff --git a/cgiedit.c b/cgiedit.c index 5fe03f4e..bf087ce7 100644 --- a/cgiedit.c +++ b/cgiedit.c @@ -1,4 +1,4 @@ -const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.25 2002/03/26 22:29:54 swa Exp $"; +const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.26 2002/03/26 22:59:17 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $ @@ -42,6 +42,9 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.25 2002/03/26 22:29:54 swa Exp $" * * Revisions : * $Log: cgiedit.c,v $ + * Revision 1.26 2002/03/26 22:59:17 jongfoster + * Fixing /toggle to display status consistently. + * * Revision 1.25 2002/03/26 22:29:54 swa * we have a new homepage! * @@ -4187,13 +4190,6 @@ jb_err cgi_toggle(struct client_state *csp, return JB_ERR_MEMORY; } - err = map_conditional(exports, "enabled", g_bToggleIJB); - if (err) - { - free_map(exports); - return err; - } - template_name = (get_char_param(parameters, "mini") ? "toggle-mini" : "toggle"); diff --git a/templates/toggle b/templates/toggle index 52b5ea09..6dc0f009 100644 --- a/templates/toggle +++ b/templates/toggle @@ -64,13 +64,13 @@ # If either have-proxy-info is true or have-adminaddr-info is # true, have-help-info is true. Used to conditionally include # a grey box for any and all help info. -# @if-enabled-then@ on @else-not-enabled@ off @endif-enabled@ +# @if-enabled-display-then@ on @else-not-enabled-display@ off @endif-enabled-display@ # - @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@ - Privoxy@@my-hostname@ + @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@ @@ -87,14 +87,14 @@ -

Privoxy is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@

+

Privoxy is @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@

When enabled, Privoxy performs its magic - blocking adverts, filtering cookies, regex-filtering, etc.

When disabled, Privoxy behaves as a normal HTTP proxy, and will not affect your web browsing.

-

Click - here to @if-enabled-then@disable@else-not-enabled@enable@endif-enabled@ Privoxy.

+

Click + here to @if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@ Privoxy.

diff --git a/templates/toggle-mini b/templates/toggle-mini index 15fbba0d..68f87f5a 100644 --- a/templates/toggle-mini +++ b/templates/toggle-mini @@ -64,13 +64,13 @@ # If either have-proxy-info is true or have-adminaddr-info is # true, have-help-info is true. Used to conditionally include # a grey box for any and all help info. -# @if-enabled-then@ on @else-not-enabled@ off @endif-enabled@ +# @if-enabled-display-then@ on @else-not-enabled-display@ off @endif-enabled-display@ # - @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@ - Privoxy@@my-hostname@ + @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@ @@ -80,9 +80,9 @@ leftmargin="3" rightmargin="3" topmargin="3" bottommargin="3">
Privoxy is -@if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@. -@if-enabled-then@[Disable]@else-not-enabled@[Enable]@endif-enabled@ +@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@. +@if-enabled-display-then@[Disable]@else-not-enabled-display@[Enable]@endif-enabled-display@
[Close]