{
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- do_template("login", NULL);
+ do_template("login");
end_burst();
}
if (havebstr("exit_action")) {
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- do_template("authpopup_finished", NULL);
+ do_template("authpopup_finished");
end_burst();
return;
}
if (WC->logged_in) {
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- do_template("authpopup_finished", NULL);
+ do_template("authpopup_finished");
end_burst();
}
} else {
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
wc_printf("<html><body>");
- do_template("openid_manual_create", NULL);
+ do_template("openid_manual_create");
wc_printf("</body></html>");
end_burst();
}
long HKLen;
const char *HKey;
HashPos *Cursor;
+ int len;
Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
serv_puts("000");
linecount = 0;
- while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000"))
+ while (len = StrBuf_ServGetln(Buf),
+ ((len >= 0) &&
+ ((len != 3) || strcmp(ChrPtr(Buf), "000") )))
{
if (linecount == 0) result = NewStrBufDup(Buf);
if (!strcasecmp(ChrPtr(result), "authenticate")) {
if (WC->logged_in) {
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- do_template("authpopup_finished", NULL);
+ do_template("authpopup_finished");
end_burst();
} else {
begin_burst();
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
wc_printf("<html><body>");
- do_template("openid_manual_create", NULL);
+ do_template("openid_manual_create");
wc_printf("</body></html>");
end_burst();
}
if (!setup_wizard) {
int len;
sprintf(wizard_filename, "setupwiz.%s.%s",
- ctdlhost, ctdlport);
- len = strlen(wizard_filename);
- for (i=0; i<len; ++i) {
- if ( (wizard_filename[i]==' ')
- || (wizard_filename[i] == '/')
- ) {
- wizard_filename[i] = '_';
- }
- }
-
+ abs(HashLittle(ctdlhost, strlen(ctdlhost))),
+ abs(HashLittle(ctdlport, strlen(ctdlport)))
+ );
+
fp = fopen(wizard_filename, "r");
if (fp != NULL) {
fgets(buf, sizeof buf, fp);
serv_getln(buf, sizeof buf);
WCC->logged_in = 0;
- if (WC->serv_info->serv_supports_guest) {
- display_default_landing_page();
- return;
- }
-
FlushStrBuf(WCC->CurRoom.name);
/* Calling output_headers() this way causes the cookies to be un-set */
output_headers(1, 1, 0, 1, 0, 0);
+ /* For sites in guest mode, redirect to the landing page after we're logged out */
+ if (WC->serv_info->serv_supports_guest) {
+ wc_printf(" <script type=\"text/javascript\"> "
+ " window.location='/'; "
+ " </script> "
+ );
+ }
+
wc_printf("<div id=\"logout_screen\">");
wc_printf("<div class=\"box\">");
wc_printf("<div class=\"boxlabel\">");
wc_printf(_("Log in again"));
wc_printf("</a></span>");
wc_printf("</div></div></div>\n");
+ if (WC->serv_info->serv_supports_guest) {
+ display_default_landing_page();
+ return;
+ }
+
wDumpContent(2);
end_webcit_session();
}
+/*
+ * Special page for monitoring scripts etc
+ */
+void monitor(void)
+{
+ output_headers(0, 0, 0, 0, 0, 0);
+
+ hprintf("Content-type: text/plain\r\n"
+ "Server: " PACKAGE_STRING "\r\n"
+ "Connection: close\r\n"
+ );
+ begin_burst();
+
+ wc_printf("Connection to Citadel server at %s:%s : %s\r\n",
+ ctdlhost, ctdlport,
+ (WC->connected ? "SUCCESS" : "FAIL")
+ );
+
+ wDumpContent(0);
+}
+
+
/*
* validate new users
*/
char buf[SIZ];
int a;
- output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("<div id=\"banner\">\n");
- wc_printf("<h1>");
- wc_printf(_("Validate new users"));
- wc_printf("</h1>");
- wc_printf("</div>\n");
+ output_headers(1, 1, 1, 0, 0, 0);
- wc_printf("<div id=\"content\" class=\"service\">\n");
+ do_template("box_begin_1");
+ StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0);
+ do_template("box_begin_2");
/* If the user just submitted a validation, process it... */
safestrncpy(buf, bstr("user"), sizeof buf);
int haveChar = 0;
int haveNum = 0;
int haveOther = 0;
- int count = 0;
+ int haveLong = 0;
pch = buf;
while (!IsEmptyStr(pch))
{
haveOther = 1;
pch ++;
}
- count = pch - buf;
- if (count > 7)
- count = 0;
- switch (count){
+ if (pch - buf > 7)
+ haveLong = 1;
+ switch (haveLong +
+ haveChar +
+ haveNum +
+ haveOther)
+ {
case 0:
pch = _("very weak");
break;
wc_printf("</div>\n");
wc_printf("</td></tr></table>\n");
+ do_template("box_end");
wDumpContent(1);
}
*/
void display_changepw(void)
{
+ wcsession *WCC = WC;
WCTemplputParams SubTP;
char buf[SIZ];
StrBuf *Buf;
memset(&SubTP, 0, sizeof(WCTemplputParams));
SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = Buf;
- DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+ DoTemplate(HKEY("box_begin"), NULL, &SubTP);
FreeStrBuf(&Buf);
- if (!IsEmptyStr(WC->ImportantMessage)) {
+ if (StrLength(WCC->ImportantMsg) > 0) {
wc_printf("<span class=\"errormsg\">"
- "%s</span><br>\n", WC->ImportantMessage);
- safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
+ "%s</span><br>\n", ChrPtr(WCC->ImportantMsg));
+ FlushStrBuf(WCC->ImportantMsg);
}
serv_puts("MESG changepw");
wc_printf("</div>\n");
wc_printf("</form>\n");
- do_template("endbox", NULL);
+ do_template("box_end");
wDumpContent(1);
}
*/
void changepw(void)
{
- char buf[SIZ];
+ StrBuf *Line;
char newpass1[32], newpass2[32];
if (!havebstr("change_action")) {
- safestrncpy(WC->ImportantMessage,
- _("Cancelled. Password was not changed."),
- sizeof WC->ImportantMessage);
+ AppendImportantMessage(_("Cancelled. Password was not changed."), -1);
display_main_menu();
return;
}
safestrncpy(newpass2, bstr("newpass2"), sizeof newpass2);
if (strcasecmp(newpass1, newpass2)) {
- safestrncpy(WC->ImportantMessage,
- _("They don't match. Password was not changed."),
- sizeof WC->ImportantMessage);
+ AppendImportantMessage(_("They don't match. Password was not changed."), -1);
display_changepw();
return;
}
if (IsEmptyStr(newpass1)) {
- safestrncpy(WC->ImportantMessage,
- _("Blank passwords are not allowed."),
- sizeof WC->ImportantMessage);
+ AppendImportantMessage(_("Blank passwords are not allowed."), -1);
display_changepw();
return;
}
+ Line = NewStrBuf();
serv_printf("SETP %s", newpass1);
- serv_getln(buf, sizeof buf);
- sprintf(WC->ImportantMessage, "%s", &buf[4]);
- if (buf[0] == '2') {
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 1, 0) == 2) {
if (WC->wc_password == NULL)
- WC->wc_password = NewStrBufPlain(buf, -1);
+ WC->wc_password = NewStrBufPlain(
+ ChrPtr(Line) + 4,
+ StrLength(Line) - 4);
else {
FlushStrBuf(WC->wc_password);
- StrBufAppendBufPlain(WC->wc_password, buf, -1, 0);
+ StrBufAppendBufPlain(WC->wc_password,
+ ChrPtr(Line) + 4,
+ StrLength(Line) - 4, 0);
}
display_main_menu();
}
else {
display_changepw();
}
+ FreeStrBuf(&Line);
}
WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0);
WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0);
WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+ WebcitAddUrlHandler(HKEY("monitor"), "", 0, monitor, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX|ANONYMOUS);
WebcitAddUrlHandler(HKEY("ajax_login_newuser"), "", 0, ajax_login_newuser, AJAX|ANONYMOUS);
WebcitAddUrlHandler(HKEY("switch_language"), "", 0, switch_language, ANONYMOUS);
projects / citadel.git / blobdiff