Changeset 10c92be in github

Timestamp:

Aug 30, 2006 3:55:55 PM (7 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ea206d3

Parents:

107bde9

Message:

New indentation for quoted message text; HTML validity

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (1 diff)
• program/include/main.inc (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (5 diffs)
• skins/default/mail.css (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2006/08/30 (thomasb)
+----------
+- New indentation for quoted message text
+- Improved HTML validity
+
 
 2006/08/28 (estadtherr)

index.php

@@ -117 +117 @@
 if ($_framed)
   {
-  $COMM_PATH .= '&_framed=1';
+  $COMM_PATH .= '&_framed=1';
   $SESS_HIDDEN_FIELD .= "\n".'<input type="hidden" name="_framed" value="1" />';
   }

program/include/main.inc

@@ -922 +922 @@
       $html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS);        
       unset($html_encode_arr['?']);
-      unset($html_encode_arr['&']);
       }
 
@@ -934 +933 @@
       unset($encode_arr['<']);
       unset($encode_arr['>']);
+      unset($encode_arr['&']);
       }
     else if ($mode=='remove')

program/steps/mail/func.inc

@@ -215 +215 @@
       $class_name = 'junk';
 
-    $js_name = rep_specialchars_output($folder['id'], 'js');
+    $js_name = htmlspecialchars(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\')"'.
@@ -272 +272 @@
 
     $out .= sprintf('<option value="%s">%s%s</option>'."\n",
-                    $folder['id'],
+                    htmlspecialchars($folder['id']),
                     str_repeat('&nbsp;', $nestLevel*4),
                     rep_specialchars_output($foldername, 'html', 'all'));
@@ -730 +730 @@
     $convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie';
     $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)";
-
-    $body = wordwrap(trim($body), 80);
+    
+    if ($part->ctype_parameters['format'] != 'flowed')
+      $body = wordwrap(trim($body), 80);
+
     $body = preg_replace($convert_patterns, $convert_replaces, $body);
 
     // split body into single lines
     $a_lines = preg_split('/\r?\n/', $body);
+    $quote_level = 0;
 
     // colorize quoted parts
@@ -741 +744 @@
       {
       $line = $a_lines[$n];
-
-      if ($line{2}=='>')
-        $color = 'red';
-      else if ($line{1}=='>')
-        $color = 'green';
-      else if ($line{0}=='>')
-        $color = 'blue';
-      else
-        $color = FALSE;
-
-      $line = rep_specialchars_output($line, 'html', 'replace', FALSE);
-        
-      if ($color)
-        $a_lines[$n] = sprintf('<font color="%s">%s</font>', $color, $line);
-      else
-        $a_lines[$n] = $line;
+      $quotation = '';
+      $q = 0;
+      
+      if (preg_match('/^(>+\s*)/', $line, $regs))
+        {
+        $q = strlen(preg_replace('/\s/', '', $regs[1]));
+        $line = substr($line, strlen($regs[1]));
+
+        if ($q > $quote_level)
+          $quotation = str_repeat('<blockquote>', $q - $quote_level);
+        else if ($q < $quote_level)
+          $quotation = str_repeat("</blockquote>", $quote_level - $q);
+        }
+      else if ($quote_level > 0)
+        $quotation = str_repeat("</blockquote>", $quote_level);
+
+      $quote_level = $q;
+      $a_lines[$n] = $quotation . rep_specialchars_output($line, 'html', 'replace', FALSE);
       }
 
@@ -762 +767 @@
     $body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines));
     
-    return "<pre>\n".$body."\n</pre>";
+    return "<div class=\"pre\">\n".$body."\n</div>";
     }
   }

skins/default/mail.css

@@ -655 +655 @@
 }
 
-div.message-part pre
+div.message-part div.pre
 {
   margin: 0px;
   padding: 0px;
-}
-
+  white-space: pre;
+  font-family: monospace;
+}
+
+div.message-part blockquote
+{
+  color: blue;
+  border-left: 2px solid blue;
+  border-right: 2px solid blue;
+  background-color: #F6F6F6;
+  margin: 2px 0px 2px 0px;
+  padding: 1px 8px 1px 10px;
+}
+
+div.message-part blockquote blockquote
+{
+  color: green;
+  border-left: 2px solid green;
+  border-right: 2px solid green;
+}
+
+div.message-part blockquote blockquote blockquote
+{
+  color: #990000;
+  border-left: 2px solid #bb0000;
+  border-right: 2px solid #bb0000;
+}
 
 #remote-objects-message