[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: felamimail read_body.php,1.2.2.2,1.2.2.3
|
From: |
Lars Kneschke <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: felamimail read_body.php,1.2.2.2,1.2.2.3 |
|
Date: |
Sun, 05 May 2002 16:02:51 -0400 |
Update of /cvsroot/phpgroupware/felamimail
In directory subversions:/tmp/cvs-serv30737
Modified Files:
Tag: Version-0_9_14-branch
read_body.php
Log Message:
- made the "Answered" flag working again
- fixed a reply to all bug(it did not reply to all)
- made the "Send Email" button on the main view vissible again
some internal code clean up
Index: read_body.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/read_body.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** read_body.php 22 Mar 2002 20:07:20 -0000 1.2.2.2
--- read_body.php 5 May 2002 20:02:49 -0000 1.2.2.3
***************
*** 63,142 ****
{
global $phpgw, $phpgw_info, $PHP_SELF, $QUERY_STRING;
!
! // if last char == , => remove it
! if (strrpos ($_addressString, ",")+1 == strlen($_addressString))
! {
! $_addressString = substr($_addressString,0,
strlen($_addressString)-1);
! }
!
! #print "$_addressString<br>";
!
! // "Lars Kneschke" <address@hidden>
! if (preg_match("/^\"(.*)\".*<(.*)>/i",$_addressString ,
$matches))
! {
! $linkData = array
! (
! 'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[2]),
! 'name' => urlencode($matches[1]),
! 'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
! );
! $link = $phpgw->link('/index.php',$linkData);
! $image = '<img src="'.PHPGW_IMAGES.
! '/sm_envelope.gif" width="10"
height="8"
! alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
! return sprintf(' <a href="%s">%s</a>',
! $link, $image);
! }
! // Lars Kneschke <address@hidden>
! elseif (preg_match("/^(.*).*<(.*)>/i",$_addressString ,
$matches))
{
! $linkData = array
! (
! 'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[2]),
! 'name' => urlencode($matches[1]),
! 'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
! );
! $link = $phpgw->link('/index.php',$linkData);
! $image = '<img src="'.PHPGW_IMAGES.
! '/sm_envelope.gif" width="10"
height="8"
! alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
! return sprintf(' <a href="%s">%s</a>',
! $link, $image);
}
! // address@hidden (Lars Kneschke)
! elseif
(preg_match("/^(address@hidden).*\((.*)\)/i",$_addressString , $matches))
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[2]),
! 'name' => urlencode($matches[1]),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
- $link = $phpgw->link('/index.php',$linkData);
- $image = '<img src="'.PHPGW_IMAGES.
- '/sm_envelope.gif" width="10"
height="8"
- alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
- return sprintf(' <a href="%s">%s</a>',
- $link, $image);
}
! // address@hidden
! elseif (preg_match("/^(address@hidden)/i",$_addressString ,
$matches))
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($matches[1]),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
- $link = $phpgw->link('/index.php',$linkData);
- $image = '<img src="'.PHPGW_IMAGES.
- '/sm_envelope.gif" width="10"
height="8"
- alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
- return sprintf(' <a href="%s">%s</a>',
- $link, $image);
}
}
--- 63,100 ----
{
global $phpgw, $phpgw_info, $PHP_SELF, $QUERY_STRING;
!
! $addressParts = imap_rfc822_parse_adrlist($_addressString,'');
! if(count($addressParts)<1)
{
! return false;
}
!
! $email = $addressParts[0]->mailbox.'@'.$addressParts[0]->host;
! $name = $addressParts[0]->personal;
!
! if(!empty($name))
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($email),
! 'name' => urlencode($name),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
}
! else
{
$linkData = array
(
'menuaction' =>
'addressbook.uiaddressbook.add_email',
! 'add_email' => urlencode($email),
'referer' =>
urlencode($PHP_SELF.'?'.$QUERY_STRING)
);
}
+ $link = $phpgw->link('/index.php',$linkData);
+ $image = '<img src="'.PHPGW_IMAGES.
+ '/sm_envelope.gif" width="10" height="8"
+ alt="'.lang("Add to address book").'"
border="0" align="absmiddle">';
+ return sprintf(' <a href="%s">%s</a>', $link, $image);
}
***************
*** 527,531 ****
'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $passed_id
);
$t->set_var("link_reply",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 485,489 ----
'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $GLOBALS['HTTP_GET_VARS']['uid']
);
$t->set_var("link_reply",$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 537,541 ****
'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $passed_id
);
$t->set_var("link_reply_all",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 495,499 ----
'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $GLOBALS['HTTP_GET_VARS']['uid']
);
$t->set_var("link_reply_all",$GLOBALS['phpgw']->link('/index.php',$linkData));
***************
*** 547,551 ****
'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $passed_id
);
$t->set_var("link_forward",$GLOBALS['phpgw']->link('/index.php',$linkData));
--- 505,509 ----
'startMessage' =>
$GLOBALS['HTTP_GET_VARS']['startMessage'],
'sort' => $GLOBALS['HTTP_GET_VARS']['sort'],
! 'reply_id' => $GLOBALS['HTTP_GET_VARS']['uid']
);
$t->set_var("link_forward",$GLOBALS['phpgw']->link('/index.php',$linkData));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: felamimail read_body.php,1.2.2.2,1.2.2.3,
Lars Kneschke <address@hidden> <=