X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=9b81e493f61b3441a9d08a8c4fc548eb04a1d7ae;hb=701e7beed3baca980039f978c6d536dd91cae775;hp=b2e337743df8d1e35f3abfeb2bdb9cd41be42c5a;hpb=856e58ef5660063838b0ad5e457dcfeea195f8a2;p=squirrelmail.git

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index b2e33774..9b81e493 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -8,13 +8,16 @@
  *       addrbook_search_html.html -- If you change one,
  *       change the other one too!
  *
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2014 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage addressbook
  */
 
+/** This is the addrbook_search page */
+define('PAGE_NAME', 'addrbook_search');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -35,7 +38,7 @@ function display_result($res, $includesource = true) {
 
     if(sizeof($res) <= 0) return;
 
-    $oTemplate->assign('use_js', true);
+    $oTemplate->assign('compose_addr_pop', true);
     $oTemplate->assign('include_abook_name', $includesource);
     $oTemplate->assign('addresses', formatAddressList($res));
     
@@ -67,7 +70,7 @@ set_my_charset();
 
 /* Empty search */
 if (empty($query) && empty($show) && !isset($listall)) {
-    $oTemplate->assign('note', htmlspecialchars(_("No persons matching your search were found")));
+    $oTemplate->assign('note', sm_encode_html_special_chars(_("No persons matching your search were found")));
     $oTemplate->display('note.tpl');
 #    exit;
 }
@@ -78,9 +81,9 @@ $abook = addressbook_init($showerr);
 
 /* Create search form (top frame) */
 if ($show == 'form' && ! isset($listall)) {
-    echo "<form name=\"sform\" target=\"abookres\" action=\"addrbook_search.php\" method=\"POST\">\n";
+    echo "<form name=\"sform\" target=\"abookres\" action=\"addrbook_search.php\" method=\"post\">\n";
     
-    $oTemplate->assign('use_js', true);
+    $oTemplate->assign('compose_addr_pop', true);
     $oTemplate->assign('backends', getBackends());
     $oTemplate->display('addressbook_search_form.tpl');
     
@@ -122,7 +125,7 @@ if ($show == 'form' && ! isset($listall)) {
         }
 
         if (!is_array($res)) {
-            plain_error_message( _("Your search failed with the following error(s)") .':<br />'. nl2br(htmlspecialchars($abook->error)) );
+            plain_error_message( _("Your search failed with the following error(s)") .':<br />'. nl2br(sm_encode_html_special_chars($abook->error)) );
         } elseif (sizeof($res) == 0) {
             $oTemplate->assign('note', _("No persons matching your search were found"));
             $oTemplate->display('note.tpl');