X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=4e914beef1ef4f28c5297d4665e19f6148e3510e;hb=0fa230016e399929e51d8e007b1509421424c7de;hp=9557065cf1f74af43075cf0a90a5c0c613912141;hpb=9487c2ff3a9d36af3dc93bd231a6f85fe7a6f762;p=squirrelmail.git

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 9557065c..4e914bee 100644
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -1,244 +1,291 @@
 <?php
-   /**
-    **  addrbook_search.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development 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$
-    **/
-
-   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();
-}
+/**
+ * addrbook_search.php
+ *
+ * Copyright (c) 1999-2003 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$
+ */
 
-function to_address($addr) {
-  var prefix    = "";
-  var pwintype = typeof parent.opener.document.compose;
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-  $addr = $addr.replace(/ {1,35}$/, "");
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/global.php');
+require_once(SM_PATH . 'functions/html.php');
 
-  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;
+/* 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);
 
-    } else {
-      parent.opener.document.compose.send_to.value = $addr;
+sqgetGlobalVar('show' ,   $show);
+sqgetGlobalVar('query',   $query,   SQ_POST);
+sqgetGlobalVar('listall', $listall, SQ_POST);
+sqgetGlobalVar('backend', $backend, SQ_POST);
+
+/* Function to include JavaScript code */
+function insert_javascript() {
+    ?>
+    <SCRIPT LANGUAGE="Javascript"><!--
+
+    function to_and_close($addr) {
+        to_address($addr);
+        parent.close();
     }
-  }
-}
 
-function cc_address($addr) {
-  var prefix    = "";
-  var pwintype = typeof parent.opener.document.compose;
+    function to_address($addr) {
+        var prefix    = "";
+        var pwintype = typeof parent.opener.document.compose;
 
-  $addr = $addr.replace(/ {1,35}$/, "");
+        $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;
+        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 bcc_address($addr) {
-  var prefix    = "";
-  var pwintype = typeof parent.opener.document.compose;
+    function cc_address($addr) {
+        var prefix    = "";
+        var pwintype = typeof parent.opener.document.compose;
 
-  $addr = $addr.replace(/ {1,35}$/, "");
+        $addr = $addr.replace(/ {1,35}$/, "");
 
-  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 (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;
+            }
+        }
     }
-  }
-}
 
-// --></SCRIPT>
+    function bcc_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_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;
+            }
+        }
+    }
 
+// --></SCRIPT>
 <?php
