From 20df9934821599488d36e6f33a08d2fe88282e6c Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 16 Mar 2010 13:01:54 +0000
Subject: [PATCH] Fixed group selection

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16629 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../groupSelect/class_filterLDAPBlacklist.inc | 46 ++++++++--------
 .../posix/groupSelect/class_groupSelect.inc   | 10 ++--
 .../posix/groupSelect/group-filter.tpl        | 34 ------------
 .../posix/groupSelect/group-filter.xml        | 55 ++++---------------
 .../personal/posix/groupSelect/group-list.tpl | 53 +++++++++---------
 .../personal/posix/groupSelect/group-list.xml | 19 ++++---
 6 files changed, 74 insertions(+), 143 deletions(-)
 delete mode 100644 gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl

diff --git a/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc b/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
index a465d0916..b78f2b287 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
+++ b/gosa-core/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
@@ -2,30 +2,30 @@
 
 class filterLDAPBlacklist {
 
-static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
-{
-$result = filterLDAP::query($base, $scope, $filter, $attributes, $category, $objectStorage);
-return(filterLDAPBlacklist::filterByBlacklist($result));
-}
+  static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
+  {
+    $result = filterLDAP::query($base, $scope, $filter, $attributes, $category, $objectStorage);
+    return(filterLDAPBlacklist::filterByBlacklist($result));
+  }
 
-static function filterByBlacklist($entries)
-{
-if(session::is_set('filterBlacklist')){
-$blist = session::get('filterBlacklist');
-foreach($blist as $attr_name => $attr_values){
-foreach($attr_values as $match){
-foreach($entries as $id => $entry){
-if(isset($entry[$attr_name])){
-$test = $entry[$attr_name];
-if(!is_array($test)) $test = array($test);
-if(in_array($match, $test)) unset($entries[$id]);
-}
-}
-}
-}
-}
-return(array_values($entries));
-}
+  static function filterByBlacklist($entries)
+  {
+    if(session::is_set('filterBlacklist')){
+      $blist = session::get('filterBlacklist');
+      foreach($blist as $attr_name => $attr_values){
+        foreach($attr_values as $match){
+          foreach($entries as $id => $entry){
+            if(isset($entry[$attr_name])){
+              $test = $entry[$attr_name];
+              if(!is_array($test)) $test = array($test);
+              if(in_array($match, $test)) unset($entries[$id]);
+            }
+          }
+        }
+      }
+    }
+    return(array_values($entries));
+  }
 }
 
 ?>
diff --git a/gosa-core/plugins/personal/posix/groupSelect/class_groupSelect.inc b/gosa-core/plugins/personal/posix/groupSelect/class_groupSelect.inc
index 2c98adada..b681d00a6 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/class_groupSelect.inc
+++ b/gosa-core/plugins/personal/posix/groupSelect/class_groupSelect.inc
@@ -33,13 +33,13 @@ class groupSelect extends management
 
     $this->storagePoints = array(get_ou("groupRDN"));
 
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")){
-      $filter= session::global_get(get_class($this)."_filter");
-    } else {
+#    // Build filter
+ #   if (session::global_is_set(get_class($this)."_filter")){
+  #    $filter= session::global_get(get_class($this)."_filter");
+   # } else {
       $filter = new filter(get_template_path("group-filter.xml", true, dirname(__FILE__)));
       $filter->setObjectStorage($this->storagePoints);
-    }
+    #}
     $this->setFilter($filter);
 
     // Build headpage
diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl b/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl
deleted file mode 100644
index 43c1d5d23..000000000
--- a/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
- {image path="images/launch.png" align="right"}{t}Filter{/t}
- </p>
-</div>
-
-<div class="contentboxb">
- 
- <div style="border-top:1px solid #AAAAAA"></div>
- 
- {$PRIMARY}&nbsp;<label for='TEMPLATES'>{t}Show primary groups{/t}</label><br>
- {$SAMBA}&nbsp;<label for='TEMPLATES'>{t}Show samba groups{/t}</label><br>
- {$MAIL}&nbsp;<label for='TEMPLATES'>{t}Show mail groups{/t}</label><br>
- 
- {$SCOPE}
- 
- <table summary='{t}Filter options{/t}' style="width:100%;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td>
-    <label for="NAME">
-    {image path="images/lists/search.png"}&nbsp;Name
-    </label>
-   </td>
-   <td>
-    {$NAME}
-   </td>
-  </tr>
-  <tr>
-   <td width="100%" align="right" colspan="2" style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
-    {$APPLY}
-   </td>
-  </tr>
- </table>
-</div>
diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-filter.xml b/gosa-core/plugins/personal/posix/groupSelect/group-filter.xml
index f44ca2458..a3e6aa917 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/group-filter.xml
+++ b/gosa-core/plugins/personal/posix/groupSelect/group-filter.xml
@@ -2,62 +2,27 @@
 <filterdef>
   <definition>
     <category>groups</category>
