corrected error which caused no data

[squirrelmail.git] / src / addrbook_search.php
diff --git a/src/addrbook_search.php b/src/addrbook_search.php

index 5181632c238ea4a78ce0b6ff5880b5ad2da49c6a..ad41bfefa0b50e08634bd5cfd8aabd299b67c530 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -36,17 +36,8 @@
     include("../src/load_prefs.php");
     sqimap_logout ($imapConnection);
  
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<HTML>
-<HEAD>
-<TITLE><?php 
-   printf("%s: %s", $org_title, _("Address Book")); 
-?></TITLE>
-</HEAD>
+   displayHtmlHeader();
  
-<?php
     // Choose correct colors for top and bottom frame
     if($show == "form") {
        echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
@@ -67,7 +58,7 @@
     // Create search form 
     if($show == "form") {
        printf("<FORM NAME=sform TARGET=abookres ACTION=\"%s\" METHOD=\"POST\">\n",
-            $PHP_SELF . "?PHPSESSID=$PHPSESSID");
+            $PHP_SELF);
        printf("<TABLE BORDER=0 WIDTH=\"100%%\" HEIGHT=\"100%%\">");
        printf("<TR><TD NOWRAP VALIGN=middle>\n");
        printf("  <STRONG>%s:</STRONG>\n</TD><TD VALIGN=middle>\n",
@@ -88,6 +79,11 @@
  ?>
  <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;
@@ -176,11 +172,12 @@ function bcc_address($addr) {
          printf("<tr%s nowrap><td nowrap align=center width=\"5%%\">".
                 "<a href=\"javascript:to_address('%s');\">To</A> | ".
                 "<a href=\"javascript:cc_address('%s');\">Cc</A>".
-               "<td nowrap>&nbsp;%s&nbsp;<td nowrap>&nbsp;%s&nbsp;".
+               "<td nowrap>&nbsp;%s&nbsp;<td nowrap>&nbsp;".
+                "<a href=\"javascript:to_and_close('%s');\">%s</A>&nbsp;".
                 "<td nowrap>&nbsp;%s&nbsp;<td nowrap>&nbsp;%s</tr>\n", 
                 ($line % 2) ? " bgcolor=\"$color[0]\"" : "", $row["email"],
-               $row["email"], $row["name"], $row["email"], $row["label"], 
-               $row["source"]);
+               $row["email"], $row["name"], $row["email"], $row["email"],
+                $row["label"], $row["source"]);
          $line++;
        }
        print "</TABLE>";