X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fctdl_commands.c;h=d065ead98baac98f66aedecfb3ada563a410df13;hb=03d5df9a4e11ce16fbfeac4ad03f2825591fa4ae;hp=64193556b760e369c07ef1a3e5bddb403b4ee1f6;hpb=1de34ae393d0f8bf9c1fb9131765ee50449f4806;p=citadel.git diff --git a/webcit-ng/ctdl_commands.c b/webcit-ng/ctdl_commands.c index 64193556b..d065ead98 100644 --- a/webcit-ng/ctdl_commands.c +++ b/webcit-ng/ctdl_commands.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996-2016 by the citadel.org team + * Copyright (c) 1996-2018 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -29,56 +29,57 @@ void serv_info(struct http_transaction *h, struct ctdlsession *c) JsonValue *j = NewJsonObject(HKEY("serv_info")); int i = 0; - while (ctdl_readline(c, buf, sizeof(buf)) , strcmp(buf, "000")) switch(i++) { + while (ctdl_readline(c, buf, sizeof(buf)), strcmp(buf, "000")) + switch (i++) { case 0: - JsonObjectAppend(j, NewJsonNumber( HKEY("serv_pid"), atol(buf))); + JsonObjectAppend(j, NewJsonNumber(HKEY("serv_pid"), atol(buf))); break; case 1: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_nodename"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_nodename"), buf, -1)); break; case 2: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_humannode"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_humannode"), buf, -1)); break; case 3: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_fqdn"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_fqdn"), buf, -1)); break; case 4: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_software"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_software"), buf, -1)); break; case 5: - JsonObjectAppend(j, NewJsonNumber( HKEY("serv_rev_level"), atol(buf))); + JsonObjectAppend(j, NewJsonNumber(HKEY("serv_rev_level"), atol(buf))); break; case 6: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_bbs_city"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_bbs_city"), buf, -1)); break; case 7: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_sysadm"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_sysadm"), buf, -1)); break; case 14: - JsonObjectAppend(j, NewJsonBool( HKEY("serv_supports_ldap"), atoi(buf))); + JsonObjectAppend(j, NewJsonBool(HKEY("serv_supports_ldap"), atoi(buf))); break; case 15: - JsonObjectAppend(j, NewJsonBool( HKEY("serv_newuser_disabled"), atoi(buf))); + JsonObjectAppend(j, NewJsonBool(HKEY("serv_newuser_disabled"), atoi(buf))); break; case 16: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_default_cal_zone"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_default_cal_zone"), buf, -1)); break; case 20: - JsonObjectAppend(j, NewJsonBool( HKEY("serv_supports_sieve"), atoi(buf))); + JsonObjectAppend(j, NewJsonBool(HKEY("serv_supports_sieve"), atoi(buf))); break; case 21: - JsonObjectAppend(j, NewJsonBool( HKEY("serv_fulltext_enabled"), atoi(buf))); + JsonObjectAppend(j, NewJsonBool(HKEY("serv_fulltext_enabled"), atoi(buf))); break; case 22: - JsonObjectAppend(j, NewJsonPlainString( HKEY("serv_svn_revision"), buf, -1)); + JsonObjectAppend(j, NewJsonPlainString(HKEY("serv_svn_revision"), buf, -1)); break; case 23: - JsonObjectAppend(j, NewJsonBool( HKEY("serv_supports_openid"), atoi(buf))); + JsonObjectAppend(j, NewJsonBool(HKEY("serv_supports_openid"), atoi(buf))); break; case 24: - JsonObjectAppend(j, NewJsonBool( HKEY("serv_supports_guest"), atoi(buf))); + JsonObjectAppend(j, NewJsonBool(HKEY("serv_supports_guest"), atoi(buf))); break; - } + } StrBuf *sj = NewStrBuf(); SerializeJson(sj, j, 1); // '1' == free the source array @@ -98,8 +99,7 @@ void ctdl_c(struct http_transaction *h, struct ctdlsession *c) { if (!strcasecmp(h->uri, "/ctdl/c/info")) { serv_info(h, c); - } - else { + } else { do_404(h); } }