mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: fix TVinfo - use curl now

Browse Source 
Origin commit data
------------------
Commit: a41e1b6525
Author: GetAway <get-away@t-online.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)
This commit is contained in:
GetAway
2019-03-16 21:15:47 +01:00
committed by vanhofen
parent 264bf9569b
commit b311acdb0e
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 != "")
{
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");

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

@@ -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

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

@@ -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!"