- Applied fixes from trunk up to r5202

7 files changed, 12 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index dfe3d115f..4b1604ed4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix text-overflow:ellipsis issues on messages list in FF7 and Webkit (#1488061)
+- Fix handling of links with IP address
 - Fix bug where message list filter was reset on folder compacting (#1488076)
 
 RELEASE 0.6-RC
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 4472ccf21..e35406459 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Fixed import from Horde-INGO (#1488064)
+
 * version 4.3 [2011-07-28]
 -----------------------------------------------------------
 - Fixed handling of error in Net_Sieve::listScripts()
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php
index 230b44bae..7f989e098 100644
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ b/plugins/managesieve/lib/rcube_sieve.php
@@ -349,8 +349,9 @@ class rcube_sieve
         $name = array();
 
         // Squirrelmail (Avelsieve)
-        if ($tokens = preg_split('/(#START_SIEVE_RULE.*END_SIEVE_RULE)\r?\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE)) {
-            foreach($tokens as $token) {
+        if (preg_match('/(#START_SIEVE_RULE.*END_SIEVE_RULE)\r?\n/', $script)) {
+            $tokens = preg_split('/(#START_SIEVE_RULE.*END_SIEVE_RULE)\r?\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE);
+            foreach ($tokens as $token) {
                 if (preg_match('/^#START_SIEVE_RULE.*/', $token, $matches)) {
                     $name[$i] = "unnamed rule ".($i+1);
                     $content .= "# rule:[".$name[$i]."]\n";
@@ -366,9 +367,10 @@ class rcube_sieve
             }
         }
         // Horde (INGO)
-        else if ($tokens = preg_split('/(# .+)\r?\n/i', $script, -1, PREG_SPLIT_DELIM_CAPTURE)) {
+        else if (preg_match('/(# .+)\r?\n/', $script)) {
+            $tokens = preg_split('/(# .+)\r?\n/', $script, -1, PREG_SPLIT_DELIM_CAPTURE);
             foreach($tokens as $token) {
-                if (preg_match('/^# (.+)/i', $token, $matches)) {
+                if (preg_match('/^# (.+)/', $token, $matches)) {
                     $name[$i] = $matches[1];
                     $content .= "# rule:[" . $name[$i] . "]\n";
                 }
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 5ce986fcb..5d743bfff 100644
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -37,7 +37,7 @@ class rcube_string_replacer
   {
     // Simplified domain expression for UTF8 characters handling
     // Support unicode/punycode in top-level domain part
-    $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})';
+    $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})';
     $url1 = '.:;,';
     $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-';
 
diff --git a/program/js/app.js b/program/js/app.js
index 062eee2da..bc16b8607 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -320,7 +320,6 @@ function rcube_webmail()
         }
         if (this.gui_objects.qsearchbox) {
           this.enable_command('search', 'reset-search', 'moveto', true);
-          $(this.gui_objects.qsearchbox).select();
         }
 
         if (this.contact_list && this.contact_list.rowcount > 0)
diff --git a/skins/default/images/listheader.gif b/skins/default/images/listheader.gif
index ff28d95ef..bf77a11c1 100644
--- a/skins/default/images/listheader.gif
+++ b/skins/default/images/listheader.gif
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 4e6e15405..e09857b16 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -632,7 +632,7 @@ body.messagelist
 #messagelist thead tr td.sortedASC,
 #messagelist thead tr td.sortedDESC
 {
-  background-position: 0 -22px;
+  background-position: 0 -26px;
 }
 
 #messagelist thead tr td.sortedASC a
@@ -824,7 +824,6 @@ body.messagelist
 #messagelist tbody tr td.subject a
 {
   cursor: default;
-  display: inline-block;
   vertical-align: middle;
 }