projects / privoxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4e0151a)
Removing duplicate @ifs on the toggle page
authorjongfoster <jongfoster@users.sourceforge.net>
Tue, 26 Mar 2002 23:06:04 +0000 (23:06 +0000)
committerjongfoster <jongfoster@users.sourceforge.net>
Tue, 26 Mar 2002 23:06:04 +0000 (23:06 +0000)
cgiedit.c patch | blob | history
templates/toggle patch | blob | history
templates/toggle-mini patch | blob | history

diff --git a/cgiedit.c b/cgiedit.c
index 5fe03f4..bf087ce 100644 (file)
--- 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 52b5ea0..6dc0f00 100644 (file)
--- 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@
 #
 <html>
 
 <head>
   
-  <title>@if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@ - Privoxy@@my-hostname@</title>
+  <title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
   <style type="text/css">
     BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
   </style>
@@ -87,14 +87,14 @@
 
     <tr>
       <td bgcolor=#eeeeee>
-        <h2>Privoxy is @if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</h2>
+        <h2>Privoxy is @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</h2>
           <blockquote>
             <p>When enabled, Privoxy performs its magic - blocking
                adverts, filtering cookies, regex-filtering, etc.</p>
             <p>When disabled, Privoxy behaves as a normal HTTP proxy,
                and will not affect your web browsing.</p>
-            <p><a href="@default-cgi@toggle?set=@if-enabled-then@disable@else-not-enabled@enable@endif-enabled@">Click
-               here</a> to @if-enabled-then@disable@else-not-enabled@enable@endif-enabled@ Privoxy.</p>
+            <p><a href="@default-cgi@toggle?set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@">Click
+               here</a> to @if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@ Privoxy.</p>
           </blockquote>
       </td>
     </tr>
diff --git a/templates/toggle-mini b/templates/toggle-mini
index 15fbba0..68f87f5 100644 (file)
--- 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@
 #
 <html>
 
 <head>
   
-  <title>@if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@ - Privoxy@@my-hostname@</title>
+  <title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
   <style type="text/css">
     BODY, P, H1, H2, UL, OL, LI { font-family: Helvetica, Helv, Arial, Sans-Serif, sans-serif }
   </style>
@@ -80,9 +80,9 @@
 leftmargin="3" rightmargin="3" topmargin="3" bottommargin="3">
 <center>
 <a href="@default-cgi@" target="_blank">Privoxy</a> is 
-<b>@if-enabled-then@Enabled@else-not-enabled@Disabled@endif-enabled@</b>.
-<a href="@default-cgi@toggle?mini=y&set=@if-enabled-then@disable@else-not-enabled@enable@endif-enabled@"
->@if-enabled-then@[Disable]@else-not-enabled@[Enable]@endif-enabled@</a>
+<b>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@</b>.
+<a href="@default-cgi@toggle?mini=y&set=@if-enabled-display-then@disable@else-not-enabled-display@enable@endif-enabled-display@"
+>@if-enabled-display-then@[Disable]@else-not-enabled-display@[Enable]@endif-enabled-display@</a>
 <br>
 <a href="" onclick="window.close();">[Close]</a>
 </center>
The official Privoxy git repository