* hunt down &'s that should be ?'s in URLs

diff --git a/webcit/floors.c b/webcit/floors.c
index 78227221b6f5353de6cd27b9ce667ae38894347c..5397cd3195fe3a97b02d7135ff2b378210147c8c 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -81,7 +81,7 @@ void display_floorconfig(StrBuf *prepend_html)
                        wprintf("</A></FONT><br />");
                }
                wprintf("<FONT SIZE=-1>"
-                       "<a href=\"display_editfloorpic&"
+                       "<a href=\"display_editfloorpic?"
                        "which_floor=%d\">", floornum);
                wprintf(_("(edit graphic)"));
                wprintf("</A></TD></TR></TABLE>");

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 6aab9381ae1392e6d66b22ceb4b602fa0d611668..9e1170df66dbcfd3840cc8581881cdf387f0aab4 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -48,7 +48,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
        wprintf(_("Please select a file to upload:"));
        wprintf("<input type=\"file\" name=\"filename\" size=\"35\">\n");
 
-       wprintf("<div class=\"uploadpic\"><img src=\"image&name=%s\"></div>\n", filename);
+       wprintf("<div class=\"uploadpic\"><img src=\"image?name=%s\"></div>\n", filename);
 
        wprintf("<div class=\"buttons\">");
        wprintf("<input type=\"submit\" name=\"upload_button\" value=\"%s\">\n", _("Upload"));

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 1fcca946e576aa04b8c714923fa8be15f8be71a8..4258ef51542452b22689f7833081640cae04a768 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -162,7 +162,7 @@ void room_tree_list(struct roomlisting *rp)
        strcpy(rmname, rp->rlname);
        f = rp->rlflags;
 
-       wprintf("<a href=\"dotgoto&room=");
+       wprintf("<a href=\"dotgoto?room=");
        urlescputs(rmname);
        wprintf("\"");
        wprintf(">");
@@ -357,7 +357,7 @@ void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
        serv_puts("OIMG _roompic_");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
-               wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
+               wprintf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
                urlescputs(ChrPtr(WC->wc_roomname));
                wprintf("\">");
                serv_puts("CLOS");
