Abstract how we get default template; move template inclusion up top; clear template...

[squirrelmail.git] / functions / abook_ldap_server.php

diff --git a/functions/abook_ldap_server.php b/functions/abook_ldap_server.php
index 212b105ac9513b9c6176c15240292be2e5482969..350fb5ac4b244d2d3e91b79d48e5ad2c8ec8aad2 100644 (file)
--- a/functions/abook_ldap_server.php
+++ b/functions/abook_ldap_server.php
@@ -142,7 +142,7 @@ class abook_ldap_server extends addressbook_backend {
      * @var boolean true if removing/adding/modifying entries is allowed
      * @since 1.5.2
      */
-    var $writeable = true;
+    var $writeable = false;
     /**
      * @var boolean controls ldap search type.
      * only first level entries are displayed if set to false
@@ -475,8 +475,7 @@ class abook_ldap_server extends addressbook_backend {
                 $surname = trim($this->charset_decode($row['sn'][0]));
             }
 
-            // FIXME: Write generic function to handle name order 
-            $fullname = trim($firstname . " " . $surname);
+            $fullname = $this->fullname($firstname,$surname);
 
             /* Add one row to result for each e-mail address */
             if(isset($row['mail']['count'])) {