hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix [PHRAS-75] csv user import is broken

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-04-15 17:59:41 +02:00
parent 721fd9e909
commit 0883c95fb4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -667,7 +667,7 @@ class Users implements ControllerProviderInterface
if ($loginToAdd === "") { if ($loginToAdd === "") {
$out['errors'][] = sprintf(_("Login line %d is empty"), $nbLine + 1); $out['errors'][] = sprintf(_("Login line %d is empty"), $nbLine + 1);
} elseif (in_array($loginToAdd, $loginNew)) { } elseif (in_array($loginToAdd, $loginNew)) {
$out['errors'][] = sprintf(_("Login %s is already defined in the file at line %d"), $loginToAdd, $i); $out['errors'][] = sprintf(_("Login %s is already defined in the file at line %d"), $loginToAdd, $nbLine + 1);
} else { } else {
if (\User_Adapter::get_usr_id_from_login($app, $loginToAdd)) { if (\User_Adapter::get_usr_id_from_login($app, $loginToAdd)) {
$out['errors'][] = sprintf(_("Login %s already exists in database"), $loginToAdd); $out['errors'][] = sprintf(_("Login %s already exists in database"), $loginToAdd);
@@ -693,7 +693,7 @@ class Users implements ControllerProviderInterface
$passwordToVerif = $value; $passwordToVerif = $value;
if ($passwordToVerif === "") { if ($passwordToVerif === "") {
$out['errors'][] = sprintf(_("Password is empty at line %d"), $i); $out['errors'][] = sprintf(_("Password is empty at line %d"), $nbLine + 1);
} else { } else {
$pwdValid = true; $pwdValid = true;
} }

11
lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php
View File

@@ -27,7 +27,7 @@ class CSVServiceProvider implements ServiceProviderInterface
$app['csv.exporter.config'] = $app->share(function () { $app['csv.exporter.config'] = $app->share(function () {
$config = new ExporterConfig(); $config = new ExporterConfig();
return $config return $config
->setDelimiter(",") ->setDelimiter(";")
->setEnclosure('"') ->setEnclosure('"')
->setEscape("\\") ->setEscape("\\")
->setToCharset('UTF-8') ->setToCharset('UTF-8')
@@ -40,7 +40,14 @@ class CSVServiceProvider implements ServiceProviderInterface
}); });
$app['csv.lexer.config'] = $app->share(function ($app) { $app['csv.lexer.config'] = $app->share(function ($app) {
return new LexerConfig(); $lexer = new LexerConfig();
$lexer->setDelimiter(';')
->setEnclosure('"')
->setEscape("\\")
->setToCharset('UTF-8')
->setFromCharset('UTF-8');
return $lexer;
}); });
$app['csv.lexer'] = $app->share(function ($app) { $app['csv.lexer'] = $app->share(function ($app) {