Saving vCards now requires the API caller to specify the room

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index 748028f85a0a79228ba0cd374ce62fadba2f83d8..cc48386bc8453fbb9083a73b252dda42f48566b9 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -43,9 +43,9 @@ void display_login(char *mesg)
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"login_screen\">\n");
 
-       if (mesg != NULL) if (strlen(mesg) > 0) {
-               stresc(buf, mesg, 0, 0);
-               svprintf("mesg", WCS_STRING, "%s", buf);
+       if (mesg != NULL) if (!IsEmptyStr(mesg)) {
+                       stresc(buf, SIZ,  mesg, 0, 0);
+                       svprintf("mesg", WCS_STRING, "%s", buf);
        }
 
        svprintf("LOGIN_INSTRUCTIONS", WCS_STRING,
@@ -142,16 +142,16 @@ void do_login(void)
 {
        char buf[SIZ];
 
-       if (strlen(bstr("language")) > 0) {
+       if (!IsEmptyStr(bstr("language"))) {
                set_selected_language(bstr("language"));
                go_selected_language();
        }
 
-       if (strlen(bstr("exit_action")) > 0) {
+       if (!IsEmptyStr(bstr("exit_action"))) {
                do_logout();
                return;
        }
-       if (strlen(bstr("login_action")) > 0) {
+       if (!IsEmptyStr(bstr("login_action"))) {
                serv_printf("USER %s", bstr("name"));
                serv_getln(buf, sizeof buf);
                if (buf[0] == '3') {
@@ -169,8 +169,8 @@ void do_login(void)
                        return;
                }
        }
-       if (strlen(bstr("newuser_action")) > 0) {
-               if (strlen(bstr("pass")) == 0) {
+       if (!IsEmptyStr(bstr("newuser_action"))) {
+               if (IsEmptyStr(bstr("pass"))) {
                        display_login(_("Blank passwords are not allowed."));
                        return;
                }
@@ -214,9 +214,11 @@ void do_welcome(void)
         */
        if (WC->is_aide) {
                if (!setup_wizard) {
+                       int len;
                        sprintf(wizard_filename, "setupwiz.%s.%s",
                                ctdlhost, ctdlport);
-                       for (i=0; i<strlen(wizard_filename); ++i) {
+                       len = strlen(wizard_filename);
+                       for (i=0; i<len; ++i) {
                                if (    (wizard_filename[i]==' ')
                                        || (wizard_filename[i] == '/')
                                ) {
@@ -245,7 +247,7 @@ void do_welcome(void)
         * Go to the user's preferred start page
         */
        get_preference("startpage", buf, sizeof buf);
-       if (strlen(buf)==0) {
+       if (IsEmptyStr(buf)) {
                safestrncpy(buf, "dotskip&room=_BASEROOM_", sizeof buf);
                set_preference("startpage", buf, 1);
        }
@@ -328,16 +330,18 @@ void validate(void)
        int a;
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"auth_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Validate new users"));
-       wprintf("</SPAN></TD></TR></TABLE>\n</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        /** If the user just submitted a validation, process it... */
        safestrncpy(buf, bstr("user"), sizeof buf);
-       if (strlen(buf) > 0) {
-               if (strlen(bstr("axlevel")) > 0) {
+       if (!IsEmptyStr(buf)) {
+               if (!IsEmptyStr(bstr("axlevel"))) {
                        serv_printf("VALI %s|%s", buf, bstr("axlevel"));
                        serv_getln(buf, sizeof buf);
                        if (buf[0] != '2') {
@@ -441,10 +445,10 @@ void display_reg(int during_login)
        }
 
        if (during_login) {
-               do_edit_vcard(vcard_msgnum, "1", "do_welcome");
+               do_edit_vcard(vcard_msgnum, "1", "do_welcome", USERCONFIGROOM);
        }
        else {
-               do_edit_vcard(vcard_msgnum, "1", "display_main_menu");
+               do_edit_vcard(vcard_msgnum, "1", "display_main_menu", USERCONFIGROOM);
        }
 
 }
@@ -459,28 +463,17 @@ void display_changepw(void)
 {
        char buf[SIZ];
 
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"auth_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
-       wprintf(_("Change your password"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       if (strlen(WC->ImportantMessage) > 0) {
-               do_template("beginbox_nt");
-               wprintf("<SPAN CLASS=\"errormsg\">"
-                       "%s</SPAN><br />\n", WC->ImportantMessage);
-               do_template("endbox");
+       svprintf("BOXTITLE", WCS_STRING, _("Change your password"));
+       do_template("beginbox");
+
+       if (!IsEmptyStr(WC->ImportantMessage)) {
+               wprintf("<span class=\"errormsg\">"
+                       "%s</span><br />\n", WC->ImportantMessage);
                safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
        }
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"auth_validate\"><tr><td>\n");
-
-       wprintf("<CENTER><br />");
        serv_puts("MESG changepw");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
@@ -489,24 +482,25 @@ void display_changepw(void)
 
        wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-       wprintf("<CENTER>"
-               "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
-               "BGCOLOR=\"#EEEEEE\">"
-               "<TR><TD>");
+       wprintf("<table class=\"altern\" ");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Enter new password:"));
-       wprintf("</TD>\n");
-       wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-       wprintf("<TR><TD>");
+       wprintf("</td><td>");
+       wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Enter it again to confirm:"));
-       wprintf("</TD>\n");
-       wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
+       wprintf("</td><td>");
+       wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+       wprintf("</table>\n");
 
-       wprintf("</TABLE><br />\n");
-       wprintf("<INPUT type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+       wprintf("<div class=\"buttons\">\n");
+       wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
        wprintf("&nbsp;");
-       wprintf("<INPUT type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
-       wprintf("</form></center>\n");
-       wprintf("</td></tr></table></div>\n");
+       wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+       wprintf("</div>\n");
+       wprintf("</form>\n");
+
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -519,7 +513,7 @@ void changepw(void)
        char buf[SIZ];
        char newpass1[32], newpass2[32];
 
-       if (strlen(bstr("change_action")) == 0) {
+       if (IsEmptyStr(bstr("change_action"))) {
                safestrncpy(WC->ImportantMessage, 
                        _("Cancelled.  Password was not changed."),
                        sizeof WC->ImportantMessage);
@@ -538,7 +532,7 @@ void changepw(void)
                return;
        }
 
-       if (strlen(newpass1) == 0) {
+       if (IsEmptyStr(newpass1)) {
                safestrncpy(WC->ImportantMessage, 
                        _("Blank passwords are not allowed."),
                        sizeof WC->ImportantMessage);