MAILINGLIST: add facility to choose the default room email alias.

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index 45c78592d34c3a8a89091ee4696bdb871ef28cc8..8b60dac3ddc7628f4a2f88ffb0bc302d7b19d18a 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -45,7 +45,7 @@ void initialize_axdefs(void) {
        axdefs[5] = _("Preferred User");
 
        /* chief */
-       axdefs[6] = _("Aide");          
+       axdefs[6] = _("Admin");          
 }
 
 
@@ -499,7 +499,7 @@ void do_logout(void)
        /* Calling output_headers() this way causes the cookies to be un-set */
        output_headers(1, 1, 0, 1, 0, 0);
        do_template("logout");
-       if (WC->serv_info->serv_supports_guest) {
+       if ((WCC->serv_info != NULL) && WCC->serv_info->serv_supports_guest) {
                display_default_landing_page();
                return;
        }
@@ -949,9 +949,9 @@ InitModule_AUTH
        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);
-       RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
-       RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE);
-       RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2,  ConditionalHaveAccessCreateRoom, CTX_NONE);
+       RegisterConditional("COND:AIDE", 2, ConditionalAide, CTX_NONE);
+       RegisterConditional("COND:LOGGEDIN", 2, ConditionalIsLoggedIn, CTX_NONE);
+       RegisterConditional("COND:MAY_CREATE_ROOM", 2,  ConditionalHaveAccessCreateRoom, CTX_NONE);
        return;
 }