X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fsystems%2Fclass_componentGeneric.inc;h=a6d93bb19da55c382f71a951f75871186f52e5c4;hb=7385deb3e680ce8a77f131b62907146bbf01075f;hp=99082b49bb4c4c24bd82f6201f946a866ed827fd;hpb=fc3cb1fd02097383665ebe265d8a9f8fc46e6178;p=gosa.git
diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 99082b49b..a6d93bb19 100644
--- a/plugins/admin/systems/class_componentGeneric.inc
+++ b/plugins/admin/systems/class_componentGeneric.inc
@@ -9,18 +9,18 @@ class componentGeneric extends plugin
/* Generic terminal attributes */
var $interfaces= array();
+ var $ignore_account= TRUE;
/* 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)
{
@@ -34,20 +34,48 @@ class componentGeneric extends plugin
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
-
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
- $display= " ".
+ $display= " ".
_("This 'dn' has no network features.")."";
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);
+ $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);
@@ -58,17 +86,19 @@ class componentGeneric extends plugin
$smarty->assign("$attr", $this->$attr);
}
$smarty->assign("base_select", $this->base);
+ $smarty->assign("baseACL", chkacl($this->acl,"base"));
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
return($smarty->fetch (get_template_path('component.tpl', TRUE)));
}
function remove_from_parent()
{
$ldap= $this->config->get_ldap_link();
+ $this->netConfigDNS->remove_from_parent();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of system component/generic with dn '%s' failed."),$this->dn));
$this->handle_post_events("remove");
/* Delete references to object groups */
@@ -79,7 +109,6 @@ class componentGeneric extends plugin
unset($og->member[$this->dn]);
$og->save ();
}
-
}
@@ -88,6 +117,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'];
@@ -98,15 +129,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 */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
- $message[]= "The required field 'Component name' is not set.";
+ $message[]= _("The required field 'Component name' is not set.");
}
- if ($this->macAddress == "" && chkacl ($this->acl, "macAddresscn") == ""){
- $message[]= "The required field 'MAC-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();
@@ -151,6 +190,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,15 +211,40 @@ class componentGeneric extends plugin
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
$this->handle_post_events("modify");
}
- show_ldap_error($ldap->get_error());
+
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of system component/generic with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->postcreate();
}
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Generic"),
+ "plDescription" => _("Component generic"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("component" => array("description" => _("Network device"),
+ "objectClass" => array("device", "ipHost", "ieee802Device"))),
+ "plProvidedAcls"=> array(
+ "cn" => _("Name"),
+ "description" => _("Description"))
+ ));
+ }
+
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: