X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=a47ef792647fb93eb6f362d5986256cc0d9d21fa;hp=faa70da843268e6d612dbd971e4b08c7a9e04065;hb=7cffc51606453083eb5ac1ddeb726d0569991e5f;hpb=d6f6d40eb51a7a7f491c5c027f83bbd7f44c009f diff --git a/cgisimple.c b/cgisimple.c index faa70da8..a47ef792 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.135 2016/03/04 13:22:22 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.140 2016/05/08 10:46:18 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -275,6 +275,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, + "
\n" + " \n" + " \n" + " \n" + " \n" + "
", tag, toggle_state, !expires, button_name); +} + /********************************************************************* * * Function : cgi_show_client_tags @@ -304,14 +347,14 @@ jb_err cgi_show_client_tags(struct client_state *csp, 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]; 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; } @@ -338,20 +381,16 @@ jb_err cgi_show_client_tags(struct client_state *csp, disable_client_specific_tag(csp, toggled_tag); } } - 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, "\n" - "\n" - "\n"); - } + client_tag_status = strdup_or_die("
Tag nameCurrent stateChange stateDescription
\n" + "\n" + "\n"); while ((this_tag != NULL) && (this_tag->name != NULL)) { int tag_state; @@ -359,24 +398,21 @@ jb_err cgi_show_client_tags(struct client_state *csp, privoxy_mutex_lock(&client_tags_mutex); tag_state = client_has_requested_tag(csp->ip_addr_str, this_tag->name); privoxy_mutex_unlock(&client_tags_mutex); - if (!err) err = string_append(&client_tags, "\n"); + if (!err) err = string_append(&client_tag_status, "\n"); if (err) { free_map(exports); @@ -384,10 +420,10 @@ jb_err cgi_show_client_tags(struct client_state *csp, } this_tag = this_tag->next; } - if (!err) err = string_append(&client_tags, "
Tag nameCurrent stateChange stateDescription
"); - 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) err = string_append(&client_tag_status, "\n"); } - if (map(exports, "client-tags", 1, client_tags, 0)) + if (map(exports, "client-tags", 1, client_tag_status, 0)) { free_map(exports); return JB_ERR_MEMORY; @@ -399,7 +435,7 @@ jb_err cgi_show_client_tags(struct client_state *csp, return JB_ERR_MEMORY; } - return template_fill_for_cgi(csp, "show-client-tags", exports, rsp); + return template_fill_for_cgi(csp, "client-tags", exports, rsp); } #endif /* def FEATURE_CLIENT_TAGS */ @@ -1675,6 +1711,14 @@ static jb_err show_defines(struct map *exports) }; static const struct feature features[] = { + { + "FEATURE_64_BIT_TIME_T", +#if (SIZEOF_TIME_T == 8) + 1, +#else + 0, +#endif + }, { "FEATURE_ACCEPT_FILTER", #ifdef FEATURE_ACCEPT_FILTER