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 "';
+ 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 ""._("ERROR").": ".
- $abook->error." ";
- print "\n \n";
- print "
\n";
-
- // Display the "new address" form again
- printf("';
-
+ 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 "