-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.28 2002/04/07 15:42:12 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
*
*
* 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
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.28 2002/04/07 15:42:12 jongfoster
+ * Fixing send-banner?type=auto when the image-blocker is
+ * a redirect to send-banner
+ *
+ * Revision 1.27 2002/04/05 15:50:48 oes
+ * added send-stylesheet CGI
+ *
+ * Revision 1.26 2002/04/04 00:36:36 gliptak
+ * always use pcre for matching
+ *
+ * Revision 1.25 2002/04/03 22:28:03 gliptak
+ * Removed references to gnu_regex
+ *
+ * Revision 1.24 2002/04/02 16:12:47 oes
+ * Fix: moving misplaced lines into #ifdef FEATURE_FORCE
+ *
+ * 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
#include "loadcfg.h"
#include "parsers.h"
#include "urlmatch.h"
+#include "errlog.h"
const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION;
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);
*
* 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.
if (imagetype == 'a') /* auto */
{
- /* Default to logo */
+ /* Default to pattern */
imagetype = 'p';
#ifdef FEATURE_IMAGE_BLOCKING
if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
{
+ static const char prefix1[] = CGI_PREFIX "send-banner?type=";
+ static const char prefix2[] = "http://" CGI_SITE_1_HOST "/send-banner?type=";
+
/* determine HOW images should be blocked */
const char * p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
/* and handle accordingly: */
- if ((p != NULL) && (0 == strcmpic(p, "blank")))
+ if (p == NULL)
+ {
+ /* Use default - nothing to do here. */
+ }
+ else if (0 == strcmpic(p, "blank"))
{
imagetype = 'b';
}
- else if ((p != NULL) && (0 == strcmpic(p, "pattern")))
+ else if (0 == strcmpic(p, "pattern"))
{
imagetype = 'p';
}
+ else if (0 == strncmpic(p, prefix1, sizeof(prefix1) - 1))
+ {
+ imagetype = p[sizeof(prefix1) - 1];
+ }
+ else if (0 == strncmpic(p, prefix2, sizeof(prefix2) - 1))
+ {
+ imagetype = p[sizeof(prefix2) - 1];
+ }
}
#endif /* def FEATURE_IMAGE_BLOCKING */
}
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);
*
*********************************************************************/
jb_err cgi_transparent_image(struct client_state *csp,
- struct http_response *rsp,
- const struct map *parameters)
+ struct http_response *rsp,
+ const struct map *parameters)
{
rsp->body = bindup(image_blank_data, image_blank_length);
rsp->content_length = image_blank_length;
}
+/*********************************************************************
+ *
+ * Function : cgi_send_stylesheet
+ *
+ * Description : CGI function that sends a css stylesheet found
+ * in the cgi-style.css template
+ *
+ * Parameters :
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : rsp = http_response data structure for output
+ * 3 : parameters = map of cgi parameters
+ *
+ * CGI Parameters : None
+ *
+ * Returns : JB_ERR_OK on success
+ * JB_ERR_MEMORY on out-of-memory error.
+ *
+ *********************************************************************/
+jb_err cgi_send_stylesheet(struct client_state *csp,
+ struct http_response *rsp,
+ const struct map *parameters)
+{
+ jb_err err;
+
+ assert(csp);
+ assert(rsp);
+
+ err = template_load(csp, &rsp->body, "cgi-style.css", 0);
+
+ if (err == JB_ERR_FILE)
+ {
+ /*
+ * No way to tell user; send empty stylesheet
+ */
+ log_error(LOG_LEVEL_ERROR, "Could not find cgi-style.css template");
+ }
+ else if (err)
+ {
+ return err; /* JB_ERR_MEMORY */
+ }
+
+ if (enlist(rsp->headers, "Content-Type: text/css"))
+ {
+ return JB_ERR_MEMORY;
+ }
+
+ return JB_ERR_OK;
+
+}
+
+
/*********************************************************************
*
* 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...)
* 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...)
while ((s != NULL) && fgets(buf, sizeof(buf), fp))
{
string_join (&s, html_encode(buf));
- string_append(&s, "<br>");
}
fclose(fp);
* 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 :
#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
if (!err) err = map_conditional(exports, "FEATURE_TRUST", 0);
#endif /* ndef FEATURE_TRUST */
-#ifdef REGEX_GNU
- if (!err) err = map_conditional(exports, "REGEX_GNU", 1);
-#else /* ifndef REGEX_GNU */
- if (!err) err = map_conditional(exports, "REGEX_GNU", 0);
-#endif /* def REGEX_GNU */
-
-#ifdef REGEX_PCRE
- if (!err) err = map_conditional(exports, "REGEX_PCRE", 1);
-#else /* ifndef REGEX_PCRE */
- if (!err) err = map_conditional(exports, "REGEX_PCRE", 0);
-#endif /* def REGEX_PCRE */
-
#ifdef STATIC_PCRE
if (!err) err = map_conditional(exports, "STATIC_PCRE", 1);
#else /* ifndef STATIC_PCRE */
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;
}
SHOW_RCS(filters_rcs)
SHOW_RCS(gateway_h_rcs)
SHOW_RCS(gateway_rcs)
-#ifdef GNU_REGEX
- SHOW_RCS(gnu_regex_h_rcs)
- SHOW_RCS(gnu_regex_rcs)
-#endif /* def GNU_REGEX */
SHOW_RCS(jbsockets_h_rcs)
SHOW_RCS(jbsockets_rcs)
SHOW_RCS(jcc_h_rcs)
projects / privoxy.git / blobdiff