mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: fix TVinfo - use curl now

Browse Source
This commit is contained in:
GetAway
2019-03-16 12:39:06 +01:00
parent 7dc03ef026
commit 214d3f641c
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/y-web/Y_Tools_Timer_Sync.js
View File

@@ -173,13 +173,23 @@ function do_get_tvinfo()
if(_password != "") if(_password != "")
{ {
var res = loadSyncURL(_url); var res = loadSyncURL(_url);
if(res.search(/Connecting/)!=-1)
if(res.search("Could not resolve host")!=-1) {
sLog_addRow(sLog_body, "red", "TVinfo: Could not resolve host", "error");
return;
}
if(res.search("error setting certificate")!=-1)
sLog_addRow(sLog_body, "red", "TVinfo: error setting certificate verify locations", "error");
if(res.search("SSL certificate verify ok")!=-1)
sLog_addRow(sLog_body, "green", "TVinfo: SSL certificate verify", "ok");
else
sLog_addRow(sLog_body, "red", "TVinfo: SSL certificate verify "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
if(res.search("left intact")!=-1)
{ {
sLog_addRow(sLog_body, "green", "TVinfo: connecting "+res, "ok"); sLog_addRow(sLog_body, "green", "TVinfo: connecting ", "ok");
if(res.search(/empty/)!=-1)
sLog_addRow(sLog_body, "red", "TVinfo: Username and/or Password wrong. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
else
sLog_addRow(sLog_body, "green", "TVinfo: Username / Password ok", "ok");
} }
else else
sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed"); sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");

4
data/y-web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.9.0.40 version=2.9.0.41
date=01.03.2017 date=16.03.2019
type=Release type=Release
info=Port Tuxbox-Neutrino info=Port Tuxbox-Neutrino

2
data/y-web/scripts/Y_Tools.sh
View File

@@ -593,7 +593,7 @@ case "$1" in
timer_get_tvinfo) timer_get_tvinfo)
shift 1 shift 1
rm -r /tmp/tvinfo.xml rm -r /tmp/tvinfo.xml
res=$(wget -O /tmp/tvinfo.xml "http://www.tvinfo.de/share/openepg/schedule.php?username=$1&password=$2" 2>&1) res=$(curl -o /tmp/tvinfo.xml -vs "https://www.tvinfo.de/share/openepg/schedule.php?username=$1&password=$2" 2>&1)
if ! [ -s /tmp/tvinfo.xml ] if ! [ -s /tmp/tvinfo.xml ]
then then
res="$res File empty!" res="$res File empty!"