X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddressbook.php;h=67be4749c3d52abdf26385cc6ba48d6f04f71e86;hb=a5ee5ac2abfa64906394d54b9d94719517274b90;hp=ca42c538363383adc92ecd1fb5b3b4e30266925e;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/src/addressbook.php b/src/addressbook.php index ca42c538..67be4749 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -11,39 +11,11 @@ * $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; -} - /* Make an input field */ function adressbook_inp_field($label, $field, $name, $size, $values, $add) { global $color; @@ -77,8 +49,8 @@ function address_form($name, $submittext, $values = array()) { } -// 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( @@ -97,19 +69,19 @@ $showaddrlist = true; $defselected = array(); -// Handle user's actions +/* Handle user's actions */ if($REQUEST_METHOD == 'POST') { - // *********************************************** - // Add new address - // *********************************************** - if(!empty($addaddr['nickname'])) { + /************************************************** + * Add new address * + **************************************************/ + if (!empty($addaddr['nickname'])) { $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); @@ -120,28 +92,28 @@ if($REQUEST_METHOD == 'POST') { } 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 +122,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 +158,58 @@ 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 ""._("ERROR").": ". - $abook->error.""; - print "\n |