From e9017a8342eed369dcae17c9a117693fade6a3e9 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 1 Nov 2015 20:37:28 -0800
Subject: [PATCH 1/2] Escape double quotes in search query

---
 data/interfaces/default/base.html      | 10 +++++-----
 data/interfaces/default/css/plexpy.css |  4 ++--
 data/interfaces/default/info.html      |  2 +-
 data/interfaces/default/search.html    |  4 ++--
 plexpy/datafactory.py                  |  2 +-
 plexpy/webserve.py                     |  3 +--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index 8d721dad..c471c3b3 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -61,7 +61,7 @@ from plexpy import version
                         <form action="search" method="post" class="form" id="search_form">
                             <div class="input-group">
                                 <span class="input-textbox">
-                                    <input type="text" class="form-control" name="search_query" id="search_query" aria-label="Search" placeholder="Search..."/>
+                                    <input type="text" class="form-control" name="query" id="query" aria-label="Search" placeholder="Search..."/>
                                 </span>
                                 <span class="input-group-btn">
                                     <button class="btn btn-dark btn-inactive" type="submit" id="search_button"><i class="fa fa-search"></i></button>
@@ -131,19 +131,19 @@ ${next.headerIncludes()}
 </script>
 <script>
     $('#search_form').submit(function (e) {
-        if ($('#search_query').hasClass('active') && $('#search_query').val().trim() != '') {
+        if ($('#query').hasClass('active') && $('#query').val().trim() != '') {
             $.ajax({
                 type: 'post',
                 url: 'search',
-                data: { 'query': $('#search_query').val() }
+                data: { 'query': $('#query').val() }
             })
         } else {
             e.preventDefault();
             $('#search_button').removeClass('btn-inactive');
-            $('#search_query').clearQueue().val('').animate({ right: '0', width: '250px' }).addClass('active').focus();
+            $('#query').clearQueue().val('').animate({ right: '0', width: '250px' }).addClass('active').focus();
         }
     })
-    $('#search_query').on('blur', function (e) {
+    $('#query').on('blur', function (e) {
         if ($(this).val().trim() == '') {
             $(this).delay(200).animate({ right: '-250px', width: '0' }, function () {
                 $('#search_button').addClass('btn-inactive');
diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index f5d89b6a..14cd9c60 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -2472,7 +2472,7 @@ table[id^='history_child'] thead th {
     display: inline-flex;
     float: right;
 }
-#search_form #search_query {
+#search_form #query {
     width: 0;
     height: 34px;
     margin-top: 0;
@@ -2481,7 +2481,7 @@ table[id^='history_child'] thead th {
     right: -250px;
     border-radius: 3px 0 0 3px;
 }
-#search_form #search_query.active {
+#search_form #query.active {
     width: 250px;
     right: 0px;
 }
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index f2f57753..5e35dfc0 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -636,7 +636,7 @@ DOCUMENTATION :: END
         url: 'get_search_results_children',
         type: 'GET',
         async: true,
-        data: {'query': "${query['query_string']}",
+        data: {'query': "${query['query_string'].replace('"','\\"')}",
                'media_type': "${query['media_type']}",
                'season_index': "${query['parent_media_index']}"
         },
diff --git a/data/interfaces/default/search.html b/data/interfaces/default/search.html
index d8e999ca..5588025b 100644
--- a/data/interfaces/default/search.html
+++ b/data/interfaces/default/search.html
@@ -26,13 +26,13 @@
 <%def name="javascriptIncludes()">
 <script>
     $('#search_button').removeClass('btn-inactive');
-    $('#search_query').val("${query}").css({ right: '0', width: '250px' }).addClass('active');
+    $('#query').val("${query.replace('"','\\"')}").css({ right: '0', width: '250px' }).addClass('active');
 
     $.ajax({
         url: 'get_search_results_children',
         type: "GET",
         async: true,
-        data: {'query': "${query}"},
+        data: {'query': "${query.replace('"','\\"')}"},
         complete: function (xhr, status) {
             $("#search-results-list").html(xhr.responseText);
         }
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 28ed51ef..b03d1c64 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -848,7 +848,7 @@ class DataFactory(object):
                     media_type = 'artist'
 
         if query_string and media_type:
-            query = {'query_string': query_string.replace('"', ''),
+            query = {'query_string': query_string,
                      'title': title,
                      'parent_title': parent_title,
                      'grandparent_title': grandparent_title,
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 267e9477..7c2a7986 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1366,8 +1366,7 @@ class WebInterface(object):
             return json.dumps({'message': 'no data received'})
 
     @cherrypy.expose
-    def search(self, search_query=''):
-        query = search_query.replace('"', '')
+    def search(self, query=''):
 
         return serve_template(templatename="search.html", title="Search", query=query)
 

From 054f1160173a7d1e42036f4145b9dfd06f1b9c2d Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 1 Nov 2015 20:38:22 -0800
Subject: [PATCH 2/2] Fix title encode for Pushover notifications

---
 plexpy/notifiers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 475ce2bc..84145c7d 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -900,7 +900,7 @@ class PUSHOVER(object):
 
         data = {'token': self.application_token,
                 'user': plexpy.CONFIG.PUSHOVER_KEYS,
-                'title': event,
+                'title': event.encode("utf-8"),
                 'message': message.encode("utf-8"),
                 'sound': plexpy.CONFIG.PUSHOVER_SOUND,
                 'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}