projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright
[squirrelmail.git]
/
functions
/
addressbook.php
diff --git
a/functions/addressbook.php
b/functions/addressbook.php
index d480a66a16b14487f47f7afb7a3a0bdef1795594..7a616cfcfb4fb8f12e437fb3d0b602304b21666a 100644
(file)
--- a/
functions/addressbook.php
+++ b/
functions/addressbook.php
@@
-4,7
+4,7
@@
*
* Functions require SM_PATH and support of forms.php functions
*
*
* Functions require SM_PATH and support of forms.php functions
*
- * @copyright 1999-20
09
The SquirrelMail Project Team
+ * @copyright 1999-20
13
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-162,7
+162,7
@@
function addressbook_init($showerr = true, $onlylocal = false) {
* display address book init errors.
*/
if ($abook_init_error!='' && $showerr) {
* display address book init errors.
*/
if ($abook_init_error!='' && $showerr) {
- error_box(nl2br(
htmlspecial
chars($abook_init_error)));
+ error_box(nl2br(
sm_encode_html_special_
chars($abook_init_error)));
}
/* Return the initialized object */
}
/* Return the initialized object */
@@
-414,7
+414,7
@@
class AddressBook {
*
* Extra field can be used to add link to form, which allows
* to modify all fields supported by backend. This is the only field
*
* Extra field can be used to add link to form, which allows
* to modify all fields supported by backend. This is the only field
- * that is not sanitized with
htmlspecial
chars. Backends MUST make
+ * that is not sanitized with
sm_encode_html_special_
chars. Backends MUST make
* sure that field data is sanitized and displayed correctly inside
* table cell. Use of html formating in other address book fields is
* not allowed. Backends that don't return 'extra' row in address book
* sure that field data is sanitized and displayed correctly inside
* table cell. Use of html formating in other address book fields is
* not allowed. Backends that don't return 'extra' row in address book
@@
-515,8
+515,7
@@
class AddressBook {
* @return string email address with real name prepended
*/
function full_address($row) {
* @return string email address with real name prepended
*/
function full_address($row) {
- global $data_dir, $username;
- $addrsrch_fullname = getPref($data_dir, $username, 'addrsrch_fullname');
+ global $data_dir, $username, $addrsrch_fullname;
// allow multiple addresses in one row (poor person's grouping - bah)
// (separate with commas)
// allow multiple addresses in one row (poor person's grouping - bah)
// (separate with commas)
@@
-958,7
+957,7
@@
class addressbook_backend {
* not found, or false if an error occured.
*
*/
* not found, or false if an error occured.
*
*/
- function lookup($value, $field) {
+ function lookup($value, $field
=SM_ABOOK_FIELD_NICKNAME
) {
$this->set_error('lookup is not implemented');
return false;
}
$this->set_error('lookup is not implemented');
return false;
}