Adding validator for mac csv + user import in groups.

Author: ngodfraind

Controller/Administration/GroupsController.php

@@ -488,7 +488,10 @@ public function importMembersAction(Group $group)
 
         if ($form->isValid()) {
             $file = $form->get('file')->getData();
-            $lines = str_getcsv(file_get_contents($file), PHP_EOL);
+            
+            $data = file_get_contents($file);
+            $data = $this->container->get('claroline.utilities.misc')->formatCsvOutput($data);
+            $lines = str_getcsv($data, PHP_EOL);
 
             foreach ($lines as $line) {
                 $users[] = str_getcsv($line, ';');

Validator/Constraints/CsvWorkspaceUserImportValidator.php

@@ -66,7 +66,9 @@ public function validate($value, Constraint $constraint)
         foreach ($workspaceRoles as $workspaceRole) {
             $wsRoleNames[] = $workspaceRole->getTranslationKey();
         }
-        $lines = str_getcsv(file_get_contents($value), PHP_EOL);
+        
+        $data = $this->ut->formatCsvOutput(file_get_contents($value));
+        $lines = str_getcsv($data, PHP_EOL);
 
         foreach ($lines as $line) {
             $linesTab = explode(';', $line);

Validator/Constraints/CsvWorkspaceValidator.php

@@ -48,7 +48,8 @@ public function __construct(
 
     public function validate($value, Constraint $constraint)
     {
-        $lines = str_getcsv(file_get_contents($value), PHP_EOL);
+        $data = $this->ut->formatCsvOutput(file_get_contents($value));
+        $lines = str_getcsv($data, PHP_EOL);
         $codes = [];
 
         foreach ($lines as $line) {

Validator/Constraints/ImportUsersInGroupValidator.php

@@ -16,6 +16,7 @@
 use JMS\DiExtraBundle\Annotation as DI;
 use Claroline\CoreBundle\Manager\UserManager;
 use Symfony\Component\Translation\TranslatorInterface;
+use Claroline\CoreBundle\Library\Utilities\ClaroUtilities;
 
 /**
  * @DI\Validator("import_user_in_group_validator")
@@ -30,20 +31,24 @@ class ImportUsersInGroupValidator extends ConstraintValidator
      * @DI\InjectParams({
      *     "userManager" = @DI\Inject("claroline.manager.user_manager"),
      *     "translator"  = @DI\Inject("translator"),
+     *     "ut"          = @DI\Inject("claroline.utilities.misc")
      * })
      */
     public function __construct(
         UserManager $userManager,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        ClaroUtilities $ut
     )
     {
         $this->userManager = $userManager;
         $this->translator = $translator;
+        $this->ut = $ut;
     }
 
     public function validate($value, Constraint $constraint)
     {
-        $usernames = str_getcsv(file_get_contents($value), PHP_EOL);
+        $data = $this->ut->formatCsvOutput(file_get_contents($value));
+        $usernames = str_getcsv($data, PHP_EOL);
 
         foreach ($usernames as $username) {