#include <stdio.h>
#include <stdarg.h>
#include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
#include "webserver.h"
StrBuf *csslocal = NULL;
HashList *HandlerHash = NULL;
+void stuff_to_cookie(int unset_cookie);
+int GetConnected(void);
+
+
void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt)
{
wcsession *WCC = WC;
{
if (print_standard_html_footer) {
wc_printf("</div> <!-- end of 'content' div -->\n");
- do_template("trailing", NULL);
+ do_template("trailing");
}
/* If we've been saving it all up for one big output burst,
if (do_htmlhead) {
begin_burst();
- do_template("head", NULL);
+ do_template("head");
/* check for ImportantMessages (these display in a div overlaying the main screen) */
- if (!IsEmptyStr(WCC->ImportantMessage)) {
- wc_printf("<div id=\"important_message\">\n"
- "<span class=\"imsg\">");
- StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
- wc_printf("</span><br>\n"
- "</div>\n"
- );
- StrBufAppendBufPlain(WCC->trailing_javascript,
- HKEY("setTimeout('hide_imsg_popup()', 5000); \n"),
- 0
- );
- WCC->ImportantMessage[0] = 0;
- }
- else if (StrLength(WCC->ImportantMsg) > 0) {
+ if (StrLength(WCC->ImportantMsg) > 0) {
wc_printf("<div id=\"important_message\">\n"
"<span class=\"imsg\">");
StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
/*
* convenience function to indicate success
*/
-void display_success(char *successmessage)
+void display_success(const char *successmessage)
{
convenience_page("007700", "OK", successmessage);
}
if (WCC->ImportantMsg != NULL)
message = ChrPtr(WCC->ImportantMsg);
- else if (WCC->ImportantMessage != NULL)
- message = WCC->ImportantMessage;
wc_printf(_("The resource you requested requires a valid username and password. "
"You could not be logged in: %s\n"), message);
}
case 1:
while (!Done) {
- StrBuf_ServGetln(Buf);
+ if (StrBuf_ServGetln(Buf) < 0)
+ break;
if ( (StrLength(Buf)==3) &&
!strcmp(ChrPtr(Buf), "000")) {
Done = 1;
* This is kind of an ugly hack, but this is the only place it can go.
* If the command was GEXP, then the instant messenger window must be
* running, so reset the "last_pager_check" watchdog timer so
- * that page_popup() doesn't try to open it a second time.
+ * that page_popup() doesn't try to open it a second time. TODO: page_popup isn't with us anymore.
*/
if (!strncasecmp(bstr("g_cmd"), "GEXP", 4)) {
WCC->last_pager_check = time(NULL);
*/
void session_loop(void)
{
- int Flags = 0;
int xhttp;
StrBuf *Buf;
WCC->upload_length = 0;
WCC->upload = NULL;
WCC->Hdr->nWildfireHeaders = 0;
- if (WCC->Hdr->HR.Handler != NULL)
- Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */
if (WCC->Hdr->HR.ContentLength > 0) {
if (ReadPostData() < 0) {
*/
else {
if (xhttp)
- groupdav_main();
+ dav_main();
else
display_main_menu();
}
wcsession *WCC = WC;
if (WCC && WCC->serv_info && WCC->serv_info->serv_supports_guest) {
- /* default action. probably revisit this. */
- StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_"));
- smart_goto(teh_lobby);
- FreeStrBuf(&teh_lobby);
+ /* default action */
+
+ if (default_landing_page) {
+ http_redirect(default_landing_page);
+ }
+ else {
+ StrBuf *teh_lobby = NewStrBufPlain(HKEY("_BASEROOM_"));
+ smart_goto(teh_lobby);
+ FreeStrBuf(&teh_lobby);
+ }
}
else {
display_login();
{
wcsession *WCC = WC;
if (WCC != NULL)
- return ((!IsEmptyStr(WCC->ImportantMessage)) ||
- (StrLength(WCC->ImportantMsg) > 0));
+ return (StrLength(WCC->ImportantMsg) > 0);
else
return 0;
}
wcsession *WCC = WC;
if (WCC != NULL) {
- if (!IsEmptyStr(WCC->ImportantMessage)) {
- StrEscAppend(Target, NULL, WCC->ImportantMessage, 0, 0);
- WCC->ImportantMessage[0] = '\0';
- }
- else if (StrLength(WCC->ImportantMsg) > 0) {
+ if (StrLength(WCC->ImportantMsg) > 0) {
StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0);
FlushStrBuf(WCC->ImportantMsg);
}
csslocal, 0);
}
+void tmplput_packagestring(StrBuf *Target, WCTemplputParams *TP)
+{
+ StrBufAppendBufPlain(Target,
+ HKEY(PACKAGE_STRING), 0);
+}
+
extern char static_local_dir[PATH_MAX];
RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE);
RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE);
+ RegisterNamespace("PACKAGESTRING", 0, 1, tmplput_packagestring, NULL, CTX_NONE);
snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);