X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_ldap.inc;h=e5809d72099e075eb69c1fdbd23d80e1c098f6b7;hb=0adbff1190cf5933e2f48f5c9022496de7bade2e;hp=13da40948e31f36d373bc416cc6cc576b56dea0c;hpb=c0eb555e5c33de4b0c5277d7c7b6593a4fcdb928;p=gosa.git diff --git a/include/class_ldap.inc b/include/class_ldap.inc index 13da40948..e5809d720 100644 --- a/include/class_ldap.inc +++ b/include/class_ldap.inc @@ -1,7 +1,7 @@ + Copyright (C) 2003 Alejandro Escanero Blanco Copyright (C) 2004-2006 Cajus Pollmeier Based in code of ldap.inc of @@ -197,6 +197,7 @@ class LDAP{ } } + $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=search('".$this->fix($this->basedn)."', '$filter')"); return($this->sr); }else{ $this->error = "Could not connect to LDAP server"; @@ -229,6 +230,8 @@ class LDAP{ } } + $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=ls('".$this->fix($basedn)."', '$filter')"); + return($this->sr); }else{ $this->error = "Could not connect to LDAP server"; @@ -281,7 +284,7 @@ class LDAP{ if ($this->re) { $att= @ldap_get_attributes($this->cid, $this->re); - $att['dn']= $this->convert(@ldap_get_dn($this->cid, $this->re)); + $att['dn']= trim($this->convert(@ldap_get_dn($this->cid, $this->re))); } $this->error = @ldap_error($this->cid); if (!isset($att)){ @@ -325,7 +328,7 @@ class LDAP{ $rv = @ldap_get_dn($this->cid, $this->re); $this->error = @ldap_error($this->cid); - return($this->convert($rv)); + return(trim($this->convert($rv))); } }else{ $this->error = "Perform a Fetch with no Search"; @@ -527,7 +530,7 @@ class LDAP{ /* If this is no department */ foreach($attr as $key => $value){ - if(in_array($key ,array("FAItemplateFile","FAIscript", "gotoLogonScript", "gosaApplicationIcon"))){ + if(in_array($key ,array("FAItemplateFile","FAIscript", "gotoLogonScript", "gosaApplicationIcon","gotoMimeIcon"))){ $sr= ldap_read($this->cid, $this->fix($sourcedn), "$key=*", array($key)); $ei= ldap_first_entry($this->cid, $sr); if ($tmp= @ldap_get_values_len($this->cid, $ei,$key)){ @@ -545,7 +548,7 @@ class LDAP{ unset($attr['count']); unset($attr['dn']); - if(!in_array("gosaApplication" , $attr['objectClass'])){ + if((!in_array("gosaApplication" , $attr['objectClass'])) && (!in_array("gotoMimeType", $attr['objectClass']))){ if($type=="branch"){ $attr['FAIstate'] ="branch"; }elseif($type=="freeze"){ @@ -642,7 +645,7 @@ class LDAP{ } $real_path= substr($target, 0, strlen($target) - strlen($this->basedn) -1 ); - $l= array_reverse(ldap_explode_dn($real_path,0)); + $l= array_reverse(gosa_ldap_explode_dn($real_path)); unset($l['count']); $cdn= $this->basedn; $tag= ""; @@ -797,7 +800,7 @@ class LDAP{ } - function gen_ldif ($dn, $filter= "(objectClass=*)", $attributes= array('*'), $recursive= TRUE,$first = true) + function gen_ldif ($dn, $filter= "(objectClass=*)", $attributes= array('*'), $recursive= TRUE) { $display= ""; @@ -806,20 +809,13 @@ class LDAP{ $this->ls($filter,$dn, array('dn','objectClass')); $deps = array(); - if($first){ - $display .= $this->gen_one_entry($dn)."\n"; - } + $display .= $this->gen_one_entry($dn)."\n"; while ($attrs= $this->fetch()){ - $display.= $this->gen_one_entry($attrs['dn'], $filter, $attributes); - $display.= "\n"; - - if(in_array("organizationalUnit",$attrs['objectClass'])){ - $deps[] = $attrs['dn']; - } + $deps[] = $attrs['dn']; } foreach($deps as $dn){ - $display .= $this->gen_ldif($dn, $filter,$attributes,$recursive,false); + $display .= $this->gen_ldif($dn, $filter,$attributes,$recursive); } } else { $display.= $this->gen_one_entry($dn); @@ -909,7 +905,14 @@ class LDAP{ - function import_complete_ldif($str_attr,&$error,$overwrite,$cleanup) + /* This funktion imports ldifs + + If DeleteOldEntries is true, the destination entry will be deleted first. + If JustModify is true the destination entry will only be touched by the attributes specified in the ldif. + if JustMofify id false the destination dn will be overwritten by the new ldif. + */ + + function import_complete_ldif($str_attr,&$error,$JustModify,$DeleteOldEntries) { if($this->reconnect) $this->connect(); @@ -921,8 +924,21 @@ class LDAP{ $cnt = 0; $current_line = 0; + /* FIX ldif */ + $last = ""; + $tmp = ""; + $i = 0; + foreach($entries as $entry){ + if(preg_match("/^ /",$entry)){ + $tmp[$i] .= trim($entry); + }else{ + $i ++; + $tmp[$i] = trim($entry); + } + } + /* Every single line ... */ - foreach($entries as $entry) { + foreach($tmp as $entry) { $current_line ++; /* Removing Spaces to .. @@ -946,8 +962,8 @@ class LDAP{ if(ereg("::",$tmp2)) { $encoded = split("::",$entry); - $attr = $encoded[0]; - $value = base64_decode($encoded[1]); + $attr = trim($encoded[0]); + $value = base64_decode(trim($encoded[1])); /* Add linenumber */ $data .= $current_line."#".base64_encode($attr.":".$value)."\n"; } @@ -989,18 +1005,18 @@ class LDAP{ /* Delete before insert */ $usermdir= false; - /* The dn address already exists! */ - if (($this->dn_exists($value))&&((!$overwrite)&&(!$cleanup))) { + /* The dn address already exists, Don't delete destination entry, overwrite it */ + if (($this->dn_exists($value))&&((!$JustModify)&&(!$DeleteOldEntries))) { - $error= sprintf(_("The dn: '%s' (from line %s) already exists in the LDAP database."), $line, $current_line); - return ALREADY_EXISTING_ENTRY; + $usermdir = $usemodify = false; - } elseif(($this->dn_exists($value))&&($cleanup)){ + /* Delete old entry first, then add new */ + } elseif(($this->dn_exists($value))&&($DeleteOldEntries)){ /* Delete first, then add */ $usermdir = true; - } elseif(($this->dn_exists($value))&&($overwrite)) { + } elseif(($this->dn_exists($value))&&($JustModify)) { /* Modify instead of Add */ $usemodify = true; @@ -1017,7 +1033,11 @@ class LDAP{ } - /* Imports a single entry */ + /* Imports a single entry + If $delete is true; The old entry will be deleted if it exists. + if $modify is true; All variables that are not touched by the new ldif will be kept. + if $modify is false; The new ldif overwrites the old entry, and all untouched attributes get lost. + */ function import_single_entry($str_attr,$modify,$delete) { if($this->reconnect) $this->connect(); @@ -1041,9 +1061,17 @@ class LDAP{ } /* Split the line into attribute and value */ - $attr = split(":", $row); + $attr = split(":", $row,2); $attr[0]= trim($attr[0]); /* attribute */ - $attr[1]= trim($attr[1]); /* value */ + $attr[1]= $attr[1]; /* value */ + + /* Check :: was used to indicate base64_encoded strings */ + if($attr[1][0] == ":"){ + $attr[1]=trim(preg_replace("/^:/","",$attr[1])); + $attr[1]=base64_decode($attr[1]); + } + + $attr[1] = trim($attr[1]); /* Check for attributes that are used more than once */ if(!isset($data[$attr[0]])) { @@ -1068,6 +1096,17 @@ class LDAP{ /* If dn is an index of data, we should try to insert the data */ if(isset($data['dn'])) { + + /* Fix dn */ + $tmp = gosa_ldap_explode_dn($data['dn']); + unset($tmp['count']); + $newdn =""; + foreach($tmp as $tm){ + $newdn.= trim($tm).","; + } + $newdn = preg_replace("/,$/","",$newdn); + $data['dn'] = $newdn; + /* Creating Entry */ $this->cd($data['dn']); @@ -1075,19 +1114,45 @@ class LDAP{ if($delete){ $this->rmdir_recursive($data['dn']); } - + /* Create missing trees */ + $this->cd ($this->basedn); $this->create_missing_trees($data['dn']); + $this->cd($data['dn']); + + $dn = $data['dn']; unset($data['dn']); - /* If entry exists use modify */ if(!$modify){ - $ret = $this->add($data); + + $this->cat($dn); + if($this->count()){ + + /* The destination entry exists, overwrite it with the new entry */ + $attrs = $this->fetch(); + foreach($attrs as $name => $value ){ + if(!is_numeric($name)){ + if(in_array($name,array("dn","count"))) continue; + if(!isset($data[$name])){ + $data[$name] = array(); + } + } + } + $ret = $this->modify($data); + + }else{ + + /* The destination entry doesn't exists, create it */ + $ret = $this->add($data); + } + } else { + + /* Keep all vars that aren't touched by this ldif */ $ret = $this->modify($data); } } - show_ldap_error($this->get_error(),_("Ldap import failed")); + show_ldap_error($this->get_error(), sprintf(_("Ldap import with dn '%s' failed."),$dn)); return($ret); } @@ -1143,6 +1208,15 @@ class LDAP{ return $objectclasses; } + function log($string) + { + if (isset($_SESSION['config'])){ + $cfg= $_SESSION['config']; + if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])){ + syslog (LOG_INFO, $string); + } + } + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: