X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Faddressbook.php;h=5096817491732ab6c4a808693f306f5c4c2259ec;hb=cc766dd0fc5eca63edada3863e574f9d70b96232;hp=61b9e7beefd811cc2a246c4cf53731f81d02631d;hpb=497203d474ca2a3762751dc433cfe13fda41e01c;p=squirrelmail.git diff --git a/functions/addressbook.php b/functions/addressbook.php index 61b9e7be..50968174 100644 --- a/functions/addressbook.php +++ b/functions/addressbook.php @@ -51,7 +51,7 @@ if(isset($addrbook_dsn) && !empty($addrbook_dsn)) { */ function addressbook_init($showerr = true, $onlylocal = false) { global $data_dir, $username, $ldap_server, $address_book_global_filename; - global $addrbook_dsn; + global $addrbook_dsn, $addrbook_table; /* Create a new addressbook object */ $abook = new AddressBook; @@ -63,9 +63,12 @@ function addressbook_init($showerr = true, $onlylocal = false) { */ if (isset($addrbook_dsn) && !empty($addrbook_dsn)) { /* Database */ + if (!isset($addrbook_table) || empty($addrbook_table)) { + $addrbook_table = 'address'; + } $r = $abook->add_backend('database', Array('dsn' => $addrbook_dsn, 'owner' => $username, - 'table' => 'address')); + 'table' => $addrbook_table)); if (!$r && $showerr) { echo _("Error initializing addressbook database."); exit;