Merge remote-tracking branch 'origin/Leia' into Matrix

pvr.zattoo/addon.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="pvr.zattoo"
-       version="19.2.9"
+       version="19.2.10"
        name="Zattoo PVR Client"
        provider-name="trummerjo,rbuehlma">
   <requires>
@@ -26,6 +26,8 @@
     <disclaimer lang="en_US">The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
     <platform>@PLATFORM@</platform>
     <news>
+v19.2.10
+ - Fix login with credentials containing exclamation mark (!) in password
 v19.2.9
  - Add support for parental pin
  - Use selective recall flag by programme
@@ -63,6 +65,8 @@ v19.0.1
  - Load description from xmltv file
 v19.0.0
  - Update to PVR addon API v6.0.0
+v18.1.13
+ - Fix login with credentials containing exclamation mark (!) in password
 v18.1.12
  - Add support for parental pin
  - Use selective recall flag by programme

src/Utils.cpp

@@ -28,7 +28,7 @@ std::string Utils::UrlEncode(const std::string &value)
 
   for (char c : value) {
       // Keep alphanumeric and other accepted characters intact
-    if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
+    if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~' || c == '!') // Exclamation mark should not be here but Zattoo does not correctly encode it
     {
       escaped << c;
       continue;