Fix autotimer close #581 and #589

E2OpenPlugins · May 8, 2017 · e6e6f5e · e6e6f5e · ims21 · May 10, 2017
1 parent c1ea05b
commit e6e6f5e
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 36 deletions.
diff --git a/plugin/controllers/views/ajax/at.tmpl b/plugin/controllers/views/ajax/at.tmpl
@@ -298,7 +298,7 @@ input#to,input#from,.text.number {width:60px;}
 <div>
 
 <script type="text/javascript" src="/js/chosen.jquery.min.js"></script>
-<script type="text/javascript" src="/js/at-2.3.min.js"></script>
+<script type="text/javascript" src="/js/at-2.4.min.js"></script>
 <script type="text/javascript">
 #raw
 $(function() { InitPage();});

diff --git a/plugin/controllers/views/ajax/epgpop.tmpl b/plugin/controllers/views/ajax/epgpop.tmpl
@@ -32,7 +32,7 @@
 #end if
 <link type="text/css" href="../css/style.min.css" rel="stylesheet"/>
 <link type="text/css" href="../web/css" rel="stylesheet"/>
-<script type="text/javascript" src="../js/openwebif-1.2.2.min.js"></script>
+<script type="text/javascript" src="../js/openwebif-1.2.3.min.js"></script>
 <script type="text/javascript" src="../js/jquery-ui-timepicker-addon.min.js"></script>
 <script type="text/javascript">initJsTranslation($dumps($tstrings))</script>
 <style>

diff --git a/plugin/controllers/views/main.tmpl b/plugin/controllers/views/main.tmpl
@@ -19,7 +19,7 @@
 #end if
 <link type="text/css" href="css/style.min.css" rel="stylesheet"/>
 <link type="text/css" href="web/css" rel="stylesheet"/>
-<script type="text/javascript" src="js/openwebif-1.2.2.min.js"></script>
+<script type="text/javascript" src="js/openwebif-1.2.3.min.js"></script>
 <script type="text/javascript" src="js/jquery-ui-timepicker-addon.min.js"></script>
 <script type="text/javascript">initJsTranslation($dumps($tstrings))</script>
 <title>Open Webif</title>

diff --git a/plugin/public/js/at-2.3.min.js b/plugin/public/js/at-2.3.min.js
diff --git a/plugin/public/js/at-2.4.min.js b/plugin/public/js/at-2.4.min.js
diff --git a/plugin/public/js/openwebif-1.2.2.min.js b/plugin/public/js/openwebif-1.2.2.min.js
diff --git a/plugin/public/js/openwebif-1.2.3.min.js b/plugin/public/js/openwebif-1.2.3.min.js
diff --git a/sourcefiles/js/at.js b/sourcefiles/js/at.js
diff --git a/sourcefiles/js/openwebif.js b/sourcefiles/js/openwebif.js
@@ -1,8 +1,8 @@
 //******************************************************************************
 //* openwebif.js: openwebif base module
-//* Version 1.2.2
+//* Version 1.2.3
 //******************************************************************************
-//* Copyright (C) 2011-2016 E2OpenPlugins
+//* Copyright (C) 2011-2017 E2OpenPlugins
 //*
 //* V 1.0   - Initial Version
 //* V 1.1   - add movie move and rename
@@ -17,6 +17,7 @@
 //* V 1.1.1 - epg fixes / change version numbering to match OWIF versioning
 //* V 1.2.1 - fix multiepg
 //* V 1.2.2 - improve epgsearch
+//* V 1.2.3 - fix add at from multiepg
 //*
 //* Authors: skaman <sandro # skanetwork.com>
 //* 		 meo
@@ -566,9 +567,14 @@ function addEditTimerEvent(sRef, eventId) {
 	});
 }
 
+function htmlEscape(str) {
+	return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
 function addAutoTimerEvent(sRef, sname, title ,begin, end) {
-	at2add = {
-			"name" : title,
+
+		at2add = {
+			"name" : htmlEscape(title),
 			"from" : begin,
 			"to" : end,
 			"sref" : sRef,