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 549229b00aa83fe0bdc87e789a8ee54e2f139b5f..fc3552e81698212e699dfb252d7c12abfcf3dd53 100644 (file)
--- 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 ab87150220ec4f9f2faee3b55ad2bef06e2ed210..507f6a36537c45dd254735d6e198fc9421064580 100644 (file)
--- 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);