Changeset 2133

Timestamp:

Oct 10, 2007, 1:03:30 AM (17 years ago)

Author:

rub

Message:

Commit 2128 was done with a latest version.
Fix my mistake!

File:

• branches/branch-1_7/include/functions_mail.inc.php (modified) (16 diffs)

branches/branch-1_7/include/functions_mail.inc.php

@@ -29 +29 @@
 // +-----------------------------------------------------------------------+
 
+
+/**
+ * Encodes a string using Q form if required (RFC2045)
+ * mail headers MUST contain only US-ASCII characters
+ */
+function encode_mime_header($str)
+{
+  $x = preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+  if ($x==0)
+  {
+    return $str;
+  }
+  // Replace every high ascii, control =, ? and _ characters
+  $str = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+                  "'='.sprintf('%02X', ord('\\1'))", $str);
+
+  // Replace every spaces to _ (more readable than =20)
+  $str = str_replace(" ", "_", $str);
+
+  global $lang_info;
+  return '=?'.$lang_info['charset'].'?Q?'.$str.'?=';
+}
+
 /*
  * Returns an array of mail configuration parameters :
@@ -81 +104 @@
     $cvt_name = trim(preg_replace('#[\n\r]+#s', '', $name));
     $cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
-    // Ascii convertion
-    $cvt_name = '"'.addslashes(str_translate_to_ascii7bits($cvt_name)).'"';
+
+    if ($cvt_name!="")
+    {
+      $cvt_name = encode_mime_header(
+                '"'
+                .addcslashes($cvt_name,'"')
+                .'"');
+      $cvt_name .= ' ';
+    }
 
     if (strpos($cvt_email, '<') === false)
     {
-      return $cvt_name.' <'.$cvt_email.'>';
+      return $cvt_name.'<'.$cvt_email.'>';
     }
     else
@@ -113 +143 @@
 
   $res = array();
-  
+
   if (empty($args['template']) or empty($args['theme']))
   {
@@ -152 +182 @@
 
 /**
- * Return string email format (html or not) 
+ * Return string email format (html or not)
  *
  * @param string format
@@ -161 +191 @@
 }
 
-/* 
+/*
  * Switch language to param language
  * All entries are push on language stack
@@ -215 +245 @@
 }
 
-/* 
+/*
  * Switch back language pushed with switch_lang_to function
  *
@@ -252 +282 @@
 /*
  * send en notification email to all administrators
- * if a administrator is doing action, 
+ * if a administrator is doing action,
  * he's be removed to email list
  *
@@ -315 +345 @@
         'Bcc' => $admins,
         'subject' => '['.$conf['gallery_title'].'] '.l10n_args($keyargs_subject),
-        'content' => 
+        'content' =>
            l10n_args($keyargs_content)."\n\n"
           .l10n_args($keyargs_content_admin_info)."\n",
@@ -343 +373 @@
  */
 function pwg_mail_group(
-  $group_id, $email_format, $keyargs_subject, 
+  $group_id, $email_format, $keyargs_subject,
   $dirname, $tpl_shortname,
   $assign_vars = array(), $language_selected = '')
@@ -353 +383 @@
 SELECT
   distinct language, template
-FROM 
-  '.USER_GROUP_TABLE.' as ug 
+FROM
+  '.USER_GROUP_TABLE.' as ug
   INNER JOIN '.USERS_TABLE.' as u  ON '.$conf['user_fields']['id'].' = ug.user_id
   INNER JOIN '.USER_INFOS_TABLE.' as ui  ON ui.user_id = ug.user_id
-WHERE 
+WHERE
         '.$conf['user_fields']['email'].' IS NOT NULL
     AND group_id = '.$group_id;
@@ -388 +418 @@
   u.'.$conf['user_fields']['username'].' as username,
   u.'.$conf['user_fields']['email'].' as mail_address
-FROM 
-  '.USER_GROUP_TABLE.' as ug 
+FROM
+  '.USER_GROUP_TABLE.' as ug
   INNER JOIN '.USERS_TABLE.' as u  ON '.$conf['user_fields']['id'].' = ug.user_id
   INNER JOIN '.USER_INFOS_TABLE.' as ui  ON ui.user_id = ug.user_id
-WHERE 
+WHERE
         '.$conf['user_fields']['email'].' IS NOT NULL
     AND group_id = '.$group_id.'
@@ -417 +447 @@
 
           $mail_template = get_mail_template($email_format, $elem);
-          $mail_template->set_filename($tpl_shortname, 
+          $mail_template->set_filename($tpl_shortname,
             (empty($dirname) ? '' : $dirname.'/').$tpl_shortname.'.tpl');
           $mail_template->assign_vars($assign_vars);
@@ -471 +501 @@
     return true;
   }
-  
+
   if (!isset($conf_mail))
   {
@@ -509 +539 @@
   $cvt_subject = trim(preg_replace('#[\n\r]+#s', '', $args['subject']));
   // Ascii convertion
-  $cvt_subject = str_translate_to_ascii7bits($cvt_subject);
+  $cvt_subject = encode_mime_header($cvt_subject);
 
   if (!isset($args['content']))
@@ -577 +607 @@
         'LANG' => $lang_info['code'],
         'DIR' => $lang_info['direction'],
-        
+
         // Footer
         'GALLERY_URL' =>
@@ -670 +700 @@
     global $user;
     @mkdir(PHPWG_ROOT_PATH.'testmail');
-    $filename = PHPWG_ROOT_PATH.'testmail/mail.'.$user['username'].$cvt_subject;
+    $filename = PHPWG_ROOT_PATH.'testmail/mail.'.$user['username'];
     if ($args['content_format'] == 'text/plain')
     {