X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=c1f230759ccf2e764e1d341a030843d1600841c4;hb=a34d6890fedb616a14007a34288b7ed4bc859d7f;hp=5742cdb28b8b032a0d9555aa57adc2aecaf0f4ef;hpb=07dcee9fe75b37b4d622529550cf6e0820b7c056;p=squirrelmail.git
diff --git a/src/addressbook.php b/src/addressbook.php
index 5742cdb2..c1f23075 100644
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -3,33 +3,60 @@
/**
* addressbook.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Manage personal address book.
*
* $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
define('SM_PATH','../');
-/* SquirrelMail required files. */
+/** SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/array.php');
+require_once(SM_PATH . 'functions/global.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');
+require_once(SM_PATH . 'functions/forms.php');
-/* Make an input field */
-function adressbook_inp_field($label, $field, $name, $size, $values, $add) {
+/** lets get the global vars we may need */
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+
+/* 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
+ * @param string $label
+ * @param string $field
+ * @param string $name
+ * @param string $size
+ * @param array $values
+ * @param string $add
+ */
+function addressbook_inp_field($label, $field, $name, $size, $values, $add) {
global $color;
- $td_str = '' . $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])
@@ -37,25 +64,71 @@ 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;
+ 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(_("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(_("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";
+}
}
+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 */
@@ -69,7 +142,6 @@ if($abook->localbackend == 0) {
displayPageHeader($color, 'None');
-
$defdata = array();
$formerror = '';
$abortform = false;
@@ -79,14 +151,20 @@ $form_url = 'addressbook.php';
/* Handle user's actions */
-if($REQUEST_METHOD == 'POST') {
+if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'POST') {
/**************************************************
* Add new address *
**************************************************/
- if (!empty($addaddr['nickname'])) {
-
- $r = $abook->add($addaddr, $abook->localbackend);
+ 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);
+ }
/* Handle error messages */
if (!$r) {
@@ -98,7 +176,6 @@ if($REQUEST_METHOD == 'POST') {
$showaddrlist = false;
$defdata = $addaddr;
}
-
} else {
/************************************************
@@ -178,11 +255,9 @@ if($REQUEST_METHOD == 'POST') {
),
'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 {
@@ -198,7 +273,7 @@ if($REQUEST_METHOD == 'POST') {
echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
- "\n". '
' . _("ERROR") . ': ' . $abook->error . '' ."\n",
'center' )
),
@@ -210,16 +285,15 @@ if($REQUEST_METHOD == 'POST') {
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
- "\n". '
' . _("Update address") . '' ."\n",
+ "\n". '' . _("Update address") . '' ."\n",
'center', $color[0] )
),
- 'center', '', 'width="100%"' ) .
+ '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;
}
@@ -319,16 +393,24 @@ if ($showaddrlist) {
$prevbackend = $row['backend'];
/* Check if this user is selected */
- if(in_array($row['backend'] . ':' . $row['nickname'], $defselected)) {
- $selected = 'CHECKED';
- } else {
- $selected = '';
- }
+ $selected = in_array($row['backend'] . ':' . $row['nickname'], $defselected);
/* Print one row */
$tr_bgcolor = '';
if ($line % 2) { $tr_bgcolor = $color[0]; }
- echo html_tag( 'tr', '') .
+ if ($squirrelmail_language == 'ja_JP')
+ {
+ echo html_tag( 'tr', '', '', $tr_bgcolor) .
+ html_tag( 'td',
+ '' .
+ addCheckBox('sel[]', $selected, $row['backend'].':'.$row['nickname']).
+ '' ,
+ 'center', '', 'valign="top" width="1%"' ) .
+ 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( 'tr', '', '', $tr_bgcolor) .
html_tag( 'td',
'' .
'full_address($row);
- if ($compose_new_win == '1') {
- echo '';
- }
- else {
- echo '';
- }
- echo htmlspecialchars($row['email']) . ' '."\n".
+ 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";
$line++;
@@ -369,9 +448,9 @@ if ($showaddrlist) {
/* Display the "new address" form */
echo '' . "\n" .
'