X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=a47ef792647fb93eb6f362d5986256cc0d9d21fa;hp=34cc5819b3a56262c6f9cff578eb7e63c5c30642;hb=67a4fa138becd0e2fe5adca3383e4efa03472c93;hpb=80b8fdfab0b5828b0a3cbdf7093c710fbde0306e diff --git a/cgisimple.c b/cgisimple.c index 34cc5819..a47ef792 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.139 2016/05/08 10:44:39 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 $ @@ -347,7 +347,7 @@ 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; + char *client_tag_status; char buf[1000]; assert(csp); @@ -381,15 +381,14 @@ 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) { - client_tags = strdup_or_die("

No tags available.

\n")); + client_tag_status = strdup_or_die("

No tags available.

\n"); } else { - client_tags = strdup_or_die("\n" + client_tag_status = strdup_or_die("
\n" "\n" "\n"); while ((this_tag != NULL) && (this_tag->name != NULL)) @@ -399,21 +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); @@ -421,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"); - if (!err) err = string_append(&client_tags, ""); + 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_tags, buf); + if (!err) err = string_append(&client_tag_status, buf); if (tag_state == 0) { cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 0); - if (!err) err = string_append(&client_tags, buf); + 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;