From 056a005c68b0db699d0c81d1870ec3bc25f62835 Mon Sep 17 00:00:00 2001 From: jervfors Date: Thu, 30 Sep 2004 22:47:10 +0000 Subject: [PATCH] If we use forms.php in STABLE we might as well try it in DEVEL git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8100 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addressbook.php | 342 +++++++++++++++++++++----------------------- 1 file changed, 166 insertions(+), 176 deletions(-) diff --git a/src/addressbook.php b/src/addressbook.php index c0ff11ff..994a7de6 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -59,15 +59,15 @@ $abook_sort_order = get_abook_sort(); function addressbook_inp_field($label, $field, $name, $size, $values, $add) { global $color; $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]) - ) - . "\n"; + html_tag( 'td', $label . ':', 'right', $color[4]) . + html_tag( 'td', $td_str, 'left', $color[4]) + ) + . "\n"; } /** @@ -75,65 +75,62 @@ function addressbook_inp_field($label, $field, $name, $size, $values, $add) { */ function address_form($name, $submittext, $values = array()) { global $color, $squirrelmail_language; - - if ($squirrelmail_language == 'ja_JP') - { - echo html_tag( 'table', - addressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, - ' ' . _("Must be unique") . '') . - 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', - addressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, - ' ' . _("Must be unique") . '') . - 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"') - ) - , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; -} + + if ($squirrelmail_language == 'ja_JP') { + echo html_tag( 'table', + addressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, + ' ' . _("Must be unique") . '') . + 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', + addSubmit($submittext, $name.'[SUBMIT]'), + 'center', $color[4], 'colspan="2"') + ) + , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; + } else { + echo html_tag( 'table', + addressbook_inp_field(_("Nickname"), 'nickname', $name, 15, $values, + ' ' . _("Must be unique") . '') . + 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', + addSubmit($submittext, $name.'[SUBMIT]') , + 'center', $color[4], 'colspan="2"') + ) + , 'center', '', 'border="0" cellpadding="1" width="90%"') ."\n"; + } } function list_writable_backends($name) { - global $color, $abook; - if ( $name != 'addaddr' ) { return; } - if ( $abook->numbackends > 1 ) { - $ret = ''; + $backends = $abook->get_backend_list(); + while (list($undef,$v) = each($backends)) { + if ($v->writeable) { + $ret .= '\n"; + } + } + $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"; } - $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 * @@ -141,8 +138,8 @@ function list_writable_backends($name) { $abook = addressbook_init(true, true); if($abook->localbackend == 0) { plain_error_message( - _("No personal address book is defined. Contact administrator."), - $color); + _("No personal address book is defined. Contact administrator."), + $color); exit(); } @@ -248,20 +245,19 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P $olddata = $abook->lookup($enick, $ebackend); /* Display the "new address" form */ - echo '
' . - "\n" . - html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - "\n". '' . _("Update address") . '' ."\n", - 'center', $color[0] ) - ), - 'center', '', 'width="100%" ' ); + echo addForm($form_url, 'post'). + html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + "\n". '' . _("Update address") . '' ."\n", + 'center', $color[0] ) + ), + 'center', '', 'width="100%" ' ); address_form("editaddr", _("Update address"), $olddata); echo addHidden('oldnick', $olddata['nickname']). - addHidden('backend', $olddata['backend']). - addHidden('doedit', '1'). - '
'; + addHidden('backend', $olddata['backend']). + addHidden('doedit', '1'). + ''; } } else { @@ -273,31 +269,30 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P /* Handle error messages */ if (!$r) { /* Display error */ - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - "\n". '' . _("ERROR") . ': ' . $abook->error . '' ."\n", - 'center' ) - ), - 'center', '', 'width="100%"' ); + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + "\n". '' . _("ERROR") . ': ' . $abook->error . '' ."\n", + 'center' ) + ), + 'center', '', 'width="100%"' ); /* Display the "new address" form again */ - echo '
' . "\n" . - html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - "\n". '' . _("Update address") . '' ."\n", - 'center', $color[0] ) - ), - 'center', '', 'width="100%"' ); + echo addForm($form_url, 'post'). + html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + "\n". '' . _("Update address") . '' ."\n", + 'center', $color[0] ) + ), + 'center', '', 'width="100%"' ); address_form("editaddr", _("Update address"), $newdata); echo - addHidden('oldnick', $oldnick). - addHidden('backend', $backend). - addHidden('doedit', '1'). - "\n" . '
'; + addHidden('oldnick', $oldnick). + addHidden('backend', $backend). + addHidden('doedit', '1'). + "\n" . ''; $abortform = true; } } else { @@ -313,8 +308,8 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P // Some times we end output before forms are printed if($abortform) { - echo "\n"; - exit(); + echo "\n"; + exit(); } } @@ -327,13 +322,13 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P /* Display error messages */ if (!empty($formerror)) { echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - "\n". '
' . _("ERROR") . ': ' . $formerror . '' ."\n", - 'center' ) - ), - 'center', '', 'width="100%"' ); + html_tag( 'tr', + html_tag( 'td', + "\n". '
' . _("ERROR") . ': ' . $formerror . '' ."\n", + 'center' ) + ), + 'center', '', 'width="100%"' ); } @@ -354,19 +349,17 @@ if ($showaddrlist) { /* List addresses */ if (count($alist) > 0) { - echo '
' . "\n"; + echo addForm($form_url, 'post'); while(list($undef,$row) = each($alist)) { - + /* New table header for each backend */ if($prevbackend != $row['backend']) { if($prevbackend < 0) { echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', - '\n" . - '\n", + addSubmit(_("Edit selected"), 'editaddr'). + addSubmit(_("Delete selected"), 'deladdr'), 'center', '', 'colspan="5"' ) ) . html_tag( 'tr', @@ -374,108 +367,105 @@ if ($showaddrlist) { ), 'center' ); echo "\n\n" . - html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) . - html_tag( 'tr', "\n" . - html_tag( 'th', ' ', 'left', '', 'width="1%"' ) . "\n" . - html_tag( 'th', _("Nickname") . - show_abook_sort_button($abook_sort_order, _("sort by nickname"), 0, 1), - 'left', '', 'width="1%"' ) . "\n" . - html_tag( 'th', _("Name") . - show_abook_sort_button($abook_sort_order, _("sort by name"), 2, 3), - 'left', '', 'width="1%"' ) . "\n" . - html_tag( 'th', _("E-mail") . - show_abook_sort_button($abook_sort_order, _("sort by email"), 4, 5), - 'left', '', 'width="1%"' ) . "\n" . - html_tag( 'th', _("Info") . - show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7), - 'left', '', 'width="1%"' ) . "\n", - '', $color[9] ) . "\n"; + html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) . + html_tag( 'tr', "\n" . + html_tag( 'th', ' ', 'left', '', 'width="1%"' ) . "\n" . + html_tag( 'th', _("Nickname") . + show_abook_sort_button($abook_sort_order, _("sort by nickname"), 0, 1), + 'left', '', 'width="1%"' ) . "\n" . + html_tag( 'th', _("Name") . + show_abook_sort_button($abook_sort_order, _("sort by name"), 2, 3), + 'left', '', 'width="1%"' ) . "\n" . + html_tag( 'th', _("E-mail") . + show_abook_sort_button($abook_sort_order, _("sort by email"), 4, 5), + 'left', '', 'width="1%"' ) . "\n" . + html_tag( 'th', _("Info") . + show_abook_sort_button($abook_sort_order, _("sort by info"), 6, 7), + 'left', '', 'width="1%"' ) . "\n", + '', $color[9] ) . "\n"; } // Separate different backends with
if($prevbackend > 0) { echo html_tag( 'tr', - html_tag( 'td', "
", 'center', '' ,'colspan="5"' ) - ); + html_tag( 'td', "
", 'center', '' ,'colspan="5"' ) + ); } // Print backend name echo html_tag( 'tr', html_tag( 'td', "\n" . '' . $row['source'] . '' . "\n", 'center', $color[0] ,'colspan="5"' ) - ); + ); $line = 0; $headerprinted = true; } /* End of header */ $prevbackend = $row['backend']; - + /* Check if this user is selected */ $selected = in_array($row['backend'] . ':' . $row['nickname'], $defselected); - + /* Print one row, with alternating color */ - if ($line % 2) { + if ($line % 2) { $tr_bgcolor = $color[12]; } else { $tr_bgcolor = $color[4]; } - if ($squirrelmail_language == 'ja_JP') - { - echo html_tag( 'tr', '', '', $tr_bgcolor); - if ($abook->backends[$row['backend']]->writeable) { - echo html_tag( 'td', - '' . - addCheckBox('sel[]', $selected, $row['backend'].':'.$row['nickname']). - '' , - 'center', '', 'valign="top" width="1%"' ); - } else { - echo html_tag( 'td', - ' ' , - 'center', '', 'valign="top" width="1%"' ); - } - echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . - html_tag( 'td', ' ' . $row['lastname'] . ' ' . $row['firstname'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . - html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . ' '; + if ($squirrelmail_language == 'ja_JP') { + echo html_tag( 'tr', '', '', $tr_bgcolor); + if ($abook->backends[$row['backend']]->writeable) { + echo html_tag( 'td', + '' . + addCheckBox('sel[]', $selected, $row['backend'].':'.$row['nickname']). + '' , + 'center', '', 'valign="top" width="1%"' ); } else { - echo html_tag( 'tr', '', '', $tr_bgcolor); - if ($abook->backends[$row['backend']]->writeable) { - echo html_tag( 'td', - '' . - '' , - 'center', '', 'valign="top" width="1%"' ); + echo html_tag( 'td', + ' ' , + 'center', '', 'valign="top" width="1%"' ); + } + echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . + html_tag( 'td', ' ' . $row['lastname'] . ' ' . $row['firstname'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . + html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . ' '; } else { - echo html_tag( 'td', - ' ' , - 'center', '', 'valign="top" width="1%"' ); - } - echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . - html_tag( 'td', ' ' . $row['name'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . - html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . ' '; + echo html_tag( 'tr', '', '', $tr_bgcolor); + if ($abook->backends[$row['backend']]->writeable) { + echo html_tag( 'td', + '' . + addCheckBox('sel[]', $selected, $row['backend'] . ':' . $row['nickname']). + '' , + 'center', '', 'valign="top" width="1%"' ); + } else { + echo html_tag( 'td', + ' ' , + 'center', '', 'valign="top" width="1%"' ); } + echo html_tag( 'td', ' ' . $row['nickname'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . + html_tag( 'td', ' ' . $row['name'] . ' ', 'left', '', 'valign="top" width="1%" nowrap' ) . + html_tag( 'td', '', 'left', '', 'valign="top" width="1%" nowrap' ) . ' '; + } $email = $abook->full_address($row); echo makeComposeLink('src/compose.php?send_to='.rawurlencode($email), - htmlspecialchars($row['email']) ) . - ' '."\n". - html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'valign="top" width="1%"' ) . - "\n"; + htmlspecialchars($row['email'])). + ' '."\n". + html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'valign="top" width="1%"' ) . + "\n"; $line++; } echo "" . - "\n\n"; + "\n\n"; /* End of list. Add edit/delete select buttons */ if ($headerprinted) { echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', - '\n" . - '\n", + addSubmit(_("Edit selected"), 'editaddr') . + addSubmit(_("Delete selected"), 'deladdr'), 'center', '', 'colspan="5"' ) ), - 'center' ); + 'center' ); } echo "
\n"; } @@ -484,14 +474,14 @@ if ($showaddrlist) { /* Display the "new address" form */ echo '' . "\n" . - '
' . "\n" . + addForm($form_url, 'post', 'f_add'). html_tag( 'table', html_tag( 'tr', html_tag( 'td', "\n". '' . _("Add to address book") . '' . "\n", 'center', $color[0] + ) ) - ) - , 'center', '', 'width="100%"' ) ."\n"; + , 'center', '', 'width="100%"' ) ."\n"; address_form('addaddr', _("Add address"), $defdata); echo "
\n"; -- 2.25.1