Improved the CSR cleanup to accept Microsoft OWA CSRs

15 years ago · dda3cc92f7
parent 5f25174f52
commit dda3cc92f7
1 changed files with 3 additions and 1 deletions
--- a/includes/general.php
+++ b/includes/general.php
@ -816,7 +816,9 @@

 	function clean_csr($CSR)
 	{
-		return(preg_replace("/[^A-Za-z0-9\n\r\-\:\=\+\/ ]/","",$CSR));
+		$newcsr = str_replace("\r\n","\n",trim($CSR));
+		$newcsr = str_replace("\n\n","\n",$newcsr);
+		return(preg_replace("/[^A-Za-z0-9\n\r\-\:\=\+\/ ]/","",$newcsr));
 	}

 	function sanitizeFilename($text)