* Changed some of the '&' between url parameters to '?' (ongoing)

diff --git a/webcit/html2html.c b/webcit/html2html.c
index dea5647c7c00b2a9d797b1fff7278e0f1d25674d..1daf7b4103218872572b09c5e9186b3d27f10485 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -369,7 +369,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
                if (!strncasecmp(ptr, "<a href=\"mailto:", 16)) {
                        content_length += 64;
                        StrBufAppendPrintf(converted_msg,
-                                       "<a href=\"display_enter?force_room=_MAIL_&recp=");
+                                       "<a href=\"display_enter?force_room=_MAIL_?recp=");
                        ptr = &ptr[16];
                        ++alevel;
                        ++brak;

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 5c029823e085dbed1162a10758f9a5b7cdcfd535..59ecb1e5f23be5aa6d282b5047ba0281415a0465 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -495,7 +495,7 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
                        || (!strcasecmp(&(ChrPtr(WCC->wc_roomname)[11]), USERCONFIGROOM))
                        || (WC->wc_view == VIEW_ADDRESSBOOK)
                        ) {
-                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
+                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
                                Mime->msgnum, ChrPtr(Mime->PartNum));
                        StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
                }

diff --git a/webcit/roomops.c b/webcit/roomops.c
index a1b69f85b505495e8db3887770c7425fdcd36961..a60efb03efe126071902521b440236bc56f1139f 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1560,7 +1560,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=listserv?line=listrecp|");
                                        urlescputs(recp);
                                        wc_printf("\">");
                                        wc_printf(_("(remove)"));
@@ -1590,7 +1590,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=listserv?line="
                                                "digestrecp|");
                                        urlescputs(recp);
                                        wc_printf("\">");
@@ -1814,7 +1814,7 @@ void display_editroom(void)
                                        wc_printf("<td>%ld</td>", extract_long(buf, 5));        /* Fetching interval */
                        
                                        wc_printf("<td class=\"button_link\">");
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=feeds?line=pop3client|");
                                        urlescputs(recp);
                                        wc_printf("\">");
                                        wc_printf(_("(remove)"));
@@ -1881,7 +1881,7 @@ void display_editroom(void)
                                        wc_printf("</td>");
 
                                        wc_printf("<td class=\"button_link\">");
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=feeds?line=rssclient|");
                                        urlescputs(recp);
                                        wc_printf("\">");
                                        wc_printf(_("(remove)"));

diff --git a/webcit/static/t/aide_usermanagement.html b/webcit/static/t/aide_usermanagement.html
index e5dc4b4a2578d5791fc011e549bd8fcbea0fb76c..de19db9a499aaf1d3f4c80c7514f82132bb61255 100644 (file)
--- a/webcit/static/t/aide_usermanagement.html
+++ b/webcit/static/t/aide_usermanagement.html
@@ -1,4 +1,4 @@
 <ul class="adminitems">
-<li><a href="select_user_to_edit?SortBy=user:name&SortOrder=1"><?_("Add, change, delete user accounts")></a></li>
+<li><a href="select_user_to_edit?SortBy=user:name?SortOrder=1"><?_("Add, change, delete user accounts")></a></li>
 <li><a href="validate"><?_("Validate new users")></a></li>
 </ul>

diff --git a/webcit/static/t/files.html b/webcit/static/t/files.html
index 5a18fec0a7370483ca4666d9694d4a3c228272a2..7becd4de47450769c95f1c9b1978a5bfe21b9835 100644 (file)
--- a/webcit/static/t/files.html
+++ b/webcit/static/t/files.html
@@ -15,10 +15,10 @@
 
 <table class="downloads_background">
 <tr>
-  <th><?_("Filename")>&nbsp;<a href="do_template?template=files&SortOrder=<?SORT:ORDER("filename")>&SortBy=<?SORT:NEXT("filename")>"><img border="0" src="<?SORT:ICON("filename")>" /></a> </th>
-  <th><?_("Size")>&nbsp;<a href="do_template?template=files&SortOrder=<?SORT:ORDER("filesize")>&SortBy=<?SORT:NEXT("filesize")>"><img border="0" src="<?SORT:ICON("filesize")>" /></a> </th>
-  <th><?_("Content")>&nbsp;<a href="do_template?template=files&SortOrder=<?SORT:ORDER("filemime")>&SortBy=<?SORT:NEXT("filemime")>"><img border="0" src="<?SORT:ICON("filemime")>" /></a> </th>
-  <th><?_("Description")>&nbsp;<a href="do_template?template=files&SortOrder=<?SORT:ORDER("filesubject")>&SortBy=<?SORT:NEXT("filesubject")>"><img border="0" src="<?SORT:ICON("filesubject")>" /></a> </th>
+  <th><?_("Filename")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filename")>&SortBy=<?SORT:NEXT("filename")>"><img border="0" src="<?SORT:ICON("filename")>" /></a> </th>
+  <th><?_("Size")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesize")>&SortBy=<?SORT:NEXT("filesize")>"><img border="0" src="<?SORT:ICON("filesize")>" /></a> </th>
+  <th><?_("Content")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filemime")>&SortBy=<?SORT:NEXT("filemime")>"><img border="0" src="<?SORT:ICON("filemime")>" /></a> </th>
+  <th><?_("Description")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesubject")>&SortBy=<?SORT:NEXT("filesubject")>"><img border="0" src="<?SORT:ICON("filesubject")>" /></a> </th>
 </tr>
 <?ITERATE("ROOM:FILES", "section_files_onefile")>
 

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index f0682e42eac4cac0fc65efd7b4459a897b074e99..bcbd21f5ee22720eae332a2cf69a600974dc8c8a 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -38,7 +38,7 @@
 </a>
 </li>
 <li id="ib_rooms" class="ib_button">
-<a class="ib_button_link" href="knrooms?template=knrooms&SortBy=byfloorroom&SortOrder=1" title="<?_("List all your accessible rooms")>"><span>
+<a class="ib_button_link" href="knrooms?template=knrooms?SortBy=byfloorroom?SortOrder=1" title="<?_("List all your accessible rooms")>"><span>
 <?_("Rooms")></span>
 </a>
 </li>

diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html
index 5081b54504fad4785cd20c00c668c26a0057db87..0c1d0ce11d736c1955dcc32d6e1ccf8f2016ba42 100644 (file)
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -16,8 +16,8 @@
        <select name="newview" size="1" 
 OnChange="location.href=roomlistomatic.newview.options[selectedIndex].value">
 
-<option <?%("COND:PREF", 1, "roomlistview", "rooms", "SELECTED", "")> value="knrooms?view=rooms&template=knrooms&SortBy=byfloorroom&SortOrder=1"><?_("View as room list")></option>
-<option <?%("COND:PREF", 1, "roomlistview", "folders", "SELECTED", "")> value="knrooms?view=folders&template=knrooms&SortBy=byfloorroom&SortOrder=1"><?_("View as folder list")></option>
+<option <?%("COND:PREF", 1, "roomlistview", "rooms", "SELECTED", "")> value="knrooms?view=rooms?template=knrooms?SortBy=byfloorroom?SortOrder=1"><?_("View as room list")></option>
+<option <?%("COND:PREF", 1, "roomlistview", "folders", "SELECTED", "")> value="knrooms?view=folders?template=knrooms?SortBy=byfloorroom?SortOrder=1"><?_("View as folder list")></option>
 <?%("COND:PREF", 1, "roomlistview", "table", "SELECTED", "")>
 </select>
 

diff --git a/webcit/static/t/msg_listselector_bottom.html b/webcit/static/t/msg_listselector_bottom.html
index 49cbe68fc656bfd93bd33249bc3ac5c902897d75..714b697ea8c48a619de6282d64375c5f2b3d7bae 100644 (file)
--- a/webcit/static/t/msg_listselector_bottom.html
+++ b/webcit/static/t/msg_listselector_bottom.html
@@ -6,7 +6,7 @@
 </select>
 <?_("of")> <?SUMM:COUNT> <?_("messages")>
 <input type="radio" name="direction" value="" 
-  OnChange="location.href='<?URLPART(0)>?SortBy=date&SortOrder=1'"
+  OnChange="location.href='<?URLPART(0)>?SortBy=date?SortOrder=1'"
   <?%("COND:BSTR", 1, "SortOrder", 1, "checked", "")>
 >
 <?_("oldest to newest")> 
@@ -14,7 +14,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;
 
 <input type="radio" name="direction" value="" 
-  OnChange="location.href='<?URLPART(0)>?SortBy=date&SortOrder=2'"
+  OnChange="location.href='<?URLPART(0)>?SortBy=date?SortOrder=2'"
   <?%("COND:BSTR", 1, "SortOrder", 2, "checked", "")>
 >
 <?_("newest to oldest")>

diff --git a/webcit/static/t/msg_listselector_top.html b/webcit/static/t/msg_listselector_top.html
index bf0fd0377c822461667410441bb2e19fe663e322..b4d6b8aaf5f11c7342ecae9581596693bd7a4b77 100644 (file)
--- a/webcit/static/t/msg_listselector_top.html
+++ b/webcit/static/t/msg_listselector_top.html
@@ -6,7 +6,7 @@
 </select>
 <?_("of")> <?SUMM:COUNT> <?_("messages")>
 <input type="radio" name="direction" value="" 
-  OnChange="location.href='<?URLPART(0)>?SortBy=date&SortOrder=1'"
+  OnChange="location.href='<?URLPART(0)>?SortBy=date?SortOrder=1'"
   <?%("COND:BSTR", 1, "SortOrder", 1, "checked", "")>
 >
 <?_("oldest to newest")> 
@@ -14,7 +14,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;
 
 <input type="radio" name="direction" value="" 
-  OnChange="location.href='<?URLPART(0)>?SortBy=date&SortOrder=2'"
+  OnChange="location.href='<?URLPART(0)>?SortBy=date?SortOrder=2'"
   <?%("COND:BSTR", 1, "SortOrder", 2, "checked", "")>
 >
 <?_("newest to oldest")>