Updated to Smarty 2.6.26 (June 18th, 2009), we should update to Smarty 3.x (current...

[mirrors/Kyberia-bloodline.git] / wwwroot / smarty / libs / plugins / function.mailto.php

diff --git a/wwwroot/smarty/libs/plugins/function.mailto.php b/wwwroot/smarty/libs/plugins/function.mailto.php
index 292c96631887f373fc27a32c2004620bd9921cd0..20e9ed984992712b1e683122fef9fd23cb5d2304 100644 (file)
--- a/wwwroot/smarty/libs/plugins/function.mailto.php
+++ b/wwwroot/smarty/libs/plugins/function.mailto.php
@@ -62,6 +62,8 @@ function smarty_function_mailto($params, &$smarty)
 
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
+    $search = array('%40', '%2C');
+    $replace  = array('@', ',');
     $mail_parms = array();
     foreach ($params as $var=>$value) {
         switch ($var) {
@@ -69,9 +71,9 @@ function smarty_function_mailto($params, &$smarty)
             case 'bcc':
             case 'followupto':
                 if (!empty($value))
-                    $mail_parms[] = $var.'='.str_replace('%40','@',rawurlencode($value));
+                    $mail_parms[] = $var.'='.str_replace($search,$replace,rawurlencode($value));
                 break;
-
+                
             case 'subject':
             case 'newsgroups':
                 $mail_parms[] = $var.'='.rawurlencode($value);
@@ -112,7 +114,7 @@ function smarty_function_mailto($params, &$smarty)
         $string = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
 
         for($x = 0, $y = strlen($string); $x < $y; $x++ ) {
-            $ord[] = ord($string[$x]);
+            $ord[] = ord($string[$x]);   
         }
 
         $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n";
@@ -123,10 +125,10 @@ function smarty_function_mailto($params, &$smarty)
         $_ret .= "}\n";
         $_ret .= "//-->\n";
         $_ret .= "</script>\n";
-
+        
         return $_ret;
-
-
+        
+        
     } elseif ($encode == 'hex') {
 
         preg_match('!^(.*)(\?.*)$!',$address,$match);