mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb/yparser: complete handling of directory defines

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f890ebfbe0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-11-22 (Thu, 22 Nov 2018)

Origin message was:
------------------
- yWeb/yparser: complete handling of directory defines

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-11-22 00:00:28 +01:00
parent fb78b326c3
commit 98443e66fc
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
data/y-web/Makefile.am
View File

@@ -126,14 +126,31 @@ install-data-hook:
find $(DESTDIR)$(PRIVATE_HTTPDDIR)/ -type f -print0 | xargs --no-run-if-empty -0 \
sed -i \
-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
-e 's|%(DATADIR)|$(DATADIR)|g' \
-e 's|%(FONTDIR)|$(FONTDIR)|g' \
-e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \
-e 's|%(LIBDIR)|$(LIBDIR)|g' \
-e 's|%(GAMESDIR)|$(GAMESDIR)|g' \
-e 's|%(ICONSDIR)|$(ICONSDIR)|g' \
-e 's|%(ICONSDIR_VAR)|$(ICONSDIR_VAR)|g' \
-e 's|%(LOCALEDIR)|$(LOCALEDIR)|g' \
-e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \
-e 's|%(PLUGINDIR)|$(PLUGINDIR)|g' \
-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
-e 's|%(PLUGINDIR_MNT)|$(PLUGINDIR_MNT)|g' \
-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
-e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \
-e 's|%(THEMESDIR)|$(THEMESDIR)|g' \
-e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \
-e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \
-e 's|%(WEBRADIODIR_VAR)|$(WEBRADIODIR_VAR)|g' \
-e 's|%(WEBTVDIR)|$(WEBTVDIR)|g' \
-e 's|%(WEBTVDIR_VAR)|$(WEBTVDIR_VAR)|g' \
-e 's|%(LOGODIR)|$(LOGODIR)|g' \
-e 's|%(LOGODIR_VAR)|$(LOGODIR_VAR)|g' \
-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
-e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \
-e 's|%(FLAGDIR)|$(FLAGDIR)|g' \
;
@# NI-yWeb
cp $(DESTDIR)$(PRIVATE_HTTPDDIR)/styles/Y_Dist-NI_dark.css $(DESTDIR)$(PRIVATE_HTTPDDIR)/Y_Dist.css

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

@@ -456,24 +456,26 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
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("ICONSDIR")) yresult = ICONSDIR;
else if (ycmd_name.compare("ICONSDIR_VAR")) yresult = ICONSDIR_VAR;
else if (ycmd_name.compare("LOCALEDIR")) yresult = LOCALEDIR;
else if (ycmd_name.compare("LOCALEDIR_VAR")) yresult = LOCALEDIR_VAR;
else if (ycmd_name.compare("PLUGINDIR")) yresult = PLUGINDIR;
else if (ycmd_name.compare("PLUGINDIR_VAR")) yresult = PLUGINDIR_VAR;
else if (ycmd_name.compare("PLUGINDIR_MNT")) yresult = PLUGINDIR_MNT;
else if (ycmd_name.compare("LUAPLUGINDIR")) yresult = LUAPLUGINDIR;
else if (ycmd_name.compare("THEMESDIR")) yresult = THEMESDIR;
else if (ycmd_name.compare("THEMESDIR_VAR")) yresult = THEMESDIR_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;
else if (ycmd_name.compare("LOCALEDIR_VAR")) yresult = LOCALEDIR_VAR;
else if (ycmd_name.compare("THEMESDIR")) yresult = THEMESDIR;
else if (ycmd_name.compare("THEMESDIR_VAR")) yresult = THEMESDIR_VAR;
else if (ycmd_name.compare("ICONSDIR")) yresult = ICONSDIR;
else if (ycmd_name.compare("ICONSDIR_VAR")) yresult = ICONSDIR_VAR;
else if (ycmd_name.compare("LOGODIR")) yresult = LOGODIR;
else if (ycmd_name.compare("LOGODIR_VAR")) yresult = LOGODIR_VAR;
else if (ycmd_name.compare("PRIVATE_HTTPDDIR")) yresult = PRIVATE_HTTPDDIR;
else if (ycmd_name.compare("PUBLIC_HTTPDDIR")) yresult = PUBLIC_HTTPDDIR;
else if (ycmd_name.compare("HOSTED_HTTPDDIR")) yresult = HOSTED_HTTPDDIR;
else if (ycmd_name.compare("FLAGDIR")) yresult = FLAGDIR;
else yresult = "";
}
else if (ycmd_type == "ini-get") {