X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=843303cc9e5815503b5b015bb85d7fa7151d143b;hb=190dc452bedb05364a6f5842142b5e484995b1ca;hp=f6d637486f76bcf4299bc2378aaae4629149fcde;hpb=08185f2a7631c3a12cb1ac085fec3be471b56b00;p=squirrelmail.git

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index f6d63748..843303cc 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -3,30 +3,34 @@
 /**
  * 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 © 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. */
-define('SM_PATH','../');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'functions/addressbook.php');
 
-/* Function to include JavaScript code */
+/**
+ * Function to include JavaScript code
+ * @return void
+ */
 function insert_javascript() {
     ?>
-    <SCRIPT LANGUAGE="Javascript"><!--
+    <script type="text/javascript"><!--
 
     function to_and_close($addr) {
         to_address($addr);
@@ -84,19 +88,24 @@ function insert_javascript() {
         }
     }
 
-// --></SCRIPT>
+// --></script>
 <?php
 } /* End of included JavaScript */
 
 
-/* List search results */
+/**
+ * List search results
+ * @param array $res Array of search results
+ * @param bool $includesource [Default=true]
+ * @return void
+ */
 function display_result($res, $includesource = true) {
     global $color;
-        
+
     if(sizeof($res) <= 0) return;
-        
+
     insert_javascript();
-        
+
     $line = 0;
     echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
     html_tag( 'tr', '', '', $color[9] ) .
@@ -106,31 +115,34 @@ function display_result($res, $includesource = true) {
     html_tag( 'th', '&nbsp;' . _("Info"), 'left' );
 
     if ($includesource) {
-        echo html_tag( 'th', '&nbsp;' . _("Source"), 'left', 'width="10%"' );
-    }    
+        echo html_tag( 'th', '&nbsp;' . _("Source"), 'left', '', 'width="10%"' );
+    }
     echo "</tr>\n";
-    
+
     while (list($undef, $row) = each($res)) {
-        $tr_bgcolor = '';
         $email = htmlspecialchars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES);
-        if ($line % 2) { $tr_bgcolor = $color[0]; }
-        echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) .
+        if ($line % 2) {
+            $tr_bgcolor = $color[12];
+        } else {
+            $tr_bgcolor = $color[4];
+        }
+        echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
         html_tag( 'td',
-             '<small><a href="javascript:to_address(' . 
-                                       "'" . $email . "');\">To</A> | " .
-             '<a href="javascript:cc_address(' . 
-                                       "'" . $email . "');\">Cc</A> | " .
-             '<a href="javascript:bcc_address(' . 
-                                 "'" . $email . "');\">Bcc</A></small>",
-        'center', '', 'valign="top" width="5%" nowrap' ) .
-        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) .
+             '<small><a href="javascript:to_address(' .
+                                       "'" . $email . "');\">"._("To")."</a> | " .
+             '<a href="javascript:cc_address(' .
+                                       "'" . $email . "');\">"._("Cc")."</a> | " .
+             '<a href="javascript:bcc_address(' .
+                                 "'" . $email . "');\">"._("Bcc")."</a></small>",
+        'center', '', 'valign="top" width="5%" style="white-space: nowrap;"' ) .
+        html_tag( 'td', '&nbsp;' . htmlspecialchars($row['name']), 'left', '', 'valign="top" style="white-space: nowrap;"' ) .
         html_tag( 'td', '&nbsp;' .
              '<a href="javascript:to_and_close(' .
-                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</A>'
+                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</a>'
         , 'left', '', 'valign="top"' ) .
-        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
+        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" style="white-space: nowrap;"' );
         if ($includesource) {
-            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" nowrap' );
+            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" style="white-space: nowrap;"' );
         }
 
         echo "</tr>\n";
@@ -140,82 +152,104 @@ function display_result($res, $includesource = true) {
 }
 
 /* ================= End of functions ================= */
-    
-require_once('../functions/array.php');
-require_once('../functions/strings.php');
-require_once('../functions/addressbook.php');
-    
+
+/** lets get the global vars we may need */
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
+
+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 = '';
+}
+
 displayHtmlHeader();
-    
-/* Initialize vars */
-if (!isset($query)) { $query = ''; }
-if (!isset($show))  { $show  = ''; }
-if (!isset($backend)) { $backend = ''; }
+
+/** set correct value of $default_charset */
+global $default_charset;
+set_my_charset();
 
 /* Choose correct colors for top and bottom frame */
 if ($show == 'form' && !isset($listall)) {
-    echo '<BODY TEXT="' . $color[6] . '" BGCOLOR="' . $color[3] . '" ' .
-               'LINK="' . $color[6] . '" VLINK="'   . $color[6] . '" ' .
-                                        'ALINK="'   . $color[6] . '" ' .
+    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 text="' . $color[8] . '" bgcolor="' . $color[4] . '" ' .
+               'link="' . $color[7] . '" vlink="'   . $color[7] . '" ' .
+                                        'alink="'   . $color[7] . "\">\n";
 }
 
 /* Empty search */
