X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=923f85ec7552a2c5c251185fec9b452d96fc7776;hb=44c046311a3f62a461a82d31f792f3fc4421f820;hp=550b430eded0605ccf19e649581caa0a2ad07698;hpb=a10110a50f284e8afdef868cab40e07e7deeea44;p=squirrelmail.git diff --git a/src/addressbook.php b/src/addressbook.php index 550b430e..923f85ec 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -11,41 +11,49 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/array.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/addressbook.php'); +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'include/validate.php'); +require_once(SM_PATH . 'functions/array.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +require_once(SM_PATH . 'functions/addressbook.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); /* Make an input field */ function adressbook_inp_field($label, $field, $name, $size, $values, $add) { global $color; - echo '' . - $label . ':' . - '' . - '' . $add . '' . "\n"; + $td_str .= '">' . $add . ''; + return html_tag( 'tr' , + html_tag( 'td', $label . ':', 'right', $color[4]) . + html_tag( 'td', $td_str, 'left', $color[4]) + ) + . "\n"; } /* Output form to add and modify address data */ function address_form($name, $submittext, $values = array()) { global $color; - - echo '' ."\n"; - - 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, ''); - - echo '' . - "\n
' . "\n" . - '
\n"; + 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"; } @@ -161,11 +169,13 @@ if($REQUEST_METHOD == 'POST') { /* Display the "new address" form */ echo '
' . "\n" . - '' . "\n" . - '\n
' . "\n" . '' . - _("Update address") . - "\n
\n"; + 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 '\n" . @@ -184,20 +194,25 @@ if($REQUEST_METHOD == 'POST') { /* Handle error messages */ if (!$r) { /* Display error */ - echo '' . - "\n" . '\n
' . "\n" . - '
' . _("ERROR") . ": " . $abook->error . - '' . "\n
\n"; + 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" . - '' . - "\n" . '\n
' . "\n" . '' . - _("Update address") . - "\n
\n"; + 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 '\n" . @@ -233,10 +248,14 @@ if($REQUEST_METHOD == 'POST') { /* Display error messages */ if (!empty($formerror)) { - echo '' . "\n" . - '\n
' . "\n" . '
' . - '' . _("ERROR") . ': ' . $formerror . - '' . "\n
\n"; + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + "\n". '
' . _("ERROR") . ': ' . $formerror . '' ."\n", + 'center' ) + ), + 'center', '', 'width="100%"' ); } @@ -253,87 +272,109 @@ if ($showaddrlist) { $prevbackend = -1; $headerprinted = false; - echo '

' . - _("Add address") . "

\n"; + echo html_tag( 'p', '' . _("Add address") . '', 'center' ) . "\n"; /* List addresses */ - echo '' . "\n"; - while(list($undef,$row) = each($alist)) { - - /* New table header for each backend */ - if($prevbackend != $row['backend']) { - if($prevbackend >= 0) { - echo '' . "\n" . - '\n" . - '\n\n" . - '' . - ' 
' . "\n"; + if (count($alist) > 0) { + echo '' . "\n"; + 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", + 'center', '', 'colspan="5"' ) + ) . + html_tag( 'tr', + html_tag( 'td', ' 
', 'center', '', 'colspan="5"' ) + ) , + 'center' ); + } + + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', "\n" . '' . $row['source'] . '' . "\n", 'center', $color[0] ) + ) , + 'center', '', 'width="95%"' ) ."\n" + . html_tag( 'table', '', 'center', '', 'border="0" cellpadding="1" cellspacing="0" width="90%"' ) . + html_tag( 'tr', "\n" . + html_tag( 'th', ' ', 'left', '', 'width="1%"' ) . + html_tag( 'th', _("Nickname"), 'left', '', 'width="1%"' ) . + html_tag( 'th', _("Name"), 'left', '', 'width="1%"' ) . + html_tag( 'th', _("E-mail"), 'left', '', 'width="1%"' ) . + html_tag( 'th', _("Info"), 'left', '', 'width="1%"' ) , + '', $color[9] ) . "\n"; + + $line = 0; + $headerprinted = true; + } /* End of header */ + + $prevbackend = $row['backend']; + + /* Check if this user is selected */ + if(in_array($row['backend'] . ':' . $row['nickname'], $defselected)) { + $selected = 'CHECKED'; + } else { + $selected = ''; } - - echo '' . "\n" . - '\n
' . "\n" . - '' . $row['source'] . - "\n
\n" . - '' . - '\n"; - - $line = 0; - $headerprinted = true; - } /* End of header */ - - $prevbackend = $row['backend']; - - /* Check if this user is selected */ - if(in_array($row['backend'] . ':' . $row['nickname'], $defselected)) { - $selected = 'CHECKED'; - } else { - $selected = ''; + + /* Print one row */ + $tr_bgcolor = ''; + if ($line % 2) { $tr_bgcolor = $color[0]; } + echo html_tag( 'tr', '') . + html_tag( 'td', + '' . + '' , + 'center', '', 'valign="top" width="1%"' ) . + 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); + if ($compose_new_win == '1') { + echo ''; + } + else { + echo ''; + } + echo htmlspecialchars($row['email']) . ' '."\n". + html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'valign="top" width="1%"' ) . + "\n"; + $line++; } - - /* Print one row */ - echo '' . - '' . - '', - ''."\n", - '' . - "\n"; - $line++; - } - - /* End of list. Close table. */ - if ($headerprinted) { - echo '
 ' . - _("Nickname") . '' . _("Name") . - '' . _("E-mail") . - '' . _("Info") . "
' . - ' ' . $row['nickname'] . - '  ' . $row['name'] . - '  ' . - '' . $row['email'] . '  ' . $row['label'] . ' 
' . "\n" . - '\n" . - '\n" . '
'; + + /* End of list. Close table. */ + if ($headerprinted) { + echo html_tag( 'tr', + html_tag( 'td', + '\n" . + '\n", + 'center', '', 'colspan="5"' ) + ); + } + echo ''; } } /* end of addresslist */ /* Display the "new address" form */ echo '' . "\n" . - '
' . "\n" . - '' . "\n" . - '\n" . - "
' . "\n" . '', - sprintf(_("Add to %s"), $abook->localbackendname) . - "\n
\n"; + '' . "\n" . + html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', "\n". '' . sprintf(_("Add to %s"), $abook->localbackendname) . '' . "\n", + 'center', $color[0] + ) + ) + , 'center', '', 'width="100%"' ) ."\n"; address_form('addaddr', _("Add address"), $defdata); echo '
';