diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index 78decf860e24cc61307ff4a35aab029df3f9f4db..9039ef07700d2b91da296d60dcdd217ab5cae58b 100644 (file)
"memcheck" => "memcheck",
"sysinfo" => "sysinfo");
"memcheck" => "memcheck",
"sysinfo" => "sysinfo");
- function servgeneric ($config, $dn= NULL)
+ var $fai_activated = FALSE;
+
+ function servgeneric ($config, $dn= NULL, $parent= NULL)
{
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
+
+ /* Check if FAI is activated */
+ $tmp = search_config($config->data,"faiManagement","CLASS");
+ if(!empty($tmp)){
+ $this->fai_activated = TRUE;
+ }
$this->modes["active"]= _("Activated");
$this->modes["locked"]= _("Locked");
$this->modes["active"]= _("Activated");
$this->modes["locked"]= _("Locked");
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
$this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
$this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+ $this->netConfigDNS->acl = $this->acl;
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
function execute()
{
/* Call parent execute */
function execute()
{
/* Call parent execute */
+ $this->netConfigDNS->acl = $this->acl;
plugin::execute();
/* Do we represent a valid server? */
plugin::execute();
/* Do we represent a valid server? */
}
/* Check for action */
}
/* Check for action */
- if (isset($_POST['action'])){
+ if (isset($_POST['action']) && chkacl($this->acl,"FAIstate") == ""){
$cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
if ($cmd == ""){
print_red(_("No ACTIONCMD definition found in your gosa.conf"));
$cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
if ($cmd == ""){
print_red(_("No ACTIONCMD definition found in your gosa.conf"));
$this->didAction= TRUE;
/* Set FAIstate */
$this->didAction= TRUE;
/* Set FAIstate */
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
- $ldap->cat($this->dn,array("objectClass"));
- $res = $ldap->fetch();
-
- $attrs = array();
- $attrs['FAIstate'] = "";
- if(isset($this->mapActions[$_POST['saction']])){
- $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
- }
- for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
- if(($attrs['FAIstate'] == "") && ($res['objectClass'][$i] == "FAIobject")) continue;
- $attrs['objectClass'][] = $res['objectClass'][$i];
- }
+ if($this->fai_activated && $this->dn != "new"){
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->cat($this->dn,array("objectClass"));
+ $res = $ldap->fetch();
- if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
- $attrs['objectClass'][] = "FAIobject";
- }
+ $attrs = array();
+ $attrs['FAIstate'] = "";
+ if(isset($this->mapActions[$_POST['saction']])){
+ $attrs['FAIstate'] = $this->mapActions[$_POST ['saction']];
+ }
+
+ for($i = 0; $i < $res['objectClass']['count'] ; $i ++){
+ $attrs['objectClass'][] = $res['objectClass'][$i];
+ }
+
+ if(($attrs['FAIstate'] != "") && (!in_array("FAIobject",$attrs['objectClass']))){
+ $attrs['objectClass'][] = "FAIobject";
+ }
+
+ if($attrs['FAIstate'] == ""){
+#FIXME we should check if FAIobject is used anymore
+ $attrs['FAIstate'] = array();
+ }
- if($attrs['FAIstate'] == ""){
- $attrs['FAIstate'] = array();
+ $ldap->cd($this->dn);
+ $ldap->modify($attrs);
+ show_ldap_error($ldap->get_error());
}
}
-
- $ldap->cd($this->dn);
- $ldap->modify($attrs);
- show_ldap_error($ldap->get_error());
}
}
}
}
}
}
}
/* Show main page */
}
/* Show main page */
+ $this->netConfigDNS->cn= $this->cn;
$smarty->assign("netconfig", $this->netConfigDNS->execute());
$smarty->assign("netconfig", $this->netConfigDNS->execute());
+ $smarty->assign("fai_activated",$this->fai_activated);
$smarty->assign("modes", $this->modes);
return($smarty->fetch (get_template_path('server.tpl', TRUE)));
$smarty->assign("modes", $this->modes);
return($smarty->fetch (get_template_path('server.tpl', TRUE)));
function remove_from_parent()
{
function remove_from_parent()
{
+ $this->netConfigDNS->acl = $this->acl;
$this->netConfigDNS->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
$this->netConfigDNS->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
- $acl= get_module_permission($acl, "server", $this->dn);
+ $acl= get_module_permission($acl, "servgeneric", $this->dn);
if (chkacl($acl, "create") != ""){
$message[]= _("You have no permissions to create a server on this 'Base'.");
}
if (chkacl($acl, "create") != ""){
$message[]= _("You have no permissions to create a server on this 'Base'.");
}
/* Save to LDAP */
function save()
{
/* Save to LDAP */
function save()
{
+ $this->netConfigDNS->acl = $this->acl;
plugin::save();
/* Remove all empty values */
plugin::save();
/* Remove all empty values */