Add index.html to Development subdir, rename README.russian_apache to

[squirrelmail.git] / src / addrbook_search.php

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index f913eca9e83c597ab3e61d46477f696c58b5f6d0..05777b89e1f7c381350d88bcc4c723e51f398141 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -3,7 +3,7 @@
 /**
  * addrbook_search.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Handle addressbook searching in the popup window.
@@ -175,6 +175,10 @@ require_once('../functions/addressbook.php');
 
 displayHtmlHeader();
 
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
+
 /* Initialize vars */
 if (!isset($query)) { $query = ''; }
 if (!isset($show))  { $show  = ''; }
@@ -201,8 +205,9 @@ if (empty($query) && empty($show) && empty($listall)) {
     exit;
 }
 
-/* Initialize addressbook */
-$abook = addressbook_init();
+/* Initialize addressbook, show init errors only in bottom frame */
+$showerr=($show=='form' ? false : true);
+$abook = addressbook_init($showerr);
 
 /* Create search form */
 if ($show == 'form' && empty($listall)) {
@@ -216,8 +221,9 @@ if ($show == 'form' && empty($listall)) {
 
     /* List all backends to allow the user to choose where to search */
     if ($abook->numbackends > 1) {
-        echo '<strong>' . _("in") . '</strong>&nbsp;'."\n".
-             $selopts['-1'] = _("All address books");
+        echo '<strong>' . _("in") . '</strong>&nbsp;'."\n";
+        $selopts = array();
+        $selopts['-1'] = _("All address books");
 
         $ret = $abook->get_backend_list();
         while (list($undef,$v) = each($ret)) {
@@ -303,4 +309,4 @@ if ($show == 'form' && empty($listall)) {
 
 }
 ?>
-</body></html>
\ No newline at end of file
+</body></html>