Textarea should not use proprietary wrap attribute (#1512681). Original

[squirrelmail.git] / src / addrbook_search.php

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index cd6366bc77d8bf5cee388edbf29022c2ee4870d6..b64d16d6bb0cc8765aedba7bb284cb479c57566e 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -17,16 +17,10 @@
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../');
+require('../include/init.php');
 
-/** SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-include_once(SM_PATH . 'functions/strings.php');
-include_once(SM_PATH . 'functions/global.php');
-include_once(SM_PATH . 'functions/html.php');
 include_once(SM_PATH . 'functions/forms.php');
 include_once(SM_PATH . 'functions/addressbook.php');
 
@@ -36,7 +30,7 @@ include_once(SM_PATH . 'functions/addressbook.php');
  */
 function insert_javascript() {
     ?>
-    <script language="Javascript"><!--
+    <script type="text/javascript"><!--
 
     function to_and_close($addr) {
         to_address($addr);
@@ -288,21 +282,15 @@ if ($show == 'form' && ! isset($listall)) {
         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";
-            exit;
-        }
-
-        if (sizeof($res) == 0) {
+                           ':<br />' . nl2br(htmlspecialchars($abook->error)) . "</b>\n" ,
+                           'center' );
+        } elseif (sizeof($res) == 0) {
             echo html_tag( 'p', '<br /><b>' .
                            _("No persons matching your search were found") . "</b>\n" ,
-                           'center' ) .
-                "\n</body></html>\n";
-            exit;
+                           'center' );
+        } else {
+            display_result($res);
         }
-
-        display_result($res);
     } else {
         /**
          * listall is not set, query is not set or empty.
@@ -311,6 +299,5 @@ if ($show == 'form' && ! isset($listall)) {
         echo html_tag( 'p', '<br /><b>' . _("Nothing to search") . "</b>\n",'center' );
     }
 }
-
-?>
-</body></html>
\ No newline at end of file
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file