X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Futils_cgi.c;h=4c88151dec7844ff18165c67d868cea5122b2b11;hp=785191422c9e449a2d85995581a53675dbf3f26a;hb=48c757c9633d61cf158d08f57f592f1c3169e8ac;hpb=1ca9e6ca7959d20780bb3bc336404549156415c7

diff --git a/src/utils_cgi.c b/src/utils_cgi.c
index 7851914..4c88151 100644
--- a/src/utils_cgi.c
+++ b/src/utils_cgi.c
@@ -433,10 +433,16 @@ char *uri_escape_copy (char *dest, const char *src, size_t n) /* {{{ */
     }
     else if ((((unsigned char) src[in]) < 32)
         || (src[in] == ' ')
-        || (src[in] == '&')
-        || (src[in] == ';')
-        || (src[in] == '?')
-        || (src[in] == '/')
+        /* RFC 3986, gen-delims */
+        || (src[in] == ':') || (src[in] == '/') || (src[in] == '?')
+        || (src[in] == '#') || (src[in] == '[') || (src[in] == ']')
+        || (src[in] == '@')
+        /* RFC 3986, sub-delims */
+        || (src[in] == '!') || (src[in] == '$') || (src[in] == '&')
+        || (src[in] == '(') || (src[in] == ')') || (src[in] == '*')
+        || (src[in] == '+') || (src[in] == ',') || (src[in] == ';')
+        || (src[in] == '=') || (src[in] == '\'')
+        /* 8-bit data */
         || (((unsigned char) src[in]) >= 128))
     {
       char esc[4];
@@ -681,10 +687,12 @@ int html_print_page (const char *title, /* {{{ */
   printf ("<html>\n"
       "  <head>\n"
       "    <title>%s</title>\n"
-      "    <link rel=\"stylesheet\" type=\"text/css\" href=\"../share/style.css\" />\n"
-      "    <script type=\"text/javascript\" src=\"../share/jquery-1.4.2.min.js\">\n"
+      "    <link rel=\"stylesheet\" type=\"text/css\" href=\"../../share/"PACKAGE"/style.css\" />\n"
+      "    <script type=\"text/javascript\" src=\"../../share/"PACKAGE"/jquery-1.4.2.min.js\">\n"
       "    </script>\n"
-      "    <script type=\"text/javascript\" src=\"../share/collection.js\">\n"
+      "    <script type=\"text/javascript\" src=\"../../share/"PACKAGE"/highcharts.js\">\n"
+      "    </script>\n"
+      "    <script type=\"text/javascript\" src=\"../../share/"PACKAGE"/collection.js\">\n"
       "    </script>\n"
       "  </head>\n",
       title_html);
@@ -738,7 +746,7 @@ int html_print_page (const char *title, /* {{{ */
   printf ("</td>\n"
       "      </tr>\n"
       "    </table>\n"
-      "    <div class=\"footer\">"PACKAGE_STRING"</div>\n"
+      "    <div class=\"footer\"><a href=\"http://octo.it/c4/\">"PACKAGE_STRING"</a></div>\n"
       "  </body>\n"
       "</html>\n");
 
@@ -751,7 +759,7 @@ int html_print_logo (__attribute__((unused)) void *user_data) /* {{{ */
   printf ("<a href=\"%s?action=list_graphs\" id=\"logo-canvas\">\n"
       "  <h1>C<sub>4</sub></h1>\n"
       "  <div id=\"logo-subscript\">collection&nbsp;4</div>\n"
-      "</a>\n");
+      "</a>\n", script_name ());
 
   return (0);
 } /* }}} int html_print_search_box */
