Applied in_array strict patches from trunk

[gosa.git] / gosa-core / plugins / personal / posix / trustModeDialog / class_trustModeDialog.inc

diff --git a/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc b/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
index 61703b126836d6f664c936e568544dc95e2e5238..9098913142a0583533a1f97e7f87f90e6c49ac6c 100644 (file)
--- a/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
+++ b/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
@@ -37,12 +37,13 @@ class trustModeDialog extends plugin
 
         $this->trustList = new sortableListing($this->accessTo, $lData);
         $this->trustList->setDeleteable(true);
+        $this->trustList->setInstantDelete(true);
         $this->trustList->setEditable(false);
         $this->trustList->setWidth("100%");
         $this->trustList->setHeight("100px");
         $this->trustList->setColspecs(array('20px','*'));
-        
-        $this->trustList->setDefaultSortColumn(0);
+        $this->trustList->setHeader(array("~",_("Name"),_("Description")));
+        $this->trustList->setDefaultSortColumn(1);
 
     }
 
@@ -77,11 +78,11 @@ class trustModeDialog extends plugin
         if($ldap->count() != 0){
             $attrs = $ldap->fetch();
             $img = $desc = "";
-            if(in_array("gotoWorkstation",$attrs['objectClass'])){
+            if(in_array_strict("gotoWorkstation",$attrs['objectClass'])){
                 $img = image('plugins/systems/images/select_workstation.png'); 
-            }elseif(in_array("gotoTerminal",$attrs['objectClass'])){
+            }elseif(in_array_strict("gotoTerminal",$attrs['objectClass'])){
                 $img = image('plugins/systems/images/select_terminal.png'); 
-            }elseif(in_array("goServer",$attrs['objectClass'])){
+            }elseif(in_array_strict("goServer",$attrs['objectClass'])){
                 $img = image('plugins/systems/images/select_server.png'); 
             }
             if(isset($attrs['description'][0])) {
@@ -178,10 +179,10 @@ class trustModeDialog extends plugin
         else
             $smarty->assign("emptyArrAccess",false);
 
-        $smarty->assign("accessTo",$this->accessTo);
 
-        $smarty->assign($smarty->assign("use_trustmode",in_array("trustmode", $this->multi_boxes)));
+        $smarty->assign($smarty->assign("use_trustmode",in_array_strict("trustmode", $this->multi_boxes)));
         $smarty->assign("multiple_support" , $this->multiple_support_active);
+#        $this->trustList->update();
         $smarty->assign("trustList", $this->trustList->render());
         return($smarty->fetch(get_template_path("generic.tpl",TRUE, dirname(__FILE__))));
     }
@@ -211,7 +212,7 @@ class trustModeDialog extends plugin
     public function save()
     {
         plugin::save();
-        
+ 
         /* Trust accounts */
         $objectclasses= array();
         foreach ($this->attrs['objectClass'] as $key => $class){
@@ -257,7 +258,7 @@ class trustModeDialog extends plugin
     public function get_multi_edit_values()
     {
         $ret = plugin::get_multi_edit_values();
-        if(in_array("trustmode",$this->multi_boxes)){
+        if(in_array_strict("trustmode",$this->multi_boxes)){
             $ret['trustModel'] = $this->trustModel;
             $ret['accessTo'] = $this->accessTo;
         }