瀏覽代碼

Fix undefined var "charset" in showInputForm()
(Japanese charset support)

tassium 22 年之前
父節點
當前提交
0753741acc
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/compose.php

+ 3 - 3
src/compose.php

@@ -808,7 +808,7 @@ function showInputForm ($session, $values=false) {
            $username, $data_dir, $identity, $draft_id, $delete_draft,
            $username, $data_dir, $identity, $draft_id, $delete_draft,
            $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
            $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
            $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, 
            $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, 
-           $username, $compose_messages, $composesession;
+           $username, $compose_messages, $composesession, $default_charset;
 
 
     $composeMessage = $compose_messages[$session];
     $composeMessage = $compose_messages[$session];
 
 
@@ -950,7 +950,7 @@ function showInputForm ($session, $values=false) {
     }
     }
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
         if ($sig_first == '1') {
         if ($sig_first == '1') {
-            if ($charset == 'iso-2022-jp') {
+            if ($default_charset == 'iso-2022-jp') {
                 echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
                 echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
             } else {
             } else {
             echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
             echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
@@ -959,7 +959,7 @@ function showInputForm ($session, $values=false) {
         }
         }
         else {
         else {
             echo "\n\n".htmlspecialchars($body);
             echo "\n\n".htmlspecialchars($body);
-            if ($charset == 'iso-2022-jp') {
+            if ($default_charset == 'iso-2022-jp') {
                 echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
                 echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP');
             }else{
             }else{
             echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
             echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);