diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index a4fc61fa2ef8ace9a06e3a3d17ae888e1ee65aef..df682a60523d8d4279c0ff355acb53dc78d3a51b 100644 (file)
plugin::plugin ($config, $dn, $parent);
- /* Initialize kerberos host key plugin */
- if(class_available("krbHostKeys")){
- $this->kerberos_key_service = new krbHostKeys($this->config,$this);
- }
-
+ /* Initialize */
$this->ui = get_userinfo();
$this->modes["active"]= _("Activated");
$this->modes["locked"]= _("Locked");
$this->base= dn2base($ui->dn);
$this->cn= "";
} else {
- $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("serverRDN"))."/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("serverRDN"), '/')."/i", "", $this->dn);
}
$this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
$this->netConfigDNS->set_acl_category("server");
$this->netConfigDNS->set_acl_base($this->base);
+ $this->netConfigDNS->MACisMust =TRUE;
+
+ /* Initialize kerberos host key plugin */
+ if(class_available("krbHostKeys")){
+ $this->kerberos_key_service = new krbHostKeys($this->config,$this);
+ }
/* Check if this host is currently in installation process*/
if($this->dn != "new" && class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if ($attrs['dn'] != $this->orig_dn){
- if(!preg_match("/cn=dhcp,/",$attrs['dn']) && !preg_match("/,".get_ou('incomingou')."/",$attrs['dn']) && preg_match("/,".get_ou('serverRDN')."/",$attrs['dn'])){
+ if(!preg_match("/cn=dhcp,/",$attrs['dn']) && !preg_match("/,".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$attrs['dn']) && preg_match("/,".preg_quote(get_ou('serverRDN'), '/')."/i",$attrs['dn'])){
$message[]= msgPool::duplicated(_("Server name"));
break;
}
}
/* Warn the user, that this host is currently installing */
- if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){
+ if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".preg_quote(get_ou("systemIncomingRDN"), '/')."/i",$this->orig_dn)){
/* Force aborting without message dialog */
$message[] = "";
"plCategory" => array("server" => array("description" => _("Server"),
"objectClass" => "goServer")),
"plProvidedAcls"=> array(
- "cn" => _("Name"),
- "description" => _("Description"),
- "gotoMode" => _("Goto mode"),
- "base" => _("Base"),
- "FAIstate" => _("Action flag"))
+ "cn" => _("Name"),
+ "description" => _("Description"),
+ "base" => _("Base"),
+
+ "gotoMode" => _("Goto mode"),
+ "userPassword"=> _("Root password"),
+ "FAIstate" => _("Action flag"))
));
}
+
+
+ function is_modal_dialog()
+ {
+ return((isset($this->dialog) && $this->dialog) || (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog));
+ }
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: