Replace view.php by LSurl routes

public_html/create.php

@@ -83,14 +83,14 @@ if(LSsession :: startLSsession()) {
             if (isset($_REQUEST['ajax'])) {
               LSsession :: displayAjaxReturn (
                 array(
-                  'LSredirect' => 'view.php?LSobject='.$LSobject.'&dn='.urlencode($object -> getDn())
+                  'LSredirect' => "object/$LSobject/".urlencode($object -> getDn())
                 )
               );
               exit();
             }
             else {
               if (!LSdebugDefined()) {
-                LSsession :: redirect('view.php?LSobject='.$LSobject.'&dn='.urlencode($object -> getDn()));
+                LSurl :: redirect("object/$LSobject/".urlencode($object -> getDn()));
               }
             }
           }

public_html/custom_action.php

@@ -54,10 +54,10 @@ if(LSsession :: startLSsession()) {
                     }
                   }
                   if ($config['redirectToObjectList']) {
-                    LSsession :: redirect('view.php?LSobject='.$LSobject.'&refresh');
+                    LSurl :: redirect("object/$LSobject?refresh");
                   }
                   else if (!isset($config['noRedirect']) || !$config['noRedirect']) {
-                    LSsession :: redirect('view.php?LSobject='.$LSobject.'&dn='.urlencode($dn));
+                    LSurl :: redirect("object/$LSobject/".urlencode($dn));
                   }
                 }
                 else {

public_html/custom_search_action.php

@@ -54,7 +54,7 @@ if(LSsession :: startLSsession()) {
                   }
                 }
                 if (!isset($config['redirectToObjectList']) || $config['redirectToObjectList']) {
-                  LSsession :: redirect('view.php?LSobject='.$LSobject.'&refresh');
+                  LSurl :: redirect("object/$LSobject?refresh");
                 }
               }
               else {

public_html/global_search.php

@@ -93,7 +93,7 @@ if(LSsession :: startLSsession()) {
     }
 
     if ($onlyOne && $onlyOneObject && isset($_REQUEST['LSsearch_submit'])) {
-      LSsession :: redirect('view.php?LSobject='.$onlyOneObject['LSobject'].'&dn='.urlencode($onlyOneObject['dn']));
+      LSurl :: redirect('object/'.$onlyOneObject['LSobject'].'/'.urlencode($onlyOneObject['dn']));
     }
 
     LStemplate :: assign('pattern',$pattern);

public_html/includes/class/class.LSrelation.php

@@ -354,7 +354,7 @@ class LSrelation {
                   else {
                     $class='';
                   }
-                  $data['html'].= "<li class='LSrelation'><a href='view.php?LSobject=$LSobjectInRelation&amp;dn=".urlencode($o -> getDn())."' class='LSrelation$class' id='LSrelation_".$_REQUEST['id']."_".$o -> getDn()."'>".$o -> getDisplayName(NULL,true)."</a></li>\n";
+                  $data['html'].= "<li class='LSrelation'><a href='object/$LSobjectInRelation/".urlencode($o -> getDn())."' class='LSrelation$class' id='LSrelation_".$_REQUEST['id']."_".$o -> getDn()."'>".$o -> getDisplayName(NULL,true)."</a></li>\n";
                 }
               }
               else {

public_html/includes/class/class.LSsearch.php

@@ -1197,7 +1197,7 @@ class LSsearch {
    **/
   public function redirectWhenOnlyOneResult() {
     if ($this -> total == 1 && $this -> result && self::formIsSubmited()) {
-      LSsession :: redirect('view.php?LSobject='.$this -> LSobject.'&dn='.urlencode($this -> result['list'][0]['dn']));
+      LSurl :: redirect('object/'.$this -> LSobject.'/'.urlencode($this -> result['list'][0]['dn']));
     }
     return;
   }

public_html/includes/class/class.LSsearchEntry.php

@@ -157,7 +157,7 @@ class LSsearchEntry {
       $this -> cache['actions'] = array (
         array(
           'label' => _('View'),
-          'url' =>'view.php?LSobject='.$this -> LSobject.'&dn='.urlencode($this -> dn),
+          'url' => 'object/'.$this -> LSobject.'/'.urlencode($this -> dn),
           'action' => 'view'
         )
       );

public_html/includes/class/class.LSsession.php

@@ -2549,11 +2549,11 @@ class LSsession {
   public static function redirectToDefaultView($force=false) {
     if (isset(self :: $ldapServer['defaultView'])) {
       if (array_key_exists(self :: $ldapServer['defaultView'], self :: $LSaccess[self :: $topDn])) {
-        self :: redirect('view.php?LSobject='.self :: $ldapServer['defaultView']);
+        LSurl :: redirect('object/'.self :: $ldapServer['defaultView']);
       }
       elseif (array_key_exists(self :: $ldapServer['defaultView'], self :: $LSaddonsViewsAccess)) {
         $addon = self :: $LSaddonsViewsAccess[self :: $ldapServer['defaultView']];
-        self :: redirect('addon/'.urlencode(self :: $LSaddonsViewsAccess[self :: $ldapServer['defaultView']]['LSaddon'])."/".urlencode(self :: $LSaddonsViewsAccess[self :: $ldapServer['defaultView']]['id']));
+        LSurl :: redirect('addon/'.urlencode(self :: $LSaddonsViewsAccess[self :: $ldapServer['defaultView']]['LSaddon'])."/".urlencode(self :: $LSaddonsViewsAccess[self :: $ldapServer['defaultView']]['id']));
       }
     }
     if ($force)
@@ -2664,6 +2664,9 @@ class LSsession {
     LSerror :: defineError('LSsession_25',
     _("LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please upgrade it.")
     );
+    LSerror :: defineError('LSsession_26',
+    _("LSsession : You have been redirect from an old-style URL %{url}. Please upgrade this link.")
+    );
   }
 
   /**

public_html/includes/js/LSformElement_select_object_field.js

@@ -217,7 +217,7 @@ var LSformElement_select_object_field = new Class({
 
         var a = new Element('a');
         a.addClass('LSformElement_select_object');
-        a.href="view.php?LSobject="+this.params['object_type']+"&dn="+dn;
+        a.href="object/"+this.params['object_type']+"/"+dn;
         a.set('html',name);
         a.injectInside(li);
 
@@ -238,7 +238,7 @@ var LSformElement_select_object_field = new Class({
       else { // Non Multiple
         var a = this.ul.getElement('a');
         if ($type(a)) { // Deja initialise
-          a.href="view.php?LSobject="+this.params['object_type']+"&dn="+dn;
+          a.href="object/"+this.params['object_type']+"/"+dn;
           a.set('html',name);
           a.removeClass('LSformElement_select_object_deleted');
 
@@ -254,7 +254,7 @@ var LSformElement_select_object_field = new Class({
 
           var a = new Element('a');
           a.addClass('LSformElement_select_object');
-          a.href="view.php?LSobject="+this.params['object_type']+"&dn="+dn;
+          a.href="object/"+this.params['object_type']+"/"+dn;
           a.set('html',name);
           a.injectInside(li);
 

public_html/includes/routes.php

@@ -62,6 +62,287 @@ function handle_image($request) {
 }
 LSurl :: add_handler('#^image/(?P<image>[^/]+)$#', 'handle_image', false);
 
+/*
+ ************************************************************
+ * LSobject views
+ ************************************************************
+ */
+
+/*
+ * LSobject view helper to retreive LSobject from request
+ *
+ * This helper load LSobject type from 'LSobject' request
+ * parameter, check user access. If instanciate parameter
+ * is True, an object of this type will be instanciate and
+ * return. Moreover, if 'dn' request parameter is present,
+ * the data of this object will be loaded from LDAP.
+ *
+ * @param[in] $request LSurlRequest The request
+ * @param[in] $instanciate boolean Instanciate and return an object (optional, default: true)
+ *
+ * @retval LSobject|boolean The instanciated LSobject (or True if $instanciate=false), or False
+ *                          on error/access refused
+ */
+function get_LSobject_from_request($request, $instanciate=true) {
+    $LSobject = $request -> LSobject;
+    $dn = (isset($request -> dn)?$request -> dn:null);
+
+    // Handle SELF redirect
+    if ( $LSobject == 'SELF' ) {
+      $LSobject = LSsession :: getLSuserObject() -> getType();
+      $dn = LSsession :: getLSuserObjectDn();
+      LSurl :: redirect("object/$LSobject/".urlencode($dn));
+    }
+
+    // If $dn, check user access to this LSobject
+    if ($dn) {
+      if (!LSsession :: canAccess($LSobject, $dn)) {
+        LSerror :: addErrorCode('LSsession_11');
+        return false;
+      }
+    }
+    else if (!LSsession :: in_menu($LSobject) && !LSsession :: canAccess($LSobject)) {
+      LSerror :: addErrorCode('LSsession_11');
+      return false;
+    }
+
+    // Load LSobject type
+    if ( !LSsession :: loadLSobject($LSobject) )
+      return false;
+
+    // If not $instanciate (and $dn not defined), just return true
+    if (!$instanciate && !$dn)
+      return True;
+
+    // Instanciate object
+    $object = new $LSobject();
+
+    // Load $dn data (if defined)
+    if ($dn && !$object -> loadData($dn)) {
+      LSurl :: error_404($request);
+      return false;
+    }
+
+    return $object;
+}
+
+/*
+ * Handle LSobject search/list request
+ *
+ * @param[in] $request LSurlRequest The request
+ *
+ * @retval void
+**/
+function handle_LSobject_search($request) {
+  $object = get_LSobject_from_request($request, true);
+  if (!$object)
+   return;
+
+  $LSobject = $object -> getType();
+
+  if (!LSsession :: loadLSclass('LSsearch')) {
+    LSsession :: addErrorCode('LSsession_05','LSsearch');
+    return false;
+  }
+
+  // Set pagetitle
+  LStemplate :: assign('pagetitle', $object -> getLabel());
+
+  // Instanciate a LSsearch
+  $LSsearch = new LSsearch($LSobject, 'LSview', null, (isset($_REQUEST['reset'])));
+  $LSsearch -> setParam('extraDisplayedColumns', True);
+  $LSsearch -> setParamsFormPostData();
+
+  // List user available actions for this LSobject type
+  $LSview_actions = array();
+  if(LSsession :: canCreate($LSobject)) {
+    $LSview_actions['create'] = array (
+      'label' => _('New'),
+      'url' => 'create.php?LSobject='.$LSobject,
+      'action' => 'create'
+    );
+    if ($object -> listValidIOformats()) {
+     $LSview_actions['import'] = array (
+      'label' => _('Import'),
+      'url' => 'import.php?LSobject='.$LSobject,
+      'action' => 'import'
+     );
+    }
+  }
+  $LSview_actions['refresh'] = array (
+    'label' => _('Refresh'),
+    'url' => "object/$LSobject?refresh",
+    'action' => 'refresh'
+  );
+  $LSview_actions['reset'] = array (
+    'label' => _('Reset'),
+    'url' => "object/$LSobject?reset",
+    'action' => 'reset'
+  );
+
+  // Custum Actions
+  $customActionsConfig = LSconfig :: get('LSobjects.'.$LSobject.'.LSsearch.customActions');
+  if (is_array($customActionsConfig)) {
+    foreach($customActionsConfig as $name => $config) {
+      if (LSsession :: canExecuteLSsearchCustomAction($LSsearch,$name)) {
+        $LSview_actions[] = array (
+          'label' => ((isset($config['label']))?__($config['label']):__($name)),
+          'hideLabel' => ((isset($config['hideLabel']))?$config['hideLabel']:False),
+          'helpInfo' => ((isset($config['helpInfo']))?__($config['helpInfo']):False),
+          'url' => 'custom_search_action.php?LSobject='.$LSobject.'&amp;customAction='.$name,
+          'action' => ((isset($config['icon']))?$config['icon']:'generate'),
+          'class' => 'LScustomActions'.(($config['noConfirmation'])?' LScustomActions_noConfirmation':'')
+        );
+      }
+    }
+  }
+
+
+  // Run search
+  $LSsearch -> run();
+  $LSsearch -> redirectWhenOnlyOneResult();
+
+  // Handle page parameter and retreive corresponding page from search
+  $page = (isset($_REQUEST['page'])?(int)$_REQUEST['page']:0);
+  $page = $LSsearch -> getPage($page);
+
+  // Set template variables
+  LStemplate :: assign('page', $page);
+  LStemplate :: assign('LSsearch', $LSsearch);
+  LStemplate :: assign('LSview_actions', $LSview_actions);
+  LStemplate :: assign('searchForm', array (
+    'action' => "object/$LSobject",
+    'recursive' => (! LSsession :: isSubDnLSobject($LSobject) && LSsession :: subDnIsEnabled() ),
+    'labels' => array (
+      'submit' => _('Search'),
+      'approx' => _('Approximative search'),
+      'recursive' => _('Recursive search')
+    ),
+    'values' => array (
+      'pattern' => $LSsearch -> getParam('pattern'),
+      'approx' => $LSsearch -> getParam('approx'),
+      'recursive' => $LSsearch -> getParam('recursive')
+    ),
+    'names' => array (
+      'submit' => 'LSsearch_submit'
+    ),
+    'hiddenFields' => $LSsearch -> getHiddenFieldForm(),
+    'predefinedFilter' => $LSsearch -> getParam('predefinedFilter')
+  ));
+
+
+  if (LSsession :: loadLSclass('LSform')) {
+    LSform :: loadDependenciesDisplayView();
+  }
+
+  // Set & display template
+  LSsession :: setTemplate('viewSearch.tpl');
+  LSsession :: displayTemplate();
+}
+LSurl :: add_handler('#^object/(?P<LSobject>[^/]+)/?$#', 'handle_LSobject_search');
+
+/*
+ * Handle LSobject show request
+ *
+ * @param[in] $request LSurlRequest The request
+ *
+ * @retval void
+**/
+function handle_LSobject_show($request) {
+  $object = get_LSobject_from_request($request, true);
+  if (!$object)
+   return;
+
+  $LSobject = $object -> getType();
+  $dn = $object -> getDn();
+
+  // List user available actions for this LSobject
+  $LSview_actions = array();
+  if ( LSsession :: canEdit($LSobject, $dn) ) {
+    $LSview_actions[] = array(
+      'label' => _('Modify'),
+      'url' =>'modify.php?LSobject='.$LSobject.'&amp;dn='.urlencode($dn),
+      'action' => 'modify'
+    );
+  }
+
+  if (LSsession :: canCreate($LSobject)) {
+    $LSview_actions[] = array(
+      'label' => _('Copy'),
+      'url' =>'create.php?LSobject='.$LSobject.'&amp;load='.urlencode($dn),
+      'action' => 'copy'
+    );
+  }
+
+  if (LSsession :: canRemove($LSobject, $dn)) {
+    $LSview_actions[] = array(
+      'label' => _('Delete'),
+      'url' => 'remove.php?LSobject='.$LSobject.'&amp;dn='.urlencode($dn),
+      'action' => 'delete'
+    );
+  }
+
+  // Custum Actions
+  $customActionsConfig = LSconfig :: get('LSobjects.'.$LSobject.'.customActions');
+  if (is_array($customActionsConfig)) {
+    foreach($customActionsConfig as $name => $config) {
+      if (LSsession :: canExecuteCustomAction($dn, $LSobject, $name)) {
+        $LSview_actions[] = array (
+          'label' => ((isset($config['label']))?__($config['label']):__($name)),
+          'hideLabel' => ((isset($config['hideLabel']))?$config['hideLabel']:False),
+          'helpInfo' => ((isset($config['helpInfo']))?__($config['helpInfo']):False),
+          'url' => 'custom_action.php?LSobject='.$LSobject.'&amp;dn='.urlencode($dn).'&amp;customAction='.$name,
+          'action' => ((isset($config['icon']))?$config['icon']:'generate'),
+          'class' => 'LScustomActions'.(($config['noConfirmation'])?' LScustomActions_noConfirmation':'')
+        );
+      }
+    }
+  }
+
+  $view = $object -> getView();
+  $view -> displayView();
+
+  // LSrelations
+  if (LSsession :: loadLSclass('LSrelation')) {
+    LSrelation :: displayInLSview($object);
+  }
+
+  LStemplate :: assign('pagetitle', (LSsession :: getLSuserObjectDn() == $dn?_('My account'):$object -> getDisplayName()));
+  LStemplate :: assign('LSldapObject', $object);
+  LStemplate :: assign('LSview_actions', $LSview_actions);
+
+
+  // Set & display template
+  LSsession :: setTemplate('view.tpl');
+  LSsession :: displayTemplate();
+}
+LSurl :: add_handler('#^object/(?P<LSobject>[^/]+)/?(?P<dn>[^/]+)/?$#', 'handle_LSobject_show');
+
+/*
+ * Handle old view.php request for retro-compatibility
+ *
+ * @param[in] $request LSurlRequest The request
+ *
+ * @retval void
+ **/
+function handle_old_view_php($request) {
+  if (!isset($_GET['LSobject']))
+    $url = null;
+  elseif (isset($_GET['dn']))
+    $url = "object/".$_GET['LSobject']."/".$_GET['dn'];
+  else
+    $url = "object/".$_GET['LSobject'];
+  LSerror :: addErrorCode('LSsession_26', 'view.php');
+  LSurl :: redirect($url);
+}
+LSurl :: add_handler('#^view.php#', 'handle_old_view_php');
+
+/*
+ ************************************************************
+ * LSaddon views
+ ************************************************************
+ */
+
 /*
  * Handle LSaddon view request
  *

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-02 18:28+0200\n"
+"PO-Revision-Date: 2020-05-03 18:40+0200\n"
 "Last-Translator: Benjamin Renard <brenard@zionetrix.net>\n"
 "Language-Team: LdapSaisie <ldapsaisie-users@lists.labs.libre-entreprise."
 "org>\n"
@@ -20,78 +20,38 @@ msgstr ""
 "X-Poedit-Basepath: /var/www/ldapsaisie/trunk\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:44
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:67
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:217
+#: 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
+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
+msgid "Recursive search"
+msgstr "Recherche récursive"
+
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:70
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1319
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2446
+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/view.php:52
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175
-msgid "Copy"
-msgstr "Copier"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:60
-#: /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
-msgid "Delete"
-msgstr "Supprimer"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:90
-msgid "My account"
-msgstr "Mon compte"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:123
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:67
-#: templates/default/global_search.tpl:7
-msgid "Search"
-msgstr "Rechercher"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:124
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:68
-msgid "Approximative search"
-msgstr "Recherche approximative"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:125
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:69
-msgid "Recursive search"
-msgstr "Recherche récursive"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:143
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:120
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267
-msgid "New"
-msgstr "Nouveau"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:149
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/import.php:59
-msgid "Import"
-msgstr "Importer"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:156
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1516
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/global_search.php:36
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:161
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:70
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1313
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2440
-msgid "Level"
-msgstr "Niveau"
-
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:60
 msgid "The object has been partially modified."
 msgstr "L'objet a été partiellement modifié."
@@ -105,6 +65,21 @@ msgstr "L'objet a bien été modifié."
 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
+msgid "Import"
+msgstr "Importer"
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:75
 msgid "Data entry form"
 msgstr "Masque de saisie"
@@ -113,6 +88,12 @@ msgstr "Masque de saisie"
 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."
@@ -129,7 +110,7 @@ msgstr ""
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_search_action.php:73
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSconfirmBox.php:37
 #: /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:1353
+#: /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/custom_action.php:83
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:51
@@ -885,69 +866,75 @@ msgstr ""
 msgid "Clear"
 msgstr "Nettoyer"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1293
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1299
 msgid "Connection"
 msgstr "Connexion"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1303
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1309
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1342
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1348
 msgid "LDAP server"
 msgstr "Serveur LDAP"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1314
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1320
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1352
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1358
 msgid "Identifier"
 msgstr "Identifiant"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1315
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1321
 msgid "Password"
 msgstr "Mot de passe"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1316
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1322
 msgid "Connect"
 msgstr "Se connecter"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1317
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1323
 msgid "Forgot your password ?"
 msgstr "Mot de passe perdu ?"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1335
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1341
 msgid "Recovery of your credentials"
 msgstr "Récupération de votre mot de passe"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1354
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1360
 msgid "Back"
 msgstr "Retour"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1357
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1363
 msgid "Please fill the identifier field to proceed recovery procedure"
 msgstr ""
 "Merci d'entrer votre identifiant pour poursuivre la procédure de récupération"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1362
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1368
 msgid ""
 "An email has been sent to  %{mail}. Please follow the instructions on it."
 msgstr ""
 "Un e-mail vient de vous être envoyé à l'adresse %{mail}. Merci de suivre les "
 "indications qu'il contient."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1371
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1377
 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:1532
+#: /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/global_search.php:36
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1538
 msgid "Language"
 msgstr "Langue"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1554
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1560
 msgid "Connected as"
 msgstr "Connecté en tant que"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2587
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2593
 msgid "LSsession : The constant %{const} is not defined."
 msgstr "LSsession : La constante %{const} n'est pas définie."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2590
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2596
 msgid ""
 "LSsession : The %{addon} support is uncertain. Verify system compatibility "
 "and the add-on configuration."
@@ -955,52 +942,52 @@ msgstr ""
 "LSsession : Le support %{addon} est incertain. Vérifiez la compatibilité du "
 "système et la configuration de l'add-on."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2593
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2599
 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/public_html/includes/class/class.LSsession.php:2596
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2602
 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/public_html/includes/class/class.LSsession.php:2599
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2605
 msgid "LSsession : Failed to load LSclass %{class}."
 msgstr "LSsession : Impossible de charger la LSclass %{class}."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2602
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2608
 msgid "LSsession : Login or password incorrect."
 msgstr "LSsession : Identifiant ou mot de passe incorrects."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2605
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2611
 msgid "LSsession : Impossible to identify you : Duplication of identities."
 msgstr "LSsession : Impossible de vous identifier : Duplication d'identité."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2608
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2614
 msgid "LSsession : Can't load class of authentification (%{class})."
 msgstr ""
 "LSsession : Impossible de charger la classe d'authentification (%{class})."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2611
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2617
 msgid "LSsession : Can't connect to LDAP server."
 msgstr "LSsession : Impossible de se connecter au serveur LDAP."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2614
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2620
 msgid "LSsession : Impossible to authenticate you."
 msgstr "LSsession : Impossible de vous identifier."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2617
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2623
 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/public_html/includes/class/class.LSsession.php:2620
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2626
 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/public_html/includes/class/class.LSsession.php:2623
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2629
 msgid ""
 "LSsession : The function of the custom action %{name} does not exists or is "
 "not configured."
@@ -1008,24 +995,24 @@ msgstr ""
 "LSsearch : La fonction de l'action personnalisée %{name} n'existe pas ou "
 "n'est pas configurée."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2626
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2632
 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/public_html/includes/class/class.LSsession.php:2629
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2635
 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/public_html/includes/class/class.LSsession.php:2632
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2638
 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/public_html/includes/class/class.LSsession.php:2635
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2641
 msgid ""
 "LSsession : Error during creation of list of levels. Contact administrators. "
 "(Code : %{code})"
@@ -1033,13 +1020,13 @@ msgstr ""
 "LSsession : Erreur durant la création de la liste des niveaux. Contacter les "
 "administrateurs. (Code : %{type})"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2638
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2644
 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/public_html/includes/class/class.LSsession.php:2641
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2647
 msgid ""
 "LSsession : Some informations are missing to recover your password. Contact "
 "administrators."
@@ -1047,7 +1034,7 @@ msgstr ""
 "LSsession : Des informations sont manques pour pouvoir récupérer votre mot "
 "de passe. Contacter les administrateurs."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2644
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2650
 msgid ""
 "LSsession : Error during password recovery. Contact administrators.(Step : "
 "%{step})"
@@ -1055,26 +1042,26 @@ msgstr ""
 "LSsession : Erreur durant la récupération de votre mot de passe. Contacter "
 "les administrateurs. (Etape : %{step})"
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2647
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2653
 msgid ""
 "LSsession : call function %{func} do not provided from LSaddon %{addon}."
 msgstr ""
 "LSsession : la fonction %{func} n'est pas fournie par le LSaddon %{addon}."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2650
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2656
 msgid "LSsession : problem during initialisation."
 msgstr "LSsession : Problème durant l'initialisation."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2653
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2659
 msgid "LSsession : view function %{func} for LSaddon %{addon} doet not exist."
 msgstr ""
 "LSsession : la fonction de vue %{func} du LSaddon %{addon} n'existe pas."
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2656
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2662
 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/public_html/includes/class/class.LSsession.php:2659
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2665
 msgid ""
 "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please "
 "upgrade it."
@@ -1082,6 +1069,14 @@ msgstr ""
 "LSsession : le LSaddon %{addon} utilise toujours l'ancien type d'URL de "
 "vues. Merci de le mettre à jour."
 
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2668
+msgid ""
+"LSsession : You have been redirect from an old-style URL %{url}. Please "
+"upgrade this link."
+msgstr ""
+"LSsession : Vous avez été redirigé depuis une ancienne URL %{url}. Merci de "
+"le mettre à jour ce lien."
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSldapObject.php:473
 msgid "The attribute %{attr} is not valid."
 msgstr "L'attribut %{attr} n'est pas valide."
@@ -2041,6 +2036,11 @@ msgstr "Stop"
 msgid "Unknown error : %{error}"
 msgstr "Erreur inconnu : %{error}"
 
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:271
+msgid "Copy"
+msgstr "Copier"
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:251
 msgid "Unknown property !"
 msgstr "Propriété inconnue !"
@@ -2063,6 +2063,14 @@ msgstr ""
 msgid "Home"
 msgstr "Accueil"
 
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:178
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:310
+msgid "My account"
+msgstr "Mon compte"
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/functions.php:112
 msgid ""
 "Function 'getFData' : The method %{meth} of the object %{obj} doesn't exist."

public_html/lang/ldapsaisie.pot

@@ -1,75 +1,35 @@
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:44
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:67
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:217
+#: 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
+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
+msgid "Recursive search"
+msgstr ""
+
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:70
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1319
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2446
+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/view.php:52
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175
-msgid "Copy"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:60
-#: /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
-msgid "Delete"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:90
-msgid "My account"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:123
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:67
-#: templates/default/global_search.tpl:7
-msgid "Search"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:124
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:68
-msgid "Approximative search"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:125
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:69
-msgid "Recursive search"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:143
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:120
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267
-msgid "New"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:149
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/import.php:59
-msgid "Import"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:156
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1516
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/global_search.php:36
-msgid "Refresh"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/view.php:161
-msgid "Reset"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/select.php:70
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1313
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2440
-msgid "Level"
-msgstr ""
-
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/modify.php:60
 msgid "The object has been partially modified."
 msgstr ""
@@ -83,6 +43,21 @@ msgstr ""
 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
+msgid "Import"
+msgstr ""
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/create.php:75
 msgid "Data entry form"
 msgstr ""
@@ -91,6 +66,12 @@ msgstr ""
 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."
@@ -103,7 +84,7 @@ msgstr ""
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/custom_search_action.php:73
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSconfirmBox.php:37
 #: /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:1353
+#: /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/custom_action.php:83
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/remove.php:51
@@ -751,176 +732,188 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1293
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1299
 msgid "Connection"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1303
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1309
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1342
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1348
 msgid "LDAP server"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1314
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1320
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1352
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1358
 msgid "Identifier"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1315
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1321
 msgid "Password"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1316
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1322
 msgid "Connect"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1317
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1323
 msgid "Forgot your password ?"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1335
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1341
 msgid "Recovery of your credentials"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1354
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1360
 msgid "Back"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1357
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1363
 msgid "Please fill the identifier field to proceed recovery procedure"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1362
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1368
 msgid ""
 "An email has been sent to  %{mail}. Please follow the instructions on it."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1371
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1377
 msgid "Your new password has been sent to %{mail}."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1532
+#: /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/global_search.php:36
+msgid "Refresh"
+msgstr ""
+
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1538
 msgid "Language"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1554
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1560
 msgid "Connected as"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2587
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2593
 msgid "LSsession : The constant %{const} is not defined."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2590
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2596
 msgid ""
 "LSsession : The %{addon} support is uncertain. Verify system compatibility "
 "and the add-on configuration."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2593
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2599
 msgid ""
 "LSsession : LDAP server's configuration data are invalid. Can't connect."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2596
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2602
 msgid "LSsession : Failed to load LSobject type %{type} : unknon type."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2599
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2605
 msgid "LSsession : Failed to load LSclass %{class}."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2602
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2608
 msgid "LSsession : Login or password incorrect."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2605
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2611
 msgid "LSsession : Impossible to identify you : Duplication of identities."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2608
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2614
 msgid "LSsession : Can't load class of authentification (%{class})."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2611
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2617
 msgid "LSsession : Can't connect to LDAP server."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2614
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2620
 msgid "LSsession : Impossible to authenticate you."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2617
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2623
 msgid "LSsession : Your are not authorized to do this action."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2620
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2626
 msgid "LSsession : Some informations are missing to display this page."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2623
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2629
 msgid ""
 "LSsession : The function of the custom action %{name} does not exists or is "
 "not configured."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2626
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2632
 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2629
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2635
 msgid ""
 "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2632
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2638
 msgid "LSsession : No import/export format define for this object type."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2635
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2641
 msgid ""
 "LSsession : Error during creation of list of levels. Contact administrators. "
 "(Code : %{code})"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2638
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2644
 msgid "LSsession : The password recovery is disabled for this LDAP server."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2641
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2647
 msgid ""
 "LSsession : Some informations are missing to recover your password. Contact "
 "administrators."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2644
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2650
 msgid ""
 "LSsession : Error during password recovery. Contact administrators.(Step : "
 "%{step})"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2647
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2653
 msgid ""
 "LSsession : call function %{func} do not provided from LSaddon %{addon}."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2650
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2656
 msgid "LSsession : problem during initialisation."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2653
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2659
 msgid "LSsession : view function %{func} for LSaddon %{addon} doet not exist."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2656
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2662
 msgid "LSsession : invalid related object's DN pass in parameter."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2659
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2665
 msgid ""
 "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please "
 "upgrade it."
 msgstr ""
 
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2668
+msgid ""
+"LSsession : You have been redirect from an old-style URL %{url}. Please "
+"upgrade this link."
+msgstr ""
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSldapObject.php:473
 msgid "The attribute %{attr} is not valid."
 msgstr ""
@@ -1739,6 +1732,11 @@ msgstr ""
 msgid "Unknown error : %{error}"
 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
+msgid "Copy"
+msgstr ""
+
 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:251
 msgid "Unknown property !"
 msgstr ""
@@ -1757,6 +1755,14 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:178
+msgid "Reset"
+msgstr ""
+
+#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:310
+msgid "My account"
+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."

public_html/modify.php

@@ -65,14 +65,14 @@ if(LSsession :: startLSsession()) {
               if (isset($_REQUEST['ajax'])) {
                 LSsession :: displayAjaxReturn (
                   array(
-                    'LSredirect' => 'view.php?LSobject='.$LSobject.'&dn='.$object -> getDn()
+                    'LSredirect' => "object/$LSobject/".$object -> getDn()
                   )
                 );
                 exit();
               }
               else {
                 if (!LSdebugDefined()) {
-                  LSsession :: redirect('view.php?LSobject='.$LSobject.'&dn='.$object -> getDn());
+                  LSurl :: redirect("object/$LSobject/".$object -> getDn());
                 }
                 else {
                   LSsession :: displayTemplate();
@@ -102,7 +102,7 @@ if(LSsession :: startLSsession()) {
           else {
             $LSview_actions[] = array(
               'label' => _('View'),
-              'url' =>'view.php?LSobject='.$LSobject.'&dn='.urlencode($object -> getDn()),
+              'url' => "object/$LSobject/".urlencode($object -> getDn()),
               'action' => 'view'
             );
 

public_html/remove.php

@@ -37,7 +37,7 @@ if(LSsession :: startLSsession()) {
               LStemplate :: assign('pagetitle',_('Deleting').' : '.$objectname);
               if ($object -> remove()) {
                 LSsession :: addInfo($objectname.' '._('has been deleted successfully').'.');
-                LSsession :: redirect('view.php?LSobject='.$LSobject.'&refresh');
+                LSurl :: redirect("object/$LSobject?refresh");
               }
               else {
                 LSerror :: addErrorCode('LSldapObject_15',$objectname);

public_html/select.php

@@ -93,7 +93,7 @@ if(LSsession :: startLSsession()) {
         $LSview_actions=array(
           array (
             'label' => 'Refresh',
-            'url' => 'view.php?LSobject='.$LSobject.'&refresh',
+            'url' => "object/$LSobject?refresh",
             'action' => 'refresh'
           )
         );

public_html/templates/default/LSformElement_select_object_field.tpl

@@ -1,5 +1,5 @@
 {if $dn}
-  <a href='view.php?LSobject={$selectableObject|escape:"url"}&dn={$dn|escape:'url'}' class='LSformElement_select_object'>{$txt|escape:"htmlall"}</a>
+  <a href='object/{$selectableObject|escape:"url"}/{$dn|escape:'url'}' class='LSformElement_select_object'>{$txt|escape:"htmlall"}</a>
   {if !$freeze}<input type='hidden' class='LSformElement_select_object' name='{$attr_name|escape:"htmlall"}[]' value='{$dn|escape:"htmlall"}' />{/if}
 {else}
   {$noValueTxt|escape:"htmlall"}

public_html/templates/default/LSrelations.tpl

@@ -8,7 +8,7 @@
 {/if}
 <ul id='LSrelation_ul_{$item.id|escape:"quotes"}' class='LSrelation'>
 {foreach from=$item.objectList item=object}
-  <li class='LSrelation'><a href='view.php?LSobject={$item.LSobject|escape:"url"}&amp;dn={$object.dn|escape:'url'}' class='LSrelation{if $object.canEdit} LSrelation_editable{/if}' id='LSrelation_{$item.id|escape:"quotes"}_{$object.dn|escape:"quotes"}'>{$object.text|escape:"htmlall"}</a></li>
+  <li class='LSrelation'><a href='object/{$item.LSobject|escape:"url"}/{$object.dn|escape:'url'}' class='LSrelation{if $object.canEdit} LSrelation_editable{/if}' id='LSrelation_{$item.id|escape:"quotes"}_{$object.dn|escape:"quotes"}'>{$object.text|escape:"htmlall"}</a></li>
 {foreachelse}
   <li class='LSrelation'>{$item.emptyText|escape:"htmlall"}</li>
 {/foreach}

public_html/templates/default/global_search_one_page.tpl

@@ -6,7 +6,7 @@
     <tr class='LSobject-list'>
       <th class='LSobject-list'>
         {if $LSsearch->sort}
-        <a href='view.php?LSobject={$LSsearch->LSobject}&amp;sortBy=displayName&amp;nocache={$smarty.now}'>
+        <a href='object/{$LSsearch->LSobject}?sortBy=displayName&amp;nocache={$smarty.now}'>
           {if $LSsearch->sortBy == 'displayName'}
             <strong>{$LSsearch->label_objectName|escape:'htmlall'}</strong>
             <img src='{img name=$LSsearch->sortDirection}' class='LSobject-list-ordersense' alt='{$LSsearch->sortDirection}'/>
@@ -21,7 +21,7 @@
       {if $LSsearch->displaySubDn}
         <th class='LSobject-list LSobject-list-subdn'>
         {if $LSsearch->sort}
-          <a href='view.php?LSobject={$LSsearch->LSobject}&amp;sortBy=subDn&amp;nocache={$smarty.now}'>
+          <a href='object/{$LSsearch->LSobject}?sortBy=subDn&amp;nocache={$smarty.now}'>
           {if $LSsearch->sortBy == 'subDn'}
             <strong>{$LSsearch->label_level|escape:'htmlall'}</strong>
             <img src='{img name=$LSsearch->sortDirection}' class='LSobject-list-ordersense' alt='{$LSsearch->sortDirection}'/>
@@ -38,7 +38,7 @@
     </tr>
     {foreach from=$page.list item=object}
     <tr class='{cycle values="LSobject-list,LSobject-list LSobject-list-bis"}'>
-        <td class='LSobject-list LSobject-list-names'><a href='view.php?LSobject={$LSsearch->LSobject|escape:'url'}&amp;dn={$object->dn|escape:'url'}'  class='LSobject-list'>{$object->displayName|escape:'htmlall'}</a> </td>
+        <td class='LSobject-list LSobject-list-names'><a href='object/{$LSsearch->LSobject|escape:'url'}/{$object->dn|escape:'url'}'  class='LSobject-list'>{$object->displayName|escape:'htmlall'}</a> </td>
         {if $LSsearch->displaySubDn}<td class='LSobject-list'>{$object->subDn|escape:'htmlall'}</td>{/if}
         <td class='LSobject-list LSobject-list-actions'>
         {foreach from=$object->actions item=item}
@@ -66,21 +66,21 @@
     {else}
       {assign var=start value=0}
     {/if}
-    <a href='view.php?LSobject={$LSsearch->LSobject|escape:'url'}&amp;page=0' class='LSobject-list-page'>&lt;</a>
+    <a href='object/{$LSsearch->LSobject|escape:'url'}?page=0' class='LSobject-list-page'>&lt;</a>
     {foreach from=0|range:10 item=i}
       {if $page.nb==$start+$i}
         <strong class='LSobject-list-page'>{$page.nb+1}</strong>
       {else}
-        <a href='view.php?LSobject={$LSsearch->LSobject|escape:'url'}&amp;page={$i+$start}'  class='LSobject-list-page'>{$i+$start+1}</a>
+        <a href='object/{$LSsearch->LSobject|escape:'url'}?page={$i+$start}'  class='LSobject-list-page'>{$i+$start+1}</a>
       {/if}
     {/foreach}
-    <a href='view.php?LSobject={$LSsearch->LSobject|escape:'url'}&amp;page={$page.nbPages-1}' class='LSobject-list-page'>&gt;</a>
+    <a href='object/{$LSsearch->LSobject|escape:'url'}?page={$page.nbPages-1}' class='LSobject-list-page'>&gt;</a>
   {else}
     {section name=listpage loop=$page.nbPages step=1}
       {if $page.nb == $smarty.section.listpage.index}
         <strong class='LSobject-list-page'>{$page.nb+1}</strong>
       {else}
-        <a href='view.php?LSobject={$LSsearch->LSobject|escape:'url'}&amp;page={$smarty.section.listpage.index}'  class='LSobject-list-page'>{$smarty.section.listpage.index+1}</a>
+        <a href='object/{$LSsearch->LSobject|escape:'url'}?page={$smarty.section.listpage.index}'  class='LSobject-list-page'>{$smarty.section.listpage.index+1}</a>
       {/if}
     {/section}
   {/if}

public_html/templates/default/import.tpl

@@ -69,7 +69,7 @@
 <h2 class='LSimport_imported_objects'>{tr msg='Imported objects'} ({count($result.imported)})</h2>
 <ul class='LSimport_imported_objects'>
 {foreach $result.imported as $dn => $name}
-  <li><a href='view.php?LSobject={$LSobject|escape:"url"}&dn={$dn|escape:"url"}'>{$name|escape:"htmlall"}</a></li>
+  <li><a href='object/{$LSobject|escape:"url"}/{$dn|escape:"url"}'>{$name|escape:"htmlall"}</a></li>
 {foreachelse}
   <li>{tr msg='No imported object'}</li>
 {/foreach}
@@ -79,7 +79,7 @@
 <h2 class='LSimport_updated_objects'>{tr msg='Updated objects'} ({count($result.updated)})</h2>
 <ul class='LSimport_updated_objects'>
 {foreach $result.updated as $dn => $name}
-  <li><a href='view.php?LSobject={$LSobject|escape:"url"}&dn={$dn|escape:"url"}'>{$name|escape:"htmlall"}</a></li>
+  <li><a href='object/{$LSobject|escape:"url"}/{$dn|escape:"url"}'>{$name|escape:"htmlall"}</a></li>
 {/foreach}
 </ul>
 {/if}

public_html/templates/default/top.tpl

@@ -18,7 +18,7 @@
   <tr>
     <td rowspan=2 id='left'>
       <a href='index.php'><img src='{img name='logo'}' alt='Logo' id='logo'/></a>
-      
+
       {if $LSsession_subDn!=""}
         <form action="index.php" method='post' id='LSsession_topDn_form'>
           <label>{$label_level|escape:"htmlall"}
@@ -40,7 +40,7 @@
 
       <ul class='menu'>
       {foreach from=$LSaccess item=label key=LSobject_type}
-        <li class='menu'><a href='view.php?LSobject={$LSobject_type|escape:"url"}' class='menu'>{tr msg=$label}</a></li>
+        <li class='menu'><a href='object/{$LSobject_type|escape:"url"}' class='menu'>{tr msg=$label}</a></li>
       {/foreach}
       {foreach from=$LSaddonsViewsAccess item=access}
         {if $access.showInMenu}
@@ -66,7 +66,3 @@
   </tr>
   <tr>
     <td id='right'>
-    
-    
-
-    

public_html/templates/default/viewSearch.tpl

@@ -5,7 +5,7 @@
   {foreach from=$searchForm.hiddenFields item=value key=name}
     <input type='hidden' name='{$name|escape:"htmlall"}' value='{$value|escape:"htmlall"}' />
   {/foreach}
-  
+
   <input type='text' name='pattern' class='LSview_search' value='{$searchForm.values.pattern|escape:"htmlall"}'/>
   <input type='submit' value='{$searchForm.labels.submit|escape:"htmlall"}' name='{$searchForm.names.submit|escape:"htmlall"}' class='LSview_search' />
   <p id='LSview_search_param'>
@@ -42,7 +42,7 @@
     <tr class='LSobject-list'>
       <th class='LSobject-list'>
         {if $LSsearch->sort}
-        <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;sortBy=displayName&amp;nocache={$smarty.now}'>
+        <a href='object/{$LSsearch->LSobject|escape:"url"}?sortBy=displayName&amp;nocache={$smarty.now}'>
           {if $LSsearch->sortBy == 'displayName'}
             <strong>{$LSsearch->label_objectName|escape:"htmlall"}</strong>
             <img src='{img name=$LSsearch->sortDirection}' class='LSobject-list-ordersense' alt='{$LSsearch->sortDirection}'/>
@@ -57,7 +57,7 @@
       {if $LSsearch->displaySubDn}
         <th class='LSobject-list LSobject-list-subdn'>
         {if $LSsearch->sort}
-          <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;sortBy=subDn&amp;nocache={$smarty.now}'>
+          <a href='object/{$LSsearch->LSobject|escape:"url"}?sortBy=subDn&amp;nocache={$smarty.now}'>
           {if $LSsearch->sortBy == 'subDn'}
             <strong>{$LSsearch->label_level|escape:"htmlall"}</strong>
             <img src='{img name=$LSsearch->sortDirection}' class='LSobject-list-ordersense' alt='{$LSsearch->sortDirection}'/>
@@ -74,7 +74,7 @@
         {foreach from=$LSsearch->visibleExtraDisplayedColumns item=conf key=cid}
         <th class='LSobject-list'{if $conf.cssStyle} style='{$conf.cssStyle|escape:"htmlall"}'{/if}>
         {if $LSsearch->sort}
-          <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;sortBy={$cid|escape:"url"}&amp;nocache={$smarty.now}'>
+          <a href='object/{$LSsearch->LSobject|escape:"url"}?sortBy={$cid|escape:"url"}&amp;nocache={$smarty.now}'>
           {if $LSsearch->sortBy == $cid}
             <strong>{tr msg=$conf.label|escape:"htmlall"}</strong>
             <img src='{img name=$LSsearch->sortDirection}' class='LSobject-list-ordersense' alt='{$LSsearch->sortDirection}'/>
@@ -92,7 +92,7 @@
     </tr>
     {foreach from=$page.list item=object}
     <tr class='{cycle values="LSobject-list,LSobject-list LSobject-list-bis"}'>
-        <td class='LSobject-list LSobject-list-names'><a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;dn={$object->dn|escape:'url'}'  class='LSobject-list'>{$object->displayName|escape:"htmlall"}</a> </td>
+        <td class='LSobject-list LSobject-list-names'><a href='object/{$LSsearch->LSobject|escape:"url"}/{$object->dn|escape:'url'}'  class='LSobject-list'>{$object->displayName|escape:"htmlall"}</a> </td>
         {if $LSsearch->displaySubDn}<td class='LSobject-list'>{$object->subDn|escape:"htmlall"}</td>{/if}
         {if $LSsearch->extraDisplayedColumns}
           {foreach from=$LSsearch->visibleExtraDisplayedColumns item=conf key=cid}
@@ -110,7 +110,7 @@
         <td colspan='{if $LSsearch->extraDisplayedColumns}{count($LSsearch->visibleExtraDisplayedColumns)+3}{else}3{/if}' class='LSobject-list-without-result'>
           {$LSsearch->label_no_result|escape:"htmlall"}
         </td>
-      </tr>   
+      </tr>
     {/foreach}
 </table>
 
@@ -120,9 +120,9 @@
     {tr msg='Nb / page :'}
     {foreach from=$LSsearch->getParam('nbObjectsByPageChoices') item=choice}
       {if $LSsearch->getParam('nbObjectsByPage') == $choice}
-        <strong><a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;nbObjectsByPage={$choice}'  class='LSobject-list-nb-by-page'>{$choice}</a></strong>
+        <strong><a href='object/{$LSsearch->LSobject|escape:"url"}?nbObjectsByPage={$choice}'  class='LSobject-list-nb-by-page'>{$choice}</a></strong>
       {else}
-        <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;nbObjectsByPage={$choice}'  class='LSobject-list-nb-by-page'>{$choice}</a>
+        <a href='object/{$LSsearch->LSobject|escape:"url"}?nbObjectsByPage={$choice}'  class='LSobject-list-nb-by-page'>{$choice}</a>
       {/if}
     {/foreach}
   </p>
@@ -130,7 +130,7 @@
 
 {if $page.nbPages > 1}
   <p class='LSobject-list-page'>
-    
+
   {if $page.nbPages > 10}
     {if $page.nb > 5}
       {if $page.nb > $page.nbPages-6}
@@ -141,21 +141,21 @@
     {else}
       {assign var=start value=0}
     {/if}
-    <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;page=0' class='LSobject-list-page'>&lt;</a>
+    <a href='object/{$LSsearch->LSobject|escape:"url"}?page=0' class='LSobject-list-page'>&lt;</a>
     {foreach from=0|range:10 item=i}
       {if $page.nb==$start+$i}
-        <strong class='LSobject-list-page'>{$page.nb+1}</strong> 
+        <strong class='LSobject-list-page'>{$page.nb+1}</strong>
       {else}
-        <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;page={$i+$start}'  class='LSobject-list-page'>{$i+$start+1}</a>
+        <a href='object/{$LSsearch->LSobject|escape:"url"}?page={$i+$start}'  class='LSobject-list-page'>{$i+$start+1}</a>
       {/if}
     {/foreach}
-    <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;page={$page.nbPages-1}' class='LSobject-list-page'>&gt;</a>
+    <a href='object/{$LSsearch->LSobject|escape:"url"}?page={$page.nbPages-1}' class='LSobject-list-page'>&gt;</a>
   {else}
     {section name=listpage loop=$page.nbPages step=1}
       {if $page.nb == $smarty.section.listpage.index}
-        <strong class='LSobject-list-page'>{$page.nb+1}</strong> 
+        <strong class='LSobject-list-page'>{$page.nb+1}</strong>
       {else}
-        <a href='view.php?LSobject={$LSsearch->LSobject|escape:"url"}&amp;page={$smarty.section.listpage.index}'  class='LSobject-list-page'>{$smarty.section.listpage.index+1}</a>
+        <a href='object/{$LSsearch->LSobject|escape:"url"}?page={$smarty.section.listpage.index}'  class='LSobject-list-page'>{$smarty.section.listpage.index+1}</a>
       {/if}
     {/section}
   {/if}

public_html/view.php

@@ -1,226 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (C) 2007 Easter-eggs
- * http://ldapsaisie.labs.libre-entreprise.org
- *
- * Author: See AUTHORS file in top-level directory.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-******************************************************************************/
-
-require_once 'core.php';
-
-if(LSsession :: startLSsession()) {
-  if (isset($_REQUEST['LSobject'])) {
-    $LSobject = $_REQUEST['LSobject'];
-    if ( $LSobject == 'SELF' ) {
-      $LSobject = LSsession :: getLSuserObject() -> getType();
-      $dn = LSsession :: getLSuserObjectDn();
-    }
-    else {
-      $dn = isset($_REQUEST['dn'])?urldecode($_REQUEST['dn']):null;
-    }
-
-    if (LSsession :: in_menu($LSobject) || LSsession :: canAccess($LSobject,$dn)) {
-
-      if ( LSsession :: loadLSobject($LSobject) ) {
-        // Affichage d'un objet
-        if ( $dn!='' ) {
-          if (LSsession :: canAccess($LSobject,$dn)) {
-            if ( LSsession :: canEdit($LSobject,$dn) ) {
-              $LSview_actions[] = array(
-                'label' => _('Modify'),
-                'url' =>'modify.php?LSobject='.$LSobject.'&amp;dn='.urlencode($dn),
-                'action' => 'modify'
-              );
-            }
-
-            if (LSsession :: canCreate($LSobject)) {
-              $LSview_actions[] = array(
-                'label' => _('Copy'),
-                'url' =>'create.php?LSobject='.$LSobject.'&amp;load='.urlencode($dn),
-                'action' => 'copy'
-              );
-            }
-
-            if (LSsession :: canRemove($LSobject,$dn)) {
-              $LSview_actions[] = array(
-                'label' => _('Delete'),
-                'url' => 'remove.php?LSobject='.$LSobject.'&amp;dn='.urlencode($dn),
-                'action' => 'delete'
-              );
-            }
-
-            // Custum Actions
-            $customActionsConfig = LSconfig :: get('LSobjects.'.$LSobject.'.customActions');
-            if (is_array($customActionsConfig)) {
-              foreach($customActionsConfig as $name => $config) {
-                if (LSsession :: canExecuteCustomAction($dn,$LSobject,$name)) {
-                  $LSview_actions[] = array (
-                    'label' => ((isset($config['label']))?__($config['label']):__($name)),
-                    'hideLabel' => ((isset($config['hideLabel']))?$config['hideLabel']:False),
-                    'helpInfo' => ((isset($config['helpInfo']))?__($config['helpInfo']):False),
-                    'url' => 'custom_action.php?LSobject='.$LSobject.'&amp;dn='.urlencode($dn).'&amp;customAction='.$name,
-                    'action' => ((isset($config['icon']))?$config['icon']:'generate'),
-                    'class' => 'LScustomActions'.(($config['noConfirmation'])?' LScustomActions_noConfirmation':'')
-                  );
-                }
-              }
-            }
-
-            if (LSsession :: getLSuserObjectDn() != $dn) {
-              $object = new $LSobject();
-              $object -> loadData($dn);
-              LStemplate :: assign('pagetitle',$object -> getDisplayName());
-            }
-            else {
-              $object = LSsession :: getLSuserObject();
-              LStemplate :: assign('pagetitle',_('My account'));
-            }
-
-            LStemplate :: assign('LSldapObject',$object);
-
-            $view = $object -> getView();
-            $view -> displayView();
-
-            // LSrelations
-            if (LSsession :: loadLSclass('LSrelation')) {
-              LSrelation :: displayInLSview($object);
-            }
-
-            LStemplate :: assign('LSview_actions',$LSview_actions);
-            LSsession :: setTemplate('view.tpl');
-          }
-          else {
-            LSerror :: addErrorCode('LSsession_11');
-          }
-        }
-        // Affichage d'une liste d'un type d'objet
-        elseif (LSsession :: loadLSclass('LSsearch')) {
-          $object = new $LSobject();
-          LStemplate :: assign('pagetitle',$object -> getLabel());
-
-          $LSsearch = new LSsearch($LSobject, 'LSview', null, (isset($_REQUEST['reset'])));
-          $LSsearch -> setParam('extraDisplayedColumns',True);
-          $LSsearch -> setParamsFormPostData();
-
-          $searchForm = array (
-            'action' => $_SERVER['PHP_SELF'],
-            'recursive' => (! LSsession :: isSubDnLSobject($LSobject) && LSsession :: subDnIsEnabled() ),
-            'labels' => array (
-              'submit' => _('Search'),
-              'approx' => _('Approximative search'),
-              'recursive' => _('Recursive search')
-            ),
-            'values' => array (
-              'pattern' => $LSsearch->getParam('pattern'),
-              'approx' => $LSsearch->getParam('approx'),
-              'recursive' => $LSsearch->getParam('recursive')
-            ),
-            'names' => array (
-              'submit' => 'LSsearch_submit'
-            ),
-            'hiddenFields' => $LSsearch -> getHiddenFieldForm(),
-            'predefinedFilter' => $LSsearch->getParam('predefinedFilter')
-          );
-          LStemplate :: assign('searchForm',$searchForm);
-
-          $LSview_actions=array();
-          if(LSsession :: canCreate($LSobject)) {
-            $LSview_actions['create'] = array (
-              'label' => _('New'),
-              'url' => 'create.php?LSobject='.$LSobject,
-              'action' => 'create'
-            );
-            if ($object -> listValidIOformats()) {
-              $LSview_actions['import'] = array (
-                'label' => _('Import'),
-                'url' => 'import.php?LSobject='.$LSobject,
-                'action' => 'import'
-              );
-            }
-          }
-          $LSview_actions['refresh'] = array (
-            'label' => _('Refresh'),
-            'url' => 'view.php?LSobject='.$LSobject.'&amp;refresh',
-            'action' => 'refresh'
-          );
-          $LSview_actions['reset'] = array (
-            'label' => _('Reset'),
-            'url' => 'view.php?LSobject='.$LSobject.'&amp;reset',
-            'action' => 'reset'
-          );
-          /*$LSview_actions['purge'] = array (
-            'label' => 'Purge the cache',
-            'url' => 'view.php?LSobject='.$LSobject.'&amp;LSsearchPurgeSession',
-            'action' => 'delete'
-          );*/
-
-          // Custum Actions
-          $customActionsConfig = LSconfig :: get('LSobjects.'.$LSobject.'.LSsearch.customActions');
-          if (is_array($customActionsConfig)) {
-            foreach($customActionsConfig as $name => $config) {
-              if (LSsession :: canExecuteLSsearchCustomAction($LSsearch,$name)) {
-                $LSview_actions[] = array (
-                  'label' => ((isset($config['label']))?__($config['label']):__($name)),
-                  'hideLabel' => ((isset($config['hideLabel']))?$config['hideLabel']:False),
-                  'helpInfo' => ((isset($config['helpInfo']))?__($config['helpInfo']):False),
-                  'url' => 'custom_search_action.php?LSobject='.$LSobject.'&amp;customAction='.$name,
-                  'action' => ((isset($config['icon']))?$config['icon']:'generate'),
-                  'class' => 'LScustomActions'.(($config['noConfirmation'])?' LScustomActions_noConfirmation':'')
-                );
-              }
-            }
-          }
-
-          LStemplate :: assign('LSview_actions',$LSview_actions);
-
-          $LSsearch -> run();
-
-          $LSsearch -> redirectWhenOnlyOneResult();
-
-          $page=(isset($_REQUEST['page'])?(int)$_REQUEST['page']:0);
-          $page = $LSsearch -> getPage($page);
-          LStemplate :: assign('page',$page);
-          LStemplate :: assign('LSsearch',$LSsearch);
-
-          if (LSsession :: loadLSclass('LSform')) {
-            LSform :: loadDependenciesDisplayView();
-          }
-
-          LSsession :: setTemplate('viewSearch.tpl');
-        }
-        else {
-          LSsession :: addErrorCode('LSsession_05','LSsearch');
-        }
-      }
-    }
-    else {
-      LSerror :: addErrorCode('LSsession_11');
-    }
-  }
-  else {
-    LSerror :: addErrorCode('LSsession_12');
-  }
-}
-else {
-  LSsession :: setTemplate('login.tpl');
-}
-// Affichage des retours d'erreurs
-LSsession :: displayTemplate();
-
-if (isset($LSsearch)) {
-  $LSsearch->afterUsingResult();
-}