X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=6e4f0d42c18d45f2a8f5de12ffd9167e52ecd43e;hb=7a68173fb6818d30bf2335d40970e38adc259588;hp=b6fc0394fe439d5e1bd0f9dcfcdf793869f41fc3;hpb=4c1798b95e26af39a18a36a3ffdd61d35bd60ea0;p=collection4.git diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c index b6fc039..6e4f0d4 100644 --- a/src/action_list_graphs.c +++ b/src/action_list_graphs.c @@ -7,7 +7,7 @@ #include "graph.h" #include "graph_ident.h" #include "graph_list.h" -#include "utils_params.h" +#include "utils_cgi.h" #include #include @@ -85,19 +85,23 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */ memset (desc, 0, sizeof (desc)); graph_get_title (cfg, desc, sizeof (desc)); + html_escape_buffer (desc, sizeof (desc)); - printf ("
  • %s\n
      \n", desc); + printf ("
    • %s\n" + "
        \n", desc); data->cfg = cfg; } memset (params, 0, sizeof (params)); inst_get_params (cfg, inst, params, sizeof (params)); + html_escape_buffer (params, sizeof (params)); memset (desc, 0, sizeof (desc)); inst_describe (cfg, inst, desc, sizeof (desc)); + html_escape_buffer (desc, sizeof (desc)); - printf ("
      • %s
        • \n", + printf ("
      • %s
        • \n", script_name (), params, desc); if (data->limit > 0) @@ -113,6 +117,12 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */ static int list_graphs_html (const char *term) /* {{{ */ { callback_data_t data = { NULL, /* limit = */ 20 }; + char *term_html; + + term_html = NULL; + if (term != NULL) + term_html = html_escape (term); + printf ("Content-Type: text/html\n\n"); printf ("\n \n"); @@ -120,6 +130,7 @@ static int list_graphs_html (const char *term) /* {{{ */ printf (" c4: Graphs matching "%s"\n", term); else printf (" c4: List of all graphs\n"); + printf (" \n"); printf (" \n \n"); printf ("
        \n" @@ -127,9 +138,11 @@ static int list_graphs_html (const char *term) /* {{{ */ " \n" " \n" "
        \n", - script_name (), (term != NULL) ? term : ""); + script_name (), (term_html != NULL) ? term_html : ""); + + free (term_html); - printf ("
          \n"); + printf ("
            \n"); if (term == NULL) gl_instance_get_all (print_graph_inst_html, /* user_data = */ &data); else