@@ -505,7 +505,7 @@ void embed_room_banner(char *got, int navbar_style) {
        if (WCC->Hdr->this_page == NULL)
                WCC->Hdr->this_page = NewStrBuf();
        StrBufPrintf(WCC->Hdr->this_page, 
-                    "dotskip&room=%s",
+                    "dotskip?room=%s",
                     ChrPtr(WC->wc_roomname));
 
        /** Check for new mail. */
@@ -1221,7 +1221,7 @@ void display_editroom(void)
                wprintf(_("Administration"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=admin\">");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
                wprintf(_("Administration"));
                wprintf("</a>");
        }
@@ -1236,7 +1236,7 @@ void display_editroom(void)
                        wprintf(_("Configuration"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
                        wprintf(_("Configuration"));
                        wprintf("</a>");
                }
@@ -1249,7 +1249,7 @@ void display_editroom(void)
                        wprintf(_("Message expire policy"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
                        wprintf(_("Message expire policy"));
                        wprintf("</a>");
                }
@@ -1262,7 +1262,7 @@ void display_editroom(void)
                        wprintf(_("Access controls"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
                        wprintf(_("Access controls"));
                        wprintf("</a>");
                }
@@ -1275,7 +1275,7 @@ void display_editroom(void)
                        wprintf(_("Sharing"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
                        wprintf(_("Sharing"));
                        wprintf("</a>");
                }
@@ -1288,7 +1288,7 @@ void display_editroom(void)
                        wprintf(_("Mailing list service"));
                }
                else {
-                       wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+                       wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
                        wprintf(_("Mailing list service"));
                        wprintf("</a>");
                }
@@ -1303,7 +1303,7 @@ void display_editroom(void)
                wprintf(_("Remote retrieval"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=feeds\">");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
                wprintf(_("Remote retrieval"));
                wprintf("</a>");
        }
@@ -1753,7 +1753,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
                                        urlescputs(recp);
                                        wprintf("\">");
                                        wprintf(_("(remove)"));
@@ -1783,7 +1783,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
                                                "digestrecp|");
                                        urlescputs(recp);
                                        wprintf("\">");
@@ -2007,7 +2007,7 @@ void display_editroom(void)
                                        wprintf("<td>%ld</td>", extract_long(buf, 5));  /* Fetching interval */
                        
                                        wprintf("<td class=\"button_link\">");
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
                                        urlescputs(recp);
                                        wprintf("\">");
                                        wprintf(_("(remove)"));
@@ -2074,7 +2074,7 @@ void display_editroom(void)
                                        wprintf("</td>");
 
                                        wprintf("<td class=\"button_link\">");
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
                                        urlescputs(recp);
                                        wprintf("\">");
                                        wprintf(_("(remove)"));
@@ -3700,13 +3700,13 @@ void knrooms(void)
                "OnChange=\"location.href=roomlistomatic.newview.options"
                "[selectedIndex].value\">\n");
 
-       wprintf("<option %s value=\"knrooms&view=rooms\">"
+       wprintf("<option %s value=\"knrooms?view=rooms\">"
                "View as room list"
                "</option>\n",
                ( !strcasecmp(ChrPtr(ListView), "rooms") ? "SELECTED" : "" )
                );
 
-       wprintf("<option %s value=\"knrooms&view=folders\">"
+       wprintf("<option %s value=\"knrooms?view=folders\">"
                "View as folder list"
                "</option>\n",
                ( !strcasecmp(ChrPtr(ListView), "folders") ? "SELECTED" : "" )

diff --git a/webcit/static/t/iconbar_edit.html b/webcit/static/t/iconbar_edit.html
index 883885da00b754151e4aa20548bab52b71954300..3a4b3ba5ae9564a3fdbd027ad8dd54ff323c4722 100644 (file)
--- a/webcit/static/t/iconbar_edit.html
+++ b/webcit/static/t/iconbar_edit.html
@@ -21,7 +21,7 @@
 <tr class="even"><td>
 <input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_logo", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 <input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_logo", 0, "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="image&name=hello" width="48" alt="&nbsp;">
+</td><td><img src="image?name=hello" width="48" alt="&nbsp;">
 </td><td><b><?_("Site logo")></b><br /><?_("An icon describing this site")></td></tr>
 
 <tr class="odd"><td>

diff --git a/webcit/static/t/login.m.html b/webcit/static/t/login.m.html
index e05027bcdde52cd6ac6b67d2f6bba4c1125a86a7..a5b71f86f8cae1455bfda894f66b4b718ebe5ff3 100644 (file)
--- a/webcit/static/t/login.m.html
+++ b/webcit/static/t/login.m.html
@@ -17,6 +17,6 @@
         </div>
 </form>
 <?OFFER_OPENID_LOGIN>
-<div class="login_image"><img src="image&name=hello"></div>
+<div class="login_image"><img src="image?name=hello"></div>
 <div class="login_infos"><?LOGIN_INSTRUCTIONS></div>
 

diff --git a/webcit/static/t/menubar.html b/webcit/static/t/menubar.html
index 2846422d272b7173f9041434560a7695e827bd9b..4f16b8f7cdd890d0bc0ed6c42fdcb4466b1b81f0 100644 (file)
--- a/webcit/static/t/menubar.html
+++ b/webcit/static/t/menubar.html
@@ -8,7 +8,7 @@
 </script>
 
 <center>
-<img src="image&name=hello"><br /><br />
+<img src="image?name=hello"><br /><br />
 
 <table border="0" cellspacing="0" cellpadding="2">
 <tr>

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 83d82e3cf10b1606367bd2c746949dac7ffe772a..e1c05c49cc00297863a7b64cd3e4a36922647f86 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -76,7 +76,7 @@ void userlist(void)
                        (bg ? "DDDDDD" : "FFFFFF")
                );
                if (has_bio) {
-                       wprintf("<a href=\"showuser&who=");
+                       wprintf("<a href=\"showuser?who=");
                        urlescputs(fl);
                        wprintf("\">");
                        escputs(fl);
@@ -140,7 +140,7 @@ void showuser(void)
 
        wprintf("<center><table><tr><td>");
        if (have_pic == 1) {
-               wprintf("<img src=\"image&name=_userpic_&parm=");
+               wprintf("<img src=\"image?name=_userpic_&parm=");
                urlescputs(who);
                wprintf("\">");
        }