浏览代码

fix for compose in new window from plugin pages, + typo fix

jmunro 23 年之前
父节点
当前提交
eca4214dd5
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      functions/page_header.php

+ 4 - 4
functions/page_header.php

@@ -62,13 +62,13 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
         Locate the first displayable form element
         Locate the first displayable form element
     */
     */
 
 
-    if ($session !== false) {
+    if ($session != false) {
 	$compose_uri = 'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
 	$compose_uri = 'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
     } else {
     } else {
         $compose_uri = 'src/compose.php?newmessage=1';
         $compose_uri = 'src/compose.php?newmessage=1';
 	$session = 0;
 	$session = 0;
     }
     }
-
+   
     switch ( $module ) {
     switch ( $module ) {
     case 'src/read_body.php':
     case 'src/read_body.php':
             if ($compose_new_win == '1') {
             if ($compose_new_win == '1') {
@@ -82,7 +82,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                     "\n<!--\n";
                     "\n<!--\n";
                 $js .= "function comp_in_new(new_mes, comp_uri) {\n".
                 $js .= "function comp_in_new(new_mes, comp_uri) {\n".
 		     '    if (new_mes) { '."\n".
 		     '    if (new_mes) { '."\n".
-		     "       comp_uri = \"../src/compose.php?newmessage=1\";\n".
+		     "       comp_uri = \"".$base_uri."/src/compose.php?newmessage=1\";\n".
 		     '    } else { '."\n".
 		     '    } else { '."\n".
 		     "       if (comp_uri =='') {\n".
 		     "       if (comp_uri =='') {\n".
 		     '           comp_uri = "'.$base_uri.$compose_uri."\";\n".
 		     '           comp_uri = "'.$base_uri.$compose_uri."\";\n".
@@ -163,7 +163,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                 }
                 }
                 $js .= "function comp_in_new(new_mes, comp_uri) {\n".
                 $js .= "function comp_in_new(new_mes, comp_uri) {\n".
 		     '    if (new_mes) { '."\n".
 		     '    if (new_mes) { '."\n".
-		     "       comp_uri = \"../src/compose.php?newmessage=1\";\n".
+		     "       comp_uri = \"".$base_uri."src/compose.php?newmessage=1\";\n".
 		     '    } else { '."\n".
 		     '    } else { '."\n".
 		     "       if (comp_uri =='') {\n".
 		     "       if (comp_uri =='') {\n".
 		     '           comp_uri = "'.$base_uri.$compose_uri."\";\n".
 		     '           comp_uri = "'.$base_uri.$compose_uri."\";\n".