Finalize vcard editing:

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 851829af909102188879f11abb7e23bd2a602478..4e3b2f86a3975099dd38b923a91f484dd37859f4 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -21,7 +21,7 @@ HashList *HandlerHash = NULL;
 
 void stuff_to_cookie(int unset_cookie);
 extern int GetConnected(void);
-
+extern int verbose;
 
 void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt)
 {
@@ -141,7 +141,13 @@ void output_headers(       int do_httpheaders,     /* 1 = output HTTP headers                        */
        wcsession *WCC = WC;
        char httpnow[128];
 
-       hprintf("HTTP/1.1 200 OK\n");
+       if (WCC->isFailure) 
+               hprintf("HTTP/2.2 500 Internal Server Error");
+       else if (WCC->Hdr->HaveRange > 1)
+               hprintf("HTTP/1.1 206 Partial Content\r\n");
+       else
+               hprintf("HTTP/1.1 200 OK\r\n");
+
        http_datestring(httpnow, sizeof httpnow, time(NULL));
 
        if (do_httpheaders) {
@@ -233,7 +239,8 @@ void http_redirect(const char *whichpage) {
  */
 void http_transmit_thing(const char *content_type, int is_static)
 {
-       syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : ""));
+       if (verbose)
+               syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : ""));
        output_headers(0, 0, 0, 0, 0, is_static);
 
        hprintf("Content-type: %s\r\n"
@@ -245,6 +252,31 @@ void http_transmit_thing(const char *content_type, int is_static)
        end_burst();
 }
 
+void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip)
+{
+       wcsession *WCC = WC;
+       if (verbose)
+               syslog(LOG_DEBUG, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : ""));
+       output_headers(0, 0, 0, 0, 0, is_static);
+
+       if (is_gzip)
+               hprintf("Content-encoding: gzip\r\n");
+
+       if (WCC->Hdr->HaveRange)
+               hprintf("Accept-Ranges: bytes\r\n"
+                       "Content-Range: bytes %ld-%ld/%ld\r\n",
+                       WCC->Hdr->RangeStart,
+                       WCC->Hdr->RangeTil,
+                       WCC->Hdr->TotalBytes);
+
+       hprintf("Content-type: %s\r\n"
+               "Server: "PACKAGE_STRING"\r\n"
+               "%s"
+               "Connection: close\r\n\r\n",
+               content_type,
+               (is_chunked)?"Transfer-Encoding: chunked\r\n":"");
+}
+
 
 /*
  * Convenience functions to display a page containing only a string
@@ -375,7 +407,8 @@ void ajax_servcmd(void)
        char *junk;
        size_t len;
 
-       syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") );
+       if (verbose)
+               syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") );
        begin_ajax_response();
        Buf = NewStrBuf();
        serv_puts(bstr("g_cmd"));
@@ -471,8 +504,9 @@ void push_destination(void) {
        }
 
        FreeStrBuf(&WCC->PushedDestination);
-       WCC->PushedDestination = NewStrBufDup(SBSTR("url"));
-       syslog(LOG_DEBUG, "Push: %s", ChrPtr(WCC->PushedDestination));
+       WCC->PushedDestination = NewStrBufDup(sbstr("url"));
+       if (verbose)
+               syslog(LOG_DEBUG, "Push: %s", ChrPtr(WCC->PushedDestination));
        wc_printf("OK");
 }
 
@@ -510,7 +544,8 @@ void pop_destination(void) {
        /*
         * All righty then!  We have a destination saved, so go there now.
         */
-       syslog(LOG_DEBUG, "Pop: %s", ChrPtr(WCC->PushedDestination));
+       if (verbose)
+               syslog(LOG_DEBUG, "Pop: %s", ChrPtr(WCC->PushedDestination));
        http_redirect(ChrPtr(WCC->PushedDestination));
 }
 
@@ -630,9 +665,10 @@ void session_loop(void)
 
        /* If the client sent a nonce that is incorrect, kill the request. */
        if (havebstr("nonce")) {
-               syslog(LOG_DEBUG, "Comparing supplied nonce %s to session nonce %d", 
-                       bstr("nonce"), WCC->nonce
-               );
+               if (verbose)
+                       syslog(LOG_DEBUG, "Comparing supplied nonce %s to session nonce %d", 
+                              bstr("nonce"), WCC->nonce
+                               );
                if (ibstr("nonce") != WCC->nonce) {
                        syslog(LOG_INFO, "Ignoring request with mismatched nonce.");
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
@@ -710,15 +746,18 @@ void session_loop(void)
         */
        if (havebstr("go")) {
                int ret;
-               syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go"));
+               if (verbose)
+                       syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go"));
                ret = gotoroom(sbstr("go"));    /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       syslog(LOG_DEBUG, "Unable to change to [%s]; Reason: %d", bstr("go"), ret);
+                       if (verbose)
+                               syslog(LOG_DEBUG, "Unable to change to [%s]; Reason: %d", bstr("go"), ret);
                }
        }
        else if (havebstr("gotofirst")) {
                int ret;
-               syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("gotofirst"));
+               if (verbose)
+                       syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("gotofirst"));
                ret = gotoroom(sbstr("gotofirst"));     /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
                        syslog(LOG_INFO, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret);
@@ -732,14 +771,16 @@ void session_loop(void)
        else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
                int ret;
 
-               syslog(LOG_DEBUG, "We are in '%s' but cookie indicates '%s', going there...",
-                       ChrPtr(WCC->CurRoom.name),
-                       ChrPtr(WCC->Hdr->c_roomname)
+               if (verbose)
+                       syslog(LOG_DEBUG, "We are in '%s' but cookie indicates '%s', going there...",
+                              ChrPtr(WCC->CurRoom.name),
+                              ChrPtr(WCC->Hdr->c_roomname)
                );
                ret = gotoroom(WCC->Hdr->c_roomname);   /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       syslog(LOG_DEBUG, "COOKIEGOTO: Unable to change to [%s]; Reason: %d",
-                               ChrPtr(WCC->Hdr->c_roomname), ret);
+                       if (verbose)
+                               syslog(LOG_DEBUG, "COOKIEGOTO: Unable to change to [%s]; Reason: %d",
+                                      ChrPtr(WCC->Hdr->c_roomname), ret);
                }
        }
 
@@ -805,10 +846,9 @@ void display_default_landing_page(void) {
                /* default action */
 
                if (havebstr("go")) {
-                       syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go"));
-                       StrBuf *teh_room = NewStrBufPlain(bstr("go"), strlen(bstr("go")));
-                       smart_goto(teh_room);
-                       FreeStrBuf(&teh_room);
+                       if (verbose)
+                               syslog(LOG_DEBUG, "Explicit room selection: %s", bstr("go"));
+                       smart_goto(sbstr("go"));
                }
                else if (default_landing_page) {
                        http_redirect(default_landing_page);