I think this restores the previous REST-like behavior of the landing page

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 8a96a13410f84b150b9b329e9dcfe3b69af52b5c..bb36f989817eb26c53f2d03857a0f6fa6f3034bd 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -6,18 +6,12 @@
  * 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.
+ * modify 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
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #define SHOW_ME_VAPPEND_PRINTF
@@ -827,7 +821,13 @@ void display_default_landing_page(void) {
        if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) {
                /* default action */
 
-               if (default_landing_page) {
+               if (havebstr("go")) {
+                       syslog(9, "Explicit room selection: %s", bstr("go"));
+                       StrBuf *teh_room = NewStrBufPlain(bstr("go"), strlen(bstr("go")));
+                       smart_goto(teh_room);
+                       FreeStrBuf(&teh_room);
+               }
+               else if (default_landing_page) {
                        http_redirect(default_landing_page);
                }
                else {
@@ -920,6 +920,7 @@ InitModule_WEBCIT
 {
        char dir[SIZ];
        WebcitAddUrlHandler(HKEY("blank"), "", 0, blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
+       WebcitAddUrlHandler(HKEY("landing"), "", 0, display_default_landing_page, ANONYMOUS|COOKIEUNNEEDED);
        WebcitAddUrlHandler(HKEY("do_template"), "", 0, url_do_template, ANONYMOUS);
        WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY);
        WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0);