X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=3be01e397cef6fd510af6341213da12099181d6b;hb=8ff919206b9740c46e7fe93e01d62f594d14262e;hp=faa70da843268e6d612dbd971e4b08c7a9e04065;hpb=d6f6d40eb51a7a7f491c5c027f83bbd7f44c009f;p=privoxy.git diff --git a/cgisimple.c b/cgisimple.c index faa70da8..3be01e39 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,3 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.135 2016/03/04 13:22:22 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -6,8 +5,8 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.135 2016/03/04 13:22:22 fabia * Purpose : Simple CGIs to get information about Privoxy's * status. * - * Copyright : Written by and Copyright (C) 2001-2016 the - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2017 the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -64,9 +63,6 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.135 2016/03/04 13:22:22 fabia #include "client-tags.h" #endif -const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION; - -static char *show_rcs(void); static jb_err show_defines(struct map *exports); static jb_err cgi_show_file(struct client_state *csp, struct http_response *rsp, @@ -275,6 +271,49 @@ jb_err cgi_show_request(struct client_state *csp, #ifdef FEATURE_CLIENT_TAGS +/********************************************************************* + * + * Function : cgi_create_client_tag_form + * + * Description : Creates a HTML form to enable or disable a given + * client tag. + * XXX: Could use a template. + * + * Parameters : + * 1 : form = Buffer to fill with the generated form + * 2 : size = Size of the form buffer + * 3 : tag = Name of the tag this form should affect + * 4 : toggle_state = Desired state after the button pressed 0 + * 5 : expires = Whether or not the tag should be enabled. + * Only checked if toggle_state is 1. + * + * Returns : void + * + *********************************************************************/ +static void cgi_create_client_tag_form(char *form, size_t size, + const char *tag, int toggle_state, int expires) +{ + char *button_name; + + if (toggle_state == 1) + { + button_name = (expires == 1) ? "Enable" : "Enable temporarily"; + } + else + { + assert(toggle_state == 0); + button_name = "Disable"; + } + + snprintf(form, size, + "
", tag, toggle_state, !expires, button_name); +} + /********************************************************************* * * Function : cgi_show_client_tags @@ -300,106 +339,169 @@ jb_err cgi_show_client_tags(struct client_state *csp, struct map *exports; struct client_tag_spec *this_tag; jb_err err = JB_ERR_OK; - const char *toggled_tag; - const char *toggle_state; - const char *tag_expires; - time_t time_to_live; - char *client_tags = strdup_or_die(""); + char *client_tag_status; char buf[1000]; + time_t refresh_delay; assert(csp); assert(rsp); assert(parameters); - if (NULL == (exports = default_exports(csp, "show-client-tags"))) + if (NULL == (exports = default_exports(csp, "client-tags"))) { return JB_ERR_MEMORY; } - - toggled_tag = lookup(parameters, "tag"); - if (*toggled_tag != '\0') - { - tag_expires = lookup(parameters, "expires"); - if (*tag_expires == '0') - { - time_to_live = 0; - } - else - { - time_to_live = csp->config->client_tag_lifetime; - } - toggle_state = lookup(parameters, "toggle-state"); - if (*toggle_state == '1') - { - enable_client_specific_tag(csp, toggled_tag, time_to_live); - } - else - { - disable_client_specific_tag(csp, toggled_tag); - } - } + assert(csp->client_address != NULL); this_tag = csp->config->client_tags; if (this_tag->name == NULL) { - if (!err) err = string_append(&client_tags, "No tags available.
\n"); + client_tag_status = strdup_or_die("No tags available.
\n"); } else { - if (!err) - { - err = string_append(&client_tags, "Tag name | \n" - "Current state | Change state | Description |
---|
Tag name | \n" + "Current state | Change state | Description |
---|---|---|---|
"); - if (!err) err = string_append(&client_tags, this_tag->name); - if (!err) err = string_append(&client_tags, " | "); - if (!err) err = string_append(&client_tags, tag_state == 1 ? "Enabled" : "Disabled"); - snprintf(buf, sizeof(buf), - " | %s", - this_tag->name, !tag_state, tag_state == 1 ? "Disable" : "Enable"); - if (!err) err = string_append(&client_tags, buf); + if (!err) err = string_append(&client_tag_status, " | |
"); + if (!err) err = string_append(&client_tag_status, this_tag->name); + if (!err) err = string_append(&client_tag_status, " | "); + if (!err) err = string_append(&client_tag_status, tag_state == 1 ? "Enabled" : "Disabled"); + if (!err) err = string_append(&client_tag_status, " | "); + cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 1); + if (!err) err = string_append(&client_tag_status, buf); if (tag_state == 0) { - snprintf(buf, sizeof(buf), ". Enable temporarily", - this_tag->name); - if (!err) err = string_append(&client_tags, buf); + cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 0); + if (!err) err = string_append(&client_tag_status, buf); } - if (!err) err = string_append(&client_tags, " | "); - if (!err) err = string_append(&client_tags, this_tag->description); - if (!err) err = string_append(&client_tags, " | "); + if (!err) err = string_append(&client_tag_status, this_tag->description); + if (!err) err = string_append(&client_tag_status, " | \n"); if (err) { - free_map(exports); - return JB_ERR_MEMORY; + break; } this_tag = this_tag->next; } - if (!err) err = string_append(&client_tags, "