X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_plugin.inc;h=0691c206073d220480c29269e45c8d395ee68038;hb=30d939bbc772a9b8cdd9704e8034101e957ab972;hp=8ed7173a5fbae10552f0c43f28d4943136bc297f;hpb=85644c6e2a3c3f99e15837dfe064893901a91ae5;p=gosa.git diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index 8ed7173a5..0691c2060 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -113,6 +113,7 @@ class plugin var $acl_base= ""; var $acl_category= ""; + var $read_only = FALSE; // Used when the entry is opened as "readonly" due to locks. /* This can be set to render the tabulators in another stylesheet */ var $pl_notify= FALSE; @@ -138,7 +139,7 @@ class plugin \param dn Distinguished name to initialize plugin from \sa plugin() */ - function plugin (&$config, $dn= NULL, $parent= NULL) + function plugin (&$config, $dn= NULL, $object= NULL) { /* Configuration is fine, allways */ $this->config= &$config; @@ -149,6 +150,16 @@ class plugin return; } + /* Check if this entry was opened in read only mode */ + if(isset($_POST['open_readonly'])){ + if(session::global_is_set("LOCK_CACHE")){ + $cache = &session::get("LOCK_CACHE"); + if(isset($cache['READ_ONLY'][$this->dn])){ + $this->read_only = TRUE; + } + } + } + /* Save current dn as acl_base */ $this->acl_base= $dn; @@ -156,8 +167,8 @@ class plugin if ($dn !== NULL){ /* Load data to 'attrs' and save 'dn' */ - if ($parent !== NULL){ - $this->attrs= $parent->attrs; + if ($object !== NULL){ + $this->attrs= $object->attrs; } else { $ldap= $this->config->get_ldap_link(); $ldap->cat ($dn); @@ -168,7 +179,7 @@ class plugin foreach ($this->attributes as $val){ $found= array_key_ics($val, $this->attrs); if ($found != ""){ - $this->$val= $this->attrs["$found"][0]; + $this->$val= $found[0]; } } @@ -180,7 +191,7 @@ class plugin /* Set the template flag according to the existence of objectClass gosaUserTemplate */ if (isset($this->attrs['objectClass'])){ - if (in_array ("gosaUserTemplate", $this->attrs['objectClass'])){ + if (in_array_ics ("gosaUserTemplate", $this->attrs['objectClass'])){ $this->is_template= TRUE; @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "found", "Template check"); @@ -207,11 +218,12 @@ class plugin /* Prepare saved attributes */ $this->saved_attributes= $this->attrs; foreach ($this->saved_attributes as $index => $value){ - if (preg_match('/^[0-9]+$/', $index)){ + if (is_numeric($index)){ unset($this->saved_attributes[$index]); continue; } - if (!in_array($index, $this->attributes) && $index != "objectClass"){ + + if (!in_array_ics($index, $this->attributes) && strcasecmp('objectClass', $index)){ unset($this->saved_attributes[$index]); continue; } @@ -229,6 +241,7 @@ class plugin } unset($this->saved_attributes["$index"]["count"]); } + if(isset($this->attrs['gosaUnitTag'])){ $this->saved_attributes['gosaUnitTag'] = $this->attrs['gosaUnitTag'][0]; } @@ -246,11 +259,13 @@ class plugin function execute() { /* This one is empty currently. Fabian - please fill in the docu code */ - session::set('current_class_for_help',get_class($this)); + session::global_set('current_class_for_help',get_class($this)); /* Reset Lock message POST/GET check array, to prevent perg_match errors*/ session::set('LOCK_VARS_TO_USE',array()); - session::set('LOCK_VARS_USED',array()); + session::set('LOCK_VARS_USED_GET',array()); + session::set('LOCK_VARS_USED_POST',array()); + session::set('LOCK_VARS_USED_REQUEST',array()); } /*! \brief execute plugin @@ -273,7 +288,7 @@ class plugin /* Remove objectClasses from entry */ $ldap->cd($this->dn); $this->attrs= array(); - $this->attrs['objectClass']= array_remove_entries($this->objectclasses,$oc); + $this->attrs['objectClass']= array_remove_entries_ics($this->objectclasses,$oc); /* Unset attributes from entry */ foreach ($this->attributes as $val){ @@ -630,14 +645,17 @@ class plugin /* Additional attributes */ foreach ($tmp as $name => $len){ $value = $add_attrs[$name]; - $command= preg_replace("/%$name/", "$value", $command); + $command= str_replace("%$name", "$value", $command); } if (check_command($command)){ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); - - exec($command); + exec($command,$arr); + foreach($arr as $str){ + @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, + $command, "Result: ".$str); + } } else { $message= msgPool::cmdnotfound("POSTCREATE", get_class($this)); msg_dialog::display(_("Error"), $message, ERROR_DIALOG); @@ -669,12 +687,16 @@ class plugin /* Additional attributes */ foreach ($tmp as $name => $len){ $value = $add_attrs[$name]; - $command= preg_replace("/%$name/", "$value", $command); + $command= str_replace("%$name", "$value", $command); } if (check_command($command)){ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,$command, "Execute"); - exec($command); + exec($command,$arr); + foreach($arr as $str){ + @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, + $command, "Result: ".$str); + } } else { $message= msgPool::cmdnotfound("POSTMODIFY", get_class($this)); msg_dialog::display(_("Error"), $message, ERROR_DIALOG); @@ -705,14 +727,18 @@ class plugin /* Additional attributes */ foreach ($tmp as $name => $len){ $value = $add_attrs[$name]; - $command= preg_replace("/%$name/", "$value", $command); + $command= str_replace("%$name", "$value", $command); } if (check_command($command)){ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); - exec($command); + exec($command,$arr); + foreach($arr as $str){ + @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, + $command, "Result: ".$str); + } } else { $message= msgPool::cmdnotfound("POSTREMOVE", get_class($this)); msg_dialog::display(_("Error"), $message, ERROR_DIALOG); @@ -720,6 +746,39 @@ class plugin } } + + /* Create unique DN */ + function create_unique_dn2($data, $base) + { + $ldap= $this->config->get_ldap_link(); + $base= preg_replace("/^,*/", "", $base); + + /* Try to use plain entry first */ + $dn= "$data,$base"; + $attribute= preg_replace('/=.*$/', '', $data); + $ldap->cat ($dn, array('dn')); + if (!$ldap->fetch()){ + return ($dn); + } + + /* Look for additional attributes */ + foreach ($this->attributes as $attr){ + if ($attr == $attribute || $this->$attr == ""){ + continue; + } + + $dn= "$data+$attr=".$this->$attr.",$base"; + $ldap->cat ($dn, array('dn')); + if (!$ldap->fetch()){ + return ($dn); + } + } + + /* None found */ + return ("none"); + } + + /* Create unique DN */ function create_unique_dn($attribute, $base) { @@ -750,6 +809,7 @@ class plugin return ("none"); } + function rebind($ldap, $referral) { $credentials= LDAP::get_credentials($referral, $this->config->current['REFERRAL']); @@ -779,8 +839,9 @@ class plugin ldap_set_rebind_proc($ds, array(&$this, "rebind")); } - $r=ldap_bind($ds,$this->config->current['ADMIN'], $this->config->current['PASSWORD']); - $sr=ldap_read($ds, @LDAP::fix($src_dn), "objectClass=*"); + $pwd = $this->config->get_credentials($this->config->current['ADMINPASSWORD']); + $r=ldap_bind($ds,$this->config->current['ADMINDN'], $pwd); + $sr=ldap_read($ds, LDAP::fix($src_dn), "objectClass=*"); /* Fill data from LDAP */ $new= array(); @@ -807,14 +868,14 @@ class plugin /* Adapt naming attribute */ $dst_name= preg_replace("/^([^=]+)=.*$/", "\\1", $dst_dn); $dst_val = preg_replace("/^[^=]+=([^,+]+).*,.*$/", "\\1", $dst_dn); - $new[$dst_name]= @LDAP::fix($dst_val); + $new[$dst_name]= LDAP::fix($dst_val); /* Check if this is a department. * If it is a dep. && there is a , override in his ou * change \2C to , again, else this entry can't be saved ... */ if((isset($new['ou'])) &&( preg_match("/\\,/",$new['ou']))){ - $new['ou'] = preg_replace("/\\\\,/",",",$new['ou']); + $new['ou'] = str_replace("\\\\,",",",$new['ou']); } /* Save copy */ @@ -826,6 +887,9 @@ class plugin /* FAIvariable=.../..., cn=.. could not be saved, because the attribute FAIvariable was different to the dn FAIvariable=..., cn=... */ + + if(!is_array($new['objectClass'])) $new['objectClass'] = array($new['objectClass']); + if(in_array_ics("FAIdebconfInfo",$new['objectClass'])){ $new['FAIvariable'] = $ldap->fix($new['FAIvariable']); } @@ -858,7 +922,7 @@ class plugin $ldap->cat($dst_dn); $attrs= $ldap->fetch(); if (count($attrs)){ - trigger_error("Trying to overwrite ".@LDAP::fix($dst_dn).", which already exists.", + trigger_error("Trying to overwrite ".LDAP::fix($dst_dn).", which already exists.", E_USER_WARNING); return (FALSE); } @@ -866,7 +930,7 @@ class plugin $ldap->cat($src_dn); $attrs= $ldap->fetch(); if (!count($attrs)){ - trigger_error("Trying to move ".@LDAP::fix($src_dn).", which does not seem to exist.", + trigger_error("Trying to move ".LDAP::fix($src_dn).", which does not seem to exist.", E_USER_WARNING); return (FALSE); } @@ -875,7 +939,7 @@ class plugin $ldap->search("objectClass=*",array("dn")); while($attrs = $ldap->fetch()){ $src = $attrs['dn']; - $dst = preg_replace("/".normalizePreg($src_dn)."$/",$dst_dn,$attrs['dn']); + $dst = preg_replace("/".preg_quote($src_dn, '/')."$/",$dst_dn,$attrs['dn']); $this->_copy($src,$dst); } return (TRUE); @@ -898,76 +962,64 @@ class plugin /* Try to move the source entry to the destination position */ $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $ldap->create_missing_trees(preg_replace("/^[^,]+,/","",$dst_dn)); if (!$ldap->rename_dn($src_dn,$dst_dn)){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $src_dn, "", get_class())); +# msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $src_dn, "", get_class())); + new log("debug","Ldap Protocol v3 implementation error, ldap_rename failed, falling back to manual copy.","FROM: $src_dn -- TO: $dst_dn",array(),$ldap->get_error()); + @DEBUG(DEBUG_LDAP,__LINE__,__FUNCTION__,__FILE__,"Rename failed FROM: $src_dn -- TO: $dst_dn", + "Ldap Protocol v3 implementation error, falling back to maunal method."); return(FALSE); } - /* Get list of groups within this tree, - maybe we have to update ACL references. - */ - $leaf_groups = get_list("(objectClass=posixGroup)",array("all"),$dst_dn, - array("dn","objectClass"),GL_SUBSEARCH | GL_NO_ACL_CHECK); - - /* Get list of users within this tree, + /* Get list of users,groups and roles within this tree, maybe we have to update ACL references. */ - $leaf_users= get_list("(objectClass=gosaAccount)",array("all"),$dst_dn, + $leaf_objs = get_list("(|(objectClass=posixGroup)(objectClass=gosaAccount)(objectClass=gosaRole))",array("all"),$dst_dn, array("dn","objectClass"),GL_SUBSEARCH | GL_NO_ACL_CHECK); - - - /* Updated acls set for this groups */ - foreach($leaf_groups as $group){ - $new_dn = $group['dn']; - $old_dn = preg_replace("/".normalizePreg($dst_dn)."$/i",$src_dn,$new_dn); - $this->update_acls($old_dn,$new_dn); - } - - /* Updated acls set for this users */ - foreach($leaf_users as $user){ - $new_dn = $user['dn']; - $old_dn = preg_replace("/".normalizePreg($dst_dn)."$/i",$src_dn,$new_dn); + foreach($leaf_objs as $obj){ + $new_dn = $obj['dn']; + $old_dn = preg_replace("/".preg_quote(LDAP::convert($dst_dn), '/')."$/i",$src_dn,LDAP::convert($new_dn)); $this->update_acls($old_dn,$new_dn); } - /* Get all objectGroups defined in this database. - and check if there is an entry matching the source dn, - if this is the case, then update this objectgroup to use the new dn. - */ - $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(member=*))","ogroups", - array(get_ou("ogroupou")),$this->config->current['BASE'],array("member"), - GL_SUBSEARCH | GL_NO_ACL_CHECK) ; + // Migrate objectgroups if needed + $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","ogroups", array(get_ou("ogroupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); - /* Walk through all objectGroups and check if there are - members matching the source dn - */ + // Walk through all objectGroups foreach($ogroups as $ogroup){ - if(isset($ogroup['member'])){ + // Migrate old to new dn + $o_ogroup= new ogroup($this->config,$ogroup['dn']); + if (isset($o_group->member[$src_dn])) { + unset($o_ogroup->member[$src_dn]); + } + $o_ogroup->member[$dst_dn]= $dst_dn; + + // Save object group + $o_ogroup->save(); + } - /* Reset class object, this will be initialized with class_ogroup on demand - */ - $o_ogroup = NULL; - for($i = 0 ; $i < $ogroup['member']['count'] ; $i ++){ + // Migrate rfc groups if needed + $groups = get_sub_list("(&(objectClass=posixGroup)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","groups", array(get_ou("groupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); - $c_mem = $ogroup['member'][$i]; - - if(preg_match("/".normalizePreg($src_dn)."$/i",$c_mem)){ - - $d_mem = preg_replace("/".normalizePreg($src_dn)."$/i",$dst_dn,$ogroup['member'][$i]); + // Walk through all POSIX groups + foreach($groups as $group){ - if($o_ogroup == NULL){ - $o_ogroup = new ogroup($this->config,$ogroup['dn']); - } + // Migrate old to new dn + $o_group= new group($this->config,$group['dn']); + $o_group->save(); + } - unset($o_ogroup->member[$c_mem]); - $o_ogroup->member[$d_mem]= $d_mem; - } - } - - /* Save object group if there were changes made on the membership */ - if($o_ogroup != NULL){ - $o_ogroup->save(); - } + /* Update roles to use the new entry dn */ + $roles = get_sub_list("(&(objectClass=organizationalRole)(roleOccupant=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","roles", array(get_ou("roleRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); + + // Walk through all roles + foreach($roles as $role){ + $role = new roleGeneric($this->config,$role['dn']); + $key= array_search($src_dn, $role->roleOccupant); + if($key !== FALSE){ + $role->roleOccupant[$key] = $dst_dn; + $role->save(); } } @@ -980,7 +1032,7 @@ class plugin if(count($leaf_deps)){ $this->config->get_departments(); $this->config->make_idepartments(); - session::set("config",$this->config); + session::global_set("config",$this->config); $ui =get_userinfo(); $ui->reset_acl_cache(); } @@ -1100,11 +1152,8 @@ class plugin if (isset($source[$var])){ if(isset($source[$var]['count'])){ if($source[$var]['count'] > 1){ - $this->$var = array(); - $tmp = array(); - for($i = 0 ; $i < $source[$var]['count']; $i++){ - $tmp = $source[$var][$i]; - } + $tmp= $source[$var]; + unset($tmp['count']); $this->$var = $tmp; }else{ $this->$var = $source[$var][0]; @@ -1144,7 +1193,7 @@ class plugin } /* This one matches with the latter part. Break and don't fix this entry */ - if (preg_match('/(^|,)'.normalizePreg($key).'$/', $dn)){ + if (preg_match('/(^|,)'.preg_quote($key, '/').'$/', $dn)){ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "DEBUG: Possibly relevant: $key", "Tagging"); $relevant[strlen($key)]= $ntag; continue; @@ -1204,24 +1253,24 @@ class plugin } /* Get configuration from gosa.conf */ - $tmp = $this->config->current; + $config = $this->config; /* Create lokal ldap connection */ $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); /* check if there are special server configurations for snapshots */ - if(!isset($tmp['SNAPSHOT_SERVER'])){ + if($config->get_cfg_value("snapshotURI") == ""){ /* Source and destination server are both the same, just copy source to dest obj */ $ldap_to = $ldap; $snapldapbase = $this->config->current['BASE']; }else{ - $server = $tmp['SNAPSHOT_SERVER']; - $user = $tmp['SNAPSHOT_USER']; - $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_BASE']; + $server = $config->get_cfg_value("snapshotURI"); + $user = $config->get_cfg_value("snapshotAdminDn"); + $password = $this->config->get_credentials($config->get_cfg_value("snapshotAdminPassword")); + $snapldapbase = $config->get_cfg_value("snapshotBase"); $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); $ldap_to -> cd($snapldapbase); @@ -1240,14 +1289,14 @@ class plugin /* Collect some infos */ $base = $this->config->current['BASE']; - $snap_base = $tmp['SNAPSHOT_BASE']; + $snap_base = $config->get_cfg_value("snapshotBase"); $base_of_object = preg_replace ('/^[^,]+,/i', '', $this->dn); - $new_base = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base; + $new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base; /* Create object */ #$data = preg_replace('/^dn:.*\n/', '', $ldap->gen_ldif($this->dn,"(!(objectClass=gosaDepartment))")); $data = $ldap->gen_ldif($this->dn,"(&(!(objectClass=gosaDepartment))(!(objectClass=FAIclass)))"); - $newName = preg_replace("/\./", "", $sec."-".$usec); + $newName = str_replace(".", "", $sec."-".$usec); $target= array(); $target['objectClass'] = array("top", "gosaSnapshotObject"); $target['gosaSnapshotData'] = gzcompress($data, 6); @@ -1264,7 +1313,7 @@ class plugin $ldap_to->cat($new_dn); while($ldap_to->count()){ $ldap_to->cat($new_dn); - $newName = preg_replace("/\./", "", $sec."-".($usec++)); + $newName = str_replace(".", "", $sec."-".($usec++)); $new_dn = "gosaSnapshotTimestamp=".$newName.",".$new_base; $target['gosaSnapshotTimestamp'] = $newName; } @@ -1293,7 +1342,10 @@ class plugin $this->dn = $dn; $ldap = $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); - $ldap->rmdir_recursive($dn); + $ldap->rmdir_recursive($this->dn); + if(!$ldap->success()){ + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn)); + } $this->dn = $old_dn; } @@ -1302,33 +1354,7 @@ class plugin There will also be some errors psoted, if the configuration failed */ function snapshotEnabled() { - $tmp = $this->config->current; - if(isset($tmp['ENABLE_SNAPSHOT'])){ - if (preg_match("/^true$/i", $tmp['ENABLE_SNAPSHOT']) || preg_match("/yes/i", $tmp['ENABLE_SNAPSHOT'])){ - - /* Check if the snapshot_base is defined */ - if(!isset($tmp['SNAPSHOT_BASE'])){ - msg_dialog::display(_("Configuration error"), sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."),"SNAPSHOT_BASE"), ERROR_DIALOG); - return(FALSE); - } - - /* check if there are special server configurations for snapshots */ - if(isset($tmp['SNAPSHOT_SERVER'])){ - - /* check if all required vars are available to create a new ldap connection */ - $missing = ""; - foreach(array("SNAPSHOT_SERVER","SNAPSHOT_USER","SNAPSHOT_PASSWORD","SNAPSHOT_BASE") as $var){ - if(!isset($tmp[$var])){ - $missing .= $var." "; - msg_dialog::display(_("Configuration error"), sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."), $missing), ERROR_DIALOG); - return(FALSE); - } - } - } - return(TRUE); - } - } - return(FALSE); + return $this->config->snapshotEnabled(); } @@ -1345,29 +1371,25 @@ class plugin $cfg= &$this->config->current; /* check if there are special server configurations for snapshots */ - - if(isset($cfg['SERVER']) && isset($cfg['SNAPSHOT_SERVER']) && $cfg['SERVER'] == $cfg['SNAPSHOT_SERVER']){ - $ldap_to = $ldap; - }elseif(isset($cfg['SNAPSHOT_SERVER'])){ - $server = $cfg['SNAPSHOT_SERVER']; - $user = $cfg['SNAPSHOT_USER']; - $password = $cfg['SNAPSHOT_PASSWORD']; - $snapldapbase = $cfg['SNAPSHOT_BASE']; - - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to -> cd ($snapldapbase); + if($this->config->get_cfg_value("snapshotURI") == ""){ + $ldap_to = $ldap; + }else{ + $server = $this->config->get_cfg_value("snapshotURI"); + $user = $this->config->get_cfg_value("snapshotAdminDn"); + $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword")); + $snapldapbase = $this->config->get_cfg_value("snapshotBase"); + $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); + $ldap_to -> cd($snapldapbase); if (!$ldap_to->success()){ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); } - }else{ - $ldap_to = $ldap; } /* Prepare bases and some other infos */ $base = $this->config->current['BASE']; - $snap_base = $cfg['SNAPSHOT_BASE']; + $snap_base = $this->config->get_cfg_value("snapshotBase"); $base_of_object = preg_replace ('/^[^,]+,/i', '', $dn); - $new_base = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base; + $new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base; $tmp = array(); /* Fetch all objects with gosaSnapshotDN=$dn */ @@ -1407,24 +1429,24 @@ class plugin $cfg= &$this->config->current; /* check if there are special server configurations for snapshots */ - if(isset($cfg['SNAPSHOT_SERVER'])){ - $server = $cfg['SNAPSHOT_SERVER']; - $user = $cfg['SNAPSHOT_USER']; - $password = $cfg['SNAPSHOT_PASSWORD']; - $snapldapbase = $cfg['SNAPSHOT_BASE']; - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to->cd ($snapldapbase); + if($this->config->get_cfg_value("snapshotURI") == ""){ + $ldap_to = $ldap; + }else{ + $server = $this->config->get_cfg_value("snapshotURI"); + $user = $this->config->get_cfg_value("snapshotAdminDn"); + $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword")); + $snapldapbase = $this->config->get_cfg_value("snapshotBase"); + $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); + $ldap_to -> cd($snapldapbase); if (!$ldap_to->success()){ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); } - }else{ - $ldap_to = $ldap; } /* Prepare bases */ $base = $this->config->current['BASE']; - $snap_base = $cfg['SNAPSHOT_BASE']; - $new_base = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base; + $snap_base = $this->config->get_cfg_value("snapshotBase"); + $new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base; /* Fetch all objects and check if they do not exist anymore */ $ui = get_userinfo(); @@ -1473,18 +1495,18 @@ class plugin $cfg= &$this->config->current; /* check if there are special server configurations for snapshots */ - if(isset($cfg['SNAPSHOT_SERVER'])){ - $server = $cfg['SNAPSHOT_SERVER']; - $user = $cfg['SNAPSHOT_USER']; - $password = $cfg['SNAPSHOT_PASSWORD']; - $snapldapbase = $cfg['SNAPSHOT_BASE']; - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to->cd ($snapldapbase); + if($this->config->get_cfg_value("snapshotURI") == ""){ + $ldap_to = $ldap; + }else{ + $server = $this->config->get_cfg_value("snapshotURI"); + $user = $this->config->get_cfg_value("snapshotAdminDn"); + $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword")); + $snapldapbase = $this->config->get_cfg_value("snapshotBase"); + $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); + $ldap_to -> cd($snapldapbase); if (!$ldap_to->success()){ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); } - }else{ - $ldap_to = $ldap; } /* Get the snapshot */ @@ -1509,17 +1531,14 @@ class plugin $ui = get_userinfo(); $this->parent = $parent; - if(!isset($this->acl_module)){ - return("VERDAMMT"); - } - foreach($_POST as $name => $value){ /* Create a new snapshot, display a dialog */ - if(preg_match("/^CreateSnapShotDialog_/",$name) && $once){ + if(preg_match("/^CreateSnapShotDialog_[^_]*_[xy]$/",$name) && $once){ + + $entry = base64_decode(preg_replace("/^CreateSnapShotDialog_([^_]*)_[xy]$/","\\1",$name)); $once = false; - $entry = preg_replace("/^CreateSnapShotDialog_/","",$name); - $entry = base64_decode(preg_replace("/_[xy]$/","",$entry)); + $entry = preg_replace("/^CreateSnapShotDialog_/","",$entry); if(!empty($entry) && $ui->allow_snapshot_create($entry,$this->parent->acl_module)){ $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); @@ -1531,9 +1550,8 @@ class plugin /* Restore a snapshot, display a dialog with all snapshots of the current object */ if(preg_match("/^RestoreSnapShotDialog_/",$name) && $once){ $once = false; - $entry = preg_replace("/^RestoreSnapShotDialog_/","",$name); - $entry = base64_decode(preg_replace("/_[xy]$/","",$entry)); - if(!empty($entry) && $ui->allow_snapshot_restore($entry,$this->parent->acl_module)){ + $entry = base64_decode(preg_replace("/^RestoreSnapShotDialog_([^_]*)_[xy]$/i","\\1",$name)); + if(!empty($entry) && $ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){ $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); $this->snapDialog->display_restore_dialog = true; }else{ @@ -1546,7 +1564,7 @@ class plugin || preg_match("/^RestoreDeletedSnapShot_/",$name)) && $once){ $once = false; - if($ui->allow_snapshot_restore($base,$this->parent->acl_module)){ + if($ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){ $this->snapDialog = new SnapShotDialog($this->config,"",$this); $this->snapDialog->set_snapshot_bases($baseSuffixe); $this->snapDialog->display_restore_dialog = true; @@ -1559,9 +1577,9 @@ class plugin /* Restore selected snapshot */ if(preg_match("/^RestoreSnapShot_/",$name) && $once){ $once = false; - $entry = preg_replace("/^RestoreSnapShot_/","",$name); - $entry = base64_decode(trim(preg_replace("/_[xy]$/","",$entry))); - if(!empty($entry) && $ui->allow_snapshot_restore($entry,$this->parent->acl_module)){ + $entry = base64_decode(preg_replace("/^RestoreSnapShot_([^_]*)_[xy]$/i","\\1",$name)); + + if(!empty($entry) && $ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){ $this->restore_snapshot($entry); $this->snapDialog = NULL; }else{ @@ -1621,6 +1639,7 @@ class plugin function acl_is_writeable($attribute,$skip_write = FALSE) { + if($this->read_only) return(FALSE); $ui= get_userinfo(); return preg_match('/w/', $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), $attribute, $skip_write)); } @@ -1635,6 +1654,7 @@ class plugin function acl_is_createable($base ="") { + if($this->read_only) return(FALSE); $ui= get_userinfo(); if($base == "") $base = $this->acl_base; return preg_match('/c/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0')); @@ -1643,6 +1663,7 @@ class plugin function acl_is_removeable($base ="") { + if($this->read_only) return(FALSE); $ui= get_userinfo(); if($base == "") $base = $this->acl_base; return preg_match('/d/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0')); @@ -1651,6 +1672,7 @@ class plugin function acl_is_moveable($base = "") { + if($this->read_only) return(FALSE); $ui= get_userinfo(); if($base == "") $base = $this->acl_base; return preg_match('/m/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0')); @@ -1665,6 +1687,7 @@ class plugin function getacl($attribute,$skip_write= FALSE) { $ui= get_userinfo(); + $skip_write |= $this->read_only; return $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), $attribute,$skip_write); } @@ -1698,6 +1721,8 @@ class plugin /* Add current base */ if(isset($this->base) && isset($this->config->idepartments[$this->base])){ $deps[$this->base] = $this->config->idepartments[$this->base]; + }elseif(strtolower($this->dn) == strtolower($this->config->current['BASE'])){ + }else{ trigger_error("Cannot return list of departments, no default base found in class ".get_class($this).". ".$this->base); } @@ -1705,7 +1730,7 @@ class plugin } - /* This function modifies object acls too, if an object is moved. + /* This function updates ACL settings if $old_dn was used. * $old_dn specifies the actually used dn * $new_dn specifies the destiantion dn */ @@ -1718,11 +1743,11 @@ class plugin } /* Update userinfo if necessary */ - $ui = session::get('ui'); + $ui = session::global_get('ui'); if($ui->dn == $old_dn){ $ui->dn = $new_dn; - session::set('ui',$ui); - new log("view","acl/".get_class($this),$this->dn,array(),"Updated current user dn from '".$old_dn."' to '".$new_dn."'"); + session::global_set('ui',$ui); + new log("view","acl/".get_class($this),$this->dn,array(),"Updated current object dn from '".$old_dn."' to '".$new_dn."'"); } /* Object was moved, ensure that all acls will be moved too */ @@ -1732,59 +1757,46 @@ class plugin $update = array(); $ldap = $this->config->get_ldap_link(); $ldap->cd ($this->config->current['BASE']); - $ldap->search("(&(objectClass=gosaAcl)(gosaAclEntry=*))",array("cn","gosaAclEntry")); + $ldap->search("(&(objectClass=gosaAcl)(gosaAclEntry=*".base64_encode($old_dn)."*))",array("cn","gosaAclEntry")); while($attrs = $ldap->fetch()){ - $acls = array(); - - /* Reset vars */ $found = false; - - /* Walk through acls */ for($i = 0 ; $i < $attrs['gosaAclEntry']['count'] ; $i ++ ){ - - /* Get Acl parts */ $acl_parts = split(":",$attrs['gosaAclEntry'][$i]); - /* Get every single member for this acl */ - $members = array(); - if(preg_match("/,/",$acl_parts[2])){ - $members = split(",",$acl_parts[2]); - }else{ - $members = array($acl_parts[2]); - } - - /* Check if member match current dn */ + /* Roles uses antoher data storage order, members are stored int the third part, + while the members in direct ACL assignments are stored in the second part. + */ + $id = ($acl_parts[1] == "role") ? 3 : 2; + + /* Update member entries to use $new_dn instead of old_dn + */ + $members = explode(",",$acl_parts[$id]); foreach($members as $key => $member){ $member = base64_decode($member); if($member == $old_dn){ - $found = true; $members[$key] = base64_encode($new_dn); + $found = TRUE; } } - - /* Create new member string */ - $new_members = ""; - foreach($members as $member){ - $new_members .= $member.","; - } - $new_members = preg_replace("/,$/","",$new_members); - $acl_parts[2] = $new_members; - - /* Reconstruckt acl entry */ - $acl_str =""; - foreach($acl_parts as $t){ - $acl_str .= $t.":"; + + /* Check if the selected role has to updated + */ + if($acl_parts[1] == "role" && $acl_parts[2] == base64_encode($old_dn)){ + $acl_parts[2] = base64_encode($new_dn); + $found = TRUE; } - $acl_str = preg_replace("/:$/","",$acl_str); - $acls[] = $acl_str; - } - /* Acls for this object must be adjusted */ - if($found){ + /* Build new acl string */ + $acl_parts[$id] = implode($members,","); + $acls[] = implode($acl_parts,":"); + } + + /* Acls for this object must be adjusted */ + if($found){ $debug_info= _("Changing ACL dn")." : 
 -"._("from")."  ". - $old_dn."
 -"._("to")." ".$new_dn."
"; + $old_dn."
 -"._("to")." ".$new_dn."
"; @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,$debug_info,"ACL"); $update[$attrs['dn']] =array(); @@ -1829,9 +1841,10 @@ class plugin /* Copy needed attributes */ foreach ($this->attributes as $val){ $found= array_key_ics($val, $this->multi_attrs); + if ($found != ""){ - if(isset($this->multi_attrs["$found"][0])){ - $this->$val= $this->multi_attrs["$found"][0]; + if(isset($this->multi_attrs["$val"][0])){ + $this->$val= $this->multi_attrs["$val"][0]; } } } @@ -1879,11 +1892,13 @@ class plugin function multiple_execute() { /* This one is empty currently. Fabian - please fill in the docu code */ - session::set('current_class_for_help',get_class($this)); + session::global_set('current_class_for_help',get_class($this)); /* Reset Lock message POST/GET check array, to prevent perg_match errors*/ session::set('LOCK_VARS_TO_USE',array()); - session::set('LOCK_VARS_USED',array()); + session::set('LOCK_VARS_USED_GET',array()); + session::set('LOCK_VARS_USED_POST',array()); + session::set('LOCK_VARS_USED_REQUEST',array()); return("Multiple edit is currently not implemented for this plugin."); } @@ -1979,21 +1994,23 @@ class plugin { $str= ""; $ui = get_userinfo(); - if($this->snapshotEnabled() && $ui->allow_snapshot_restore($base,$category)){ + if($this->snapshotEnabled()){ + if ($ui->allow_snapshot_restore($base,$category)){ - if(count($this->Available_SnapsShots($base))){ - $str.= " "; - } else { - $str = " "; + if(count($this->Available_SnapsShots($base))){ + $str.= " "; + } else { + $str = " "; + } + } + if($ui->allow_snapshot_create($base,$category)){ + $str.= " "; + }else{ + $str = "  "; } - } - if($this->snapshotEnabled() && $ui->allow_snapshot_create($base,$category)){ - $str.= " "; - }else{ - $str = "  "; } return($str); @@ -2039,10 +2056,10 @@ class plugin /* Check permissions for each category, if there is at least one category which support read or paste permissions for the given base, then display the specific actions. */ - $readable = $pasteable = TRUE; + $readable = $pasteable = false; foreach($category as $cat){ - $readable |= $ui->get_category_permissions($base,$cat); - $pasteable|= $ui->is_pasteable($base,$cat); + $readable= $readable || preg_match('/r/', $ui->get_category_permissions($base, $cat)); + $pasteable= $pasteable || $ui->is_pasteable($base, $cat) == 1; } if(($cut || $copy) && isset($this->CopyPasteHandler) && is_object($this->CopyPasteHandler)){ @@ -2076,6 +2093,11 @@ class plugin { return(array()); } + + function is_modal_dialog() + { + return(isset($this->dialog) && $this->dialog); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: