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

- neutrino: introduce WEBRADIODIR and WEBRADIODIR_VAR

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/yhttpd_mods/mod_yparser.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-09-25 23:53:35 +02:00
committed by Thilo Graf
parent c982d02be5
commit d71d1aab91
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@@ -268,6 +268,12 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
[--with-luaplugindir=PATH], [where to find Lua plugins])
TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
[--with-webradiodir=PATH], [where to find webradio content])
TUXBOX_APPS_DIRECTORY_ONE(webradiodir_var, WEBRADIODIR_VAR, localstatedir, /var, /tuxbox/webradio,
[--with-webradiodir_var=PATH], [where to find webradio content in /var])
TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv,
[--with-webtvdir=PATH], [where to find webtv content])
@@ -317,6 +323,8 @@ AC_SUBST(PLUGINDIR)
AC_SUBST(PLUGINDIR_VAR)
AC_SUBST(PLUGINDIR_MNT)
AC_SUBST(LUAPLUGINDIR)
AC_SUBST(WEBRADIODIR)
AC_SUBST(WEBRADIODIR_VAR)
AC_SUBST(WEBTVDIR)
AC_SUBST(WEBTVDIR_VAR)
AC_SUBST(LOCALEDIR)

4
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -453,10 +453,14 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
if (ycmd_name.compare("CONFIGDIR")) yresult = CONFIGDIR;
else if (ycmd_name.compare("DATADIR")) yresult = DATADIR;
else if (ycmd_name.compare("FONTDIR")) yresult = FONTDIR;
else if (ycmd_name.compare("FONTDIR_VAR")) yresult = FONTDIR_VAR;
else if (ycmd_name.compare("LIBDIR")) yresult = LIBDIR;
else if (ycmd_name.compare("GAMESDIR")) yresult = GAMESDIR;
else if (ycmd_name.compare("PLUGINDIR")) yresult = PLUGINDIR;
else if (ycmd_name.compare("PLUGINDIR_VAR")) yresult = PLUGINDIR_VAR;
else if (ycmd_name.compare("WEBRADIODIR")) yresult = WEBRADIODIR;
else if (ycmd_name.compare("WEBRADIODIR_VAR")) yresult = WEBRADIODIR_VAR;
else if (ycmd_name.compare("WEBTVDIR")) yresult = WEBTVDIR;
else if (ycmd_name.compare("WEBTVDIR_VAR")) yresult = WEBTVDIR_VAR;
else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR;
else if (ycmd_name.compare("LOCALEDIR")) yresult = LOCALEDIR;