From ec352974d2300659d3c08b7750b602a65ab9e346 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 14 Jul 2006 05:55:19 +0000 Subject: [PATCH] Added acls for FAI objects git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4144 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_faiHook.inc | 13 +++++++ plugins/admin/fai/class_faiManagement.inc | 37 +++++++++++-------- plugins/admin/fai/class_faiPackage.inc | 15 ++++++++ plugins/admin/fai/class_faiPartitionTable.inc | 19 ++++++++++ plugins/admin/fai/class_faiProfile.inc | 18 +++++++-- plugins/admin/fai/class_faiScript.inc | 13 +++++++ plugins/admin/fai/class_faiTemplate.inc | 15 ++++++++ plugins/admin/fai/class_faiVariable.inc | 12 ++++++ plugins/admin/fai/tabsHook.inc | 2 + plugins/admin/fai/tabsPackage.inc | 3 ++ plugins/admin/fai/tabsPartition.inc | 3 ++ plugins/admin/fai/tabsProfile.inc | 3 ++ plugins/admin/fai/tabsScript.inc | 3 ++ plugins/admin/fai/tabsTemplate.inc | 3 ++ plugins/admin/fai/tabsVariable.inc | 3 ++ 15 files changed, 142 insertions(+), 20 deletions(-) diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc index 7659b6655..5d3707535 100644 --- a/plugins/admin/fai/class_faiHook.inc +++ b/plugins/admin/fai/class_faiHook.inc @@ -466,6 +466,19 @@ class faiHook extends plugin $this->handle_object_tagging($sub_dn, $this->gosaUnitTag); } } + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI hook"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "description" => _("Description"), + "FAItast" => _("Task"), + "FAIscript" => _("FAI script"))); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 057cf420b..ed479f75f 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -574,24 +574,29 @@ class faiManagement extends plugin if(($this->dialog != NULL) && (isset($this->dialog->config))){ $display .= $this->dialog->execute(); /* Don't show buttons if tab dialog requests this */ - if (((isset($this->dialog->current))&&($this->dialog->by_object[$this->dialog->current]->is_dialog))){ - - }elseif(((isset($this->dialog->current))&&(!$this->dialog->by_object[$this->dialog->current]->is_dialog))){ - $display.= "

\n"; - $display.= "\n"; - $display.= " \n"; - if ($this->dn != "new"){ - $display.= "\n"; + + if(isset($this->dialog->current)){ + + $obj = $this->dialog->by_object[$this->dialog->current]; + + if((isset($obj->is_dialog) && (!$obj->is_dialog)) || (isset($obj->dialog) && (!$obj->dialog))){ + + $display.= "

\n"; + $display.= "\n"; $display.= " \n"; + if ($this->dn != "new"){ + $display.= "\n"; + $display.= " \n"; + } + $display.= "\n"; + $display.= "

"; + }elseif(!isset($this->dialog->current)){ + $display.= "

\n"; + $display.= " "; + $display.= "\n"; + $display.= "

"; } - $display.= "\n"; - $display.= "

"; - }elseif(!isset($this->dialog->current)){ - $display.= "

\n"; - $display.= " "; - $display.= "\n"; - $display.= "

"; - } + } return($display); } diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc index 3c35bf755..a07c24240 100644 --- a/plugins/admin/fai/class_faiPackage.inc +++ b/plugins/admin/fai/class_faiPackage.inc @@ -532,6 +532,21 @@ class faiPackage extends plugin } } } + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI Package list"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "description" => _("Description"), + "FAIpackage" => _("Packages"), + "FAIdebianSection" => _("Section"), + "FAIinstallMethod" => _("Install Method"), + "FAIdebianRelease" => _("Release"))); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc index c299d6d9a..3acf00d82 100644 --- a/plugins/admin/fai/class_faiPartitionTable.inc +++ b/plugins/admin/fai/class_faiPartitionTable.inc @@ -478,6 +478,25 @@ class faiPartitionTable extends plugin } $this->handle_post_events("add"); } + + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI partition table"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "FAIpartitionType" => _("Partition type"), + "FAIpartitionNr" => _("Partition no."), + "FAIfsType" => _("File system type"), + "FAImountPoint" => _("Mount point"), + "FAIpartitionSize" => _("Partition size"), + "FAImountOptions" => _("Mount options"), + "FAIfsOptions" => _("File system options"), + "FAIpartitionFlags" => _("Partition flags"))); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc index f09f4ddb3..ee8634314 100644 --- a/plugins/admin/fai/class_faiProfile.inc +++ b/plugins/admin/fai/class_faiProfile.inc @@ -16,10 +16,6 @@ class faiProfile extends plugin /* ObjectClasses for this Object*/ var $objectclasses = array("top","FAIclass","FAIprofile"); - /* Class name of the Ldap ObjectClass for the Sub Object */ - var $subClass = "FAIscriptEntry"; - var $subClasses = array("top","FAIclass","FAIscriptEntry"); - /* Specific attributes */ var $old_cn = ""; var $cn = ""; // The class name for this object @@ -427,6 +423,20 @@ class faiProfile extends plugin $this->handle_object_tagging(); show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/profile with dn '%s' failed."),$this->dn)); } + + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI profile"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "description" => _("Description"), + "FAIclass" => _("FAI classes"))); + } + } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index 7f0bce319..2610db8ae 100644 --- a/plugins/admin/fai/class_faiScript.inc +++ b/plugins/admin/fai/class_faiScript.inc @@ -441,6 +441,19 @@ class faiScript extends plugin $this->handle_object_tagging($sub_dn, $this->gosaUnitTag); } } + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI script"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "description" => _("Description"), + "FAIpriority" => _("Script priority"), + "FAIscript" => _("FAI script"))); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc index a9fbd7bbb..b0fb680a8 100644 --- a/plugins/admin/fai/class_faiTemplate.inc +++ b/plugins/admin/fai/class_faiTemplate.inc @@ -405,6 +405,21 @@ class faiTemplate extends plugin $this->handle_object_tagging($sub_dn, $this->gosaUnitTag); } } + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI template"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "description" => _("Description"), + "FAItemplateFile" => _("Template file"), + "FAItemplatePath" => _("Template path"), + "FAIowner" => _("File owner"), + "FAImode" => _("File permissions"))); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc index 2656b942b..09e1fb6f6 100644 --- a/plugins/admin/fai/class_faiVariable.inc +++ b/plugins/admin/fai/class_faiVariable.inc @@ -373,6 +373,18 @@ class faiVariable extends plugin $this->handle_object_tagging($sub_dn, $this->gosaUnitTag); } } + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plDescription" => _("FAI variable"), + "plSelfModify" => FALSE, + "plDepends" => array("objectClass" => "FAIclass"), + "cn" => _("Name"), + "description" => _("Description"), + "FAIvariableContent"=> _("Variable content"))); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/admin/fai/tabsHook.inc b/plugins/admin/fai/tabsHook.inc index 3220f5631..0a2a6b772 100644 --- a/plugins/admin/fai/tabsHook.inc +++ b/plugins/admin/fai/tabsHook.inc @@ -7,6 +7,8 @@ class tabsHook extends tabs function tabsHook($config, $data, $dn) { tabs::tabs($config, $data, $dn); + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() diff --git a/plugins/admin/fai/tabsPackage.inc b/plugins/admin/fai/tabsPackage.inc index 7a82adcab..57a5c6e96 100644 --- a/plugins/admin/fai/tabsPackage.inc +++ b/plugins/admin/fai/tabsPackage.inc @@ -7,6 +7,9 @@ class tabsPackage extends tabs function tabsPackage($config, $data, $dn) { tabs::tabs($config, $data, $dn); + + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() diff --git a/plugins/admin/fai/tabsPartition.inc b/plugins/admin/fai/tabsPartition.inc index 18596362b..a6243aca1 100644 --- a/plugins/admin/fai/tabsPartition.inc +++ b/plugins/admin/fai/tabsPartition.inc @@ -7,6 +7,9 @@ class tabsPartition extends tabs function tabsPartition($config, $data, $dn) { tabs::tabs($config, $data, $dn); + + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() diff --git a/plugins/admin/fai/tabsProfile.inc b/plugins/admin/fai/tabsProfile.inc index f8a7a2a07..a51653b2d 100644 --- a/plugins/admin/fai/tabsProfile.inc +++ b/plugins/admin/fai/tabsProfile.inc @@ -7,6 +7,9 @@ class tabsProfile extends tabs function tabsProfile($config, $data, $dn) { tabs::tabs($config, $data, $dn); + + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() diff --git a/plugins/admin/fai/tabsScript.inc b/plugins/admin/fai/tabsScript.inc index 1f51edd97..69ddfc963 100644 --- a/plugins/admin/fai/tabsScript.inc +++ b/plugins/admin/fai/tabsScript.inc @@ -7,6 +7,9 @@ class tabsScript extends tabs function tabsScript($config, $data, $dn) { tabs::tabs($config, $data, $dn); + + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() diff --git a/plugins/admin/fai/tabsTemplate.inc b/plugins/admin/fai/tabsTemplate.inc index 0c06e5152..2b765e05d 100644 --- a/plugins/admin/fai/tabsTemplate.inc +++ b/plugins/admin/fai/tabsTemplate.inc @@ -7,6 +7,9 @@ class tabsTemplate extends tabs function tabsTemplate($config, $data, $dn) { tabs::tabs($config, $data, $dn); + + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() diff --git a/plugins/admin/fai/tabsVariable.inc b/plugins/admin/fai/tabsVariable.inc index 3d8eb5683..aca820a3e 100644 --- a/plugins/admin/fai/tabsVariable.inc +++ b/plugins/admin/fai/tabsVariable.inc @@ -7,6 +7,9 @@ class tabsVariable extends tabs function tabsVariable($config, $data, $dn) { tabs::tabs($config, $data, $dn); + + /* Add references/acls/snapshots */ + $this->addSpecialTabs(); } function check() -- 2.30.2