From b54f576c687a03df83b3026f3d0bbdb64739cc91 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Tue, 26 Aug 2014 18:04:12 +0200 Subject: changed plugin check, now based on IP. Old test hangs when in wrong IP net. --- History | 1 + index.html | 13 ++++++++----- settings.js | 8 +++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/History b/History index 5adc8c2..54a52b5 100644 --- a/History +++ b/History @@ -4,6 +4,7 @@ Motorola Vip : 1960, 1910, 1903, 1963. VDR 1.7.29+ 0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server + Changed Plugin check, only check if digit 1,2,3 from server ip & box ip are the same. 0.25 Get recordings from Streamdev, Restfulapi or SmartTVweb. diff --git a/index.html b/index.html index c7f32b5..fd8a45d 100644 --- a/index.html +++ b/index.html @@ -150,7 +150,6 @@ function GetSettings() { if (!is.getObject("vip.serveraddress")) {} } catch(e) { is.setObject("vip.serveraddress","0",is.STORAGE_PERMANENT) - firstrun = 1; } try { @@ -259,10 +258,14 @@ function GetSettings() { for (var i = minChan[Fav_group]; i < (maxChan[Fav_group]+10); i++) { EPG[0][4][i] = "";EPG[1][4][i] = "";EPG[0][5][i] = "";EPG[1][5][i] = "";EPG[0][7][i] = "";EPG[1][7][i] = "";AvInfo[i] = ""; } - //Check if there is a SmartTV or Restfulapi VDR server plugin but not on first run. - if (!firstrun) { - CheckPlugins(); + //Check if there is a SmartTV or Restfulapi VDR server plugin but not when box ip isn't the same range as server ip + test_ip = server_ip.split("."); + box_ip = (is.getObject("config.ipaddress")).split("."); + + if (("http://" + box_ip[0] == test_ip[0]) && (box_ip[1] == test_ip[1]) && (box_ip[2] == test_ip[2])) { + CheckPlugins(); } + // override check for testing : // smartTVplugin = 0 ; // Restfulapiplugin = 1; @@ -3348,7 +3351,7 @@ try { } function ShowSearchTimerInfo() { - // info about a search timer. + // info about a search timer. //Like Show EPG Info //setup some dummy vars diff --git a/settings.js b/settings.js index afc8fdc..ce6fb00 100644 --- a/settings.js +++ b/settings.js @@ -2,9 +2,9 @@ // Default settings // -var Version = "0.26.1"; +var Version = "0.26.2"; -server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://easyvdr","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); +server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); var server_ip = server_ip_array[0]; // default server var StartVolume = 15; // Volume on (re)start of the portal. @@ -359,6 +359,8 @@ var PIPDelayID; var ErrorAgain = 0; var smartTVplugin; // Turn on or off the use of smartTVplugin var Restfulapiplugin; // Turn on or off the use of Restfulapiplugin -var firstrun = 0;// First time run or settings are cleaned. var localRecording = 0; +var box_ip; // Used for testing plugins +var test_ip; // Used for testing plugins + -- cgit v1.2.3