diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index b2295c8ab0ddcf5e55ddfc52ab9af19b70db647a..dd5a5e2c2070d7cf4fdc5b47126c171b5ac237ae 100644 (file)
var $l= "";
var $description= "";
var $orig_dn= "";
+ var $orig_cn= "";
/* attribute list for save action */
var $attributes= array("cn", "description","gotoMode");
$this->base= dn2base($ui->dn);
$this->cn= "";
} else {
- $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("serverou"))."/", "", $this->dn);
}
$this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
$this->netConfigDNS->set_acl_category("server");
/* Save dn for later references */
$this->orig_dn= $this->dn;
+ $this->orig_cn= $this->cn;
}
/* Do we represent a valid server? */
if (!$this->is_account && $this->parent === NULL){
- $display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
+ $display= "<img alt=\"\" src=\"images/small-error.png\" align=middle> <b>".
msgPool::noValidExtension(_("server"))."</b>";
return($display);
}
$tmp->set_type(TRIGGERED_EVENT);
$o_queue = new gosaSupportDaemon();
if(!$o_queue->append($tmp)){
- msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
- $o_queue->get_error()),ERROR_DIALOG);
+ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
}
}
}else{
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
+ update_accessTo($this->orig_cn,"");
+
new log("remove","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
if (!$ldap->success()){
}
/* Warn the user, that this host is currently installing */
- if($this->currently_installing && !$this->currently_installing_warned){
+ if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){
+
+ /* Force aborting without message dialog */
+ $message[] = "";
$this->currently_installing_warned = TRUE;
- $message[] = _("This host is currently installing, if you really want to save it, save again.");
+ msg_dialog::display(_("Software deployment"),
+ _("This host is currently installing, if you really want to save it, press 'OK'."),
+ CONFIRM_DIALOG);
}
return ($message);
new log("create","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
$mode= "add";
} else {
-
- /* cn is not case sensitive for ldap, but for php it is!! */
- if($this->config->current['DNMODE'] == "cn"){
- if (strtolower($this->orig_dn) != (strtolower($this->dn))){
- $this->recursive_move($this->orig_dn, $this->dn);
- plugin::save();
- }
- }else{
- if ($this->orig_dn != $this->dn){
- $this->recursive_move($this->orig_dn, $this->dn);
- plugin::save();
- }
- }
$ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);
new log("modify","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+ /* Update all accessTo/trust dependencies */
+ if($this->orig_cn != $this->cn){
+ update_accessTo($this->orig_cn,$this->cn);
+ }
+
$mode= "modify";
}
if (!$ldap->success()){
$tmp->set_type(TRIGGERED_EVENT);
$tmp->add_targets(array($this->netConfigDNS->macAddress));
if(!$o_queue->append($tmp)){
- msg_dialog::display(_("Daemon"),sprintf(_("Something went wrong while talking to the daemon: %s."),
- $o_queue->get_error()),ERROR_DIALOG);
+ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
}
}
}