![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index b205c00cd824f380971645304fb339f967d02deb..c56cfae687e9f38d8e8b144314cc3a8ec8e38842 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
{
/* Rename dn in possible object groups */
$ldap= $this->config->get_ldap_link();
- $ldap->search('(&(objectClass=gosaGroupOfNames)(member='.$src_dn.'))',
+ $ldap->search('(&(objectClass=gosaGroupOfNames)(member='.@LDAP::fix($src_dn).'))',
array('cn'));
while ($attrs= $ldap->fetch()){
$og= new ogroup($this->config, $ldap->getDN());
$ldap->cat($dst_dn);
$attrs= $ldap->fetch();
if (count($attrs)){
- trigger_error("Trying to overwrite $dst_dn, which already exists.",
+ trigger_error("Trying to overwrite ".@LDAP::fix($dst_dn).", which already exists.",
E_USER_WARNING);
return (FALSE);
}
$ldap->cat($src_dn);
$attrs= $ldap->fetch();
if (!count($attrs)){
- trigger_error("Trying to move $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);
}
$r=ldap_bind($ds,$this->config->current['ADMIN'], $this->config->current['PASSWORD']);
error_reporting (0);
- $sr=ldap_read($ds, $ldap->fix($src_dn), "objectClass=*");
+ $sr=ldap_read($ds, @LDAP::fix($src_dn), "objectClass=*");
/* Fill data from LDAP */
$new= array();
/* Adapt naming attribute */
$dst_name= preg_replace("/^([^=]+)=.*$/", "\\1", $dst_dn);
$dst_val = preg_replace("/^[^=]+=([^,+]+).*,.*$/", "\\1", $dst_dn);
- $new[$dst_name]= $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("/\\\\2C/",$new['ou']))){
- $new['ou'] = preg_replace("/\\\\2C/",",",$new['ou']);
+ if((isset($new['ou'])) &&( preg_match("/\\,/",$new['ou']))){
+ $new['ou'] = preg_replace("/\\\\,/",",",$new['ou']);
}
/* Save copy */
}
/* Get configuration from gosa.conf */
- $tmp = $this->config->data['MAIN'];
- /* Check if the undo level is specified */
- if(isset($tmp['SNAPSHOT_UNDO_LEVEL'])){
- $UndoLvl = $tmp['SNAPSHOT_UNDO_LEVEL'];
- }else{
- $UndoLvl = 5;
- }
+ $tmp = $this->config->current;
/* Create lokal ldap connection */
$ldap= $this->config->get_ldap_link();
if(!isset($tmp['SNAPSHOT_SERVER'])){
/* Source and destination server are both the same, just copy source to dest obj */
- $ldap_to = $ldap;
+ $ldap_to = $ldap;
+ $snapldapbase = $this->config->current['BASE'];
}else{
$server = $tmp['SNAPSHOT_SERVER'];
show_ldap_error($ldap_to->get_error(), _("Snapshot failed."));
}
-
/* check if the dn exists */
if ($ldap->dn_exists($this->dn)){
}
/* Inset this new snapshot */
+ $ldap_to->cd($snapldapbase);
$ldap_to->create_missing_trees($new_base);
$ldap_to->cd($new_dn);
$ldap_to->add($target);
+
show_ldap_error($ldap_to->get_error(), _("Create snapshot failed."));
show_ldap_error($ldap->get_error(), _("Create snapshot failed."));
+ }
+ }
- /* Check amount of used snapshots, and remove old ones if necessary */
- $test = $this->Available_SnapsShots($this->dn,true);
- if(count($test) > $UndoLvl){
- $toDel = array();
- foreach($test as $entry){
- $toDel[preg_replace("/-/","",$entry['gosaSnapshotTimestamp'][0])] = $entry['dn'];
- }
- krsort($toDel);
- $i = 0 ;
- foreach($toDel as $entryID => $entry){
- $i ++ ;
- if($i > $UndoLvl){
- $ldap_to->rmdir_recursive($entry);
- }
- }
- }
+ function remove_snapshot($dn)
+ {
+ $ui = get_userinfo();
+ $acl = get_permissions ($dn, $ui->subtreeACL);
+ $acl = get_module_permission($acl, "snapshot", $dn);
+
+ if (chkacl($this->acl, "delete") == ""){
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->rmdir_recursive($dn);
+ }else{
+ print_red (_("You are not allowed to delete this snap shot!"));
}
}
There will also be some errors psoted, if the configuration failed */
function snapshotEnabled()
{
- $tmp = $this->config->data['MAIN'];
+ $tmp = $this->config->current;
if(isset($tmp['ENABLE_SNAPSHOT'])){
if (preg_match("/^true$/i", $tmp['ENABLE_SNAPSHOT']) || preg_match("/yes/i", $tmp['ENABLE_SNAPSHOT'])){
points to our ldap snapshot server */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $tmp = $this->config->data['MAIN'];
+ $tmp = $this->config->current;
/* check if there are special server configurations for snapshots */
if(isset($tmp['SNAPSHOT_SERVER'])){
points to our ldap snapshot server */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $tmp = $this->config->data['MAIN'];
+ $tmp = $this->config->current;
/* check if there are special server configurations for snapshots */
if(isset($tmp['SNAPSHOT_SERVER'])){
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $tmp = $this->config->data['MAIN'];
+ $tmp = $this->config->current;
/* check if there are special server configurations for snapshots */
if(isset($tmp['SNAPSHOT_SERVER'])){
$data = gzuncompress($ldap_to->get_attribute($dn,'gosaSnapshotData'));
/* Import the given data */
- $ldap->import_complete_ldif($data,$err,true,true);
+ $ldap->import_complete_ldif($data,$err,false,false);
show_ldap_error($ldap_to->get_error().$err, _("Restore snapshot failed."));
}
foreach($_POST as $name => $value){
/* Create a new snapshot, display a dialog */
- if(preg_match("/^CreateSnapShot_/",$name) && $once){
+ if(preg_match("/^CreateSnapShotDialog_/",$name) && $once){
$once = false;
- $entry = preg_replace("/^CreateSnapShot_/","",$name);
+ $entry = preg_replace("/^CreateSnapShotDialog_/","",$name);
$entry = base64_decode(preg_replace("/_[xy]$/","",$entry));
$this->snapDialog = new SnapShotDialog($this->config,$entry,$this);
}
/* Restore a snapshot, display a dialog with all snapshots of the current object */
- if(preg_match("/^RestoreSnapShot_/",$name) && $once){
+ if(preg_match("/^RestoreSnapShotDialog_/",$name) && $once){
$once = false;
- $entry = preg_replace("/^RestoreSnapShot_/","",$name);
+ $entry = preg_replace("/^RestoreSnapShotDialog_/","",$name);
$entry = base64_decode(preg_replace("/_[xy]$/","",$entry));
$this->snapDialog = new SnapShotDialog($this->config,$entry,$this);
- $this->snapDialog->Restore = true;
+ $this->snapDialog->display_restore_dialog = true;
}
/* Restore one of the already deleted objects */
if(preg_match("/^RestoreDeletedSnapShot_/",$name) && $once){
$once = false;
$this->snapDialog = new SnapShotDialog($this->config,$baseSuffixe,$this);
- $this->snapDialog->Restore = true;
- $this->snapDialog->DeletedOnes = true;
+ $this->snapDialog->display_restore_dialog = true;
+ $this->snapDialog->display_all_removed_objects = true;
+ }
+
+ /* 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)){
+ $this->restore_snapshot($entry);
+ $this->snapDialog = NULL;
+ }
}
}
/* Restore is requested, restore the object with the posted dn .*/
if((isset($_POST['RestoreSnapshot'])) && (isset($_POST['SnapShot']))){
- $entry =trim($_POST['SnapShot']);
- if(!empty($entry)){
- $entry = base64_decode($entry);
- $this->restore_snapshot($entry);
- $this->snapDialog = NULL;
- }
}
if(isset($_POST['CancelSnapshot'])){