From a1592728612e2e19455e882c154fd1f320e99778 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 7 Mar 2023 22:31:38 +0100 Subject: [PATCH] yWeb: fix paths Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8312f407eec9bf3d90fa329b93451c0ab0a358bc Author: vanhofen Date: 2023-03-07 (Tue, 07 Mar 2023) Origin message was: ------------------ - yWeb: fix paths ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_About_yWeb.yhtm | 2 +- data/y-web/Y_Boxcontrol_Menue.yhtm | 10 +++++----- data/y-web/Y_Settings_Plugins.yhtm | 20 ++++++++++---------- data/y-web/Y_Version.txt | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/y-web/Y_About_yWeb.yhtm b/data/y-web/Y_About_yWeb.yhtm index 930b46a3e..b7348b466 100644 --- a/data/y-web/Y_About_yWeb.yhtm +++ b/data/y-web/Y_About_yWeb.yhtm @@ -13,7 +13,7 @@ jQuery(document).ready(function(){ }); {=include-block:Y_Blocks.txt;head_close=} -{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/yWeb.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/yWeb.conf;management_ip2=}~1~=}=} +{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip2=}~1~=}=} {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=} {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=} diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm index b4f6735f9..8487f4396 100644 --- a/data/y-web/Y_Boxcontrol_Menue.yhtm +++ b/data/y-web/Y_Boxcontrol_Menue.yhtm @@ -165,20 +165,20 @@ function init() {