X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_plugin.inc;h=8bb0a2ce35e9e631fe63b40968e17e49f6408184;hb=1352a55239650c688be5bffa60230dc15d9983af;hp=3b8508967df9692daba2b6a74a42363ccfb7b238;hpb=17f1c734f9c5a73ab9c7de270fd3614a4e26e1c8;p=gosa.git diff --git a/include/class_plugin.inc b/include/class_plugin.inc index 3b8508967..8bb0a2ce3 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -115,6 +115,9 @@ class plugin var $plHeadline= ""; var $plDescription= ""; + /* This can be set to render the tabulators in another stylesheet */ + var $pl_notify= FALSE; + /*! \brief plugin constructor If 'dn' is set, the node loads the given 'dn' from LDAP @@ -222,8 +225,6 @@ class plugin */ function execute() { - gosa_log("ACL ".get_class($this)." - ".$this->acl_category." - ".$this->acl_base); - /* This one is empty currently. Fabian - please fill in the docu code */ $_SESSION['current_class_for_help'] = get_class($this); @@ -397,6 +398,11 @@ class plugin } } } + + /* Update saved attributes and ensure that next cleanups will be successful too */ + foreach($this->attrs as $name => $value){ + $this->saved_attributes[$name] = $value; + } } /* Check formular input */ @@ -909,15 +915,41 @@ class plugin } - function PrepareForCopyPaste($source){ + function PrepareForCopyPaste($source) + { $todo = $this->attributes; if(isset($this->CopyPasteVars)){ $todo = array_merge($todo,$this->CopyPasteVars); } - $todo[] = "is_account"; + + if(count($this->objectclasses)){ + $this->is_account = TRUE; + foreach($this->objectclasses as $class){ + if(!in_array($class,$source['objectClass'])){ + $this->is_account = FALSE; + } + } + } + foreach($todo as $var){ - if (isset($source->$var)){ - $this->$var= $source->$var; + 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]; + } + $this->$var = $tmp; +# echo $var."=".$tmp."
"; + }else{ + $this->$var = $source[$var][0]; +# echo $var."=".$source[$var][0]."
"; + } + }else{ + $this->$var= $source[$var]; +# echo $var."=".$source[$var]."
"; + } } } } @@ -1069,7 +1101,7 @@ class plugin $server = $tmp['SNAPSHOT_SERVER']; $user = $tmp['SNAPSHOT_USER']; $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE']; + $snapldapbase = $tmp['SNAPSHOT_BASE']; $ldap_to = new LDAP($user,$password, $server); $ldap_to -> cd($snapldapbase); @@ -1146,7 +1178,7 @@ class plugin /* Check if the snapshot_base is defined */ if(!isset($tmp['SNAPSHOT_BASE'])){ - print_red(sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not configured in your gosa.conf."),$missing)); + print_red(sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not configured in your gosa.conf."),"SNAPSHOT_BASE")); return(FALSE); } @@ -1155,7 +1187,7 @@ class plugin /* check if all required vars are available to create a new ldap connection */ $missing = ""; - foreach(array("SNAPSHOT_SERVER","SNAPSHOT_USER","SNAPSHOT_PASSWORD","SNAPSHOT_LDAP_BASE") as $var){ + foreach(array("SNAPSHOT_SERVER","SNAPSHOT_USER","SNAPSHOT_PASSWORD","SNAPSHOT_BASE") as $var){ if(!isset($tmp[$var])){ $missing .= $var." "; print_red(sprintf(_("The snapshot functionality is enabled, but the required variable(s) '%s' is not configured in your gosa.conf."),$missing)); @@ -1187,7 +1219,7 @@ class plugin $server = $tmp['SNAPSHOT_SERVER']; $user = $tmp['SNAPSHOT_USER']; $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE']; + $snapldapbase = $tmp['SNAPSHOT_BASE']; $ldap_to = 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)); @@ -1243,7 +1275,7 @@ class plugin $server = $tmp['SNAPSHOT_SERVER']; $user = $tmp['SNAPSHOT_USER']; $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE']; + $snapldapbase = $tmp['SNAPSHOT_BASE']; $ldap_to = new LDAP($user,$password, $server); $ldap_to->cd ($snapldapbase); show_ldap_error($ldap->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn)); @@ -1307,7 +1339,7 @@ class plugin $server = $tmp['SNAPSHOT_SERVER']; $user = $tmp['SNAPSHOT_USER']; $password = $tmp['SNAPSHOT_PASSWORD']; - $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE']; + $snapldapbase = $tmp['SNAPSHOT_BASE']; $ldap_to = new LDAP($user,$password, $server); $ldap_to->cd ($snapldapbase); show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$snapldapbase)); @@ -1524,6 +1556,12 @@ class plugin return; } + /* Update userinfo if necessary */ + if($_SESSION['ui']->dn == $old_dn){ + $_SESSION['ui']->dn = $new_dn; + new log("view","acl/".get_class($this),$this->dn,array(),"Updated current user dn from '".$old_dn."' to '".$new_dn."'"); + } + /* Object was moved, ensure that all acls will be moved too */ if($new_dn != $old_dn && $old_dn != "new"){ @@ -1555,14 +1593,14 @@ class plugin /* Check if member match current dn */ foreach($members as $key => $member){ - $member = base64_decode($member); if($member == $old_dn){ $found = true; $members[$key] = base64_encode($new_dn); } } - + + /* Create new member string */ $new_members = ""; foreach($members as $member){ $new_members .= $member.","; @@ -1570,20 +1608,24 @@ class plugin $new_members = preg_replace("/,$/","",$new_members); $acl_parts[2] = $new_members; + /* Reconstruckt acl entry */ $acl_str =""; foreach($acl_parts as $t){ - $acl_str .= $t.":"; + $acl_str .= $t.":"; } $acl_str = preg_replace("/:$/","",$acl_str); - - $acls[] = $acl_str; - } + /* Acls for this object must be adjusted */ - if($found){ + if($found){ if($output_changes){ - echo "Changing ACL dn from :
 -  to".$old_dn."
 - ".$new_dn."
"; + echo "". + _("Changing ACL dn")." : 
 -"._("from")."  ". + $old_dn. + "
 -"._("to")." ". + $new_dn. + "
"; } $update[$attrs['dn']] =array(); foreach($acls as $acl){