Added class selection dialog for FAIprofiles

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

diff --git a/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc b/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc
new file mode 100644 (file)
index 0000000..c5e8612
--- /dev/null
+++ b/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc
@@ -0,0 +1,62 @@
+<?php
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id: class_target_list.inc 9850 2008-03-14 14:15:12Z hickert $$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+class classSelect extends management
+{
+  // Tab definition 
+  protected $skipFooter = TRUE;
+  protected $skipHeader = TRUE;
+
+  function __construct($config,$ui)
+  {
+    $this->config = $config;
+    $this->ui = $ui;
+
+#    // 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("selectClass-filter.xml", true, dirname(__FILE__)));
+      $filter->setObjectStorage($this->storagePoints);
+    #}
+    $this->setFilter($filter);
+
+    // Build headpage
+    $headpage = new listing(get_template_path("selectClass-list.xml", true, dirname(__FILE__)));
+    $headpage->setFilter($filter);
+    parent::__construct($config, $ui, "object", $headpage);
+  }
+
+  function save()
+  {
+    $act = $this->detectPostActions();
+    $headpage = $this->getHeadpage();
+    if(!isset($act['targets'])) return(array());
+    $ret = array();
+    foreach($act['targets'] as $dn){
+      $ret[] = $headpage->getEntry($dn);
+    }
+    return($ret);
+  }
+}
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>

diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl
new file mode 100644 (file)
index 0000000..e1016c0
--- /dev/null
+++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl
@@ -0,0 +1,37 @@
+<div class="contentboxh">
+ <p class="contentboxh">
+  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+ </p>
+</div>
+
+<div class="contentboxb">
+
+<div style="border-top:1px solid #AAAAAA"></div>
+
+{$USER}&nbsp;<LABEL for='SAMBA'>{t}Show users{/t}</LABEL><br>
+{$GROUP}&nbsp;<LABEL for='POSIX'>{t}Show groups{/t}</LABEL><br>
+
+ <div style="border-top:1px solid #AAAAAA"></div>
+ {$SCOPE}
+
+ <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
+  <tr>
+   <td>
+    <label for="NAME">
+     <img src="images/lists/search.png" align=middle>&nbsp;Name
+    </label>
+   </td>
+   <td>
+    {$NAME}
+   </td>
+  </tr>
+ </table>
+
+ <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
+  <tr>
+   <td width="100%" align="right">
+    {$APPLY}
+   </td>
+  </tr>
+ </table>
+</div>

diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml
new file mode 100644 (file)
index 0000000..5dc11ee
--- /dev/null
+++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<filterdef>
+  <definition>
+    <category>users</category>
+    <template>../plugins/admin/fai/classSelect/selectClass-filter.tpl</template>
+    <initial>true</initial>
+  </definition>
+
+  <search>
+    <query>
+      <backend>LDAPBlacklist</backend>
+      <filter>(&amp;(|$USER $GROUP ) $NAME)</filter>
+      <attribute>dn</attribute>
+      <attribute>objectClass</attribute>
+      <attribute>cn</attribute>
+      <attribute>sn</attribute>
+      <attribute>uid</attribute>
+      <attribute>givenName</attribute>
+      <attribute>description</attribute>
+      <attribute>userPassword</attribute>
+    </query>
+    <scope>auto</scope>
+  </search>
+
+  <element>
+    <type>textfield</type>
+    <tag>NAME</tag>
+    <size>20</size>
+    <maxlength>60</maxlength>
+    <default></default>
+    <unset></unset>
+    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+    <alphabet>true</alphabet>
+    <autocomplete>
+      <backend>LDAPBlacklist</backend>
+      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
+  </element>
+
+  <element>
+    <type>checkbox</type>
+    <tag>USER</tag>
+    <default>true</default>
+    <set>(&amp;(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate)))</set>
+    <unset></unset>
+  </element>
+
+  <element>
+    <type>checkbox</type>
+    <tag>GROUP</tag>
+    <default>true</default>
+    <unset></unset>
+    <set>(objectClass=posixGroup)</set>
+  </element>
+
+</filterdef>

diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl
new file mode 100644 (file)
index 0000000..3043f9e
--- /dev/null
+++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl
@@ -0,0 +1,39 @@
+<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
+
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=2>
+  <tr>
+    <td style="vertical-align:top; width:50%;">
+      <div class="contentboxh">
+        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
+      </div>
+      
+      <div class="contentboxb">
+       <div style='background:white;padding:0px;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;<input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
+        </tr></table>
+       </div>
+      </div>
+      
+      <div style='height:4px;'>
+      </div>
+      
+      <input type="hidden" id="d_save" value="450">
+      <input type="hidden" id="d_space" value="760">
+      {$LIST}
+    </td>
+    <td style='vertical-align:top'>
+      {$FILTER}
+    </td>
+  </tr>
+</table>
+
+
+<p class='separator'>&nbsp;</p>
+  <p style="text-align:right">
+  <input type=submit name="classSelect_save" value="{msgPool type=okButton}">
+  &nbsp;
+  <input type=submit name="classSelect_cancel" value="{msgPool type=cancelButton}">
+</p>
+
+<input type="hidden" name="ignore">

diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.xml b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.xml
new file mode 100644 (file)
index 0000000..cf197a9
--- /dev/null
+++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<list>
+  <definition>
+    <departmentBrowser>false</departmentBrowser>
+    <departmentRootVisible>false</departmentRootVisible>
+    <baseMode>false</baseMode>
+    <multiSelect>false</multiSelect>
+    <template>../plugins/admin/fai/classSelect/selectClass-list.tpl</template>
+    <module>users</module>
+    <label>Please select the desired entries</label>
+    <defaultSortColumn>1</defaultSortColumn>
+
+    <objectType>
+      <label>User</label>
+      <objectClass>gosaAccount</objectClass>
+      <category>users</category>
+      <class>user</class>
+      <image>plugins/users/images/select_user.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Group</label>
+      <objectClass>posixGroup</objectClass>
+      <category>groups</category>
+      <class>group</class>
+      <image>plugins/groups/images/groups.png</image>
+    </objectType>
+
+  </definition>
+
+  <table>
+    <layout>|20px;c|220px||</layout>
+
+    <department>
+      <value>%{filter:objectType(dn,objectClass)}</value>
+    </department>
+
+    <department>
+      <value>%{filter:departmentLink(row,dn,description)}</value>
+      <span>1</span>
+    </department>
+
+    <column>
+      <value>%{filter:objectType(dn,objectClass)}</value>
+    </column>
+
+    <column>
+      <label>Name</label>
+      <sortAttribute>cn</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{cn}</value>
+      <export>true</export>
+    </column>
+
+    <column>
+      <label>Description</label>
+      <sortAttribute>description</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{description}</value>
+      <export>true</export>
+    </column>
+
+  </table>
+
+  <actionmenu>
+  </actionmenu>
+
+  <actiontriggers snapshot="false" copypaste="false">
+    <action>
+      <name>edit</name>
+      <type>entry</type>
+      <objectclass>gosaAccount</objectclass>
+      <image>images/lists/edit.png</image>
+      <label>Add</label>
+    </action>
+  </actiontriggers>
+</list>

diff --git a/gosa-plugins/fai/admin/fai/class_faiProfile.inc b/gosa-plugins/fai/admin/fai/class_faiProfile.inc
index 018d8c750b975abaecefd17b58ccfc1c412fbe8b..67d41d187932ce6c4ea9213c1bf83ee73c06d726 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiProfile.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiProfile.inc
@@ -23,6 +23,8 @@ class faiProfile extends plugin
   var $FAIstate      = "";
   var $view_logged      = FALSE;
 
+  var $classSelect;
+
   function faiProfile(&$config, $dn= NULL)
   {
     /* Load Attributes */
@@ -250,39 +252,30 @@ class faiProfile extends plugin
       }
 
       if($s_action == "add" && $this->acl_is_writeable("FAIclass")){
-        $this->dialog = new faiProfileEntry($this->config,$this->dn,$this->FAIclasses,$this->parent->parent->fai_release);
-        $this->is_dialog  =true;
+        $this->classSelect = new classSelect($this->config, get_userinfo());
+        $this->dialog  =true;
       }
 
       /* Save Dialog */
-      if(isset($_POST['SaveSubObject'])){
-        $this->dialog->save_object();
-        $msgs= $this->dialog->check();
-        if(count($msgs)){
-          msg_dialog::display(_("Error"), $msgs, ERROR_DIALOG);
-        }else{
-          $ret = $this->dialog->save();
-          foreach($ret as $class){
-            $this->FAIclasses[$class] =$class; 
-          }
-          $this->is_dialog=false;
-          unset($this->dialog);
-          $this->dialog=FALSE;
-          //ksort($this->FAIclasses);
+      if(isset($_POST['classSelect_save'])){
+        $list = $this->classSelect->save();
+        foreach($list as $entry){
+          $class = $entry['cn'][0];
+          $this->FAIclasses[$class] =$class; 
         }
+        $this->dialog=false;
+        $this->classSelect=FALSE;
       }
     }
 
     /* Cancel Dialog */
-    if(isset($_POST['CancelSubObject'])){
-      $this->is_dialog=false;
-      unset($this->dialog);
-      $this->dialog=FALSE;
+    if(isset($_POST['classSelect_cancel']) && $this->classSelect instanceOf classSelect){
+      $this->dialog=false;
+      $this->classSelect=FALSE;
     }
 
-    if(is_object($this->dialog)){
-      $this->dialog->save_object();
-      return($this->dialog->execute());
+    if($this->classSelect instanceOf classSelect){
+      return($this->classSelect->execute());
     }
 
     $divlist  =new divSelectBox("Profile");