Removed samba2 references

[gosa.git] / gosa-core / plugins / admin / users / class_userManagement.inc

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 3099387cde0d8265ba7aa62a0726ee7bdf68b8b6..f3bb656588e81fc3f83daa842aa21eab0336e824 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -988,37 +988,37 @@ class userManagement extends plugin
     $this->DivListUsers->setEntries($this->list);
 
     # FILTER Test #################################################
-    # Build filter
-    if (!$this->filter) {
-      $this->filter = new filter(get_template_path("user-filter.xml", true));
-      $this->filter->setObjectStorage(get_people_ou());
-    }
-    $this->filter->update();
-    session::set('autocomplete', $this->filter);
-    if (!$this->filter->isValid()){
-      msg_dialog::display(_("Filter error"), _("The filter is uncomplete!"), ERROR_DIALOG);
-    }
-
-    # Build headpage
-    if (!$this->headpage){
-      $this->headpage = new listing(get_template_path("user-list.xml", true));
-      $this->headpage->registerElementFilter("accountProperties", "userManagement::filterProperties");
-      $this->headpage->registerElementFilter("lockLabel", "userManagement::filterLockLabel");
-      $this->headpage->registerElementFilter("lockImage", "userManagement::filterLockImage");
-      $this->headpage->setFilter($this->filter);
-    }
-
-    # Needs to be called before update!
-    $action= $this->headpage->getAction();
-    if ($action['action'] != '') {
-      echo "List detected action:";
-      print_a($action);
-    }
-
-    # Refresh for filter
-    $this->headpage->update();
-    
-    return($this->headpage->render());
+    ## Build filter
+    #if (!$this->filter) {
+    #  $this->filter = new filter(get_template_path("user-filter.xml", true));
+    #  $this->filter->setObjectStorage(get_people_ou());
+    #}
+    #$this->filter->update();
+    #session::set('autocomplete', $this->filter);
+    #if (!$this->filter->isValid()){
+    #  msg_dialog::display(_("Filter error"), _("The filter is uncomplete!"), ERROR_DIALOG);
+    #}
+
+    ## Build headpage
+    #if (!$this->headpage){
+    #  $this->headpage = new listing(get_template_path("user-list.xml", true));
+    #  $this->headpage->registerElementFilter("accountProperties", "userManagement::filterProperties");
+    #  $this->headpage->registerElementFilter("lockLabel", "userManagement::filterLockLabel");
+    #  $this->headpage->registerElementFilter("lockImage", "userManagement::filterLockImage");
+    #  $this->headpage->setFilter($this->filter);
+    #}
+
+    ## Needs to be called before update!
+    #$action= $this->headpage->getAction();
+    #if ($action['action'] != '') {
+    #  echo "List detected action:";
+    #  print_a($action);
+    #}
+
+    ## Refresh for filter
+    #$this->headpage->update();
+    #
+    #return($this->headpage->render());
     ################################################### FILTER Test
 
     return($this->DivListUsers->Draw());
@@ -1135,11 +1135,7 @@ class userManagement extends plugin
 
     /* Setup filter depending on selection */
     $filter="";
-    if ($this->config->get_cfg_value("sambaversion") == 3){
-      $samba= "sambaSamAccount";
-    } else {
-      $samba= "sambaAccount";
-    }
+    $samba= "sambaSamAccount";
 
     if ($ShowFunctionalUsers){
       $filter.= "(&(objectClass=gosaAccount)(!(|(objectClass=posixAccount)".