X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_plugin.inc;h=31d5b4bafd80e2c155c2852626394c08e60b80f1;hb=06cc53394cf695b3bc663073e526d7d94e4bb2d6;hp=2e10d7215e84e4a0291045348bb438b59a0bbc38;hpb=328dee909ba4b0f59a089805845585b19e7c1ff7;p=gosa.git
diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 2e10d7215..31d5b4baf 100644
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -180,7 +180,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");
@@ -215,13 +215,18 @@ class plugin
unset($this->saved_attributes[$index]);
continue;
}
- if (isset($this->saved_attributes[$index][0]) || $this->saved_attributes[$index]["count"] == 1){
- $tmp= $this->saved_attributes[$index][0];
- unset($this->saved_attributes[$index]);
- $this->saved_attributes[$index]= $tmp;
- continue;
- }
+ if (isset($this->saved_attributes[$index][0])){
+ if(!isset($this->saved_attributes[$index]["count"])){
+ $this->saved_attributes[$index]["count"] = count($this->saved_attributes[$index]);
+ }
+ if($this->saved_attributes[$index]["count"] == 1){
+ $tmp= $this->saved_attributes[$index][0];
+ unset($this->saved_attributes[$index]);
+ $this->saved_attributes[$index]= $tmp;
+ continue;
+ }
+ }
unset($this->saved_attributes["$index"]["count"]);
}
if(isset($this->attrs['gosaUnitTag'])){
@@ -268,7 +273,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){
@@ -496,7 +501,7 @@ class plugin
}
/* Adapt from template, using 'dn' */
- function adapt_from_template($dn)
+ function adapt_from_template($dn, $skip= array())
{
/* Include global link_info */
$ldap= $this->config->get_ldap_link();
@@ -508,6 +513,11 @@ class plugin
/* Walk through attributes */
foreach ($this->attributes as $val){
+ /* Skip the ones in skip list */
+ if (in_array($val, $skip)){
+ continue;
+ }
+
if (isset($this->attrs["$val"][0])){
/* If attribute is set, replace dynamic parts:
@@ -603,26 +613,36 @@ class plugin
if ($command != ""){
- /* Additional attributes */
- foreach ($add_attrs as $name => $value){
- $command= preg_replace("/%$name( |$)/", "$value ", $command);
- }
-
/* Walk through attribute list */
foreach ($this->attributes as $attr){
if (!is_array($this->$attr)){
- $command= preg_replace("/%$attr( |$)/", $this->$attr." ", $command);
+ $add_attrs[$attr] = $this->$attr;
}
}
- $command= preg_replace("/%dn( |$)/", $this->dn." ", $command);
+ $add_attrs['dn']=$this->dn;
+
+ $tmp = array();
+ foreach($add_attrs as $name => $value){
+ $tmp[$name] = strlen($name);
+ }
+ arsort($tmp);
+
+ /* Additional attributes */
+ foreach ($tmp as $name => $len){
+ $value = $add_attrs[$name];
+ $command= preg_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));
+ $message= msgPool::cmdnotfound("POSTCREATE", get_class($this));
msg_dialog::display(_("Error"), $message, ERROR_DIALOG);
}
}
@@ -635,26 +655,35 @@ class plugin
if ($command != ""){
- /* Additional attributes */
- foreach ($add_attrs as $name => $value){
- $command= preg_replace("/%$name( |$)/", "$value ", $command);
- }
-
/* Walk through attribute list */
foreach ($this->attributes as $attr){
if (!is_array($this->$attr)){
- $command= preg_replace("/%$attr( |$)/", $this->$attr." ", $command);
+ $add_attrs[$attr] = $this->$attr;
}
}
- $command= preg_replace("/%dn( |$)/", $this->dn." ", $command);
+ $add_attrs['dn']=$this->dn;
- if (check_command($command)){
- @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,
- $command, "Execute");
+ $tmp = array();
+ foreach($add_attrs as $name => $value){
+ $tmp[$name] = strlen($name);
+ }
+ arsort($tmp);
+
+ /* Additional attributes */
+ foreach ($tmp as $name => $len){
+ $value = $add_attrs[$name];
+ $command= preg_replace("/%$name/", "$value", $command);
+ }
- exec($command);
+ if (check_command($command)){
+ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,$command, "Execute");
+ exec($command,$arr);
+ foreach($arr as $str){
+ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,
+ $command, "Result: ".$str);
+ }
} else {
- $message[]= msgPool::cmdnotfound("POSTMODIFY", get_class($this));
+ $message= msgPool::cmdnotfound("POSTMODIFY", get_class($this));
msg_dialog::display(_("Error"), $message, ERROR_DIALOG);
}
}
@@ -666,26 +695,37 @@ class plugin
$command= $this->config->search(get_class($this), "POSTREMOVE",array('menu','tabs'));
if ($command != ""){
- /* Additional attributes */
- foreach ($add_attrs as $name => $value){
- $command= preg_replace("/%$name( |$)/", "$value ", $command);
- }
-
/* Walk through attribute list */
foreach ($this->attributes as $attr){
if (!is_array($this->$attr)){
- $command= preg_replace("/%$attr( |$)/", $this->$attr." ", $command);
+ $add_attrs[$attr] = $this->$attr;
}
}
- $command= preg_replace("/%dn( |$)/", $this->dn." ", $command);
+ $add_attrs['dn']=$this->dn;
+
+ $tmp = array();
+ foreach($add_attrs as $name => $value){
+ $tmp[$name] = strlen($name);
+ }
+ arsort($tmp);
+
+ /* Additional attributes */
+ foreach ($tmp as $name => $len){
+ $value = $add_attrs[$name];
+ $command= preg_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));
+ $message= msgPool::cmdnotfound("POSTREMOVE", get_class($this));
msg_dialog::display(_("Error"), $message, ERROR_DIALOG);
}
}
@@ -724,7 +764,7 @@ class plugin
function rebind($ldap, $referral)
{
$credentials= LDAP::get_credentials($referral, $this->config->current['REFERRAL']);
- if (ldap_bind($ldap, $credentials['ADMIN'], $credentials['PASSWORD'])) {
+ if (ldap_bind($ldap, $credentials['ADMIN'], $this->config->get_credentials($credentials['PASSWORD']))) {
$this->error = "Success";
$this->hascon=true;
$this->reconnect= true;
@@ -803,7 +843,7 @@ class plugin
$ldap->cd($dst_dn);
$ldap->add($new);
- if ($ldap->error != "Success"){
+ if (!$ldap->success()){
trigger_error("Trying to save $dst_dn failed.",
E_USER_WARNING);
return(FALSE);
@@ -853,6 +893,117 @@ class plugin
}
+
+ /*! \brief Move a given ldap object indentified by $src_dn \
+ to the given destination $dst_dn \
+ * Ensure that all references are updated (ogroups) \
+ * Update ACLs \
+ * Update accessTo \
+ @param String The source dn.
+ @param String The destination dn.
+ @return Boolean TRUE on success else FALSE.
+ */
+ function rename($src_dn, $dst_dn)
+ {
+ $start = microtime(1);
+
+ /* 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()));
+ 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,
+ maybe we have to update ACL references.
+ */
+ $leaf_users= get_list("(objectClass=gosaAccount)",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);
+ $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) ;
+
+ /* Walk through all objectGroups and check if there are
+ members matching the source dn
+ */
+ foreach($ogroups as $ogroup){
+ if(isset($ogroup['member'])){
+
+ /* Reset class object, this will be initialized with class_ogroup on demand
+ */
+ $o_ogroup = NULL;
+ for($i = 0 ; $i < $ogroup['member']['count'] ; $i ++){
+
+ $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]);
+
+ if($o_ogroup == NULL){
+ $o_ogroup = new ogroup($this->config,$ogroup['dn']);
+ }
+
+ 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();
+ }
+ }
+ }
+
+ /* Check if there are gosa departments moved.
+ If there were deps moved, the force reload of config->deps.
+ */
+ $leaf_deps= get_list("(objectClass=gosaDepartment)",array("all"),$dst_dn,
+ array("dn","objectClass"),GL_SUBSEARCH | GL_NO_ACL_CHECK);
+
+ if(count($leaf_deps)){
+ $this->config->get_departments();
+ $this->config->make_idepartments();
+ session::set("config",$this->config);
+ $ui =get_userinfo();
+ $ui->reset_acl_cache();
+ }
+
+ return(TRUE);
+ }
+
+
+
function move($src_dn, $dst_dn)
{
/* Do not copy if only upper- lowercase has changed */
@@ -860,6 +1011,21 @@ class plugin
return(TRUE);
}
+
+ /* Try to move the entry instead of copy & delete
+ */
+ if(TRUE){
+
+ /* Try to move with ldap routines, if this was not successfull
+ fall back to the old style copy & remove method
+ */
+ if($this->rename($src_dn, $dst_dn)){
+ return(TRUE);
+ }else{
+ // See code below.
+ }
+ }
+
/* Copy source to destination */
if (!$this->copy($src_dn, $dst_dn)){
return (FALSE);
@@ -868,7 +1034,7 @@ class plugin
/* Delete source */
$ldap= $this->config->get_ldap_link();
$ldap->rmdir_recursive($src_dn);
- if ($ldap->error != "Success"){
+ if (!$ldap->success()){
trigger_error("Trying to delete $src_dn failed.",
E_USER_WARNING);
return (FALSE);
@@ -987,7 +1153,7 @@ class plugin
foreach ($this->config->adepartments as $key => $ntag){
/* This one is bigger than our dn, its not relevant... */
- if ($len <= strlen($key)){
+ if ($len < strlen($key)){
continue;
}
@@ -1052,28 +1218,32 @@ 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("snapshot_server") == ""){
/* 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("snapshot_server");
+ $user = $config->get_cfg_value("snapshot_user");
+ $password = $config->get_cfg_value("snapshot_password");
+ $snapldapbase = $config->get_cfg_value("snapshot_base");
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
- show_ldap_error($ldap->get_error(), sprintf(_("Saving object snapshot with dn '%s' failed."),$snapldapbase));
+
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
+
}
/* check if the dn exists */
@@ -1084,7 +1254,7 @@ class plugin
/* Collect some infos */
$base = $this->config->current['BASE'];
- $snap_base = $tmp['SNAPSHOT_BASE'];
+ $snap_base = $config->get_cfg_value("snapshot_base");
$base_of_object = preg_replace ('/^[^,]+,/i', '', $this->dn);
$new_base = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base;
@@ -1119,9 +1289,14 @@ class plugin
$ldap_to->create_missing_trees($new_base);
$ldap_to->cd($new_dn);
$ldap_to->add($target);
-
- show_ldap_error($ldap->get_error(), sprintf(_("Saving object snapshot with dn '%s' failed."),$new_base));
- show_ldap_error($ldap_to->get_error(), sprintf(_("Saving object snapshot with dn '%s' failed."),$new_base));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $new_dn, LDAP_ADD, get_class()));
+ }
+
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $new_base, "", get_class()));
+ }
+
}
}
@@ -1141,31 +1316,28 @@ 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);
- }
+ $config = $this->config;
+ if($config->get_cfg_value("enable_snapshot") == "true"){
+ /* Check if the snapshot_base is defined */
+ if ($config->get_cfg_value("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 ($config->get_cfg_value("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($config->get_cfg_value($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);
}
@@ -1193,9 +1365,11 @@ class plugin
$password = $cfg['SNAPSHOT_PASSWORD'];
$snapldapbase = $cfg['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd ($snapldapbase);
- show_ldap_error($ldap->get_error(), sprintf(_("Method get available snapshots with dn '%s' failed."),$this->dn));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
}else{
$ldap_to = $ldap;
}
@@ -1249,9 +1423,11 @@ class plugin
$user = $cfg['SNAPSHOT_USER'];
$password = $cfg['SNAPSHOT_PASSWORD'];
$snapldapbase = $cfg['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to->cd ($snapldapbase);
- show_ldap_error($ldap_to->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
}else{
$ldap_to = $ldap;
}
@@ -1313,9 +1489,11 @@ class plugin
$user = $cfg['SNAPSHOT_USER'];
$password = $cfg['SNAPSHOT_PASSWORD'];
$snapldapbase = $cfg['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to->cd ($snapldapbase);
- show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$snapldapbase));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
}else{
$ldap_to = $ldap;
}
@@ -1328,14 +1506,20 @@ class plugin
$data = gzuncompress($ldap_to->get_attribute($dn,'gosaSnapshotData'));
/* Import the given data */
+ $err = "";
$ldap->import_complete_ldif($data,$err,false,false);
- show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$dn));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, "", get_class()));
+ }
}
- function showSnapshotDialog($base,$baseSuffixe)
+ function showSnapshotDialog($base,$baseSuffixe,&$parent)
{
$once = true;
+ $ui = get_userinfo();
+ $this->parent = $parent;
+
foreach($_POST as $name => $value){
/* Create a new snapshot, display a dialog */
@@ -1343,26 +1527,40 @@ class plugin
$once = false;
$entry = preg_replace("/^CreateSnapShotDialog_/","",$name);
$entry = base64_decode(preg_replace("/_[xy]$/","",$entry));
- $this->snapDialog = new SnapShotDialog($this->config,$entry,$this);
- }
+ if(!empty($entry) && $ui->allow_snapshot_create($entry,$this->parent->acl_module)){
+ $this->snapDialog = new SnapShotDialog($this->config,$entry,$this);
+ }else{
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s."),$entry),ERROR_DIALOG);
+ }
+ }
+
/* 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));
- $this->snapDialog = new SnapShotDialog($this->config,$entry,$this);
- $this->snapDialog->display_restore_dialog = true;
+ if(!empty($entry) && $ui->allow_snapshot_restore($entry,$this->parent->acl_module)){
+ $this->snapDialog = new SnapShotDialog($this->config,$entry,$this);
+ $this->snapDialog->display_restore_dialog = true;
+ }else{
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),ERROR_DIALOG);
+ }
}
/* Restore one of the already deleted objects */
if(((isset($_POST['menu_action']) && $_POST['menu_action'] == "RestoreDeletedSnapShot")
|| preg_match("/^RestoreDeletedSnapShot_/",$name)) && $once){
$once = false;
- $this->snapDialog = new SnapShotDialog($this->config,"",$this);
- $this->snapDialog->set_snapshot_bases($baseSuffixe);
- $this->snapDialog->display_restore_dialog = true;
- $this->snapDialog->display_all_removed_objects = true;
+
+ if($ui->allow_snapshot_restore($base,$this->parent->acl_module)){
+ $this->snapDialog = new SnapShotDialog($this->config,"",$this);
+ $this->snapDialog->set_snapshot_bases($baseSuffixe);
+ $this->snapDialog->display_restore_dialog = true;
+ $this->snapDialog->display_all_removed_objects = true;
+ }else{
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$base),ERROR_DIALOG);
+ }
}
/* Restore selected snapshot */
@@ -1370,9 +1568,11 @@ class plugin
$once = false;
$entry = preg_replace("/^RestoreSnapShot_/","",$name);
$entry = base64_decode(trim(preg_replace("/_[xy]$/","",$entry)));
- if(!empty($entry)){
+ if(!empty($entry) && $ui->allow_snapshot_restore($entry,$this->parent->acl_module)){
$this->restore_snapshot($entry);
$this->snapDialog = NULL;
+ }else{
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),ERROR_DIALOG);
}
}
}
@@ -1440,24 +1640,27 @@ class plugin
}
- function acl_is_createable()
+ function acl_is_createable($base ="")
{
$ui= get_userinfo();
- return preg_match('/c/', $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), '0'));
+ if($base == "") $base = $this->acl_base;
+ return preg_match('/c/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0'));
}
- function acl_is_removeable()
+ function acl_is_removeable($base ="")
{
$ui= get_userinfo();
- return preg_match('/d/', $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), '0'));
+ if($base == "") $base = $this->acl_base;
+ return preg_match('/d/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0'));
}
- function acl_is_moveable()
+ function acl_is_moveable($base = "")
{
$ui= get_userinfo();
- return preg_match('/m/', $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), '0'));
+ if($base == "") $base = $this->acl_base;
+ return preg_match('/m/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0'));
}
@@ -1472,18 +1675,18 @@ class plugin
return $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), $attribute,$skip_write);
}
- /* Get all allowed bases to move an object to or to create a new object.
- Idepartments also contains all base departments which lead to the allowed bases */
- function get_allowed_bases($category = "")
+
+ /*! \brief Returns a list of all available departments for this object.
+ If this object is new, all departments we are allowed to create a new user in are returned.
+ If this is an existing object, return all deps. we are allowed to move tis object too.
+
+ @return Array [dn] => "..name" // All deps. we are allowed to act on.
+ */
+ function get_allowed_bases()
{
$ui = get_userinfo();
$deps = array();
- /* Set category */
- if(empty($category)){
- $category = $this->acl_category.get_class($this);
- }
-
/* Is this a new object ? Or just an edited existing object */
if(!$this->initially_was_account && $this->is_account){
$new = true;
@@ -1491,17 +1694,10 @@ class plugin
$new = false;
}
- $cat_bases = $ui->get_module_departments(preg_replace("/\/.*$/","",$category));
foreach($this->config->idepartments as $dn => $name){
-
- if(!in_array_ics($dn,$cat_bases)){
- continue;
- }
-
- $acl = $ui->get_permissions($dn,$category);
- if($new && preg_match("/c/",$acl)){
+ if($new && $this->acl_is_createable($dn)){
$deps[$dn] = $name;
- }elseif(!$new && preg_match("/m/",$acl)){
+ }elseif(!$new && $this->acl_is_moveable($dn)){
$deps[$dn] = $name;
}
}
@@ -1509,8 +1705,10 @@ 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("No default base found in class ".get_class($this).". ".$this->base);
+ trigger_error("Cannot return list of departments, no default base found in class ".get_class($this).". ".$this->base);
}
return($deps);
}
@@ -1548,12 +1746,12 @@ class plugin
$acls = array();
+ /* Reset vars */
+ $found = false;
+
/* Walk through acls */
for($i = 0 ; $i < $attrs['gosaAclEntry']['count'] ; $i ++ ){
- /* Reset vars */
- $found = false;
-
/* Get Acl parts */
$acl_parts = split(":",$attrs['gosaAclEntry'][$i]);
@@ -1573,7 +1771,7 @@ class plugin
$members[$key] = base64_encode($new_dn);
}
}
-
+
/* Create new member string */
$new_members = "";
foreach($members as $member){
@@ -1588,6 +1786,7 @@ class plugin
$acl_str .= $t.":";
}
$acl_str = preg_replace("/:$/","",$acl_str);
+ $acls[] = $acl_str;
}
/* Acls for this object must be adjusted */
@@ -1758,6 +1957,136 @@ class plugin
$message = plugin::check();
return($message);
}
+
+
+ /*! \brief Returns the snapshot header part for "Actions" menu in management dialogs
+ @param $layer_menu
+ */
+ function get_snapshot_header($base,$category)
+ {
+ $str = "";
+ $ui = get_userinfo();
+ if($this->snapshotEnabled() && $ui->allow_snapshot_restore($base,$category)){
+
+ $ok = false;
+ foreach($this->get_used_snapshot_bases() as $base){
+ $ok |= count($this->getAllDeletedSnapshots($base)) >= 1 ;
+ }
+
+ if($ok){
+ $str = "..|
"._("Restore"). "|RestoreDeletedSnapShot|\n";
+ }else{
+ $str = "..|
"._("Restore")."||\n";
+ }
+ }
+ return($str);
+ }
+
+
+ function get_snapshot_action($base,$category)
+ {
+ $str= "";
+ $ui = get_userinfo();
+ if($this->snapshotEnabled()){
+ if ($ui->allow_snapshot_restore($base,$category)){
+
+ if(count($this->Available_SnapsShots($base))){
+ $str.= " ";
+ } else {
+ $str = " ";
+ }
+ }
+ if($ui->allow_snapshot_create($base,$category)){
+ $str.= " ";
+ }else{
+ $str = "
";
+ }
+ }
+
+ return($str);
+ }
+
+
+ function get_copypaste_action($base,$category,$class,$copy = TRUE, $cut = TRUE)
+ {
+ $ui = get_userinfo();
+ $action = "";
+ if($this->CopyPasteHandler){
+ if($cut){
+ if($ui->is_cutable($base,$category,$class)){
+ $action .= " ";
+ }else{
+ $action.=" ";
+ }
+ }
+ if($copy){
+ if($ui->is_copyable($base,$category,$class)){
+ $action.= " ";
+ }else{
+ $action.=" ";
+ }
+ }
+ }
+
+ return($action);
+ }
+
+
+ function get_copypaste_header($base,$category,$copy = TRUE, $cut = TRUE)
+ {
+ $s = "";
+ $ui =get_userinfo();
+
+ if(!is_array($category)){
+ $category = array($category);
+ }
+
+ /* 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;
+ foreach($category as $cat){
+ $readable |= $ui->get_category_permissions($base,$cat);
+ $pasteable|= $ui->is_pasteable($base,$cat);
+ }
+
+ if(($cut || $copy) && isset($this->CopyPasteHandler) && is_object($this->CopyPasteHandler)){
+ if($readable){
+ $s.= "..|---|\n";
+ if($copy){
+ $s.= "..|
".
+ " "._("Copy")."|"."multiple_copy_systems|\n";
+ }
+ if($cut){
+ $s.= "..|
".
+ " "._("Cut")."|"."multiple_cut_systems|\n";
+ }
+ }
+
+ if($pasteable){
+ if($this->CopyPasteHandler->entries_queued()){
+ $img = "
";
+ $s.="..|".$img." "._("Paste")."|editPaste|\n";
+ }else{
+ $img = "
";
+ $s.="..|".$img." "._("Paste")."\n";
+ }
+ }
+ }
+ return($s);
+ }
+
+
+ function get_used_snapshot_bases()
+ {
+ return(array());
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: