Encoding fix for Speech provider; branch-alias in composer [iet:949…

…9314]

* IET-OU/open-media-player#89
[ci skip]

composer.json

@@ -55,6 +55,9 @@
     "preferred-install": "dist"
   },
   "extra": {
+    "branch-alias": {
+      "dev-master": "2.0.x-dev"
+    },
     "//": [
       "https://gist.github.com/nfreear/57262e040d49b2f212ec"
     ]

lib/URN_Speech_Provider.php

@@ -50,10 +50,10 @@ public function call($url, $matches)
 
         // Generate the embed URL from the input URL.
         $embed_url = strtr(self::EMBED_URL, [
-            '{version}' => self::VERSION,
-            '{text}' => $text,
-            '{lang}' => $lang ? $lang : '',
-            '{mode}' => $mode ? $mode : 'speak',
+            '{version}' => self::getVersion(),
+            '{text}' => urlencode($text),
+            '{lang}' => urlencode($lang ? $lang : ''),
+            '{mode}' => urlencode($mode ? $mode : 'speak'),
         ]);
 
         $meta = $this->getIframeResponse($url);
@@ -64,4 +64,10 @@ public function call($url, $matches)
 
         return $meta;
     }
+
+    protected static function getVersion()
+    {
+        $version = config_item('speech_provider_version');
+        return $version ? $version : self::VERSION;
+    }
 }