-if (empty($query) && empty($show) && empty($listall)) {
-    echo html_tag( 'p', '<br>' .
-                      _("No persons matching your search was found"),
+if (empty($query) && empty($show) && !isset($listall)) {
+    echo html_tag( 'p', '<br />' .
+                      _("No persons matching your search were found"),
             'center' ) .
-          "\n</BODY></HTML>\n",
+          "\n</body></html>\n";
     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)) {
-    echo '<FORM NAME=sform TARGET=abookres ACTION="addrbook_search.php'. 
-         '" METHOD="POST">' . "\n" .
+/* Create search form (top frame) */
+if ($show == 'form' && ! isset($listall)) {
+    echo '<form name="sform" target="abookres" action="addrbook_search.php'.
+            '" method="post">' . "\n" .
          html_tag( 'table', '', '', '', 'border="0" width="100%" height="100%"' ) .
          html_tag( 'tr' ) .
-         html_tag( 'td', '  <strong>' . _("Search for") . "</strong>\n", 'left', '', 'nowrap valign="middle" width="10%"' ) .
+         html_tag( 'td', '  <strong><label for="query">' . _("Search for") .
+             "</label></strong>\n", 'left', '',
+             'style="white-space: nowrap;" valign="middle" width="10%"' ) .
          html_tag( 'td', '', 'left', '', '' ) .
-                 '<INPUT TYPE=text NAME=query VALUE="' . htmlspecialchars($query) .
-                 "\" SIZE=28>\n";
+         addInput('query', $query, 28);
 
     /* 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";
+        echo '<strong><label for="backend">' . _("in") . '</label></strong>&nbsp;'."\n";
+        $selopts = array();
+        $selopts['-1'] = _("All address books");
+
         $ret = $abook->get_backend_list();
         while (list($undef,$v) = each($ret)) {
-            echo '<OPTION VALUE=' . $v->bnum . '>' . $v->sname . "\n";
+            $selopts[$v->bnum] = $v->sname;
         }
-        echo "</SELECT>\n";
+        echo addSelect('backend', $selopts, '-1', TRUE);
     } else {
-        echo '<INPUT TYPE=hidden NAME=backend VALUE=-1>' . "\n";
+        echo addHidden('backend', '-1');
     }
-        
+
     echo '</td></tr>' .
     html_tag( 'tr',
                     html_tag( 'td', '', 'left' ) .
                     html_tag( 'td',
-                            '<INPUT TYPE=submit VALUE="' . _("Search") . '" NAME=show>' .
-                            '&nbsp;|&nbsp;<INPUT TYPE=submit VALUE="' . _("List all") .
-                            '" NAME=listall>' . "\n" .
-                            '&nbsp;|&nbsp;<INPUT TYPE=button VALUE="' . _("Close") .
-                            '" onclick="parent.close();">' . "\n" ,
+                            '<input type="submit" value="' . _("Search") . '" name="show" />' .
+                            '&nbsp;|&nbsp;<input type="submit" value="' . _("List all") .
+                            '" name="listall" />' . "\n" .
+                            '&nbsp;|&nbsp;<input type="button" value="' . _("Close") .
+                            '" onclick="parent.close();" />' . "\n" ,
                     'left' )
             ) .
          '</table></form>' . "\n";
 } else {
-
-    /* Show personal addressbook */
-    if ($show == 'blank' && empty($listall)) {
+    /**
+     * 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') {
@@ -228,9 +262,9 @@ if ($show == 'form' && empty($listall)) {
                 display_result($res, false);
             } else {
                 echo html_tag( 'p', '<strong>' .
-                                 sprintf(_("Unable to list addresses from %s"),
-                                     $abook->backends[$backend]->sname) . '</strong>' ,
-                       'center' ) . "\n";
+                               sprintf(_("Unable to list addresses from %s"),
+                                       $abook->backends[$backend]->sname) . '</strong>' ,
+                               'center' ) . "\n";
             }
         } else {
             $res = $abook->list_addr();
@@ -238,43 +272,34 @@ if ($show == 'form' && empty($listall)) {
             display_result($res, true);
         }
 
-    } else {
-        if( !empty( $listall ) ){
-          $query = '*';
+    } elseif (!empty($query)) {
+        /* Do the search (listall is not set. query is set.)*/
+
+        if($backend == -1) {
+            $res = $abook->s_search($query);
+        } else {
+            $res = $abook->s_search($query, $backend);
         }
 
-        /* Do the search */
-        if (!empty($query)) {
-    
-            if($backend == -1) {
-                $res = $abook->s_search($query);
-            } else {
-                $res = $abook->s_search($query, $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";
-                exit;
-            }
-        
-            if (sizeof($res) == 0) {
-                echo html_tag( 'p', '<br><b>' .
-                                 _("No persons matching your search was found") . "</b>\n" ,
-                       'center' ) .
-                "\n</BODY></HTML>\n";
-                exit;
-            }
-        
+        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' );
+        } elseif (sizeof($res) == 0) {
+            echo html_tag( 'p', '<br /><b>' .
+                           _("No persons matching your search were found") . "</b>\n" ,
+                           'center' );
+        } else {
             display_result($res);
         }
+    } else {
+        /**
+         * listall is not set, query is not set or empty.
+         * User hit search button without entering search expression.
+         */
+        echo html_tag( 'p', '<br /><b>' . _("Nothing to search") . "</b>\n",'center' );
     }
-   
 }
-
-echo "</BODY></HTML>\n";
-   
+$oTemplate->display('footer.tpl');
 ?>