X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=0cd1f24a075c9364da2831e6d099f239c2a3a079;hb=4d5537d1f0a7800248d353f8e1776c36864ada6d;hp=ca42c538363383adc92ecd1fb5b3b4e30266925e;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/src/addressbook.php b/src/addressbook.php index ca42c538..0cd1f24a 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -3,7 +3,7 @@ /** * addressbook.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Manage personal address book. @@ -11,74 +11,83 @@ * $Id$ */ -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below looks. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - -require_once('../src/validate.php'); -require_once('../functions/array.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/addressbook.php'); - -/* Sort array by the key "name" */ -function alistcmp($a,$b) { - if($a['backend'] > $b['backend']) { - return 1; - } else { - if($a['backend'] < $b['backend']) { - return -1; - } - } - return (strtolower($a['name']) > strtolower($b['name'])) ? 1 : -1; +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'include/validate.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'); + +/* lets get the global vars we may need */ +$key = $_COOKIE['key']; + +$username = $_SESSION['username']; +$onetimepad = $_SESSION['onetimepad']; +$base_uri = $_SESSION['base_uri']; +$delimiter = $_SESSION['delimiter']; + +/* From the address form */ +if ( isset($_POST['addaddr']) ) { + $addaddr = &$_POST['addaddr']; +} +if ( isset($_POST['editaddr']) ) { + $editaddr = &$_POST['editaddr']; +} +if ( isset($_POST['deladdr']) ) { + $deladdr = &$_POST['deladdr']; +} +$sel = &$_POST['sel']; + +if (isset($_POST['oldnick'])) { + $oldnick = $_POST['oldnick']; +} +if (isset($_POST['backend'])) { + $backend = $_POST['backend']; +} +if (isset($_POST['doedit'])) { + $doedit = $_POST['doedit']; } /* 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"; } - -// Open addressbook, with error messages on but without LDAP (the -// second "true"). Don't need LDAP here anyway +/* Open addressbook, with error messages on but without LDAP (the * + * second "true"). Don't need LDAP here anyway */ $abook = addressbook_init(true, true); if($abook->localbackend == 0) { plain_error_message( @@ -89,27 +98,29 @@ if($abook->localbackend == 0) { displayPageHeader($color, 'None'); - $defdata = array(); $formerror = ''; $abortform = false; $showaddrlist = true; $defselected = array(); +$form_url = 'addressbook.php'; -// Handle user's actions -if($REQUEST_METHOD == 'POST') { - - // *********************************************** - // Add new address - // *********************************************** - if(!empty($addaddr['nickname'])) { +/* Handle user's actions */ +if($_SERVER['REQUEST_METHOD'] == 'POST') { + /************************************************** + * Add new address * + **************************************************/ + if (!empty($addaddr['nickname'])) { + foreach( $addaddr as $k => $adr ) { + $addaddr[$k] = strip_tags( $adr ); + } $r = $abook->add($addaddr, $abook->localbackend); - // Handle error messages - if(!$r) { - // Remove backend name from error string + /* Handle error messages */ + if (!$r) { + /* Remove backend name from error string */ $errstr = $abook->error; $errstr = ereg_replace('^\[.*\] *', '', $errstr); @@ -117,31 +128,30 @@ if($REQUEST_METHOD == 'POST') { $showaddrlist = false; $defdata = $addaddr; } - } else { - // *********************************************** - // Delete address(es) - // *********************************************** - if((!empty($deladdr)) && sizeof($sel) > 0) { + /************************************************ + * Delete address(es) * + ************************************************/ + if ((!empty($deladdr)) && sizeof($sel) > 0) { $orig_sel = $sel; sort($sel); - // The selected addresses are identidied by "backend:nickname". - // Sort the list and process one backend at the time + /* The selected addresses are identidied by "backend:nickname". * + * Sort the list and process one backend at the time */ $prevback = -1; $subsel = array(); $delfailed = false; - for($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) { + for ($i = 0 ; (($i < sizeof($sel)) && !$delfailed) ; $i++) { list($sbackend, $snick) = explode(':', $sel[$i]); - // When we get to a new backend, process addresses in - // previous one. - if($prevback != $sbackend && $prevback != -1) { + /* When we get to a new backend, process addresses in * + * previous one. */ + if ($prevback != $sbackend && $prevback != -1) { $r = $abook->remove($subsel, $prevback); - if(!$r) { + if (!$r) { $formerror = $abook->error; $i = sizeof($sel); $delfailed = true; @@ -150,32 +160,32 @@ if($REQUEST_METHOD == 'POST') { $subsel = array(); } - // Queue for processing + /* Queue for processing */ array_push($subsel, $snick); $prevback = $sbackend; } - if(!$delfailed) { + if (!$delfailed) { $r = $abook->remove($subsel, $prevback); - if(!$r) { // Handle errors + if (!$r) { /* Handle errors */ $formerror = $abook->error; $delfailed = true; } } - if($delfailed) { + if ($delfailed) { $showaddrlist = true; $defselected = $orig_sel; } } else { - // *********************************************** - // Update/modify address - // *********************************************** - if(!empty($editaddr)) { + /*********************************************** + * Update/modify address * + ***********************************************/ + if (!empty($editaddr)) { - // Stage one: Copy data into form + /* Stage one: Copy data into form */ if (isset($sel) && sizeof($sel) > 0) { if(sizeof($sel) > 1) { $formerror = _("You can only edit one address at the time"); @@ -186,58 +196,65 @@ if($REQUEST_METHOD == 'POST') { list($ebackend, $enick) = explode(':', $sel[0]); $olddata = $abook->lookup($enick, $ebackend); - // Display the "new address" form - print "
\n"; - print "\n"; - print "\n"; - print "
\n"; - print _("Update address"); - print "\n
\n"; + /* 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%" ' ); address_form("editaddr", _("Update address"), $olddata); - printf("\n", - htmlspecialchars($olddata["nickname"])); - printf("\n", - htmlspecialchars($olddata["backend"])); - print "\n"; - print '
'; + echo '\n" . + '\n" . + '' . "\n" . + ''; } } else { - // Stage two: Write new data - if($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 - print "\n"; - print "\n"; - print "
\n
"; - print ""._("ERROR").": ". - $abook->error.""; - print "\n
\n"; - - // Display the "new address" form again - printf("
\n", $PHP_SELF); - print "\n"; - print "\n"; - print "
\n"; - print _("Update address"); - print "\n
\n"; + /* 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%"' ); + + /* 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%"' ) . address_form("editaddr", _("Update address"), $newdata); - printf("\n", - htmlspecialchars($oldnick)); - printf("\n", - htmlspecialchars($backend)); - print "\n"; - print '
'; - + echo '\n" . + '\n" . + '' . + "\n" . ''; $abortform = true; } } else { - // Should not get here... + /* Should not get here... */ plain_error_message(_("Unknown error"), $color); $abortform = true; } @@ -248,30 +265,33 @@ if($REQUEST_METHOD == 'POST') { // Some times we end output before forms are printed if($abortform) { - print "\n"; + echo "\n"; exit(); } } -// =================================================================== -// The following is only executed on a GET request, or on a POST when -// a user is added, or when "delete" or "modify" was successful. -// =================================================================== - -// Display error messages -if(!empty($formerror)) { - print "\n"; - print "\n"; - print "
\n
"; - print ""._("ERROR").": $formerror"; - print "\n
\n"; +/* =================================================================== * + * The following is only executed on a GET request, or on a POST when * + * a user is added, or when "delete" or "modify" was successful. * + * =================================================================== */ + +/* Display error messages */ +if (!empty($formerror)) { + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', + "\n". '
' . _("ERROR") . ': ' . $formerror . '' ."\n", + 'center' ) + ), + 'center', '', 'width="100%"' ); } -// Display the address management part -if($showaddrlist) { - // Get and sort address list +/* Display the address management part */ +if ($showaddrlist) { + /* Get and sort address list */ $alist = $abook->list_addr(); if(!is_array($alist)) { plain_error_message($abook->error, $color); @@ -282,96 +302,113 @@ if($showaddrlist) { $prevbackend = -1; $headerprinted = false; - echo "

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

\n"; - - // List addresses - printf("
\n", $PHP_SELF); - while(list($undef,$row) = each($alist)) { - - // New table header for each backend - if($prevbackend != $row["backend"]) { - if($prevbackend >= 0) { - print "\n"; - printf("\n", - _("Edit selected")); - printf("\n", - _("Delete selected")); - echo "\n"; - print ''; - print " 
\n"; + echo html_tag( 'p', '' . _("Add address") . '', 'center' ) . "\n"; + + /* List addresses */ + 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 = ''; } - - print "\n"; - print "\n"; - print "
\n"; - print $row["source"]; - print "\n
\n"; - - print ''; - printf('\n", $color[9], "1%", - "1%", _("Nickname"), - "1%", _("Name"), - "1%", _("E-mail"), - "%", _("Info")); - $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 - printf("", - (($line % 2) ? " bgcolor=\"$color[0]\"" : "")); - print '', - $selected, $row["backend"], $row["nickname"]); - printf(''. - '', - "1%", $row["nickname"], - "1%", $row["name"]); - printf(''."\n", - "1%", rawurlencode($row["email"]), $row["email"]); - printf('', - "%", $row["label"]); - print "\n"; - $line++; - } - - // End of list. Close table. - if($headerprinted) { - print "
 '. - '%s%s'. - '%s%s'. - "
'; - printf(' %s  %s  %s  %s 
\n"; - printf("\n", - _("Edit selected")); - printf("\n", - _("Delete selected")); - print "
"; + + /* 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"; -printf(_("Add to %s"), $abook->localbackendname); -echo "\n
\n"; +} /* end of addresslist */ + + +/* Display the "new address" form */ +echo '' . "\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 '
'; -// Add hook for anything that wants on the bottom +/* Add hook for anything that wants on the bottom */ do_hook('addressbook_bottom'); ?>