From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 8 Aug 2006 05:14:13 +0000 (+0000)
Subject: Fixed win workstation acls.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f7dd694fcfb8dae77215fe0d6b02443c53b74ae2;p=gosa.git

Fixed win workstation acls.
Fixed samba acl handling


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

diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index fb557fdf5..01fbbef1a 100644
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -227,6 +227,26 @@ class wingeneric extends plugin
     $this->postcreate();
   }
 
+  /* Return plugin informations for acl handling
+  #FIXME FAIscript seams to ununsed within this class... */
+  function plInfo()
+  {
+    return (array(
+          "plShortName"   => _("Win generic"),
+          "plDescription" => _("Windows workstation generic"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("administration"),
+          "plCategory"    => array("winworkstation" => array("description"  => _("Win workstation"),
+                                                          "objectClass"  => "gotoWorkstation")),
+          "plProvidedAcls"=> array(
+            "cn"                  => _("Workstation name"),
+            "description"         => _("Description"))
+          ));
+  }
+
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index edc286e0e..c9c48a1ee 100644
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -328,7 +328,8 @@ class sambaAccount extends plugin
       }
       $regex= $sambafilter['regex'];
       $filter= "(&(objectClass=sambaSAMAccount)$exclude(uid=*$)(|(uid=$regex)(cn=$regex)))";
-      $res= get_list($filter, "workstation", $sambafilter['depselect'], array("uid"), GL_SUBSEARCH | GL_SIZELIMIT);
+      $res= get_list($filter, "winworkstation", $sambafilter['depselect'], array("uid"), GL_SUBSEARCH | GL_SIZELIMIT);
+        
       $wslist= array();
       foreach ($res as $attrs){
         $wslist[]= preg_replace('/\$/', '', $attrs['uid'][0]);
diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc
index a9ede299b..6d5a630f9 100644
--- a/plugins/personal/samba/main.inc
+++ b/plugins/personal/samba/main.inc
@@ -87,7 +87,7 @@ if (!$remove_lock){
   }
 
   $info= "";
-  if ($sambaAccount->is_account){
+  if (($sambaAccount->is_account) && (!$sambaAccount->show_ws_dialog)){
     $display.= "<p class=\"plugbottom\">";
 
     /* Are we in edit mode? */