Changeset 18e2a3ef in github

Timestamp:

Dec 31, 2006 10:16:09 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

462a9d9

Parents:

2af4e48

Message:

Event handler removing again. Closes #1484200

Location:

program

Files:

• include/main.inc (modified) (1 diff)
• steps/mail/func.inc (modified) (1 diff)

program/include/main.inc

@@ -1089 +1089 @@
  * @see rep_specialchars_output
  */
-function JQ($str, $mode='strict', $newlines=TRUE)
-  {
-  return rep_specialchars_output($str, 'js', $mode, $newlines);
+function JQ($str)
+  {
+  return rep_specialchars_output($str, 'js');
   }
 

program/steps/mail/func.inc

@@ -1215 +1215 @@
     {
     $prev_body = $body;
-    $body = preg_replace('/(<[^!][^>]*?\s)(on[^=]+)(=[^>]*?>)/im', '$1__removed=$3', $body);
-    $body = preg_replace('/(<[^!][^>]*?\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body);
+    $body = preg_replace('/(<[^!][^>]*\s)(on[^=>]+)=([^>]+>)/im', '$1__removed=$3', $body);
+    $body = preg_replace('/(<[^!][^>]*\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body);
     }