-    <template>../plugins/personal/posix/groupSelect/group-filter.tpl</template>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>cn</attribute>
+    <attribute>description</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA))</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;(objectClass=posixGroup)(cn=$))</filter>
     </query>
-    <scope>auto</scope>
-  </search>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PRIMARY</tag>
-    <default>true</default>
-    <unset/>
-    <set>(!(objectClass=gosaObject))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>MAIL</tag>
-    <default>true</default>
-    <unset/>
-    <set>(objectClass=gosaMailAccount)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SAMBA</tag>
-    <default>true</default>
-    <unset/>
-    <set>(objectClass=sambaGroupMapping)</set>
-  </element>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default/>
-    <unset/>
-    <set>(|(cn=*$*)(description=*$*))</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
+  </search>
 
 </filterdef>
diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
index 559505303..af0f2c69f 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
+++ b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
@@ -1,36 +1,33 @@
-<table summary="{t}Group selection{/t}"
-  style="width:100%;height:100%" cellpadding=2>
- <tr>
-  <td style="width:100%;">
-   <div class="contentboxh">
-    <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-   </div>
-   
-   <div class="contentboxb">
-    <div style='background:white;padding:3px;'>
-     <table><tr>
-       <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{image path="images/rocket.png"}
-       </td><td> {$ACTIONS}</td>
-     </tr></table>
-    </div>
-   </div>
-   
-   <div style='height:4px;'>
+<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
+
+<div id="mainlist">
+
+  <div class="mainlist-header">
+   <p>{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
+   <div class="mainlist-nav">
+    <table>
+     <tr>
+      <td>{$ROOT}</td>
+      <td>{$BACK}</td>
+      <td>{$HOME}</td>
+      <td>{$RELOAD}</td>
+      <td class="left-border">{t}Base{/t} {$BASE}</td>
+      <td class="left-border">{$ACTIONS}</td>
+      <td class="left-border">{$FILTER}</td>
+     </tr>
+    </table>
    </div>
-   {$LIST}
-  </td>
-  <td style='min-width:250px'>
-   {$FILTER}
-  </td>
- </tr>
-</table>
+  </div>
 
-<input type="hidden" value="1" name="PosixGroupDialogPosted">
+  {$LIST}
+</div>
+
+<input type="hidden" name="ignore">
 
 <br>
 <div class="plugin-actions">
-<button type='submit' name='add_groups_finish'>{msgPool type=addButton}</button>
-<button type='submit' name='add_groups_cancel'>{msgPool type=cancelButton}</button>
+  <button type='submit' name='add_groups_finish'>{msgPool type=addButton}</button>
+  <button type='submit' name='add_groups_cancel'>{msgPool type=cancelButton}</button>
 </div>
 
 
diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-list.xml b/gosa-core/plugins/personal/posix/groupSelect/group-list.xml
index 9714ced2f..8703cbc37 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/group-list.xml
+++ b/gosa-core/plugins/personal/posix/groupSelect/group-list.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <list>
   <definition>
-    <departmentbrowser>true</departmentbrowser>
-    <departmentrootvisible>false</departmentrootvisible>
-    <basemode>true</basemode>
-    <multiselect>true</multiselect>
+    <departmentBrowser>true</departmentBrowser>
+    <departmentRootVisible>false</departmentRootVisible>
+    <baseMode>true</baseMode>
+    <multiSelect>true</multiSelect>
     <template>../plugins/personal/posix/groupSelect/group-list.tpl</template>
     <module>groups</module>
     <label>Please select the desired entries</label>
-    <defaultsortcolumn>1</defaultsortcolumn>
-    <objecttype>
+    <defaultSortColumn>1</defaultSortColumn>
+
+    <objectType>
       <label>Group</label>
-      <objectclass>posixGroup</objectclass>
+      <objectClass>posixGroup</objectClass>
       <category>groups</category>
       <class>group</class>
       <image>plugins/groups/images/select_group.png</image>
-    </objecttype>
+    </objectType>
+
   </definition>
 
   <table>
-- 
2.30.2