#include "webcit.h"
#include "webserver.h"
+#include <ctype.h>
+
+
+void display_reg(int during_login);
/*
* Access level definitions. This is initialized from a function rather than a
svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
_("<ul>"
"<li>Enter your OpenID URL and click "Login"."
+ "<li><a href=\"http://www.citadel.org/doku.php/documentation:openid\">"
+ "Click here to learn what OpenID is and how Citadel is using it.</a>"
"<li>Please log off properly when finished. "
"<li>You must use a browser that supports <i>frames</i> and "
"<i>cookies</i>. "
stresc(buf, sizeof buf, claimed_id, 0, 0);
svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
claimed_id);
+ svput("CLAIMED_ID", WCS_STRING, claimed_id);
+
if (!IsEmptyStr(username)) {
stresc(buf, sizeof buf, username, 0, 0);
extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
}
- get_preference("current_iconbar", buf, sizeof buf);
- WC->current_iconbar = atoi(buf);
+ get_pref_long("current_iconbar", &WC->current_iconbar, current_iconbar_menu);
- get_preference("floordiv_expanded", WC->floordiv_expanded, sizeof WC->floordiv_expanded);
+ get_preference("floordiv_expanded", &WC->floordiv_expanded);
}
}
}
if (WC->logged_in) {
+ set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
if (WC->need_regi) {
display_reg(1);
} else if (WC->need_vali) {
return;
}
-#if 0
- char buf[SIZ];
+ char buf[1024];
if (havebstr("newuser_action")) {
serv_printf("OIDC %s", bstr("name"));
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- become_logged_in(bstr("name"), bstr("pass"), buf); // FIXME
- } else {
- display_openid_name_request(char *claimed_id, char *username); // FIXME
- return;
+ char gpass[1024] = "";
+ serv_puts("SETP GENERATE_RANDOM_PASSWORD");
+ serv_getln(gpass, sizeof gpass);
+ become_logged_in(bstr("name"), &gpass[4], buf);
}
}
-#endif
if (WC->logged_in) {
if (WC->need_regi) {
do_welcome();
}
} else {
- display_login(_("Your password was not accepted."));
+ display_openid_name_request(bstr("openid_url"), bstr("name"));
}
}
*/
void do_welcome(void)
{
- char buf[SIZ];
+ StrBuf *Buf;
#ifdef XXX_NOT_FINISHED_YET_XXX
FILE *fp;
int i;
/*
* Go to the user's preferred start page
*/
- get_preference("startpage", buf, sizeof buf);
- if (IsEmptyStr(buf)) {
- safestrncpy(buf, "dotskip&room=_BASEROOM_", sizeof buf);
- set_preference("startpage", buf, 1);
+ if (!get_preference("startpage", &Buf)) {
+ Buf = NewStrBuf ();
+ StrBufPrintf(Buf, "dotskip&room=_BASEROOM_");
+ set_preference("startpage", Buf, 1);
}
- if (buf[0] == '/') {
- strcpy(buf, &buf[1]);
+ if (ChrPtr(Buf)[0] == '/') {
+ StrBufCutLeft(Buf, 1);
}
- http_redirect(buf);
+ if (StrLength(Buf) == 0)
+ StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
+ http_redirect(ChrPtr(Buf));
}
* Disconnect from the Citadel server, and end this WebCit session
*/
void end_webcit_session(void) {
- char buf[256];
-
+
if (WC->logged_in) {
- sprintf(buf, "%d", WC->current_iconbar);
- set_preference("current_iconbar", buf, 0);
+ set_pref_long("current_iconbar", WC->current_iconbar, 0);
set_preference("floordiv_expanded", WC->floordiv_expanded, 1);
}
if (a == 1)
wprintf("#%s<br /><H1>%s</H1>",
buf, &cmd[4]);
- if (a == 2)
- wprintf("PW: %s<br />\n", buf);
+ if (a == 2) {
+ char *pch;
+ int haveChar = 0;
+ int haveNum = 0;
+ int haveOther = 0;
+ int count = 0;
+ pch = buf;
+ while (!IsEmptyStr(pch))
+ {
+ if (isdigit(*pch))
+ haveNum = 1;
+ else if (isalpha(*pch))
+ haveChar = 1;
+ else
+ haveOther = 1;
+ pch ++;
+ }
+ count = pch - buf;
+ if (count > 7)
+ count = 0;
+ switch (count){
+ case 0:
+ pch = _("very weak");
+ break;
+ case 1:
+ pch = _("weak");
+ break;
+ case 2:
+ pch = _("ok");
+ break;
+ case 3:
+ default:
+ pch = _("strong");
+ }
+
+ wprintf("PW: %s<br />\n", pch);
+ }
if (a == 3)
wprintf("%s<br />\n", buf);
if (a == 4)
wprintf(_("Select access level for this user:"));
wprintf("<br />\n");
for (a = 0; a <= 6; ++a) {
- wprintf("<a href=\"validate?nonce=%ld?user=", WC->nonce);
+ wprintf("<a href=\"validate?nonce=%d?user=", WC->nonce);
urlescputs(user);
wprintf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
}
wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<table class=\"altern\" ");
wprintf("<tr class=\"even\"><td>");
wprintf(_("Enter new password:"));
}
}
+void _display_openid_login(void) {display_openid_login(NULL);}
+void _display_reg(void) {display_reg(0);}
-void InitModule_AUTH(void)
+void
+InitModule_AUTH
+(void)
{
- WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0);
+ WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("display_openid_login"), _display_openid_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("openid_login"), do_openid_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("finalize_openid_login"), finalize_openid_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("openid_manual_create"), openid_manual_create, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY("do_logout"), do_logout, 0);
+ WebcitAddUrlHandler(HKEY("validate"), validate, 0);
+ WebcitAddUrlHandler(HKEY("display_reg"), _display_reg, 0);
+ WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0);
+ WebcitAddUrlHandler(HKEY("changepw"), changepw, 0);
+ WebcitAddUrlHandler(HKEY("termquit"), do_logout, 0);
return ;
}