mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

.version: fix path to .version in some relevant files

Browse Source
This commit is contained in:
Thilo Graf
2017-12-23 15:58:00 +01:00
parent 2ce57350ba
commit a48d9dc626
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/network_setup.cpp
View File

@@ -710,7 +710,7 @@ void CNetworkSetup::testNetworkSettings()
//get www-domain testsite from /.version
CConfigFile config('\t');
config.loadConfig(TARGET_PREFIX "/.version");
config.loadConfig("/.version");
testsite = config.getString("homepage",defaultsite);
testsite.replace( 0, testsite.find("www",0), "" );

4
src/gui/update.cpp
View File

@@ -146,7 +146,7 @@ bool CFlashUpdate::checkOnlineVersion()
std::vector<CUpdateMenuTarget*> update_t_list;
CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
const char * versionString = (_configfile.loadConfig( "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
#ifdef DEBUG
printf("[update] file %s\n", g_settings.softupdate_url_file.c_str());
#endif
@@ -203,7 +203,7 @@ bool CFlashUpdate::selectHttpImage(void)
CConfigFile _configfile('\t');
std::string versionString = "????????????????";
if (_configfile.loadConfig(TARGET_PREFIX "/.version"))
if (_configfile.loadConfig("/.version"))
versionString = _configfile.getString("version", "????????????????");
CFlashVersionInfo curInfo(versionString.c_str());

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

@@ -822,7 +822,7 @@ void CControlAPI::InfoCGI(CyhookHandler *hh)
if (hh->ParamList["1"] == "streaminfo") // print streaminfo
SendStreamInfo(hh);
else if (hh->ParamList["1"] == "version") // send version file
hh->SendFile(TARGET_PREFIX "/.version");
hh->SendFile("/.version");
else if (hh->ParamList["1"] == "httpdversion") // print httpd version typ (just for compatibility)
hh->Write("3");
else if (hh->ParamList["1"] == "nhttpd_version")// print nhttpd version
@@ -2052,7 +2052,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::VersionCGI(CyhookHandler *hh)
{
hh->SendFile(TARGET_PREFIX "/.version");
hh->SendFile("/.version");
}
//-----------------------------------------------------------------------------
void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)