Fixes: #2859 Added comment modifier, force uid unicity

include/class_plugin.inc

@@ -565,6 +565,8 @@ class plugin
     mb_internal_encoding('UTF-8');
     mb_regex_encoding('UTF-8');
     switch($m) {
+      case 'c': // comment
+        return array('');
       case 'u': // uppercase
         return array(mb_strtoupper($str, 'UTF-8'));
       case 'l': // lowercase

plugins/personal/generic/class_user.inc

@@ -1250,16 +1250,16 @@ class user extends plugin
       $message[]= msgPool::check_base();;
     }
 
-    if (!$this->is_template){
-      /* UID already used? */
-      $ldap= $this->config->get_ldap_link();
-      $ldap->cd($this->config->current['BASE']);
-      $ldap->search("(uid=$this->uid)", array("uid"));
-      $ldap->fetch();
-      if ($ldap->count() != 0 && $this->dn == 'new'){
-        $message[]= msgPool::duplicated(_("Login"));
-      }
+    /* UID already used? */
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($this->config->current['BASE']);
+    $ldap->search("(uid=$this->uid)", array("uid"));
+    $ldap->fetch();
+    if ($ldap->count() != 0 && $this->dn == 'new') {
+      $message[] = msgPool::duplicated(_("Login"));
+    }
 
+    if (!$this->is_template){
       if ($this->givenName == ""){
         $message[]= msgPool::required(_("Given name"));
       }