ldap_mod_add($this->ds,'$dn',array(objectClass =>".print_r($ldapContact['objectClass'],true)."))
\n"; error_log('class.so_ldap.inc.php ('. __LINE__ .') update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')'); @@ -458,17 +458,17 @@ class so_ldap } } } - + // check if we need to rename the DN or need to recreate the contact $newRDN = 'uid='. ldap::quote($contactUID); $newDN = $newRDN .','. $baseDN; - if(strtolower($dn) != strtolower($newDN) || $needRecreation) + if(strtolower($dn) != strtolower($newDN) || $needRecreation) { $result = ldap_read($this->ds, $dn, 'objectclass=*'); $oldContact = ldap_get_entries($this->ds, $result); - foreach($oldContact[0] as $key => $value) + foreach($oldContact[0] as $key => $value) { - if(is_array($value)) + if(is_array($value)) { unset($value['count']); $newContact[$key] = $value; @@ -476,17 +476,17 @@ class so_ldap } $newContact['uid'] = $contactUID; - if(is_array($ldapContact['objectClass']) && count($ldapContact['objectClass']) > 0) + if(is_array($ldapContact['objectClass']) && count($ldapContact['objectClass']) > 0) { $newContact['objectclass'] = array_merge($newContact['objectclass'], $ldapContact['objectClass']); } - if(!ldap_delete($this->ds, $dn)) + if(!ldap_delete($this->ds, $dn)) { error_log('class.so_ldap.inc.php ('. __LINE__ .') delete of old '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')'); return $this->_error(__LINE__); } - if(!@ldap_add($this->ds, $newDN, $newContact)) + if(!@ldap_add($this->ds, $newDN, $newContact)) { //echo "recreate: ldap_add($this->ds,'$newDN',".print_r($newContact,true).")
\n"; //print 'class.so_ldap.inc.php ('. __LINE__ .') update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')';_debug_array($newContact);exit; @@ -498,7 +498,7 @@ class so_ldap } unset($ldapContact['objectClass']); - if (!@ldap_modify($this->ds, $dn, $ldapContact)) + if (!@ldap_modify($this->ds, $dn, $ldapContact)) { //echo "ldap_modify($this->ds,'$dn',".print_r($ldapContact,true).")
\n"; error_log('class.so_ldap.inc.php ('. __LINE__ .') update of '. $dn .' failed errorcode: '. ldap_errno($this->ds) .' ('. ldap_error($this->ds) .')'); @@ -509,7 +509,7 @@ class so_ldap else { $dn = 'uid='. ldap::quote($ldapContact['uid']) .','. $baseDN; - + if (!@ldap_add($this->ds, $dn, $ldapContact)) { //echo "ldap_add($this->ds,'$dn',".print_r($ldapContact,true).")
\n"; @@ -531,8 +531,8 @@ class so_ldap { // single entry if($keys[$this->contacts_id]) $keys = array( 0 => $keys); - - if(!is_array($keys)) + + if(!is_array($keys)) { $keys = array( $keys); } @@ -544,11 +544,11 @@ class so_ldap foreach($keys as $entry) { $entry = ldap::quote($entry); - if($result = ldap_search($this->ds, $GLOBALS['egw_info']['server']['ldap_contact_context'], - "(|(entryUUID=$entry)(uid=$entry))", $attributes)) + if($result = ldap_search($this->ds, $GLOBALS['egw_info']['server']['ldap_contact_context'], + "(|(entryUUID=$entry)(uid=$entry))", $attributes)) { $contactInfo = ldap_get_entries($this->ds, $result); - if(@ldap_delete($this->ds, $contactInfo[0]['dn'])) + if(@ldap_delete($this->ds, $contactInfo[0]['dn'])) { $ret++; } @@ -571,7 +571,7 @@ class so_ldap * @param string $op='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together * @param mixed $start=false if != false, return only maxmatch rows begining with start, or array($start,$num) * @param array $filter=null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards - * @param string $join='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or + * @param string $join='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or * "LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join! * @param boolean $need_full_no_count=false If true an unlimited query is run to determine the total number of rows, default false * @return array of matching rows (the row is an array of the cols) or False @@ -588,12 +588,12 @@ class so_ldap #$limit = $need_full_no_count ? 0 : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; #return parent::read($start,$limit,$fields,$query,$filter,$sort,$order); - if((int)$filter['owner']) + if((int)$filter['owner']) { if (!($accountName = $GLOBALS['egw']->accounts->id2name($filter['owner']))) return false; $searchDN = 'cn='. ldap::quote(strtolower($accountName)) .','; - + if ($filter['owner'] < 0) { $searchDN .= $this->sharedContactsDN; @@ -604,7 +604,7 @@ class so_ldap $searchDN .= $this->personalContactsDN; $addressbookType = ADDRESSBOOK_PERSONAL; } - } + } elseif (!isset($filter['owner'])) { $searchDN = $GLOBALS['egw_info']['server']['ldap_contact_context']; @@ -615,9 +615,9 @@ class so_ldap $searchDN = $GLOBALS['egw_info']['server']['ldap_context']; $addressbookType = ADDRESSBOOK_ACCOUNTS; } - + // create the search filter - switch($addressbookType) + switch($addressbookType) { case ADDRESSBOOK_ALL: $objectFilter = '(|(objectclass=inetorgperson)(objectclass=posixaccount))'; @@ -630,16 +630,16 @@ class so_ldap break; } - $searchFilter = ''; - if(is_array($criteria) && count($criteria) > 0) + $searchFilter = ''; + if(is_array($criteria) && count($criteria) > 0) { $wildcard = $wildcard === '%' ? '*' : ''; $searchFilter = ''; - foreach($criteria as $egwSearchKey => $searchValue) + foreach($criteria as $egwSearchKey => $searchValue) { foreach($this->schema2egw as $mapping) { - if(($ldapSearchKey = $mapping[$egwSearchKey])) + if(($ldapSearchKey = $mapping[$egwSearchKey])) { $searchString = $GLOBALS['egw']->translation->convert($searchValue,$this->charset,'utf-8'); $searchFilter .= '('.$ldapSearchKey.'='.$wildcard.ldap::quote($searchString).$wildcard.')'; @@ -647,11 +647,11 @@ class so_ldap } } } - if($op == 'AND') + if($op == 'AND') { $searchFilter = "(&$searchFilter)"; - } - else + } + else { $searchFilter = "(|$searchFilter)"; } @@ -701,7 +701,7 @@ class so_ldap } return $rows; } - + /** * Process so_sql like filters (at the moment only a subset used by the addressbook UI * @@ -722,7 +722,7 @@ class so_ldap case 'owner': // already handled case 'tid': // ignored break; - + case 'account_id': if (is_null($value)) { @@ -731,7 +731,7 @@ class so_ldap elseif ($value) { $filters .= '(uidNumber='.ldap::quote($value).')'; - + } break; @@ -757,7 +757,7 @@ class so_ldap if (count($cats) > 1) $filters .= ')'; } break; - + default: if (!is_int($key)) { @@ -790,23 +790,23 @@ class so_ldap } return $filters; } - + /** * Perform the actual ldap-search, retrieve and convert all entries - * + * * Used be read and search * - * @internal + * @internal * @param string $_ldapContext * @param string $_filter * @param array $_attributes * @param int $_addressbooktype * @return array/boolean with eGW contacts or false on error */ - function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype) + function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype) { $this->total = 0; - + $_attributes[] = 'entryUUID'; $_attributes[] = 'uid'; $_attributes[] = 'uidNumber'; @@ -817,36 +817,36 @@ class so_ldap $_attributes[] = 'modifiersName'; //echo "ldap_search($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit)
\n"; - if($_addressbooktype == ADDRESSBOOK_ALL) + if($_addressbooktype == ADDRESSBOOK_ALL) { $result = ldap_search($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit); - } - else + } + else { $result = @ldap_list($this->ds, $_ldapContext, $_filter, $_attributes, 0, $this->ldapLimit); } if(!$result) return array(); - + $entries = ldap_get_entries($this->ds, $result); $this->total = $entries['count']; foreach($entries as $i => $entry) { if (!is_int($i)) continue; // eg. count - + $contact = array( 'id' => $entry['uid'][0] ? $entry['uid'][0] : $entry['entryuuid'][0], 'tid' => 'n', // the type id for the addressbook ); - foreach($entry['objectclass'] as $ii => $objectclass) + foreach($entry['objectclass'] as $ii => $objectclass) { $objectclass = strtolower($objectclass); if (!is_int($ii) || !isset($this->schema2egw[$objectclass])) { continue; // eg. count or unsupported objectclass } - foreach($this->schema2egw[$objectclass] as $egwFieldName => $ldapFieldName) + foreach($this->schema2egw[$objectclass] as $egwFieldName => $ldapFieldName) { - if(!empty($entry[$ldapFieldName][0]) && !isset($contact[$egwFieldName])) + if(!empty($entry[$ldapFieldName][0]) && !isset($contact[$egwFieldName])) { $contact[$egwFieldName] = $GLOBALS['egw']->translation->convert($entry[$ldapFieldName][0],'utf-8'); } @@ -867,7 +867,7 @@ class so_ldap { // personal addressbook $contact['owner'] = $GLOBALS['egw']->accounts->name2id($matches[1],'account_lid','u'); - $contact['private'] = 1; + $contact['private'] = 0; } elseif(preg_match('/cn=([^,]+),'.preg_quote($this->sharedContactsDN,'/').'$/i',$entry['dn'],$matches)) { @@ -878,7 +878,7 @@ class so_ldap else { // accounts - $contact['owner'] = 0; + $contact['owner'] = 0; $contact['private'] = 0; } ######################################### @@ -899,7 +899,7 @@ class so_ldap 'modifytimestamp' => 'modified', ) as $ldapFieldName => $egwFieldName) { - if(!empty($entry[$ldapFieldName][0])) + if(!empty($entry[$ldapFieldName][0])) { $contact[$egwFieldName] = $this->_ldap2ts($entry[$ldapFieldName][0]); } @@ -908,20 +908,20 @@ class so_ldap } return $contacts; } - + /** * Creates a timestamp from the date returned by the ldap server * - * @internal + * @internal * @param string $date YYYYmmddHHiiss * @return int */ function _ldap2ts($date) { - return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2), + return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2), substr($date,4,2),substr($date,6,2),substr($date,0,4)); } - + /** * check if $baseDN exists. If not create it * @@ -935,14 +935,14 @@ class so_ldap { return false; } - if(ldap_errno($this->ds) != 32 || substr($baseDN,0,3) != 'cn=') + if(ldap_errno($this->ds) != 32 || substr($baseDN,0,3) != 'cn=') { return $this->_error(__LINE__); // baseDN does NOT exist and we cant/wont create it } // create a admin connection to add the needed DN $adminLDAP =& new ldap; $adminDS = $adminLDAP->ldapConnect(); - + list(,$ou) = explode(',',$baseDN); foreach(array( 'ou=contacts,'.$GLOBALS['egw_info']['server']['ldap_contact_context'], @@ -969,10 +969,10 @@ class so_ldap } } $adminLDAP->ldapDisconnect(); - + return false; } - + /** * error message for failed ldap operation * @@ -986,20 +986,20 @@ class so_ldap /** * Special handling for mapping of eGW contact-data to the evolutionPerson objectclass - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$ldapContact already copied fields according to the mapping * @param array $data eGW contact data * @param boolean $isUpdate */ function _egw2evolutionperson(&$ldapContact,$data,$isUpdate) { - if(!empty($data['cat_id'])) + if(!empty($data['cat_id'])) { $ldapContact['category'] = array(); - foreach(is_array($data['cat_id']) ? $data['cat_id'] : explode(',',$data['cat_id']) as $cat) + foreach(is_array($data['cat_id']) ? $data['cat_id'] : explode(',',$data['cat_id']) as $cat) { $ldapContact['category'][] = $GLOBALS['egw']->translation->convert( ExecMethod('phpgwapi.categories.id2name',$cat),$this->charset,'utf-8'); @@ -1010,11 +1010,11 @@ class so_ldap 'homepostaladdress' => $data['adr_two_street'] .'$'. $data['adr_two_locality'] .', '. $data['adr_two_region'] .'$'. $data['adr_two_postalcode'] .'$$'. $data['adr_two_countryname'], ) as $attr => $value) { - if($value != '$, $$$') + if($value != '$, $$$') { $ldapContact[$attr] = $GLOBALS['egw']->translation->convert($value,$this->charset,'utf-8'); - } - elseif($isUpdate) + } + elseif($isUpdate) { $ldapContact[$attr] = array(); } @@ -1032,10 +1032,10 @@ class so_ldap /** * Special handling for mapping data of the evolutionPerson objectclass to eGW contact - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$contact already copied fields according to the mapping * @param array $data eGW contact data */ @@ -1044,10 +1044,10 @@ class so_ldap if ($data['category'] && is_array($data['category'])) { $contact['cat_id'] = array(); - foreach($data['category'] as $iii => $cat) + foreach($data['category'] as $iii => $cat) { if (!is_int($iii)) continue; - + $contact['cat_id'][] = ExecMethod('phpgwapi.categories.name2id',$cat); } if ($contact['cat_id']) $contact['cat_id'] = implode(',',$contact['cat_id']); @@ -1061,10 +1061,10 @@ class so_ldap /** * Special handling for mapping data of the inetOrgPerson objectclass to eGW contact - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$contact already copied fields according to the mapping * @param array $data eGW contact data */ @@ -1075,25 +1075,25 @@ class so_ldap $parts = explode($data['sn'][0], $data['cn'][0]); $contact['n_prefix'] = trim($parts[0]); $contact['n_suffix'] = trim($parts[1]); - } - else + } + else { $parts = preg_split('/'. preg_quote($data['givenname'][0],'/') .'.*'. preg_quote($data['sn'][0],'/') .'/', $data['cn'][0]); $contact['n_prefix'] = trim($parts[0]); $contact['n_suffix'] = trim($parts[1]); - if(preg_match('/'. preg_quote($data['givenname'][0],'/') .' (.*) '. preg_quote($data['sn'][0],'/') .'/',$data['cn'][0], $matches)) + if(preg_match('/'. preg_quote($data['givenname'][0],'/') .' (.*) '. preg_quote($data['sn'][0],'/') .'/',$data['cn'][0], $matches)) { $contact['n_middle'] = $matches[1]; } } } - + /** * Special handling for mapping data of the mozillaAbPersonAlpha objectclass to eGW contact - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$contact already copied fields according to the mapping * @param array $data eGW contact data */ @@ -1107,10 +1107,10 @@ class so_ldap /** * Special handling for mapping of eGW contact-data to the mozillaAbPersonAlpha objectclass - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$ldapContact already copied fields according to the mapping * @param array $data eGW contact data * @param boolean $isUpdate @@ -1124,15 +1124,15 @@ class so_ldap elseif ($isUpdate) { $ldapContact['c'] = array(); - } + } } - + /** * Special handling for mapping data of the mozillaOrgPerson objectclass to eGW contact - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$contact already copied fields according to the mapping * @param array $data eGW contact data */ @@ -1146,10 +1146,10 @@ class so_ldap /** * Special handling for mapping of eGW contact-data to the mozillaOrgPerson objectclass - * + * * Please note: all regular fields are already copied! * - * @internal + * @internal * @param array &$ldapContact already copied fields according to the mapping * @param array $data eGW contact data * @param boolean $isUpdate @@ -1163,7 +1163,7 @@ class so_ldap elseif ($isUpdate) { $ldapContact['c'] = array(); - } + } } /**