Fixed baseSelectDialog parameters

[gosa.git] / plugins / personal / generic / class_user.inc

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index e7872c67f801757e6b5647242b75595ef37b5f53..ec56ed885bf14dc326de4d57bcc74ce677f5445f 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -257,7 +257,9 @@ class user extends plugin
     $smarty->assign("gender_list", $sex);
 
     /* Assign prefered langage */
-    $language= array(0 => " ", "fr_FR" => ("fr_FR"), "en_EN" => ("en_EN"), "de_DE" => ("de_DE"), "it_IT" => ("it_IT"), "nl_NL" => ("nl_NL"));
+    $language= array(0 => " ", "fr_FR" => ("fr_FR"), "en_EN" => ("en_EN"), 
+                                    "de_DE" => ("de_DE"), "it_IT" => ("it_IT"), 
+                                    "nl_NL" => ("nl_NL"), "ru_RU" => ("ru_RU"));
     $smarty->assign("preferredLanguage_list", $language);
 
     /* Get random number for pictures */
@@ -276,7 +278,7 @@ class user extends plugin
     foreach($_POST as $name => $value){
       if(preg_match("/^chooseBase/",$name) && $once){
         $once = false;
-        $this->dialog = new baseSelectDialog($this->config,$this->allowedBasesToMoveTo());
+        $this->dialog = new baseSelectDialog($this->config,$this,$this->allowedBasesToMoveTo());
         $this->dialog->setCurrentBase($this->base);
       }
     }
@@ -479,7 +481,7 @@ class user extends plugin
       $this->pw_storage= $this->config->current['HASH'];
     }
 
-    $temp   = passwordMethod::get_available_methods();
+    $temp   = @passwordMethod::get_available_methods();
     $hashes = $temp['name'];
     
     $smarty->assign("pwmode", $hashes);
@@ -541,6 +543,7 @@ class user extends plugin
   {
     $ldap= $this->config->get_ldap_link();
     $ldap->rmdir ($this->dn);
+    show_ldap_error($ldap->get_error(), _("Removing generic user account failed"));
 
     /* Delete references to groups */
     $ldap->cd ($this->config->current['BASE']);
@@ -808,7 +811,7 @@ class user extends plugin
 
     /* Save data. Using 'modify' implies that the entry is already present, use 'add' for
        new entries. So do a check first... */
-    $ldap->cat ($this->dn);
+    $ldap->cat ($this->dn, array('dn'));
     if ($ldap->fetch()){
       $mode= "modify";
     } else {
@@ -829,7 +832,7 @@ class user extends plugin
     $this->cleanup();
     $ldap->cd ($this->dn);
     $ldap->$mode ($this->attrs);
-    if (show_ldap_error($ldap->get_error())){
+    if (show_ldap_error($ldap->get_error(), _("Saving generic user account failed"))){
       return (1);
     }