]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02be0a0)
server name access cleanups, fixes #4281
authorJaroslav Kysela <perex@perex.cz>
Tue, 14 Mar 2017 09:58:15 +0000 (10:58 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 14 Mar 2017 09:58:15 +0000 (10:58 +0100)
src/config.c patch | blob | blame | history
src/webui/extjs.c patch | blob | blame | history
src/webui/xmltv.c patch | blob | blame | history

diff --git a/src/config.c b/src/config.c
index 59ca041c521dfbd87a28b21574d1ddc49e69789c..9bf31bf0e0130b728766c9ba1dcb077cc990f12e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -2396,7 +2396,7 @@ const idclass_t config_class = {
 
 const char *config_get_server_name ( void )
 {
-  return config.server_name;
+  return config.server_name ?: "Tvheadend";
 }
 
 const char *config_get_language ( void )
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 24bcd02425b8259dd0b110fbc1e3902988e63948..7ecd6ee8c7a533be4a74c29b7a52b279aa12b1d4 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -135,7 +135,7 @@ Ext.onReady(tvheadend.app.init, tvheadend.app);\
                 "}\n"
                 "</style>\n"
                 "<title>");
-  htsbuf_append_str(hq, config.server_name);
+  htsbuf_append_str(hq, config_get_server_name());
   htsbuf_append_str(hq,
                 "</title>\n"
                 "</head>\n"
@@ -161,7 +161,7 @@ extjs_livetv(http_connection_t *hc, const char *remain, void *opaque)
   htsbuf_append_str(hq, "<head>\n");
   htsbuf_append_str(hq, "<link rel=\"shortcut icon\" href=\"static/img/logo.png\" type=\"image/png\">\n");
   htsbuf_append_str(hq, "<title>");
-  htsbuf_append_str(hq, config.server_name);
+  htsbuf_append_str(hq, config_get_server_name());
   htsbuf_append_str(hq, "</title>\n");
 
   if (tvheadend_webui_debug) {
diff --git a/src/webui/xmltv.c b/src/webui/xmltv.c
index e1b532e65a0ba7b3c07410b8db924a670f7fbf85..54da0452ea38a95f4f408d14d5d61c3622926fac 100644 (file)
--- a/src/webui/xmltv.c
+++ b/src/webui/xmltv.c
@@ -45,7 +45,7 @@ http_xmltv_begin(htsbuf_queue_t *hq)
 <tv generator-info-name=\"TVHeadend-");
   htsbuf_append_and_escape_xml(hq, tvheadend_version);
   htsbuf_append_str(hq, "\" source-info-name=\"tvh-");
-  htsbuf_append_and_escape_xml(hq, config.server_name);
+  htsbuf_append_and_escape_xml(hq, config_get_server_name());
   htsbuf_append_str(hq, "\">\n");
 }
 
Mirror of https://github.com/tvheadend/tvheadend.git