X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=cfbe3ba8b6c296026aad418691ccefd89ca84794;hb=6a2f68354009082148e09f5c82a29d1b17f69190;hp=2adb5ad5a1802616fb0c749af59e9b04912c5ded;hpb=00a065a69448f66db8f29fda00961878926a5912;p=squirrelmail.git

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 2adb5ad5..cfbe3ba8 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -1,202 +1,99 @@
 <?php
-
 /**
  * addrbook_search.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Handle addressbook searching in the popup window.
  *
  * NOTE: A lot of this code is similar to the code in
  *       addrbook_search_html.html -- If you change one,
  *       change the other one too!
  *
- * $Id$
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage addressbook
  */
 
-require_once('../src/validate.php');
-
-/* Function to include JavaScript code */
-function insert_javascript() {
-    ?>
-    <SCRIPT LANGUAGE="Javascript"><!--
-
-    function to_and_close($addr) {
-        to_address($addr);
-        parent.close();
-    }
-
-    function to_address($addr) {
-        var prefix    = "";
-        var pwintype = typeof parent.opener.document.compose;
-
-        $addr = $addr.replace(/ {1,35}$/, "");
-
-        if (pwintype != "undefined") {
-            if (parent.opener.document.compose.send_to.value) {
-                prefix = ", ";
-                parent.opener.document.compose.send_to.value =
-                    parent.opener.document.compose.send_to.value + ", " + $addr;
-            } else {
-                parent.opener.document.compose.send_to.value = $addr;
-            }
-        }
-    }
-
-    function cc_address($addr) {
-        var prefix    = "";
-        var pwintype = typeof parent.opener.document.compose;
-
-        $addr = $addr.replace(/ {1,35}$/, "");
-
-        if (pwintype != "undefined") {
-            if (parent.opener.document.compose.send_to_cc.value) {
-                prefix = ", ";
-                parent.opener.document.compose.send_to_cc.value =
-                    parent.opener.document.compose.send_to_cc.value + ", " + $addr;
-            } else {
-                parent.opener.document.compose.send_to_cc.value = $addr;
-            }
-        }
-    }
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
 
-    function bcc_address($addr) {
-        var prefix    = "";
-        var pwintype = typeof parent.opener.document.compose;
+include_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'functions/addressbook.php');
+include_once(SM_PATH . 'templates/util_addressbook.php');
 
-        $addr = $addr.replace(/ {1,35}$/, "");
+/**
+ * List search results
+ * @param array $res Array of search results
+ * @param bool $includesource [Default=true]
+ * @return void
+ */
+function display_result($res, $includesource = true) {
+    global $oTemplate, $oErrorHandler;
 
-        if (pwintype != "undefined") {
-            if (parent.opener.document.compose.send_to_bcc.value) {
-                prefix = ", ";
-                parent.opener.document.compose.send_to_bcc.value =
-                    parent.opener.document.compose.send_to_bcc.value + ", " + $addr;
-            } else {
-                parent.opener.document.compose.send_to_bcc.value = $addr;
-            }
-        }
-    }
+    if(sizeof($res) <= 0) return;
 
-// --></SCRIPT>
-<?php
-} /* End of included JavaScript */
+    $oTemplate->assign('use_js', true);
+    $oTemplate->assign('include_abook_name', $includesource);
+    $oTemplate->assign('addresses', formatAddressList($res));
+    
+    $oTemplate->display('addrbook_search_list.tpl');    
+}
 
+/* ================= End of functions ================= */
 
