IdnaConverter repository changed url

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

composer.json

@@ -43,10 +43,10 @@
 		"ext-curl": "*",
 		"ext-json": "*",
 		"ext-openssl": "*",
-		"mso/idna-convert": "1.*",
 		"phpmailer/phpmailer": "~6.0",
 		"monolog/monolog": "^1.24",
-		"robthree/twofactorauth": "^1.6"
+		"robthree/twofactorauth": "^1.6",
+		"algo26-matthias/idna-convert": "^2.1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "6.5.13",

lib/Froxlor/Idna/IdnaWrapper.php

@@ -40,7 +40,7 @@ class IdnaWrapper
 	public function __construct()
 	{
 		// Instantiate it
-		$this->idna_converter = new \Mso\IdnaConvert\IdnaConvert();
+		$this->idna_converter = new \Algo26\IdnaConvert\IdnaConvert();
 	}
 
 	/**
@@ -59,9 +59,7 @@ class IdnaWrapper
 		try {
 			return $this->idna_converter->encode($to_encode);
 		} catch (\InvalidArgumentException $iae) {
-			// dirty hack because Mso\IdnaConvert does not specify error-numbers
-			// see https://github.com/phlylabs/idna-convert/issues/11
-			if (strtolower($iae->getMessage()) == 'this is already a punycode string') {
+			if ($iae->getCode() == 100) {
 				return $to_encode;
 			}
 			throw $iae;