X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=ab0d224943c7e6a540a8078a42dca0db7b6d3275;hb=933ecbdd14e8e3ce99ca2f57731549304dfdd7b7;hp=50029c1c27b504ec6ea12c1bfad1bf3642cf725a;hpb=ef2a636ee407633fa658e22603c8feedb534eeea;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 50029c1c2..ab0d22494 100644
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -23,7 +23,7 @@
 class userManagement extends management
 {
   var $plHeadline     = "Users";
-  var $plDescription  = "Manage users";
+  var $plDescription  = "Manage aspects of user accounts like generic, posix, samba and mail settings";
   var $plIcon  = "plugins/users/images/user.png";
 
   var $sn = "";
@@ -124,7 +124,8 @@ class userManagement extends management
 
   function editEntry($action="",$target=array(),$all=array(), $altTabClass ="", $altTabType = "", $altAclCategory="")
   {
-    management::editEntry($action,$target);
+    $str = management::editEntry($action,$target);
+    if($str) return($str);
 
     if(preg_match("/^edit_/",$action)){
       $tab = preg_replace("/^edit_/","",$action); 
@@ -227,11 +228,12 @@ class userManagement extends management
 
   function handlePasswordQueue()
   {
+    $smarty = get_smarty();
+
     // Get next entry from queue.
     if(empty($this->dn) && count($this->pwd_change_queue)){
       $this->dn = array_pop($this->pwd_change_queue);
       set_object_info($this->dn);
-      $smarty = get_smarty();
       return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
     }
 
@@ -252,7 +254,6 @@ class userManagement extends management
       // Display errors
       if (count($message) != 0){
         msg_dialog::displayChecks($message);
-        $smarty = get_smarty();
         return($smarty->fetch(get_template_path('password.tpl', TRUE)));
       }
 
@@ -293,13 +294,36 @@ class userManagement extends management
    */ 
   function saveChanges()
   {
-    management::saveChanges();
+    $str = management::saveChanges();
+  
+    if(!empty($str)) return($str);
+
+    if($this->last_tabObject instanceOf multi_plug){
+      foreach($this->last_tabObject->a_handles as $user){
+        if($user->password_change_needed()){
+          $this->force_hash_type[$user->dn] = $user->by_object['user']->pw_storage;
+          $this->pwd_change_queue[] = $user->dn;
+        }
+      }
+      return($this->handlePasswordQueue());
+    }
 
     if(isset($this->last_tabObject->by_object['user']) && $this->last_tabObject->by_object['user']->password_change_needed()){
       $this->force_hash_type[$this->last_tabObject->dn] = $this->last_tabObject->by_object['user']->pw_storage;
       $this->pwd_change_queue[] = $this->last_tabObject->dn;
       return($this->handlePasswordQueue());
-    }elseif($this->last_dn == "new"){
+    }
+  }
+
+  function cancelEdit()
+  {
+    $str = management::cancelEdit();
+    if(!empty($str)) return($str);
+
+    if(isset($this->last_tabObject->by_object['user']) && 
+        $this->last_tabObject->by_object['user']->dn != "new" &&  
+        $this->last_tabObject->by_object['user']->password_change_needed()){
+      $this->force_hash_type[$this->last_tabObject->dn] = $this->last_tabObject->by_object['user']->pw_storage;
       $this->pwd_change_queue[] = $this->last_tabObject->dn;
       return($this->handlePasswordQueue());
     }
@@ -313,7 +337,8 @@ class userManagement extends management
   function newUserFromTemplate($action="",$target=array(),$all=array())
   {
     // Call parent method, it knows whats to do, locking and so on ...
-    management::newEntry($action,$target,$all);
+    $str = management::newEntry($action,$target,$all);
+    if(!empty($str)) return($str);
 
     // Reset uid selection.
     $this->got_uid= "";
@@ -349,7 +374,8 @@ class userManagement extends management
   {
   
     // Call parent method, it manages everything, locking, object creation...
-    management::newEntry($action,$target,$all);
+    $str = management::newEntry($action,$target,$all);
+    if(!empty($str)) return($str);
     
     // If we've at least one template, then ask the user if he wants to use one?
     $templates = array();
@@ -357,7 +383,7 @@ class userManagement extends management
     $templates = array_merge($templates,$this->get_templates());
 
     // Display template selection
-    if (count($templates)){
+    if (count($templates) > 1){
       $smarty = get_smarty();
   
       // Set default variables, normally empty.
@@ -526,6 +552,7 @@ class userManagement extends management
       // Check entry locking
       foreach($target as $dn){
         if (($user= get_lock($dn)) != ""){
+          $this->dn = $dn;
           return(gen_locked_message ($user, $dn));
         }
         $this->dns[] = $dn;
@@ -574,6 +601,7 @@ class userManagement extends management
    */ 
   function lockUsers($action,$target,$all)
   {
+    if(!count($target)) return;
     if($action == "lockUsers"){
       $this->lockEntry($action,$target, $all, "lock");
     }else{
@@ -710,7 +738,7 @@ class userManagement extends management
     $label= "";
     if(isset($userPassword[0]) && preg_match("/^\{[^\}]/",$userPassword[0])){
       if(preg_match("/^[^\}]*+\}!/",$userPassword[0])){
-        $label= _("Unlock account");
+        $label= _("Unlock account")."<rowClass:entry-locked/>";
       }else{
         $label= _("Lock account");
       }
@@ -758,11 +786,9 @@ class userManagement extends management
     // Walk thru map
     foreach ($map as $oc => $properties) {
       if (in_array_ics($oc, $classes)) {
-        $result.="<input class='center' type='image' src='".$properties['image']."' ".
-                 "alt='".$properties['alt']."' title='".$properties['title'].
-                 "' name='listing_edit_".$properties['plugin']."_$row' style='padding:1px'>";
+        $result.= image($properties['image'], "listing_edit_".$properties['plugin']."_$row", $properties['title']);
       } else {
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+        $result.= image('images/empty.png');
       }
     }
     return $result;