[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_base.inc.php,1.1,1.2 clas
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_base.inc.php,1.1,1.2 class.msg_base_sock.inc.php,1.1,1.2 |
|
Date: |
Sun, 26 May 2002 16:09:03 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30661
Modified Files:
class.msg_base.inc.php class.msg_base_sock.inc.php
Log Message:
formatting
Index: class.msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_base.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.msg_base.inc.php 6 May 2002 09:05:44 -0000 1.1
--- class.msg_base.inc.php 26 May 2002 20:09:01 -0000 1.2
***************
*** 17,21 ****
{
var $msg_struct;
! var $err = array("code","msg","desc");
var $msg_info = Array(Array());
--- 17,21 ----
{
var $msg_struct;
! var $err = array('code','msg','desc');
var $msg_info = Array(Array());
***************
*** 33,39 ****
function msg_base()
{
! $this->err["code"] = " ";
! $this->err["msg"] = " ";
! $this->err["desc"] = " ";
$this->tempfile =
$GLOBALS['phpgw_info']['server']['temp_dir'].SEP.$GLOBALS['phpgw_info']['user']['sessionid'].'.mhd';
$this->force_check = false;
--- 33,39 ----
function msg_base()
{
! $this->err['code'] = ' ';
! $this->err['msg'] = ' ';
! $this->err['desc'] = ' ';
$this->tempfile =
$GLOBALS['phpgw_info']['server']['temp_dir'].SEP.$GLOBALS['phpgw_info']['user']['sessionid'].'.mhd';
$this->force_check = false;
***************
*** 134,144 ****
// folder name at this stage is
{SERVER_NAME:PORT}FOLDERNAME
! // get everything to the right of the bracket "}",
INCLUDES the bracket itself
$name['folder_before'] = strstr($data_str,'}');
! // get rid of that 'needle' "}"
$name['folder_before'] = substr($name['folder_before'],
1);
// translate
$name['folder_after'] =
imap_utf7_decode($name['folder_before']);
! // "imap_utf7_decode" returns False if no translation
occured
if ($name['folder_after'] == False)
{
--- 134,144 ----
// folder name at this stage is
{SERVER_NAME:PORT}FOLDERNAME
! // get everything to the right of the bracket '}',
INCLUDES the bracket itself
$name['folder_before'] = strstr($data_str,'}');
! // get rid of that 'needle' '}'
$name['folder_before'] = substr($name['folder_before'],
1);
// translate
$name['folder_after'] =
imap_utf7_decode($name['folder_before']);
! // 'imap_utf7_decode' returns False if no translation
occured
if ($name['folder_after'] == False)
{
***************
*** 160,164 ****
for ($i=0;$i<count($header);$i++)
{
! $pos = strpos($header[$i],":");
if (is_int($pos) && $pos)
{
--- 160,164 ----
for ($i=0;$i<count($header);$i++)
{
! $pos = strpos($header[$i],':');
if (is_int($pos) && $pos)
{
***************
*** 173,177 ****
return false;
}
-
} // end of class mail
?>
--- 173,176 ----
Index: class.msg_base_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_base_sock.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.msg_base_sock.inc.php 6 May 2002 09:05:44 -0000 1.1
--- class.msg_base_sock.inc.php 26 May 2002 20:09:01 -0000 1.2
***************
*** 22,25 ****
--- 22,27 ----
\**************************************************************************/
+ /* $Id$ */
+
define('SA_MESSAGES',1);
define('SA_RECENT',2);
***************
*** 28,32 ****
define('SA_UIDVALIDITY',16);
define('SA_ALL',31);
!
define('SORTDATE',0);
define('SORTARRIVAL',1);
--- 30,34 ----
define('SA_UIDVALIDITY',16);
define('SA_ALL',31);
!
define('SORTDATE',0);
define('SORTARRIVAL',1);
***************
*** 36,40 ****
define('SORTCC',5);
define('SORTSIZE',6);
!
define ('TYPETEXT',0);
define ('TYPEMULTIPART',1);
--- 38,42 ----
define('SORTCC',5);
define('SORTSIZE',6);
!
define ('TYPETEXT',0);
define ('TYPEMULTIPART',1);
***************
*** 55,59 ****
// ENCUU not defined in php 4, but we may use it
define ('ENCUU',6);
!
define ('FT_UID',1); // the msgnum is a UID
define ('FT_PEEK',2); // do not set the \Seen flag if not already set
--- 57,61 ----
// ENCUU not defined in php 4, but we may use it
define ('ENCUU',6);
!
define ('FT_UID',1); // the msgnum is a UID
define ('FT_PEEK',2); // do not set the \Seen flag if not already set
***************
*** 61,65 ****
define ('FT_INTERNAL',8); // server will not attempt to standardize
CRLFs
define ('FT_PREFETCHTEXT',16); // grab the header AND its associated
RFC822.TEXT
!
define ('SE_UID',1); // used with IMAP_SORT, IMAP_SEARCH,
define ('SE_FREE',2); // Return the search program to free storage
after finishing NOT used by PHP
--- 63,67 ----
define ('FT_INTERNAL',8); // server will not attempt to standardize
CRLFs
define ('FT_PREFETCHTEXT',16); // grab the header AND its associated
RFC822.TEXT
!
define ('SE_UID',1); // used with IMAP_SORT, IMAP_SEARCH,
define ('SE_FREE',2); // Return the search program to free storage
after finishing NOT used by PHP
***************
*** 67,71 ****
//SE_UID Return UIDs instead of sequence numbers
//SE_NOPREFETCH Don't prefetch searched messages.
!
// This may need to be a reference to the different months in native
tongue....
$GLOBALS['month_array'] = Array(
--- 69,73 ----
//SE_UID Return UIDs instead of sequence numbers
//SE_NOPREFETCH Don't prefetch searched messages.
!
// This may need to be a reference to the different months in native
tongue....
$GLOBALS['month_array'] = Array(
***************
*** 107,111 ****
var $quota_all = '';
}
!
/*
@class mailbox_msg_info (sockets)
--- 109,113 ----
var $quota_all = '';
}
!
/*
@class mailbox_msg_info (sockets)
***************
*** 132,136 ****
var $Size = '';
}
!
/*
@class mailbox_status (sockets) discussion VS. class mailbox_msg_info
(sockets)
--- 134,138 ----
var $Size = '';
}
!
/*
@class mailbox_status (sockets) discussion VS. class mailbox_msg_info
(sockets)
***************
*** 203,207 ****
var $parts = array();
}
!
// gonna have to decide on one of the next two
class msg_params
--- 205,209 ----
var $parts = array();
}
!
// gonna have to decide on one of the next two
class msg_params
***************
*** 221,225 ****
var $value;
}
!
class address
{
--- 223,227 ----
var $value;
}
!
class address
{
***************
*** 229,233 ****
var $adl;
}
!
/*
@class msg_overview (sockets)
--- 231,235 ----
var $adl;
}
!
/*
@class msg_overview (sockets)
***************
*** 330,334 ****
//var $body_glob_msgnum = '';
var $body_array = array();
! var $body_array_msgnum = '';
// structural information from our processing functions
//var $mailbox_msg_info = ''; // caching this with POP3 is OK
but will cause HAVOC with IMAP or NNTP
--- 332,336 ----
//var $body_glob_msgnum = '';
var $body_array = array();
! var $body_array_msgnum = '';
// structural information from our processing functions
//var $mailbox_msg_info = ''; // caching this with POP3 is OK
but will cause HAVOC with IMAP or NNTP
***************
*** 342,346 ****
// because this line is not actually data, so put this line
here for inspection if necessary
var $server_last_ok_response = '';
!
// future use
var $refto_msg_parent;
--- 344,348 ----
// because this line is not actually data, so put this line
here for inspection if necessary
var $server_last_ok_response = '';
!
// future use
var $refto_msg_parent;
***************
*** 351,363 ****
var $bsub=array();
var $folder = '';
!
var $imap_builtin=False;
var $force_msg_uids = False;
!
// DEBUG FLAG: Debug Levels are 0=none, 1=basic, 2=detailed,
3=more detailed
var $debug=0;
//var $debug=1;
//var $debug=2;
!
function msg_base()
{
--- 353,365 ----
var $bsub=array();
var $folder = '';
!
var $imap_builtin=False;
var $force_msg_uids = False;
!
// DEBUG FLAG: Debug Levels are 0=none, 1=basic, 2=detailed,
3=more detailed
var $debug=0;
//var $debug=1;
//var $debug=2;
!
function msg_base()
{
***************
*** 371,378 ****
else
{
! // NEED GENERIC DEFAULT VALUES HERE
}
}
!
function error()
{
--- 373,380 ----
else
{
! // NEED GENERIC DEFAULT VALUES HERE
}
}
!
function error()
{
***************
*** 381,385 ****
$GLOBALS['phpgw']->common->phpgw_exit();
}
!
// REDUNDANT FUNCTION FROM NON-SOCK CLASS
function get_flag($stream,$msg_num,$flag)
--- 383,387 ----
$GLOBALS['phpgw']->common->phpgw_exit();
}
!
// REDUNDANT FUNCTION FROM NON-SOCK CLASS
function get_flag($stream,$msg_num,$flag)
***************
*** 402,406 ****
return false;
}
!
/*!
@function distill_fq_folder
--- 404,408 ----
return false;
}
!
/*!
@function distill_fq_folder
***************
*** 433,437 ****
$svr_data['port_with_junk'] = '';
$svr_data['port'] = '';
!
// see if we have any data to work with
if ((!isset($fq_folder))
--- 435,439 ----
$svr_data['port_with_junk'] = '';
$svr_data['port'] = '';
!
// see if we have any data to work with
if ((!isset($fq_folder))
***************
*** 443,447 ****
// we're out'a here
}
!
// see if this is indeed a fully qualified folder name
if (strstr($fq_folder,'}') == False)
--- 445,449 ----
// we're out'a here
}
!
// see if this is indeed a fully qualified folder name
if (strstr($fq_folder,'}') == False)
***************
*** 452,456 ****
// we're out'a here
}
!
// -- (1) -- get the folder name stripped of the server
string
// folder name at this stage is
{SERVER_NAME:PORT}FOLDERNAME
--- 454,458 ----
// we're out'a here
}
!
// -- (1) -- get the folder name stripped of the server
string
// folder name at this stage is
{SERVER_NAME:PORT}FOLDERNAME
***************
*** 494,498 ****
return $svr_data;
}
!
/*!
@function read_port_glob
--- 496,500 ----
return $svr_data;
}
!
/*!
@function read_port_glob
***************
*** 521,525 ****
return $glob_response;
}
!
/*!
@function glob_to_array
--- 523,527 ----
return $glob_response;
}
!
/*!
@function glob_to_array
***************
*** 565,569 ****
{
// do noting
! }
else
{
--- 567,571 ----
{
// do noting
! }
else
{
***************
*** 574,578 ****
return $return_array;
}
!
/*!
@function show_crlf
--- 576,580 ----
return $return_array;
}
!
/*!
@function show_crlf
***************
*** 589,593 ****
return str_replace("\r\n", 'CRLF', $data);
}
!
function create_header($line,$header,$line2='')
{
--- 591,595 ----
return str_replace("\r\n", 'CRLF', $data);
}
!
function create_header($line,$header,$line2='')
{
***************
*** 628,632 ****
//echo 'Header[$key] = '.$header[$key].'<br>'."\n";
}
!
function build_address_structure($key)
{
--- 630,634 ----
//echo 'Header[$key] = '.$header[$key].'<br>'."\n";
}
!
function build_address_structure($key)
{
***************
*** 648,652 ****
}
}
!
function convert_date_array($field_list)
{
--- 650,654 ----
}
}
!
function convert_date_array($field_list)
{
***************
*** 657,670 ****
$new_list[$key] = $this->make_udate($value);
if ($this->debug >= 2) { echo 'base_sock:
convert_date_array: field_list: "'.$new_list[$key].'" was "'.$value.'"<br>'; }
!
}
return $new_list;
}
!
function convert_date($msg_date)
{
$dta = array();
$ta = array();
!
// Convert "Sat, 15 Jul 2000 20:50:22 +0200" to unixtime
$comma = strpos($msg_date,',');
--- 659,672 ----
$new_list[$key] = $this->make_udate($value);
if ($this->debug >= 2) { echo 'base_sock:
convert_date_array: field_list: "'.$new_list[$key].'" was "'.$value.'"<br>'; }
!
}
return $new_list;
}
!
function convert_date($msg_date)
{
$dta = array();
$ta = array();
!
// Convert "Sat, 15 Jul 2000 20:50:22 +0200" to unixtime
$comma = strpos($msg_date,',');
***************
*** 676,680 ****
$dta = explode(' ',$msg_date);
$ta = explode(':',$dta[3]);
!
if(substr($dta[4],0,3) <> 'GMT')
{
--- 678,682 ----
$dta = explode(' ',$msg_date);
$ta = explode(':',$dta[3]);
!
if(substr($dta[4],0,3) <> 'GMT')
{
***************
*** 694,703 ****
}
}
!
$new_time =
mktime($ta[0],$ta[1],$ta[2],$GLOBALS['month_array'][strtolower($dta[1])],$dta[0],$dta[2])
- ((60 * 60) *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tzoffset']));
//echo 'New Time : '.$new_time."<br>\n";
return $new_time;
}
!
function make_udate($msg_date)
{
--- 696,705 ----
}
}
!
$new_time =
mktime($ta[0],$ta[1],$ta[2],$GLOBALS['month_array'][strtolower($dta[1])],$dta[0],$dta[2])
- ((60 * 60) *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tzoffset']));
//echo 'New Time : '.$new_time."<br>\n";
return $new_time;
}
!
function make_udate($msg_date)
{
***************
*** 735,739 ****
return $utime;
}
!
function ssort_prep($a)
{
--- 737,741 ----
return $utime;
}
!
function ssort_prep($a)
{
***************
*** 751,760 ****
$a_mod = $a;
}
!
while(substr($a_mod,0,1) == ' ')
{
$a_mod = substr($a_mod,1);
}
!
//if(strpos(' '.$a_mod,'[') == 1)
//{
--- 753,762 ----
$a_mod = $a;
}
!
while(substr($a_mod,0,1) == ' ')
{
$a_mod = substr($a_mod,1);
}
!
//if(strpos(' '.$a_mod,'[') == 1)
//{
***************
*** 763,767 ****
return $a_mod;
}
!
function ssort_ascending($a,$b)
{
--- 765,769 ----
return $a_mod;
}
!
function ssort_ascending($a,$b)
{
***************
*** 774,778 ****
return ($a_mod < $b_mod) ? -1 : 1;
}
!
function ssort_decending($a,$b)
{
--- 776,780 ----
return ($a_mod < $b_mod) ? -1 : 1;
}
!
function ssort_decending($a,$b)
{
***************
*** 785,789 ****
return ($a_mod > $b_mod) ? -1 : 1;
}
!
function msg_header($msgnum)
{
--- 787,791 ----
return ($a_mod > $b_mod) ? -1 : 1;
}
!
function msg_header($msgnum)
{
***************
*** 791,800 ****
// This needs to be pulled back to the actual read
header of the mailer type.
//$this->msg_fetch_overview($msgnum);
!
// From:
$this->msg->from = array(new address);
$this->msg->from =
$this->build_address_structure('From');
$this->msg->fromaddress = $this->header['From'];
!
// To:
$this->msg->to = array(new address);
--- 793,802 ----
// This needs to be pulled back to the actual read
header of the mailer type.
//$this->msg_fetch_overview($msgnum);
!
// From:
$this->msg->from = array(new address);
$this->msg->from =
$this->build_address_structure('From');
$this->msg->fromaddress = $this->header['From'];
!
// To:
$this->msg->to = array(new address);
***************
*** 817,821 ****
$this->msg->toaddress = $this->header['To'];
}
!
// Cc:
$this->msg->cc = array(new address);
--- 819,823 ----
$this->msg->toaddress = $this->header['To'];
}
!
// Cc:
$this->msg->cc = array(new address);
***************
*** 825,829 ****
$this->msg->ccaddress = $this->header['Cc'];
}
!
// Bcc:
$this->msg->bcc = array(new address);
--- 827,831 ----
$this->msg->ccaddress = $this->header['Cc'];
}
!
// Bcc:
$this->msg->bcc = array(new address);
***************
*** 833,837 ****
$this->msg->bccaddress = $this->header['bcc'];
}
!
// Reply-To:
$this->msg->reply_to = array(new address);
--- 835,839 ----
$this->msg->bccaddress = $this->header['bcc'];
}
!
// Reply-To:
$this->msg->reply_to = array(new address);
***************
*** 841,845 ****
$this->msg->reply_toaddress =
$this->header['Reply-To'];
}
!
// Sender:
$this->msg->sender = array(new address);
--- 843,847 ----
$this->msg->reply_toaddress =
$this->header['Reply-To'];
}
!
// Sender:
$this->msg->sender = array(new address);
***************
*** 849,853 ****
$this->msg->senderaddress =
$this->header['Sender'];
}
!
// Return-Path:
$this->msg->return_path = array(new address);
--- 851,855 ----
$this->msg->senderaddress =
$this->header['Sender'];
}
!
// Return-Path:
$this->msg->return_path = array(new address);
***************
*** 857,872 ****
$this->msg->return_pathaddress =
$this->header['Return-Path'];
}
!
// UDate
$this->msg->udate =
$this->convert_date($this->header['Date']);
!
// Subject
$this->msg->subject =
$this->phpGW_quoted_printable_decode($this->header['Subject']);
!
// Lines
// This represents the number of lines contained in the
body
$this->msg->lines = $this->header['Lines'];
}
!
function msg_headerinfo($msgnum)
{
--- 859,874 ----
$this->msg->return_pathaddress =
$this->header['Return-Path'];
}
!
// UDate
$this->msg->udate =
$this->convert_date($this->header['Date']);
!
// Subject
$this->msg->subject =
$this->phpGW_quoted_printable_decode($this->header['Subject']);
!
// Lines
// This represents the number of lines contained in the
body
$this->msg->lines = $this->header['Lines'];
}
!
function msg_headerinfo($msgnum)
{
***************
*** 895,899 ****
return quoted_printable_decode($string);
}
!
/*
* Remove '=' at the end of the lines.
`quoted_printable_decode` doesn't do it.
--- 897,901 ----
return quoted_printable_decode($string);
}
!
/*
* Remove '=' at the end of the lines.
`quoted_printable_decode` doesn't do it.
***************
*** 904,908 ****
return preg_replace("/\=\n/", '', $string);
}
!
function decode_base64($string)
{
--- 906,910 ----
return preg_replace("/\=\n/", '', $string);
}
!
function decode_base64($string)
{
***************
*** 911,915 ****
return $string;
}
!
function decode_qp($string)
{
--- 913,917 ----
return $string;
}
!
function decode_qp($string)
{
***************
*** 918,922 ****
return $string;
}
!
function decode_header($string)
{
--- 920,924 ----
return $string;
}
!
function decode_header($string)
{
***************
*** 969,973 ****
$name = eregi_replace("^\((.*)\)$", "\\1", $name);
}
!
// OBSOLETED ?
function get_mime_type($de_part)
--- 971,975 ----
$name = eregi_replace("^\((.*)\)$", "\\1", $name);
}
!
// OBSOLETED ?
function get_mime_type($de_part)
***************
*** 982,1003 ****
}
}
!
function type_int_to_str($type_int)
{
switch ($type_int)
{
! case TYPETEXT : $type_str = 'text';
break;
! case TYPEMULTIPART : $type_str =
'multipart'; break;
! case TYPEMESSAGE : $type_str =
'message'; break;
! case TYPEAPPLICATION : $type_str =
'application'; break;
! case TYPEAUDIO : $type_str = 'audio';
break;
! case TYPEIMAGE : $type_str = 'image';
break;
! case TYPEVIDEO : $type_str = 'video';
break;
! case TYPEOTHER : $type_str = 'other';
break;
! default : $type_str = 'unknown';
}
return $type_str;
}
!
function get_mime_encoding($de_part)
{
--- 984,1005 ----
}
}
!
function type_int_to_str($type_int)
{
switch ($type_int)
{
! case TYPETEXT : $type_str = 'text';
break;
! case TYPEMULTIPART : $type_str = 'multipart';
break;
! case TYPEMESSAGE : $type_str = 'message';
break;
! case TYPEAPPLICATION : $type_str =
'application'; break;
! case TYPEAUDIO : $type_str = 'audio';
break;
! case TYPEIMAGE : $type_str = 'image';
break;
! case TYPEVIDEO : $type_str = 'video';
break;
! case TYPEOTHER : $type_str = 'other';
break;
! default : $type_str = 'unknown';
}
return $type_str;
}
!
function get_mime_encoding($de_part)
{
***************
*** 1016,1036 ****
}
}
!
function encoding_int_to_str($encoding_int)
{
switch ($encoding_int)
{
! case ENC7BIT : $encoding_str = '7bit'; break;
! case ENC8BIT : $encoding_str = '8bit'; break;
! case ENCBINARY : $encoding_str = 'binary';
break;
! case ENCBASE64 : $encoding_str = 'base64';
break;
case ENCQUOTEDPRINTABLE : $encoding_str =
'quoted-printable'; break;
! case ENCOTHER : $encoding_str = 'other';
break;
! case ENCUU : $encoding_str = 'uu'; break;
! default : $encoding_str = 'other';
}
return $encoding_str;
}
!
// OBSOLETED
function get_att_name($de_part)
--- 1018,1038 ----
}
}
!
function encoding_int_to_str($encoding_int)
{
switch ($encoding_int)
{
! case ENC7BIT : $encoding_str = '7bit'; break;
! case ENC8BIT : $encoding_str = '8bit'; break;
! case ENCBINARY : $encoding_str = 'binary';
break;
! case ENCBASE64 : $encoding_str = 'base64';
break;
case ENCQUOTEDPRINTABLE : $encoding_str =
'quoted-printable'; break;
! case ENCOTHER : $encoding_str = 'other';
break;
! case ENCUU : $encoding_str = 'uu'; break;
! default : $encoding_str = 'other';
}
return $encoding_str;
}
!
// OBSOLETED
function get_att_name($de_part)
***************
*** 1057,1061 ****
return $att_name;
}
!
function uudecode($str)
{
--- 1059,1063 ----
return $att_name;
}
!
function uudecode($str)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_base.inc.php,1.1,1.2 class.msg_base_sock.inc.php,1.1,1.2,
Miles Lott <address@hidden> <=