Some IdPs has newline in a name, so remove it.

tauceti2 · tauceti2 · commit 43b874af502b · 2017-08-10T09:25:08.000+02:00
diff --git a/www/protected/whitelistedIdps.php b/www/protected/whitelistedIdps.php
@@ -41,15 +41,15 @@ function getEntityName($metadata) {
 		$displayName = $metadata['UIInfo']['DisplayName'];
 		assert('is_array($displayName)'); // Should always be an array of language code -> translation
 		if (!empty($displayName)) {
-			return $displayName['en'];
+			return preg_replace( "/\r|\n/", "", $displayName['en']);
 		}
 	}
 	if (array_key_exists('name', $metadata)) {
 		if (is_array($metadata['name'])) {
-			return $metadata['name']['en'];
+			return preg_replace( "/\r|\n/", "", $metadata['name']['en']);
 		} else {
-			return $metadata['name'];
+			return preg_replace( "/\r|\n/", "", $metadata['name']);
 		}
 	}
 	return $metadata['entityid'];
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ function getEntityName($metadata) {`
`41`	`41`	`$displayName = $metadata['UIInfo']['DisplayName'];`
`42`	`42`	`assert('is_array($displayName)'); // Should always be an array of language code -> translation`
`43`	`43`	`if (!empty($displayName)) {`
`44`		`- return $displayName['en'];`
	`44`	`+ return preg_replace( "/\r\|\n/", "", $displayName['en']);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`if (array_key_exists('name', $metadata)) {`
`48`	`48`	`if (is_array($metadata['name'])) {`
`49`		`- return $metadata['name']['en'];`
	`49`	`+ return preg_replace( "/\r\|\n/", "", $metadata['name']['en']);`
`50`	`50`	`} else {`
`51`		`- return $metadata['name'];`
	`51`	`+ return preg_replace( "/\r\|\n/", "", $metadata['name']);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`return $metadata['entityid'];`
`55`		`-}`
	`55`	`+}`