extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 18:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up object calls

Browse Source
This commit is contained in:
Miles Lott 2001-03-20 22:55:03 +00:00
parent cfba770497
commit df6f72c92a
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/export.php
View File

@ -104,7 +104,7 @@
if ( ($download == "on") || ($o->type == 'pdb') ) {
header("Content-disposition: attachment; filename=\"".$tsvfilename."\"");
header("Content-type: application/octetstream");
header("Content-length: ".strlen($buffer);
header("Content-length: ".strlen($buffer));
header("Pragma: no-cache");
header("Expires: 0");
echo $buffer;

42
addressbook/import.php
View File

@ -73,31 +73,31 @@
if ($private=="") { $private="public"; }
$row=0;
$buffer=array();
$o = new import_conv;
$buffer = $o->import_start_file($buffer,$basedn,$context);
$this = new import_conv;
$buffer = $this->import_start_file($buffer,$basedn,$context);
$fp=fopen($tsvfile,"r");
if ($o->type == 'csv') {
if ($this->type == 'csv') {
while ($data = fgetcsv($fp,8000,",")) {
$num = count($data);
$row++;
if ($row == 1) {
$header = $data;
} else {
$buffer = $o->import_start_record($buffer);
$buffer = $this->import_start_record($buffer);
for ($c=0; $c<$num; $c++ ) {
//Send name/value pairs along with the buffer
if ($o->import[$header[$c]]!="" && $data[$c]!="") {
$buffer = $o->import_new_attrib($buffer, $o->import[$header[$c]],$data[$c]);
if ($this->import[$header[$c]]!="" && $data[$c]!="") {
$buffer = $this->import_new_attrib($buffer, $this->import[$header[$c]],$data[$c]);
}
}
$buffer = $o->import_end_record($buffer,$private);
$buffer = $this->import_end_record($buffer,$private);
}
}
} elseif ($o->type == 'ldif') {
} elseif ($this->type == 'ldif') {
while ($data = fgets($fp,8000)) {
list($name,$value,$url) = split(':', $data);
if (substr($name,0,2) == 'dn') {
$buffer = $o->import_start_record($buffer);
$buffer = $this->import_start_record($buffer);
}
if ($name && $value) {
$test = split(',mail=',$value);
@ -110,26 +110,34 @@
$value = $value . ':' . $url;
}
//echo '<br>'.$j.': '.$name.' => '.$value;
if ($o->import[$name] != "" && $value != "") {
$buffer = $o->import_new_attrib($buffer, $o->import[$name],$value);
if ($this->import[$name] != "" && $value != "") {
$buffer = $this->import_new_attrib($buffer, $this->import[$name],$value);
}
} else {
$buffer = $o->import_end_record($buffer,$private);
$buffer = $this->import_end_record($buffer,$private);
}
}
} else {
$buffer = $o->import_start_record($buffer);
while ($data = fgets($fp,8000)) {
list($name,$value) = split(':', $data);
if ($o->import[$name] != "" && $value != "") {
$buffer = $o->import_new_attrib($buffer, $o->import[$name],$value);
if (strtolower(substr($name,0,5)) == 'begin') {
$buffer = $this->import_start_record($buffer);
}
if ($name && $value) {
reset($this->import);
while ( list($fname,$fvalue) = each($this->import) ) {
if ( strstr(strtolower($name), $this->import[$fname]) ) {
$buffer = $this->import_new_attrib($buffer,$name,$value);
}
}
} else {
$buffer = $this->import_end_record($buffer,$private);
}
}
$buffer = $o->import_end_record($buffer,$private);
}
fclose($fp);
$buffer = $o->import_end_file($buffer);
$buffer = $this->import_end_file($buffer);
if ($download == "") {
if($conv_type=="Debug LDAP" || $conv_type=="Debug SQL" ) {