X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fhtml2html.c;h=965dc55d69bc57ea9458068f8d19602897b261aa;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=7281eb64026fd5eecd6b98738688533a79603d0f;hpb=6984213c936384e82cca051f017f0cacda0cd066;p=citadel.git

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 7281eb640..965dc55d6 100644
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -2,20 +2,15 @@
  * Output an HTML message, modifying it slightly to make sure it plays nice
  * with the rest of our web framework.
  *
- * Copyright (c) 2005-2010 by the citadel.org team
+ * Copyright (c) 2005-2012 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
  */
 
 #include "webcit.h"
@@ -393,9 +388,16 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
 				StrBufAppendPrintf(converted_msg, new_window);
 				ptr = &ptr[8];
 			}
-			else if ( (treat_as_wiki) && (strncasecmp(ptr, "<a href=\"wiki?", 14)) ) {
+			else if (
+				(treat_as_wiki)
+				&& (strncasecmp(ptr, "<a href=\"wiki?", 14))
+				&& (strncasecmp(ptr, "<a href=\"dotgoto?", 17))
+				&& (strncasecmp(ptr, "<a href=\"knrooms?", 17))
+			) {
 				content_length += 64;
-				StrBufAppendPrintf(converted_msg, "<a href=\"wiki?page=");
+				StrBufAppendPrintf(converted_msg, "<a href=\"wiki?go=");
+				StrBufUrlescAppend(converted_msg, WC->CurRoom.name, NULL);
+				StrBufAppendPrintf(converted_msg, "?page=");
 				ptr = &ptr[9];
 			}
 			else {
@@ -414,7 +416,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
 			if (!tag_end) {
 				syslog(9, "tag_end is null and ptr is:\n");
 				syslog(9, "%s\n", ptr);
-				syslog(9, "Theoretical bytes remaining: %ld\n", msgend - ptr);
+				syslog(9, "Theoretical bytes remaining: %d\n", (int)(msgend - ptr));
 			}
 
 			src=strstr(ptr, "src=\"cid:");