From 9bbd41468bcc353c870eb3541fce9734c0d763ac Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Mon, 4 May 2020 10:49:11 +0200 Subject: [PATCH] Replace remove.php by a LSurl route --- .../includes/class/class.LSsearchEntry.php | 2 +- public_html/includes/js/LSview.js | 6 +- public_html/includes/routes.php | 66 ++++++- .../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 55066 -> 55128 bytes .../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 179 +++++++++--------- public_html/lang/ldapsaisie.pot | 171 +++++++++-------- public_html/remove.php | 77 -------- 7 files changed, 245 insertions(+), 256 deletions(-) delete mode 100644 public_html/remove.php diff --git a/public_html/includes/class/class.LSsearchEntry.php b/public_html/includes/class/class.LSsearchEntry.php index 04debb04..cdd630c5 100644 --- a/public_html/includes/class/class.LSsearchEntry.php +++ b/public_html/includes/class/class.LSsearchEntry.php @@ -181,7 +181,7 @@ class LSsearchEntry { if (LSsession :: canRemove($this -> LSobject,$this -> dn)) { $this -> cache['actions'][] = array ( 'label' => _('Delete'), - 'url' => 'remove.php?LSobject='.$this -> LSobject.'&dn='.urlencode($this -> dn), + 'url' => 'object/'.$this -> LSobject.'/'.urlencode($this -> dn).'/remove', 'action' => 'delete' ); } diff --git a/public_html/includes/js/LSview.js b/public_html/includes/js/LSview.js index d9effe8d..f2843281 100644 --- a/public_html/includes/js/LSview.js +++ b/public_html/includes/js/LSview.js @@ -13,13 +13,13 @@ var LSview = new Class({ el.addEvent('click',this.onTdLSobjectListNamesClick.bind(this,el)); }, this); $$('a.LSobject-list-actions').each(function(el) { - var checkRemove = /remove\.php.*/; + var checkRemove = /\/remove$/; if (checkRemove.exec(el.href)) { el.addEvent('click',this.onRemoveListBtnClick.bindWithEvent(this,el)); } }, this); $$('a.LSview-actions').each(function(el) { - var checkRemove = /remove\.php.*/; + var checkRemove = /\/remove$/; if (checkRemove.exec(el.href)) { el.addEvent('click',this.onRemoveViewBtnClick.bindWithEvent(this,el)); } @@ -80,7 +80,7 @@ var LSview = new Class({ }, removeFromA: function(a) { - document.location = a.href+'&valid'; + document.location = a.href+'?valid'; }, onCustomActionBtnClick: function(event,a) { diff --git a/public_html/includes/routes.php b/public_html/includes/routes.php index 8b7afd10..67e6d27e 100644 --- a/public_html/includes/routes.php +++ b/public_html/includes/routes.php @@ -402,7 +402,7 @@ function handle_LSobject_show($request) { if (LSsession :: canRemove($LSobject, $dn)) { $LSview_actions[] = array( 'label' => _('Delete'), - 'url' => 'remove.php?LSobject='.$LSobject.'&dn='.urlencode($dn), + 'url' => "object/$LSobject/".urlencode($dn)."/remove", 'action' => 'delete' ); } @@ -536,7 +536,7 @@ function handle_LSobject_modify($request) { if (LSsession :: canRemove($LSobject,$object -> getDn())) { $LSview_actions[] = array( 'label' => _('Delete'), - 'url' => 'remove.php?LSobject='.$LSobject.'&dn='.urlencode($object -> getDn()), + 'url' => "object/$LSobject/".urlencode($object -> getDn())."/remove", 'action' => 'delete' ); } @@ -569,6 +569,68 @@ function handle_old_modify_php($request) { } LSurl :: add_handler('#^modify.php#', 'handle_old_modify_php'); +/* + * Handle LSobject remove request + * + * @param[in] $request LSurlRequest The request + * + * @retval void +**/ +function handle_LSobject_remove($request) { + $object = get_LSobject_from_request( + $request, + true, // instanciate object + array('LSsession', 'canRemove') // Check access method + ); + if (!$object) + return; + + $LSobject = $object -> getType(); + $dn = $object -> getDn(); + $objectname = $object -> getDisplayName(); + + // Remove object (if validated) + if (isset($_GET['valid'])) { + if ($object -> remove()) { + LSsession :: addInfo(getFData(_('%{objectname} has been successfully deleted.'), $objectname)); + LSurl :: redirect("object/$LSobject?refresh"); + } + else { + LSerror :: addErrorCode('LSldapObject_15', $objectname); + } + } + + // Define page title + LStemplate :: assign('pagetitle', getFData(_('Deleting : %{objectname}'), $objectname)); + LStemplate :: assign('question', getFData(_('Do you really want to delete %{displayName} ?'), $objectname)); + LStemplate :: assign('validation_url', "object/$LSobject/".urlencode($dn)."/remove?valid"); + LStemplate :: assign('validation_label', _('Validate')); + + // Set & display template + LSsession :: setTemplate('question.tpl'); + LSsession :: displayTemplate(); +} +LSurl :: add_handler('#^object/(?P[^/]+)/(?P[^/]+)/remove/?$#', 'handle_LSobject_remove'); + +/* + * Handle old remove.php request for retro-compatibility + * + * @param[in] $request LSurlRequest The request + * + * @retval void + **/ +function handle_old_remove_php($request) { + if (!isset($_GET['LSobject']) || !isset($_GET['dn'])) + $url = null; + elseif (isset($_GET['valid'])) + $url = "object/".$_GET['LSobject']."/".$_GET['dn']."/remove?valid"; + else + $url = "object/".$_GET['LSobject']."/".$_GET['dn']."/remove"; + LSerror :: addErrorCode('LSsession_26', 'remove.php'); + LSurl :: redirect($url); +} +LSurl :: add_handler('#^remove.php#', 'handle_old_remove_php'); + /* ************************************************************ * LSaddon views diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index cfc3251cf9301ac875d3ba03a350203ec3ffd779..581b6e6e3af4f1bd13bb866e313b58089a9c2cee 100644 GIT binary patch delta 9043 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 A%m4rY diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index e963fec1..d2afee10 100644 --- a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/public_html/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: 2020-05-03 18:40+0200\n" +"PO-Revision-Date: 2020-05-04 10:44+0200\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -21,18 +21,18 @@ msgstr "" "X-Generator: Poedit 2.2.1\n" #: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:67 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:217 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:222 #: templates/default/global_search.tpl:7 msgid "Search" msgstr "Rechercher" #: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:68 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:218 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:223 msgid "Approximative search" msgstr "Recherche approximative" #: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:69 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:219 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:224 msgid "Recursive search" msgstr "Recherche récursive" @@ -42,58 +42,11 @@ msgstr "Recherche récursive" msgid "Level" msgstr "Niveau" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:54 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannCompositeAttribute.php:106 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:260 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:68 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:62 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:167 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:263 -msgid "Modify" -msgstr "Modifier" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:60 -msgid "The object has been partially modified." -msgstr "L'objet a été partiellement modifié." - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:63 -msgid "The object has been modified successfully." -msgstr "L'objet a bien été modifié." - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:104 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:159 -msgid "View" -msgstr "Voir" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:111 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:216 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:215 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:69 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:85 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:183 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:279 -msgid "Delete" -msgstr "Supprimer" - #: /home/brenard/dev/ldapsaisie_clean3/public_html/import.php:59 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:166 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:171 msgid "Import" msgstr "Importer" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:75 -msgid "Data entry form" -msgstr "Masque de saisie" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:81 -msgid "Object has been added." -msgstr "L'objet a été ajouté." - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:120 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:160 -msgid "New" -msgstr "Nouveau" - #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_search_action.php:53 msgid "" "The custom action %{title} have been successfully execute on this search." @@ -112,8 +65,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsmoothbox.php:39 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1359 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:68 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:607 #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_action.php:83 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:51 msgid "Validate" msgstr "Valider" @@ -607,6 +560,16 @@ msgstr "" "LSattr_html_%{type} : Les données multiples ne sont pas supportées pour ce " "type de champ." +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannCompositeAttribute.php:106 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:260 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:68 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:62 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:167 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:388 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:546 +msgid "Modify" +msgstr "Modifier" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannCompositeAttribute.php:107 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:75 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:63 @@ -917,7 +880,7 @@ msgid "Your new password has been sent to %{mail}." msgstr "Votre nouveau mot de passe vous a été envoyé à l'adresse %{mail}." #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1522 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:173 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:178 #: /home/brenard/dev/ldapsaisie_clean3/public_html/global_search.php:36 msgid "Refresh" msgstr "Rafraîchir" @@ -1400,7 +1363,7 @@ msgid "updating relations" msgstr "mise à jour des relations" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:214 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:213 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:214 msgid "Do you really want to delete" msgstr "Voulez-vous vraiment supprimer" @@ -1408,11 +1371,27 @@ msgstr "Voulez-vous vraiment supprimer" msgid "Warning" msgstr "Attention" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:216 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:216 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:69 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:85 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:183 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:404 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:538 +msgid "Delete" +msgstr "Supprimer" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:243 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:365 msgid "No object." msgstr "Aucun objet." +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:165 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:343 +msgid "New" +msgstr "Nouveau" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:453 msgid "" "LSrelation : The function %{function} for action '%{action}' on the relation " @@ -1563,20 +1542,20 @@ msgstr "" "des constantes suivantes : LSAUTH_CAS_SERVER_SSL_CACERT ou " "LSAUTH_CAS_SERVER_NO_SSL_VALIDATION" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:98 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:99 msgid "Add a field to add another values." msgstr "Ajouter une autre valeur à ce champ." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:99 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:100 msgid "Delete this field." msgstr "Supprimer cette valeur." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:121 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:248 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:122 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:249 msgid "No field." msgstr "Aucun champ." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:202 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:203 #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_action.php:73 msgid "" "Do you really want to execute custom action %{customAction} on " @@ -1585,49 +1564,49 @@ msgstr "" "Êtes-vous vraiment sûre de vouloir exécuter l'action personnalisée " "%{customAction} sur %{objectname} ?" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:214 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:215 msgid "Caution" msgstr "Attention" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:269 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:270 msgid "%{label} attribute data is not valid." msgstr "Les données de l'attribut %{label} sont incorrectes." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:347 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:348 msgid "Mandatory field" msgstr "Champ obligatoire" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:779 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:780 msgid "LSform : Error during the recovery of the values of the form." msgstr "LSform : Erreur durant la récupération des valeurs du formulaire." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:782 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:783 msgid "" "LSform : Error durring the recovery of the value of the field '%{element}'." msgstr "" "LSform : Erreur durant la recupération de la valeur du champ %{element}." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:789 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:790 msgid "LSform : The field %{element} doesn't exist." msgstr "LSform : Le champ %{element} n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:792 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:793 msgid "LSfom : Field type unknow (%{type})." msgstr "LSform : Type de champ inconnu (%{type})." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:795 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:796 msgid "LSform : Error during the creation of the element '%{element}'." msgstr "LSform : Erreur durant la création de l'élément %{element}." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:798 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:799 msgid "LSform : The data entry form %{name} doesn't exist." msgstr "LSform : Le masque de saisie %{name} n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:801 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:802 msgid "LSform : The data entry form %{name} is not correctly configured." msgstr "LSform : Le masque de saisie %{name} n'est pas correctement configuré." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:804 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:805 msgid "" "LSform : The element %{name}, listed as displayed in data entry form " "configuration, doesn't exist." @@ -2036,8 +2015,13 @@ msgstr "Stop" msgid "Unknown error : %{error}" msgstr "Erreur inconnu : %{error}" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:159 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:530 +msgid "View" +msgstr "Voir" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:271 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:396 msgid "Copy" msgstr "Copier" @@ -2063,14 +2047,42 @@ msgstr "" msgid "Home" msgstr "Accueil" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:178 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:183 msgid "Reset" msgstr "Réinitialiser" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:310 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:302 +msgid "Data entry form" +msgstr "Masque de saisie" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:308 +msgid "Object has been added." +msgstr "L'objet a été ajouté." + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:435 msgid "My account" msgstr "Mon compte" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:488 +msgid "The object has been partially modified." +msgstr "L'objet a été partiellement modifié." + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:491 +msgid "The object has been modified successfully." +msgstr "L'objet a bien été modifié." + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:595 +msgid "%{objectname} has been successfully deleted." +msgstr "%{objectname} a bien été supprimé." + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:604 +msgid "Deleting : %{objectname}" +msgstr "Suppression : %{objectname}" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:605 +msgid "Do you really want to delete %{displayName} ?" +msgstr "Voulez-vous vraiment supprimer %{displayName} ?" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/functions.php:112 msgid "" "Function 'getFData' : The method %{meth} of the object %{obj} doesn't exist." @@ -2092,19 +2104,6 @@ msgstr "" "L'action personnalisée %{customAction} a été correctement exécutée sur " "%{objectname}." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:37 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:48 -msgid "Deleting" -msgstr "Suppression" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:39 -msgid "has been deleted successfully" -msgstr "a bien été supprimé" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:49 -msgid "Do you really want to delete %{displayName} ?" -msgstr "Voulez-vous vraiment supprimer %{displayName} ?" - #: /home/brenard/dev/ldapsaisie_clean3/public_html/global_search.php:30 msgid "You must provide pattern for global search." msgstr "Vous devez fournir un mot clé pour les recherches globales." @@ -2227,6 +2226,12 @@ msgstr "non" msgid "yes" msgstr "oui" +#~ msgid "Deleting" +#~ msgstr "Suppression" + +#~ msgid "has been deleted successfully" +#~ msgstr "a bien été supprimé" + #~ msgid "Missing parameter" #~ msgstr "Paramètre manquant" diff --git a/public_html/lang/ldapsaisie.pot b/public_html/lang/ldapsaisie.pot index 40c2849f..eec4fb6d 100644 --- a/public_html/lang/ldapsaisie.pot +++ b/public_html/lang/ldapsaisie.pot @@ -1,16 +1,16 @@ #: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:67 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:217 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:222 #: templates/default/global_search.tpl:7 msgid "Search" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:68 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:218 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:223 msgid "Approximative search" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:69 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:219 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:224 msgid "Recursive search" msgstr "" @@ -20,58 +20,11 @@ msgstr "" msgid "Level" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:54 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannCompositeAttribute.php:106 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:260 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:68 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:62 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:167 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:263 -msgid "Modify" -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:60 -msgid "The object has been partially modified." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:63 -msgid "The object has been modified successfully." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:104 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:159 -msgid "View" -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:111 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:216 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:215 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:69 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:85 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:183 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:279 -msgid "Delete" -msgstr "" - #: /home/brenard/dev/ldapsaisie_clean3/public_html/import.php:59 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:166 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:171 msgid "Import" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:75 -msgid "Data entry form" -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:81 -msgid "Object has been added." -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:120 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:160 -msgid "New" -msgstr "" - #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_search_action.php:53 msgid "" "The custom action %{title} have been successfully execute on this search." @@ -86,8 +39,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsmoothbox.php:39 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1359 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:68 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:607 #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_action.php:83 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:51 msgid "Validate" msgstr "" @@ -516,6 +469,16 @@ msgid "" "LSattr_html_%{type} : Multiple data are not supported for this field type." msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannCompositeAttribute.php:106 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:260 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:68 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:62 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:167 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:388 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:546 +msgid "Modify" +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannCompositeAttribute.php:107 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:75 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:63 @@ -780,7 +743,7 @@ msgid "Your new password has been sent to %{mail}." msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1522 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:173 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:178 #: /home/brenard/dev/ldapsaisie_clean3/public_html/global_search.php:36 msgid "Refresh" msgstr "" @@ -1177,7 +1140,7 @@ msgid "updating relations" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:214 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:213 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:214 msgid "Do you really want to delete" msgstr "" @@ -1185,11 +1148,27 @@ msgstr "" msgid "Warning" msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:216 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:216 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:69 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:85 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:183 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:404 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:538 +msgid "Delete" +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:243 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:365 msgid "No object." msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:165 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:343 +msgid "New" +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:453 msgid "" "LSrelation : The function %{function} for action '%{action}' on the relation " @@ -1310,68 +1289,68 @@ msgid "" "LSAUTH_CAS_SERVER_SSL_CACERT or LSAUTH_CAS_SERVER_NO_SSL_VALIDATION" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:98 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:99 msgid "Add a field to add another values." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:99 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:100 msgid "Delete this field." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:121 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:248 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:122 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:249 msgid "No field." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:202 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:203 #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_action.php:73 msgid "" "Do you really want to execute custom action %{customAction} on " "%{objectname} ?" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:214 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:215 msgid "Caution" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:269 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:270 msgid "%{label} attribute data is not valid." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:347 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:348 msgid "Mandatory field" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:779 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:780 msgid "LSform : Error during the recovery of the values of the form." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:782 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:783 msgid "" "LSform : Error durring the recovery of the value of the field '%{element}'." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:789 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:790 msgid "LSform : The field %{element} doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:792 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:793 msgid "LSfom : Field type unknow (%{type})." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:795 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:796 msgid "LSform : Error during the creation of the element '%{element}'." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:798 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:799 msgid "LSform : The data entry form %{name} doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:801 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:802 msgid "LSform : The data entry form %{name} is not correctly configured." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:804 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:805 msgid "" "LSform : The element %{name}, listed as displayed in data entry form " "configuration, doesn't exist." @@ -1732,8 +1711,13 @@ msgstr "" msgid "Unknown error : %{error}" msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:159 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:530 +msgid "View" +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:271 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:396 msgid "Copy" msgstr "" @@ -1755,14 +1739,42 @@ msgstr "" msgid "Home" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:178 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:183 msgid "Reset" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:310 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:302 +msgid "Data entry form" +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:308 +msgid "Object has been added." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:435 msgid "My account" msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:488 +msgid "The object has been partially modified." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:491 +msgid "The object has been modified successfully." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:595 +msgid "%{objectname} has been successfully deleted." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:604 +msgid "Deleting : %{objectname}" +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:605 +msgid "Do you really want to delete %{displayName} ?" +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/functions.php:112 msgid "" "Function 'getFData' : The method %{meth} of the object %{obj} doesn't exist." @@ -1782,19 +1794,6 @@ msgid "" "%{objectname}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:37 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:48 -msgid "Deleting" -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:39 -msgid "has been deleted successfully" -msgstr "" - -#: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:49 -msgid "Do you really want to delete %{displayName} ?" -msgstr "" - #: /home/brenard/dev/ldapsaisie_clean3/public_html/global_search.php:30 msgid "You must provide pattern for global search." msgstr "" diff --git a/public_html/remove.php b/public_html/remove.php deleted file mode 100644 index 5e5c7987..00000000 --- a/public_html/remove.php +++ /dev/null @@ -1,77 +0,0 @@ - loadData($dn)) { - if (isset($_GET['valid'])) { - $objectname=$object -> getDisplayName(); - LStemplate :: assign('pagetitle',_('Deleting').' : '.$objectname); - if ($object -> remove()) { - LSsession :: addInfo($objectname.' '._('has been deleted successfully').'.'); - LSurl :: redirect("object/$LSobject?refresh"); - } - else { - LSerror :: addErrorCode('LSldapObject_15',$objectname); - } - } - else { - // Définition du Titre de la page - LStemplate :: assign('pagetitle',_('Deleting').' : '.$object -> getDisplayName()); - LStemplate :: assign('question', getFData(_('Do you really want to delete %{displayName} ?'), $object -> getDisplayName())); - LStemplate :: assign('validation_url','remove.php?LSobject='.$LSobject.'&dn='.urlencode($dn).'&valid'); - LStemplate :: assign('validation_label',_('Validate')); - } - LSsession :: setTemplate('question.tpl'); - } - else { - LSerror :: addErrorCode('LSsession_12'); - } - } - else { - LSerror :: addErrorCode('LSsession_11'); - } - } - else { - LSerror :: addErrorCode('LSldapObject_01'); - } - } - else { - LSerror :: addErrorCode('LSsession_12'); - } - -} -else { - LSsession :: setTemplate('login.tpl'); -} - -// Affichage des retours d'erreurs -LSsession :: displayTemplate();