mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- controlapi: minor changes in url creation in xmltvm3uCGI() function

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-09-09 13:26:51 +02:00
committed by Thilo Graf
parent b08e9dd750
commit e3d609759d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -3294,14 +3294,15 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh)
std::string result = ""; std::string result = "";
int mode = NeutrinoAPI->Zapit->getMode(); int mode = NeutrinoAPI->Zapit->getMode();
// build url
std::string url = "";
if (!hh->ParamList["host"].empty())
url = "http://" + hh->ParamList["host"];
else
url = "http://" + hh->HeaderList["Host"];
std::string lurl = url; std::string host = "";
if (!hh->ParamList["host"].empty())
host = "http://" + hh->ParamList["host"];
else
host = "http://" + hh->HeaderList["Host"];
// build url
std::string url = host;
/* strip off optional custom port */ /* strip off optional custom port */
if (url.rfind(":") != 4) if (url.rfind(":") != 4)
url = url.substr(0, url.rfind(":")); url = url.substr(0, url.rfind(":"));
@@ -3324,7 +3325,7 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh)
CZapitChannel *channel = chanlist[j]; CZapitChannel *channel = chanlist[j];
std::string bouq_name = g_bouquetManager->Bouquets[i]->bName; std::string bouq_name = g_bouquetManager->Bouquets[i]->bName;
std::string chan_id_short = string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL); std::string chan_id_short = string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL);
result += "#EXTINF:-1 tvg-id=\"" + chan_id_short + "\" tvg-logo=\"" + lurl + NeutrinoAPI->getLogoFile(channel->getChannelID()) + "\" group-title=\"" + bouq_name + "\"," + channel->getName() + "\n"; result += "#EXTINF:-1 tvg-id=\"" + chan_id_short + "\" tvg-logo=\"" + host + NeutrinoAPI->getLogoFile(channel->getChannelID()) + "\" group-title=\"" + bouq_name + "\"," + channel->getName() + "\n";
result += url + string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()) + "\n"; result += url + string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()) + "\n";
} }
} }