Converted all files in functions/ to use SM_PATH. This will break all

[squirrelmail.git] / functions / addressbook.php

diff --git a/functions/addressbook.php b/functions/addressbook.php
index a991c35d2ce8fe74cff4dc4d2ed69825b69c56e5..f62ccde50fdc0f752c2968d05edf02a7d4864ea2 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -30,8 +30,8 @@
   Include backends here.
 */
 
-require_once('../functions/abook_local_file.php');
-require_once('../functions/abook_ldap_server.php');
+require_once(SM_PATH . 'functions/abook_local_file.php');
+require_once(SM_PATH . 'functions/abook_ldap_server.php');
 
 global $addrbook_dsn;
 
@@ -208,10 +208,12 @@ class AddressBook {
      */
 
     function full_address($row) {
-        global $addrsrch_fullname;
+        global $addrsrch_fullname, $datadir, $user;
 
-        if ((isset($addrsrch_fullname)) && ($addrsrch_fullname)) {
-            $name = ($addrsrch_fullname === 'nickname') ? $row['nickname']
+        if (($prefix = getPref($datadir, $user, 'addrsrch_fullname') or
+            isset($addrsrch_fullname) and $prefix = $addrsrch_fullname)
+            and $prefix !== 'noprefix') {
+            $name = ($prefix === 'nickname') ? $row['nickname']
                 : $row['name'];
             return $name . ' <' . trim($row['email']) . '>';
         } else {