X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cgisimple.c;h=c230054bf03ba0dd77b72a0526164548b1ad67c1;hb=0e1b13f3c38b2b8fc5dc675361db629ebb4ed421;hp=710466acecb73205d3210aa9927f3e4d076339ba;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232;p=privoxy.git

diff --git a/cgisimple.c b/cgisimple.c
index 710466ac..c230054b 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.19 2002/03/16 23:54:06 jongfoster Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.23 2002/03/26 22:29:54 swa Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -10,7 +10,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.19 2002/03/16 23:54:06 jongfo
  * 
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                Privoxy team.  http://ijbswa.sourceforge.net
+ *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -36,6 +36,18 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.19 2002/03/16 23:54:06 jongfo
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.23  2002/03/26 22:29:54  swa
+ *    we have a new homepage!
+ *
+ *    Revision 1.22  2002/03/24 16:18:15  jongfoster
+ *    Removing old logo
+ *
+ *    Revision 1.21  2002/03/24 15:23:33  jongfoster
+ *    Name changes
+ *
+ *    Revision 1.20  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
  *    Revision 1.19  2002/03/16 23:54:06  jongfoster
  *    Adding graceful termination feature, to help look for memory leaks.
  *    If you enable this (which, by design, has to be done by hand
@@ -252,7 +264,7 @@ jb_err cgi_error_404(struct client_state *csp,
       return JB_ERR_MEMORY;
    }
 
-   rsp->status = strdup("404 JunkBuster configuration page not found");
+   rsp->status = strdup("404 Privoxy configuration page not found");
    if (rsp->status == NULL)
    {
       free_map(exports);
@@ -268,7 +280,7 @@ jb_err cgi_error_404(struct client_state *csp,
  *
  * Function    :  cgi_die
  *
- * Description :  CGI function to shut down JunkBuster.
+ * Description :  CGI function to shut down Privoxy.
  *                NOTE: Turning this on in a production build
  *                would be a BAD idea.  An EXTREMELY BAD idea.
  *                In short, don't do it.
@@ -398,7 +410,7 @@ jb_err cgi_send_banner(struct client_state *csp,
 
    if (imagetype == 'a') /* auto */
    {
-      /* Default to logo */
+      /* Default to pattern */
       imagetype = 'p';
 #ifdef FEATURE_IMAGE_BLOCKING
       if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
@@ -425,11 +437,6 @@ jb_err cgi_send_banner(struct client_state *csp,
       rsp->content_length = image_blank_length;
 
    }
-   else  if (imagetype == 'l') /* logo */
-   {
-      rsp->body = bindup(image_logo_data, image_logo_length);
-      rsp->content_length = image_logo_length;
-   }   
    else /* pattern */
    {
       rsp->body = bindup(image_pattern_data, image_pattern_length);
@@ -499,7 +506,7 @@ jb_err cgi_transparent_image(struct client_state *csp,
  * Function    :  cgi_show_version
  *
  * Description :  CGI function that returns a a web page describing the
- *                file versions of IJB.
+ *                file versions of Privoxy.
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -542,7 +549,7 @@ jb_err cgi_show_version(struct client_state *csp,
  * Function    :  cgi_show_status
  *
  * Description :  CGI function that returns a a web page describing the
- *                current status of IJB.
+ *                current status of Privoxy.
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -762,7 +769,7 @@ jb_err cgi_show_status(struct client_state *csp,
  * Function    :  cgi_show_url_info
  *
  * Description :  CGI function that determines and shows which actions
- *                junkbuster will perform for a given url, and which
+ *                Privoxy will perform for a given url, and which
  *                matches starting from the defaults have lead to that.
  *
  * Parameters  :
@@ -1110,8 +1117,10 @@ static jb_err show_defines(struct map *exports)
 
 #ifdef FEATURE_FORCE_LOAD
    if (!err) err = map_conditional(exports, "FEATURE_FORCE_LOAD", 1);
+   if (!err) err = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
 #else /* ifndef FEATURE_FORCE_LOAD */
    if (!err) err = map_conditional(exports, "FEATURE_FORCE_LOAD", 0);
+   if (!err) err = map(exports, "FORCE_PREFIX", 1, "(none - disabled)", 1);
 #endif /* ndef FEATURE_FORCE_LOAD */
 
 #ifdef FEATURE_IMAGE_BLOCKING
@@ -1186,8 +1195,6 @@ static jb_err show_defines(struct map *exports)
    if (!err) err = map_conditional(exports, "STATIC_PCRS", 0);
 #endif /* ndef STATIC_PCRS */
 
-   if (!err) err = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
-
    return err;
 }