Changeset 218190

Timestamp:

03/16/2010 05:20:05 AM (16 years ago)

Author:

kirkpatrick

Message:

1.4

Location:

emoba-email-obfuscator-advanced/trunk

Files:

• emoba.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)

emoba-email-obfuscator-advanced/trunk/emoba.php

@@ -59 +59 @@
 define ("LEGACY", false);
 
-
 /****
 Here we designate the symbols used for at/dot separators in the displayed email addresses.
-You may want to change the alts or i18n them, or choose different symbols.
+You may want to change the alts or i18n them.
 ****/
 if (true == GLYPHS) {
@@ -98 +97 @@
 }
 
+
 /****
 This is the RE expression for detecting email addresses.
 ****/
 define( "EMAIL", "([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})" );
+
 
 /****
@@ -120 +121 @@
 }
 
-/****
-Insert the JavaScript needed to create the email link and popup
+
+/****
+The JavaScript for creating the email link and popup
 ****/
 function emoba_addJScript($email, $ename, $id) {
@@ -148 +150 @@
 
   $content = preg_replace_callback(
-    '!<a(?:.*)href="mailto:' .EMAIL. '([^"]*)"[^>]*>(.+)</a>!i',
+    '!<a(?:.*)href="mailto:' .EMAIL. '([?][^"]*)"[^>]*>(.+)</a>!i',
     create_function(
       '$match',
@@ -170 +172 @@
 //     Allows any number of spaces at each position within [EMAIL|]
   $content = preg_replace_callback(
-    '!\[EMAIL(?:[\s]|&nbsp;)*([^|]+)(?:(?:[\s]|&nbsp;)*[|](?:[\s]|&nbsp;)*)'.EMAIL.'(?:[\s]|&nbsp;)*]!',
-    create_function(
-      '$match',
-            '$em_email = $match[2];
+    '!\[EMAIL(?:[\s]|&nbsp;)*([^|]+)(?:(?:[\s]|&nbsp;)*[|](?:[\s]|&nbsp;)*)'.EMAIL.'([?][^]]*?)(?:[ ]|&nbsp;)*]!',
+    create_function(
+      '$match',
+            '$em_email = $match[2].$match[3];
             $em_name = emoba_symb_email($match[1]);
             $id = "emoba-" . rand(1000, 9999);

emoba-email-obfuscator-advanced/trunk/readme.txt

@@ -18 +18 @@
  * standard email links (`<a href="mailto:[email protected]">Name</a>`), allowing (but ignoring) additional attributes both before and after the href attribute, and allowing a subject using the syntax `mailto:[email protected]?subject=...`.  
 
- * the special "easy to write" form  `[EMAIL Name | [email protected]]` (changed from the earlier versions' much more fragile `[Name] [email protected]`, which remains available via the LEGACY flag)  
+ * the special "easy to write" form  `[EMAIL Name | [email protected]]`, also allowing the `?subject=... ]` syntax.  (Earlier versions' much more fragile `[Name] [email protected]` remains available if the LEGACY flag is true.)  
 
- * a bare email address `[email protected]` (with or without "mailto:" in front of it)  
+ * a bare email address `[email protected]` (with or without "mailto:" in front of it; `?subject=` syntax not allowed here)  
 
 These will all appear as active email links displaying "Name". In the cases of a bare email link (one which has no Name) or a link in which the Name is the email itself, the link will show as the email displayed in human-readable form, eg `you [@] example [.] com`, where the [@] and [.] are  text symbols or graphic images to hide them from spambots. 
@@ -46 +46 @@
 
 = 1.5 =
-2010/03/16 Using graphics in email obfuscation (`GLYPHS=true`) no longer causes xhtml validation errors. 
+2010/03/16 Using graphics in email obfuscation (`GLYPHS=true`) no longer causes xhtml validation errors. `?subject=` syntax allowed in `[EMAIL | ]` form.
 = 1.4 =
 2010/03/09 Bugfix: now correctly allows extended email syntax "email?subject=yyy". Bugfix: now correctly allows extra spaces within shortcode [EMAIL | ].  Email link may exhibit email: `<a href="mailto:[email protected]">[email protected]</a>`; the exhibited email will be obfuscated.