Menu
▾
▴
tuxbox-cvs-commits — Tuxbox-commit messages
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(7) |
May
(3) |
Jun
(5) |
Jul
|
Aug
(2) |
Sep
(4) |
Oct
(2) |
Nov
(8) |
Dec
(2) |
| 2014 |
Jan
(3) |
Feb
(2) |
Mar
(2) |
Apr
(3) |
May
|
Jun
|
Jul
(5) |
Aug
(4) |
Sep
|
Oct
(4) |
Nov
(5) |
Dec
(1) |
| 2015 |
Jan
|
Feb
(6) |
Mar
(24) |
Apr
(29) |
May
(43) |
Jun
(17) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: GetAway <tux...@ne...> - 2015-05-12 14:32:23
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via fa967f9f085f85ee99a7280b31d104d6d2987f5b (commit)
from 17875b740770903ec906f159a1bbb016256d50b1 (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 fa967f9f085f85ee99a7280b31d104d6d2987f5b
Author: m4...@gm... <m4...@gm...>
Date: Tue May 12 16:31:41 2015 +0200
network setup: calculate broadcast based on ip and netmask
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/src/gui/network_setup.cpp b/tuxbox/neutrino/src/gui/network_setup.cpp
index 42886de..29d1cd2 100644
--- a/tuxbox/neutrino/src/gui/network_setup.cpp
+++ b/tuxbox/neutrino/src/gui/network_setup.cpp
@@ -44,6 +44,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <linux/if.h>
#include "gui/network_setup.h"
@@ -145,6 +146,15 @@ int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
+void CNetworkSetup::setBroadcast(void)
+{
+ in_addr_t na = inet_addr(network_address.c_str());
+ in_addr_t nm = inet_addr(network_netmask.c_str());
+ struct in_addr in;
+ in.s_addr = na | ~nm;
+ char tmp[40];
+ network_broadcast = (inet_ntop(AF_INET, &in, tmp, sizeof(tmp))) ? std::string(tmp) : "0.0.0.0";
+}
#define OPTIONS_NTPENABLE_OPTION_COUNT 2
const CMenuOptionChooser::keyval OPTIONS_NTPENABLE_OPTIONS[OPTIONS_NTPENABLE_OPTION_COUNT] =
@@ -183,7 +193,8 @@ int CNetworkSetup::showNetworkSetup()
CMenuForwarder *m1 = new CMenuForwarder(LOCALE_NETWORKMENU_IPADDRESS , networkConfig->inet_static, network_address , &networkSettings_NetworkIP );
CMenuForwarder *m2 = new CMenuForwarder(LOCALE_NETWORKMENU_NETMASK , networkConfig->inet_static, network_netmask , &networkSettings_NetMask );
- CMenuForwarder *m3 = new CMenuForwarder(LOCALE_NETWORKMENU_BROADCAST , networkConfig->inet_static, network_broadcast , &networkSettings_Broadcast );
+ setBroadcast();
+ CMenuForwarder *m3 = new CMenuForwarder(LOCALE_NETWORKMENU_BROADCAST , false, network_broadcast);
CMenuForwarder *m4 = new CMenuForwarder(LOCALE_NETWORKMENU_GATEWAY , networkConfig->inet_static, network_gateway , &networkSettings_Gateway );
CMenuForwarder *m5 = new CMenuForwarder(LOCALE_NETWORKMENU_NAMESERVER, networkConfig->inet_static, network_nameserver, &networkSettings_NameServer);
@@ -437,7 +448,7 @@ void CNetworkSetup::restoreNetworkSettings(bool show_message)
network_dhcp = old_network_dhcp;
network_address = old_network_address;
network_netmask = old_network_netmask;
- network_broadcast = old_network_broadcast;
+ setBroadcast();
network_nameserver = old_network_nameserver;
network_gateway = old_network_gateway;
@@ -545,20 +556,13 @@ void CNetworkSetup::showCurrentNetworkSettings()
ShowMsgUTF(LOCALE_NETWORKMENU_SHOW, text, CMessageBox::mbrBack, CMessageBox::mbBack); // UTF-8
}
-bool CNetworkSetup::changeNotify(const neutrino_locale_t OptionName, void * Data)
+bool CNetworkSetup::changeNotify(const neutrino_locale_t OptionName, void * /*Data*/)
{
- if (ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_IPADDRESS))
- {
- char ip[16];
- unsigned char _ip[4];
- sscanf((char*) Data, "%hhu.%hhu.%hhu.%hhu", &_ip[0], &_ip[1], &_ip[2], &_ip[3]);
-
- sprintf(ip, "%hhu.%hhu.%hhu.255", _ip[0], _ip[1], _ip[2]);
- networkConfig->broadcast = ip;
- network_broadcast = networkConfig->broadcast;
-
- networkConfig->netmask = (_ip[0] == 10) ? "255.0.0.0" : "255.255.255.0";
- network_netmask = networkConfig->netmask;
+ if (ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_IPADDRESS)) {
+ setBroadcast();
+ }
+ else if(OptionName == LOCALE_NETWORKMENU_NETMASK) {
+ setBroadcast();
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_NTPSERVER) ||
ARE_LOCALES_EQUAL(OptionName, LOCALE_NETWORKMENU_NTPREFRESH) ||
diff --git a/tuxbox/neutrino/src/gui/network_setup.h b/tuxbox/neutrino/src/gui/network_setup.h
index cb0fc24..2723eb7 100644
--- a/tuxbox/neutrino/src/gui/network_setup.h
+++ b/tuxbox/neutrino/src/gui/network_setup.h
@@ -71,6 +71,7 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
bool checkForIP();
bool settingsChanged();
const char * mypinghost(const char * const host);
+ void setBroadcast(void);
public:
enum NETWORK_DHCP_MODE
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/network_setup.cpp | 34 ++++++++++++++++------------
tuxbox/neutrino/src/gui/network_setup.h | 1 +
2 files changed, 20 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-10 19:17:08
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 17875b740770903ec906f159a1bbb016256d50b1 (commit)
from 5e284d6b1c1f3f4be4995e9e420f1f65912d7806 (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 17875b740770903ec906f159a1bbb016256d50b1
Author: Stefan Seyfried <se...@tu...>
Date: Sun May 10 21:16:33 2015 +0200
ywebserver: try to use port 8080 if port 80 is not available
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp
index 4b44757..dcd4d07 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp
@@ -119,10 +119,17 @@ CWebserver::~CWebserver()
#define MAX_TIMEOUTS_TO_TEST 100
bool CWebserver::run(void)
{
- if(!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS))
- {
- dperror("Socket cannot bind and listen. Abort.\n");
- return false;
+ if (!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS)) {
+ if (port != 80) {
+ fprintf(stderr, "[yhttpd] Socket cannot bind and listen on port %d Abort.\n", port);
+ return false;
+ }
+ fprintf(stderr, "[yhttpd] cannot bind and listen on port 80, retrying on port 8080.\n");
+ port = 8080;
+ if (!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS)) {
+ fprintf(stderr, "[yhttpd] Socket cannot bind and listen on port %d Abort.\n", port);
+ return false;
+ }
}
#ifdef Y_CONFIG_FEATURE_KEEP_ALIVE
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/yhttpd_core/ywebserver.cpp | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-09 19:04:13
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 5e284d6b1c1f3f4be4995e9e420f1f65912d7806 (commit)
from 34529ba9a5d364d7ba9c71364614248e651eef21 (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 5e284d6b1c1f3f4be4995e9e420f1f65912d7806
Author: GetAway <get...@t-...>
Date: Sat May 9 21:02:17 2015 +0200
yWeb: port "Tuxbox.DisplayLogos" from martii & svenhofer
now support for jpg, and gif logos
as an example: start nfs share of Coolstream Logo-Dir
and mount it with your dbox.
set dir of logos in yWeb/Settings/Webserver ;)
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
index 13710ca..15646a6 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
@@ -424,3 +424,24 @@ std::string CNeutrinoAPI::timerEventRepeat2Str(CTimerd::CTimerEventRepeat rep)
return result;
}
+//-------------------------------------------------------------------------
+std::string CNeutrinoAPI::getLogoFile(std::string _logoURL, t_channel_id channelId) {
+ std::string channelIdAsString = string_printf( PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS , channelId & 0xFFFFFFFFFFFFULL);
+ std::string channelName = GetServiceName(channelId);
+// replace(channelName, " ", "_");
+ _logoURL+="/";
+ if (access((_logoURL + channelName + ".png").c_str(), 4) == 0)
+ return _logoURL + channelName + ".png";
+ else if (access((_logoURL + channelName + ".jpg").c_str(), 4) == 0)
+ return _logoURL + channelName + ".jpg";
+ else if (access((_logoURL + channelName + ".gif").c_str(), 4) == 0)
+ return _logoURL + channelName + ".gif";
+ else if(access((_logoURL + channelIdAsString + ".png").c_str(), 4) == 0)
+ return _logoURL + channelIdAsString + ".png";
+ else if (access((_logoURL + channelIdAsString + ".jpg").c_str(), 4) == 0)
+ return _logoURL + channelIdAsString + ".jpg";
+ else if (access((_logoURL + channelIdAsString + ".gif").c_str(), 4) == 0)
+ return _logoURL + channelIdAsString + ".gif";
+ else
+ return "";
+}
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.h b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.h
index c4898bc..9dd9c7c 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.h
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.h
@@ -75,6 +75,7 @@ class CNeutrinoAPI
std::string timerEventType2Str(CTimerd::CTimerEventTypes type);
std::string timerEventRepeat2Str(CTimerd::CTimerEventRepeat rep);
+ std::string getLogoFile(std::string _logoURL, t_channel_id channelId);
public:
CNeutrinoAPI();
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 0378b0e..7b54c6f 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -74,7 +74,6 @@ THandleStatus CNeutrinoYParser::Hook_ReadConfig(CConfigFile *Config, CStringList
ConfigList["ExtrasDocumentURL"] = Config->getString("ExtrasDocURL", EXTRASDOCUMENTURL);
// ConfigList["NewGui"] = Config->getString("NewGui", "true");
ConfigList["Zapit_XML_Path"] = Config->getString("Zapit_XML_Path", ZAPITXMLPATH);
- ConfigList["TUXBOX_LOGOS_URL"]= Config->getString("Tuxbox.LogosURL", TUXBOX_LOGOS_URL);
if (Config->getInt32("configfile.version") < 3)
{
@@ -99,6 +98,7 @@ const CNeutrinoYParser::TyFuncCall CNeutrinoYParser::yFuncCallList[]=
{"get_channels_as_dropdown", &CNeutrinoYParser::func_get_channels_as_dropdown},
{"get_bouquets_with_epg", &CNeutrinoYParser::func_get_bouquets_with_epg},
{"get_actual_channel_id", &CNeutrinoYParser::func_get_actual_channel_id},
+ {"get_logo_name", &CNeutrinoYParser::func_get_logo_name},
{"get_mode", &CNeutrinoYParser::func_get_mode},
{"get_video_pids", &CNeutrinoYParser::func_get_video_pids},
{"get_audio_pid", &CNeutrinoYParser::func_get_radio_pid},
@@ -317,7 +317,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
std::string timestr;
bool have_logos = false;
- if(!hh->WebserverConfigList["TUXBOX_LOGOS_URL"].empty())
+ if (!hh->WebserverConfigList["Tuxbox.LogosURL"].empty() && hh->WebserverConfigList["Tuxbox.DisplayLogos"] == "true" )
have_logos = true;
CZapitClient::BouquetChannelList::iterator channel = channellist->begin();
for (; channel != channellist->end(); ++channel)
@@ -330,14 +330,34 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
std::string bouquetstr = (BouquetNr >= 0) ? ("&bouquet=" + itoa(BouquetNr)) : "";
yresult += "<tr>";
- if(have_logos)
- yresult += string_printf("<td class=\"%c\" width=\"44\" rowspan=\"2\"><a href=\"javascript:do_zap('"
- PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
- "')\"><img class=\"channel_logo\" src=\"%s/"
- PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
- ".gif\" alt=\"%s\"/></a></td>", classname, channel->channel_id,
- (hh->WebserverConfigList["TUXBOX_LOGOS_URL"]).c_str(),
- channel->channel_id, channel->name);
+
+ if(have_logos) {
+ std::string channel_logo = NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->channel_id);
+ std::string zaplink;
+ if (channel_logo.empty())
+ zaplink = channel->name;
+ else
+ zaplink = string_printf(
+ "<img class=\"channel_logo\" src=\"%s\" title=\"%s\" alt=\"%s\" />"
+ , channel_logo.c_str()
+ , channel->name
+ , channel->name
+ );
+
+ yresult += string_printf(
+ "<td class=\"%c logo_cell %s\" width=\"44\" rowspan=\"2\">"
+ "<a href=\"javascript:do_zap('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
+ "%s"
+ "</a>"
+ "</td>"
+ , classname
+ , (channel_logo.empty() ? "no_logo" : "")
+ , channel->channel_id
+ , zaplink.c_str()
+ , channel->name
+ , channel->name
+ );
+ }
/* timer slider */
if(event && event->duration > 0)
@@ -466,6 +486,20 @@ std::string CNeutrinoYParser::func_get_actual_channel_id(CyhookHandler */*hh*/,
{
return string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,NeutrinoAPI->Zapit->getCurrentServiceID());
}
+
+//-------------------------------------------------------------------------
+// func: Get Logo Name
+//-------------------------------------------------------------------------
+std::string CNeutrinoYParser::func_get_logo_name(CyhookHandler *hh, std::string channelId)
+{
+ if (hh->WebserverConfigList["Tuxbox.DisplayLogos"] == "true") {
+ t_channel_id cid;
+ if (1 == sscanf(channelId.c_str(), "%llx", &cid))
+ return NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], cid);
+ }
+ return "";
+}
+
//-------------------------------------------------------------------------
// y-func : get_mode (returns tv|radio|unknown)
//-------------------------------------------------------------------------
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.h b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.h
index de2b52c..97a10de 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.h
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.h
@@ -36,6 +36,7 @@ private:
std::string func_get_actual_bouquet_number(CyhookHandler *hh, std::string para);
std::string func_get_channels_as_dropdown(CyhookHandler *hh, std::string para);
std::string func_get_actual_channel_id(CyhookHandler *hh, std::string para);
+ std::string func_get_logo_name(CyhookHandler *hh, std::string para);
std::string func_get_bouquets_with_epg(CyhookHandler *hh, std::string para);
std::string func_get_mode(CyhookHandler *hh, std::string para);
std::string func_get_video_pids(CyhookHandler *hh, std::string para);
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
index b43d0fb..8bd4289 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
@@ -54,6 +54,7 @@ start-block~nhttpd_save_settings
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.mime_types;{=mod_sendfile_mime_types=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;mod_sendfile.sendAll;{=mod_sendfile_sendAll=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;Language.selected;{=language=}~cache=}
+{=ini-set:/var/tuxbox/config/nhttpd.conf;Tuxbox.DisplayLogos;{=Tuxbox_DisplayLogos=}~cache=}
{=ini-set:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL;{=Tuxbox_LogosURL=}~save=}
{=func:do_reload_httpd_config=}
end-block~nhttpd_save_settings
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
index 195ca2f..302f9cd 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
@@ -10,8 +10,7 @@ function do_zap(channelid)
}
function do_epg(channelid)
{
- window.location.href="Y_Dyn_Pages.yhtm?page=frame_live_epg&channel="+channelid;
-// window.open("Y_Dyn_Pages.yhtm?page=frame_live_epg&channel="+channelid, "epg", "width=400");
+ window.location.href="Y_Dyn_Pages.yhtm?page=frame_live_epg&channel="+channelid+"&logoid="+logoid;
}
function do_streaminfo()
{
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
index ddc7860..ffd79f1 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
@@ -50,11 +50,9 @@ function show_info(_index)
}
function check_logo()
{
- {=if-equal:{=ini-get:/var/tuxbox/config/nhttpd.conf;ExtrasDocRoot=}~web~~
- var test = loadSyncURL("{=ini-get:/var/tuxbox/config/nhttpd.conf;ExtrasDocURL=}/logos/{=channel=}.gif");
- if(test != "")
- =}
+ {=if-empty:{=logoid=}~~
show_obj("logo",true);
+ =}
}
function show_epg() {
show_waitbox(true);
@@ -108,7 +106,7 @@ function _show_epg()
<table id="epglist" class="y_invisible_table" cellpadding="4" cellspacing="0" width="100%">
<thead align="left">
<tr>
- <th colspan="2"><img id="logo" src="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL=}/{=channel=}.gif" style="visibility:hidden"> </th>
+ <th colspan="2"><img id="logo" src="{=func:get_logo_name {=channel=}=}" style="visibility:hidden; max-width: 50px;"/></th>
<th>{=L:0035=}</th><th>{=L:0036=}</th><th>{=L:0037=}</th><th>{=L:0038=}</th>
</tr>
</thead>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
index 27bdf6d..29434b4 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
@@ -8,6 +8,7 @@ function form_init()
obj_set_radio_value('authenticate', "{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.authenticate;false=}");
obj_set_radio_value('threading', "{=ini-get:/var/tuxbox/config/nhttpd.conf;webserver.threading;false=}");
obj_set_radio_value('mod_sendfile_sendAll', "{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_sendfile.sendAll;false=}");
+ obj_set_radio_value('Tuxbox_DisplayLogos', "{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.DisplayLogos;true=}");
}
function do_submit()
{
@@ -22,6 +23,13 @@ function do_submit()
document.f.submit();
}
}
+function do_check_input_LogosURL()
+{
+ if(document.getElementById('Tuxbox_DisplayLogos').checked == true)
+ document.f.Tuxbox_LogosURL.readOnly = false;
+ else
+ document.f.Tuxbox_LogosURL.readOnly = true;
+}
//]]>
</script>
</head>
@@ -93,6 +101,13 @@ function do_submit()
</tr>
<tr><td colspan="2" class="y_form_header">{=L:0008=}</td></tr>
<tr>
+ <td>{=L:1523=}</td>
+ <td>
+ <input type="radio" name="Tuxbox_DisplayLogos" value="false" onClick="do_check_input_LogosURL()" />{=L:0032=}
+ <input type="radio" name="Tuxbox_DisplayLogos" value="true" onClick="do_check_input_LogosURL()" id="Tuxbox_DisplayLogos" />{=L:0031=}
+ </td>
+ </tr>
+ <tr>
<td>{=L:1513=}</td>
<td><input type="text" name="Tuxbox_LogosURL" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL~cache=}" title="{=L:1512=}" /></td>
</tr>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 8ba32a4..362fee4 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.2.32
+version=2.8.3.00
date=09.05.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
index 83b8702..ebd6da9 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
@@ -394,6 +394,7 @@
1520=Server Konfiguration
1521=Passwort muss mind. 4 Zeichen haben
1522=Port muss angegeben werden
+1523=Logos anzeigen
#========= Settings yWeb
1600=IP Adresse eingeben (xxx.xxx.xxx.xxx)
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/English b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
index f565052..871bc3e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/English
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
@@ -394,6 +394,7 @@
1520=Server Configuration
1521=Password must have 4 letters at minimum
1522=Port is required
+1523=Show Logos
#=========Settings yWeb
1600=enter IP (xxx.xxx.xxx.xxx)
diff --git a/tuxbox/neutrino/daemons/nhttpd/yconfig.h b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
index c5355aa..b680951 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yconfig.h
+++ b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
@@ -191,8 +191,6 @@
#define UPLOAD_TMP_FILE "/tmp/upload.tmp"
#define CACHE_DIR "/tmp/.cache"
-#define TUXBOX_LOGOS_URL ""
-
#endif
//-----------------------------------------------------------------------------
// Configurations for AVM FritzBox
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp
index a8e6b9b..2ae9eea 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp
@@ -488,6 +488,28 @@ void Cyhttpd::ReadConfig(void)
ConfigList["WebsiteMain.directory"] = Config->getString("WebsiteMain.directory", PRIVATEDOCUMENTROOT);
ConfigList["WebsiteMain.override_directory"] = Config->getString("WebsiteMain.override_directory", PUBLICDOCUMENTROOT);
ConfigList["WebsiteMain.hosted_directory"] = Config->getString("WebsiteMain.hosted_directory", HOSTEDDOCUMENTROOT);
+
+ // Logos
+ ConfigList["Tuxbox.DisplayLogos"] = Config->getString("Tuxbox.DisplayLogos", "true");
+ // Check location of logos
+ if (Config->getString("Tuxbox.LogosURL", "").empty()) {
+#ifdef Y_CONFIG_USE_HOSTEDWEB
+ if (access((ConfigList["WebsiteMain.hosted_directory"] + "/logos").c_str(), R_OK) == 0){
+ Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.hosted_directory"] + "/logos");
+ have_config = false; //save config
+ }
+#endif
+ else if (access((ConfigList["WebsiteMain.override_directory"] + "/logos").c_str(), R_OK) == 0) {
+ Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.override_directory"] + "/logos");
+ have_config = false; //save config
+ }
+ else if (access((ConfigList["WebsiteMain.directory"] + "/logos").c_str(), R_OK) == 0){
+ Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.directory"] + "/logos");
+ have_config = false; //save config
+ }
+ }
+ ConfigList["Tuxbox.LogosURL"] = Config->getString("Tuxbox.LogosURL", "");
+
#ifdef Y_CONFIG_USE_OPEN_SSL
ConfigList["SSL"] = Config->getString("WebsiteMain.ssl", "false");
ConfigList["SSL_pemfile"] = Config->getString("WebsiteMain.ssl_pemfile", SSL_PEMFILE);
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/neutrinoapi.cpp | 21 ++++++++
.../daemons/nhttpd/tuxboxapi/neutrinoapi.h | 1 +
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp | 54 ++++++++++++++++----
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.h | 1 +
tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt | 1 +
.../nhttpd/web/Y_Boxcontrol_Channellist.yhtm | 3 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm | 8 +--
.../daemons/nhttpd/web/Y_Settings_nhttpd.yhtm | 15 ++++++
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 2 +-
.../neutrino/daemons/nhttpd/web/languages/Deutsch | 1 +
.../neutrino/daemons/nhttpd/web/languages/English | 1 +
tuxbox/neutrino/daemons/nhttpd/yconfig.h | 2 -
tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp | 22 ++++++++
13 files changed, 112 insertions(+), 20 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-09 12:50:57
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 34529ba9a5d364d7ba9c71364614248e651eef21 (commit)
from 44957a4f6a17d0c00d837fb6685938671a328394 (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 34529ba9a5d364d7ba9c71364614248e651eef21
Author: GetAway <get...@t-...>
Date: Sat May 9 14:47:52 2015 +0200
yweb: small cosmetic
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm
index 92a6aa7..6b62876 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm
@@ -92,7 +92,7 @@ function vlc() {
<table border="0" width="100%">
<tr>
<td width="150" id="prim">
- <span style="font-size: 8pt;position:relative;left:45px;top:10px;">{=L:0116=} {=ini-get:Y_Version.txt;version=}</span>
+ <span style="font-size: 8pt;position:relative;left:45px;top:10px;">v{=ini-get:Y_Version.txt;version=}</span>
</td>
<td>
<ul id="menu_prim" class="y_menu_prim">
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index f1b0983..8ba32a4 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.2.31
-date=07.05.2015
+version=2.8.2.32
+date=09.05.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
index 53d6138..83b8702 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
@@ -93,7 +93,6 @@
0113=LiveTV Popup
0114=Fernbedienung & OSD
0115=Live TV direkt im VLC Client
-0116=Version
#========= Boxcontrol Menue
0200=Sender auswählen
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/English b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
index 6d5a123..f565052 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/English
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
@@ -93,7 +93,6 @@
0113=LiveTV popup
0114=Remote & OSD
0115=Stream to VLC Client
-0116=Version
#========= Boxcontrol Menue
0200=Switch channels
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
.../neutrino/daemons/nhttpd/web/languages/Deutsch | 1 -
.../neutrino/daemons/nhttpd/web/languages/English | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-07 18:59:37
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 44957a4f6a17d0c00d837fb6685938671a328394 (commit)
from 69480c1578baba8b7a36e0fa27689bec2db7d40a (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 44957a4f6a17d0c00d837fb6685938671a328394
Author: GetAway <get...@t-...>
Date: Thu May 7 20:58:54 2015 +0200
yWeb: remove unused code in Y_Blocks.txt
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
index 1ba232d..b43d0fb 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
@@ -14,11 +14,6 @@ start-block~timer
</body>
end-block~timer
-# ------- build live url
-start-block~build_live_url
-{=var-set:mrl={=if-equal:{=mode=}~tv~http://{=func:get_header_data Host=}:31339/0,{=func:get_video_pids {=if-empty:{=audiopid=}~00000~{=audiopid=}=}=}~http://{=func:get_header_data Host=}:31338/{=func:get_audio_pid=}=}=}
-end-block~build_live_url
-
# ------- yWeb save Settings
start-block~yWeb_save_settings
{=ini-set:/var/tuxbox/config/Y-Web.conf;management_ip;{=managementIP=}~open=}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 73bc5b2..f1b0983 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.2.30
+version=2.8.2.31
date=07.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt | 5 -----
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-07 18:46:05
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 69480c1578baba8b7a36e0fa27689bec2db7d40a (commit)
via 9d8f2313debcad8bc6dced2c8f16561963de8d5d (commit)
via bda8ceb4c47c70311b9dc577a5c05aa3c8dc0a7e (commit)
from 3b19f1bdf4736b1d9a711d7be2e789eda67cbbac (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 69480c1578baba8b7a36e0fa27689bec2db7d40a
Author: GetAway <get...@t-...>
Date: Thu May 7 20:45:16 2015 +0200
Y_LIVE.js: fix audio track selection for streamts
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index a3e8075..4dd4ae4 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -213,7 +213,7 @@ function do_play_state(_state, _options)
if(Mode == "tv") {
loadXMLDoc("/control/exec?Y_Live&udp_stream&stop", dummy);
}
- mrl = loadSyncURL("/control/build_live_url");
+ mrl = loadSyncURL("/control/build_live_url?audio_no="+AudioTrack);
}
V2.set_actual_mrl(mrl);
V2.play();
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index bc6a940..73bc5b2 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.2.29
+version=2.8.2.30
date=07.05.2015
type=Release
info=Tuxbox
commit 9d8f2313debcad8bc6dced2c8f16561963de8d5d
Author: GetAway <get...@t-...>
Date: Thu May 7 20:37:02 2015 +0200
Y_LIVE.js: fix IE audio track selection for udp streaming
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index 5c13c39..a3e8075 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -160,18 +160,18 @@ function do_play()
{
var options = new Array();
if(Mode == "tv"){
- if(isDeinterlace){
- options.push(":vout-filter=deinterlace");
- options.push(":deinterlace-mode=bob");
- }
+ if(AudioTrack != 0)
+ options.push(":audio-track="+AudioTrack);
if(isUDP && Mode == "tv"){
options.push(":access-filter=timeshift");
}
else if(cachetime > 0){
options.push(":http-caching="+cachetime);
}
- if(AudioTrack != 0)
- options.push(":audio-track="+AudioTrack);
+ if(isDeinterlace){
+ options.push(":vout-filter=deinterlace");
+ options.push(":deinterlace-mode=bob");
+ }
}
do_play_state(0, options);
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 0319efe..bc6a940 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.2.28
-date=06.05.2015
+version=2.8.2.29
+date=07.05.2015
type=Release
info=Tuxbox
commit bda8ceb4c47c70311b9dc577a5c05aa3c8dc0a7e
Author: GetAway <get...@t-...>
Date: Thu May 7 20:24:42 2015 +0200
Y_Live.js: fix audio track selection for udp streaming
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index d3f9f3a..5c13c39 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -15,7 +15,7 @@ var vlc_height = 288;
var Window_delta_w = 0;
var Window_delta_h = 0;
var Mode = "tv";
-var AudioChannel = 0;
+var AudioTrack = 0;
var isSubs = false;
var cachetime = 0;
/*resize,init*/
@@ -170,14 +170,14 @@ function do_play()
else if(cachetime > 0){
options.push(":http-caching="+cachetime);
}
- if(AudioChannel != 0)
- options.push(":audio-track="+AudioChannel);
+ if(AudioTrack != 0)
+ options.push(":audio-track="+AudioTrack);
}
do_play_state(0, options);
}
function start_udp_server()
{
- var pids = loadSyncURL("/control/yweb?video_stream_pids=0&no_commas=true");
+ var pids = loadSyncURL("/control/yweb?video_stream_pids="+AudioTrack+"&no_commas=true");
var args = "-b /dev/null "+ClientAddr+" 31330 0 "+pids;
var _cmd = "udp_stream start "+args;
var __cmd = _cmd.replace(/ /g, "&");
@@ -275,7 +275,7 @@ function change_channel()
if(sel != -1)
channel = dd[sel].value;
do_stop();
- AudioChannel = 0;
+ AudioTrack = 0;
window.setTimeout("change_channel_zapto(\""+channel+"\")",500);
}
function change_sub_channel()
@@ -286,7 +286,7 @@ function change_sub_channel()
if(sel != -1)
channel = dd[sel].value;
do_stop();
- AudioChannel = 0;
+ AudioTrack = 0;
window.setTimeout("change_channel_zapto(\""+channel+"\")",500);
}
function change_channel_zapto(channel)
@@ -361,14 +361,14 @@ function view_streaminfo()
function doChangeAudioPid()
{
var dd = id('audiopid');
- AudioChannel = dd.selectedIndex;
+ AudioTrack = dd.selectedIndex;
do_stop();
// insert_message_control("... zapping ...");
window.setTimeout("change_channel_play()",1000);
}
function build_audio_pid_list()
{
- var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20audio="+AudioChannel+":";
+ var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20audio="+AudioTrack+":";
var audio_pid_list = loadSyncURL(audio_pids_url);
audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onchange=\"doChangeAudioPid()\">"
+ audio_pid_list
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 7e41467..0319efe 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.2.27
-date=05.05.2015
+version=2.8.2.28
+date=06.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js | 26 +++++++++++-----------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
2 files changed, 15 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-05 19:37:05
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 3b19f1bdf4736b1d9a711d7be2e789eda67cbbac (commit)
from 6ac05e3530827615f677f9c0e1d867e559a0fcb6 (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 3b19f1bdf4736b1d9a711d7be2e789eda67cbbac
Author: GetAway <get...@t-...>
Date: Tue May 5 21:35:22 2015 +0200
yWeb Live: move selection of apid to neutrinoyparser
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index f38a1af..0378b0e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -530,9 +530,13 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
std::string yresult;
static bool init_iso=true;
bool idx_as_id=true;
+ unsigned int selected_apid = 0;
if(para == "apid")
idx_as_id=false;
+ else if (!para.empty()) {
+ sscanf(para.c_str(), "audio=%i:", &selected_apid);
+ }
if(init_iso)
{
if(initialize_iso639_map())
@@ -559,8 +563,9 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
{
if(!tags[i].component.empty())
{
- yresult += string_printf("<option value=%05u>%s%s</option>\r\n",
+ yresult += string_printf("<option value=%05u %s>%s%s</option>\r\n",
idx_as_id ? j : pids.APIDs[j].pid,
+ (j==selected_apid) ? "selected=\"selected\"" : "",
encodeString(tags[i].component).c_str(),
pids.APIDs[j].is_ac3 && tags[i].component.find("AC3") == std::string::npos ? " (AC3)": "");
eit_not_ok = false;
@@ -576,8 +581,9 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
strncpy( pids.APIDs[j].desc, getISO639Description( pids.APIDs[j].desc ), desc_maxlen );
pids.APIDs[j].desc[desc_maxlen] = 0;
}
- yresult += string_printf("<option value=%05u>%s%s</option>\r\n",
+ yresult += string_printf("<option value=%05u %s>%s%s</option>\r\n",
idx_as_id ? j : pids.APIDs[j].pid,
+ (j==selected_apid) ? "selected=\"selected\"" : "",
encodeString(std::string(pids.APIDs[j].desc)).c_str(),
pids.APIDs[j].is_ac3 && strstr(pids.APIDs[j].desc, "AC3") == NULL ? " (AC3)": "");
}
@@ -594,8 +600,9 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
strncpy( it->desc, getISO639Description( it->desc ), desc_maxlen );
it->desc[desc_maxlen] = 0;
}
- yresult += string_printf("<option value=%05u>%s%s</option>\r\n",
+ yresult += string_printf("<option value=%05u %s>%s%s</option>\r\n",
idx_as_id ? i : it->pid,
+ (i==selected_apid) ? "selected=\"selected\"" : "",
encodeString(std::string(it->desc)).c_str(),
it->is_ac3 && strstr(it->desc, "AC3") == NULL ? " (AC3)": "");
i++;
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index 15d3698..d3f9f3a 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -368,11 +368,10 @@ function doChangeAudioPid()
}
function build_audio_pid_list()
{
- var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown";
+ var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20audio="+AudioChannel+":";
var audio_pid_list = loadSyncURL(audio_pids_url);
audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onchange=\"doChangeAudioPid()\">"
+ audio_pid_list
+ "</select>";
obj_update('audio_pid_list', audio_pid_list);
- id("audiopid").selectedIndex = AudioChannel;
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 646463b..7e41467 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.2.26
-date=04.05.2015
+version=2.8.2.27
+date=05.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp | 13 ++++++++++---
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js | 3 +--
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
3 files changed, 13 insertions(+), 7 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-04 16:39:42
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 6ac05e3530827615f677f9c0e1d867e559a0fcb6 (commit)
from 5e90418e40a63670acb5fd2c9ed7fc9c7d7af693 (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 6ac05e3530827615f677f9c0e1d867e559a0fcb6
Author: Jacek Jendrzej <cra...@go...>
Date: Mon May 4 18:39:01 2015 +0200
Y_VLC.js fix VLC detection without var plugin.version (linux)
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index 4263c41..42aab06 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -52,6 +52,7 @@ CyVLC.prototype = {
}
else if (navigator.plugins && (navigator.plugins.length > 0)) {
var numPlugins = navigator.plugins.length;
+ var plug_version = "0.0.0";
for(var i = 0; i < numPlugins; i++) {
var plugin = navigator.plugins[i];
var numTypes = plugin.length;
@@ -60,12 +61,32 @@ CyVLC.prototype = {
var mimetype = plugin[j];
if (mimetype) {
if (mimetype.type.indexOf("application/x-vlc-plugin") != -1) {
- return plugin.version;
+ if(plugin.version != 0){
+ plug_version = plugin.version;
+ break;
+ }
+ else
+ {
+ var Suche = /(PLUGIN)/gi;
+ var Ergebnis = Suche.test(plugin.description);
+ if (Ergebnis == true){
+ var ex = /^.*[pP]lugin [\"]*([^ \"]*)[\"]*.*$/;
+ var ve = ex.exec(plugin.description);
+ }else{
+ var ex = /^.*[vV]ersion [\"]*([^ \"]*)[\"]*.*$/;
+ var ve = ex.exec(plugin.description);
+ }
+ var Suche = /([0-9])/g;
+ var Ergebnis = Suche.test(ve);
+ if (Ergebnis == true)
+ plug_version = ve[1];
+ break;
+ }
}
}
}
}
- return "0.0.0";
+ return plug_version;
}
else
return "0.0.0";
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 2b0225b..646463b 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.2.25
-date=03.05.2015
+version=2.8.2.26
+date=04.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js | 25 ++++++++++++++++++++-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
2 files changed, 25 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-03 19:24:55
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 5e90418e40a63670acb5fd2c9ed7fc9c7d7af693 (commit)
from 2f432a983a24770deee688f607bddf97536b4e5b (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 5e90418e40a63670acb5fd2c9ed7fc9c7d7af693
Author: GetAway <get...@t-...>
Date: Sun May 3 21:24:17 2015 +0200
yWeb: set selected audio pid after changing it
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index 18216c1..15d3698 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -370,8 +370,9 @@ function build_audio_pid_list()
{
var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown";
var audio_pid_list = loadSyncURL(audio_pids_url);
- audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onChange=\"doChangeAudioPid()\">"
+ audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onchange=\"doChangeAudioPid()\">"
+ audio_pid_list
+ "</select>";
obj_update('audio_pid_list', audio_pid_list);
+ id("audiopid").selectedIndex = AudioChannel;
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 58c57c3..2b0225b 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.2.24
-date=02.05.2015
+version=2.8.2.25
+date=03.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js | 3 ++-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-02 13:55:09
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 2f432a983a24770deee688f607bddf97536b4e5b (commit)
from d1a86219bc9080bb60fab8492adc8793cf1c578c (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 2f432a983a24770deee688f607bddf97536b4e5b
Author: GetAway <get...@t-...>
Date: Sat May 2 15:54:21 2015 +0200
yWeb:fix visibility of VLC in IE11
format some code
remove some unnecessary 'break;'
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index 5f93d47..4263c41 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -142,9 +142,9 @@ CyVLC.prototype = {
},
is_playing : function() {
switch(this.plugin) {
- case "ie1": return this.vlc.Playing;break;
- case "moz2": return this.vlc.playlist.isPlaying;break;
- default: return this.vlc.isplaying();break;
+ case "ie1": return this.vlc.Playing;
+ case "moz2": return this.vlc.playlist.isPlaying;
+ default: return this.vlc.isplaying();
}
},
toggle_fullscreen : function() {
@@ -162,9 +162,9 @@ CyVLC.prototype = {
},
get_volume : function() {
switch(this.plugin) {
- case "ie1": return this.vlc.volume;break;
- case "moz2": return this.vlc.audio.volume;break;
- default: return this.vlc.get_volume();break;
+ case "ie1": return this.vlc.volume;
+ case "moz2": return this.vlc.audio.volume;
+ default: return this.vlc.get_volume();
}
},
set_volume_delta : function(delta) {
@@ -209,14 +209,14 @@ CyVLC.prototype = {
set_resolution : function (w,h) {
this.vlc.width = w;
this.vlc.height = h;
- this.vlc.style.width = w;
- this.vlc.style.height = h;
+ this.vlc.style.width = w+"px";
+ this.vlc.style.height = h+"px";
},
have_options : function() {
switch(this.plugin) {
case "ie1":
- case "moz2": return true;break;
- default: return false;break;
+ case "moz2": return true;
+ default: return false;
}
},
insert_control : function()
@@ -224,31 +224,32 @@ CyVLC.prototype = {
var vlc_control_html = "";
if(isIE) {
vlc_control_html =
- "<object classid=\"clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8\" " +
-/* "<object classid=\"clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921\" " +*/
-
- "width=\""+this.c_width+"\" height=\""+this.c_height+"\" id=\""+this.id+"\" events=\"True\">" +
- "<param name='ShowDisplay' value='"+this.c_show_display+"' />" +
- "<param name='Loop' value='"+this.c_loop+"' />" +
- "<param name='AutoPlay' value='"+this.c_auto_play+"' />" +
-/* "<param name=\"Visible\" value=\"-1\"/>" + */
- "<param name='ShowDisplay' value='True'/>" +
- "The VideoLan Client ActiveX is not installed.<br/>"+
- "You need <a href='http://www.videolan.org' target='_blank'>VideoLan Client</a> V0.8.5 or higher.<br/>" +
- "Install with Option ActiveX." +
- "</object>";
+ "<object classid=\"clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8\""
+// "<object classid=\"clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921\""
+ + "width=\"" + this.c_width + "\""
+ + "height=\"" + this.c_height + "\""
+ + "id=\"" + this.id + "\" events=\"True\">"
+ + "<param name=\"ShowDisplay\" value=\"" + this.c_show_display + "\" />"
+ + "<param name=\"Loop\" value=\"" + this.c_loop + "\" />"
+ + "<param name=\"AutoPlay\" value=\"" + this.c_auto_play + "\" />"
+ + "The VideoLan Client ActiveX is not installed.<br />"
+ + "You need <a href=\"http://www.videolan.org\" target=\"_blank\">VideoLan Client</a> V0.8.6 or higher.<br />"
+ + "Install with Option ActiveX."
+ + "</object>";
}
else {
- vlc_control_html = "<embed type='application/x-vlc-plugin'";
+ vlc_control_html = "<embed type=\"application/x-vlc-plugin\""
if(this.plugin == "moz2")
vlc_control_html += "version=\"VideoLAN.VLCPlugin.2\"";
vlc_control_html +=
- "id='"+this.id+"'"+
- "autoplay='"+this.c_auto_play+"' loop='"+this.c_loop+"' width='"+this.c_width+"' height='"+this.c_height+"'" +
- "target='' >" +
- "</embed>";
+ "version=\"VideoLAN.VLCPlugin.2\""
+ + "id=\"" + this.id + "\""
+ + "autoplay=\"" + this.c_auto_play + "\""
+ + "autoloop=\"" + this.c_loop + "\""
+ + "width=\"" + this.c_width + "\""
+ + "height=\"" + this.c_height + "\" >"
+ + "</embed>";
}
obj_update(this.c_masterid,vlc_control_html);
- this.vlc = id(this.id);
}
};
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 011d797..58c57c3 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.2.23
-date=01.05.2015
+version=2.8.2.24
+date=02.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js | 59 +++++++++++-----------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
2 files changed, 32 insertions(+), 31 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-01 19:19:57
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via d1a86219bc9080bb60fab8492adc8793cf1c578c (commit)
from 27805a03a3ec2008e7363c9d0a84b655f4f210d3 (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 d1a86219bc9080bb60fab8492adc8793cf1c578c
Author: Christian Schuett <Gau...@ho...>
Date: Fri May 1 17:59:59 2015 +0200
Neutrino movieplayer: fix restarting a movie when end bookmark was reached
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/src/gui/movieplayer.cpp b/tuxbox/neutrino/src/gui/movieplayer.cpp
index feb1858..5676b0b 100644
--- a/tuxbox/neutrino/src/gui/movieplayer.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer.cpp
@@ -3112,6 +3112,7 @@ else
//--------------------------------
ctx->inFd = -1;
mp_closeDVBDevices(ctx);
+ g_fileposition = 0L;
//-- on exit after film end this will force any --
//-- action in ::PlayFile() - do not remove ! --
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/movieplayer.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-05-01 13:40:19
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 27805a03a3ec2008e7363c9d0a84b655f4f210d3 (commit)
from 0b32b035b810f6d91b169ba77c1b6d1a34447ed6 (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 27805a03a3ec2008e7363c9d0a84b655f4f210d3
Author: GetAway <get...@t-...>
Date: Fri May 1 15:39:05 2015 +0200
yWeb: improve detection if IE up to IE11 and above
Version bump 2.8.2.23
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
index f59993b..3f29629 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
@@ -3,8 +3,19 @@
$Revision: 1.5 $
*/
var baselib_version="2.0.0";
-var agt=navigator.userAgent.toLowerCase();
-var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
+var tmp = document.documentMode, e, isIE;
+// Try to force this property to be a string.
+try{document.documentMode = "";}
+catch(e){ };
+// If document.documentMode is a number, then it is a read-only property, and so
+// we have IE 8+.
+// Otherwise, if conditional compilation works, then we have IE < 11.
+// Otherwise, we have a non-IE browser.
+isIE = typeof document.documentMode == "number" || new Function("return/*@cc_on!@*/!1")( );
+// Switch back the value to be unobtrusive for non-IE browsers.
+try{document.documentMode = tmp;}
+catch(e){ };
+
/*DHTML-Basics*/
function $yN(_obj_name)
{
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm
index 9ed5f52..712b376 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm
@@ -79,9 +79,7 @@ function doUpload()
<script language="JavaScript" type="text/javascript" >
//<![CDATA[
- var agt=navigator.userAgent.toLowerCase();
- var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
- if(is_ie)
+ if(isIE)
document.f.appendx.checked = true;
window.document.f.cmd.focus();
//]]>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js
index 7600e19..9f1a818 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Timer_Sync.js
@@ -109,8 +109,6 @@ function processReqChange()
}
else if (document.f.planer[1].checked == true)
{
- var agt=navigator.userAgent.toLowerCase();
- var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
var xml = g_req.responseXML;
var recProg_NodeList = xml.getElementsByTagName('item');
for(i=0;i<recProg_NodeList.length;i++)
@@ -119,7 +117,7 @@ function processReqChange()
var progName = getXMLNodeItemValue(recProg_Node, 'title');
var description = getXMLNodeItemValue(recProg_Node, 'description');
-//FF3?Probs if(is_ie)
+//FF3?Probs if(isIE)
{
var sDate = getXMLNodeItemValue(recProg_Node, 'dc:date');
var sender = getXMLNodeItemValue(recProg_Node, 'dc:subject');
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index 6f308dd..5f93d47 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -29,14 +29,14 @@ CyVLC.prototype = {
this.c_masterid = masterid;
this.c_width = width;
this.c_height = height;
- if(!is_ie) {
+ if(!isIE) {
this.version_string = this._get_version();
this._generate_sub_versions();
this._determine_plugin_generation();
}
this.insert_control();
this.vlc = id(_id);
- if(is_ie) {
+ if(isIE) {
this.version_string = this._get_version();
this._generate_sub_versions();
this._determine_plugin_generation();
@@ -44,7 +44,7 @@ CyVLC.prototype = {
this.set_resolution(this.c_width, this.c_height);
},
_get_version : function() {
- if(is_ie)
+ if(isIE)
{
var vstr = this.vlc.VersionInfo;
var words = vstr.split(" ");
@@ -81,7 +81,7 @@ CyVLC.prototype = {
if(ve.length >4 && ve[4] !== "") this.version_level4 = ve[4];
},
_determine_plugin_generation : function() {
- if(is_ie)
+ if(isIE)
this.plugin = "ie1";
else
if(this.version_level1 <= 0 && this.version_level2 <= 8 && this.version_level3 <= 5)
@@ -222,7 +222,7 @@ CyVLC.prototype = {
insert_control : function()
{
var vlc_control_html = "";
- if(is_ie) {
+ if(isIE) {
vlc_control_html =
"<object classid=\"clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8\" " +
/* "<object classid=\"clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921\" " +*/
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index abd70c0..011d797 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.2.22
-date=18.04.2015
+version=2.8.2.23
+date=01.05.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js | 15 +++++++++++++--
.../neutrino/daemons/nhttpd/web/Y_Tools_Cmd.yhtm | 4 +---
.../daemons/nhttpd/web/Y_Tools_Timer_Sync.js | 4 +---
tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js | 10 +++++-----
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
5 files changed, 22 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-30 19:35:22
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 0b32b035b810f6d91b169ba77c1b6d1a34447ed6 (commit)
from e65d843fbb0aaab70a8c51db840bb0198c8b22f5 (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 0b32b035b810f6d91b169ba77c1b6d1a34447ed6
Author: GetAway <get...@t-...>
Date: Thu Apr 30 21:32:40 2015 +0200
yWeb: fix detection of VLC >= 2.1.0
tested from vlc-0.8.6 to vlc-3.0.0-git
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index 88bfd11..6f308dd 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -1,4 +1,4 @@
-/* VLC abstraction by yj...@on...
+/* VLC abstraction by yjogol
$Date: $
$Revision: $
*/
@@ -50,49 +50,41 @@ CyVLC.prototype = {
var words = vstr.split(" ");
return words[0];
}
- else
- if (navigator.plugins && (navigator.plugins.length > 0)) {
- var name = "VLC";
- for(var i=0;i<navigator.plugins.length;++i)
- if (navigator.plugins[i].name.indexOf(name) != -1)
- var plug = navigator.plugins[navigator.plugins[i].name];
-
- if(typeof plug != 'undefined') {
- var Suche = /(PLUGIN)/gi;
- var Ergebnis = Suche.test(plug.description);
- if (Ergebnis == true){
- var ex = /^.*[pP]lugin [\"]*([^ \"]*)[\"]*.*$/;
- var ve = ex.exec(plug.description);
- }else{
- var ex = /^.*[vV]ersion [\"]*([^ \"]*)[\"]*.*$/;
- var ve = ex.exec(plug.description);
+ else if (navigator.plugins && (navigator.plugins.length > 0)) {
+ var numPlugins = navigator.plugins.length;
+ for(var i = 0; i < numPlugins; i++) {
+ var plugin = navigator.plugins[i];
+ var numTypes = plugin.length;
+ for (var j = 0; j < numTypes; j++)
+ {
+ var mimetype = plugin[j];
+ if (mimetype) {
+ if (mimetype.type.indexOf("application/x-vlc-plugin") != -1) {
+ return plugin.version;
+ }
+ }
}
}
- var Suche = /([0-9])/g;
- var Ergebnis = Suche.test(ve);
- if (Ergebnis == true)
- return ve[1];
- else
- return "0.0.0";
- }
- else
return "0.0.0";
+ }
+ else
+ return "0.0.0";
},
_generate_sub_versions : function() {
- if(this.version_string == "")
- return
+ if(this.version_string === "")
+ return;
var ex = /([^\.]*)[\.]*([^\.]*)[\.]*([^\.-]*)[\.-]*([^\.]*).*$/;
var ve = ex.exec(this.version_string);
if(ve.length >1) this.version_level1 = ve[1];
if(ve.length >2) this.version_level2 = ve[2];
- if(ve.length >3 && ve[3] != "") this.version_level3 = ve[3];
- if(ve.length >4 && ve[4] != "") this.version_level4 = ve[4];
+ if(ve.length >3 && ve[3] !== "") this.version_level3 = ve[3];
+ if(ve.length >4 && ve[4] !== "") this.version_level4 = ve[4];
},
_determine_plugin_generation : function() {
if(is_ie)
this.plugin = "ie1";
else
- if(this.version_level1 <= "0" && this.version_level2 <= "8" && this.version_level3 <= "5")
+ if(this.version_level1 <= 0 && this.version_level2 <= 8 && this.version_level3 <= 5)
this.plugin = "moz1";
else
this.plugin = "moz2";
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js | 52 +++++++++++---------------
1 files changed, 22 insertions(+), 30 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-19 10:14:54
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via e65d843fbb0aaab70a8c51db840bb0198c8b22f5 (commit)
from 54375439063a140a74b6d9aee5854de6750d01d1 (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 e65d843fbb0aaab70a8c51db840bb0198c8b22f5
Author: GetAway <get...@t-...>
Date: Sun Apr 19 12:14:00 2015 +0200
use empty() to check string
Signed-off-by: GetAway <get...@t-...>
diff --git a/misc/libs/libupnpclient/UPNPDevice.cpp b/misc/libs/libupnpclient/UPNPDevice.cpp
index 314d71f..90a85e7 100644
--- a/misc/libs/libupnpclient/UPNPDevice.cpp
+++ b/misc/libs/libupnpclient/UPNPDevice.cpp
@@ -155,7 +155,7 @@ CUPnPDevice::CUPnPDevice(std::string url)
head = result.substr(0,pos);
body = result.substr(pos+4);
- if (body == "")
+ if (body.empty())
throw std::runtime_error(std::string("desc body empty"));
if (!check_response(head, charset, rcode))
diff --git a/misc/libs/libupnpclient/UPNPService.cpp b/misc/libs/libupnpclient/UPNPService.cpp
index 7e845aa..32c15aa 100644
--- a/misc/libs/libupnpclient/UPNPService.cpp
+++ b/misc/libs/libupnpclient/UPNPService.cpp
@@ -69,7 +69,7 @@ std::list<UPnPAttribute> CUPnPService::SendSOAP(std::string action, std::list<UP
post << ">";
for (i = attribs.begin(); i != attribs.end(); ++i)
{
- if (i->second == "")
+ if (i->second.empty())
post << "<" << i->first << "/>";
else
{
@@ -157,7 +157,7 @@ std::list<UPnPAttribute> CUPnPService::SendSOAP(std::string action, std::list<UP
if (!strcmp(node->GetType(),"faultstring"))
faultstring=std::string(node->GetData()?node->GetData():"");
}
- if (faultstring != "")
+ if (!faultstring.empty())
throw std::runtime_error(faultstring + " " + upnpcode + " " + upnpdesc);
else
throw std::runtime_error(std::string("XML: http error with unknown soap: ")+rcode);
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 020633e..344b08e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -229,7 +229,7 @@ void CControlAPI::Execute(CyhookHandler *hh)
}
// send header
- else if(std::string(yCgiCallList[index].mime_type) == "") // decide in function
+ else if(std::string(yCgiCallList[index].mime_type).empty()) // decide in function
;
else if(std::string(yCgiCallList[index].mime_type) == "+xml") // Parameter xml?
if (!hh->ParamList["xml"].empty())
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
index d2957e9..617f9f1 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -139,7 +139,7 @@ void CyParser::Execute(CyhookHandler *hh)
}
// send header
- if(std::string(yCgiCallList[index].mime_type) == "") // set by self
+ if(std::string(yCgiCallList[index].mime_type).empty()) // set by self
;
else if(std::string(yCgiCallList[index].mime_type) == "+xml") // Parameter xml?
if (!hh->ParamList["xml"].empty())
-----------------------------------------------------------------------
Summary of changes:
misc/libs/libupnpclient/UPNPDevice.cpp | 2 +-
misc/libs/libupnpclient/UPNPService.cpp | 4 ++--
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 2 +-
.../daemons/nhttpd/yhttpd_mods/mod_yparser.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-18 17:57:12
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 54375439063a140a74b6d9aee5854de6750d01d1 (commit)
from dbefdbf5bfd0644e17687fadfe2540891cedbc2d (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 54375439063a140a74b6d9aee5854de6750d01d1
Author: GetAway <get...@t-...>
Date: Sat Apr 18 19:56:11 2015 +0200
yWeb: fix Y_live.yhtm tags
fix deinterlace default setting
more appropriate symbol for live settings
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
index 5a1b6be..33aa50d 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
@@ -57,7 +57,7 @@ function view_transcode_mode()
<table class="y_live_table" cellspacing="0" cellpadding="0" style="margin:0">
<tr><td>
<div id="bouquets_div"><div class="y_live_channels" style="border:1px solid #555555;">
- <img src="/images/smallwait.gif"> {=L:2501=}</div>
+ <img src="/images/smallwait.gif" /> {=L:2501=}</div>
</div>
</td><td>
{=if-equal:{=typ=}~popup~
@@ -72,22 +72,22 @@ function view_transcode_mode()
</td></tr>
<tr><td>
<div id="channels_div"><div class="y_live_bouquets" style="border:1px solid #555555;">
- <img src="/images/smallwait.gif"> {=L:2502=}</div>
+ <img src="/images/smallwait.gif" /> {=L:2502=}</div>
</div>
</td><td>
<button id="go" class="y_live_button" type="button" title="{=L:2504=}" onclick="change_channel()" disabled="disabled">
- <img src="/images/play.png"></button>
+ <img src="/images/play.png" /></button>
<button id="epg" class="y_live_button" type="button" title="{=L:2505=}" onclick="view_epg()" disabled="disabled">
- <img src="/images/epg.png"></button>
+ <img src="/images/epg.png" /></button>
</td></tr>
<tr id="subsRow" style="display:none">
<td>
<div id="subs_div"><div class="y_live_channels" style="border:1px solid #555555;">
- <img src="/images/smallwait.gif"> {=L:2507=}</div>
+ <img src="/images/smallwait.gif" /> {=L:2507=}</div>
</div>
</td><td>
<button id="go" class="y_live_button" type="button" title="{=L:2504=}" onclick="change_sub_channel()">
- <img src="/images/play.png"></button>
+ <img src="/images/play.png" /></button>
</td>
</tr>
@@ -100,40 +100,40 @@ function view_transcode_mode()
<div id="live_controls">
<form name="v" action="" method="get">
<button id="PlayOrPause" class="y_live_button" type="button" title="{=L:2508=}"
- onclick="do_play_or_pause()"><img src="/images/pause.png"></button>
+ onclick="do_play_or_pause()"><img src="/images/pause.png" /></button>
<button id="stop" type="button" title="{=L:2509=}" onclick="do_stop()" class="y_live_button">
- <img src="/images/stop.png"></button>
+ <img src="/images/stop.png" /></button>
<button id="mute" class="y_live_button" type="button" value="Mute" title="{=L:2510=}" onclick="do_mute_toggle()">
- <img src="/images/volumemute.png"></button>
+ <img src="/images/volumemute.png" /></button>
<button id="volumedown" class="y_live_button" type="button" value="-" title="{=L:2511=}" onclick="V2.set_volume_delta(-10);">
- <img src="/images/volumedown.png"></button>
+ <img src="/images/volumedown.png" /></button>
<button id="volumeup" class="y_live_button" type="button" value="+" title="{=L:2512=}" onclick="V2.set_volume_delta(+10);">
- <img src="/images/volumeup.png"></button>
+ <img src="/images/volumeup.png" /></button>
{=if-equal:{=mode=}~tv~
<button id="fullscreen" class="y_live_button" type="button" value="F"
title="{=L:2513=}" onclick="V2.toggle_fullscreen()">
- <img src="/images/fullscreen.png"></button>
+ <img src="/images/fullscreen.png" /></button>
=}
<button id="livelock" class="y_live_button" type="button" value="Lock" title="{=L:2514=}" name="lock" onclick="do_lock_toggle()">
- <img src="/images/livelock.png"></button>
+ <img src="/images/livelock.png" /></button>
{=if-equal:{=mode=}~tv~
<button class="y_live_button" type="button" value="set" title="{=L:2515=}" id="udp" onclick="do_udp_toggle()" style="visibility:hidden">
- <img src="/images/udp_switch_on.png"/></button>
+ <img src="/images/udp_switch_on.png" /></button>
<button class="y_live_button" type="button" value="set" title="{=L:2516=}" id="settings" onclick="view_settings_mode()">
- <img src="/images/properties.png"></button>
+ <img src="/images/properties.png" /></button>
<button class="y_live_button" type="button" value="S" title="{=L:2517=}" id="snapshot" onclick="V2.snapshot()" style="visibility:hidden">
- <img src="/images/snapshot.png"></button>
+ <img src="/images/snapshot.png" /></button>
=}
{=if-equal:{=typ=}~popup~~
{=if-equal:{=typ=}~transcode~~
<button id="rec" class="y_live_button" type="button" value="Rec" title="{=L:2518=}" name="record_mode" onclick="view_record_mode()" style="visibility:hidden">
- <img src="/images/record.png"></button>
+ <img src="/images/record.png" /></button>
=}
<button id="transcode" class="y_live_button" type="button" value="Transcode" title="{=L:2519=}" onclick="view_transcode_mode()" style="visibility:hidden">
- <img src="/images/transcode.png"></button>
+ <img src="/images/transcode.png" /></button>
=}
- <span id="audio_pid_list"></span>
+ <br /><span id="audio_pid_list"></span>
</form>
</div>
<script type="text/javascript">
@@ -144,7 +144,7 @@ function view_transcode_mode()
LiveTyp = "{=typ=}";
ClientAddr = "{=func:get_request_data clientaddr=}";
insert_message_control("{=L:2520=}");
- isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;true=}" == "true");
+ isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;false=}" == "true");
cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;1000=};
/* {=if-equal:{=typ=}~popup~
always_on_top();
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 240e189..abd70c0 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.2.21
+version=2.8.2.22
date=18.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif b/tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif
deleted file mode 100755
index 963ead1..0000000
Binary files a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif and /dev/null differ
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png b/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png
old mode 100755
new mode 100644
index 046811e..47b75a4
Binary files a/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png and b/tuxbox/neutrino/daemons/nhttpd/web/images/properties.png differ
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm | 40 ++++++++++----------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 2 +-
.../daemons/nhttpd/web/images/properties.gif | Bin 214 -> 0 bytes
.../daemons/nhttpd/web/images/properties.png | Bin 807 -> 865 bytes
4 files changed, 21 insertions(+), 21 deletions(-)
delete mode 100755 tuxbox/neutrino/daemons/nhttpd/web/images/properties.gif
mode change 100755 => 100644 tuxbox/neutrino/daemons/nhttpd/web/images/properties.png
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-18 15:57:36
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via dbefdbf5bfd0644e17687fadfe2540891cedbc2d (commit)
from de72609832873b066be967e924bda85711f57b1f (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 dbefdbf5bfd0644e17687fadfe2540891cedbc2d
Author: svenhoefer <sve...@sv...>
Date: Sat Apr 18 17:54:05 2015 +0200
yWeb: re-introduce 'WebsiteMain.hosted_directory'
* this directory can be used to host some of your cracy stuff.
It is reachable with <boxip>/hosted/
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
index db8d7a7..27bdf6d 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
@@ -73,7 +73,12 @@ function do_submit()
<tr>
<td>{=L:1507=}</td>
<td><input type="text" name="override_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory~cache=}" title="{=L:1507=}" /> {=L:1504=}
- <input type="hidden" name="HostedDocRoot" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="{=L:1509=}" /></td>
+ </td>
+ </tr>
+ <tr>
+ <td>{=L:1508=}</td>
+ <td><input type="text" name="hosted_directory" size="20" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.hosted_directory~cache=}" title="{=L:1509=}" /> {=L:1504=}
+ </td>
</tr>
<tr>
<td>{=L:1510=}</td>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index efe1e79..240e189 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.2.2
-date=17.04.2015
+version=2.8.2.21
+date=18.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/yconfig.h b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
index ccd4656..c5355aa 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yconfig.h
+++ b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
@@ -115,6 +115,7 @@
#define PRIVATEDOCUMENTROOT "/home/y/nhttpd-y"
#define PUBLICDOCUMENTROOT "/var/httpd"
#define HOSTEDDOCUMENTROOT "/mnt/hosted"
+#define HOSTEDDOCUMENTURL "/hosted/"
#define SSL_PEMFILE HTTPD_CONFIGDIR "/server.pem"
#define SSL_CA_FILE HTTPD_CONFIGDIR "/cacert.pem"
@@ -142,6 +143,7 @@
#define PRIVATEDOCUMENTROOT "/cygdrive/d/Work/y/ws/nhttpd30/web"
#define PUBLICDOCUMENTROOT "/var/httpd"
#define HOSTEDDOCUMENTROOT "/mnt/hosted"
+#define HOSTEDDOCUMENTURL "/hosted/"
#define SSL_PEMFILE HTTPD_CONFIGDIR "/server.pem"
#define SSL_CA_FILE HTTPD_CONFIGDIR "/cacert.pem"
@@ -175,6 +177,7 @@
#define PUBLICDOCUMENTROOT "/var/httpd"
#define NEUTRINO_CONFIGFILE CONFIGDIR "/neutrino.conf"
#define HOSTEDDOCUMENTROOT "/mnt/hosted"
+#define HOSTEDDOCUMENTURL "/hosted/"
#define EXTRASDOCUMENTROOT "/mnt/hosted/extras"
#define EXTRASDOCUMENTURL "/hosted/extras"
#define ZAPITXMLPATH CONFIGDIR "/zapit"
@@ -211,6 +214,7 @@
#define PRIVATEDOCUMENTROOT "/tmp/web" //FIXME: Test
#define PUBLICDOCUMENTROOT "/var/httpd"
#define HOSTEDDOCUMENTROOT "/mnt/hosted"
+#define HOSTEDDOCUMENTURL "/hosted/"
#define SSL_PEMFILE HTTPD_CONFIGDIR "/server.pem"
#define SSL_CA_FILE HTTPD_CONFIGDIR "/cacert.pem"
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yresponse.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yresponse.cpp
index 981edd5..b8dfff2 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yresponse.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yresponse.cpp
@@ -65,16 +65,6 @@ bool CWebserverResponse::SendResponse()
// Checking and Preperation: Auth, static, cache, ...
//--------------------------------------------------------------
-// move to mod_sendfile ???
-#ifdef Y_CONFIG_USE_HOSTEDWEB
- // for hosted webs: rewrite URL
- std::string _hosted="/hosted/";
- if((Connection->Request.UrlData["path"]).compare(0,_hosted.length(),"/hosted/") == 0) // hosted Web ?
- Connection->Request.UrlData["path"]=Cyhttpd::ConfigList["WebsiteMain.hosted_directory"]
- +(Connection->Request.UrlData["path"]).substr(_hosted.length()-1);
-#endif //Y_CONFIG_USE_HOSTEDWEB
- log_level_printf(5,"UrlPath:%s\n",(Connection->Request.UrlData["path"]).c_str());
-
do
{
if(Connection->RequestCanceled)
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_sendfile.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_sendfile.cpp
index c8f15b2..a98a8bf 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_sendfile.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_sendfile.cpp
@@ -69,16 +69,23 @@ THandleStatus CmodSendfile::Hook_PrepareResponse(CyhookHandler *hh)
{
hh->status = HANDLED_NONE;
- int filed;
log_level_printf(4,"mod_sendfile prepare hook start url:%s\n",hh->UrlData["fullurl"].c_str());
+
+#ifdef Y_CONFIG_USE_HOSTEDWEB
+ // for hosted webs: rewrite URL
+ std::string _hosted=HOSTEDDOCUMENTURL;
+ if((hh->UrlData["path"]).compare(0,_hosted.length(),HOSTEDDOCUMENTURL) == 0) // hosted Web ?
+ hh->UrlData["path"]=hh->WebserverConfigList["WebsiteMain.hosted_directory"]+(hh->UrlData["path"]).substr(_hosted.length()-1);
+#endif //Y_CONFIG_USE_HOSTEDWEB
+
std::string mime = sendfileTypes[hh->UrlData["fileext"]];
if(!mime.empty() || (hh->WebserverConfigList["mod_sendfile.sendAll"] == "true") && hh->UrlData["fileext"] != "yhtm")
{
//TODO: Check allowed directories / actually in GetFileName
// build filename
std::string fullfilename = GetFileName(hh, hh->UrlData["path"], hh->UrlData["filename"]);
- filed = OpenFile(hh, fullfilename);
- if( filed != -1 ) //can access file?
+ int filed;
+ if ((filed = OpenFile(hh, fullfilename)) != -1) //can access file?
{
struct stat statbuf;
hh->LastModified = (time_t)0;
@@ -120,7 +127,8 @@ THandleStatus CmodSendfile::Hook_PrepareResponse(CyhookHandler *hh)
}
else
{
- aprintf("mod_sendfile: File not found. url:(%s)\n", hh->UrlData["url"].c_str());
+ aprintf("mod_sendfile: File not found. url:(%s) fullfilename:(%s)\n",
+ hh->UrlData["url"].c_str(), fullfilename.c_str());
hh->SetError(HTTP_NOT_FOUND);
}
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
index 7d12e95..d2957e9 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -285,19 +285,26 @@ std::string CyParser::cgi_file_parsing(CyhookHandler *hh, std::string htmlfilena
bool found = false;
std::string htmlfullfilename, yresult, html_template;
- for (unsigned int i=0;i<HTML_DIR_COUNT && !found;i++)
- {
- htmlfullfilename = HTML_DIRS[i]+"/"+htmlfilename;
+ bool isHosted = false;
+#ifdef Y_CONFIG_USE_HOSTEDWEB
+ // for hosted webs: search in hosted_directory only
+ std::string _hosted=hh->WebserverConfigList["WebsiteMain.hosted_directory"];
+ if((hh->UrlData["path"]).compare(0,_hosted.length(),hh->WebserverConfigList["WebsiteMain.hosted_directory"]) == 0) // hosted Web ?
+ isHosted = true;
+#endif //Y_CONFIG_USE_HOSTEDWEB
+
+ char cwd[255];
+ getcwd(cwd, 254);
+ for (unsigned int i = 0; i < (isHosted ? 1 : HTML_DIR_COUNT) && !found; i++) {
+ htmlfullfilename = (isHosted ? "" : HTML_DIRS[i]) + "/" + htmlfilename;
std::fstream fin(htmlfullfilename.c_str(), std::fstream::in);
- if(fin.good())
- {
+ if (fin.good()) {
found = true;
chdir(HTML_DIRS[i].c_str()); // set working dir
// read whole file into html_template
std::string ytmp;
- while (!fin.eof())
- {
+ while (!fin.eof()) {
getline(fin, ytmp);
html_template = html_template + ytmp + "\r\n";
}
@@ -305,12 +312,13 @@ std::string CyParser::cgi_file_parsing(CyhookHandler *hh, std::string htmlfilena
fin.close();
}
}
- if (!found)
- {
- printf("[CyParser] Y-cgi:template %s not found in\n",htmlfilename.c_str());
- for (unsigned int i=0;i<HTML_DIR_COUNT;i++) {
- printf("%s\n",HTML_DIRS[i].c_str());
- }
+ chdir(cwd);
+ if (!found) {
+ printf("[CyParser] Y-cgi:template %s not found %s\n", htmlfilename.c_str(), isHosted ? "" : "in");
+ if (!isHosted)
+ for (unsigned int i = 0; i < HTML_DIR_COUNT; i++) {
+ printf("%s\n", HTML_DIRS[i].c_str());
+ }
}
return yresult;
}
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Settings_nhttpd.yhtm | 7 +++-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
tuxbox/neutrino/daemons/nhttpd/yconfig.h | 4 ++
.../daemons/nhttpd/yhttpd_core/yresponse.cpp | 10 ------
.../daemons/nhttpd/yhttpd_mods/mod_sendfile.cpp | 16 +++++++--
.../daemons/nhttpd/yhttpd_mods/mod_yparser.cpp | 34 ++++++++++++-------
6 files changed, 45 insertions(+), 30 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-18 13:01:54
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via de72609832873b066be967e924bda85711f57b1f (commit)
from ffe922052372ccea16f63bb29d726ffa040befc6 (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 de72609832873b066be967e924bda85711f57b1f
Author: Jacek Jendrzej <cra...@go...>
Date: Sat Apr 18 14:41:11 2015 +0200
xmlinterface use const char instand char
Signed-off-by: GetAway <get...@t-...>
diff --git a/dvb/zapit/src/bouquets.cpp b/dvb/zapit/src/bouquets.cpp
index c4c24d0..155b0af 100644
--- a/dvb/zapit/src/bouquets.cpp
+++ b/dvb/zapit/src/bouquets.cpp
@@ -51,7 +51,7 @@ void cp(char * from, char * to);
#define GET_ATTR(node, name, fmt, arg) \
do { \
- char * ptr = xmlGetAttribute(node, name); \
+ const char * ptr = xmlGetAttribute(node, name); \
if ((ptr == NULL) || (sscanf(ptr, fmt, &arg) <= 0)) \
arg = 0; \
} \
@@ -378,15 +378,15 @@ void CBouquetManager::parseBouquetsXml(const xmlNodePtr root)
while ((search = xmlGetNextOccurence(search, "Bouquet")) != NULL)
{
CBouquet *newBouquet;
- char *name = xmlGetAttribute(search, "name");
+ const char *name = xmlGetAttribute(search, "name");
int bnum = existsBouquet(name);
if (bnum != -1)
newBouquet = Bouquets[bnum];
else
{
newBouquet = addBouquet(name);
- char* hidden = xmlGetAttribute(search, "hidden");
- char* locked = xmlGetAttribute(search, "locked");
+ const char* hidden = xmlGetAttribute(search, "hidden");
+ const char* locked = xmlGetAttribute(search, "locked");
newBouquet->type = xmlGetNumericAttribute(search, "type", 16);
newBouquet->bouquet_id = xmlGetNumericAttribute(search, "bouquet_id", 16);
newBouquet->bHidden = hidden ? (strcmp(hidden, "1") == 0) : false;
diff --git a/dvb/zapit/src/getservices.cpp b/dvb/zapit/src/getservices.cpp
index d0412cc..c9f7288 100644
--- a/dvb/zapit/src/getservices.cpp
+++ b/dvb/zapit/src/getservices.cpp
@@ -146,7 +146,7 @@ void ParseChannels(xmlNodePtr node, const t_transport_stream_id transport_stream
name = xmlGetAttribute(node, "name");
service_type = xmlGetNumericAttribute(node, "service_type", 16);
- char *ptr = xmlGetAttribute(node, "action");
+ const char *ptr = xmlGetAttribute(node, "action");
bool remove = ptr ? (!strcmp(ptr, "remove") || !strcmp(ptr, "replace")) : false;
bool add = ptr ? (!strcmp(ptr, "add") || !strcmp(ptr, "replace")) : true;
if (remove) {
diff --git a/dvb/zapit/src/zapit.cpp b/dvb/zapit/src/zapit.cpp
index ac31d42..2998f08 100644
--- a/dvb/zapit/src/zapit.cpp
+++ b/dvb/zapit/src/zapit.cpp
@@ -1965,7 +1965,6 @@ bool parse_command(CBasicMessage::Header &rmsg, int connfd)
}
uint32_t satlength;
- char * satname;
xmlNodePtr search = xmlDocGetRootElement(scanInputParser)->xmlChildrenNode;
const char * frontendname = getFrontendName();
CZapitClient::responseGetSatelliteList sat;
@@ -1973,7 +1972,7 @@ bool parse_command(CBasicMessage::Header &rmsg, int connfd)
if (frontendname != NULL) {
while ((search = xmlGetNextOccurence(search, frontendname)) != NULL)
{
- satname = xmlGetAttribute(search, "name");
+ const char * satname = xmlGetAttribute(search, "name");
strncpy(sat.satName, satname, 29);
sat.satName[29] = '\0';
sat.satPosition = satellitePositions[satname];
diff --git a/misc/libs/libxmltree/xmlinterface.cpp b/misc/libs/libxmltree/xmlinterface.cpp
index b09d176..2856664 100644
--- a/misc/libs/libxmltree/xmlinterface.cpp
+++ b/misc/libs/libxmltree/xmlinterface.cpp
@@ -46,7 +46,7 @@
unsigned long xmlGetNumericAttribute(const xmlNodePtr node, const char *name, const int base)
{
- char *ptr = xmlGetAttribute(node, name);
+ const char *ptr = xmlGetAttribute(node, name);
if (!ptr)
return 0;
@@ -56,7 +56,7 @@ unsigned long xmlGetNumericAttribute(const xmlNodePtr node, const char *name, co
long xmlGetSignedNumericAttribute(const xmlNodePtr node, const char *name, const int base)
{
- char *ptr = xmlGetAttribute(node, name);
+ const char *ptr = xmlGetAttribute(node, name);
if (!ptr)
return 0;
diff --git a/misc/libs/libxmltree/xmlinterface.h b/misc/libs/libxmltree/xmlinterface.h
index cf3736f..d149cf0 100644
--- a/misc/libs/libxmltree/xmlinterface.h
+++ b/misc/libs/libxmltree/xmlinterface.h
@@ -41,8 +41,8 @@
#ifdef USE_LIBXML
#include <libxml/parser.h>
#define xmlNextNode next
-inline char* xmlGetAttribute (xmlNodePtr cur, const char * s) { return (char *)xmlGetProp(cur, (const xmlChar *)s); };
-inline char* xmlGetName (xmlNodePtr cur) { return (char *)(cur->name); };
+inline const char* xmlGetAttribute (xmlNodePtr cur, const char * s) { return (const char *)xmlGetProp(cur, (const xmlChar *)s); };
+inline const char* xmlGetName (xmlNodePtr cur) { return (const char *)(cur->name); };
#else /* use libxmltree */
#include "xmltree.h"
@@ -52,9 +52,9 @@ typedef XMLTreeNode* xmlNodePtr;
#define xmlNextNode GetNext()
inline xmlNodePtr xmlDocGetRootElement(xmlDocPtr doc) { return doc->RootNode(); };
inline void xmlFreeDoc (xmlDocPtr doc) { delete doc; };
-inline char* xmlGetAttribute (xmlNodePtr cur, const char *s) { return cur->GetAttributeValue(s); };
-inline char* xmlGetName (xmlNodePtr cur) { return cur->GetType(); };
-inline char* xmlGetData (xmlNodePtr cur) { return cur->GetData(); };
+inline const char* xmlGetAttribute (xmlNodePtr cur, const char *s) { return cur->GetAttributeValue(s); };
+inline const char* xmlGetName (xmlNodePtr cur) { return cur->GetType(); };
+inline const char* xmlGetData (xmlNodePtr cur) { return cur->GetData(); };
#endif /* USE_LIBXML */
diff --git a/tuxbox/neutrino/src/gui/audioplayer.cpp b/tuxbox/neutrino/src/gui/audioplayer.cpp
index 3c2dd77..cecf479 100644
--- a/tuxbox/neutrino/src/gui/audioplayer.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer.cpp
@@ -1098,10 +1098,10 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *nametag,
neutrino_msg_data_t data;
g_RCInput->getMsg(&msg, &data, 0);
while (element && msg != CRCInput::RC_home) {
- char *ptr = NULL;
- char *name = NULL;
- char *url = NULL;
- char *type = NULL;
+ const char *ptr = NULL;
+ const char *name = NULL;
+ const char *url = NULL;
+ const char *type = NULL;
time_t bitrate = 0;
bool skip = true;
listPos++;
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index e7fff11..4351daf 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -471,7 +471,7 @@ bool CFileBrowser::readDir_vlc(const std::string & dirname, CFileList* flist)
if (answer_parser != NULL) {
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
element = element->xmlChildrenNode;
- char *ptr;
+ const char *ptr;
if (element == NULL) {
printf("[FileBrowser] vlc: Drive is not readable. Possibly no disc inserted\n");
CFile file;
@@ -590,7 +590,7 @@ and add to neutrino playlist
xmlDocPtr answer_parser = parseXml(answer.c_str());
if (answer_parser != NULL) {
- char *ptr;
+ const char *ptr;
unsigned char xml_decode = 0;
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
@@ -609,7 +609,7 @@ and add to neutrino playlist
file.Time = 0;
flist->push_back(file);
} else {
- char * tunein_base = NULL;
+ const char * tunein_base = NULL;
if (xml_decode == 1) {
CFile file;
diff --git a/tuxbox/neutrino/src/gui/movieplayer.cpp b/tuxbox/neutrino/src/gui/movieplayer.cpp
index 74b17d0..feb1858 100644
--- a/tuxbox/neutrino/src/gui/movieplayer.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer.cpp
@@ -724,7 +724,7 @@ int VlcGetStreamTime()
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
element = element->xmlChildrenNode;
while (element) {
- char* tmp = xmlGetName(element);
+ const char* tmp = xmlGetName(element);
if (strcmp(tmp, "time") == 0) {
return atoi(xmlGetData(element));
}
@@ -756,7 +756,7 @@ int VlcGetStreamLength()
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
element = element->xmlChildrenNode;
while (element) {
- char* tmp = xmlGetName(element);
+ const char* tmp = xmlGetName(element);
if (strcmp(tmp, "length") == 0) {
return atoi(xmlGetData(element));
}
@@ -4682,7 +4682,7 @@ void CMoviePlayerGui::showFileInfoVLC()
}
while (element)
{
- char *data = xmlGetAttribute(element, "name");
+ const char *data = xmlGetAttribute(element, "name");
if (data)
helpbox.addLine(NEUTRINO_ICON_BUTTON_RED, data);
xmlNodePtr element1 = element->xmlChildrenNode;
diff --git a/tuxbox/neutrino/src/gui/movieplayer2.cpp b/tuxbox/neutrino/src/gui/movieplayer2.cpp
index c2565c3..19a9a07 100644
--- a/tuxbox/neutrino/src/gui/movieplayer2.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer2.cpp
@@ -831,7 +831,7 @@ int VlcGetStatus(const char *attribute)
element = element->xmlChildrenNode;
while (element)
{
- char* tmp = xmlGetName(element);
+ const char* tmp = xmlGetName(element);
if (strcmp(tmp, attribute) == 0)
{
ret = atoi(xmlGetData(element));
@@ -3680,7 +3680,7 @@ void CMoviePlayerGui::showFileInfoVLC()
}
while (element)
{
- char *data = xmlGetAttribute(element, "name");
+ const char *data = xmlGetAttribute(element, "name");
if (data)
helpbox.addLine(NEUTRINO_ICON_BUTTON_RED, data);
xmlNodePtr element1 = element->xmlChildrenNode;
-----------------------------------------------------------------------
Summary of changes:
dvb/zapit/src/bouquets.cpp | 8 ++++----
dvb/zapit/src/getservices.cpp | 2 +-
dvb/zapit/src/zapit.cpp | 3 +--
misc/libs/libxmltree/xmlinterface.cpp | 4 ++--
misc/libs/libxmltree/xmlinterface.h | 10 +++++-----
tuxbox/neutrino/src/gui/audioplayer.cpp | 8 ++++----
tuxbox/neutrino/src/gui/filebrowser.cpp | 6 +++---
tuxbox/neutrino/src/gui/movieplayer.cpp | 6 +++---
tuxbox/neutrino/src/gui/movieplayer2.cpp | 4 ++--
9 files changed, 25 insertions(+), 26 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-17 20:18:34
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via ffe922052372ccea16f63bb29d726ffa040befc6 (commit)
from 22f2c379569e8fe6d9da34c78957bd3260348a4b (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 ffe922052372ccea16f63bb29d726ffa040befc6
Author: Jacek Jendrzej <cra...@go...>
Date: Fri Apr 17 22:17:30 2015 +0200
nhttpd: simplify encodeString function
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
index e84274b..74e3fff 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
@@ -239,31 +239,24 @@ std::string decodeString(std::string encodedString)
//-----------------------------------------------------------------------------
// HTMLEncode std::string
//-----------------------------------------------------------------------------
-std::string encodeString(std::string decodedString)
+std::string encodeString(const std::string &decodedString)
{
- unsigned int len = sizeof(char) * decodedString.length()*5 + 1;
- std::string result( len, '\0' );
- char *newString = (char *)result.c_str();
- char *dstring = (char *)decodedString.c_str();
- char one_char;
- if(len == result.length()) // got memory needed
- {
- while(one_char = *dstring++) /* use the null character as a loop terminator */
- {
- if(isalnum(one_char))
- *newString++ = one_char;
- else
- newString += snprintf(newString, result.length(), "&#%d;", (unsigned char) one_char);
- }
+ std::string result="";
+ char buf[10]= {0};
- *newString='\0'; /* when done copying the string,need to terminate w/ null char */
- result.resize((unsigned int)(newString - result.c_str()), '\0');
- return result;
- }
- else
+ for (unsigned int i=0; i<decodedString.length(); i++)
{
- return "";
- }
+ const char one_char = decodedString[i];
+ if (isalnum(one_char)) {
+ result += one_char;
+ } else {
+ snprintf(buf,sizeof(buf), "&#%d;",(unsigned char) one_char);
+ result +=buf;
+ }
+ }
+ result+='\0';
+ result.reserve();
+ return result;
}
//-----------------------------------------------------------------------------
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
index 2d570ac..a5dc11e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
@@ -22,7 +22,7 @@ void correctTime(struct tm *zt);
std::string itoa(unsigned int conv);
std::string itoh(unsigned int conv);
std::string decodeString(std::string encodedString);
-std::string encodeString(std::string decodedString);
+std::string encodeString(const std::string &decodedString);
std::string string_tolower(std::string str);
//-----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
.../neutrino/daemons/nhttpd/yhttpd_core/helper.cpp | 37 ++++++++------------
.../neutrino/daemons/nhttpd/yhttpd_core/helper.h | 2 +-
2 files changed, 16 insertions(+), 23 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-17 19:49:42
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 22f2c379569e8fe6d9da34c78957bd3260348a4b (commit)
from c9e59d02633e16dfe7fe08aefe99e678d89102fd (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 22f2c379569e8fe6d9da34c78957bd3260348a4b
Author: GetAway <get...@t-...>
Date: Fri Apr 17 21:47:18 2015 +0200
yWeb:fix check presence of flash tools
Signed-off-by: GetAway <get...@t-...>
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 8a2df7e..c7fb634 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
@@ -105,7 +105,7 @@ function do_check()
~
sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote & OSD is enabled.", "ok");
=}
- {=var-set:fcp={=find-exec:fcp=}=}{=var-set:fcp={=find-exec:flashcp=}=}
+ {=var-set:fcp={=if-empty:{=find-exec:fcp=}~{=if-empty:{=find-exec:flashcp=}~~{=find-exec:flashcp=}=}~{=find-exec:fcp=}=}=}
{=if-empty:{=var-get:fcp=}~
sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. ", "failed");
~
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 daece4a..e651448 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
@@ -21,8 +21,7 @@ function do_image_upload_ready()
</script>
</head>
<body>
-{=var-set:fcp={=find-exec:fcp=}=}
-{=var-set:fcp={=find-exec:flashcp=}=}
+{=var-set:fcp={=if-empty:{=find-exec:fcp=}~{=if-empty:{=find-exec:flashcp=}~~{=find-exec:flashcp=}=}~{=find-exec:fcp=}=}=}
{=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">
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 4b4b186..efe1e79 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.2.1
-date=15.04.2015
+version=2.8.2.2
+date=17.04.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Tools_Check_Install.yhtm | 2 +-
.../daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm | 3 +--
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-15 19:21:12
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via c9e59d02633e16dfe7fe08aefe99e678d89102fd (commit)
from 7a711c6512f23b9dfed7138b54642e3c6add2b5e (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 c9e59d02633e16dfe7fe08aefe99e678d89102fd
Author: Jacek Jendrzej <cra...@go...>
Date: Wed Apr 15 21:18:48 2015 +0200
nhttpd: change sprintf to snprintf
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 2205a53..020633e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -1994,7 +1994,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
strcpy(zAddData, NeutrinoAPI->Zapit->isChannelTVChannel(timer->channel_id) ? "Unbekannter TV-Kanal" : "Unbekannter Radiokanal");
}
else
- sprintf(zAddData, PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id);
+ snprintf(zAddData,sizeof(zAddData), PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id);
zAddData[22]=0;
@@ -2002,7 +2002,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
case CTimerd::TIMER_STANDBY:
if (!send_id)
- sprintf(zAddData,"Standby: %s",(timer->standby_on ? "ON" : "OFF"));
+ snprintf(zAddData,sizeof(zAddData),"Standby: %s",(timer->standby_on ? "ON" : "OFF"));
break;
case CTimerd::TIMER_REMIND :
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
index 471eb23..e84274b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
@@ -253,7 +253,7 @@ std::string encodeString(std::string decodedString)
if(isalnum(one_char))
*newString++ = one_char;
else
- newString += sprintf(newString, "&#%d;", (unsigned char) one_char);
+ newString += snprintf(newString, result.length(), "&#%d;", (unsigned char) one_char);
}
*newString='\0'; /* when done copying the string,need to terminate w/ null char */
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 4 ++--
.../neutrino/daemons/nhttpd/yhttpd_core/helper.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-15 18:52:41
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 7a711c6512f23b9dfed7138b54642e3c6add2b5e (commit)
from fc1c8084e15da61091391a06316945d9795c147d (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 7a711c6512f23b9dfed7138b54642e3c6add2b5e
Author: GetAway <get...@t-...>
Date: Wed Apr 15 20:51:58 2015 +0200
Y_Live.yhtm: default http_caching is 1000ms
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
index 97e63e0..5a1b6be 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
@@ -145,7 +145,7 @@ function view_transcode_mode()
ClientAddr = "{=func:get_request_data clientaddr=}";
insert_message_control("{=L:2520=}");
isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;true=}" == "true");
- cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;0=};
+ cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;1000=};
/* {=if-equal:{=typ=}~popup~
always_on_top();
=}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 19d5b54..4b4b186 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.2.0
+version=2.8.2.1
date=15.04.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
Tuxbox-GIT: apps
|
|
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
|
|
From: GetAway <tux...@ne...> - 2015-04-13 07:52:44
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 6b89af1d88bb6106ac17b9ae6d002f1980bf1127 (commit)
from 1b4373ed942e3d89d6985f5476015158405a15d8 (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 6b89af1d88bb6106ac17b9ae6d002f1980bf1127
Author: Stefan Seyfried <se...@tu...>
Date: Mon Apr 13 09:48:59 2015 +0200
helper: add a function to find an executable in $PATH
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/src/system/helper.cpp b/tuxbox/neutrino/src/system/helper.cpp
index 66505f4..cb7a065 100644
--- a/tuxbox/neutrino/src/system/helper.cpp
+++ b/tuxbox/neutrino/src/system/helper.cpp
@@ -122,3 +122,34 @@ int my_system(int argc, const char *arg, ...)
va_end(args);
return ret;
}
+
+std::string find_executable(const char *name)
+{
+ struct stat s;
+ char *tmpPath = getenv("PATH");
+ char *p, *n, *path;
+ if (tmpPath)
+ path = strdupa(tmpPath);
+ else
+ path = strdupa("/bin:/var/bin:/sbin:/var/sbin");
+ if (name[0] == '/') { /* full path given */
+ if (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode))
+ return std::string(name);
+ return "";
+ }
+
+ p = path;
+ while (p) {
+ n = strchr(p, ':');
+ if (n)
+ *n++ = '\0';
+ if (*p != '\0') {
+ std::string tmp = std::string(p) + "/" + std::string(name);
+ const char *f = tmp.c_str();
+ if (!access(f, X_OK) && !stat(f, &s) && S_ISREG(s.st_mode))
+ return tmp;
+ }
+ p = n;
+ }
+ return "";
+}
diff --git a/tuxbox/neutrino/src/system/helper.h b/tuxbox/neutrino/src/system/helper.h
index 5fd8de4..8ccc836 100644
--- a/tuxbox/neutrino/src/system/helper.h
+++ b/tuxbox/neutrino/src/system/helper.h
@@ -34,4 +34,6 @@ int my_system(int argc, const char *arg, ...); /* argc is number of arguments in
bool file_exists(const char *filename);
+std::string find_executable(const char *name);
+
#endif
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/system/helper.cpp | 31 +++++++++++++++++++++++++++++++
tuxbox/neutrino/src/system/helper.h | 2 ++
2 files changed, 33 insertions(+), 0 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-13 07:23:43
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 1b4373ed942e3d89d6985f5476015158405a15d8 (commit)
from cc5531dfe4aadce6fd23fbdf1e8a48a90f2a92c4 (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 1b4373ed942e3d89d6985f5476015158405a15d8
Author: svenhoefer <sve...@sv...>
Date: Mon Apr 13 09:23:00 2015 +0200
yWeb: remove dead links to yjogol website
Signed-off-by: GetAway <get...@t-...>
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 af05936..8506d2b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
@@ -50,10 +50,7 @@ function wiki_url(_page)
{
return "<a href=\"http://wiki.dbox2-tuning.net/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
}
-function y_url(_page)
-{
- return "<a href=\"http://www.yjogol.com/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
-}
+
function do_check()
{
sLog_init();
@@ -66,13 +63,12 @@ function do_check()
if(nhttpd_version.search(/error/)!=-1)
nhttpd_version = "0.0.0-unknown";
if(nhttpd_version < needed_nhttpd_version)
- sLog_addRow(sLog_body, "red", "WebServer: version: "+nhttpd_version+" version needed: "+needed_nhttpd_version+
- " <a href='http://www.yjogol.com/yFAQ.htm#diy' target='_blank'><b>[Help]<\/b><\/a>", "fail");
+ sLog_addRow(sLog_body, "red", "WebServer: version: "+nhttpd_version+" version needed: "+needed_nhttpd_version+" ", "fail");
else
sLog_addRow(sLog_body, "green", "WebServer: version is "+nhttpd_version, "ok");
{=if-equal:{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.authenticate;false=}~false~~
- sLog_addRow(sLog_body, "yellow", "WebServer: Authentication is on. "+y_url("Help-Settings-Webserver"), "notice");
+ sLog_addRow(sLog_body, "yellow", "WebServer: Authentication is on. ", "notice");
=}
{=if-equal:{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80=}~80~~
sLog_addRow(sLog_body, "yellow",
@@ -93,37 +89,37 @@ 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~
- sLog_addRow(sLog_body, "red", "Programs: fbshot is not installed. OSD Screenshot is disabled. "+y_url("Help-BoxControl-OSD_Screenshot"), "failed");
+ 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~
- sLog_addRow(sLog_body, "red", "Programs: dboxshot is not installed. Remote & OSD is disabled. <a href='http://www.yjogol.com/faq-diy' target='_blank'><b>[Download]<\/b><\/a>", "failed");
+ 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~
- sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. "+y_url("Help-Tools-Image"), "failed");
+ 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~
- sLog_addRow(sLog_body, "red", "Programs: ether-wake is not installed. Wake on LAN is disabled. "+y_url("Help-Tools-Wake_on_LAN"), "failed");
+ 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~
- sLog_addRow(sLog_body, "red", "Programs: automount is not installed. AutoMount is disabled. "+y_url("Help-Tools-AutoMount"), "failed");
+ 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~
- sLog_addRow(sLog_body, "red", "Programs: udpstreamts is not installed. udp-streaming is disabled. "+y_url("Help-Live_Timer-UDP_Streaming"), "failed");
+ 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_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 002e258..c3bb9a4 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.8
-date=12.04.2015
+version=2.8.1.9
+date=13.04.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Tools_Check_Install.yhtm | 22 ++++++++-----------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
2 files changed, 11 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
|
From: GetAway <tux...@ne...> - 2015-04-12 19:27:21
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via cc5531dfe4aadce6fd23fbdf1e8a48a90f2a92c4 (commit)
from fe3d32c7d4017a98a85147cefe5c425381768557 (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 cc5531dfe4aadce6fd23fbdf1e8a48a90f2a92c4
Author: svenhoefer <sve...@sv...>
Date: Sun Apr 12 21:24:56 2015 +0200
yWeb: add signal strength to boxcontrol menu
port from N-HD
fix translation in Y_Settings_nhttpd.yhtm
yWeb version bump 2.8.1.8
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 0bf6010..4fcfa0b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
@@ -5,6 +5,64 @@
<script type="text/javascript" src="/Y_yweb.js"></script>
<script type="text/javascript">
//<![CDATA[
+var g_sig = 100;
+function set_sigbar(_sig){
+ var l = $("sigbar_left");
+ var r = $("sigbar_right");
+ /*IE: width=0 -> =""*/
+ if(_sig > 0)
+ l.width = _sig.toString()+"%";
+ else
+ l.width = "";
+ if(_sig >= 100)
+ r.width = "";
+ else
+ r.width = (100-_sig).toString()+"%";
+}
+function sig_get(){
+ var __sig_str = loadSyncURL("/control/signal?sig");
+ var __sig = parseInt(__sig_str,10);
+ if(isNaN(__sig)) __sig=100;
+ set_sigbar(__sig);
+ g_sig = __sig;
+ $('sig_value').update(g_sig);
+ return __sig;
+}
+
+var g_snr = 100;
+function set_snrbar(_snr){
+ var l = $("snrbar_left");
+ var r = $("snrbar_right");
+ /*IE: width=0 -> =""*/
+ if(_snr > 0)
+ l.width = _snr.toString()+"%";
+ else
+ l.width = "";
+ if(_snr >= 100)
+ r.width = "";
+ else
+ r.width = (100-_snr).toString()+"%";
+}
+function snr_get(){
+ var __snr_str = loadSyncURL("/control/signal?snr");
+ var __snr = parseInt(__snr_str,10);
+ if(isNaN(__snr)) __snr=100;
+ set_snrbar(__snr);
+ g_snr = __snr;
+ $('snr_value').update(g_snr);
+ return __snr;
+}
+
+var g_ber = 0;
+function ber_get(){
+ var __ber_str = loadSyncURL("/control/signal?ber");
+ var __ber = parseInt(__ber_str,10);
+ if(isNaN(__ber)) __ber=100;
+ g_ber = __ber;
+ $('ber_value').update(g_ber);
+ //return __ber;
+}
+
var g_volumen = 100;
function volumen_set_audiobar(_volumen)
{
@@ -64,9 +122,16 @@ function init(){
volumen_set_audiobar(volumen_get());
set_mute_button();
add_yExtensions('boxcontrol', 'secmenu_boxcontrol');
+
+ set_sigbar(sig_get());
+ set_snrbar(snr_get());
+ ber_get();
}
function get_data(){
volumen_set_audiobar(volumen_get());
+ set_sigbar(sig_get());
+ set_snrbar(snr_get());
+ ber_get();
}
//]]>
</script>
@@ -120,12 +185,37 @@ function get_data(){
<a href="javascript:volumen_set(g_volumen+10);"><img src="/images/volumeup.png"></a></span>
<span title="{=L:0217=}">
<a id="btMute" href="javascript:toggle_mute();"> <img src="/images/volumemute.png"> </a></span>
-<!-- <br/><br/>-->
<span title="{=L:0218=}"><a href="javascript:set_mode('tv');"><img src="/images/live.gif"> </a></span>
<span title="{=L:0219=}"><a href="javascript:set_mode('radio');"> <img src="/images/radio.png"></a></span>
</center>
</div>
</div>
+<div class="y_menu_sec_box">
+ <div class="y_menu_sec_box_head"><h2>{=L:0224=}</h2></div>
+ <div class="y_menu_sec_box_body">
+ <center>
+ <div class="y_text_boxcontrol_div_progress">SIG <span id="sig_value"></span>%</div>
+ <table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:0225=}">
+ <tr>
+ <td id="sigbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ <td id="sigbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ </tr>
+ </table>
+ </center>
+ <center>
+ <div class="y_text_boxcontrol_div_progress">SNR <span id="snr_value"></span>%</div>
+ <table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:0226=}">
+ <tr>
+ <td id="snrbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ <td id="snrbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+ </tr>
+ </table>
+ </center>
+ <center>
+ <div class="y_text_boxcontrol_div_progress" title="{=L:0227=}">BER <span id="ber_value"></span></div>
+ </center>
+ </div>
+</div>
{=if-empty:{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}~~
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>{=L:0223=}</h2></div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
index b183900..db8d7a7 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_nhttpd.yhtm
@@ -80,7 +80,7 @@ function do_submit()
<td><input type="text" name="mod_sendfile_mime_types" size="60" value="{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_sendfile.mime_types~cache=}" /></td>
</tr>
<tr>
- <td>{=L:1510=}</td>
+ <td>{=L:1511=}</td>
<td>
<input type="radio" name="mod_sendfile_sendAll" value="false" />{=L:0032=}
<input type="radio" name="mod_sendfile_sendAll" value="true" />{=L:0031=}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index cc193f4..002e258 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.7
-date=11.04.2015
+version=2.8.1.8
+date=12.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 d14628e..0fdb530 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
@@ -119,6 +119,10 @@
0221=Lautstärke Anzeige
0222=dboxshot nicht installiert in
0223=Wechseln zu
+0224=Signalstärke
+0225=Signalstärkepegel anzeigen
+0226=Signal-Rausch-Verhältnis anzeigen
+0227=Bitfehlerverhältnis anzeigen
#======== Boxcontrol - fbshot - lcshot
0300=Schnappschuss
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/English b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
index 0ea7c06..0f8548b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/English
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
@@ -119,6 +119,10 @@
0221=volumen display
0222=dboxshot not installed at
0223=Switch to
+0224=Signal strength
+0225=Show signal strength level
+0226=Show signal to noise ratio
+0227=Show bit error ratio
#======== Boxcontrol - snapshot - fbshot
0300=snapshot
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm | 92 +++++++++++++++++++-
.../daemons/nhttpd/web/Y_Settings_nhttpd.yhtm | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
.../neutrino/daemons/nhttpd/web/languages/Deutsch | 4 +
.../neutrino/daemons/nhttpd/web/languages/English | 4 +
5 files changed, 102 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
|
1 message has been excluded from this view by a project administrator.