-/* List search results */
-function display_result($res, $includesource = true) {
-    global $color;
-        
-    if(sizeof($res) <= 0) return;
-        
-    insert_javascript();
-        
-    $line = 0;
-    echo '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>' .
-         '<TR BGCOLOR="' . $color[9] . '"><TH ALIGN=left>&nbsp;' .
-         '<TH ALIGN=left>&nbsp;' . _("Name") .
-         '<TH ALIGN=left>&nbsp;' . _("E-mail") .
-         '<TH ALIGN=left>&nbsp;' . _("Info");
-
-    if ($includesource) {
-        echo '<TH ALIGN=left WIDTH="10%">&nbsp;' . _("Source");
-    }    
-    echo "</TR>\n";
-    
-    while (list($undef, $row) = each($res)) {
-        echo '<tr';
-        if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
-        echo ' nowrap><td valign=top nowrap align=center width="5%">' .
-             '<small><a href="javascript:to_address(' . 
-                                       "'" . $row['email'] . "');\">To</A> | " .
-             '<a href="javascript:cc_address(' . 
-                                       "'" . $row['email'] . "');\">Cc</A> | " .
-             '<a href="javascript:bcc_address(' . 
-                                 "'" . $row['email'] . "');\">Bcc</A></small>" .
-             '<td nowrap valign=top>&nbsp;' .
-                                 $row['name'] . '&nbsp;<td nowrap valign=top>' .
-             '&nbsp;<a href="javascript:to_and_close(' .
-                 "'" . $row['email'] . "');\">" . $row['email'] . '</A>&nbsp;' .
-             '<td valign=top>&nbsp;' . $row['label'] . '&nbsp;';
-        if ($includesource) {
-            echo '<td nowrap valign=top>&nbsp;' . $row['source'];
-        }
+/** lets get the global vars we may need */
 
-        echo "</TR>\n";
-        $line++;
-    }
-    echo '</TABLE>';
+if (! sqgetGlobalVar('show' , $show)) {
+    $show = '';
+}
+if (! sqgetGlobalVar('query', $query, SQ_POST)) {
+    $query = '';
+}
+if (! sqgetGlobalVar('listall', $listall, SQ_POST)) {
+    unset($listall);
+}
+if (! sqgetGlobalVar('backend', $backend, SQ_POST)) {
+    $backend = '';
 }
 
-/* ================= End of functions ================= */
-    
-require_once('../functions/array.php');
-require_once('../functions/strings.php');
-require_once('../functions/addressbook.php');
-    
 displayHtmlHeader();
-    
-/* Initialize vars */
-if (!isset($query)) { $query = ''; }
-if (!isset($show))  { $show  = ''; }
-
-/* Choose correct colors for top and bottom frame */
-if ($show == 'form') {
-    echo '<BODY TEXT="' . $color[6] . '" BGCOLOR="' . $color[3] . '" ' .
-               'LINK="' . $color[6] . '" VLINK="'   . $color[6] . '" ' .
-                                        'ALINK="'   . $color[6] . '" ' .
-         'OnLoad="document.sform.query.focus();">';
-} else {
-    echo '<BODY TEXT="' . $color[8] . '" BGCOLOR="' . $color[4] . '" ' .
-               'LINK="' . $color[7] . '" VLINK="'   . $color[7] . '" ' .
-                                        'ALINK="'   . $color[7] . "\">\n";
-}
+echo "<body>\n";
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
 
 /* Empty search */
-if (empty($query) && empty($show) && empty($listall)) {
-    echo '<P ALIGN=center><BR>' .
-          _("No persons matching your search was found") .
-          "</P>\n</BODY></HTML>\n",
-    exit;
+if (empty($query) && empty($show) && !isset($listall)) {
+    $oTemplate->assign('note', htmlspecialchars(_("No persons matching your search were found")));
+    $oTemplate->display('note.tpl');
+#    exit;
 }
 
-/* Initialize addressbook */
-$abook = addressbook_init();
-
-/* Create search form */
-if ($show == 'form') {
-    echo '<FORM NAME=sform TARGET=abookres ACTION="' . $PHP_SELF .
-         '" METHOD="POST">' . "\n" .
-         '<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">' .
-         '<TR><TD NOWRAP VALIGN=middle>' . "\n" .
-         '  <STRONG>' . _("Search for") . "</STRONG>\n" .
-         '  <INPUT TYPE=text NAME=query VALUE="' . htmlspecialchars($query) .
-         "\" SIZE=26>\n";
-
-    /* List all backends to allow the user to choose where to search */
-    if ($abook->numbackends > 1) {
-        echo '<STRONG>' . _("in") . '</STRONG>&nbsp;<SELECT NAME=backend>'."\n".
-             '<OPTION VALUE=-1 SELECTED>' . _("All address books") . "\n";
-        $ret = $abook->get_backend_list();
-        while (list($undef,$v) = each($ret)) {
-            echo '<OPTION VALUE=' . $v->bnum . '>' . $v->sname . "\n";
-        }
-        echo "</SELECT>\n";
-    } else {
-        echo '<INPUT TYPE=hidden NAME=backend VALUE=-1>' . "\n";
-    }
-        
-    echo '<INPUT TYPE=submit VALUE="' . _("Search") . '">' .
-         '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
-         '" NAME=listall>' . "\n" .
-         '</TD><TD ALIGN=right>' . "\n" .
-         '<INPUT TYPE=button VALUE="' . _("Close window") .
-         '" onclick="parent.close();">' . "\n" .
-         '</TD></TR></TABLE></FORM>' . "\n";
-} else {
+/* Initialize addressbook, show init errors only in bottom frame */
+$showerr=($show=='form' ? false : true);
+$abook = addressbook_init($showerr);
 
-    /* Show personal addressbook */
-    if ($show == 'blank' || !empty($listall)) {
+/* Create search form (top frame) */
+if ($show == 'form' && ! isset($listall)) {
+    echo "<form name=\"sform\" target=\"abookres\" action=\"addrbook_search.php\" method=\"POST\">\n";
+    
+    $oTemplate->assign('use_js', true);
+    $oTemplate->assign('backends', getBackends());
+    $oTemplate->display('addressbook_search_form.tpl');
+    
+    echo "</form>\n";
+} else {
+    /**
+     * List addresses (bottom frame)
+     * If listall is set, list all entries in selected backend.
+     * If $show is 'blank' (initial call of address book popup) - list
+     * personal address book.
+     */
+    if ($show == 'blank' || isset($listall)) {
 
         if($backend != -1 || $show == 'blank') {
             if ($show == 'blank') {
@@ -205,49 +102,42 @@ if ($show == 'form') {
             $res = $abook->list_addr($backend);
 
             if(is_array($res)) {
+                usort($res,'alistcmp');
                 display_result($res, false);
             } else {
-                echo '<P ALIGN=center><STRONG>' .
-                     sprintf(_("Unable to list addresses from %s"),
-                         $abook->backends[$backend]->sname) .
-                     '</STRONG></P>' . "\n";
+                plain_error_message(sprintf(_("Unable to list addresses from %s"), $abook->backends[$backend]->sname));
             }
         } else {
             $res = $abook->list_addr();
+            usort($res,'alistcmp');
             display_result($res, true);
         }
 
-    } else {
+    } elseif (!empty($query)) {
+        /* Do the search (listall is not set. query is set.)*/
 
-        /* Do the search */
-        if (!empty($query) && empty($listall)) {
-    
-            if($backend == -1) {
-                $res = $abook->s_search($query);
-            } else {
-                $res = $abook->s_search($query, $backend);
-            }
-        
-            if (!is_array($res)) {
-                echo '<P ALIGN=center><B><BR>' .
-                     _("Your search failed with the following error(s)") .
-                     ':<br>' . $abook->error . "</B></P>\n</BODY></HTML>\n";
-                exit;
-            }
-        
-            if (sizeof($res) == 0) {
-                echo '<P ALIGN=center><BR><B>' .
-                     _("No persons matching your search was found") .
-                     ".</B></P>\n</BODY></HTML>\n";
-                exit;
-            }
-        
+        if($backend == -1) {
+            $res = $abook->s_search($query);
+        } else {
+            $res = $abook->s_search($query, $backend);
+        }
+
+        if (!is_array($res)) {
+            plain_error_message( _("Your search failed with the following error(s)") .':<br />'. nl2br(htmlspecialchars($abook->error)) );
+        } elseif (sizeof($res) == 0) {
+            $oTemplate->assign('note', _("No persons matching your search were found"));
+            $oTemplate->display('note.tpl');
+        } else {
             display_result($res);
         }
+    } else {
+        /**
+         * listall is not set, query is not set or empty.
+         * User hit search button without entering search expression.
+         */
+        plain_error_message(_("Nothing to search"));
     }
-   
 }
 
-echo "</BODY></HTML>\n";
-   
-?>
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file