X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_componentGeneric.inc;h=2463ca1173fd6aa6d51cc818c293de483c675bdb;hb=868f556da0e7c0003fb3ae735559e6500e5bc3ed;hp=139444563bd4fcddf36b9c266d0833a5a5c4e155;hpb=c02a9629a834fa473d9fb709e9ca3d531c936c5e;p=gosa.git
diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 139444563..2463ca117 100644
--- a/plugins/admin/systems/class_componentGeneric.inc
+++ b/plugins/admin/systems/class_componentGeneric.inc
@@ -2,11 +2,6 @@
class componentGeneric extends plugin
{
- /* CLI vars */
- var $cli_summary= "Manage component base objects";
- var $cli_description= "Some longer text\nfor help";
- var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
/* Generic terminal attributes */
var $interfaces= array();
var $ignore_account= TRUE;
@@ -14,18 +9,17 @@ class componentGeneric extends plugin
/* Needed values and lists */
var $base= "";
var $cn= "";
- var $macAddress= "";
- var $ipHostNumber= "";
var $description= "";
var $orig_dn= "";
/* attribute list for save action */
- var $attributes= array("cn", "description", "macAddress", "ipHostNumber");
+ var $attributes= array("cn", "description");
var $objectclasses= array("top", "device", "ipHost", "ieee802Device");
+ var $netConfigDNS;
- function componentgeneric ($config, $dn= NULL)
+ function componentgeneric ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
/* Set base */
if ($this->dn == "new"){
@@ -35,6 +29,8 @@ class componentGeneric extends plugin
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
+ $this->netConfigDNS->acl = $this->acl;
/* Save dn for later references */
$this->orig_dn= $this->dn;
@@ -42,6 +38,11 @@ class componentGeneric extends plugin
function execute()
{
+ $this->netConfigDNS->acl = $this->acl;
+
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
$display= "
".
@@ -49,6 +50,31 @@ class componentGeneric extends plugin
return($display);
}
+ /* Base select dialog */
+ $once = true;
+ foreach($_POST as $name => $value){
+ if(preg_match("/^chooseBase/",$name) && $once){
+ $once = false;
+ $this->dialog = new baseSelectDialog($this->config);
+ $this->dialog->setCurrentBase($this->base);
+ }
+ }
+
+ /* Dialog handling */
+ if(is_object($this->dialog)){
+ /* Must be called before save_object */
+ $this->dialog->save_object();
+
+ if($this->dialog->isClosed()){
+ $this->dialog = false;
+ }elseif($this->dialog->isSelected()){
+ $this->base = $this->dialog->isSelected();
+ $this->dialog= false;
+ }else{
+ return($this->dialog->execute());
+ }
+ }
+
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("bases", $this->config->idepartments);
@@ -59,21 +85,22 @@ class componentGeneric extends plugin
$smarty->assign("$attr", $this->$attr);
}
$smarty->assign("base_select", $this->base);
+ $smarty->assign("baseACL", chkacl($this->acl,"base"));
- /* Show Asterisk for required attribute ipHostNumber and macAddress */
- $smarty->assign("staticAddress", "*");
-
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $this->netConfigDNS->cn= $this->cn;
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
return($smarty->fetch (get_template_path('component.tpl', TRUE)));
}
function remove_from_parent()
{
+ $this->netConfigDNS->acl = $this->acl;
$ldap= $this->config->get_ldap_link();
+ $this->netConfigDNS->remove_from_parent();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
- $this->handle_post_events("remove");
+ show_ldap_error($ldap->get_error(), _("Removing generic component failed"));
+ $this->handle_post_events("remove",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
@@ -83,7 +110,6 @@ class componentGeneric extends plugin
unset($og->member[$this->dn]);
$og->save ();
}
-
}
@@ -92,6 +118,8 @@ class componentGeneric extends plugin
{
plugin::save_object();
+ $this->netConfigDNS->save_object();
+
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
@@ -102,18 +130,23 @@ class componentGeneric extends plugin
/* Check supplied data */
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+ $message= array_merge($message,$this->netConfigDNS->check());
+
$this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
- /* must: cn, macAddress, ipHostNumber */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
$message[]= _("The required field 'Component name' is not set.");
}
- if ($this->macAddress == "" && chkacl ($this->acl, "macAddress") == ""){
- $message[]= _("The required field 'MAC-address' is not set.");
- }
- if ($this->ipHostNumber == "" && chkacl ($this->acl, "ipHostNumber") == ""){
- $message[]= _("The required field 'IP-address' is not set.");
+
+ /* To check for valid ip*/
+ if($this->netConfigDNS->ipHostNumber == ""){
+ $message[]= _("The required field IP address is empty.");
+ } else {
+ if (!is_ip($this->netConfigDNS->ipHostNumber)){
+ $message[]= _("The field IP address contains an invalid address.");
+ }
}
$ui= get_userinfo();
@@ -144,6 +177,7 @@ class componentGeneric extends plugin
/* Save to LDAP */
function save()
{
+ $this->netConfigDNS->acl = $this->acl;
plugin::save();
/* Remove all empty values */
@@ -158,6 +192,13 @@ class componentGeneric extends plugin
$this->attrs= $attrs;
}
+ /* If this is a new Object IP & Mac aren't set.
+ IP & Mac are msut attributes, so we set this values by here. */
+ if($this->orig_dn == 'new'){
+ $this->attrs['ipHostNumber'] = $this->netConfigDNS->ipHostNumber;
+ $this->attrs['macAddress'] = $this->netConfigDNS->macAddress;
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
@@ -165,22 +206,24 @@ class componentGeneric extends plugin
$ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
- $this->handle_post_events("add");
+ $this->handle_post_events("add",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
} else {
if ($this->orig_dn != $this->dn){
$this->move($this->orig_dn, $this->dn);
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- $this->handle_post_events("modify");
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
}
- show_ldap_error($ldap->get_error());
- /* Optionally execute a command after we're done */
- $this->postcreate();
- }
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+ show_ldap_error($ldap->get_error(), _("Saving generic component failed"));
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: