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

yWeb: rename Y-Web.conf => yWeb.conf

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e6d6f3da0
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-02-20 (Mon, 20 Feb 2023)

Origin message was:
------------------
- yWeb: rename Y-Web.conf => yWeb.conf

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2023-02-20 20:47:53 +01:00
parent 53bc1ca945
commit fa8d630a8a
19 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/backup.sh.in
View File

@@ -16,7 +16,7 @@ TOBACKUP="\
@CONFIGDIR@/scan.conf \
@CONFIGDIR@/timerd.conf \
@CONFIGDIR@/weather-favorites.xml \
@CONFIGDIR@/Y-Web.conf \
@CONFIGDIR@/yWeb.conf \
\
@CONFIGDIR@/doscam.* \
@CONFIGDIR@/oscam.* \

5
data/scripts/migration.sh.in
View File

@@ -19,6 +19,11 @@ if [ -e neutrino.conf ]; then
mv @CONFIGDIR@/webtv_usr.xml @WEBTVDIR_VAR@/
fi
# Y-Web.conf was renamed to yWeb.conf
if [ -e @CONFIGDIR@/Y-Web.conf ]; then
mv @CONFIGDIR@/Y-Web.conf @CONFIGDIR@/yWeb.conf
fi
# remove all old glcd_ keywords; neutrino will add the new ones
if ! grep -q glcd_foreground_color neutrino.conf ; then
sed -i "/^glcd_/d" neutrino.conf

40
data/y-web/Y_Blocks.txt
View File

@@ -15,20 +15,20 @@ end-block~timer
# ------- yWeb save Settings
start-block~yWeb_save_settings
{=ini-set:%(CONFIGDIR)/Y-Web.conf;management_ip;{=managementIP=}~open=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;management_ip2;{=managementIP2=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_mac_1;{=wol_mac_1=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_mac_2;{=wol_mac_2=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_mac_3;{=wol_mac_3=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_desc_1;{=wol_desc_1=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_desc_2;{=wol_desc_2=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_desc_3;{=wol_desc_3=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;fb;{=fb=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;{=screenshot_rc=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;style;{=style=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;yweb_box_name;{=yweb_box_name=}~cache=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;yweb_box_color;{=yweb_box_color=}~save=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;management_ip;{=managementIP=}~open=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;management_ip2;{=managementIP2=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_mac_1;{=wol_mac_1=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_mac_2;{=wol_mac_2=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_mac_3;{=wol_mac_3=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_desc_1;{=wol_desc_1=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_desc_2;{=wol_desc_2=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;wol_desc_3;{=wol_desc_3=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;fb;{=fb=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;screenshot_rc;{=screenshot_rc=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;start_page;{=start_page=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;style;{=style=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;yweb_box_name;{=yweb_box_name=}~cache=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;yweb_box_color;{=yweb_box_color=}~save=}
end-block~yWeb_save_settings
# ------- nhttpd save Settings
@@ -165,7 +165,7 @@ end-block~no_management
# ------- Managemant Check : insert at Top of Page
start-block~management_check_top
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.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~=}=}
{=if-empty:{=var-get:management=}
~
{=include-block:Y_Blocks.txt;no_management=}
@@ -335,8 +335,8 @@ end-block~js_jquery_ui
# ------- nhttpd save Settings
start-block~start_wizard_save_settings
{=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~open=}
{=ini-set:%(CONFIGDIR)/Y-Web.conf;startup;true~save=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;start_page;{=start_page=}~open=}
{=ini-set:%(CONFIGDIR)/yWeb.conf;startup;true~save=}
{=ini-set:%(CONFIGDIR)/nhttpd.conf;Language.selected;{=language=}=}
{=func:do_reload_httpd_config=}
end-block~start_wizard_save_settings
@@ -394,7 +394,7 @@ end-block~start_wizard_page
# ------- Lay-Frame MAIN
start-block~frame_main
{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;startup=}~
{=if-empty:{=ini-get:%(CONFIGDIR)/yWeb.conf;startup=}~
{=include-block:Y_Blocks.txt;start_wizard_page=}
~
{=include-block:Y_Blocks.txt;head_frame=}
@@ -442,7 +442,7 @@ end-block~frame_secondary
# ------- Lay-Frame Boxcontrol-Menu
start-block~frame_boxcontrol
{=var-set:sec_menu=Y_Boxcontrol_Menue.yhtm=}
{=var-set:startpage={=ini-get:%(CONFIGDIR)/Y-Web.conf;start_page;none=}=}
{=var-set:startpage={=ini-get:%(CONFIGDIR)/yWeb.conf;start_page;none=}=}
{=var-set:work=
{=if-equal:{=var-get:startpage=}~bouquets~Y_Boxcontrol_Bouquets.yhtm
~
@@ -590,7 +590,7 @@ end-block~rc_variables
start-block~remote
{=include-block:Y_Blocks.txt;rc_variables=}
{=var-set:nfbtype={=ini-get:%(CONFIGDIR)/neutrino.conf;remote_control_hardware=}=}
{=var-set:yfbtype={=ini-get:%(CONFIGDIR)/Y-Web.conf;fb;0=}=}
{=var-set:yfbtype={=ini-get:%(CONFIGDIR)/yWeb.conf;fb;0=}=}
{=var-set:boxtype={=func:get_boxtype=}=}
{=if-equal:{=var-get:yfbtype=}~{=var-get:_fb_auto=}~
{=if-equal:{=var-get:nfbtype=}~{=var-get:_fb_dbox_philips=}~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~

4
data/y-web/Y_Boxcontrol_Menue.yhtm
View File

@@ -164,10 +164,10 @@ function init() {
</li>
<ul>
<li>
<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&rc={=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false=}">OSD</a>
<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&rc={=ini-get:/var/tuxbox/config/yWeb.conf;screenshot_rc;false=}">OSD</a>
</li>
<li>
<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&rc={=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false=}">TV</a>
<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&rc={=ini-get:/var/tuxbox/config/yWeb.conf;screenshot_rc;false=}">TV</a>
</li>
{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;lcd4l_support;0=}~1~
{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;lcd4l_screenshots;0=}~1~

2
data/y-web/Y_Ext_Menue.yhtm
View File

@@ -1,5 +1,5 @@
{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extensions.txt~%(CONFIGDIR)/extensions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extensions.txt~%(PUBLIC_HTTPDDIR)/extensions.txt~%(PRIVATE_HTTPDDIR)/extensions.txt=}=}=}
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.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~=}=}
{=include-block:Y_Blocks.txt;head=}
{=include-block:Y_Blocks.txt;js_prototype=}
<script src="/Y_Baselib.js"></script>

2
data/y-web/Y_Info_Menue.yhtm
View File

@@ -9,7 +9,7 @@ function init(){
}
</script>
{=include-block:Y_Blocks.txt;head_close=}
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.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~=}=}
<body onload="init()">
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>{=L:main.info=}</h2></div>

4
data/y-web/Y_Menue.yhtm
View File

@@ -113,9 +113,9 @@ function vlc() {
</td>
<td align="right">
<span id="state" style="color : red;font-family: Courier New, Courier, monospace;">&nbsp;</span>
<span id="box_name" {=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_color=}~~style="color : #{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_color=};"=}>
<span id="box_name" {=if-empty:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=}~~style="color : #{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=};"=}>
<!-- //NI -->
{=if-equal:{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}~${HOSTNAME}~{=script:Y_Tools get_hostname=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}=}</span>
{=if-equal:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}~${HOSTNAME}~{=script:Y_Tools get_hostname=}~{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}=}</span>
<span id="clock">00:00</span>
</td>
</tr>

2
data/y-web/Y_Settings_Menue.yhtm
View File

@@ -13,7 +13,7 @@ function init(){
</script>
{=include-block:Y_Blocks.txt;head_close=}
<body onload="init()">
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.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~=}=}
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>{=L:main.settings=}</h2></div>
<div class="y_menu_sec_box_body">

12
data/y-web/Y_Settings_wol.yhtm
View File

@@ -3,9 +3,9 @@
<script src="/Y_Baselib.js"></script>
<script>
var g_wol = new Array(
"{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_1=}",
"{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_2=}",
"{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_3=}");
"{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_1=}",
"{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_2=}",
"{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_3=}");
function do_wol(_nr)
{
var nhttpd_version = loadSyncURL("/control/exec?Y_Tools&wol&"+g_wol[_nr-1]);
@@ -28,15 +28,15 @@ function goto_settings(){
<form name="f" action="/y/cgi">
<table border="0" class="y_form_table">
<tr>
<td>Wake on Lan MAC 1 ({=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_1=}) {=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_desc_1=}</td>
<td>Wake on Lan MAC 1 ({=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_1=}) {=ini-get:%(CONFIGDIR)/yWeb.conf;wol_desc_1=}</td>
<td><input id="wol1" type="button" name="wol_mac_1" value="wake up" title="wake up that MAC" onclick='do_wol(1)'/></td>
</tr>
<tr>
<td>Wake on Lan MAC 2 ({=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_2=}) {=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_desc_2=}</td>
<td>Wake on Lan MAC 2 ({=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_2=}) {=ini-get:%(CONFIGDIR)/yWeb.conf;wol_desc_2=}</td>
<td><input id="wol2" type="button" name="wol_mac_2" value="wake up" title="wake up that MAC" onclick='do_wol(2)'/></td>
</tr>
<tr>
<td>Wake on Lan MAC 3 ({=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_3=}) {=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_desc_3=}</td>
<td>Wake on Lan MAC 3 ({=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_3=}) {=ini-get:%(CONFIGDIR)/yWeb.conf;wol_desc_3=}</td>
<td><input id="wol3" type="button" name="wol_mac_3" value="wake up" title="wake up that MAC" onclick='do_wol(3)'/></td>
</tr>
<tr><td colspan="2"><a href="javascript:goto_settings()" class="inlink">{=L:main.settings=}</a></td></tr>

30
data/y-web/Y_Settings_yWeb.yhtm
View File

@@ -26,7 +26,7 @@ function do_submit(){
}
}
function do_init(){
var val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;0~open=}";
var val = "{=ini-get:/var/tuxbox/config/yWeb.conf;fb;0~open=}";
var cst = (loadSyncURL("/control/info?hwinfo").indexOf("CST") > -1);
var fb_options = document.f.fb.getElementsByTagName("option");
for (var i = 0; i < fb_options.length; i++)
@@ -42,8 +42,8 @@ function do_init(){
fb_options[i].disabled = true;
}
}
obj_set_radio_value('screenshot_rc', "{=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false~cache=}");
val = "{=ini-get:%(CONFIGDIR)/Y-Web.conf;start_page;bouquets~cache=}";
obj_set_radio_value('screenshot_rc', "{=ini-get:%(CONFIGDIR)/yWeb.conf;screenshot_rc;false~cache=}");
val = "{=ini-get:%(CONFIGDIR)/yWeb.conf;start_page;bouquets~cache=}";
var sel=4;
switch(val){
case "bouquets": sel=0; break;
@@ -52,9 +52,9 @@ function do_init(){
case "screenshot": sel=3; break;
}
document.f.start_page.selectedIndex = sel;
style_old = "{=ini-get:%(CONFIGDIR)/Y-Web.conf;style~cache=}";
style_old = "{=ini-get:%(CONFIGDIR)/yWeb.conf;style~cache=}";
//NI
if ("{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}" == "${HOSTNAME}") {
if ("{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}" == "${HOSTNAME}") {
document.f.hostname.checked = true;
document.f.yweb_box_name.value = "${HOSTNAME}";
document.f.yweb_box_name.readOnly = true;
@@ -97,35 +97,35 @@ select {
<tr><td class="y_form_header" colspan="4">{=L:set.yweb.management_IPs=}</td></tr>
<tr>
<td>IP 1</td>
<td colspan="3"><input type="text" name="managementIP" size="15" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=}" title="{=L:set.yweb.enter_ip_desc=}"/></td>
<td colspan="3"><input type="text" name="managementIP" size="15" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip=}" title="{=L:set.yweb.enter_ip_desc=}"/></td>
</tr>
<tr>
<td>IP 2</td>
<td colspan="3"><input type="text" name="managementIP2" size="15" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}" title="{=L:set.yweb.enter_ip_desc=}"/></td>
<td colspan="3"><input type="text" name="managementIP2" size="15" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip2=}" title="{=L:set.yweb.enter_ip_desc=}"/></td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:set.yweb.wake_on_lan=}</td></tr>
<tr>
<td>MAC 1</td>
<td><input type="text" name="wol_mac_1" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_1=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td><input type="text" name="wol_mac_1" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_1=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td>{=L:set.yweb.description=}</td>
<td><input type="text" name="wol_desc_1" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_desc_1=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
<td><input type="text" name="wol_desc_1" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_desc_1=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
</tr>
<tr>
<td>MAC 2</td>
<td><input type="text" name="wol_mac_2" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_2=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td><input type="text" name="wol_mac_2" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_2=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td>{=L:set.yweb.description=}</td>
<td><input type="text" name="wol_desc_2" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_desc_2=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
<td><input type="text" name="wol_desc_2" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_desc_2=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
</tr>
<tr>
<td>MAC 3</td>
<td><input type="text" name="wol_mac_3" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_mac_3=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td><input type="text" name="wol_mac_3" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_mac_3=}" title="{=L:set.yweb.enter_mac_desc=}"/></td>
<td>{=L:set.yweb.description=}</td>
<td><input type="text" name="wol_desc_3" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;wol_desc_3=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
<td><input type="text" name="wol_desc_3" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;wol_desc_3=}" title="{=L:set.yweb.enter_description_desc=}"/></td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:set.yweb.box_tag=}</td></tr>
<tr>
<td>{=L:set.yweb.box_tag=}</td>
<td colspan="3"><input type="text" name="yweb_box_name" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}"
<td colspan="3"><input type="text" name="yweb_box_name" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}"
title="{=L:set.yweb.box_tag_desc=}"/>
<!-- //NI -->
<input type="checkbox" name="hostname" value="Hostname" onclick="do_switch_hostname()"/> Hostname
@@ -133,7 +133,7 @@ select {
</tr>
<tr>
<td>{=L:set.yweb.box_color=}</td>
<td colspan="3"><input type="text" name="yweb_box_color" size="8" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_color=}"
<td colspan="3"><input type="text" name="yweb_box_color" size="8" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=}"
title="{=L:set.yweb.box_color_desc=}"/></td>
</tr>
<tr><td class="y_form_header" colspan="4">{=L:others=}</td></tr>

8
data/y-web/Y_Tools_Check_Install.yhtm
View File

@@ -61,13 +61,13 @@ function do_check(){
"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=}", "notice");
=}
/*settings*/
{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=}~~
{=if-empty:{=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip=}~~
sLog_addRow(sLog_body, "yellow",
"Settings: Management IP(1) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=} ! Your IP is {=func:get_request_data client_addr=}.", "notice");
"Settings: Management IP(1) is set to {=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip=} ! Your IP is {=func:get_request_data client_addr=}.", "notice");
=}
{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~~
{=if-empty:{=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip2=}~~
sLog_addRow(sLog_body, "yellow",
"Settings: Management IP(2) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=} ! Your IP is {=func:get_request_data client_addr=}.", "notice");
"Settings: Management IP(2) is set to {=ini-get:%(CONFIGDIR)/yWeb.conf;management_ip2=} ! Your IP is {=func:get_request_data client_addr=}.", "notice");
=}
/*programs*/

2
data/y-web/Y_Tools_Menue.yhtm
View File

@@ -13,7 +13,7 @@ function init(){
}
</script>
{=include-block:Y_Blocks.txt;head_close=}
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.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:automount={=find-exec:automount=}=}
{=var-set:ether-wake={=find-exec:ether-wake=}=}
<body onload="init()">

2
data/y-web/Y_Version.txt
View File

@@ -1,3 +1,3 @@
version=3.0.35
version=3.0.36
date=19.02.2023
info=NI-Neutrino-Webinterface

10
data/y-web/scripts/Y_Tools.sh
View File

@@ -14,8 +14,8 @@
# -----------------------------------------------------------
style_get()
{
check_Y_Web_conf
active_style=$(config_get_value_direct $y_config_Y_Web 'style')
check_yWeb_conf
active_style=$(config_get_value_direct $y_config_yWeb 'style')
y_path_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.directory')
y_path_override_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.override_directory')
@@ -55,7 +55,7 @@ style_set()
# This function should be called one time after installing a new image
# to get sure, the right skin is installed too
style=${1:-$(config_get_value_direct $y_config_Y_Web 'style')}
style=${1:-$(config_get_value_direct $y_config_yWeb 'style')}
test -n "$style" || return
y_path_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.directory')
@@ -67,7 +67,7 @@ style_set()
elif [ -e $y_path_directory/styles/Y_Dist-$style.css ]; then
cp $y_path_directory/styles/Y_Dist-$style.css Y_Dist.css
else
config_set_value_direct $y_config_Y_Web 'style'
config_set_value_direct $y_config_yWeb 'style'
fi
}
@@ -480,7 +480,7 @@ case "$1" in
ps) msg=`ps aux`; y_format_message_html ;;
free) f=`free`; p=`df -h`; msg="RAM Memory use\n-------------------\n$f\n\nPartitions\n-------------------\n$p"; y_format_message_html ;;
yreboot) reboot; echo "Reboot..." ;;
check_yWeb_conf) check_Y_Web_conf ;;
check_yWeb_conf) check_yWeb_conf ;;
rcsim) rcsim $2 >/dev/null ;;
domount) shift 1; do_mount $* ;;
dounmount) shift 1; do_unmount $* ;;

2
data/y-web/scripts/_Y_Globals.sh
View File

@@ -29,7 +29,7 @@ y_url_control="http://localhost/control"
# -----------------------------------------------------------
# Files
# -----------------------------------------------------------
y_config_Y_Web="$y_path_config/Y-Web.conf"
y_config_yWeb="$y_path_config/yWeb.conf"
y_config_nhttpd="$y_path_config/nhttpd.conf"
y_config_neutrino="$y_path_config/neutrino.conf"
y_upload_file="$y_path_tmp/upload.tmp"

8
data/y-web/scripts/_Y_Library.sh
View File

@@ -205,12 +205,12 @@ msg_popup()
}
# -----------------------------------------------------------
# create Y_Web.conf if does not exists
# create yWeb.conf if does not exists
# -----------------------------------------------------------
check_Y_Web_conf()
check_yWeb_conf()
{
if ! [ -e $y_config_Y_Web ]
if ! [ -e $y_config_yWeb ]
then
echo "skin=Tuxbox" >$y_config_Y_Web
echo "skin=NI_dark" > $y_config_yWeb
fi
}

3
src/nhttpd/Makefile.am
View File

@@ -26,6 +26,5 @@ libnhttpd_adir = @CONFIGDIR@
libnhttpd_a_DATA = nhttpd.conf
EXTRA_DIST = nhttpd.conf nhttpd.conf.in
# NI
installdir = $(CONFIGDIR)
install_DATA = Y-Web.conf
install_DATA = yWeb.conf

0
src/nhttpd/Y-Web.conf → src/nhttpd/yWeb.conf
View File

2
src/nhttpd/yconfig.h
View File

@@ -106,7 +106,7 @@
#define HTTPD_CONFIGDIR CONFIGDIR
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf"
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf"
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/yWeb.conf"
#define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf"
#define MOVIEBROWSER_CONFIGFILE CONFIGDIR"/moviebrowser.conf"