New global variable 'site_prefix' which replaces the often-repeated code which constr...

[citadel.git] / webcit / groupdav_main.c

diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index bc5286fc8610c3b745fd7a91d8151b681d7dbebc..3fc38fb306d1b585f4ef26d8ba873eb97655ffd1 100644 (file)
--- a/webcit/groupdav_main.c
+++ b/webcit/groupdav_main.c
@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * Entry point for GroupDAV functions
  *
- *
  * Copyright (c) 2005-2010 by the citadel.org team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -193,39 +190,20 @@ void groupdav_main(void)
  * Output our host prefix for globally absolute URL's.
  */  
 void groupdav_identify_host(void) {
-       wcsession *WCC = WC;
-
-       if (StrLength(WCC->Hdr->HR.http_host)!=0) {
-               wc_printf("%s://%s",
-                       (is_https ? "https" : "http"),
-                       ChrPtr(WCC->Hdr->HR.http_host));
-       }
+       wc_printf("%s", ChrPtr(site_prefix));
 }
 
 
 void tmplput_GROUPDAV_HOSTNAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-       wcsession *WCC = WC;
-
-       if (StrLength(WCC->Hdr->HR.http_host)!=0) {
-               StrBufAppendPrintf(Target, 
-                                  "%s://%s",
-                                  (is_https ? "https" : "http"),
-                                  ChrPtr(WCC->Hdr->HR.http_host));
-       }
+       StrBufAppendPrintf(Target, "%s", ChrPtr(site_prefix));
 }
 
 /*
  * Output our host prefix for globally absolute URL's.
  */  
 void groupdav_identify_hosthdr(void) {
-       wcsession *WCC = WC;
-
-       if (StrLength(WCC->Hdr->HR.http_host)!=0) {
-               hprintf("%s://%s",
-                       (is_https ? "https" : "http"),
-                       ChrPtr(WCC->Hdr->HR.http_host));
-       }
+       hprintf("%s", ChrPtr(site_prefix));
 }