[Commits] [Tuxbox-GIT] Tuxbox-GIT: apps branch master updated. CVS-Final-29-g01b8bea
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] [Tuxbox-GIT] Tuxbox-GIT: apps branch master updated. CVS-Final-29-g01b8bea
|
From: Carsten S. <tux...@ne...> - 2013-01-06 22:16:29
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 01b8bea02569e8109cb8ea147c1ac1bf32680f11 (commit)
via 2b02690ced48e659ad9919ba0ea38298bc7764bb (commit)
via e9dbd6f25a85454b09111fe6c63cd4eba6307806 (commit)
from aeec2aea76430499e40c9c8a98e1b32d0df15379 (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 01b8bea02569e8109cb8ea147c1ac1bf32680f11
Author: Christian Schuett <Gau...@ho...>
Date: Mon Dec 31 19:26:24 2012 +0100
yWeb: use 'textarea' for boxcontrol messages
it is now possible to send messages with newlines via yWeb
to TV screen
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Messages.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Messages.yhtm
index 77ae75a..d198eca 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Messages.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Messages.yhtm
@@ -10,12 +10,12 @@
<table class="y_invisible_table" cellpadding="5" width="100%">
<tr><td class="y_form_header">Meldung auf dbox-Bildschirm</td></tr>
<tr><td>
- <input name="nmsg" type="text" size="50" maxlength="255" title="enter message to send to TV screen"/>
+ <textarea name="nmsg" cols="50" rows="5" title="enter message to send to TV screen"></textarea><br/>
<button type="submit" name="message" ytype="go" title="send message">senden</button>
</td></tr>
<tr><td class="y_form_header">Popup auf dbox-Bildschirm</td></tr>
<tr><td>
- <input name="popup" type="text" size="50" maxlength="255" title="enter message to send to TV screen"/>
+ <textarea name="popup" cols="50" rows="5" title="enter message to send to TV screen"></textarea><br/>
<button type="submit" name="pmessage" ytype="go" title="send message">senden</button>
</td></tr>
</table>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index efb1243..6987f11 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,5 +1,5 @@
-version=2.7.0.20
-date=14.11.2011
+version=2.7.0.21
+date=31.12.2012
type=Release
info=
commit 2b02690ced48e659ad9919ba0ea38298bc7764bb
Author: Christian Schuett <Gau...@ho...>
Date: Sun Dec 23 22:53:04 2012 +0100
Neutrino: fix wrong infos on LCD on subchannels
this ensures that infos on the LCD are correct after cancelling
numeric zap or leaving virtual zap mode on subchannels
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index b172057..09abc7d 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -829,7 +829,14 @@ int CChannelList::numericZap(neutrino_msg_t key)
}
else
{
- showInfo(tuned);
+ if (!g_RemoteControl->subChannels.empty() && g_RemoteControl->selected_subchannel > 0)
+ g_InfoViewer->showTitle(getActiveChannelNumber(),
+ getActiveChannelName(),
+ getActiveSatellitePosition(),
+ g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].getChannelID(),
+ true);
+ else
+ showInfo(tuned);
g_InfoViewer->killTitle();
// Rote Taste zeigt EPG fuer gewaehlten Kanal an
@@ -940,7 +947,14 @@ void CChannelList::virtual_zap_mode(bool up)
}
else
{
- showInfo(tuned);
+ if (!g_RemoteControl->subChannels.empty() && g_RemoteControl->selected_subchannel > 0)
+ g_InfoViewer->showTitle(getActiveChannelNumber(),
+ getActiveChannelName(),
+ getActiveSatellitePosition(),
+ g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].getChannelID(),
+ true);
+ else
+ showInfo(tuned);
g_InfoViewer->killTitle();
// Rote Taste zeigt EPG fuer gewaehlten Kanal an
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 287083c..97a7972 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -640,6 +640,7 @@ void CInfoViewer::showTitle(const int ChanNum, const std::string & Channel, cons
showLcdPercentOver();
+#if 0
if ( ( g_RemoteControl->current_channel_id == channel_id) &&
!( ( ( info_CurrentNext.flags & CSectionsdClient::epgflags::has_next ) &&
( info_CurrentNext.flags & ( CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::has_no_current ) ) ) ||
@@ -648,6 +649,7 @@ void CInfoViewer::showTitle(const int ChanNum, const std::string & Channel, cons
// EVENT anfordern!
g_Sectionsd->setServiceChanged(channel_id, true );
}
+#endif
#ifdef ENABLE_RADIOTEXT
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_radio)
commit e9dbd6f25a85454b09111fe6c63cd4eba6307806
Author: Christian Schuett <Gau...@ho...>
Date: Sun Dec 23 22:51:43 2012 +0100
nhttpd: don't decode URL parameters multiple times
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 19a300c..7fbc3cf 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -568,7 +568,7 @@ void CControlAPI::MessageCGI(CyhookHandler *hh)
if (event != 0)
{
- message=decodeString(message);
+ //message=decodeString(message);
NeutrinoAPI->EventServer->sendEvent(event, CEventServer::INITID_HTTPD, (void *) message.c_str(), message.length() + 1);
hh->SendOk();
}
@@ -1368,7 +1368,7 @@ void CControlAPI::StartPluginCGI(CyhookHandler *hh)
if (hh->ParamList["name"] != "")
{
pluginname = hh->ParamList["name"];
- pluginname=decodeString(pluginname);
+ //pluginname=decodeString(pluginname);
NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::EVT_START_PLUGIN,
CEventServer::INITID_HTTPD,
(void *) pluginname.c_str(),
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
index 3811ef4..471eb23 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
@@ -237,7 +237,7 @@ std::string decodeString(std::string encodedString)
return result;
}
//-----------------------------------------------------------------------------
-// Encode URLEncoded std::string
+// HTMLEncode std::string
//-----------------------------------------------------------------------------
std::string encodeString(std::string decodedString)
{
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yrequest.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yrequest.cpp
index b4d48b5..c4813e1 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yrequest.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/yrequest.cpp
@@ -176,6 +176,7 @@ bool CWebserverRequest::ParseParams(std::string param_string)
ende = true;
if(ySplitStringExact(param,"=",name,value))
{
+ name = decodeString(name);
value = trim(decodeString(value));
if(ParameterList[name].empty())
ParameterList[name] = value;
@@ -185,6 +186,8 @@ bool CWebserverRequest::ParseParams(std::string param_string)
ParameterList[name] += value;
}
}
+ else
+ name = trim(decodeString(name));
number = string_printf("%d", ParameterList.size()+1);
log_level_printf(7,"ParseParams: name: %s value: %s\n",name.c_str(), value.c_str());
ParameterList[number] = name;
@@ -228,16 +231,22 @@ bool CWebserverRequest::ParseHeader(std::string header)
//-----------------------------------------------------------------------------
void CWebserverRequest::analyzeURL(std::string url)
{
+ std::string fullurl = "";
ParameterList.clear();
+
// URI decode
- url = decodeString(url);
- url = trim(url, "\r\n"); // non-HTTP-Standard: allow \r or \n in URL. Delete it.
- UrlData["fullurl"] = url;
+ fullurl = decodeString(url);
+ fullurl = trim(fullurl, "\r\n"); // non-HTTP-Standard: allow \r or \n in URL. Delete it.
+ UrlData["fullurl"] = fullurl;
+
// split Params
if(ySplitString(url,"?",UrlData["url"],UrlData["paramstring"])) // split pure URL and all Params
+ {
+ UrlData["url"] = decodeString(UrlData["url"]);
ParseParams(UrlData["paramstring"]); // split params to ParameterList
+ }
else // No Params
- UrlData["url"] = url;
+ UrlData["url"] = fullurl;
if(!ySplitStringLast(UrlData["url"],"/",UrlData["path"],UrlData["filename"]))
{
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 4 ++--
.../daemons/nhttpd/web/Y_Boxcontrol_Messages.yhtm | 4 ++--
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
.../neutrino/daemons/nhttpd/yhttpd_core/helper.cpp | 2 +-
.../daemons/nhttpd/yhttpd_core/yrequest.cpp | 17 +++++++++++++----
tuxbox/neutrino/src/gui/channellist.cpp | 18 ++++++++++++++++--
tuxbox/neutrino/src/gui/infoviewer.cpp | 2 ++
7 files changed, 38 insertions(+), 13 deletions(-)
--
Tuxbox-GIT: apps
|
