From 19bef0eaf7b8c44c7b99da234571834ccc83f48b Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Sat, 16 Sep 2006 22:58:51 +0000
Subject: code cleanup of HTML editing capability (round 1)

---
 program/include/bugs.inc              | 17 +----------------
 program/localization/en_US/labels.inc |  2 +-
 program/steps/mail/compose.inc        |  8 ++++----
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/program/include/bugs.inc b/program/include/bugs.inc
index bf4c572c8..946a910be 100644
--- a/program/include/bugs.inc
+++ b/program/include/bugs.inc
@@ -115,19 +115,4 @@ function log_bug($arg_arr)
     }
   }
 
-function log_debug($filename, $text)
-{
-   global $CONFIG, $INSTALL_PATH;
-
-   if (empty($CONFIG['log_dir']))
-      $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
-
-   // try to open specific log file for writing
-   if ($fp = @fopen($CONFIG['log_dir'].'/'.$filename, 'a'))
-   {
-      fwrite($fp, date("d-M-Y H:i:s", mktime()) . ' ' . $text . "\n");
-      fclose($fp);
-   }
-}
-
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 0c351f929..395ecab6b 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -202,7 +202,7 @@ $labels['timezone']  = 'Time zone';
 $labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'Signature';
 $labels['dstactive']  = 'Daylight savings';
-$labels['htmleditor'] = 'Use HTML editor';
+$labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlsignature'] = 'HTML signature';
 
 $labels['autosavedraft']  = 'Automatically save draft';
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 9b759e6e8..5077d5c16 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -543,10 +543,10 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
         "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">From: </th><td>%s</td></tr>" .
         "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">To: </th><td>%s</td></tr>" .
         "</tbody></table><br>",
-                     $MESSAGE['subject'],
-                     $MESSAGE['headers']->date,
-                     $IMAP->decode_header($MESSAGE['headers']->from),
-                     $IMAP->decode_header($MESSAGE['headers']->to));
+                     rep_specialchars_output($MESSAGE['subject']),
+                     rep_specialchars_output($MESSAGE['headers']->date),
+                     rep_specialchars_output($IMAP->decode_header($MESSAGE['headers']->from)),
+                     rep_specialchars_output($IMAP->decode_header($MESSAGE['headers']->to)));
   }
 
   // add attachments
-- 
cgit v1.2.3