current cgisimple.c,1.140,1.141

Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20517

Modified Files:
	cgisimple.c 
Log Message:
cgi_show_client_tags(): Rename the variable that contains the client tag status


Index: cgisimple.c
===================================================================
RCS file: /cvsroot/ijbswa/current/cgisimple.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** cgisimple.c	8 May 2016 10:46:18 -0000	1.140
--- cgisimple.c	8 May 2016 10:46:29 -0000	1.141
***************
*** 348,352 ****
     const char *tag_expires;
     time_t time_to_live;
!    char *client_tags;
     char buf[1000];
  
--- 348,352 ----
     const char *tag_expires;
     time_t time_to_live;
!    char *client_tag_status;
     char buf[1000];
  
***************
*** 382,394 ****
        }
     }
- 
     this_tag = csp->config->client_tags;
     if (this_tag->name == NULL)
     {
!       client_tags = strdup_or_die("<p>No tags available.</p>\n"));
     }
     else
     {
!       client_tags = strdup_or_die("<table border=\"1\">\n"
           "<tr><th>Tag name</th>\n"
           "<th>Current state</th><th>Change state</th><th>Description</th></tr>\n");
--- 382,393 ----
        }
     }
     this_tag = csp->config->client_tags;
     if (this_tag->name == NULL)
     {
!       client_tag_status = strdup_or_die("<p>No tags available.</p>\n");
     }
     else
     {
!       client_tag_status = strdup_or_die("<table border=\"1\">\n"
           "<tr><th>Tag name</th>\n"
           "<th>Current state</th><th>Change state</th><th>Description</th></tr>\n");
***************
*** 400,418 ****
           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, "<tr><td>");
!          if (!err) err = string_append(&client_tags, this_tag->name);
!          if (!err) err = string_append(&client_tags, "</td><td>");
!          if (!err) err = string_append(&client_tags, tag_state == 1 ? "Enabled" : "Disabled");
!          if (!err) err = string_append(&client_tags, "</td><td>");
           cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 1);
!          if (!err) err = string_append(&client_tags, 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_tags, "</td><td>");
!          if (!err) err = string_append(&client_tags, this_tag->description);
!          if (!err) err = string_append(&client_tags, "</td></tr>\n");
           if (err)
           {
--- 399,417 ----
           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_tag_status, "<tr><td>");
!          if (!err) err = string_append(&client_tag_status, this_tag->name);
!          if (!err) err = string_append(&client_tag_status, "</td><td>");
!          if (!err) err = string_append(&client_tag_status, tag_state == 1 ? "Enabled" : "Disabled");
!          if (!err) err = string_append(&client_tag_status, "</td><td>");
           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)
           {
              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_tag_status, "</td><td>");
!          if (!err) err = string_append(&client_tag_status, this_tag->description);
!          if (!err) err = string_append(&client_tag_status, "</td></tr>\n");
           if (err)
           {
***************
*** 422,429 ****
           this_tag = this_tag->next;
        }
!       if (!err) err = string_append(&client_tags, "</table>\n");
     }
  
!    if (map(exports, "client-tags", 1, client_tags, 0))
     {
        free_map(exports);
--- 421,428 ----
           this_tag = this_tag->next;
        }
!       if (!err) err = string_append(&client_tag_status, "</table>\n");
     }
  
!    if (map(exports, "client-tags", 1, client_tag_status, 0))
     {
        free_map(exports);


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z