sqsession_register fix

[squirrelmail.git] / functions / addressbook.php

diff --git a/functions/addressbook.php b/functions/addressbook.php
index c99b8e5ce6fd5b5aa432265782b69f2258493654..9b98f61bf386d2f1ee6a3e0a3763326eaddf4a84 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -30,19 +30,19 @@
   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;
 
 /* Use this if you wanna have a global address book */
 if (isset($address_book_global_filename)) {
-    include_once('../functions/abook_global_file.php');
+    include_once(SM_PATH . 'functions/abook_global_file.php');
 }
 
 /* Only load database backend if database is configured */
 if(isset($addrbook_dsn) && !empty($addrbook_dsn)) {
-  include_once('../functions/abook_database.php');
+  include_once(SM_PATH . 'functions/abook_database.php');
 }
 
 /*
@@ -210,8 +210,9 @@ class AddressBook {
     function full_address($row) {
         global $addrsrch_fullname, $datadir, $user;
 
-        if ($prefix = getPref($datadir, $user, 'addrsrch_fullname') or
-            isset($addrsrch_fullname) and $prefix = $addrsrch_fullname) {
+        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']) . '>';