Fix comp_in_new.

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

diff --git a/ChangeLog b/ChangeLog
index 504c5f3d1bc07f2bdaa3e8a55570dbbe26884fd7..15061e31b87e4f60fff4c7e74d50da0603d4b440 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ Version 1.5.0 -- CVS
   - Fix for Folders being listed in create/remove/rename operations 
     (#725443, #722823, #729225)
   - Fix for bad attachment view link (#697381, #729295)
+  - Fix comp_in_new in search and addressbook not having right parameters (#731768).
+
 
 **************************************
 *** SquirrelMail Stable Series 1.4 ***

diff --git a/doc/compose.txt b/doc/compose.txt
index 3d507353fdb67c41aca093fe5e5e9b5d5f4eaca3..9cf0904e4d9804d3cb2f5f57fab86d70ddf622d9 100644 (file)
--- a/doc/compose.txt
+++ b/doc/compose.txt
@@ -3,16 +3,12 @@ Using the comp_in_new function
 
 comp_in_new is the javascript function to popup a new compose window.
 
-the function needs two arguments:
-1) compose new message (true or false)
-2) url with arguments to the compose window.
-
-if argument 1 is true then argument 2 should be ""
-
+the function needs one argument:
+1) url with arguments to the compose window.
 
 example 1:
-<a href="javascript:void(0)" onclick="comp_in_new(true,"")> 
+<a href="javascript:void(0)" onclick="comp_in_new("")> 
 
 example 2:
-<a href="javascript:void(0)" onclick="comp_in_new(false,"../../src/compose.php?argument1=true&amp;argument2=test")> 
+<a href="javascript:void(0)" onclick="comp_in_new("../../src/compose.php?argument1=true&amp;argument2=test")> 
 

diff --git a/src/addressbook.php b/src/addressbook.php
index b37701f19ae5264d0925efebbf9c0ddc2d7d68fd..4ba7e9696bd8741749cbb7200aff7af28cb68f53 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -387,7 +387,7 @@ if ($showaddrlist) {
                 }
             $email = $abook->full_address($row);
             if ($compose_new_win == '1') {
-                echo '<a href="javascript:void(0)" onclick=comp_in_new(false,"compose.php?send_to='.rawurlencode($email).'")>';
+                echo '<a href="javascript:void(0)" onclick=comp_in_new("compose.php?send_to='.rawurlencode($email).'")>';
             }
             else {
                 echo '<A HREF="compose.php?send_to=' . rawurlencode($email).'">';

diff --git a/src/search.php b/src/search.php
index 89823839297db7c2308988e93116fed0089c153d..4fca3ea9c9db800895d03dd96d5dad7896eb6404 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -254,7 +254,7 @@ if ($mailbox == 'All Folders') {
 if (isset($composenew) && $composenew) {
     $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
                "&session=$composesession&attachedmessages=true&amp";
-    displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
+    displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
 }