Changeset 2126 for trunk/include/functions_mail.inc.php

Timestamp:

Oct 9, 2007, 1:46:09 AM (17 years ago)

Author:

rvelices

Message:

• some code refactoring before upgrade to utf (only cosmetic at this point...)

File:

• trunk/include/functions_mail.inc.php (modified) (8 diffs)

trunk/include/functions_mail.inc.php

@@ -49 +49 @@
 
   global $lang_info;
-  return '=?'.$lang_info['charset'].'?Q?'.$str.'?=';
+  return '=?'.get_pwg_charset().'?Q?'.$str.'?=';
 }
 
@@ -227 +227 @@
 
       // language files
-      include(get_language_filepath('common.lang.php', '', $language));
+      load_language('common.lang', '', $language);
       // No test admin because script is checked admin (user selected no)
       // Translations are in admin file too
-      include(get_language_filepath('admin.lang.php', '', $language));
+      load_language('admin.lang', '', $language);
       trigger_action('loading_lang');
-      @include(get_language_filepath('local.lang.php', '', $language));
+      load_language('local.lang', '', $language);
 
       $switch_lang[$language]['lang_info'] = $lang_info;
@@ -589 +589 @@
   $content = '';
 
-  if (!isset($conf_mail[$args['email_format']][$lang_info['charset']][$args['template']][$args['theme']]))
+  if (!isset($conf_mail[$args['email_format']][get_pwg_charset()][$args['template']][$args['theme']]))
   {
     if (!isset($mail_template))
@@ -604 +604 @@
         'BOUNDARY_KEY' => $conf_mail['boundary_key'],
         'CONTENT_TYPE' => $args['email_format'],
-        'CONTENT_ENCODING' => $lang_info['charset'],
+        'CONTENT_ENCODING' => get_pwg_charset(),
         'LANG' => $lang_info['code'],
         'DIR' => $lang_info['direction'],
@@ -651 +651 @@
     // what are displayed on the header of each mail ?
     $conf_mail[$args['email_format']]
-      [$lang_info['charset']]
+      [get_pwg_charset()]
       [$args['template']][$args['theme']]['header'] =
         $mail_template->parse('mail_header', true);
@@ -657 +657 @@
     // what are displayed on the footer of each mail ?
     $conf_mail[$args['email_format']]
-      [$lang_info['charset']]
+      [get_pwg_charset()]
       [$args['template']][$args['theme']]['footer'] =
         $mail_template->parse('mail_footer', true);
@@ -664 +664 @@
   // Header
   $content.= $conf_mail[$args['email_format']]
-              [$lang_info['charset']]
+              [get_pwg_charset()]
               [$args['template']][$args['theme']]['header'];
 
@@ -684 +684 @@
   // Footer
   $content.= $conf_mail[$args['email_format']]
-              [$lang_info['charset']]
+              [get_pwg_charset()]
               [$args['template']][$args['theme']]['footer'];