-   } // End of included JavaScript
+} /* End of included JavaScript */
 
 
-    // List search results
-    function display_result($res, $includesource = true) {
-        global $color;
+/* List search results */
+function display_result($res, $includesource = true) {
+    global $color;
         
-        if(sizeof($res) <= 0) return;
+    if(sizeof($res) <= 0) return;
         
-        insert_javascript();
+    insert_javascript();
         
-        $line = 0;
-        echo '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>';
-        printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left>&nbsp;".
-            "<TH ALIGN=left>&nbsp;%s<TH ALIGN=left>&nbsp;%s".
-            "<TH ALIGN=left>&nbsp;%s",
-            _("Name"), _("E-mail"), _("Info"));
-        
-        if($includesource)
-            printf("<TH ALIGN=left WIDTH=\"10%%\">&nbsp;%s", _("Source"));
-    
-        echo "</TR>\n";
-    
-        while(list($undef, $row) = each($res)) {
-            printf("<tr%s nowrap><td valign=top nowrap align=center width=\"5%%\">".
-                    "<small><a href=\"javascript:to_address('%s');\">To</A> | ".
-                    "<a href=\"javascript:cc_address('%s');\">Cc</A> | ".
-                    "<a href=\"javascript:bcc_address('%s');\">Bcc</A></small>".
-                    "<td nowrap valign=top>&nbsp;%s&nbsp;<td nowrap valign=top>".
-                    "&nbsp;<a href=\"javascript:to_and_close('%s');\">%s</A>&nbsp;".
-                    "<td valign=top>&nbsp;%s&nbsp;",
-                    ($line % 2) ? " bgcolor=\"$color[0]\"" : "",
-                    $row["email"], $row["email"], $row["email"],
-                    $row["name"],  $row["email"], $row["email"],
-                    $row["label"]);
-    
-            if($includesource)
-                printf("<td nowrap valign=top>&nbsp;%s", $row["source"]);
+    $line = 0;
+    echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
+    html_tag( 'tr', '', '', $color[9] ) .
+    html_tag( 'th', '&nbsp;', 'left' ) .
+    html_tag( 'th', '&nbsp;' . _("Name"), 'left' ) .
+    html_tag( 'th', '&nbsp;' . _("E-mail"), 'left' ) .
+    html_tag( 'th', '&nbsp;' . _("Info"), 'left' );
+
+    if ($includesource) {
+        echo html_tag( 'th', '&nbsp;' . _("Source"), 'left', 'width="10%"' );
+    }    
+    echo "</tr>\n";
     
-            echo "</TR>\n";
-            $line++;
+    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' ) .
+        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' ) .
+        html_tag( 'td', '&nbsp;' .
+             '<a href="javascript:to_and_close(' .
+                 "'" . $email . "');\">" . htmlspecialchars($row['email']) . '</A>'
+        , 'left', '', 'valign="top"' ) .
+        html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' );
+        if ($includesource) {
+            echo html_tag( 'td', '&nbsp;' . $row['source'], 'left', '', 'valign="top" nowrap' );
         }
-        echo '</TABLE>';
+
+        echo "</tr>\n";
+        $line++;
     }
+    echo '</table>';
+}
 
-    /* ================= End of functions ================= */
+/* ================= End of functions ================= */
     
-    require_once('../functions/array.php');
-    require_once('../functions/strings.php');
-    require_once('../functions/addressbook.php');
+require_once('../functions/strings.php');
+require_once('../functions/addressbook.php');
     
-    displayHtmlHeader();
+displayHtmlHeader();
     
