fix missing space in company address

[contagged] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index bbae2701b2f18402547082e66515a8d8548bdf80..add970ca8bcb73c58ac51673fedb40c84698e664 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -344,7 +344,7 @@ function ldap_store_objectclasses($dn,$classes){
   $add['objectClass'] = $set;
 
   $r = @ldap_mod_replace($LDAP_CON,$dn,$add);
-  tpl_ldaperror();
+  tpl_ldaperror('store object classes');
 
 /*  print '<pre>';
   print_r($set);
@@ -387,7 +387,7 @@ function ldap_queryabooks($filter,$types){
   $result3 = array();
 
   // public addressbook
-  $sr      = @ldap_list($LDAP_CON,$conf['publicbook'],
+  $sr      = @ldap_search($LDAP_CON,$conf['publicbook'],
                         $filter,$types);
   tpl_ldaperror();
   $result1 = ldap_get_binentries($LDAP_CON, $sr);
@@ -526,4 +526,24 @@ function get_fields_from_template($tpl){
     return $return;
 }
 
+function addCoords(&$coords, $entry, $geocoder)
+{
+    $priv = $geocoder->getPrivateCoords($entry);
+    if ($priv !== null) {
+        $priv->address = '<b>'
+            . $entry['givenname'] . ' ' . $entry['name'] . '</b><br/>'
+            . str_replace("\n", '<br/>', $entry['homestreet']);
+        $coords[] = $priv;
+    }
+
+    $busi = $geocoder->getBusinessCoords($entry);
+    if ($busi !== null) {
+        $busi->address = '<b>' . $entry['organization'] . '<br/>'
+            . $entry['givenname'] . ' ' . $entry['name'] . '</b><br/>'
+            . $entry['street'] . '<br/>'
+            . $entry['zip'] . ' ' . $entry['location'];
+        $coords[] = $busi;
+    }
+}
+
 ?>