Force wiki room views into the wiki viewer instead of a read loop

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 6e30c98d30e2f3f176a2be4df1afdb5cff39ade3..a6cfc33d779090ba261b7e7c573c21eb5f4a9cb0 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,5 +1,21 @@
 /*
  * Functions which deal with the fetching and displaying of messages.
+ *
+ * Copyright (c) 1996-2011 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.
+ *
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -52,7 +68,7 @@ int load_message(message_summary *Msg,
                *Error = NewStrBuf();
                StrBufAppendPrintf(*Error, "<strong>");
                StrBufAppendPrintf(*Error, _("ERROR:"));
-               StrBufAppendPrintf(*Error, "</strong> %s<br />\n", &buf[4]);
+               StrBufAppendPrintf(*Error, "</strong> %s<br>\n", &buf[4]);
                FreeStrBuf(&Buf);
                return 0;
        }
@@ -70,7 +86,7 @@ int load_message(message_summary *Msg,
                                Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
                                StrBufAppendPrintf(Msg->MsgBody->Data, "<div><i>");
                                StrBufAppendPrintf(Msg->MsgBody->Data, _("Empty message"));
-                               StrBufAppendPrintf(Msg->MsgBody->Data, "</i><br /><br />\n");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "</i><br><br>\n");
                                StrBufAppendPrintf(Msg->MsgBody->Data, "</div>\n");
                        }
                        break;
@@ -749,6 +765,11 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
                return;
        }
 
+       if (WCC->CurRoom.view == VIEW_WIKI) {
+               http_redirect("wiki?page=home");
+               return;
+       }
+
        memset(&Stat, 0, sizeof(SharedMessageStatus));
        Stat.maxload = 10000;
        Stat.lowest_found = (-1);
@@ -1422,7 +1443,7 @@ void display_enter(void)
                        }
                }
                else if (buf[0] != '2') {       /* Any other error means that we cannot continue */
-                       wc_printf("<em>%s</em><br />\n", &buf[4]);      /* TODO -> important message */
+                       wc_printf("<em>%s</em><br>\n", &buf[4]);        /* TODO -> important message */
                        return;
                }
        }
@@ -1509,7 +1530,7 @@ void confirm_move_msg(void)
        wc_printf("<CENTER>");
 
        wc_printf(_("Move this message to:"));
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("<form METHOD=\"POST\" action=\"move_msg\">\n");
        wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -1527,7 +1548,7 @@ void confirm_move_msg(void)
                }
        }
        wc_printf("</SELECT>\n");
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        wc_printf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
        wc_printf("&nbsp;");