}
+#ifdef __OLD__LOGIN__SCREEN__
/*
* Perform authentication using a user name and password
*/
}
FreeStrBuf(&Buf);
}
-
+#endif
/*
return;
}
- convenience_page("770000", _("Error"), &buf[4]);
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ wc_printf("<html><body>");
+ escputs(&buf[4]);
+ wc_printf("</body></html>");
+ end_burst();
}
/* Did we manage to log in? If so, continue with the normal flow... */
if (WC->logged_in) {
-
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
do_template("authpopup_finished", NULL);
*/
} else {
- /* maybe do something prettier here? */
- convenience_page("770000", _("Error"), _("Error") );
+ /* FIXME do something prettier here? */
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ wc_printf("<html><body>");
+ wc_printf("error");
+ wc_printf("</body></html>");
+ end_burst();
}
FreeStrBuf(&result);
int ConditionalAide(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
- return (WCC != NULL)? (WC->is_aide == 0) : 0;
+ return (WCC != NULL) ? ((WCC->logged_in == 0)||(WC->is_aide == 0)) : 0;
}
int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
- return (WCC != NULL)? (WCC->logged_in == 0) : 0;
+ return (WCC != NULL) ? (WCC->logged_in == 0) : 0;
}
/* some of these will be removed soon */
WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED);
+#ifdef __OLD__LOGIN__SCREEN__
WebcitAddUrlHandler(HKEY("login"), "", 0, do_login, ANONYMOUS|COOKIEUNNEEDED);
+#endif
WebcitAddUrlHandler(HKEY("openid_login"), "", 0, do_openid_login, ANONYMOUS);
WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS);
WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS);