[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-526-gfc1c808
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-526-gfc1c808
|
From: GetAway <tux...@ne...> - 2015-04-15 18:42:54
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via fc1c8084e15da61091391a06316945d9795c147d (commit)
via e987da8838695f5e52047176a9278bd213a6fb6b (commit)
via b8631f11ba44320976ee5393dac48e6ca039a7a7 (commit)
from 6b89af1d88bb6106ac17b9ae6d002f1980bf1127 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fc1c8084e15da61091391a06316945d9795c147d
Author: GetAway <get...@t-...>
Date: Wed Apr 15 20:41:38 2015 +0200
yWeb: simplify code by using find-exec function
based on svenhoefer <sve...@sv...>
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
index 4fcfa0b..d7a7723 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
@@ -136,9 +136,9 @@ function get_data(){
//]]>
</script>
</head>
-{=var-set:lcshot={=if-file-exists:/bin/lcshot~true~{=if-file-exists:/var/bin/lcshot~true~false=}=}=}
-{=var-set:fbshot={=if-file-exists:/bin/fbshot~true~{=if-file-exists:/var/bin/fbshot~true~false=}=}=}
-{=var-set:dboxshot={=if-file-exists:/bin/dboxshot~true~{=if-file-exists:/var/bin/dboxshot~true~false=}=}=}
+{=var-set:lcshot={=find-exec:lcshot=}=}
+{=var-set:fbshot={=find-exec:fbshot=}=}
+{=var-set:dboxshot={=find-exec:dboxshot=}=}
<body>
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>{=L:0100=}</h2></div>
@@ -149,20 +149,20 @@ function get_data(){
<li><a target="work" title="{=L:0202=}" href="Y_Tools_Boxcontrol.yhtm">{=L:0203=}</a></li>
<li><a target="work" title="{=L:0204=}" href="Y_Boxcontrol_Messages.yhtm">{=L:0205=}</a></li>
<li><a target="work" title="{=L:0206=}" href="Y_Tools_Rcsim.yhtm">{=L:0207=}</a></li>
- {=if-equal:{=var-get:lcshot=}~true~
- <li><a target="work" title="{=L:0210=}" href="Y_Tools_lcshot.yhtm">{=L:0209=}</a></li>
+ {=if-empty:{=var-get:lcshot=}~
+ <li class="disabled" title="{=L:0211=} /bin:/var/bin">{=L:0209=}</li>
~
- <li class="disabled" title="{=L:0211=} /bin oder /var/bin">{=L:0209=}</li>
+ <li><a target="work" title="{=L:0210=}" href="Y_Tools_lcshot.yhtm">{=L:0209=}</a></li>
=}
- {=if-equal:{=var-get:fbshot=}~true~
- <li><a target="work" title="{=L:0213=}" href="Y_Tools_fbshot.yhtm">{=L:0212=}</a></li>
+ {=if-empty:{=var-get:fbshot=}~
+ <li class="disabled" title="{=L:0214=} /bin:/var/bin">{=L:0212=}</li>
~
- <li class="disabled" title="{=L:0214=} /bin oder /var/bin">{=L:0212=}</li>
+ <li><a target="work" title="{=L:0213=}" href="Y_Tools_fbshot.yhtm">{=L:0212=}</a></li>
=}
- {=if-equal:{=var-get:dboxshot=}~true~
- <li><a target="work" title="{=0114=}" href="Y_Tools_remote_osd.yhtm">{=L:0114=}</a></li>
+ {=if-empty:{=var-get:dboxshot=}~
+ <li class="disabled" title="{=0222=} /bin:/var/bin">{=L:0114=}</li>
~
- <li class="disabled" title="{=0222=} /bin oder /var/bin">{=L:0114=}</li>
+ <li><a target="work" title="{=0114=}" href="Y_Tools_remote_osd.yhtm">{=L:0114=}</a></li>
=}
</ul>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
index 3ccc3ff..97e63e0 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
@@ -138,7 +138,7 @@ function view_transcode_mode()
</div>
<script type="text/javascript">
//<![CDATA[
- haveUDP = ("{=if-file-exists:/sbin/udpstreamts~true~{=if-file-exists:/var/bin/udpstreamts~true~false=}=}" == "true");
+ haveUDP = ("{=find-exec:udpstreamts=}" != "");
isUDP = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;udp;false=}" == "true");
Mode = "{=mode=}";
LiveTyp = "{=typ=}";
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
index 8506d2b..8a2df7e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
@@ -55,7 +55,7 @@ function do_check()
{
sLog_init();
sLog_clear();
- sLog_addRow(sLog_body, "ok", "yWeb Version is: {=ini-get:Y_Version.txt;version=} {=ini-get:Y_Version.txt;date=}", "ok");
+ sLog_addRow(sLog_body, "ok", "yWeb Version is: {=ini-get:Y_Version.txt;version=} - {=ini-get:Y_Version.txt;date=}", "ok");
/*webserver*/
var needed_nhttpd_version = "3.1.8";
@@ -87,38 +87,44 @@ function do_check()
=}
/*programs*/
- {=var-set:fbshot={=if-file-exists:/bin/fbshot~/bin/fbshot~{=if-file-exists:/var/bin/fbshot~/var/bin/fbshot~false=}=}=}
- {=if-equal:{=var-get:fbshot=}~false~
+ {=var-set:lcshot={=find-exec:lcshot=}=}
+ {=if-empty:{=var-get:lcshot=}~
+ sLog_addRow(sLog_body, "red", "Programs: lcshot is not installed. LCD Screenshot is disabled. ", "failed");
+ ~
+ sLog_addRow(sLog_body, "green", "Programs: lcshot is installed at: {=var-get:lcshot=}. LCD Screenshot is enabled.", "ok");
+ =}
+ {=var-set:fbshot={=find-exec:fbshot=}=}
+ {=if-empty:{=var-get:fbshot=}~
sLog_addRow(sLog_body, "red", "Programs: fbshot is not installed. OSD Screenshot is disabled. ", "failed");
~
sLog_addRow(sLog_body, "green", "Programs: fbshot is installed at: {=var-get:fbshot=}. OSD Screenshot is enabled.", "ok");
=}
- {=var-set:dboxshot={=if-file-exists:/bin/dboxshot~/bin/dboxshot~{=if-file-exists:/var/bin/dboxshot~/var/bin/dboxshot~false=}=}=}
- {=if-equal:{=var-get:dboxshot=}~false~
+ {=var-set:dboxshot={=find-exec:dboxshot=}=}
+ {=if-empty:{=var-get:dboxshot=}~
sLog_addRow(sLog_body, "red", "Programs: dboxshot is not installed. Remote & OSD is disabled. ", "failed");
~
sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote & OSD is enabled.", "ok");
=}
- {=var-set:fcp={=if-file-exists:/sbin/fcp~/sbin/fcp~{=if-file-exists:/var/bin/fcp~/var/bin/fcp~{=if-file-exists:/bin/fcp~/bin/fcp~{=if-file-exists:/sbin/flashcp~/sbin/flashcp~{=if-file-exists:/var/bin/flashcp~/var/bin/flashcp~{=if-file-exists:/bin/flashcp~/bin/flashcp~false}=}=}=}=}=}=}
- {=if-equal:{=var-get:fcp=}~false~
+ {=var-set:fcp={=find-exec:fcp=}=}{=var-set:fcp={=find-exec:flashcp=}=}
+ {=if-empty:{=var-get:fcp=}~
sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. ", "failed");
~
sLog_addRow(sLog_body, "green", "Programs: fcp is installed at: {=var-get:fcp=}. Image flashing is enabled.", "ok");
=}
- {=var-set:ether-wake={=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~false=}=}=}
- {=if-equal:{=var-get:ether-wake=}~false~
+ {=var-set:ether-wake={=find-exec:ether-wake=}=}
+ {=if-empty:{=var-get:ether-wake=}~
sLog_addRow(sLog_body, "red", "Programs: ether-wake is not installed. Wake on LAN is disabled. ", "failed");
~
sLog_addRow(sLog_body, "green", "Programs: ether-wake is installed at: {=var-get:ether-wake=}. Wake on LAN is enabled.", "ok");
=}
- {=var-set:automount={=if-file-exists:/sbin/automount~/sbin/automount~{=if-file-exists:/var/bin/automount~/var/bin/automount~false=}=}=}
- {=if-equal:{=var-get:automount=}~false~
+ {=var-set:automount={=find-exec:automount=}=}
+ {=if-empty:{=var-get:automount=}~
sLog_addRow(sLog_body, "red", "Programs: automount is not installed. AutoMount is disabled. ", "failed");
~
sLog_addRow(sLog_body, "green", "Programs: automount is installed at: {=var-get:automount=}. AutoMount is enabled.", "ok");
=}
- {=var-set:udpstreamts={=if-file-exists:/sbin/udpstreamts~/sbin/udpstreamts~{=if-file-exists:/var/bin/udpstreamts~/var/bin/udpstreamts~false=}=}=}
- {=if-equal:{=var-get:udpstreamts=}~false~
+ {=var-set:udpstreamts={=find-exec:udpstreamts=}=}
+ {=if-empty:{=var-get:udpstreamts=}~
sLog_addRow(sLog_body, "red", "Programs: udpstreamts is not installed. udp-streaming is disabled. ", "failed");
~
sLog_addRow(sLog_body, "green", "Programs: udpstreamts is installed at: {=var-get:udpstreamts=}. udp-streaming is enabled.", "ok");
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
index e56a0a1..daece4a 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
@@ -21,7 +21,8 @@ function do_image_upload_ready()
</script>
</head>
<body>
-{=var-set:fcp={=if-file-exists:/sbin/fcp~true~{=if-file-exists:/var/bin/fcp~true~{=if-file-exists:/bin/fcp~true~{=if-file-exists:/sbin/flashcp~true~{=if-file-exists:/var/bin/flashcp~true~{=if-file-exists:/bin/flashcp~true~false=}=}=}=}=}=}=}
+{=var-set:fcp={=find-exec:fcp=}=}
+{=var-set:fcp={=find-exec:flashcp=}=}
{=var-set:wait_text={=L:4410=}=}{=include-block:Y_Blocks.txt;snip_wait=}
<div id="wait_flash" class="ydiagfree" style="left: 100px; position: absolute; top: 100px; display: none;">
<div class="y_wait_box_visible">
@@ -73,7 +74,9 @@ function do_image_upload_ready()
{=var-set:help_url=Help-Tools-Image=}{=var-set:menu={=L:4416=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<b><font size="2">{=L:4417=} mtd {=mtd=}</font><br />{=mtd_text=}</b>
- {=if-equal:{=var-get:fcp=}~true~
+ {=if-empty:{=var-get:fcp=}~
+ <h2><br /><br /><br /><b><font color="#FF0000">{=L:4421=}</font></b></h2>
+ ~
<form method="post" name="f" id="f" enctype="multipart/form-data" action="/control/exec?Y_Tools&image_upload" target="out">
<p>
<input type="file" name="file" size="40"/><br/>
@@ -81,8 +84,6 @@ function do_image_upload_ready()
<button type="button" ytype="flash" title="{=L:4420=}" name="su" onclick="do_submit()">{=L:4416=}</button><br/>
</p>
</form>
- ~
- <h2><br /><br /><br /><b><font color="#FF0000">{=L:4421=}</font></b></h2>
=}
</div>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Menue.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Menue.yhtm
index ce86cdb..89973be 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Menue.yhtm
@@ -13,7 +13,8 @@ function init(){
}
</script>
</head>
-{=var-set:automount={=if-file-exists:/sbin/automount~true~{=if-file-exists:/var/bin/automount~true~false=}=}=}
+{=var-set:automount={=find-exec:automount=}=}
+{=var-set:ether-wake={=find-exec:ether-wake=}=}
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=}
<body onload="init()">
<div class="y_menu_sec_box">
@@ -33,7 +34,11 @@ function init(){
<li><a target="work" title="{=L:2300=}" href="Y_Settings_automount_liste.yhtm">{=L:2301=}</a></li>
=}
<li><a target="work" title="{=L:2302=}" href="Y_Settings_mount_liste.yhtm">{=L:2303=}</a></li>
- <li><a target="work" title="{=L:2304=}" href="Y_Settings_wol.yhtm">{=L:2304=}</a></li>
+ {=if-empty:{=var-get:ether-wake=}~
+ <li class="disabled" title="{=L:2326=} {=L:2311=}">{=L:2304=}</li>
+ ~
+ <li><a target="work" title="{=L:2304=}" href="Y_Settings_wol.yhtm">{=L:2304=}</a></li>
+ =}
=}
</ul>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_fbshot.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_fbshot.yhtm
index 3829a6e..70e6383 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_fbshot.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_fbshot.yhtm
@@ -45,8 +45,8 @@ function do_clearshot2(){
{=var-set:help_url=Help-BoxControl-OSD_Screenshot=}{=var-set:menu={=L:0212=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<button name="snapshot" ytype="shot" onclick="do_snapshot()">{=L:0300=}</button>
- {=var-set:dboxshot={=if-file-exists:/bin/dboxshot~true~{=if-file-exists:/var/bin/dboxshot~true~false=}=}=}
- {=if-equal:{=var-get:dboxshot=}~true~
+ {=var-set:dboxshot={=find-exec:dboxshot=}=}
+ {=if-empty:{=var-get:dboxshot=}~~
<button name="dboxshot" ytype="shot" onclick="do_dboxshot()">{=L:0301=}</button>
=}
<button name="clearshot" ytype="clearshot" onclick="do_clearshot()">{=L:0302=}</button>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index c3bb9a4..19d5b54 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.1.9
-date=13.04.2015
+version=2.8.2.0
+date=15.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
index 0fdb530..53d6138 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
@@ -495,7 +495,7 @@
2308=Image sichern oder flashen
2309=Image
2310=Shell
-2311=nicht installiert
+2311=ist nicht installiert
2312=fortlaufende Ausgabe (nur IE - wg. scrollen)
2313=Ausgabe anhägen (nur IE)
2314=Verzeichnis
@@ -509,6 +509,7 @@
2322=Dateimanager
2324=yInstaller (für, Dateien, Plugins, ...)
2325=Sammeln von Informationen
+2326=ether-wake
#=========== LIVE Menue
2400=Live/Timer
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/English b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
index 0f8548b..6d5a123 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/English
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
@@ -495,7 +495,7 @@
2308=backup or flash image
2309=Image
2310=Command Shell
-2311=not installed
+2311=is not installed
2312=automatic output scrolling (only IE)
2313=append output (only IE)
2314=Path
@@ -509,6 +509,7 @@
2322=File manager
2324=yInstaller (for files, plugins, ...)
2325=collecting information
+2326=ether-wake
#=========== LIVE Menue
2400=Live/Timer
commit e987da8838695f5e52047176a9278bd213a6fb6b
Author: svenhoefer <sve...@sv...>
Date: Tue Apr 14 17:32:14 2015 +0200
mod_yparser: add find-exec function
return full path and filename of given executable
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
index e408e42..7d12e95 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -19,6 +19,8 @@
#include <signal.h>
// tuxbox
#include <configfile.h>
+#include <system/helper.h>
+
// yhttpd
#include "yconfig.h"
#include "ytypes_globals.h"
@@ -362,8 +364,9 @@ std::string CyParser::cgi_cmd_parsing(CyhookHandler *hh, std::string html_templ
// ini-set:<filename>;<varname>;<value>[~open|save|cache]
// if-empty:<value>~<then>~<else>
// if-equal:<left_value>~<right_value>~<then>~<else> (left_value == right_value?)
-// if-not-equal:<left_value>~<right_value>~<then>~<else> (left_val!e == right_value?)
+// if-not-equal:<left_value>~<right_value>~<then>~<else> (left_value == right_value?)
// if-file-exists:<filename>~<then>~<else>
+// find-exec:<filename>
// include-block:<filename>;<block-name>[;<default-text>]
// var-get:<varname>
// var-set:<varname>=<varvalue>
@@ -427,6 +430,10 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd)
yresult = (access(if_value.c_str(), 4) == 0) ? if_then : if_else;
}
}
+ else if (ycmd_type == "find-exec")
+ {
+ yresult = find_executable(ycmd_name.c_str());
+ }
else if(ycmd_type == "include")
{
std::string ytmp;
commit b8631f11ba44320976ee5393dac48e6ca039a7a7
Author: GetAway <get...@t-...>
Date: Mon Apr 13 22:28:08 2015 +0200
nhttpd: add possibility to use system/helper
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/Makefile.am b/tuxbox/neutrino/Makefile.am
index 2c6eb0b..32ca167 100644
--- a/tuxbox/neutrino/Makefile.am
+++ b/tuxbox/neutrino/Makefile.am
@@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS = gnu
-SUBDIRS = lib daemons src data
+SUBDIRS = lib src data daemons
diff --git a/tuxbox/neutrino/daemons/nhttpd/Makefile.am b/tuxbox/neutrino/daemons/nhttpd/Makefile.am
index b474265..3060be5 100644
--- a/tuxbox/neutrino/daemons/nhttpd/Makefile.am
+++ b/tuxbox/neutrino/daemons/nhttpd/Makefile.am
@@ -21,6 +21,7 @@ nhttpd_LDADD = \
$(top_srcdir)/daemons/nhttpd/yhttpd_core/libyhttpd.a \
$(top_builddir)/lib/sectionsdclient/libsectionsdclient.la \
$(top_builddir)/lib/timerdclient/libtimerdclient.la \
+ $(top_builddir)/src/system/libneutrino_system.a \
@LCDDISPLAY_LIBS@ \
@FREETYPE_LIBS@ \
@CONFIGFILE_LIBS@ \
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/Makefile.am | 2 +-
tuxbox/neutrino/daemons/nhttpd/Makefile.am | 1 +
.../daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm | 24 +++++++-------
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm | 2 +-
.../daemons/nhttpd/web/Y_Tools_Check_Install.yhtm | 32 ++++++++++++--------
.../daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm | 9 +++--
.../neutrino/daemons/nhttpd/web/Y_Tools_Menue.yhtm | 9 ++++-
.../daemons/nhttpd/web/Y_Tools_fbshot.yhtm | 4 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
.../neutrino/daemons/nhttpd/web/languages/Deutsch | 3 +-
.../neutrino/daemons/nhttpd/web/languages/English | 3 +-
.../daemons/nhttpd/yhttpd_mods/mod_yparser.cpp | 9 +++++-
12 files changed, 62 insertions(+), 40 deletions(-)
--
Tuxbox-GIT: apps
|
