From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 20 Feb 2016 18:17:58 +0000 (+0200)
Subject: smtp passwords can now contain percent characters
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=8635a4f02c369fc7192fff07f0f952773696cdeb;p=motioneye-debian

smtp passwords can now contain percent characters
---

diff --git a/motioneye/config.py b/motioneye/config.py
index 9e4900e..7e718e0 100644
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -873,7 +873,7 @@ def motion_camera_ui_to_dict(ui, old_config=None):
                 'server': ui['email_notifications_smtp_server'],
                 'port': ui['email_notifications_smtp_port'],
                 'account': ui['email_notifications_smtp_account'],
-                'password': ui['email_notifications_smtp_password'].replace(';', '\\;'),
+                'password': ui['email_notifications_smtp_password'].replace(';', '\\;').replace('%', '%%'),
                 'tls': ui['email_notifications_smtp_tls'],
                 'to': emails,
                 'timespan': ui['email_notifications_picture_time_span']})
@@ -1242,7 +1242,7 @@ def motion_camera_dict_to_ui(data):
             ui['email_notifications_smtp_server'] = e[-10]
             ui['email_notifications_smtp_port'] = e[-9]
             ui['email_notifications_smtp_account'] = e[-8]
-            ui['email_notifications_smtp_password'] = e[-7].replace('\\;', ';')
+            ui['email_notifications_smtp_password'] = e[-7].replace('\\;', ';').replace('%%', '%')
             ui['email_notifications_smtp_tls'] = e[-6].lower() == 'true'
             ui['email_notifications_addresses'] = e[-5]
             try: