basic html address book

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@485 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index 6e1159a9829ebea9761bf431457513d870c41744..8d792876df29c351086964a9a3808fe6cfc7a378 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -67,7 +67,6 @@ while ($line = <FILE>) {
                   $tmp =~ s/^\s*"base"\s*=>\s*"//i;
                   $tmp =~ s/",\s*$//;
                   $tmp =~ s/"\);\s*$//;
-                  print $tmp."\n";
                   $base = $tmp;
                } elsif ($tmp =~ /^\s*"charset"/i) {
                   $tmp =~ s/^\s*"charset"\s*=>\s*"//i;
@@ -191,6 +190,7 @@ while (($command ne "q") && ($command ne "Q")) {
       for ($count = 0; $count <= $#ldap_host; $count++) {
          print "    >  $ldap_host[$count]\n";
       }
+      print "2.  Use Javascript Address Book Search  : $WHT$default_use_javascript_addr_book$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 7) {
@@ -270,7 +270,8 @@ while (($command ne "q") && ($command ne "Q")) {
             command41 (); 
          }
       } elsif ($menu == 6) {
-         if ($command == 1) { command61(); }
+         if    ($command == 1) { command61(); }
+         elsif ($command == 2) { command62(); }
       } elsif ($menu == 7) {
          if    ($command == 1) { $motd = command71 (); $motd =~ s/"/\\"/g;}
       }
@@ -1089,6 +1090,33 @@ sub command61 {
    }
 }   
 
