Code

Moved dialogs to their logical parent plugin
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 27 Jan 2010 09:51:57 +0000 (09:51 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 27 Jan 2010 09:51:57 +0000 (09:51 +0000)
-UserGroup select dialog to admin/groups
-System select dialog to systems/goto

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

gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc [deleted file]
gosa-plugins/sudo/admin/sudo/class_target_list_users.inc [deleted file]
gosa-plugins/sudo/admin/sudo/selectSystem-filter.tpl [deleted file]
gosa-plugins/sudo/admin/sudo/selectSystem-filter.xml [deleted file]
gosa-plugins/sudo/admin/sudo/selectSystem-list.tpl [deleted file]
gosa-plugins/sudo/admin/sudo/selectSystem-list.xml [deleted file]
gosa-plugins/sudo/admin/sudo/selectUser-filter.tpl [deleted file]
gosa-plugins/sudo/admin/sudo/selectUser-filter.xml [deleted file]
gosa-plugins/sudo/admin/sudo/selectUser-list.tpl [deleted file]
gosa-plugins/sudo/admin/sudo/selectUser-list.xml [deleted file]

diff --git a/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc b/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc
deleted file mode 100644 (file)
index 80e63c7..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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 target_list_systems extends management
-{
-  // Tab definition 
-  protected $skipFooter = TRUE;
-  protected $skipHeader = TRUE;
-
-  function __construct($config,$ui)
-  {
-    $this->config = $config;
-    $this->ui = $ui;
-    $this->storagePoints = array(get_ou("serverRDN"), get_ou("workstationRDN"), get_ou('terminalRDN'));
-
-#    // 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("selectSystem-filter.xml", true));
-      $filter->setObjectStorage($this->storagePoints);
-#    }
-    $this->setFilter($filter);
-
-    // Build headpage
-    $headpage = new listing(get_template_path("selectSystem-list.xml", true));
-    $headpage->setFilter($filter);
-    parent::__construct($config, $ui, "object", $headpage);
-  }
-
-  function save_object() {}
-
-  function execute()
-  {
-    $str = management::execute();
-    $str.= "<p class='separator'>&nbsp;</p>
-      <p style=\"text-align:right\">
-      <input type=submit name=\"SavetargetSelectDialog\" value=\"".msgPool::okButton()."\">
-      &nbsp; 
-      <input type=submit name=\"ClosetargetSelectDialog\" value=\"".msgPool::cancelButton()."\">
-      </p>";
-    return($str);
-  }
-
-  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/sudo/admin/sudo/class_target_list_users.inc b/gosa-plugins/sudo/admin/sudo/class_target_list_users.inc
deleted file mode 100644 (file)
index 4fc7981..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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 target_list_users extends management
-{
-  // Tab definition 
-  protected $skipFooter = TRUE;
-  protected $skipHeader = TRUE;
-
-  function __construct($config,$ui)
-  {
-    $this->config = $config;
-    $this->ui = $ui;
-    $this->storagePoints = array(get_ou("userRDN"), get_ou("groupRDN"));
-
-#    // 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("selectUser-filter.xml", true));
-      $filter->setObjectStorage($this->storagePoints);
-#    }
-    $this->setFilter($filter);
-
-    // Build headpage
-    $headpage = new listing(get_template_path("selectUser-list.xml", true));
-    $headpage->setFilter($filter);
-    parent::__construct($config, $ui, "object", $headpage);
-  }
-
-  function save_object() {}
-
-  function execute()
-  {
-    $str = management::execute();
-    $str.= "<p class='separator'>&nbsp;</p>
-      <p style=\"text-align:right\">
-      <input type=submit name=\"SavetargetSelectDialog\" value=\"".msgPool::okButton()."\">
-      &nbsp; 
-      <input type=submit name=\"ClosetargetSelectDialog\" value=\"".msgPool::cancelButton()."\">
-      </p>";
-    return($str);
-  }
-
-  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/sudo/admin/sudo/selectSystem-filter.tpl b/gosa-plugins/sudo/admin/sudo/selectSystem-filter.tpl
deleted file mode 100644 (file)
index 2f09c58..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<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>
-
-  {$SERVER}&nbsp;<LABEL for='SERVER'>{t}Show servers{/t}</LABEL><br>
-  {$WORKSTATION}&nbsp;<LABEL for='WORKSTATION'>{t}Show workstations{/t}</LABEL><br>
-  {$TERMINAL}&nbsp;<LABEL for='TERMINAL'>{t}Show terminals{/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/sudo/admin/sudo/selectSystem-filter.xml b/gosa-plugins/sudo/admin/sudo/selectSystem-filter.xml
deleted file mode 100644 (file)
index 6677db5..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<filterdef>
-  <definition>
-    <category>server</category>
-    <template>selectSystem-filter.tpl</template>
-    <initial>true</initial>
-  </definition>
-
-  <search>
-    <query>
-      <backend>LDAP</backend>
-      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL ) $NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</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=*$*)</set>
-    <alphabet>true</alphabet>
-    <autocomplete>
-      <backend>LDAP</backend>
-      <filter>(cn=*$NAME*)</filter>
-      <attribute>cn</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
-    </autocomplete>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SERVER</tag>
-    <default>true</default>
-    <set>(objectClass=goServer)</set>
-    <unset></unset>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WORKSTATION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gotoWorkstation)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TERMINAL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gotoTerminal)</set>
-  </element>
-
-</filterdef>
diff --git a/gosa-plugins/sudo/admin/sudo/selectSystem-list.tpl b/gosa-plugins/sudo/admin/sudo/selectSystem-list.tpl
deleted file mode 100644 (file)
index b233c58..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<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>
-
-<input type="hidden" name="ignore">
diff --git a/gosa-plugins/sudo/admin/sudo/selectSystem-list.xml b/gosa-plugins/sudo/admin/sudo/selectSystem-list.xml
deleted file mode 100644 (file)
index 0fa7b88..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<list>
-  <definition>
-    <departmentBrowser>true</departmentBrowser>
-    <departmentRootVisible>false</departmentRootVisible>
-    <baseMode>true</baseMode>
-    <multiSelect>true</multiSelect>
-    <template>selectSystem-list.tpl</template>
-    <module>server</module>
-    <label>List of systems</label>
-    <defaultSortColumn>1</defaultSortColumn>
-
-    <objectType>
-      <label>Server</label>
-      <objectClass>goServer</objectClass>
-      <category>server</category>
-      <class>servgeneric</class>
-      <image>plugins/systems/images/select_server.png</image>
-    </objectType>
-
-    <objectType>
-      <label>Workstation</label>
-      <objectClass>gotoWorkstation</objectClass>
-      <category>workstation</category>
-      <class>workgeneric</class>
-      <image>plugins/systems/images/select_workstation.png</image>
-    </objectType>
-
-    <objectType>
-      <label>Terminal</label>
-      <objectClass>gotoTerminal</objectClass>
-      <category>terminal</category>
-      <class>termgeneric</class>
-      <image>plugins/systems/images/select_terminal.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 name</label>
-      <sortAttribute>description</sortAttribute>
-      <sortType>string</sortType>
-      <value>%{description}</value>
-      <export>true</export>
-    </column>
-
-  </table>
-
-  <actionmenu>
-  </actionmenu>
-
-  <actiontriggers snapshot="false" copypaste="false">
-  </actiontriggers>
-</list>
diff --git a/gosa-plugins/sudo/admin/sudo/selectUser-filter.tpl b/gosa-plugins/sudo/admin/sudo/selectUser-filter.tpl
deleted file mode 100644 (file)
index e1016c0..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<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/sudo/admin/sudo/selectUser-filter.xml b/gosa-plugins/sudo/admin/sudo/selectUser-filter.xml
deleted file mode 100644 (file)
index c0f7c51..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<filterdef>
-  <definition>
-    <category>users</category>
-    <template>selectUser-filter.tpl</template>
-    <initial>true</initial>
-  </definition>
-
-  <search>
-    <query>
-      <backend>LDAP</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>LDAP</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/sudo/admin/sudo/selectUser-list.tpl b/gosa-plugins/sudo/admin/sudo/selectUser-list.tpl
deleted file mode 100644 (file)
index b233c58..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<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>
-
-<input type="hidden" name="ignore">
diff --git a/gosa-plugins/sudo/admin/sudo/selectUser-list.xml b/gosa-plugins/sudo/admin/sudo/selectUser-list.xml
deleted file mode 100644 (file)
index c4b2acd..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<list>
-  <definition>
-    <departmentBrowser>true</departmentBrowser>
-    <departmentRootVisible>false</departmentRootVisible>
-    <baseMode>true</baseMode>
-    <multiSelect>true</multiSelect>
-    <template>selectUser-list.tpl</template>
-    <module>users</module>
-    <label>List of users and groups</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 name</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>