Merge branch 'develop' of https://labs.maarch.org/maarch/MaarchCourrier into develop

apps/maarch_entreprise/cas_connect.php

@@ -63,9 +63,13 @@ if($loginRequestArray['CAS_VERSION'] == 'CAS_VERSION_2_0'){
     $Id = phpCAS::getUser();
     echo 'Identifiant : ' . phpCAS::getUser();
     echo '<br/> phpCAS version : ' . phpCAS::getVersion();
-    $tmpId = explode($id_separator, $Id);
-    $userId = $tmpId[0];
-
+    if(!empty($id_separator)){
+        $tmpId = explode($id_separator, $Id);
+        $userId = $tmpId[0];
+    } else {
+        $userId = $Id;
+    }
+    
 } elseif($loginRequestArray['CAS_VERSION'] == 'SAML_VERSION_1_1'){
     // $attrSAML = phpCAS::getAttributes();
     // var_export($attrSAML);

apps/maarch_entreprise/xml/cas_config.xml

@@ -4,6 +4,6 @@
 	<WEB_CAS_URL>192.168.21.25</WEB_CAS_URL> <!-- ip -->
 	<WEB_CAS_PORT>443</WEB_CAS_PORT>
 	<WEB_CAS_CONTEXT>/cas-server-webapp-4.0.0</WEB_CAS_CONTEXT>
-	<ID_SEPARATOR>@</ID_SEPARATOR><!--return id without string after the separator include-->
+	<ID_SEPARATOR></ID_SEPARATOR><!--return id without string after the separator include-->
 	<PATH_CERTIFICATE></PATH_CERTIFICATE><!--path to the cas server certificate. absolute path. empty if no certificate-->
 </ROOT>
\ No newline at end of file