Changeset 653242c in github

Timestamp:

Apr 20, 2008 6:49:15 PM (5 years ago)

Author:

svncommit <devs@…>

Branches:

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

Children:

f025740

Parents:

ea090ca

Message:

Fix parse_attrib_string to handle unquoted attribute values

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (7 diffs)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/04/20 (estadtherr)
+----------
+- fix parse_attrib_string to handle unquoted values, which fixes
+  display issues with HTML messages that do not quote attributes
 
 2008/04/17 (alec)

program/include/main.inc

@@ -379 +379 @@
   {
   global $CONFIG;
-  
+
   // return table name if configured
   $config_key = 'db_table_'.$table;
@@ -385 +385 @@
   if (strlen($CONFIG[$config_key]))
     return $CONFIG[$config_key];
-  
+
   return $table;
   }
@@ -392 +392 @@
 /**
  * Return correct name for a specific database sequence
- * (used for Postres only)
+ * (used for Postgres only)
  *
  * @param string Secuence name
@@ -400 +400 @@
   {
   global $CONFIG;
-  
+
   // return table name if configured
   $config_key = 'db_sequence_'.$sequence;
@@ -406 +406 @@
   if (strlen($CONFIG[$config_key]))
     return $CONFIG[$config_key];
-  
+
   return $sequence;
   }
@@ -1484 +1484 @@
   {
   $attrib = array();
-  preg_match_all('/\s*([-_a-z]+)=(["\'])([^"]+)\2/Ui', stripslashes($str), $regs, PREG_SET_ORDER);
+  preg_match_all('/\s*([-_a-z]+)=(["\'])??(?(2)([^"\']+)\2|(\S+?))/Ui', stripslashes($str), $regs, PREG_SET_ORDER);
 
   // convert attributes to an associative array (name => value)
   if ($regs)
     foreach ($regs as $attr)
-      $attrib[strtolower($attr[1])] = $attr[3];
+      {
+      $attrib[strtolower($attr[1])] = $attr[3] . $attr[4];
+      }
 
   return $attrib;
@@ -1634 +1636 @@
  * Date will be added automatically to the line.
  *
- * @param $name Name of logfile
- * @param $line Line to append
+ * @param $name name of log file
+ * @param line Line to append
  */
 function write_log($name, $line)