[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.bopreferences.inc.php inc/...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.bopreferences.inc.php inc/... |
|
Date: |
Fri, 09 Feb 2007 12:37:54 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 07/02/09 12:37:54
Modified files:
inc : class.bopreferences.inc.php
class.uidisplay.inc.php
class.uifelamimail.inc.php
templates/base : config.tpl
Log message:
encoding
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bopreferences.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uidisplay.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifelamimail.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/config.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: inc/class.bopreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- inc/class.bopreferences.inc.php 9 Feb 2007 11:23:01 -0000 1.10
+++ inc/class.bopreferences.inc.php 9 Feb 2007 12:37:54 -0000 1.11
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bopreferences.inc.php,v 1.10 2007/02/09 11:23:01 sigurdne
Exp $ */
+ /* $Id: class.bopreferences.inc.php,v 1.11 2007/02/09 12:37:54 sigurdne
Exp $ */
class bopreferences
{
@@ -73,6 +73,8 @@
$data['smtpPort'] =
(isset($GLOBALS['phpgw_info']["server"]["smtp_port"])?$GLOBALS['phpgw_info']["server"]["smtp_port"]:'');
// check for felamimail specific settings
+
+ $data['encoding'] =
isset($felamimailConfig['encoding']) && $felamimailConfig['encoding'] ?
$felamimailConfig['encoding'] : 'utf8';
if(!empty($felamimailConfig['imapServer']))
$data['imapServerAddress'] =
$felamimailConfig['imapServer'];
Index: inc/class.uidisplay.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uidisplay.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.uidisplay.inc.php 22 Dec 2006 10:36:52 -0000 1.11
+++ inc/class.uidisplay.inc.php 9 Feb 2007 12:37:54 -0000 1.12
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uidisplay.inc.php,v 1.11 2006/12/22 10:36:52 sigurdne Exp
$ */
+ /* $Id: class.uidisplay.inc.php,v 1.12 2007/02/09 12:37:54 sigurdne Exp
$ */
class uidisplay
{
@@ -443,8 +443,6 @@
);
$add_attr_to_tag = Array();
-
-
for($i=0; $i<count($bodyParts); $i++ )
{
// if($i > 0) $body .= "<br><br>Atachment
-------------------<br><br>";
@@ -464,7 +462,10 @@
// add line breaks to $bodyParts
#$newBody =
wordwrap($bodyParts[$i],90,"\n",1);
#$newBody =
wordwrap($bodyParts[$i],90,"<br>",1);
+ if($this->mailPreferences['encoding'] =='utf8')
+ {
$bodyParts[$i]['body'] =
utf8_encode($bodyParts[$i]['body']);
+ }
if($bodyParts[$i]['mimeType'] == 'text/plain')
{
Index: inc/class.uifelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.uifelamimail.inc.php 22 Dec 2006 10:36:52 -0000 1.12
+++ inc/class.uifelamimail.inc.php 9 Feb 2007 12:37:54 -0000 1.13
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifelamimail.inc.php,v 1.12 2006/12/22 10:36:52 sigurdne
Exp $ */
+ /* $Id: class.uifelamimail.inc.php,v 1.13 2007/02/09 12:37:54 sigurdne
Exp $ */
class uifelamimail
{
@@ -452,6 +452,11 @@
{
if
(!empty($headers['header'][$i]['subject']))
{
+
$headers['header'][$i]['sender_name'] =
htmlentities($headers['header'][$i]['sender_name'],ENT_COMPAT,'UTF-8');
+ }
+
+ if
(!empty($headers['header'][$i]['subject']))
+ {
// make the subject shorter if
it is to long
if(strlen($headers['header'][$i]['subject']) > $maxSubjectLength)
{
Index: templates/base/config.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/config.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/config.tpl 22 Dec 2006 10:36:52 -0000 1.3
+++ templates/base/config.tpl 9 Feb 2007 12:37:54 -0000 1.4
@@ -10,6 +10,22 @@
<td colspan="2"> </td>
</tr>
+
+ <tr bgcolor="{row_off}">
+ <td colspan="2"> <b>{lang_system_settings}</b></td>
+ </tr>
+
+ <tr bgcolor="{row_off}">
+ <td>{lang_Select_your_system_encoding}:</td>
+ <td>
+ <select name="newsettings[encoding]">
+ <option value="utf8" {selected_encoding_utf8}>utf-8</option>
+ <option value="LATIN1" {selected_encoding_LATIN1}>iso-8859-1</option>
+ </select>
+ </td>
+ </tr>
+
+
<tr bgcolor="{row_off}">
<td colspan="2"> <b>{lang_Mail_settings}</b></td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] felamimail inc/class.bopreferences.inc.php inc/...,
Sigurd Nes <=