- LSformElement_text : Mise en compatibilité avec les nouvelles fonctionalités

de la fonction getFData()

trunk/conf/LSobjects/config.LSobjects.LSeepeople.php

@@ -27,6 +27,7 @@ $GLOBALS['LSobjects']['LSeepeople'] = array (
     'posixAccount',
     'sambaSamAccount',
   ),
+  'orderby' => 'displayValue',  // Valeurs possibles : 'displayValue' ou 'subDn'
   'rdn' => 'uid',
   'container_dn' => 'ou=people',
   'container_auto_create' => array(
@@ -66,6 +67,12 @@ $GLOBALS['LSobjects']['LSeepeople'] = array (
       'label' => _('Identifiant'),
       'ldap_type' => 'ascii',
       'html_type' => 'text',
+      'html_options' => array(
+        'generate_value_format' => '%{givenName:1}.%{sn}',
+        'withoutAccent' => 1,
+        'replaceSpaces' => '.',
+        'lowerCase' => 1
+      ),
       'required' => 1,
       'check_data' => array (
         'alphanumeric' => array(
@@ -340,7 +347,13 @@ $GLOBALS['LSobjects']['LSeepeople'] = array (
         'generationTool' => true,
         'autoGenerate' => false,
         'chars' => 'abcdefgh',
-        'lenght' => 5
+        'lenght' => 5,
+        'mail' => array(
+          'send' => 1,
+          'ask' => 1,
+          'subject' => "LSexample : votre nouveau mot de passe",
+          'msg' => "Votre mot de passe vient d'être modifié.\nNouveau mot de passe : %{mdp}"
+        )
       ),
       'required' => 1,
       'rights' => array(

trunk/includes/class/class.LSformElement_password.php

@@ -35,6 +35,8 @@ class LSformElement_password extends LSformElement {
   var $fieldTemplate = 'LSformElement_password_field.tpl';
   var $template = 'LSformElement_password.tpl';
   
+  var $sendMail = false;
+
   /**
    * Recupère la valeur de l'élement passée en POST
    *
@@ -56,6 +58,16 @@ class LSformElement_password extends LSformElement {
         $this -> form -> _notUpdate[$this -> name] == true;
         return true;
       }
+      
+      //Mail
+      if (isset($_POST['LSformElement_password_'.$this -> name.'_send'])) {
+        if ($_POST['LSformElement_password_'.$this -> name.'_send']==1) {
+          $this -> sendMail = true;
+        }
+      }
+      else if ($this -> params['html_options']['mail']['send']==1) {
+        $this -> sendMail = true;
+      }
     }
     return $retval;
   }
@@ -80,6 +92,9 @@ class LSformElement_password extends LSformElement {
         'generate' => ($this -> params['html_options']['generationTool']==True),
         'verify' => (!$this -> attr_html -> attribute -> ldapObject-> isNew())
       );
+      if (isset($this -> params['html_options']['mail'])) {
+        $params['mail'] = $this -> params['html_options']['mail'];
+      }
       $GLOBALS['LSsession'] -> addJSconfigParam($this -> name,$params);
       
       $GLOBALS['LSsession'] -> addJSscript('LSformElement_password_field.js');

trunk/includes/js/LSformElement_password_field.js

@@ -8,6 +8,30 @@ var LSformElement_password_field = new Class({
     },
     
     initialiseLSformElement_password_field: function() {
+      // Mail
+      if (this.params['mail']) {
+        if (this.params.mail['ask']) {
+          this.mailBtn = new Element('img');
+          this.mailBtn.addClass('btn');
+          this.mailBtn.addEvent('click',this.onMailBtnClick.bind(this));
+          this.mailInput = new Element('input');
+          this.mailInput.setProperties({
+            name: 'LSformElement_password_' + this.name + '_send',
+            type: 'hidden'
+          });
+          if (this.params.mail['send']) {
+            this.mailInput.value = 1;
+            this.mailBtn.src = varLSdefault.imagePath('nomail.png');
+          }  
+          else {
+            this.mailInput.value = 0;
+            this.mailBtn.src = varLSdefault.imagePath('mail.png');
+          }
+          this.mailBtn.injectAfter(this.input);
+          this.mailInput.injectAfter(this.mailBtn);
+        }
+      }
+      
       // ViewBtn
       this.viewBtn = new Element('img');
       this.viewBtn.src = varLSdefault.imagePath('view.png');
@@ -44,6 +68,17 @@ var LSformElement_password_field = new Class({
       }
     },
     
+    onMailBtnClick: function() {
+      if (this.mailInput.value==1) {
+        this.mailInput.value = 0;
+        this.mailBtn.src = varLSdefault.imagePath('mail.png');
+      }
+      else {
+        this.mailInput.value = 1;
+        this.mailBtn.src = varLSdefault.imagePath('nomail.png');
+      }
+    },
+    
     onGenerateBtnClick: function() {
       var data = {
         template:   'LSform',

trunk/includes/js/LSformElement_text.js

@@ -35,12 +35,12 @@ var LSformElement_text = new Class({
     getDependsFields: function(format) {
       var retval=new Array();
       var find = 1;
-      var getMotif =  new RegExp('%\{([A-Za-z0-9]+)\}');
+      var getMotif =  new RegExp('%\{(([A-Za-z0-9]+)(\:(-?[0-9])+)?(\:(-?[0-9])+)?)\}');
       var ch = null;
       while (find) {
         ch = getMotif.exec(format);
         if ($type(ch)) {
-          retval.include(ch[1]);
+          retval.include(ch[2]);
           format=format.replace (
                   new RegExp('%\{'+ch[1]+'\}'),
                   ''