Updated class user.inc

-Removed old style base selection - code
-Fixed sub-dialog handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@17568 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 10c4eba291c388e4c8e4d35f1fb15fad51627faf..9bf7f47c728c90edac0ca79813a05d3862d699ea 100644 (file)
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -314,7 +314,7 @@ class user extends plugin
     if(preg_match("/ editManager/i", " ".implode(array_keys($_POST),' ')." ")){
       $this->dialog = new singleUserSelect($this->config, get_userinfo());
     }
-    if($this->dialog && count($this->dialog->detectPostActions())){
+    if($this->dialog instanceOf singleUserSelect && count($this->dialog->detectPostActions())){
       $users = $this->dialog->detectPostActions();
       if(isset($users['targets']) && count($users['targets'])){
 
@@ -329,7 +329,7 @@ class user extends plugin
     if(isset($_POST['add_users_cancel'])){
       $this->dialog = NULL;
     }
-    if($this->dialog) return($this->dialog->execute()); 
+    if($this->dialog instanceOf singleUserSelect) return($this->dialog->execute()); 
 
 
     $smarty= get_smarty();
@@ -364,26 +364,6 @@ class user extends plugin
       $this->dialog= false;
     }
 
-    /* Dialog handling */
-    if(is_object($this->dialog)){
-      /* Must be called before save_object */
-      $this->dialog->save_object();
-   
-      if($this->dialog->isClosed()){
-        $this->dialog = false;
-      }elseif($this->dialog->isSelected()){
-
-        /* check if selected base is allowed to move to / create a new object */
-        $tmp = $this->get_allowed_bases();
-        if(isset($tmp[$this->dialog->isSelected()])){
-          $this->base = $this->dialog->isSelected();
-        }
-        $this->dialog= false;
-      }else{
-        return($this->dialog->execute());
-      }
-    }
-
     /* Want password method editing? */
     if ($this->acl_is_writeable("userPassword")){
       if (isset($_POST['edit_pw_method'])){