X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=294eab7fec8d200125a1e073a509ce9f04b34f3c;hb=288df1a09d98fc7a455cbab2fceca36d00508328;hp=8d4c80ff719b6b03b327b02211ae759deb00a2bc;hpb=097437875bf27998072b139eefe18f9e6450a0ff;p=squirrelmail.git diff --git a/src/addressbook.php b/src/addressbook.php index 8d4c80ff..294eab7f 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -1,28 +1,32 @@ ' . $add . ''; + $value = ( isset($values[$field]) ? $values[$field] : ''); + + $td_str = addInput($name.'['.$field.']', $value, $size) + . $add ; + return html_tag( 'tr' , html_tag( 'td', $label . ':', 'right', $color[4]) . html_tag( 'td', $td_str, 'left', $color[4]) @@ -54,37 +69,41 @@ function adressbook_inp_field($label, $field, $name, $size, $values, $add) { . "\n"; } -/* Output form to add and modify address data */ +/** + * 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, + addressbook_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, '') . + addressbook_inp_field(_("E-mail address"), 'email', $name, 45, $values, '') . + addressbook_inp_field(_("Last name"), 'lastname', $name, 45, $values, '') . + addressbook_inp_field(_("First name"), 'firstname', $name, 45, $values, '') . + addressbook_inp_field(_("Additional info"), 'label', $name, 45, $values, '') . + list_writable_backends($name) . 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, + addressbook_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, '') . + addressbook_inp_field(_("E-mail address"), 'email', $name, 45, $values, '') . + addressbook_inp_field(_("First name"), 'firstname', $name, 45, $values, '') . + addressbook_inp_field(_("Last name"), 'lastname', $name, 45, $values, '') . + addressbook_inp_field(_("Additional info"), 'label', $name, 45, $values, '') . + list_writable_backends($name) . html_tag( 'tr', html_tag( 'td', - '', 'center', $color[4], 'colspan="2"') ) @@ -92,6 +111,30 @@ function address_form($name, $submittext, $values = array()) { } } +function list_writable_backends($name) { + global $color, $abook; + if ( $name != 'addaddr' ) { return; } + if ( $abook->numbackends > 1 ) { + $ret = ""; + return html_tag( 'tr', + html_tag( 'td', _("Add to:"),'right', $color[4] ) . + html_tag( 'td', $ret, 'left', $color[4] )) . "\n"; + } else { + return html_tag( 'tr', + html_tag( 'td', + addHidden('backend', '1'), + 'center', $color[4], 'colspan="2"')) . "\n"; + } +} + /* Open addressbook, with error messages on but without LDAP (the * * second "true"). Don't need LDAP here anyway */ $abook = addressbook_init(true, true); @@ -119,10 +162,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) { @@ -213,11 +257,9 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P ), 'center', '', 'width="100%" ' ); address_form("editaddr", _("Update address"), $olddata); - echo '\n" . - '\n" . - '' . "\n" . + echo addHidden('oldnick', $olddata['nickname']). + addHidden('backend', $olddata['backend']). + addHidden('doedit', '1'). ''; } } else { @@ -250,11 +292,10 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P ), 'center', '', 'width="100%"' ); address_form("editaddr", _("Update address"), $newdata); - echo '\n" . - '\n" . - '' . + echo + addHidden('oldnick', $oldnick). + addHidden('backend', $backend). + addHidden('doedit', '1'). "\n" . ''; $abortform = true; } @@ -312,7 +353,7 @@ if ($showaddrlist) { /* List addresses */ if (count($alist) > 0) { - echo '
'; + echo "\n"; } } /* end of addresslist */ /* Display the "new address" form */ echo '' . "\n" . - ''; +echo "\n"; /* Add hook for anything that wants on the bottom */ do_hook('addressbook_bottom'); ?> -