More encoding issues; enhanced debugging functions

3 files changed, 61 insertions, 23 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index 59b827763..c52b671e1 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -707,7 +707,7 @@ function show_message($message, $type='notice', $vars=NULL)
   
   $framed = $GLOBALS['_framed'];
   $command = sprintf("display_message('%s', '%s');",
-                     addslashes(rep_specialchars_output(rcube_label(array('name' => $message, 'vars' => $vars)))),
+                     rep_specialchars_output(rcube_label(array('name' => $message, 'vars' => $vars)), 'js'),
                      $type);
                      
   if ($REMOTE_REQUEST)
@@ -718,20 +718,6 @@ function show_message($message, $type='notice', $vars=NULL)
                                 $framed ? sprintf('if(parent.%s)parent.', $JS_OBJECT_NAME) : '',
                                 $JS_OBJECT_NAME,
                                 $command));
-  
-  // console(rcube_label($message));
-  }
-
-
-function console($msg, $type=1)
-  {
-  if ($GLOBALS['REMOTE_REQUEST'])
-    print "// $msg\n";
-  else
-    {
-    print $msg;
-    print "\n<hr>\n";
-    }
   }
 
 
@@ -1014,7 +1000,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
     if ($OUTPUT->get_charset()!='UTF-8')
       $str = rcube_charset_convert($str, $GLOBALS['CHARSET'], $OUTPUT->get_charset());
       
-    return preg_replace(array("/\r\n/", '/"/', "/([^\\\])'/"), array('\n', '\"', "$1\'"), strtr($str, $js_rep_table));
+    return addslashes(preg_replace(array("/\r\n/", "/\r/"), array('\n', '\n'), strtr($str, $js_rep_table)));
     }
 
   // encode for RTF
@@ -1792,7 +1778,58 @@ function rcmail_charset_selector($attrib)
   }
 
 
-/****** debugging function ********/
+/****** debugging functions ********/
+
+
+/**
+ * Print or write debug messages
+ *
+ * @param mixed Debug message or data
+ */
+function console($msg)
+  {
+  if (is_string($msg))
+    $msg = var_export($msg, true);
+
+  if (!($GLOBALS['CONFIG']['debug_level'] & 4))
+    write_log('console', $msg);
+  else if ($GLOBALS['REMOTE_REQUEST'])
+    print "/*\n $msg \n*/\n";
+  else
+    {
+    print '<div style="background:#eee; border:1px solid #ccc; margin-bottom:3px; padding:6px"><pre>';
+    print $msg;
+    print "</pre></div>\n";
+    }
+  }
+
+
+/**
+ * Append a line to a logfile in the logs directory.
+ * Date will be added automatically to the line.
+ *
+ * @param $name Name of logfile
+ * @param $line Line to append
+ */
+function write_log($name, $line)
+  {
+  global $CONFIG;
+  
+  $log_entry = sprintf("[%s]: %s\n",
+                 date("d-M-Y H:i:s O", mktime()),
+                 $line);
+                 
+  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'].'/'.$name, 'a'))    
+    {
+    fwrite($fp, $log_entry);
+    fclose($fp);
+    }
+  }
+
 
 function rcube_timer()
   {
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 4b3114be9..9c27ad9db 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -214,6 +214,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox_name, $m
     else if ($folder['id']==$CONFIG['junk_mbox'])
       $class_name = 'junk';
 
+    $js_name = rep_specialchars_output($folder['id'], 'js');
     $out .= sprintf('<li id="rcmbx%s" class="mailbox %s %s%s%s"><a href="%s&amp;_mbox=%s"'.
                     ' onclick="return %s.command(\'list\',\'%s\')"'.
                     ' onmouseover="return %s.focus_mailbox(\'%s\')"' .            
@@ -223,17 +224,17 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox_name, $m
                     $class_name,
                     $zebra_class,
                     $unread_count ? ' unread' : '',
-                    addslashes($folder['id'])==addslashes($mbox_name) ? ' selected' : '',
+                    $folder['id']==$mbox_name ? ' selected' : '',
                     $COMM_PATH,
                     urlencode($folder['id']),
                     $JS_OBJECT_NAME,
-                    addslashes($folder['id']),
+                    $js_name,
                     $JS_OBJECT_NAME,
-                    addslashes($folder['id']),
+                    $js_name,
                     $JS_OBJECT_NAME,
-                    addslashes($folder['id']),
+                    $js_name,
                     $JS_OBJECT_NAME,
-                    addslashes($folder['id']),
+                    $js_name,
                     $title,
                     rep_specialchars_output($foldername, 'html', 'all'));
 
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 2fbc780ca..af0c829ef 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -74,7 +74,7 @@ else if ($_action=='rename-folder')
   if ($rename && $REMOTE_REQUEST)
     {
     $commands = sprintf("this.replace_folder_row('%s','%s','%s');",
-                        rep_specialchars_output($_GET['_folder_oldname'], 'js'),
+                        rep_specialchars_output(get_input_value('_folder_oldname', RCUBE_INPUT_GET), 'js'),
                         rep_specialchars_output($rename, 'js'),
                         rep_specialchars_output(rcube_charset_convert($rename, 'UTF-7'), 'js'));