[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2
|
From: |
Lars Kneschke <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.6,1.1.1.1.2.7 class.bofelamimail.inc.php,1.2.2.8,1.2.2.9 class.uicompose.inc.php,1.1.1.1.2.5,1.1.1.1.2.6 |
|
Date: |
Thu, 24 Oct 2002 18:16:56 -0400 |
Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv4262/inc
Modified Files:
Tag: Version-0_9_14-branch
class.bocompose.inc.php class.bofelamimail.inc.php
class.uicompose.inc.php
Log Message:
fixed a nasty compose bug
Index: class.bocompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -C2 -r1.1.1.1.2.6 -r1.1.1.1.2.7
*** class.bocompose.inc.php 16 Oct 2002 08:09:38 -0000 1.1.1.1.2.6
--- class.bocompose.inc.php 24 Oct 2002 22:16:54 -0000 1.1.1.1.2.7
***************
*** 207,211 ****
if(!empty($val->personal))
{
!
$this->sessionData['cc'] .= sprintf("%s <address@hidden>",
$val->personal,
$val->mailbox,
--- 207,211 ----
if(!empty($val->personal))
{
!
$this->sessionData['cc'] .= sprintf('"%s" <address@hidden>',
$val->personal,
$val->mailbox,
***************
*** 237,241 ****
if(!empty($val->personal))
{
!
$this->sessionData['to'] .= sprintf("%s <address@hidden>",
$val->personal,
$val->mailbox,
--- 237,241 ----
if(!empty($val->personal))
{
!
$this->sessionData['to'] .= sprintf('"%s" <address@hidden>',
$val->personal,
$val->mailbox,
***************
*** 362,365 ****
--- 362,366 ----
$this->sessionData['signature'] =
$_formData['signature'];
+
$mail = CreateObject('felamimail.phpmailer');
***************
*** 381,392 ****
if (!empty($this->sessionData['to']))
{
! $address = split(",",$this->sessionData['to']);
! while (list($key,$value) = each($address))
{
! $address_array =
imap_rfc822_parse_adrlist($value,'');
! if(count($address_array)>0)
{
! $emailAddress =
$address_array[0]->mailbox."@".$address_array[0]->host;
! $emailName =
$address_array[0]->personal;
$mail->AddAddress($emailAddress,$emailName);
}
--- 382,392 ----
if (!empty($this->sessionData['to']))
{
! $address_array =
imap_rfc822_parse_adrlist($this->sessionData['to'],'');
! if(count($address_array)>0)
{
! for($i=0;$i<count($address_array);$i++)
{
! $emailAddress =
$address_array[$i]->mailbox."@".$address_array[$i]->host;
! $emailName =
$address_array[$i]->personal;
$mail->AddAddress($emailAddress,$emailName);
}
***************
*** 396,407 ****
if (!empty($this->sessionData['cc']))
{
! $address = split(",",$this->sessionData['cc']);
! while (list($key,$value) = each($address))
{
! $address_array =
imap_rfc822_parse_adrlist($value,'');
! if(count($address_array)>0)
{
! $emailAddress =
$address_array[0]->mailbox."@".$address_array[0]->host;
! $emailName =
$address_array[0]->personal;
$mail->AddCC($emailAddress,$emailName);
}
--- 396,406 ----
if (!empty($this->sessionData['cc']))
{
! $address_array =
imap_rfc822_parse_adrlist($this->sessionData['cc'],'');
! if(count($address_array)>0)
{
! for($i=0;$i<count($address_array);$i++)
{
! $emailAddress =
$address_array[$i]->mailbox."@".$address_array[$i]->host;
! $emailName =
$address_array[$i]->personal;
$mail->AddCC($emailAddress,$emailName);
}
***************
*** 411,422 ****
if (!empty($this->sessionData['bcc']))
{
! $address = split(",",$this->sessionData['bcc']);
! while (list($key,$value) = each($address))
{
! $address_array =
imap_rfc822_parse_adrlist($value,'');
! if(count($address_array)>0)
{
! $emailAddress =
$address_array[0]->mailbox."@".$address_array[0]->host;
! $emailName =
$address_array[0]->personal;
$mail->AddBCC($emailAddress,$emailName);
}
--- 410,420 ----
if (!empty($this->sessionData['bcc']))
{
! $address_array =
imap_rfc822_parse_adrlist($this->sessionData['bcc'],'');
! if(count($address_array)>0)
{
! for($i=0;$i<count($address_array);$i++)
{
! $emailAddress =
$address_array[$i]->mailbox."@".$address_array[$i]->host;
! $emailName =
$address_array[$i]->personal;
$mail->AddBCC($emailAddress,$emailName);
}
***************
*** 426,439 ****
if (!empty($this->sessionData['reply_to']))
{
! $address =
split(",",$this->sessionData['reply_to']);
! while (list($key,$value) = each($address))
{
! $address_array =
imap_rfc822_parse_adrlist($value,'');
! if(count($address_array)>0)
! {
! $emailAddress =
$address_array[0]->mailbox."@".$address_array[0]->host;
! $emailName =
$address_array[0]->personal;
!
$mail->AddReplyTo($emailAddress,$emailName);
! }
}
}
--- 424,433 ----
if (!empty($this->sessionData['reply_to']))
{
! $address_array =
imap_rfc822_parse_adrlist($this->sessionData['reply_to'],'');
! if(count($address_array)>0)
{
! $emailAddress =
$address_array[0]->mailbox."@".$address_array[0]->host;
! $emailName =
$address_array[0]->personal;
!
$mail->AddReplyTo($emailAddress,$emailName);
}
}
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -C2 -r1.2.2.8 -r1.2.2.9
*** class.bofelamimail.inc.php 16 Oct 2002 08:09:38 -0000 1.2.2.8
--- class.bofelamimail.inc.php 24 Oct 2002 22:16:54 -0000 1.2.2.9
***************
*** 715,719 ****
$this->saveSessionData();
}
}
-
?>
--- 715,738 ----
$this->saveSessionData();
}
+
+ function validate_email($_emailAddress)
+ {
+ if($val != "")
+ {
+ $pattern =
"/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-]+)+/";
+ if(preg_match($pattern, $val))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
}
?>
Index: class.uicompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -C2 -r1.1.1.1.2.5 -r1.1.1.1.2.6
*** class.uicompose.inc.php 16 Oct 2002 08:09:38 -0000 1.1.1.1.2.5
--- class.uicompose.inc.php 24 Oct 2002 22:16:54 -0000 1.1.1.1.2.6
***************
*** 55,58 ****
--- 55,65 ----
}
+ function unhtmlentities ($string)
+ {
+ $trans_tbl = get_html_translation_table (HTML_ENTITIES);
+ $trans_tbl = array_flip ($trans_tbl);
+ return strtr ($string, $trans_tbl);
+ }
+
function action()
{
***************
*** 152,160 ****
// header
$this->t->set_var("from",htmlentities($this->bocompose->getUserName()));
! $this->t->set_var("to",$sessionData['to']);
! $this->t->set_var("cc",$sessionData['cc']);
! $this->t->set_var("bcc",$sessionData['bcc']);
! $this->t->set_var("reply_to",$sessionData['reply_to']);
! $this->t->set_var("subject",$sessionData['subject']);
$this->t->pparse("out","header");
--- 159,167 ----
// header
$this->t->set_var("from",htmlentities($this->bocompose->getUserName()));
!
$this->t->set_var("to",htmlentities($sessionData['to']));
!
$this->t->set_var("cc",htmlentities($sessionData['cc']));
!
$this->t->set_var("bcc",htmlentities($sessionData['bcc']));
!
$this->t->set_var("reply_to",htmlentities($sessionData['reply_to']));
!
$this->t->set_var("subject",htmlentities($sessionData['subject']));
$this->t->pparse("out","header");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.6,1.1.1.1.2.7 class.bofelamimail.inc.php,1.2.2.8,1.2.2.9 class.uicompose.inc.php,1.1.1.1.2.5,1.1.1.1.2.6,
Lars Kneschke <address@hidden> <=