holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do some cleanup of ^M and stray commas

Browse Source
This commit is contained in:
Miles Lott 2001-03-19 03:30:41 +00:00
parent a2e2ed23f3
commit da9a34e49d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addressbook/export/phpgw_LDIF
View File

@ -106,7 +106,7 @@
// Read each attribute, populate buffer // Read each attribute, populate buffer
// name/value are the fields from the export array above // name/value are the fields from the export array above
function export_new_attrib($buffer,$name,$value) { function export_new_attrib($buffer,$name,$value) {
if ($this->export[$name]) { if ($this->export[$name] && ($value != "") ) {
$buffer[$this->id][$this->export[$name]] = $value; $buffer[$this->id][$this->export[$name]] = $value;
//echo '<br>'.$this->id.' - '.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]]; //echo '<br>'.$this->id.' - '.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
} }
@ -120,7 +120,13 @@
$context = $phpgw_info['server']['ldap_contact_context']; $context = $phpgw_info['server']['ldap_contact_context'];
} }
$time = gettimeofday(); $time = gettimeofday();
$buffer[$this->id]["dn"] = 'uid='.time().$time["usec"].":".$buffer[$this->id]['cn'].','.$context; $cn = ereg_replace(',','',$buffer[$this->id]["cn"]);
$buffer[$this->id]["dn"] = 'uid='.time().$time["usec"].":".$cn.','.$context;
$buffer[$this->id]["uid"] = time().$time["usec"];
if ($buffer[$this->id]['cn']) {
$buffer[$this->id]["uid"] .= ":".$buffer[$this->id]['cn'];
}
$buffer[$this->id]["description"] = ereg_replace("\r\n",';',$buffer[$this->id]["description"]);
//echo '<br>'.$this->id.' - '.$buffer[$this->id]['dn']; //echo '<br>'.$this->id.' - '.$buffer[$this->id]['dn'];
return $buffer; return $buffer;
} }
@ -131,19 +137,15 @@
$entries .= 'dn: '.$buffer[$i]['dn'] . "\n"; $entries .= 'dn: '.$buffer[$i]['dn'] . "\n";
reset($this->export); reset($this->export);
while (list($name,$value)=each($this->export)) { while (list($name,$value)=each($this->export)) {
if ($value != 'dn') { if (($value != 'dn') && !empty($buffer[$i][$value])) {
$entries .= $value . ": " . $buffer[$i][$value] . "\n"; $tmp = ereg_replace(',','',$buffer[$i][$value]);
$entries .= $value . ": " . $tmp . "\n";
} }
} }
$entries .= "xmozillauseconferenceserver: " . $buffer[$i]["xmozillauseconferenceserver"] . "\n";
$entries .= "xmozillanickname: " . $buffer[$i]["xmozillanickname"] . "\n";
$entries .= "xmozillausehtmlmail: " . $buffer[$i]["xmozillausehtmlmail"] . "\n";
$entries .= "objectClass: person\n"; $entries .= "objectClass: person\n";
$entries .= "objectClass: account\n";
$entries .= "objectClass: organizationalPerson\n"; $entries .= "objectClass: organizationalPerson\n";
$entries .= "objectClass: posixAccount\n";
$entries .= "objectClass: inetOrgPerson\n"; $entries .= "objectClass: inetOrgPerson\n";
$entries .= "objectClass: shadowAccount\n"; $entries .= "objectClass: phpgwContact\n";
$entries .= "\n"; $entries .= "\n";
} }
$buffer = $entries; $buffer = $entries;