X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=ac0be5609901293ef996935f7239efd147327d13;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=d64e8b52a932c56206db0342d8b2b7a8abc448d5;hpb=c435f076fe6b5b58e09ae19a8e216f37b069d802;p=squirrelmail.git

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index d64e8b52..ac0be560 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,41 +1,36 @@
 <?php
-
 /**
  * addrbook_search_html.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Handle addressbook searching with pure html.
  *
  * This file is included from compose.php
  *
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage addressbook
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
+ * Because this file can also be included within compose we check for the $bInit
+ * var which is set inside ini.php. It's needed because compose already includes
+ * init.php.
  */
-if (! defined('SM_PATH') ) {
-    define('SM_PATH','../');
+if (!isset($bInit)) {
+    include('../include/init.php');
 }
 
 /** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/date.php');
-require_once(SM_PATH . 'functions/display_messages.php');
-require_once(SM_PATH . 'functions/addressbook.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/date.php');
+include_once(SM_PATH . 'functions/addressbook.php');
 
 sqgetGlobalVar('session',   $session,   SQ_POST);
 sqgetGlobalVar('mailbox',   $mailbox,   SQ_POST);
-sqgetGlobalVar('addrquery', $addrquery, SQ_POST);
+if (! sqgetGlobalVar('addrquery', $addrquery, SQ_POST))
+     $addrquery='';
 sqgetGlobalVar('listall',   $listall,   SQ_POST);
 sqgetGlobalVar('backend',   $backend,   SQ_POST);
 
@@ -66,7 +61,7 @@ function addr_insert_hidden() {
 /**
  * List search results
  * @param array $res Array containing results of search
- * @param bool $includesource UNDOCUMENTED [Default=true]
+ * @param bool $includesource If true, adds backend column to address listing
  */
 function addr_display_result($res, $includesource = true) {
     global $color, $javascript_on, $PHP_SELF, $squirrelmail_language;
@@ -78,25 +73,28 @@ function addr_display_result($res, $includesource = true) {
     addr_insert_hidden();
     $line = 0;
 
-if ($javascript_on) {
-    print
-        '<script language="JavaScript" type="text/javascript">' .
-        "\n<!-- \n" .
-        "function CheckAll(ch) {\n" .
-        "   for (var i = 0; i < document.addrbook.elements.length; i++) {\n" .
-        "       if( document.addrbook.elements[i].type == 'checkbox' &&\n" .
-        "           document.addrbook.elements[i].name.substr(0,16) == 'send_to_search['+ch ) {\n" .
-        "           document.addrbook.elements[i].checked = !(document.addrbook.elements[i].checked);\n".
-        "       }\n" .
-        "   }\n" .
-        "}\n" .
-        "//-->\n" .
-        "</script>\n";
-    $chk_all = '<a href="#" onclick="CheckAll(\'T\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("To").'</font>'.
+    if ($javascript_on) {
+        print
+            '<script type="text/javascript">' .
+            "\n<!-- \n" .
+            "function CheckAll(ch) {\n" .
+            "   for (var i = 0; i < document.addrbook.elements.length; i++) {\n" .
+            "       if( document.addrbook.elements[i].type == 'checkbox' &&\n" .
+            "           document.addrbook.elements[i].name.substr(0,16) == 'send_to_search['+ch ) {\n" .
+            "           document.addrbook.elements[i].checked = !(document.addrbook.elements[i].checked);\n".
+            "       }\n" .
+            "   }\n" .
+            "}\n" .
+            "//-->\n" .
+            "</script>\n";
+        $chk_all = '<a href="#" onclick="CheckAll(\'T\');">'._("All").'</a>&nbsp;<font color="'.$color[9].'">'._("To").'</font>'.
             '&nbsp;&nbsp;'.
             '<a href="#" onclick="CheckAll(\'C\');">' . _("All") . '</a>&nbsp;<font color="'.$color[9].'">'._("Cc").'</font>'.
             '&nbsp;&nbsp;'.
             '<a href="#" onclick="CheckAll(\'B\');">' . _("All") . '</a>';
+    } else {
+        // check_all links are used only in JavaScript. disable links in js=off environment.
+        $chk_all = '';
     }
     echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
     html_tag( 'tr', '', '', $color[9] ) .
@@ -118,21 +116,7 @@ if ($javascript_on) {
         } else {
             $tr_bgcolor = $color[4];
         }
-        if ($squirrelmail_language == 'ja_JP')
-            {
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
-        html_tag( 'td',
-             '<input type="checkbox" name="send_to_search[T' . $line . ']" value = "' .
-             htmlspecialchars($email) . '" />&nbsp;' . _("To") . '&nbsp;' .
-             '<input type="checkbox" name="send_to_search[C' . $line . ']" value = "' .
-             htmlspecialchars($email) . '" />&nbsp;' . _("Cc") . '&nbsp;' .
-             '<input type="checkbox" name="send_to_search[B' . $line . ']" value = "' .
-             htmlspecialchars($email) . '" />&nbsp;' . _("Bcc") . '&nbsp;' ,
-        'center', '', 'width="5%" style="white-space: nowrap;"' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
-            } else {
+
         echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
             addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
@@ -145,19 +129,20 @@ if ($javascript_on) {
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['email']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' ) .
         html_tag( 'td', '&nbsp;' . htmlspecialchars($row['label']) . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
-            }
 
-         if ($includesource) {
-             echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
-         }
-         echo "</tr>\n";
-         $line ++;
+        if ($includesource) {
+            echo html_tag( 'td', '&nbsp;' . $row['source'] . '&nbsp;', 'left', '', 'style="white-space: nowrap;"' );
+        }
+        echo "</tr>\n";
+        $line ++;
     }
     if ($includesource) { $td_colspan = '5'; } else { $td_colspan = '4'; }
     echo html_tag( 'tr',
                 html_tag( 'td',
                         '<input type="submit" name="addr_search_done" value="' .
-                        _("Use Addresses") . '" />' ,
+                        _("Use Addresses") . '" /> ' .
+                        '<input type="submit" name="addr_search_cancel" value="' .
+                        _("Cancel") . '" />',
                 'center', '', 'colspan="'. $td_colspan .'"' )
             ) .
          '</table>' .
@@ -173,6 +158,11 @@ if ($compose_new_win == '1') {
 else {
     displayPageHeader($color, $mailbox);
 }
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
 /* Initialize addressbook */
 $abook = addressbook_init();
 
@@ -186,16 +176,14 @@ html_tag( 'table',
 
 
 /* Search form */
-echo '<center>' .
+echo '<div style="text-align: center;">' .
     html_tag( 'table', '', 'center', '', 'border="0"' ) .
     html_tag( 'tr' ) .
     html_tag( 'td', '', 'left', '', 'style="white-space: nowrap;" valign="middle"' ) . "\n" .
     addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
-    "\n<center>\n" .
+    "\n<div style=\"text-align: center;\">\n" .
     '  <nobr><strong>' . _("Search for") . "</strong>\n";
 addr_insert_hidden();
-if (! isset($addrquery))
-    $addrquery = '';
 echo addInput('addrquery', $addrquery, 26);
 
 /* List all backends to allow the user to choose where to search */
@@ -220,22 +208,16 @@ if (isset($session)) {
 echo '<input type="submit" value="' . _("Search") . '" />' .
      '&nbsp;|&nbsp;<input type="submit" value="' . _("List all") .
      '" name="listall" />' . "\n" .
-     '</form></center></td></tr></table>' . "\n";
-addr_insert_hidden();
-echo '</center>';
+     '</form></div></td></tr></table>' . "\n";
+echo '</div>';
 do_hook('addrbook_html_search_below');
 /* End search form */
 
-/* Show personal addressbook */
-
-if ( !empty( $listall ) ){
-    $addrquery = '*';
-}
-
-if ($addrquery == '' && empty($listall)) {
-
+/* List addresses. Show personal addressbook */
+if ($addrquery == '' || ! empty($listall)) {
+    // TODO: recheck all conditions and simplity if statements
     if (! isset($backend) || $backend != -1 || $addrquery == '') {
-        if ($addrquery == '') {
+        if ($addrquery == '' && empty($listall)) {
             $backend = $abook->localbackend;
         }
 
@@ -258,46 +240,47 @@ if ($addrquery == '' && empty($listall)) {
         usort($res,'alistcmp');
         addr_display_result($res, true);
     }
+    $oTemplate->display('footer.tpl');
     exit;
-}
-else {
-
+} elseif (!empty($addrquery)) {
     /* Do the search */
-    if (!empty($addrquery)) {
-
-        if ($backend == -1) {
-            $res = $abook->s_search($addrquery);
-        } else {
-            $res = $abook->s_search($addrquery, $backend);
-        }
+    if ($backend == -1) {
+        $res = $abook->s_search($addrquery);
+    } else {
+        $res = $abook->s_search($addrquery, $backend);
+    }
 
-        if (!is_array($res)) {
-            echo html_tag( 'p', '<b><br />' .
-                             _("Your search failed with the following error(s)") .
-                            ':<br />' . $abook->error . "</b>\n" ,
-                   'center' ) .
-            "\n</body></html>\n";
+    if (!is_array($res)) {
+        echo html_tag( 'p', '<b><br />' .
+                       _("Your search failed with the following error(s)") .
+                       ':<br />' . nl2br(htmlspecialchars($abook->error)) . "</b>\n" ,
+                       'center' ) . "\n";
+        $oTemplate->display('footer.tpl');
+    } else {
+        if (sizeof($res) == 0) {
+            echo html_tag( 'p', '<br /><b>' .
+                           _("No persons matching your search were found") . "</b>\n" ,
+                           'center' ) . "\n";
+            $oTemplate->display('footer.tpl');
         } else {
-            if (sizeof($res) == 0) {
-                echo html_tag( 'p', '<br /><b>' .
-                                 _("No persons matching your search were found") . "</b>\n" ,
-                       'center' ) .
-                "\n</body></html>\n";
-            } else {
-                addr_display_result($res);
-            }
+            addr_display_result($res);
         }
     }
+} else {
+    // not first time display, not listall and search is empty
+    // TODO: I think, this part of control structure is never reached.
+    echo html_tag( 'p', '<br /><b>' .
+                   _("Nothing to search") . "</b>\n" ,
+                   'center' );
 }
 
 if ($addrquery == '' || sizeof($res) == 0) {
-    /* printf('<center><form method="post" name="k" action="compose.php">'."\n", $PHP_SELF); */
-    echo '<center>'.
+    echo '<div style="text-align: center;">'.
         addForm('compose.php','post','k');
     addr_insert_hidden();
     echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
-         '</form></center></nobr>';
+         '</form></div></nobr>';
 }
 
-?>
-</body></html>
\ No newline at end of file
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file