Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

src/gui/moviebrowser.cpp

@@ -1235,7 +1235,12 @@ void CMovieBrowser::refreshMovieInfo(void)
 		int picw = (int)(((float)16 / (float)9) * (float)m_cBoxFrameInfo.iHeight);
 		int pich = m_cBoxFrameInfo.iHeight;
 		std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name);
-		logo_ok = (fname != "");
+		if(fname.empty()) {
+			std::string cover = m_movieSelectionHandler->file.Name;
+			cover.replace((cover.length()-18),15,""); //covername without yyyymmdd_hhmmss
+			fname = getScreenshotName(cover);
+		}
+		logo_ok = (!fname.empty());
 		int flogo_w = 0, flogo_h = 0;
 		if(logo_ok) {
 			g_PicViewer->getSize(fname.c_str(), &flogo_w, &flogo_h);

src/nhttpd/tuxboxapi/coolstream/controlapi.cpp

@@ -561,7 +561,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();
 	}

src/nhttpd/yhttpd_core/helper.cpp

@@ -203,12 +203,9 @@ std::string decodeString(std::string encodedString) {
 			iStr = strtoul(hex, NULL, 16); /* convert to Hex char */
 			result += (char) iStr;
 			count += 3;
-#if 0
-//why decode '+' to ' ' ?
 		} else if (string[count] == '+') {
 			result += ' ';
 			count++;
-#endif
 		} else {
 			result += string[count];
 			count++;

src/nhttpd/yhttpd_core/yrequest.cpp

@@ -211,7 +211,7 @@ bool CWebserverRequest::ParseHeader(std::string header) {
 void CWebserverRequest::analyzeURL(std::string url) {
 	ParameterList.clear();
 	// URI decode
-	url = decodeString(url);
+	//url = decodeString(url);
 	url = trim(url, "\r\n"); // non-HTTP-Standard: allow \r or \n in URL. Delete it.
 	UrlData["fullurl"] = url;
 	// split Params