From: Art Cancro <ajc@uncensored.citadel.org>
Date: Thu, 9 Feb 2012 20:13:58 +0000 (-0500)
Subject: When the root page is requested, replace it with a request for '/landing' which calls... 
X-Git-Tag: v8.11~195^2
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=20524787ef32996d36ddbcfbca8648328865dad2

When the root page is requested, replace it with a request for '/landing' which calls display_default_landing_page().  This will perform the correct action for both public and private systems.
---

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index bcab1154c..e9f940195 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -334,10 +334,9 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
 		);
 	}
 	else {
-		Hdr->HR.DontNeedAuth = 1; /* Flat request? show him the login screen... */
-		StrBuf *NewLine = NewStrBufPlain(HKEY("GET /do_template?template=login"));
-		StrBufUrlescAppend(NewLine, Buf, NULL);
-		StrBufAppendBufPlain(NewLine, HKEY(" HTTP/1.0"), 0);
+		/* If this is a "flat" request for the root, display the configured landing page. */
+		Hdr->HR.DontNeedAuth = 1;
+		StrBuf *NewLine = NewStrBufPlain(HKEY("GET /landing HTTP/1.0"));
 		syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
 		int return_value = ReadHttpSubject(Hdr, NewLine, Buf);
 		FreeStrBuf(&NewLine);
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 5642ee168..94dda267c 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -914,6 +914,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);