diff --git a/src/includes/class/class.LSimport.php b/src/includes/class/class.LSimport.php index cf4a341d..5c28d450 100644 --- a/src/includes/class/class.LSimport.php +++ b/src/includes/class/class.LSimport.php @@ -20,6 +20,7 @@ ******************************************************************************/ +LSsession :: loadLSclass('LSlog_staticLoggerClass'); LSsession::loadLSclass('LSioFormat'); /** @@ -27,7 +28,7 @@ LSsession::loadLSclass('LSioFormat'); * * @author Benjamin Renard */ -class LSimport { +class LSimport extends LSlog_staticLoggerClass { /** * Check if the form was posted by check POST data @@ -142,152 +143,153 @@ class LSimport { */ public static function importFromPostData() { // Get data from $_POST - $data=self::getPostData(); - if (is_array($data)) { - LSdebug($data,1); - // Load LSobject - if (!isset($data['LSobject']) || LSsession::loadLSobject($data['LSobject'])) { - $LSobject=$data['LSobject']; - // Validate ioFormat - $object = new $LSobject(); - if($object -> isValidIOformat($data['ioFormat'])) { - // Create LSioFormat object - $ioFormat = new LSioFormat($LSobject,$data['ioFormat']); - if ($ioFormat -> ready()) { - // Load data in LSioFormat object - if ($ioFormat -> loadFile($data['importfile'])) { - LSdebug('file loaded'); - $return=array( - 'imported' => array(), - 'updated' => array(), - ); - // Retreive object from ioFormat - $objectsData=$ioFormat -> getAll(); - $objectsInError=array(); - LSdebug($objectsData); - // Browse inputed objects - foreach($objectsData as $objData) { - $globalErrors=array(); - // Instanciate an LSobject - $object = new $LSobject(); - // Instanciate a creation LSform (in API mode) - $form = $object -> getForm('create', null, true); - // Set form data from inputed data - if ($form -> setPostData($objData,true)) { - // Validate form - if ($form -> validate(true)) { - // Validate data (just validate) - if ($object -> updateData('create',True)) { - LSdebug('Data is correct, retreive object DN'); - $dn = $object -> getDn(); - if ($dn) { - // Check if object already exists - $entry=LSldap::getLdapEntry($dn); - if ($entry===False) { - LSdebug('New object, perform creation'); - if ($data['justTry'] || $object -> updateData('create')) { - LSdebug('Object '.$object -> getDn().' imported'); - $return['imported'][$object -> getDn()]=$object -> getDisplayName(); - continue; - } - else { - LSdebug('Failed to updateData on : '.print_r($objData,True)); - $globalErrors[]=_('Error creating object on LDAP server.'); - } - } - // This object already exist, check 'updateIfExists' mode - elseif ($data['updateIfExists']) { - LSdebug('Object exist, perform update'); + $data = self::getPostData(); + $return = array( + 'success' => false, + 'imported' => array(), + 'updated' => array(), + 'errors' => array(), + ); + if (!is_array($data)) { + LSerror :: addErrorCode('LSimport_01'); + return $return; + } + self :: log_trace("importFromPostData(): POST data=".varDump($data)); + $return = array_merge($return, $data); + // Load LSobject + if (!isset($data['LSobject']) || !LSsession::loadLSobject($data['LSobject'])) { + LSerror :: addErrorCode('LSimport_02'); + return $return; + } - // Restart import in update mode + $LSobject = $data['LSobject']; - // Instanciate a new LSobject and load data from it's DN - $object = new $LSobject(); - if ($object -> loadData($dn)) { - // Instanciate a modify form (in API mode) - $form = $object -> getForm('modify', null, true); - // Set form data from inputed data - if ($form -> setPostData($objData,true)) { - // Validate form - if ($form -> validate(true)) { - // Update data on LDAP server - if ($data['justTry'] || $object -> updateData('modify')) { - LSdebug('Object '.$object -> getDn().' updated'); - $return['updated'][$object -> getDn()]=$object -> getDisplayName(); - continue; - } - else { - LSdebug('Failed to updateData (modify) on : '.print_r($objData,True)); - $globalErrors[]=_('Error updating object on LDAP server.'); - } - } - else { - LSdebug('Failed to validate update form on : '.print_r($objData,True)); - LSdebug('Form errors : '.print_r($form->getErrors(),True)); - $globalErrors[]=_('Error validating update form.'); - } - } - else { - LSdebug('Failed to setPostData on update form : '.print_r($objData,True)); - $globalErrors[]=_('Failed to set post data on update form.'); - } - } - else { - LSdebug('Failed to load data of '.$dn); - $globalErrors[]=getFData(_("Failed to load existing object %{dn} from LDAP server. Can't update object.")); - } - } - else { - LSdebug('Object '.$dn.' already exist'); - $globalErrors[]=getFData(_('An object already exist on LDAP server with DN %{dn}.'),$dn); - } - } - else { - $globalErrors[]=_('Failed to generate DN for this object.'); - } - } - else { - $globalErrors[]=_('Failed to validate object data.'); - } - } - else { - LSdebug('Failed to validate form on : '.print_r($objData,True)); - LSdebug('Form errors : '.print_r($form->getErrors(),True)); - $globalErrors[]=_('Error validating creation form.'); - } - } - else { - LSdebug('Failed to setPostData on : '.print_r($objData,True)); - $globalErrors[]=_('Failed to set post data on creation form.'); - } - $objectsInError[]=array( - 'data' => $objData, - 'errors' => array ( - 'globals' => $globalErrors, - 'attrs' => $form->getErrors() - ) - ); - } - $return['errors']=$objectsInError; - return $return; - } - } - else { - LSerror :: addErrorCode('LSimport_04'); - } - } - else { - LSerror :: addErrorCode('LSimport_03',$data['ioFormat']); - } + // Validate ioFormat + $object = new $LSobject(); + if(!$object -> isValidIOformat($data['ioFormat'])) { + LSerror :: addErrorCode('LSimport_03',$data['ioFormat']); + return $return; + } + + // Create LSioFormat object + $ioFormat = new LSioFormat($LSobject,$data['ioFormat']); + if (!$ioFormat -> ready()) { + LSerror :: addErrorCode('LSimport_04'); + return $return; + } + + // Load data in LSioFormat object + if (!$ioFormat -> loadFile($data['importfile'])) { + LSerror :: addErrorCode('LSimport_05'); + return $return; + } + self :: log_debug("importFromPostData(): file loaded"); + + // Retreive object from ioFormat + $objectsData = $ioFormat -> getAll(); + $objectsInError = array(); + self :: log_trace("importFromPostData(): objects data=".varDump($objectsData)); + + // Browse inputed objects + foreach($objectsData as $objData) { + $globalErrors = array(); + // Instanciate an LSobject + $object = new $LSobject(); + // Instanciate a creation LSform (in API mode) + $form = $object -> getForm('create', null, true); + // Set form data from inputed data + if (!$form -> setPostData($objData, true)) { + self :: log_debug('importFromPostData(): Failed to setPostData on: '.print_r($objData,True)); + $globalErrors[] = _('Failed to set post data on creation form.'); + } + // Validate form + else if (!$form -> validate(true)) { + self :: log_debug('importFromPostData(): Failed to validate form on: '.print_r($objData,True)); + self :: log_debug('importFromPostData(): Form errors: '.print_r($form->getErrors(),True)); + $globalErrors[] = _('Error validating creation form.'); + } + // Validate data (just check mode) + else if (!$object -> updateData('create', True)) { + self :: log_debug('importFromPostData(): fail to validate object data: '.varDump($objData)); + $globalErrors[] = _('Failed to validate object data.'); } else { - LSerror :: addErrorCode('LSimport_02'); + self :: log_debug('importFromPostData(): Data is correct, retreive object DN'); + $dn = $object -> getDn(); + if (!$dn) { + self :: log_debug('importFromPostData(): fail to generate for this object: '.varDump($objData)); + $globalErrors[] = _('Failed to generate DN for this object.'); + } + else { + // Check if object already exists + if (!LSldap :: exists($dn)) { + // Creation mode + self :: log_debug('importFromPostData(): New object, perform creation'); + if ($data['justTry'] || $object -> updateData('create')) { + self :: log_info('Object '.$object -> getDn().' imported'); + $return['imported'][$object -> getDn()] = $object -> getDisplayName(); + continue; + } + else { + self :: log_error('Failed to updateData on : '.print_r($objData,True)); + $globalErrors[]=_('Error creating object on LDAP server.'); + } + } + // This object already exist, check 'updateIfExists' mode + elseif (!$data['updateIfExists']) { + self :: log_debug('importFromPostData(): Object '.$dn.' already exist'); + $globalErrors[] = getFData(_('An object already exist on LDAP server with DN %{dn}.'),$dn); + } + else { + self :: log_info('Object '.$object -> getDn().' exist, perform update'); + + // Restart import in update mode + + // Instanciate a new LSobject and load data from it's DN + $object = new $LSobject(); + if (!$object -> loadData($dn)) { + self :: log_debug('importFromPostData(): Failed to load data of '.$dn); + $globalErrors[] = getFData(_("Failed to load existing object %{dn} from LDAP server. Can't update object.")); + } + else { + // Instanciate a modify form (in API mode) + $form = $object -> getForm('modify', null, true); + // Set form data from inputed data + if (!$form -> setPostData($objData,true)) { + self :: log_debug('importFromPostData(): Failed to setPostData on update form : '.print_r($objData,True)); + $globalErrors[] = _('Failed to set post data on update form.'); + } + // Validate form + else if (!$form -> validate(true)) { + self :: log_debug('importFromPostData(): Failed to validate update form on : '.print_r($objData,True)); + self :: log_debug('importFromPostData(): Form errors : '.print_r($form->getErrors(),True)); + $globalErrors[] = _('Error validating update form.'); + } + // Update data on LDAP server + else if ($data['justTry'] || $object -> updateData('modify')) { + self :: log_info('Object '.$object -> getDn().' updated'); + $return['updated'][$object -> getDn()] = $object -> getDisplayName(); + continue; + } + else { + self :: log_error('Object '.$object -> getDn().': Failed to updateData (modify) on : '.print_r($objData,True)); + $globalErrors[] = _('Error updating object on LDAP server.'); + } + } + } + } } + $objectsInError[] = array( + 'data' => $objData, + 'errors' => array ( + 'globals' => $globalErrors, + 'attrs' => $form->getErrors() + ) + ); } - else { - LSerror :: addErrorCode('LSimport_01'); - } - return False; + $return['errors'] = $objectsInError; + $return['success'] = empty($objectsInError); + return $return; } } @@ -328,3 +330,6 @@ ___("LSimport : input/output format %{format} invalid.") LSerror :: defineError('LSimport_04', ___("LSimport : Fail to initialize input/output driver") ); +LSerror :: defineError('LSimport_05', +___("LSimport : Fail to load objects's data from input file") +); diff --git a/src/includes/class/class.LSioFormat.php b/src/includes/class/class.LSioFormat.php index 56f33e93..1215b1b1 100644 --- a/src/includes/class/class.LSioFormat.php +++ b/src/includes/class/class.LSioFormat.php @@ -44,7 +44,7 @@ class LSioFormat { $this -> config=$conf; if (isset($this -> config['driver']) && LSsession :: loadLSclass('LSioFormat'.$this -> config['driver'])) { $driverClass='LSioFormat'.$this -> config['driver']; - $driverOptions=array(); + $driverOptions=array(); if (isset($this -> config['driver_options'])) $driverOptions = $this -> config['driver_options']; $this -> driver = new $driverClass($driverOptions); } diff --git a/src/includes/class/class.LSldap.php b/src/includes/class/class.LSldap.php index fd28b024..f23bd06d 100644 --- a/src/includes/class/class.LSldap.php +++ b/src/includes/class/class.LSldap.php @@ -498,7 +498,7 @@ class LSldap extends LSlog_staticLoggerClass { * @retval boolean True si l'objet a �t� d�plac�, false sinon */ public static function move($old,$new) { - $ret = self :: $cnx -> move($old,$new); + $ret = self :: $cnx -> move($old, $new); if (Net_LDAP2::isError($ret)) { LSerror :: addErrorCode('LSldap_07'); LSerror :: addErrorCode(0,'NetLdap-Error : '.$ret->getMessage()); diff --git a/src/includes/routes.php b/src/includes/routes.php index 605a5a94..33816e46 100644 --- a/src/includes/routes.php +++ b/src/includes/routes.php @@ -787,7 +787,7 @@ function handle_LSobject_import($request) { if (is_array($ioFormats) && !empty($ioFormats)) { if (LSimport::isSubmit()) { $result = LSimport::importFromPostData(); - LSdebug($result, 1); + LSlog :: debug("LSimport::importFromPostData(): result = ".varDump($result)); } } else { diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index e5523434..9e0c8937 100644 Binary files a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo and b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo differ diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index 1a02949f..1d7fb580 100644 --- a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-02-03 14:37+0100\n" +"PO-Revision-Date: 2021-02-04 11:51+0100\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -437,66 +437,72 @@ msgstr "LSformRule_%{type} : Le paramètre %{param} n'est pas défini." msgid "LSformRule: Unknown rule type %{type}." msgstr "LSformRule : Type de règle %{type} inconnu." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:196 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:203 +msgid "Failed to set post data on creation form." +msgstr "Impossible de définir les données dans le formulaire de création." + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:209 +msgid "Error validating creation form." +msgstr "Une erreur est survenue en validant le formulaire de création." + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:214 +msgid "Failed to validate object data." +msgstr "Impossible de valider les données de l'objet." + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:221 +msgid "Failed to generate DN for this object." +msgstr "Impossible de générer le DN de cet objet." + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:235 msgid "Error creating object on LDAP server." msgstr "Une erreur est survenue en création cet objet dans l'annuaire LDAP." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:222 -msgid "Error updating object on LDAP server." -msgstr "" -"Une erreur est survenue en mettant à jour cet objet dans l'annuaire LDAP." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:241 +msgid "An object already exist on LDAP server with DN %{dn}." +msgstr "Un objet existe déjà dans l'annuaire LDAP avec le DN %{dn}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:228 -msgid "Error validating update form." -msgstr "Une erreur est survenue en validant le formulaire de mise à jour." - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:233 -msgid "Failed to set post data on update form." -msgstr "Impossible de définir les données dans le formulaire de mise à jours." - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:238 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:252 msgid "" "Failed to load existing object %{dn} from LDAP server. Can't update object." msgstr "" "Impossible de charger l'objet existant %{dn} depuis l'annuaire LDAP. " "Impossible de mettre à jour cet objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:243 -msgid "An object already exist on LDAP server with DN %{dn}." -msgstr "Un objet existe déjà dans l'annuaire LDAP avec le DN %{dn}." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:260 +msgid "Failed to set post data on update form." +msgstr "Impossible de définir les données dans le formulaire de mise à jours." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:247 -msgid "Failed to generate DN for this object." -msgstr "Impossible de générer le DN de cet objet." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:266 +msgid "Error validating update form." +msgstr "Une erreur est survenue en validant le formulaire de mise à jour." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:251 -msgid "Failed to validate object data." -msgstr "Impossible de valider les données de l'objet." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:276 +msgid "Error updating object on LDAP server." +msgstr "" +"Une erreur est survenue en mettant à jour cet objet dans l'annuaire LDAP." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:257 -msgid "Error validating creation form." -msgstr "Une erreur est survenue en validant le formulaire de création." - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:262 -msgid "Failed to set post data on creation form." -msgstr "Impossible de définir les données dans le formulaire de création." - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:321 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:322 msgid "LSimport : Post data not found or not completed." msgstr "LSimport : les données transmises sont introuvables ou incomplètes." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:324 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:325 msgid "LSimport : object type invalid." msgstr "LSimport : type d'objet invalide." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:327 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:328 msgid "LSimport : input/output format %{format} invalid." msgstr "LSimport : Le format d'entrée/sortie %{format} est invalide." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:330 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:331 msgid "LSimport : Fail to initialize input/output driver" msgstr "LSimport : Impossible d'initialiser le pilote d'entrée/sortie" +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:334 +msgid "LSimport : Fail to load objects's data from input file" +msgstr "" +"LSimport: Impossible de charger les données des objets depuis le fichier " +"d'import." + #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_ldap_pwdHistory.php:76 msgid "Unknown (%{raw_value})" msgstr "Inconnue (%{raw_value})" @@ -759,22 +765,22 @@ msgstr "" msgid "Smarty - An exception occured fetching template '%{template}'" msgstr "Smarty - Un erreur est survenue en générant le modèle '%{template}'." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:460 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:470 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:461 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:471 msgid "A fatal error occured. If problem persist, please contact support." msgstr "" "Une erreur irrécupérable est survenue. Si le problème persiste, merci de " "contacter le support." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:469 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:470 msgid "A fatal error occured." msgstr "Une erreur fatale est survenue." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:669 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:670 msgid "LStemplate : Template %{file} not found." msgstr "LStemplate : le template %{file} est introuvable." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:672 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:673 msgid "" "LStemplate : Fail to execute trigger %{callable} on event %{event} : is not " "callable." @@ -782,7 +788,7 @@ msgstr "" "LStemplate : Échec d'exécution du déclencheur %{callable} lors de événement " "%{event} : il n'est pas un callable." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:675 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:676 msgid "" "LStemplate : Error during the execution of the trigger %{callable} on event " "%{event}." @@ -1004,17 +1010,17 @@ msgstr "Votre nouveau mot de passe vous a été envoyé à l'adresse %{mail}." msgid "Refresh" msgstr "Rafraîchir" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2713 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2718 #: templates/default/select.tpl:20 templates/default/recoverpassword.tpl:17 #: templates/default/login.tpl:16 msgid "Level" msgstr "Niveau" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2871 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2876 msgid "LSsession : The constant '%{const}' is not defined." msgstr "LSsession : La constante '%{const}' n'est pas définie." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2874 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2879 msgid "" "LSsession : The addon '%{addon}' support is uncertain. Verify system " "compatibility and the add-on configuration." @@ -1022,53 +1028,53 @@ msgstr "" "LSsession : Le support de l'addon '%{addon}' est incertain. Vérifiez la " "compatibilité du système et la configuration de l'add-on." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2877 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2882 msgid "" "LSsession : LDAP server's configuration data are invalid. Can't connect." msgstr "" "LSsession : Les données de configuration du serveur LDAP sont invalide. " "Impossible de s'y connecter." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2880 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2885 msgid "LSsession : Failed to load LSobject type '%{type}' : unknon type." msgstr "" "LSsession : Impossible de charger le type d'LSobject '%{type}' : type " "inconnu." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2883 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2888 msgid "LSsession : Failed to load LSclass '%{class}'." msgstr "LSsession : Impossible de charger la LSclass '%{class}'." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2886 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2891 msgid "LSsession : Login or password incorrect." msgstr "LSsession : Identifiant ou mot de passe incorrects." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2889 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2894 msgid "LSsession : Impossible to identify you : Duplication of identities." msgstr "LSsession : Impossible de vous identifier : Duplication d'identité." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2892 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2897 msgid "LSsession : Can't load class of authentification (%{class})." msgstr "" "LSsession : Impossible de charger la classe d'authentification (%{class})." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2895 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2900 msgid "LSsession : Can't connect to LDAP server." msgstr "LSsession : Impossible de se connecter au serveur LDAP." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2898 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2903 msgid "LSsession : Impossible to authenticate you." msgstr "LSsession : Impossible de vous identifier." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2901 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2906 msgid "LSsession : Your are not authorized to do this action." msgstr "LSsession : Vous n'êtes pas autorisé à faire cette action." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2904 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2909 msgid "LSsession : Some informations are missing to display this page." msgstr "LSsession : Des informations sont manquant pour afficher cette page." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2907 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2912 msgid "" "LSsession : The function '%{function}' of the custom action " "'%{customAction}' does not exists or is not configured." @@ -1076,24 +1082,24 @@ msgstr "" "LSsession : La fonction '%{function}' de l'action personnalisée " "'%{customAction}' n'existe pas ou n'est pas configurée." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2910 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2915 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth." msgstr "" "LSsession : Erreur en récupérant les identifiants LDAP de l'utilisateur " "depuis LSauth." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2913 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2918 msgid "" "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials." msgstr "" "LSsession : Impossible de se reconnecter au serveur LDAP avec les " "identifiants de l'utilisateur." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2916 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2921 msgid "LSsession : No import/export format define for this object type." msgstr "LSsession : Aucun format d'entrée/sortie définie pour ce type d'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2919 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2924 msgid "" "LSsession : Error during creation of list of levels. Contact administrators. " "(Code : %{code})" @@ -1101,13 +1107,13 @@ msgstr "" "LSsession : Erreur durant la création de la liste des niveaux. Contacter les " "administrateurs. (Code : %{type})" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2922 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2927 msgid "LSsession : The password recovery is disabled for this LDAP server." msgstr "" "LSsession : La récupération de mot de passe est désactivée pour ce serveur " "LDAP." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2925 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2930 msgid "" "LSsession : Some informations are missing to recover your password. Contact " "administrators." @@ -1115,7 +1121,7 @@ msgstr "" "LSsession : Des informations sont manques pour pouvoir récupérer votre mot " "de passe. Contacter les administrateurs." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2928 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2933 msgid "" "LSsession : Error during password recovery. Contact administrators.(Step : " "%{step})" @@ -1123,7 +1129,7 @@ msgstr "" "LSsession : Erreur durant la récupération de votre mot de passe. Contacter " "les administrateurs. (Etape : %{step})" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2931 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2936 msgid "" "LSsession : The function '%{func}' configured for the view '%{view}' of the " "LSaddon '%{addon}' is not declared in the LSaddon file." @@ -1131,7 +1137,7 @@ msgstr "" "LSsession : la fonction '%{func}' configurée pour la vue '%{view}' du " "LSaddon '%{addon}' n'est pas déclaré dans le fichier du LSaddon." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2935 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2940 msgid "" "LSsession : The function '%{func}' configured for the view '%{view}' of the " "LSaddon '%{addon}' doesn't exist." @@ -1139,11 +1145,11 @@ msgstr "" "LSsession : la fonction '%{func}' configurée pour la vue '%{view}' du " "LSaddon '%{addon}' n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2938 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2943 msgid "LSsession : invalid related object's DN pass in parameter." msgstr "LSsession : DN d'objet en relation incorrect dans les paramètres." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2941 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2946 msgid "" "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please " "upgrade it." @@ -1151,7 +1157,7 @@ msgstr "" "LSsession : le LSaddon %{addon} utilise toujours l'ancien type d'URL de " "vues. Merci de le mettre à jour." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2944 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2949 msgid "" "LSsession : You have been redirect from an old-style URL %{url}. Please " "upgrade this link." @@ -1159,7 +1165,7 @@ msgstr "" "LSsession : Vous avez été redirigé depuis une ancienne URL %{url}. Merci de " "le mettre à jour ce lien." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2947 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2952 msgid "" "LSsession : You always seem to use %{old} in your custom code: Please " "upgrade it and use %{new}.
\n"
@@ -1171,25 +1177,25 @@ msgstr ""
 "Context:\n"
 "%{context}
" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:477 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:489 msgid "The attribute %{attr} is not valid." msgstr "L'attribut %{attr} n'est pas valide." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3035 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3058 msgid "LSldapObject : Object type unknown." msgstr "LSldapObject : Type d'objet inconnu." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3038 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3061 msgid "LSldapObject : Update form is not defined for the object %{obj}." msgstr "" "LSldapObject : Le formulaire de mise à jour n'est pas défini pour l'objet " "%{obj}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3041 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3064 msgid "LSldapObject : No form exists for the object %{obj}." msgstr "LSldapObject : Aucun formulaire n'existe pour l'objet %{obj}" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3044 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3067 msgid "" "LSldapObject : The function %{func} to validate the attribute %{attr} the " "object %{obj} is unknow." @@ -1197,7 +1203,7 @@ msgstr "" "LSldapObject : La fonction %{func} pour valider l'attribut %{attr} de " "l'objet %{obj} est inconnu." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3047 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3070 msgid "" "LSldapObject : Configuration data are missing to validate the attribute " "%{attr} of the object %{obj}." @@ -1205,7 +1211,7 @@ msgstr "" "LSldapObject : Des données de configurations sont manquant pour pouvoir " "valider l'attribut %{attr} de l'objet %{obj}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3051 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3074 msgid "" "LSldapObject : The function %{func} to be executed on the object event " "%{event} doesn't exist." @@ -1213,14 +1219,14 @@ msgstr "" "LSldapObject : La fonction %{func} devant être exécutée lors de l'évènement " "%{event} de l'objet n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3054 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3077 msgid "" "LSldapObject : The %{func} execution on the object event %{event} failed." msgstr "" "LSldapObject : L'exécution de la fonction %{func} lors de l'évènement " "%{event} de l'objet a échouée." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3058 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3081 msgid "" "LSldapObject : Class %{class}, which method %{meth} to be executed on the " "object event %{event}, doesn't exist." @@ -1228,7 +1234,7 @@ msgstr "" "La classe %{class}, contenant la méthode %{meth} devant être exécutée lors " "de l'évènement %{event} de l'objet, n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3061 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3084 msgid "" "LSldapObject : Method %{meth} within %{class} class to be executed on object " "event %{event}, doesn't exist." @@ -1236,7 +1242,7 @@ msgstr "" "LSldapObject : La méthode %{meth} de la classe %{class} devant être exécutée " "lors de l'évènement %{event} de l'objet n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3064 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3087 msgid "" "LSldapObject : Error during execute %{meth} method within %{class} class, to " "be executed on object event %{event}." @@ -1244,7 +1250,7 @@ msgstr "" "LSldapObject : Erreur durant l'exécution de la méthode %{meth} de la classe " "%{class} devant être exécutée lors de l'évènement %{event} de l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3068 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3091 msgid "" "LSldapObject : Some configuration data of the object type %{obj} are missing " "to generate the DN of the new object." @@ -1252,7 +1258,7 @@ msgstr "" "LSldapObject : Des informations de configuration du type d'objet %{obj} sont " "manquantes pour la génération du DN du nouvel objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3071 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3094 msgid "" "LSldapObject : The attibute %{attr} of the object is not yet defined. Can't " "generate DN." @@ -1260,11 +1266,11 @@ msgstr "" "LSldapObjet : L'attribut %{attr} de l'objet n'est pas encore défini. " "Impossible de générer le DN." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3074 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3097 msgid "LSldapObject : Without DN, the object could not be changed." msgstr "LSldapObject : Sans DN, l'objet ne peut pas être modifié." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3077 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3100 msgid "" "LSldapObject : The attribute %{attr_depend} depending on the attribute " "%{attr} doesn't exist." @@ -1272,39 +1278,39 @@ msgstr "" "LSldapObject : L'attritbut %{attr_depend} dépendant de l'attribut %{attr} " "n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3080 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3103 msgid "LSldapObject : Error during deleting the object %{objectname}." msgstr "LSldapObject : Erreur durant la suppression de l'objet %{objectname}" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3084 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3107 msgid "" "LSldapObject : Error during actions to be executed before renaming the objet." msgstr "" "LSldapObject : Erreur durant les actions devant être exécutée avant de " "renommer l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3087 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3110 msgid "" "LSldapObject : Error during actions to be executed after renaming the objet." msgstr "" "LSldapObject : Erreur durant les actions devant être exécutée après avoir " "renommé l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3091 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3114 msgid "" "LSldapObject : Error during actions to be executed before deleting the objet." msgstr "" "LSldapObject : Erreur durant les actions devant être exécutée avant de " "supprimer l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3094 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3117 msgid "" "LSldapObject : Error during actions to be executed after deleting the objet." msgstr "" "LSldapObject : Erreur durant les actions devant être exécutée après avoir " "supprimé l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3098 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3121 msgid "" "LSldapObject : Error during the actions to be executed before creating the " "object." @@ -1312,7 +1318,7 @@ msgstr "" "LSldapObject : Erreur durant les actions devant être exécutée avant de créer " "l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3101 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3124 msgid "" "LSldapObject : Error during the actions to be executed after creating the " "object. It was created anyway." @@ -1320,7 +1326,7 @@ msgstr "" "LSldapObject : Erreur durant les actions devant être exécutées après la " "création de l'objet. Il a tout de même été créé." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3105 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3128 msgid "" "LSldapObject : The function %{func} to be executed before creating the " "object doesn't exist." @@ -1328,7 +1334,7 @@ msgstr "" "LSldapObject : La fonction %{func} devant être exécutée avant la création de " "l'objet n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3108 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3131 msgid "" "LSldapObject : Error executing the function %{func} to be execute after " "deleting the object." @@ -1336,7 +1342,7 @@ msgstr "" "LSldapObject : Erreur durant l'exécution de la fonction %{func} devant être " "exécutée après la suppression de l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3111 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3134 msgid "" "LSldapObject : The function %{func} to be executed after deleting the object " "doesn't exist." @@ -1344,7 +1350,7 @@ msgstr "" "LSldapObject : La fonction %{func} devant être exécutée après la suppression " "de l'objet n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3114 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3137 msgid "" "LSldapObject : Error executing the function %{func} to be execute after " "creating the object." @@ -1352,7 +1358,7 @@ msgstr "" "LSldapObject : Erreur durant l'exécution de la fonction %{func} devant être " "exécutée après la création de l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3118 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3141 msgid "" "LSldapObject : %{func} function, to be executed on object event %{event}, " "doesn't exist." @@ -1360,7 +1366,7 @@ msgstr "" "LSldapObject : La fonction %{func}, devant être exécutée lors de l'évènement " "%{event} de l'objet, n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3121 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3144 msgid "" "LSldapObject : Error during the execution of %{func} function on object " "event %{event}." @@ -1368,7 +1374,7 @@ msgstr "" "LSldapObject : Erreur durant l'exécution de la fonction %{func} lors de " "l'évènement %{event} de l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3125 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3148 msgid "" "LSldapObject : %{meth} method, to be executed on object event %{event}, " "doesn't exist." @@ -1376,7 +1382,7 @@ msgstr "" "LSldapObject : La méthode %{meth}, devant être exécutée lors de l'évènement " "%{event} de l'objet, n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3128 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3151 msgid "" "LSldapObject : Error during execution of %{meth} method on object event " "%{event}." @@ -1384,13 +1390,13 @@ msgstr "" "LSldapObject : Erreur durant l'exécution de la méthode %{meth} lors de " "l'évènement %{event} de l'objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3131 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3154 msgid "LSldapObject : Error during generate LDAP filter for %{LSobject}." msgstr "" "LSldapObject : Erreur durant la génération du filtre LDAP de l'objet " "%{LSobject}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3135 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3158 msgid "" "LSldapObject : Error during execution of the custom action %{customAction} " "on %{objectname}." @@ -1398,22 +1404,22 @@ msgstr "" "LSldapObject : Erreur durant l'exécution de l'action personnalisée " "%{customAction} sur l'objet %{objectname}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3139 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3162 msgid "LSldapObject : Fail to retrieve container DN." msgstr "LSldapObject : Impossible de récupérer le DN parent." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3142 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3165 msgid "" "LSldapObject : The function %{func} to generate container DN is not callable." msgstr "" "LSldapObject : La fonction %{func} pour générer le DN parent n'est pas " "exécutable." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3145 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3168 msgid "LSldapObject : Error during generating container DN : %{error}" msgstr "LSldapObject : Erreur durant la génération du DN parent : %{error}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3148 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3171 msgid "" "LSldapObject : An LDAP object with the same DN as generated for this new one " "already exists. Please verify your configuration." @@ -1421,7 +1427,7 @@ msgstr "" "LSldapObject : Un objet LDAP avec le même DN que celui généré pour ce nouvel " "objet existe déjà. Merci de vérifier votre configuration." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3153 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3176 msgid "" "LSrelation : Some parameters are missing in the call of methods to handle " "standard relations (Method : %{meth})." @@ -2248,7 +2254,7 @@ msgid "LSlog : Fail to load logging handler %{handler}." msgstr "LSlog : Impossible de charger l'handler %{handler}." #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSerror.php:112 -#: templates/default/import.tpl:29 +#: templates/default/import.tpl:43 msgid "Errors" msgstr "Erreurs" @@ -2514,7 +2520,7 @@ msgstr "Recherche globale" msgid "Identifier" msgstr "Identifiant" -#: templates/default/import.tpl:71 +#: templates/default/import.tpl:85 msgid "Imported objects" msgstr "Objets importés" @@ -2550,11 +2556,11 @@ msgstr "Nb / page :" msgid "No field." msgstr "Aucun champ." -#: templates/default/import.tpl:76 +#: templates/default/import.tpl:90 msgid "No imported object" msgstr "Aucun objet importé" -#: templates/default/import.tpl:44 +#: templates/default/import.tpl:58 msgid "No value" msgstr "Aucune valeur" @@ -2562,7 +2568,7 @@ msgstr "Aucune valeur" msgid "Object classes" msgstr "Classes d'objet" -#: templates/default/import.tpl:19 +#: templates/default/import.tpl:30 msgid "Only validate data" msgstr "Validation des données uniquement" @@ -2610,7 +2616,7 @@ msgstr "Rafraîchir mes droits d'accès" msgid "Relations / Profiles" msgstr "Relations / Profils" -#: templates/default/import.tpl:27 +#: templates/default/import.tpl:41 msgid "Result" msgstr "Résultat" @@ -2640,23 +2646,23 @@ msgstr "" msgid "This object type has no configured relation." msgstr "Ce type d'objet n'a aucune relation de configurée." -#: templates/default/import.tpl:16 +#: templates/default/import.tpl:24 msgid "Update objects if exists" msgstr "Mise à jour des objets existants" -#: templates/default/import.tpl:81 +#: templates/default/import.tpl:95 msgid "Updated objects" msgstr "Objets mis à jour" -#: templates/default/import.tpl:22 +#: templates/default/import.tpl:36 msgid "Valid" msgstr "Valider" -#: templates/default/import.tpl:17 templates/default/import.tpl:20 +#: templates/default/import.tpl:27 templates/default/import.tpl:33 msgid "no" msgstr "non" -#: templates/default/import.tpl:17 templates/default/import.tpl:20 +#: templates/default/import.tpl:26 templates/default/import.tpl:32 msgid "yes" msgstr "oui" diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot index d6abf8c5..96fb281d 100644 --- a/src/lang/ldapsaisie.pot +++ b/src/lang/ldapsaisie.pot @@ -360,63 +360,67 @@ msgstr "" msgid "LSformRule: Unknown rule type %{type}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:196 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:203 +msgid "Failed to set post data on creation form." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:209 +msgid "Error validating creation form." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:214 +msgid "Failed to validate object data." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:221 +msgid "Failed to generate DN for this object." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:235 msgid "Error creating object on LDAP server." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:222 -msgid "Error updating object on LDAP server." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:241 +msgid "An object already exist on LDAP server with DN %{dn}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:228 -msgid "Error validating update form." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:233 -msgid "Failed to set post data on update form." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:238 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:252 msgid "" "Failed to load existing object %{dn} from LDAP server. Can't update object." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:243 -msgid "An object already exist on LDAP server with DN %{dn}." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:260 +msgid "Failed to set post data on update form." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:247 -msgid "Failed to generate DN for this object." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:266 +msgid "Error validating update form." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:251 -msgid "Failed to validate object data." +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:276 +msgid "Error updating object on LDAP server." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:257 -msgid "Error validating creation form." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:262 -msgid "Failed to set post data on creation form." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:321 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:322 msgid "LSimport : Post data not found or not completed." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:324 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:325 msgid "LSimport : object type invalid." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:327 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:328 msgid "LSimport : input/output format %{format} invalid." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:330 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:331 msgid "LSimport : Fail to initialize input/output driver" msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSimport.php:334 +msgid "LSimport : Fail to load objects's data from input file" +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSattr_ldap_pwdHistory.php:76 msgid "Unknown (%{raw_value})" msgstr "" @@ -659,26 +663,26 @@ msgstr "" msgid "Smarty - An exception occured fetching template '%{template}'" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:460 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:470 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:461 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:471 msgid "A fatal error occured. If problem persist, please contact support." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:469 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:470 msgid "A fatal error occured." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:669 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:670 msgid "LStemplate : Template %{file} not found." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:672 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:673 msgid "" "LStemplate : Fail to execute trigger %{callable} on event %{event} : is not " "callable." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:675 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LStemplate.php:676 msgid "" "LStemplate : Error during the execution of the trigger %{callable} on event " "%{event}." @@ -854,133 +858,133 @@ msgstr "" msgid "Refresh" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2713 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2718 #: templates/default/select.tpl:20 templates/default/recoverpassword.tpl:17 #: templates/default/login.tpl:16 msgid "Level" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2871 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2876 msgid "LSsession : The constant '%{const}' is not defined." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2874 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2879 msgid "" "LSsession : The addon '%{addon}' support is uncertain. Verify system " "compatibility and the add-on configuration." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2877 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2882 msgid "" "LSsession : LDAP server's configuration data are invalid. Can't connect." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2880 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2885 msgid "LSsession : Failed to load LSobject type '%{type}' : unknon type." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2883 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2888 msgid "LSsession : Failed to load LSclass '%{class}'." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2886 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2891 msgid "LSsession : Login or password incorrect." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2889 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2894 msgid "LSsession : Impossible to identify you : Duplication of identities." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2892 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2897 msgid "LSsession : Can't load class of authentification (%{class})." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2895 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2900 msgid "LSsession : Can't connect to LDAP server." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2898 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2903 msgid "LSsession : Impossible to authenticate you." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2901 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2906 msgid "LSsession : Your are not authorized to do this action." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2904 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2909 msgid "LSsession : Some informations are missing to display this page." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2907 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2912 msgid "" "LSsession : The function '%{function}' of the custom action " "'%{customAction}' does not exists or is not configured." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2910 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2915 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2913 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2918 msgid "" "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2916 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2921 msgid "LSsession : No import/export format define for this object type." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2919 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2924 msgid "" "LSsession : Error during creation of list of levels. Contact administrators. " "(Code : %{code})" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2922 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2927 msgid "LSsession : The password recovery is disabled for this LDAP server." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2925 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2930 msgid "" "LSsession : Some informations are missing to recover your password. Contact " "administrators." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2928 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2933 msgid "" "LSsession : Error during password recovery. Contact administrators.(Step : " "%{step})" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2931 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2936 msgid "" "LSsession : The function '%{func}' configured for the view '%{view}' of the " "LSaddon '%{addon}' is not declared in the LSaddon file." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2935 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2940 msgid "" "LSsession : The function '%{func}' configured for the view '%{view}' of the " "LSaddon '%{addon}' doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2938 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2943 msgid "LSsession : invalid related object's DN pass in parameter." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2941 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2946 msgid "" "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please " "upgrade it." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2944 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2949 msgid "" "LSsession : You have been redirect from an old-style URL %{url}. Please " "upgrade this link." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2947 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2952 msgid "" "LSsession : You always seem to use %{old} in your custom code: Please " "upgrade it and use %{new}.
\n"
@@ -988,199 +992,199 @@ msgid ""
 "%{context}
" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:477 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:489 msgid "The attribute %{attr} is not valid." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3035 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3058 msgid "LSldapObject : Object type unknown." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3038 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3061 msgid "LSldapObject : Update form is not defined for the object %{obj}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3041 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3064 msgid "LSldapObject : No form exists for the object %{obj}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3044 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3067 msgid "" "LSldapObject : The function %{func} to validate the attribute %{attr} the " "object %{obj} is unknow." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3047 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3070 msgid "" "LSldapObject : Configuration data are missing to validate the attribute " "%{attr} of the object %{obj}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3051 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3074 msgid "" "LSldapObject : The function %{func} to be executed on the object event " "%{event} doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3054 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3077 msgid "" "LSldapObject : The %{func} execution on the object event %{event} failed." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3058 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3081 msgid "" "LSldapObject : Class %{class}, which method %{meth} to be executed on the " "object event %{event}, doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3061 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3084 msgid "" "LSldapObject : Method %{meth} within %{class} class to be executed on object " "event %{event}, doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3064 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3087 msgid "" "LSldapObject : Error during execute %{meth} method within %{class} class, to " "be executed on object event %{event}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3068 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3091 msgid "" "LSldapObject : Some configuration data of the object type %{obj} are missing " "to generate the DN of the new object." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3071 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3094 msgid "" "LSldapObject : The attibute %{attr} of the object is not yet defined. Can't " "generate DN." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3074 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3097 msgid "LSldapObject : Without DN, the object could not be changed." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3077 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3100 msgid "" "LSldapObject : The attribute %{attr_depend} depending on the attribute " "%{attr} doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3080 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3103 msgid "LSldapObject : Error during deleting the object %{objectname}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3084 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3107 msgid "" "LSldapObject : Error during actions to be executed before renaming the objet." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3087 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3110 msgid "" "LSldapObject : Error during actions to be executed after renaming the objet." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3091 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3114 msgid "" "LSldapObject : Error during actions to be executed before deleting the objet." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3094 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3117 msgid "" "LSldapObject : Error during actions to be executed after deleting the objet." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3098 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3121 msgid "" "LSldapObject : Error during the actions to be executed before creating the " "object." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3101 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3124 msgid "" "LSldapObject : Error during the actions to be executed after creating the " "object. It was created anyway." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3105 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3128 msgid "" "LSldapObject : The function %{func} to be executed before creating the " "object doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3108 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3131 msgid "" "LSldapObject : Error executing the function %{func} to be execute after " "deleting the object." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3111 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3134 msgid "" "LSldapObject : The function %{func} to be executed after deleting the object " "doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3114 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3137 msgid "" "LSldapObject : Error executing the function %{func} to be execute after " "creating the object." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3118 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3141 msgid "" "LSldapObject : %{func} function, to be executed on object event %{event}, " "doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3121 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3144 msgid "" "LSldapObject : Error during the execution of %{func} function on object " "event %{event}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3125 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3148 msgid "" "LSldapObject : %{meth} method, to be executed on object event %{event}, " "doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3128 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3151 msgid "" "LSldapObject : Error during execution of %{meth} method on object event " "%{event}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3131 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3154 msgid "LSldapObject : Error during generate LDAP filter for %{LSobject}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3135 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3158 msgid "" "LSldapObject : Error during execution of the custom action %{customAction} " "on %{objectname}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3139 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3162 msgid "LSldapObject : Fail to retrieve container DN." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3142 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3165 msgid "" "LSldapObject : The function %{func} to generate container DN is not callable." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3145 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3168 msgid "LSldapObject : Error during generating container DN : %{error}" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3148 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3171 msgid "" "LSldapObject : An LDAP object with the same DN as generated for this new one " "already exists. Please verify your configuration." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3153 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSldapObject.php:3176 msgid "" "LSrelation : Some parameters are missing in the call of methods to handle " "standard relations (Method : %{meth})." @@ -1907,7 +1911,7 @@ msgid "LSlog : Fail to load logging handler %{handler}." msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSerror.php:112 -#: templates/default/import.tpl:29 +#: templates/default/import.tpl:43 msgid "Errors" msgstr "" @@ -2165,7 +2169,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: templates/default/import.tpl:71 +#: templates/default/import.tpl:85 msgid "Imported objects" msgstr "" @@ -2201,11 +2205,11 @@ msgstr "" msgid "No field." msgstr "" -#: templates/default/import.tpl:76 +#: templates/default/import.tpl:90 msgid "No imported object" msgstr "" -#: templates/default/import.tpl:44 +#: templates/default/import.tpl:58 msgid "No value" msgstr "" @@ -2213,7 +2217,7 @@ msgstr "" msgid "Object classes" msgstr "" -#: templates/default/import.tpl:19 +#: templates/default/import.tpl:30 msgid "Only validate data" msgstr "" @@ -2261,7 +2265,7 @@ msgstr "" msgid "Relations / Profiles" msgstr "" -#: templates/default/import.tpl:27 +#: templates/default/import.tpl:41 msgid "Result" msgstr "" @@ -2289,22 +2293,22 @@ msgstr "" msgid "This object type has no configured relation." msgstr "" -#: templates/default/import.tpl:16 +#: templates/default/import.tpl:24 msgid "Update objects if exists" msgstr "" -#: templates/default/import.tpl:81 +#: templates/default/import.tpl:95 msgid "Updated objects" msgstr "" -#: templates/default/import.tpl:22 +#: templates/default/import.tpl:36 msgid "Valid" msgstr "" -#: templates/default/import.tpl:17 templates/default/import.tpl:20 +#: templates/default/import.tpl:27 templates/default/import.tpl:33 msgid "no" msgstr "" -#: templates/default/import.tpl:17 templates/default/import.tpl:20 +#: templates/default/import.tpl:26 templates/default/import.tpl:32 msgid "yes" msgstr "" diff --git a/src/templates/default/import.tpl b/src/templates/default/import.tpl index cfcc12b7..04d1bde4 100644 --- a/src/templates/default/import.tpl +++ b/src/templates/default/import.tpl @@ -11,13 +11,27 @@
-
+
+ +
-
{tr msg='yes'} {tr msg='no'}
+
+ {tr msg='yes'} + {tr msg='no'} +
-
{tr msg='yes'} {tr msg='no'}
+
+ {tr msg='yes'} + {tr msg='no'} +