Add support for latin-1 in notify xbmc (I hope)

midgetspy · Jul 5, 2013 · ceaa993 · ceaa993
1 parent 0a14280
commit ceaa993
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/modules/xbmc_notify.py b/modules/xbmc_notify.py
@@ -1,5 +1,5 @@
 from flask import Flask, jsonify, render_template, request
-import os
+import os, urllib
 
 from maraschino import app, RUNDIR, logger
 from socket import *
@@ -27,10 +27,10 @@ def xhr_notify():
 
 @app.route('/xhr/xbmc_notify/send', methods=['post'])
 def xhr_notify_message():
-    label = str(request.form['label'])
-    hostname = str(request.form['hostname'])
-    message = str(request.form['message'])
-    title = str(request.form['title'])
+    label = urllib.unquote(request.form['label']).encode('utf-8')
+    hostname = urllib.unquote(request.form['hostname']).encode('utf-8')
+    message = urllib.unquote(request.form['message']).encode('utf-8')
+    title = urllib.unquote(request.form['title']).encode('utf-8')
     port = 9777
     icon = os.path.join(RUNDIR, 'static', 'images', 'notifications', request.form['image'])
 

diff --git a/static/js/index.js b/static/js/index.js
@@ -2766,10 +2766,10 @@ $(document).ready(function() {
 
   $(document).on('click', '#notify_dialog #sendmessage', function() {
     var image = $('#notify_dialog #image').val();
-    var label = $('#notify_dialog #sendmessage').data('label');
-    var hostname = $('#notify_dialog #sendmessage').data('hostname');
-    var title = $('#notify_dialog #title').val();
-    var message = $('#notify_dialog #message').val();
+    var label = escape($('#notify_dialog #sendmessage').data('label'));
+    var hostname = escape($('#notify_dialog #sendmessage').data('hostname'));
+    var title = escape($('#notify_dialog #title').val());
+    var message = escape($('#notify_dialog #message').val());
     var result = $('#notify_dialog .result');
 
     result.text('');