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 5642ee168a3d8bfa2d1860e7b5aeb6abbefaa230..bb36f989817eb26c53f2d03857a0f6fa6f3034bd 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -821,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 {
@@ -914,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);