X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Faddressbook.php;h=dfb02d8f6af59de70d255b436475d816b16459f7;hp=615ba878e66849250465710a62179117be7c4160;hb=be4ba0bffba237a21d902482a0eadb4ed2158e7c;hpb=39b2625243496d8efb709b62f6f02c70a28a2783 diff --git a/src/addressbook.php b/src/addressbook.php index 615ba878..dfb02d8f 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -3,106 +3,74 @@ /** * addressbook.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Manage personal address book. * - * $Id$ + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail + * @subpackage addressbook */ -/* Path for SquirrelMail required files. */ -define('SM_PATH','../'); +/** + * Include the SquirrelMail initialization file. + */ +include('../include/init.php'); -/* SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/global.php'); -require_once(SM_PATH . 'functions/display_messages.php'); +/** SquirrelMail required files. */ +/* address book functions */ require_once(SM_PATH . 'functions/addressbook.php'); -require_once(SM_PATH . 'functions/strings.php'); -require_once(SM_PATH . 'functions/html.php'); +include_once(SM_PATH . 'templates/util_addressbook.php'); -/* lets get the global vars we may need */ -sqgetGlobalVar('key', $key, SQ_COOKIE); +/* form functions */ +require_once(SM_PATH . 'functions/forms.php'); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); -sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +/** lets get the global vars we may need */ /* From the address form */ -sqgetGlobalVar('addaddr', $addaddr, SQ_POST); -sqgetGlobalVar('editaddr', $editaddr, SQ_POST); -sqgetGlobalVar('deladdr', $deladdr, SQ_POST); -sqgetGlobalVar('sel', $sel, SQ_POST); -sqgetGlobalVar('oldnick', $oldnick, SQ_POST); -sqgetGlobalVar('backend', $backend, SQ_POST); -sqgetGlobalVar('doedit', $doedit, SQ_POST); - -/* Make an input field */ -function adressbook_inp_field($label, $field, $name, $size, $values, $add) { - global $color; - $td_str = '' . $add . ''; - return html_tag( 'tr' , - html_tag( 'td', $label . ':', 'right', $color[4]) . - html_tag( 'td', $td_str, 'left', $color[4]) - ) - . "\n"; -} +sqgetGlobalVar('addaddr', $addaddr, SQ_POST); +sqgetGlobalVar('editaddr', $editaddr, SQ_POST); +sqgetGlobalVar('deladdr', $deladdr, SQ_POST); +sqgetGlobalVar('sel', $sel, SQ_POST); +sqgetGlobalVar('oldnick', $oldnick, SQ_POST); +sqgetGlobalVar('backend', $backend, SQ_POST); +sqgetGlobalVar('doedit', $doedit, SQ_POST); + +/* Get sorting order */ +$abook_sort_order = get_abook_sort(); + +/* Create page header before addressbook_init in order to display error messages correctly. */ +displayPageHeader($color, 'None'); -/* Output form to add and modify address data */ -function address_form($name, $submittext, $values = array()) { - global $color, $squirrelmail_language; - - if ($squirrelmail_language == 'ja_JP') - { - echo html_tag( 'table', - adressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, - ' ' . _("Must be unique") . '') . - adressbook_inp_field(_("E-mail address"), 'email', $name, 45, $values, '') . - adressbook_inp_field(_("Last name"), 'lastname', $name, 45, $values, '') . - adressbook_inp_field(_("First name"), 'firstname', $name, 45, $values, '') . - adressbook_inp_field(_("Additional info"), 'label', $name, 45, $values, '') . - html_tag( 'tr', - html_tag( 'td', - '', - 'center', $color[4], 'colspan="2"') - ) - , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; - } else { - echo html_tag( 'table', - adressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, - ' ' . _("Must be unique") . '') . - adressbook_inp_field(_("E-mail address"), 'email', $name, 45, $values, '') . - adressbook_inp_field(_("First name"), 'firstname', $name, 45, $values, '') . - adressbook_inp_field(_("Last name"), 'lastname', $name, 45, $values, '') . - adressbook_inp_field(_("Additional info"), 'label', $name, 45, $values, '') . - html_tag( 'tr', - html_tag( 'td', - '', - 'center', $color[4], 'colspan="2"') - ) - , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; -} -} +/* Open addressbook with error messages on. + remote backends (LDAP) are enabled because they can be used. (list_addr function) +*/ +$abook = addressbook_init(true, false); -/* Open addressbook, with error messages on but without LDAP (the * - * second "true"). Don't need LDAP here anyway */ -$abook = addressbook_init(true, true); +// FIXME: do we have to stop use of address book, when localbackend is not present. if($abook->localbackend == 0) { - plain_error_message( - _("No personal address book is defined. Contact administrator."), - $color); + plain_error_message(_("No personal address book is defined. Contact administrator.")); exit(); } -displayPageHeader($color, 'None'); +$current_backend = $abook->localbackend; +if (sqgetGlobalVar('new_bnum',$new_backend,SQ_POST) && array_key_exists($new_backend,$abook->backends)) { + $current_backend = (int) $new_backend; +} + +$abook_selection = ' '; +$list_backends = array(); +if (count($abook->backends) > 1) { + foreach($abook->get_backend_list() as $oBackend) { + if ($oBackend->listing) { + $list_backends[$oBackend->bnum]=$oBackend->sname; + } + } + if (count($list_backends)>1) { + $abook_selection = addSelect('new_bnum',$list_backends,$current_backend,true) + .addSubmit(_("Change"),'change_abook'); + } +} $defdata = array(); $formerror = ''; @@ -111,7 +79,6 @@ $showaddrlist = true; $defselected = array(); $form_url = 'addressbook.php'; - /* Handle user's actions */ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'POST') { @@ -119,10 +86,11 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P * Add new address * **************************************************/ if (isset($addaddr)) { - foreach( $addaddr as $k => $adr ) { - $addaddr[$k] = strip_tags( $adr ); + if (isset($backend)) { + $r = $abook->add($addaddr, $backend); + } else { + $r = $abook->add($addaddr, $abook->localbackend); } - $r = $abook->add($addaddr, $abook->localbackend); /* Handle error messages */ if (!$r) { @@ -143,14 +111,14 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P $orig_sel = $sel; sort($sel); - /* The selected addresses are identidied by "backend:nickname". * + /* The selected addresses are identidied by "nickname_backend". * * Sort the list and process one backend at the time */ $prevback = -1; $subsel = array(); $delfailed = false; for ($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) { - list($sbackend, $snick) = explode(':', $sel[$i]); + list($snick, $sbackend) = explode('_', $sel[$i]); /* When we get to a new backend, process addresses in * * previous one. */ @@ -190,7 +158,6 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P * Update/modify address * ***********************************************/ if (!empty($editaddr)) { - /* Stage one: Copy data into form */ if (isset($sel) && sizeof($sel) > 0) { if(sizeof($sel) > 1) { @@ -199,80 +166,55 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P $defselected = $sel; } else { $abortform = true; - list($ebackend, $enick) = explode(':', $sel[0]); + list($enick, $ebackend) = explode('_', current($sel)); $olddata = $abook->lookup($enick, $ebackend); - - /* Display the "new address" form */ - echo '
'; + // Test if $olddata really contains anything and return an error message if it doesn't + if (!$olddata) { + error_box(nl2br(htmlspecialchars($abook->error))); + } else { + /* Display the "new address" form */ + abook_create_form($form_url,'editaddr',_("Update address"),_("Update address"),$olddata); + echo addHidden('oldnick', $olddata['nickname']). + addHidden('backend', $olddata['backend']). + addHidden('doedit', '1'). + ''; + } } - } else { - + } elseif ($doedit == 1) { /* Stage two: Write new data */ - if ($doedit = 1) { - $newdata = $editaddr; - $r = $abook->modify($oldnick, $newdata, $backend); - - /* Handle error messages */ - if (!$r) { - /* Display error */ - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - "\n". '