-    // Initialize vars
-    if(!isset($query)) $query = "";
-    if(!isset($show))  $show  = "";
-
-    // Choose correct colors for top and bottom frame
-    if($show == 'form') {
-        echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
-        echo "LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\" ";
-        echo 'OnLoad="document.sform.query.focus();">';
-    } else {
-        echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" ";
-        echo "LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-    }
+/* Initialize vars */
+if (!isset($query)) { $query = ''; }
+if (!isset($show))  { $show  = ''; }
+if (!isset($backend)) { $backend = ''; }
 
-    // Empty search
-    if(empty($query) && empty($show) && empty($listall))  {
-        printf("<P ALIGN=center><BR>%s</P>\n</BODY></HTML>\n",
-         _("No persons matching your search was found"));
-      exit;
-    }
+/* 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] . '" ' .
+         'OnLoad="document.sform.query.focus();">';
+} else {
+    echo '<BODY TEXT="' . $color[8] . '" BGCOLOR="' . $color[4] . '" ' .
+               'LINK="' . $color[7] . '" VLINK="'   . $color[7] . '" ' .
+                                        'ALINK="'   . $color[7] . "\">\n";
+}
 
-    // Initialize addressbook
-    $abook = addressbook_init();
-
-    // Create search form
-    if($show == 'form') {
-        echo "<FORM NAME=sform TARGET=abookres ACTION=\"$PHP_SELF\" METHOD=\"POST\">\n";
-        echo '<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">';
-        echo "<TR><TD NOWRAP VALIGN=middle>\n";
-        printf("  <STRONG>%s</STRONG>\n", _("Search for"));
-        printf("  <INPUT TYPE=text NAME=query VALUE=\"%s\" SIZE=26>\n",
-         htmlspecialchars($query));
-        
-        // List all backends to allow the user to choose where to search
-        if($abook->numbackends > 1) {
-            printf("<STRONG>%s</STRONG>&nbsp;<SELECT NAME=backend>\n",
-               _("in"));
-            printf("<OPTION VALUE=-1 SELECTED>%s\n",
-               _("All address books"));
-            $ret = $abook->get_backend_list();
-            while(list($undef,$v) = each($ret))
-                printf("<OPTION VALUE=%d>%s\n", $v->bnum, $v->sname);
-            print "</SELECT>\n";
-        } else {
-            print "<INPUT TYPE=hidden NAME=backend VALUE=-1>\n";
+/* Empty search */
+if (empty($query) && empty($show) && empty($listall)) {
+    echo html_tag( 'p', '<br>' .
+                      _("No persons matching your search was found"),
+            'center' ) .
+          "\n</BODY></HTML>\n",
+    exit;
+}
+
+/* Initialize addressbook */
+$abook = addressbook_init();
+
+/* Create search form */
+if ($show == 'form' && empty($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', '', 'left', '', '' ) .
+                 '<INPUT TYPE=text NAME=query VALUE="' . htmlspecialchars($query) .
+                 "\" SIZE=28>\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";
+    }
         
-        printf("<INPUT TYPE=submit VALUE=\"%s\">",
-             _("Search"));
-        printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
-             _("List all"));
-        print "</TD><TD ALIGN=right>\n";
-        printf("<INPUT TYPE=button VALUE=\"%s\" onclick=\"parent.close();\">\n",
-             _("Close window"));
-        print "</TD></TR></TABLE></FORM>\n";
-    } else
-
-    // Show personal addressbook
-    if($show == 'blank' || !empty($listall)) {
+    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" ,
+                    'left' )
+            ) .
+         '</table></form>' . "\n";
+} else {
+
+    /* Show personal addressbook */
+    if ($show == 'blank' && empty($listall)) {
 
         if($backend != -1 || $show == 'blank') {
-            if($show == 'blank')
+            if ($show == 'blank') {
                 $backend = $abook->localbackend;
-
+            }
             $res = $abook->list_addr($backend);
 
             if(is_array($res)) {
+                usort($res,'alistcmp');
                 display_result($res, false);
             } else {
-                printf("<P ALIGN=center><STRONG>"._("Unable to list addresses from %s").
-                       "</STRONG></P>\n", $abook->backends[$backend]->sname);
+                echo html_tag( 'p', '<strong>' .
+                                 sprintf(_("Unable to list addresses from %s"),
+                                     $abook->backends[$backend]->sname) . '</strong>' ,
+                       'center' ) . "\n";
             }
-
         } else {
-         $res = $abook->list_addr();
-         display_result($res, true);
+            $res = $abook->list_addr();
+            usort($res,'alistcmp');
+            display_result($res, true);
         }
 
-    } else
+    } else {
+        if( !empty( $listall ) ){
+          $query = '*';
+        }
 
-    // Do the search
-    if(!empty($query) && empty($listall)) {
+        /* Do the search */
+        if (!empty($query)) {
     
-        if($backend == -1) {
-            $res = $abook->s_search($query);
-        } else {
-            $res = $abook->s_search($query, $backend);
-        }
+            if($backend == -1) {
+                $res = $abook->s_search($query);
+            } else {
+                $res = $abook->s_search($query, $backend);
+            }
         
-        if(!is_array($res)) {
-            printf("<P ALIGN=center><B><BR>%s:<br>%s</B></P>\n</BODY></HTML>\n",
-                   _("Your search failed with the following error(s)"),
-            $abook->error);
-            exit;
-        }
+            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) {
-            printf("<P ALIGN=center><BR><B>%s.</B></P>\n</BODY></HTML>\n",
-                   _("No persons matching your search was found"));
-            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;
+            }
         
-        display_result($res);
+            display_result($res);
+        }
     }
    
-   echo "</BODY></HTML>\n";
+}
+
+echo "</BODY></HTML>\n";
    
-?>
\ No newline at end of file
+?>