diff --git a/data/y-web/Y_Tools_Timer_Sync.js b/data/y-web/Y_Tools_Timer_Sync.js index 81c0a6402..418f37622 100644 --- a/data/y-web/Y_Tools_Timer_Sync.js +++ b/data/y-web/Y_Tools_Timer_Sync.js @@ -173,13 +173,23 @@ function do_get_tvinfo() if(_password != "") { 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"); - 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"); + sLog_addRow(sLog_body, "green", "TVinfo: connecting ", "ok"); } else sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed"); diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index f0acb3c47..4967504fe 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=2.9.0.41 -date=29.01.2019 +version=2.9.0.42 +date=16.03.2019 info=NI-Neutrino diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh index d93b15bf2..c8c627566 100755 --- a/data/y-web/scripts/Y_Tools.sh +++ b/data/y-web/scripts/Y_Tools.sh @@ -593,7 +593,7 @@ case "$1" in timer_get_tvinfo) shift 1 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 ] then res="$res File empty!"