X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=8acfc1e2b6b31bf67324b1d86ec02084d6352606;hb=3b76b57d0ff326795a52b48322a91ba43dc13df0;hp=8000af485d069fc64fd4d4895412f965e9e8efd3;hpb=ac5f0d2c606a432e9cf70c0f40a0e86d660c5551;p=privoxy.git diff --git a/cgisimple.c b/cgisimple.c index 8000af48..8acfc1e2 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.137 2016/04/04 10:51:45 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.141 2016/05/08 10:46:29 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 = strdup_or_die(""); + char *client_tag_status; char buf[1000]; assert(csp); @@ -358,7 +358,7 @@ jb_err cgi_show_client_tags(struct client_state *csp, { return JB_ERR_MEMORY; } - + assert(csp->client_address != NULL); toggled_tag = lookup(parameters, "tag"); if (*toggled_tag != '\0') { @@ -381,42 +381,38 @@ 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, "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"); - 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) { free_map(exports); @@ -424,16 +420,16 @@ jb_err cgi_show_client_tags(struct client_state *csp, } this_tag = this_tag->next; } - if (!err) err = string_append(&client_tags, "