+sub command62 {
+   print "Although our project goals stated that we would stay 100% HTML with\n";
+   print "no javascript, some of our developers have developed a wonderful\n";
+   print "javascript interface for searching for email addresses in your address\n";
+   print "books.  In order to stick with our project goals, and without having\n";
+   print "to refuse their work, we also developed an HTML version of address\n";
+   print "book searching.\n";
+   print "\n";
+   print "This is just the default value.  It is also a user option that each\n";
+   print "user can configure individually\n";
+   print "\n";
+   
+   if ($default_use_javascript_addr_book eq "true") {
+      $default_value = "y";
+   } else {
+      $default_use_javascript_addr_book = "false";
+      $default_value = "n";
+   }
+   print "Use javascript version (y/n) [$WHT$default_value$NRM]: $WHT";
+   $new_show = <STDIN>;
+   if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) {
+      $default_use_javascript_addr_book = "true";
+   } else {
+      $default_use_javascript_addr_book = "false";
+   }
+   return $default_use_javascript_addr_book;
+}
 
 
 sub save_data {
@@ -1142,6 +1170,10 @@ sub save_data {
    
    print FILE "\n";
 
+   if ($default_use_javascript_addr_book ne "true") {
+      $default_use_javascript_addr_book = "false";
+   }   
+   print FILE "\t\$default_use_javascript_addr_book = $default_use_javascript_addr_book;\n";
    for ($count=0; $count <= $#ldap_host; $count++) {
       print FILE "\t\$ldap_server[$count] = Array(\n";
       print FILE "\t\t\t\"host\" => \"$ldap_host[$count]\",\n";
@@ -1161,6 +1193,7 @@ sub save_data {
       print FILE ");\n\n";
    }
 
+   print FILE "\n";
    print FILE "\t\$motd = \"$motd\";\n";
 
    print FILE "?>\n";

diff --git a/config/config_default.php b/config/config_default.php
index 9679ddb7dcce997403b5125f7cade215239ef9e3..2c2a574de452fdd2bfcb5876f2e055d4d0821b65 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -218,4 +218,11 @@
                        "base" => "",
                        "charset" => "iso8859-1");
 
+ // you have an option to chose between javascript or html version of
+ // address book searching.  
+ //   true = javascript
+ //  false = html
+
+ $default_use_javascript_addr_book = false;
+
 ?>

diff --git a/functions/url_parser.php b/functions/url_parser.php
index fb47657ec2e6e818eb39c4d7d52567a0653302ee..bcb5f7b91d113677d7ab93a6e7f086f127fe313a 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -18,7 +18,7 @@
    function parseUrl ($body) {
       #Possible ways a URL could finish.
 
-      $poss_ends=array(" ","\n","\r","<",">",".&nbsp","&nbsp",")","(");
+      $poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ".&nbsp", "&nbsp", ")", "(");
       $done=False;
       while (!$done) {
          #Look for when a URL starts

diff --git a/src/compose.php b/src/compose.php
index 018650a6b35707b5957fd1ab6128559ddcd1d49f..5221cde0e79ff74d60467df783358ee736a8004f 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -31,7 +31,7 @@
    // This function is used when not sending or adding attachments
    function newMail () {
       global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
-         $reply_id, $send_to, $send_to_cc, $mailbox;
+         $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc;
 
       $send_to = decodeHeader($send_to);
       $send_to_cc = decodeHeader($send_to_cc);
@@ -144,28 +144,30 @@
    function showInputForm () {
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
          $passed_body, $color, $use_signature, $signature, $editor_size,
-         $attachments, $subject, $newmail;
+         $attachments, $subject, $newmail, $use_javascript_addr_book,
+         $send_to_bcc;
 
       $subject = decodeHeader($subject);
       $reply_subj = decodeHeader($reply_subj);
       $forward_subj = decodeHeader($forward_subj);
 
-      echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
-      echo "function open_abook() { \n";
-      echo "  var nwin = window.open(\"addrbook_popup.php\",\"abookpopup\",";
-      echo "\"width=670,height=300,resizable=yes,scrollbars=yes\");\n";
-      echo "  if((!nwin.opener) && (document.windows != null))\n";
-      echo "    nwin.opener = document.windows;\n";
-      echo "}\n";
-      echo "// --></SCRIPT>\n\n";
-
-      echo "\n<FORM name=compose action=\"compose.php?\" METHOD=POST\n";
-      echo "ENCTYPE=\"multipart/form-data\">\n";
+      if ($use_javascript_addr_book) {
+         echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
+         echo "function open_abook() { \n";
+         echo "  var nwin = window.open(\"addrbook_popup.php\",\"abookpopup\",";
+         echo "\"width=670,height=300,resizable=yes,scrollbars=yes\");\n";
+         echo "  if((!nwin.opener) && (document.windows != null))\n";
+         echo "    nwin.opener = document.windows;\n";
+         echo "}\n";
+         echo "// --></SCRIPT>\n\n";
+      }
+
+      echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\">\n";
       echo "<TABLE COLS=2 WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
       echo _("To:");
-      echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      </TD><TD colspan=2 WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to)
          echo "         <INPUT TYPE=TEXT NAME=send_to VALUE=\"$send_to\" SIZE=60><BR>";
       else
@@ -175,7 +177,7 @@
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
       echo _("CC:");
-      echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      </TD><TD WIDTH=% colspan=2 BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_cc)
          echo "         <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
       else
@@ -187,19 +189,22 @@
       echo _("BCC:");
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_bcc)
-         echo "         <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=60><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=55><BR>";
       else
-         echo "         <INPUT TYPE=TEXT NAME=send_to_bcc SIZE=60><BR>";
+         echo "         <INPUT TYPE=TEXT NAME=send_to_bcc SIZE=55><BR>";
       echo "      </TD>\n";
-      echo "   </TR>\n";
-
-      echo "<SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
-      echo "<TR><TD BGCOLOR=\\\"$color[4]\\\">&nbsp;</TD>";
-      echo "</TD><TD BGCOLOR=\\\"$color[4]\\\" ALIGN=LEFT>";
-      printf("<A HREF=\\\"javascript:open_abook();\\\">%s</A>",
-            _("Lookup recipients in addressbook.")."<BR>");
-      echo "</TD></TR>\");\n";
-      echo "// --></SCRIPT>\n";
+      echo "<TD width=1% BGCOLOR=\"$color[4]\" ALIGN=Right>";
+      
+      if ($use_javascript_addr_book) {
+         $lookup_str = _("Addresses");
+         echo "<SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
+         echo "<a href=\\\"javascript:open_abook();\\\">$lookup_str</a><br>\");";
+         echo "// --></SCRIPT>\n";
+      } else {  
+         echo "<input type=submit name=html_addr_search value=\""._("Addresses")."\">";
+      }   
+      
+      echo "</TD></TR>\n";
 
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
@@ -211,7 +216,7 @@
          $reply_subj = trim($reply_subj);
          if (substr(strtolower($reply_subj), 0, 3) != "re:")
             $reply_subj = "Re: $reply_subj";
-         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=60 VALUE=\"$reply_subj\">";
+         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$reply_subj\">";
       } else if ($forward_subj) {
          $forward_subj = str_replace("\"", "'", $forward_subj);
          $forward_subj = stripslashes($forward_subj);
@@ -220,16 +225,17 @@
              (substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
              (substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
             $forward_subj = "[Fwd: $forward_subj]";
-         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=50 VALUE=\"$forward_subj\">";
+         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$forward_subj\">";
       } else {
-         echo "         <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=50>";
+         echo "         <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=55>";
       }
-      echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">";
+      echo "</td><td align=right>";
+      echo "<INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">";
       echo "      </TD>\n";
       echo "   </TR>\n";
 
       echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
+      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=3>\n";
       if ($use_signature == true && $newmail == true)
          echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n-- \n".$signature."</TEXTAREA><BR>";
       else
@@ -300,6 +306,14 @@
       return true;
    } // function checkInput()
 
+
+
+
+
+
+
+
+
    if(isset($send)) {
       if (checkInput(false)) {
          sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body);
@@ -312,6 +326,22 @@
          
          showInputForm();
       }
+   } else if ($html_addr_search) {
+      //* I am using an include so as to elminiate an extra unnecessary click.  If you
+      //* can think of a better way, please implement it.
+      include ("addrbook_search_html.php");
+   } else if ($html_addr_search_done) {
+      echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      displayPageHeader($color, "None");
+
+      $body = stripslashes($body);
+      $send_to = stripslashes($send_to);
+      $send_to_cc = stripslashes($send_to_cc);
+      $send_to_bcc = stripslashes($send_to_bcc);
+      $subject = stripslashes($subject);
+      
+      showInputForm();
    } else if (isset($attach)) {
       echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
       $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

diff --git a/src/load_prefs.php b/src/load_prefs.php
index a30be3bea94b7644a40f7fa9c5593f687228ce4a..3d28037e2dcbb060896c53f112dfbf7063db20e6 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -24,6 +24,11 @@
       }
    }
 
+   $use_javascript_addr_book = getPref($data_dir, $username, "use_javascript_addr_book");
+   if ($use_javascript_addr_book == "")
+      $use_javascript_addr_book = $default_use_javascript_addr_book;
+
+   
    /** Load the user's sent folder preferences **/
    $move_to_sent = getPref($data_dir, $username, "move_to_sent");
    if ($move_to_sent == "")

diff --git a/src/options.php b/src/options.php
index a6412655590ed52793cf5dee2b0385a080c8852b..6e45190c84c0645387c47f3b294f7bc9f19c06f1 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -121,7 +121,6 @@
 
 
        // TRASH FOLDER
-
        echo "<tr><td align=right>";
        echo _("Trash Folder:");
        echo "</td><td>";
@@ -149,7 +148,6 @@
        echo "</td></tr>";      
 
        // SENT FOLDER
-
        echo "<tr><td align=right>";
        echo _("Sent Folder:");
        echo "</td><td>";
@@ -179,6 +177,25 @@
 
    echo "</TABLE>";
 
+   echo "<table width=1% cols=2 align=center>\n";
+   echo "   <tr>\n";
+   echo "      <td nowrap align=center>\n";
+   echo "         " . _("Use javascript version of address book?") . "\n";
+   echo "      </td>\n";
+   echo "   </tr>\n";
+   echo "   <tr>\n";
+   echo "      <td align=left>\n";
+   if ($use_javascript_addr_book == true) {
+      echo "         <input type=radio name=javascript_abook value=1 checked> &nbsp;&nbsp;" . _("Yes") . "<br>";
+      echo "         <input type=radio name=javascript_abook value=0> &nbsp;&nbsp;" . _("No") . "<br>";
+   } else {
+      echo "         <input type=radio name=javascript_abook value=1> &nbsp;&nbsp;" . _("Yes") . "<br>";
+      echo "         <input type=radio name=javascript_abook value=0 checked> &nbsp;&nbsp;" . _("No") . "<br>";
+   }
+   echo "      </td>\n";
+   echo "   </tr>\n";
+   echo "</table>\n";
+   
    echo "<TABLE WIDTH=100% COLS=2 ALIGN=CENTER>\n";
 
    // SHOW_NUM

diff --git a/src/options_submit.php b/src/options_submit.php
index b96d03111d0eafd00837fa59ee7f345fa1ad08b3..506b95f2737145ae99a1fd0a507e6aff1dba35bf 100644 (file)
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -29,6 +29,7 @@
    setPref($data_dir, $username, "language", $language);
    setPref($data_dir, $username, "left_size", $leftsize);
    setPref($data_dir, $username, "folder_prefix", $folderprefix);
+   setPref($data_dir, $username, "use_javascript_addr_book", $javascript_abook);
 
        if ($trash != "none") {
        setPref($data_dir, $username, "move_to_trash", true);