[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-504-g8fa01aa
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-504-g8fa01aa
|
From: GetAway <tux...@ne...> - 2015-03-18 07:52:05
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 8fa01aaff74b230431236165db6096c1a3dcc1e8 (commit)
via cb17895ab4186204bf8506216b7884e94de1a81f (commit)
via 39098127b34b5445135f5fb17d82308ea5fc53b2 (commit)
from 803ccb993a7e81e594428a724e9e1b4584bdf60f (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 8fa01aaff74b230431236165db6096c1a3dcc1e8
Author: Christian Schuett <Gau...@ho...>
Date: Tue Mar 17 20:43:02 2015 +0100
yWeb: add reschedule button to timerlist
Signed-off-by: Christian Schuett <Gau...@ho...>
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 009a8a0..73b2544 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -843,8 +843,10 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler */*hh*/, std::s
default:{}
}
+ std::string show_reschedule = (timer->eventRepeat != CTimerd::TIMERREPEAT_ONCE && timer->repeatCount != 1) ? "visible" : "hidden";
yresult += string_printf(para.c_str(), classname, zAlarmTime, zStopTime, zRep.c_str(), zRepCount.c_str(),
- zType.c_str(), sAddData.c_str(),timer->eventID,timer->eventID);
+ zType.c_str(), sAddData.c_str(), timer->eventID, show_reschedule.c_str(), timer->eventID,
+ timer->eventID);
}
classname = (i++&1)?'a':'b';
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
index 8eee876..a9f8410 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
@@ -18,6 +18,7 @@
<td>Beschreibung</td>
<td> </td>
<td> </td>
+ <td> </td>
</tr>
{=var-set:row=
<tr class="%ctimer">
@@ -28,6 +29,10 @@
<td>%s</td>
<td>%s</td>
<td>
+ <a href="/fb/timer.dbox2?action=reschedule&id=%d" style="visibility:%s;">
+ <img src="/images/time_down.png" alt="Timer aussetzen"/></a>
+ </td>
+ <td>
<a href="/fb/timer.dbox2?action=remove&id=%d">
<img src="/images/remove.png" alt="Timer löschen"/></a>
</td>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index b03e039..74be22d 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.0.9
-date=15.03.2015
+version=2.8.0.10
+date=17.03.2015
type=Release
info=Tuxbox
commit cb17895ab4186204bf8506216b7884e94de1a81f
Author: Christian Schuett <Gau...@ho...>
Date: Tue Mar 17 20:27:16 2015 +0100
nhttpd controlapi: add possibility to reschedule timers
Signed-off-by: Christian Schuett <Gau...@ho...>
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 123dc80..3e19048 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -116,6 +116,11 @@ void CControlAPI::compatibility_Timer(CyhookHandler *hh)
unsigned removeId = atoi(hh->ParamList["id"].c_str());
NeutrinoAPI->Timerd->removeTimerEvent(removeId);
}
+ else if(hh->ParamList["action"] == "reschedule")
+ {
+ unsigned rescheduleId = atoi(hh->ParamList["id"].c_str());
+ NeutrinoAPI->Timerd->rescheduleTimerEvent(rescheduleId);
+ }
else if(hh->ParamList["action"] == "modify")
doModifyTimer(hh);
else if(hh->ParamList["action"] == "new")
@@ -264,6 +269,14 @@ void CControlAPI::TimerCGI(CyhookHandler *hh)
NeutrinoAPI->Timerd->removeTimerEvent(removeId);
hh->SendOk();
}
+ else if (hh->ParamList["action"] == "reschedule")
+ {
+ unsigned rescheduleId = atoi(hh->ParamList["id"].c_str());
+ if (NeutrinoAPI->Timerd->rescheduleTimerEvent(rescheduleId))
+ hh->SendOk();
+ else
+ hh->SendError();
+ }
else if(!hh->ParamList["get"].empty())
{
int pre=0,post=0;
commit 39098127b34b5445135f5fb17d82308ea5fc53b2
Author: svenhoefer <sve...@sv...>
Date: Wed Mar 18 08:48:49 2015 +0100
libconfigfile: allow configfiles with another delimiter as '='
Signed-off-by: GetAway <get...@t-...>
diff --git a/misc/libs/libconfigfile/configfile.cpp b/misc/libs/libconfigfile/configfile.cpp
index b92fd67..11b3cb4 100644
--- a/misc/libs/libconfigfile/configfile.cpp
+++ b/misc/libs/libconfigfile/configfile.cpp
@@ -51,7 +51,7 @@ void CConfigFile::clear()
//
// public file operation methods
//
-bool CConfigFile::loadConfig(const char * const filename)
+bool CConfigFile::loadConfig(const char * const filename, char _delimiter)
{
std::ifstream configFile(filename);
@@ -67,7 +67,7 @@ bool CConfigFile::loadConfig(const char * const filename)
if (configFile.fail())
break;
- std::string::size_type i = s.find('=');
+ std::string::size_type i = s.find(_delimiter);
if (i != std::string::npos)
{
std::string::size_type j = s.find('#');
@@ -86,12 +86,12 @@ bool CConfigFile::loadConfig(const char * const filename)
}
}
-bool CConfigFile::loadConfig(const std::string & filename)
+bool CConfigFile::loadConfig(const std::string & filename, char _delimiter)
{
- return loadConfig(filename.c_str());
+ return loadConfig(filename.c_str(), _delimiter);
}
-bool CConfigFile::saveConfig(const char * const filename)
+bool CConfigFile::saveConfig(const char * const filename, char _delimiter)
{
std::string tmpname = std::string(filename) + ".tmp";
unlink(tmpname.c_str());
@@ -102,7 +102,7 @@ bool CConfigFile::saveConfig(const char * const filename)
std::cout << "[ConfigFile] saving " << filename << std::endl;
for (ConfigDataMap::const_iterator it = configData.begin(); it != configData.end(); ++it)
{
- configFile << it->first << "=" << it->second << std::endl;
+ configFile << it->first << _delimiter << it->second << std::endl;
}
configFile.sync();
@@ -123,9 +123,9 @@ bool CConfigFile::saveConfig(const char * const filename)
}
}
-bool CConfigFile::saveConfig(const std::string & filename)
+bool CConfigFile::saveConfig(const std::string & filename, char _delimiter)
{
- return saveConfig(filename.c_str());
+ return saveConfig(filename.c_str(), _delimiter);
}
diff --git a/misc/libs/libconfigfile/configfile.h b/misc/libs/libconfigfile/configfile.h
index 6a83a36..599b68c 100644
--- a/misc/libs/libconfigfile/configfile.h
+++ b/misc/libs/libconfigfile/configfile.h
@@ -51,11 +51,11 @@ class CConfigFile
public:
CConfigFile(const char p_delimiter, const bool p_saveDefaults = true);
- bool loadConfig(const char * const filename);
- bool loadConfig(const std::string & filename);
+ bool loadConfig(const char * const filename, char _delimiter = '=');
+ bool loadConfig(const std::string & filename, char _delimiter = '=');
- bool saveConfig(const char * const filename);
- bool saveConfig(const std::string & filename);
+ bool saveConfig(const char * const filename, char _delimiter = '=');
+ bool saveConfig(const std::string & filename, char _delimiter = '=');
void clear();
-----------------------------------------------------------------------
Summary of changes:
misc/libs/libconfigfile/configfile.cpp | 16 ++++++++--------
misc/libs/libconfigfile/configfile.h | 8 ++++----
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 13 +++++++++++++
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp | 4 +++-
.../neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm | 5 +++++
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
6 files changed, 35 insertions(+), 15 deletions(-)
--
Tuxbox-GIT: apps
|
