Browse Source

Fix comp_in_new.

Thijs Kinkhorst 22 years ago
parent
commit
229291a732
4 changed files with 8 additions and 10 deletions
  1. 2 0
      ChangeLog
  2. 4 8
      doc/compose.txt
  3. 1 1
      src/addressbook.php
  4. 1 1
      src/search.php

+ 2 - 0
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 ***

+ 4 - 8
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")> 
 

+ 1 - 1
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).'">';

+ 1 - 1
src/search.php

@@ -254,7 +254,7 @@ if ($mailbox == 'All Folders') {
 if (isset($composenew) && $composenew) {
     $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
 		"&amp;session=$composesession&amp;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);
 }