X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=81cb0bc4ebf2c91ed53db422f61334ff5ca33802;hb=854000c01b0a890c69ce818a00517acb35e1857a;hp=5a5c74811ffa245d2202f399766e3abfbc003389;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 5a5c7481..81cb0bc4 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -17,218 +17,218 @@ * $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/date.php'); require_once('../functions/smtp.php'); require_once('../functions/display_messages.php'); require_once('../functions/addressbook.php'); require_once('../functions/plugin.php'); +require_once('../functions/strings.php'); - // Insert hidden data - function addr_insert_hidden() { - global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, - $identity; - - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo "' . "\n"; - echo "' . "\n"; - echo "' . "\n"; - echo "\n"; - echo "\n"; - } - +/* Insert hidden data */ +function addr_insert_hidden() { + global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, + $identity; - // List search results - function addr_display_result($res, $includesource = true) { - global $color, $PHP_SELF; - - if(sizeof($res) <= 0) return; - - echo '
\n"; - echo ''; - echo "\n"; - addr_insert_hidden(); - $line = 0; - - print ""; - printf("\n"; - - foreach ($res as $row) { - echo ''; - echo ''; - echo ''; - if($includesource) - echo ''; - echo "\n"; - $line ++; - } - printf('', - 4 + ($includesource ? 1 : 0), - _("Use Addresses")); - print '
 ". - " %s %s". - " %s", - _("Name"), _("E-mail"), _("Info")); - - if($includesource) - printf(" %s", _("Source")); - - print "
'; - echo ' To '; - echo ' Cc '; - echo ' Bcc '; - echo ' ' . $row['name'] . '  ' . $row['email'] . '  ' . $row['label'] . '  ' . $row['source'] . ' 
'; - print ''; - print '
'; + echo '' . "\n" . + '' . "\n" . + '' . "\n" . + '' . "\n" . + '' . "\n" . + '' . "\n" . + '\n" . '' . + "\n"; } - // --- End functions --- - - global $mailbox; - displayPageHeader($color, $mailbox); - // Initialize addressbook - $abook = addressbook_init(); +/* List search results */ +function addr_display_result($res, $includesource = true) { + global $color, $PHP_SELF; + + if (sizeof($res) <= 0) return; + + echo '
\n" . + '' . "\n"; + addr_insert_hidden(); + $line = 0; + + echo '' . + '\n"; + + foreach ($res as $row) { + echo '' . + '' . + ''; + if ($includesource) { + echo ''; + } + echo "\n"; + $line ++; + } + echo '' . + '
 ' . + ' ' . _("Name") . + ' ' . _("E-mail") . + ' ' . _("Info"); + + if ($includesource) { + echo ' ' . _("Source"); + } + + echo "
' . + ' ' . _("To") . ' ' . + ' ' . _("Cc") . ' ' . + ' ' . _("Bcc") . ' ' . + ' ' . $row['name'] . '  ' . $row['email'] . '  ' . $row['label'] . '  ' . $row['source'] . ' 
' . + '' . + '
'; +} + +/* --- End functions --- */ + +global $mailbox; +if ($compose_new_win == '1') { + compose_Header($color, $mailbox); +} +else { + displayPageHeader($color, $mailbox); +} +/* Initialize addressbook */ +$abook = addressbook_init(); ?>
- +
\n"; - print "\n"; - print "
\n"; - printf('
'."\n", $PHP_SELF); - print "
\n"; - printf(" %s\n", _("Search for")); - addr_insert_hidden(); - if (! isset($addrquery)) - $addrquery = ''; - printf(" \n", - htmlspecialchars($addrquery)); - - // List all backends to allow the user to choose where to search - if(!isset($backend)) $backend = ""; - if($abook->numbackends > 1) { - printf("%s \n"; - } else { - print "\n"; - } - printf("", - _("Search")); - printf(" | \n", - _("List all")); - print '
'; - - print "
\n"; - addr_insert_hidden(); - print ""; - do_hook('addrbook_html_search_below'); - // End search form - - // Show personal addressbook - if($addrquery == '' || !empty($listall)) { - - if(! isset($backend) || $backend != -1 || $addrquery == '') { - if($addrquery == '') + +/* Search form */ +echo "
\n
\n" . + '
' . "\n
\n" . + ' ' . _("Search for") . "\n"; +addr_insert_hidden(); +if (! isset($addrquery)) + $addrquery = ''; +echo ' \n"; + +/* List all backends to allow the user to choose where to search */ +if (!isset($backend)) { $backend = ''; } +if ($abook->numbackends > 1) { + echo '' . _("in") . ' \n"; +} else { + echo '' . "\n"; +} +echo '' . + ' | ' . "\n" . + '
' . "\n"; +addr_insert_hidden(); +echo '
'; +do_hook('addrbook_html_search_below'); +/* End search form */ + +/* Show personal addressbook */ + +if ( !empty( $listall ) ){ + $addrquery = '*'; +} + +if ($addrquery == '' && empty($listall)) { + + if (! isset($backend) || $backend != -1 || $addrquery == '') { + if ($addrquery == '') { $backend = $abook->localbackend; + } - //printf("

%s

\n", $abook->backends[$backend]->sname); + /* echo '

' . $abook->backends[$backend]->sname) . "

\n"; */ - $res = $abook->list_addr($backend); + $res = $abook->list_addr($backend); - if(is_array($res)) { + if (is_array($res)) { + usort($res,'alistcmp'); addr_display_result($res, false); - } else { - printf("

"._("Unable to list addresses from %s"). - "

\n", $abook->backends[$backend]->sname); - } - - } else { - $res = $abook->list_addr(); - addr_display_result($res, true); - } - exit; - - } else - - // Do the search - if(!empty($addrquery) && empty($listall)) { - - if($backend == -1) { - $res = $abook->s_search($addrquery); - } else { - $res = $abook->s_search($addrquery, $backend); - } - - if(!is_array($res)) { - printf("


%s:
%s

\n\n", - _("Your search failed with the following error(s)"), - $abook->error); - } else if(sizeof($res) == 0) { - printf("


%s.

\n\n", - _("No persons matching your search was found")); - } else { - addr_display_result($res); - } - } - - if ($addrquery == '' || sizeof($res) == 0) { - printf('
'."\n", $PHP_SELF); - addr_insert_hidden(); - printf("\n", _("Return")); - print '
'; - print '
'; - } + } else { + echo '

' . + sprintf(_("Unable to list addresses from %s"), + $abook->backends[$backend]->sname) . + "

\n"; + } + + } else { + $res = $abook->list_addr(); + usort($res,'alistcmp'); + addr_display_result($res, true); + } + exit; +} +else { + + /* Do the search */ + if (!empty($addrquery)) { + + if ($backend == -1) { + $res = $abook->s_search($addrquery); + } else { + $res = $abook->s_search($addrquery, $backend); + } + + if (!is_array($res)) { + echo '


' . + _("Your search failed with the following error(s)") . ':
' . + $abook->error . "

\n\n"; + } else { + if (sizeof($res) == 0) { + echo '


' . + _("No persons matching your search was found") . + ".

\n\n"; + } else { + addr_display_result($res); + } + } + } +} + +if ($addrquery == '' || sizeof($res) == 0) { + /* printf('
'."\n", $PHP_SELF); */ + echo '
' . "\n"; + addr_insert_hidden(); + echo '' . "\n" . + '
'; +} ?>