diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index d1673bc9371baa466afbd095eedae984ad051740..fef7254f884fe0089f0e5b1a02255c339ec94fd5 100644 (file)
$this->base= dn2base($ui->dn);
$this->cn= "";
} else {
- $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_winstations_ou())."/", "", $this->dn);
}
/* Save dn for later references */
$this->orig_dn= $this->dn;
+
+ $this->cn= preg_replace("/\\\$\$/","",$this->cn);
+
+ if($this->is_account){
+ @log::log("view","winworkstation/".get_class($this),$this->dn);
+ }
}
+
+ function set_acl_base($base)
+ {
+ plugin::set_acl_base($base);
+ $this->netConfigDNS->set_acl_base($base);
+ }
+
+ function set_acl_category($cat)
+ {
+ plugin::set_acl_category($cat);
+ $this->netConfigDNS->set_acl_category($cat);
+ }
+
+
function execute()
{
/* Call parent execute */
if($this->dialog->isClosed()){
$this->dialog = false;
}elseif($this->dialog->isSelected()){
- $this->base = $this->dialog->isSelected();
+
+ /* A new base was selected, check if it is a valid one */
+ $tmp = $this->get_allowed_bases();
+ if(isset($tmp[$this->dialog->isSelected()])){
+ $this->base = $this->dialog->isSelected();
+ }
+
$this->dialog= false;
}else{
return($this->dialog->execute());
$this->netConfigDNS->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
+ @log::log("remove","winworkstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
show_ldap_error($ldap->get_error(), sprintf(_("Removing of system wingeneric/generic with dn '%s' failed."),$this->dn));
$this->handle_post_events("remove");
/* Save data to object */
function save_object()
{
+ /* Create a base backup and reset the
+ base directly after calling plugin::save_object();
+ Base will be set seperatly a few lines below */
+ $base_tmp = $this->base;
plugin::save_object();
+ $this->base = $base_tmp;
+
$this->netConfigDNS->save_object();
- /* Save base, since this is no LDAP attribute */
- if (isset($_POST['base']) && $this->acl_is_moveable(){
- $this->base= $_POST['base'];
+
+ /* Set new base if allowed */
+ $tmp = $this->get_allowed_bases();
+ if(isset($_POST['base'])){
+ if(isset($tmp[$_POST['base']])){
+ $this->base= $_POST['base'];
+ }
}
}
$message= plugin::check();
$message= array_merge($message, $this->netConfigDNS->check());
$this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
+
+ /* Set new acl base */
+ if($this->dn == "new") {
+ $this->set_acl_base($this->base);
+ }
- $ui= get_userinfo();
- $acl= get_permissions ($this->dn, $ui->subtreeACL);
- $acl= get_module_permission($acl, "component", $this->dn);
if(!$this->acl_is_createable() && $this->dn == "new"){
$message[]= _("You have no permissions to create a component on this 'Base'.");
}
$this->attrs= $attrs;
}
+ if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
+ $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
$ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
+ @log::log("create","winworkstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
$this->handle_post_events("add");
} else {
if ($this->orig_dn != $this->dn){
$ldap->cd($this->dn);
$this->cleanup();
$ldap->modify ($this->attrs);
-
+ @log::log("modify","winworkstation/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
$this->handle_post_events("modify");
}
- $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->cn = preg_replace("/\\\$\$/","",$this->cn);
$this->netConfigDNS->save($this->dn);
show_ldap_error($ldap->get_error(), sprintf(_("Saving of system wingeneric/generic with dn '%s' failed."),$this->dn));