* LDAP wasn't exposed that way for a long time; TODO: does this way still represent...

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 3b8655f068c0e4726a3e8a38667bc719b63ddedf..ae13798a65198dc9dfc5442b3a8be0214d3e3dbd 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -200,6 +200,8 @@ int GetConnected (void)
                        return 1;
                }
 
+               /* 2010jun03: every now and then the connection to Citadel dies before this point.  why? */
+
                /*
                 * From what host is our user connecting?  Go with
                 * the host at the other end of the HTTP socket,
@@ -214,8 +216,9 @@ int GetConnected (void)
                        }
                        locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
                }
-               if (WCC->serv_info == NULL)
+               if (WCC->serv_info == NULL) {
                        WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
+               }
                if (WCC->serv_info == NULL){
                        begin_burst();
                        wc_printf(_("Received unexpected answer from Citadel server; bailing out."));
@@ -659,6 +662,14 @@ int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
        return WCC->serv_info->serv_fulltext_enabled != 0;
 }
 
+int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       if (WCC->serv_info == NULL)
+               return 0;
+       return WCC->serv_info->serv_supports_ldap != 0;
+}
+
 void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -755,7 +766,8 @@ InitModule_SERVFUNC
 
        RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
        RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
-       RegisterConditional(HKEY("COND:SERV:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+       RegisterConditional(HKEY("COND:SERV:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+       RegisterConditional(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_enabled, CTX_NONE);
        RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
        RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
        RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);