Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-21 17:57:38 +01:00
43 changed files with 485 additions and 92 deletions

View File

@@ -498,23 +498,34 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::RCCGI(CyhookHandler *hh)
{
if (!(hh->ParamList.empty()))
{
bool locked = CRCLock::getInstance()->isLocked();
bool locked = CRCLock::getInstance()->isLocked();
if (hh->ParamList["1"] == "lock"){ // lock remote control
if (hh->ParamList.empty() || hh->ParamList["1"] == "status")
{
if (locked)
hh->WriteLn("off");
else
hh->WriteLn("on");
}
else
{
if (hh->ParamList["1"] == "lock")
{
if (!locked)
NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::LOCK_RC, CEventServer::INITID_HTTPD);
}
else if (hh->ParamList["1"] == "unlock"){// unlock remote control
else if (hh->ParamList["1"] == "unlock")
{
if (locked)
NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::UNLOCK_RC, CEventServer::INITID_HTTPD);
}
else{
else
{
hh->SendError();
return;
}
hh->SendOk();
}
hh->SendOk();
}
//-----------------------------------------------------------------------------