From: Art Cancro <ajc@citadel.org>
Date: Wed, 8 Sep 2010 16:56:39 +0000 (-0400)
Subject: Removed tmplput_HOST_DISPLAYNAME
X-Git-Tag: v8.01~735
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=bfa9090d165dba3d9ae49c37d1eacf9181d07579

Removed tmplput_HOST_DISPLAYNAME
<?URL:HOSTNAME> is no longer used and no longer relevant.
<?DAV:HOSTNAME> is better.  It prepends http:// or https://
---

diff --git a/webcit/static/t/aide/display_generic_cmd.html b/webcit/static/t/aide/display_generic_cmd.html
index 549229b00..fc3552e81 100644
--- a/webcit/static/t/aide/display_generic_cmd.html
+++ b/webcit/static/t/aide/display_generic_cmd.html
@@ -18,7 +18,7 @@
 	      <?_("Command input (if requesting SEND_LISTING transfer mode):")><br />
 	      <textarea name="g_input" rows=10 cols=80 width=80></textarea><br />
 	      <font size=-2>
-		<?_("Detected host header is ")><?%("COND:IS_HTTPS", 1, 1, 1, "https", "http")>://<?URL:HOSTNAME>
+		<?_("Detected host header is ")><?DAV:HOSTNAME>
 	      </font>
 	      <input type="submit" name="sc_button" value="<?_("Send command")>">&nbsp;
 	      <input type="submit" name="cancel_button" value="<?_("Cancel")>"><br />
diff --git a/webcit/webcit.c b/webcit/webcit.c
index ab8715022..507f6a365 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -46,11 +46,6 @@ void tmplput_HANDLER_DISPLAYNAME(StrBuf *Target, WCTemplputParams *TP)
 		StrBufAppendTemplate(Target, TP, WCC->Hdr->HR.Handler->DisplayName, 0);
 }
 
-void tmplput_HOST_DISPLAYNAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	wcsession *WCC = WC;
-	StrBufAppendTemplate(Target, TP, WCC->Hdr->HR.http_host, 0);
-}
 
 /*
  * web-printing funcion. uses our vsnprintf wrapper
@@ -864,7 +859,6 @@ InitModule_WEBCIT
 	RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
 	RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE);
 	RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE);
-	RegisterNamespace("URL:HOSTNAME", 0, 1, tmplput_HOST_DISPLAYNAME, NULL, CTX_NONE);
 
 	
 	snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);