[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc/class.mail_dcom_pop3_sock.inc.php, 1.20.2.1
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] email/inc/class.mail_dcom_pop3_sock.inc.php, 1.20.2.1 |
|
Date: |
Sat, 6 Nov 2004 17:13:46 +0100 |
Update of /email/inc
Modified Files:
Branch: Version-0_9_16-branch
class.mail_dcom_pop3_sock.inc.php
date: 2004/11/06 16:13:46; author: powerstat; state: Exp; lines: +180 -180
Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: email/inc/class.mail_dcom_pop3_sock.inc.php
diff -u email/inc/class.mail_dcom_pop3_sock.inc.php:1.20
email/inc/class.mail_dcom_pop3_sock.inc.php:1.20.2.1
--- email/inc/class.mail_dcom_pop3_sock.inc.php:1.20 Fri Mar 14 04:00:55 2003
+++ email/inc/class.mail_dcom_pop3_sock.inc.php Sat Nov 6 16:13:46 2004
@@ -45,7 +45,7 @@
function createmailbox($stream,$mailbox)
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: createmailbox<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: createmailbox<br />'; }
return true;
}
/*!
@@ -55,7 +55,7 @@
function deletemailbox($stream,$mailbox)
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: deletemailbox<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: deletemailbox<br />'; }
return true;
}
/*!
@@ -65,7 +65,7 @@
function expunge($stream)
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: expunge<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: expunge<br />'; }
return true;
}
/*!
@@ -75,7 +75,7 @@
function listmailbox($stream,$ref,$pattern)
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: listmailbox (probable namespace discovery
attempt)<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: listmailbox (probable namespace discovery attempt)<br
/>'; }
return False;
}
/*!
@@ -85,7 +85,7 @@
function mailcopy($stream,$msg_list,$mailbox,$flags)
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: mailcopy<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: mailcopy<br />'; }
return False;
}
/*!
@@ -95,7 +95,7 @@
function mail_move($stream,$msg_list,$mailbox)
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: mail_move<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: mail_move<br />'; }
return False;
}
/*!
@@ -105,7 +105,7 @@
function reopen($stream,$mailbox,$flags = "")
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: reopen<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: reopen<br />'; }
return False;
}
/*!
@@ -115,7 +115,7 @@
function append($stream, $folder = "Sent", $header, $body,
$flags = "")
{
// N/A for pop3
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: append<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unused function in POP3: append<br />'; }
return False;
}
/**************************************************************************\
@@ -128,7 +128,7 @@
function fetch_overview($stream,$sequence,$flags)
{
// not yet implemented
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
not-yet-implemented function in POP3: fetch_overview<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
not-yet-implemented function in POP3: fetch_overview<br />'; }
return False;
}
/*!
@@ -138,7 +138,7 @@
function noop_ping_test($stream)
{
// not yet implemented
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
unimplemented socket function: noop_ping_test<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
unimplemented socket function: noop_ping_test<br />'; }
return False;
}
/*!
@@ -148,7 +148,7 @@
function server_last_error()
{
// not yet implemented
- if ($this->debug_dcom >= 1) { echo 'pop3: call to
not-yet-implemented socket function: server_last_error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: call to
not-yet-implemented socket function: server_last_error<br />'; }
return '';
}
@@ -169,7 +169,7 @@
*/
function open ($fq_folder, $user, $pass, $flags='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
open<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
open<br />'; }
// fq_folder is a "fully qualified folder", seperate
the parts:
$svr_data = array();
@@ -177,12 +177,12 @@
$folder = $svr_data['folder'];
$server = $svr_data['server'];
$port = $svr_data['port'];
- if ($this->debug_dcom >= 1) { echo 'pop3: open:
svr_data:<br>'.serialize($svr_data).'<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: open:
svr_data:<br />'.serialize($svr_data).'<br />'; }
//$port = 110;
if (!$this->open_port($server,$port,15))
{
- echo '<p><center><b>' . lang('There was an
error trying to connect to your POP3 server.<br>Please contact your admin to
check the servername, username or password.').'</b></center>';
+ echo '<p><center><b>' . lang('There was an
error trying to connect to your POP3 server.<br />Please contact your admin to
check the servername, username or password.').'</b></center>';
echo('<CENTER><A
HREF="'.$GLOBALS['phpgw']->link('/home.php').'">'.lang('Click here to
continue').'...</A></CENTER>'); //cbsman
$GLOBALS['phpgw']->common->phpgw_exit();
}
@@ -190,14 +190,14 @@
if(!$this->msg2socket('USER '.$user,"^\+ok",&$response)
|| !$this->msg2socket('PASS '.$pass,"^\+ok",&$response))
{
$this->error();
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving open with Error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving open with Error<br />'; }
return False;
}
else
{
- //echo "Successful POP3 Login.<br>\n";
- if ($this->debug_dcom >= 1) { echo 'pop3: open:
Successful POP3 Login<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving open<br>'; }
+ //echo "Successful POP3 Login.<br />\n";
+ if ($this->debug_dcom >= 1) { echo 'pop3: open:
Successful POP3 Login<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving open<br />'; }
return $this->socket;
}
}
@@ -217,12 +217,12 @@
if (!$this->msg2socket('QUIT',"^\+ok",&$response))
{
$this->error();
- if ($this->debug_dcom >= 1) { echo 'pop3:
close: Error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
close: Error<br />'; }
return False;
}
else
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
close: Successful POP3 Logout<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
close: Successful POP3 Logout<br />'; }
return True;
}
}
@@ -241,12 +241,12 @@
*/
function mailboxmsginfo($stream_notused='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
mailboxmsginfo<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
mailboxmsginfo<br />'; }
// caching this with POP3 is OK but will cause HAVOC
with IMAP or NNTP
// do we have a cached header_array ?
//if ($this->mailbox_msg_info != '')
//{
- // if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving mailboxmsginfo returning cached data<br>'; }
+ // if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving mailboxmsginfo returning cached data<br />'; }
// return $this->mailbox_msg_info;
//}
// NO cached data, so go get it
@@ -276,18 +276,18 @@
{
if ($this->debug_dcom >= 2)
{
- echo 'pop3: mailboxmsginfo:
info->Nmsgs: '.$info->Nmsgs.'<br>';
- echo 'pop3: mailboxmsginfo: info->Size:
'.$info->Size.'<br>';
+ echo 'pop3: mailboxmsginfo:
info->Nmsgs: '.$info->Nmsgs.'<br />';
+ echo 'pop3: mailboxmsginfo: info->Size:
'.$info->Size.'<br />';
}
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving mailboxmsginfo<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving mailboxmsginfo<br />'; }
// save this data for future use
//$this->mailbox_msg_info = $info;
return $info;
}
else
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
mailboxmsginfo: returining False<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving mailboxmsginfo<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
mailboxmsginfo: returining False<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving mailboxmsginfo<br />'; }
return False;
}
}
@@ -304,7 +304,7 @@
*/
function status($stream_notused='',
$fq_folder='',$options=SA_ALL)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
status<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
status<br />'; }
// POP3 has only INBOX so ignore $fq_folder
// assume option is SA_ALL for POP3 because POP3
returns so little info anyway
// initialize structure
@@ -325,8 +325,8 @@
$mailbox_msg_info =
$this->mailboxmsginfo($stream_notused);
// all POP3 can return from imap_status is messages
$info->messages = $mailbox_msg_info->Nmsgs;
- if ($this->debug_dcom >= 1) { echo 'pop3: status:
info->messages: '.$info->messages.'<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
status<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: status:
info->messages: '.$info->messages.'<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
status<br />'; }
return $info;
}
@@ -340,13 +340,13 @@
*/
function num_msg($stream_notused='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
num_msg<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
num_msg<br />'; }
// Most Efficient Method:
// call mailboxmsginfo and fill THIS size data
from that
$mailbox_msg_info =
$this->mailboxmsginfo($stream_notused);
$return_num_msg = $mailbox_msg_info->Nmsgs;
- if ($this->debug_dcom >= 1) { echo 'pop3: num_msg:
'.$return_num_msg.'<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
num_msg<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: num_msg:
'.$return_num_msg.'<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
num_msg<br />'; }
return $return_num_msg;
}
@@ -378,7 +378,7 @@
*/
function
sort($stream_notused='',$criteria=SORTARRIVAL,$reverse=False,$options='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
sort<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
sort<br />'; }
// nr_of_msgs on pop server
$msg_num = $this->num_msg($stream_notused);
@@ -386,20 +386,20 @@
// no msgs - no sort.
if (!$msg_num)
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving sort with Error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving sort with Error<br />'; }
return false;
}
- if ($this->debug_dcom >= 1) { echo 'pop3: sort: Number
of Msgs:'.$msg_num.'<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: sort: Number
of Msgs:'.$msg_num.'<br />'; }
switch($criteria)
{
case SORTDATE:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTDATE<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTDATE<br />'; }
$old_list =
$this->fetch_header_element(1,$msg_num,'Date');
$field_list =
$this->convert_date_array($old_list);
- if ($this->debug_dcom >= 2) { echo
'pop3: sort: field_list: '.serialize($field_list).'<br><br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: sort: field_list: '.serialize($field_list).'<br /><br />'; }
break;
case SORTARRIVAL:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTARRIVAL<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTARRIVAL<br />'; }
// TEST
if
(!$this->msg2socket('LIST',"^\+ok",&$response))
{
@@ -408,26 +408,26 @@
$response = $this->read_port_glob('.');
// expected array should NOT start at
element 0, instead start it at element 1
$field_list =
$this->glob_to_array($response, False, ' ',True,1);
- if ($this->debug_dcom >= 2) { echo
'pop3: sort: field_list: '.serialize($field_list).'<br><br><br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: sort: field_list: '.serialize($field_list).'<br /><br /><br />'; }
break;
case SORTFROM:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTFROM<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTFROM<br />'; }
$field_list =
$this->fetch_header_element(1,$msg_num,'From');
break;
case SORTSUBJECT:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTSUBJECT<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTSUBJECT<br />'; }
$field_list =
$this->fetch_header_element(1,$msg_num,'Subject');
break;
case SORTTO:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTTO<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTTO<br />'; }
$field_list =
$this->fetch_header_element(1,$msg_num,'To');
break;
case SORTCC:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTCC<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTCC<br />'; }
$field_list =
$this->fetch_header_element(1,$msg_num,'cc');
break;
case SORTSIZE:
- if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTSIZE<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: sort: case SORTSIZE<br />'; }
$field_list =
$this->fetch_header_element(1,$msg_num,'Size');
break;
}
@@ -457,12 +457,12 @@
while(list($key,$value) = each($field_list))
{
$return_array[] = $key;
- //echo '('.$i.') Field:
<b>'.$value."</b>\t\tMsg Num: <b>".$key."</b><br>\n";
+ //echo '('.$i.') Field:
<b>'.$value."</b>\t\tMsg Num: <b>".$key."</b><br />\n";
$i++;
}
@reset($return_array);
- if ($this->debug_dcom >= 2) { echo 'pop3: sort:
return_array: '.serialize($return_array).'<br><br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
sort<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3: sort:
return_array: '.serialize($return_array).'<br /><br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
sort<br />'; }
return $return_array;
}
@@ -472,10 +472,10 @@
*/
function fetch_header_element($start,$stop,$element)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetch_header_element<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetch_header_element<br />'; }
for($i=$start;$i<=$stop;$i++)
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetch_header_element: issue "TOP '.$i.' 0"<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetch_header_element: issue "TOP '.$i.' 0"<br />'; }
if(!$this->write_port('TOP '.$i.' 0'))
{
$this->error();
@@ -484,19 +484,19 @@
if($this->header[$element])
{
$field_element[$i] =
$this->phpGW_quoted_printable_decode2($this->header[$element]);
- //echo $field_element[$i].' =
'.$this->phpGW_quoted_printable_decode2($this->header[$element])."<br>\n";
- if ($this->debug_dcom >= 1) { echo
'pop3: fetch_header_element: field_element['.$i.']:
'.$field_element[$i].'<br>'; }
+ //echo $field_element[$i].' =
'.$this->phpGW_quoted_printable_decode2($this->header[$element])."<br />\n";
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetch_header_element: field_element['.$i.']: '.$field_element[$i].'<br
/>'; }
}
else
{
$field_element[$i] =
$this->phpGW_quoted_printable_decode2($this->header[strtoupper($element)]);
- //echo $field_element[$i].' =
'.$this->phpGW_quoted_printable_decode2($this->header[strtoupper($element)])."<br>\n";
- if ($this->debug_dcom >= 1) { echo
'pop3: fetch_header_element: field_element['.$i.']:
'.$field_element[$i].'<br>'; }
+ //echo $field_element[$i].' =
'.$this->phpGW_quoted_printable_decode2($this->header[strtoupper($element)])."<br
/>\n";
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetch_header_element: field_element['.$i.']: '.$field_element[$i].'<br
/>'; }
}
}
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetch_header_element: field_element:
'.serialize($field_element).'<br><br><br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetch_header_element<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetch_header_element: field_element: '.serialize($field_element).'<br /><br
/><br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetch_header_element<br />'; }
return $field_element;
}
@@ -519,21 +519,21 @@
function fetchstructure($stream_notused,$msg_num,$flags="")
{
// outer control structure for the multi-pass functions
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetchstructure<br />'; }
// do we have a cached fetchstructure ?
if (($this->msg_structure != '')
&& ((int)$this->msg_structure_msgnum ==
(int)($msg_num)))
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetchstructure: using cached msg_structure data<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetchstructure: using cached msg_structure data<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fetchstructure<br />'; }
return $this->msg_structure;
}
// NO cached fetchstructure data - so make it
// this will fill $this->msg_structure *TopLevel* only
if
($this->fill_toplevel_fetchstructure($stream_notused,$msg_num,$flags) == False)
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fetchstructure with Error from Toplevel<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fetchstructure with Error from Toplevel<br />'; }
return False;
}
// by now we have these created and stored (cached)
@@ -555,14 +555,14 @@
if (count($this->msg_structure->parts[$i]) > 0)
{
// grap 3rd level embedded data (if any)
- if ($this->debug_dcom >= 2) { echo
'pop3: fetchstructure: attempting ['.$i.'] 3rd level parts embedded
discovery<br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: fetchstructure: attempting ['.$i.'] 3rd level parts embedded
discovery<br />'; }
// --- Create 3rd Level Sub-Parts
FetchStructure Data (if necessary) ---
// NOTE: param to
create_embeded_fetchstructure is a REFERENCE
$this->create_embeded_fetchstructure(&$this->msg_structure->parts[$i]);
}
else
{
- if ($this->debug_dcom >= 2) { echo
'pop3: fetchstructure: this ['.$i.'] 3rd level part is empty<br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: fetchstructure: this ['.$i.'] 3rd level part is empty<br />'; }
}
}
*/
@@ -582,7 +582,7 @@
for ($lev_1=0; $lev_1 <
count($this->msg_structure->parts) ;$lev_1++)
{
// grap 1st level embedded data (if any)
- if ($this->debug_dcom >= 2) { echo
'<br>***<br>* * * * * * * * *<br>pop3: fetchstructure: attempting
this->msg_structure->parts['.$lev_1.'] of
['.(string)(count($this->msg_structure->parts)-1).'] embedded parts discovery *
* * * *<br>'; }
+ if ($this->debug_dcom >= 2) { echo '<br
/>***<br />* * * * * * * * *<br />pop3: fetchstructure: attempting
this->msg_structure->parts['.$lev_1.'] of
['.(string)(count($this->msg_structure->parts)-1).'] embedded parts discovery *
* * * *<br />'; }
// Create Sub-Parts FetchStructure Data
(if necessary) ---
// NOTE: param to
create_embeded_fetchstructure is a REFERENCE
$this->create_embeded_fetchstructure(&$this->msg_structure->parts[$lev_1]);
@@ -594,7 +594,7 @@
for ($lev_2=0; $lev_2 <
count($tmp_lev_1->parts) ;$lev_2++)
{
// grap 2nd level
embedded data (if any)
- if ($this->debug_dcom
>= 2) { echo '<br>***<br>* * * * * * * * *<br>pop3: fetchstructure: attempting
this->msg_structure->parts['.$lev_1.']->parts['.$lev_2.'] of
['.(string)(count($tmp_lev_1->parts)-1).'] embedded parts discovery * * * *
*<br>'; }
+ if ($this->debug_dcom
>= 2) { echo '<br />***<br />* * * * * * * * *<br />pop3: fetchstructure:
attempting this->msg_structure->parts['.$lev_1.']->parts['.$lev_2.'] of
['.(string)(count($tmp_lev_1->parts)-1).'] embedded parts discovery * * * *
*<br />'; }
// Create Sub-Parts
FetchStructure Data (if necessary) ---
// NOTE: param to
create_embeded_fetchstructure is a REFERENCE
$this->create_embeded_fetchstructure(&$tmp_lev_1->parts[$lev_2]);
@@ -606,7 +606,7 @@
for ($lev_3=0;
$lev_3 < count($tmp_lev_2->parts) ;$lev_3++)
{
// grap
3rd level embedded data (if any)
- if
($this->debug_dcom >= 2) { echo '<br>***<br>* * * * * * * * *<br>pop3:
fetchstructure: attempting
this->msg_structure->parts['.$lev_1.']->parts['.$lev_2.']->parts['.$lev_3.'] of
['.(string)(count($tmp_lev_2->parts)-1).'] embedded parts discovery * * * *
*<br>'; }
+ if
($this->debug_dcom >= 2) { echo '<br />***<br />* * * * * * * * *<br />pop3:
fetchstructure: attempting
this->msg_structure->parts['.$lev_1.']->parts['.$lev_2.']->parts['.$lev_3.'] of
['.(string)(count($tmp_lev_2->parts)-1).'] embedded parts discovery * * * *
*<br />'; }
//
Create 3rd Level Sub-Parts FetchStructure Data (if necessary) ---
//
NOTE: param to create_embeded_fetchstructure is a REFERENCE
$this->create_embeded_fetchstructure(&$tmp_lev_2->parts[$lev_3]);
@@ -618,7 +618,7 @@
for ($lev_4=0; $lev_4 < count($tmp_lev_3->parts) ;$lev_4++)
{
// grap 3rd level embedded data (if any)
-
if ($this->debug_dcom >= 2) { echo '<br>***<br>* * * * * * * *
*<br>pop3: fetchstructure: attempting
this->msg_structure->parts['.$lev_1.']->parts['.$lev_2.']->parts['.$lev_3.']->parts['.$lev_4.']
of ['.(string)(count($tmp_lev_3->parts)-1).'] embedded parts discovery * * * *
*<br>'; }
+
if ($this->debug_dcom >= 2) { echo '<br />***<br />* * * * * * * * *<br
/>pop3: fetchstructure: attempting
this->msg_structure->parts['.$lev_1.']->parts['.$lev_2.']->parts['.$lev_3.']->parts['.$lev_4.']
of ['.(string)(count($tmp_lev_3->parts)-1).'] embedded parts discovery * * * *
*<br />'; }
// Create Sub-Parts FetchStructure Data (if necessary) ---
// NOTE: param to create_embeded_fetchstructure is a REFERENCE
$this->create_embeded_fetchstructure(&$tmp_lev_3->parts[$lev_4]);
@@ -626,37 +626,37 @@
}
else
{
-
if ($this->debug_dcom >= 2) { echo '<br>***<br>pop3: fetchstructure: Traversal
SKIP FOUTRH PASS level parts NOT SET<br>'; }
+
if ($this->debug_dcom >= 2) { echo '<br />***<br />pop3: fetchstructure:
Traversal SKIP FOUTRH PASS level parts NOT SET<br />'; }
}
}
}
else
{
- if
($this->debug_dcom >= 2) { echo '<br>***<br>pop3: fetchstructure: Traversal
SKIP THIRD PASS level parts NOT SET<br>'; }
+ if
($this->debug_dcom >= 2) { echo '<br />***<br />pop3: fetchstructure: Traversal
SKIP THIRD PASS level parts NOT SET<br />'; }
}
}
}
else
{
- if ($this->debug_dcom >= 2) {
echo '<br>***<br>pop3: fetchstructure: Traversal SKIP SECOND PASS level parts
NOT SET<br>'; }
+ if ($this->debug_dcom >= 2) {
echo '<br />***<br />pop3: fetchstructure: Traversal SKIP SECOND PASS level
parts NOT SET<br />'; }
}
}
}
else
{
- if ($this->debug_dcom >= 2) { echo 'pop3:
fetchstructure: Traversal SKIP FIRST PARTS level parts NOT SET<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
fetchstructure: Traversal SKIP FIRST PARTS level parts NOT SET<br />'; }
}
- if ($this->debug_dcom >= 2) { echo '<br>***<br>pop3:
fetchstructure: * * * * * * Traversal OVER * * * * * * * * * * <br>'; }
+ if ($this->debug_dcom >= 2) { echo '<br />***<br
/>pop3: fetchstructure: * * * * * * Traversal OVER * * * * * * * * * * <br />';
}
if ($this->debug_dcom >= 2)
{
- echo '<br>dumping fetchstructure FINAL data:
<br>';
+ echo '<br />dumping fetchstructure FINAL data:
<br />';
var_dump($this->msg_structure);
- echo '<br><br><br>';
+ echo '<br /><br /><br />';
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetchstructure<br />'; }
return $this->msg_structure;
}
@@ -673,7 +673,7 @@
*/
function
fill_toplevel_fetchstructure($stream_notused,$msg_num,$flags="")
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fill_toplevel_fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fill_toplevel_fetchstructure<br />'; }
// --- Header Array ---
$header_array =
$this->get_header_array($stream_notused,$msg_num,$flags);
@@ -682,7 +682,7 @@
if ((count($this->body_array) > 0)
&& ((int)$this->body_array_msgnum == (int)($msg_num)))
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
fill_toplevel_fetchstructure: using cached body_array data<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fill_toplevel_fetchstructure: using cached body_array data<br />'; }
$body_array = $this->body_array;
}
else
@@ -699,20 +699,20 @@
{
echo '+['.$i.']
'.htmlspecialchars($this->body_array[$i])."\r\n";
}
- echo '</pre><br><br>';
+ echo '</pre><br /><br />';
}
}
if ($this->debug_dcom >= 2)
{
- echo 'pop3: fill_toplevel_fetchstructure
header_array iteration:<br>';
+ echo 'pop3: fill_toplevel_fetchstructure
header_array iteration:<br />';
for($i=0;$i < count($header_array);$i++)
{
- echo
'+'.htmlspecialchars($header_array[$i]).'<br>';
+ echo
'+'.htmlspecialchars($header_array[$i]).'<br />';
}
}
if (!$header_array)
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fill_toplevel_fetchstructure with error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fill_toplevel_fetchstructure with error<br />'; }
return False;
}
@@ -732,7 +732,7 @@
if (!$this->msg2socket('LIST
'.$msg_num,"^\+ok",&$response))
{
$this->error();
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fill_toplevel_fetchstructure with error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving fill_toplevel_fetchstructure with error<br />'; }
return False;
}
$list_response = explode(' ',$response);
@@ -771,11 +771,11 @@
$this->unset_unfilled_fetchstructure(&$this->msg_structure);
if ($this->debug_dcom >= 2)
{
- echo '<br>dumping fill_toplevel_fetchstructure
TOP-LEVEL data: <br>';
+ echo '<br />dumping
fill_toplevel_fetchstructure TOP-LEVEL data: <br />';
var_dump($this->msg_structure);
- echo '<br><br><br>';
+ echo '<br /><br /><br />';
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fill_toplevel_fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fill_toplevel_fetchstructure<br />'; }
return True;
}
@@ -790,7 +790,7 @@
*/
function create_embeded_fetchstructure($info)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
create_embeded_fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
create_embeded_fetchstructure<br />'; }
// --- Do We Have SubParts To Discover ---
// Test 1: Detect Boundary Paramaters
@@ -815,14 +815,14 @@
&& (count($info->parts) == 0))
{
// Boundry Based Multi-Part MIME In Need Of
Discovered
- if ($this->debug_dcom >= 1) { echo 'pop3:
create_embeded_fetchstructure: Discovery Needed for boundary param:
'.$info->custom['my_cookie'].'<br>'; }
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: begin "mime loop", iterate thru body_array<br>';
}
+ if ($this->debug_dcom >= 1) { echo 'pop3:
create_embeded_fetchstructure: Discovery Needed for boundary param:
'.$info->custom['my_cookie'].'<br />'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: begin "mime loop", iterate thru body_array<br
/>'; }
// look for any parts using this boundary/cookie
for ($x=0; $x < count($this->body_array) ;$x++)
{
// search line by line thru the body
$body_line = $this->body_array[$x];
- if ($this->debug_dcom >= 2) { echo
'pop3: create_embeded_fetchstructure: mime loop ['.$x.']:
'.htmlspecialchars($body_line).'<br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: create_embeded_fetchstructure: mime loop ['.$x.']:
'.htmlspecialchars($body_line).'<br />'; }
if
((strstr($body_line,'--'.$info->custom['my_cookie']))
&&
(strpos($body_line,'--'.$info->custom['my_cookie']) == 0)
// but NOT the final boundary
@@ -849,7 +849,7 @@
$tmp_cur_part_idx->custom['part_end'] = $x-1;
// --Lines-- we know
beginning line and ending line, so calculate # lines for this part
$tmp_cur_part_idx->lines = (int)$tmp_cur_part_idx->custom['part_end'] -
(int)$tmp_cur_part_idx->custom['part_start'];
- if ($this->debug_dcom
>= 2) { echo 'pop3: create_embeded_fetchstructure: mime loop: current part end
at ['.(string)($x-1).'] byte cumula: ['.$tmp_cur_part_idx->bytes.'] lines:
['.$tmp_cur_part_idx->lines.']<br>'; }
+ if ($this->debug_dcom
>= 2) { echo 'pop3: create_embeded_fetchstructure: mime loop: current part end
at ['.(string)($x-1).'] byte cumula: ['.$tmp_cur_part_idx->bytes.'] lines:
['.$tmp_cur_part_idx->lines.']<br />'; }
// this individual part
has completed discovery, it os now "OUT"
$tmp_cur_part_idx->custom['detect_state'] = 'out';
// we are DONE with
this part for now
@@ -860,7 +860,7 @@
unset($tmp_cur_part_idx);
}
// so now deal with this NEW
part we just discovered
- if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop: begin part
discovery<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop: begin part discovery<br
/>'; }
// Create New Sub Part Object
$new_part_idx =
count($info->parts);
$info->parts[$new_part_idx] =
new msg_structure;
@@ -882,7 +882,7 @@
{
// grap this
part header line
$part_header_blob .= $this->body_array[$y]."\r\n";
- if
($this->debug_dcom >= 2) { echo 'pop3: create_embeded_fetchstructure: mime
loop: part part_header_blob line['.$y.']: '.$this->body_array[$y].'<br>'; }
+ if
($this->debug_dcom >= 2) { echo 'pop3: create_embeded_fetchstructure: mime
loop: part part_header_blob line['.$y.']: '.$this->body_array[$y].'<br />'; }
}
else
{
@@ -903,7 +903,7 @@
// make the header blob into an
array of strings, one array element per header line, throw away blank lines
$part_header_array = Array();
$part_header_array =
$this->glob_to_array($part_header_blob, False, '', True);
- if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop:
part_header_array:'.serialize($part_header_array).'<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop:
part_header_array:'.serialize($part_header_array).'<br />'; }
// since we just passed the
headers, and this is NOT a final boundary
// this MUST be a start point
for the next part
$tmp_new_part_idx->custom['part_start'] = (int)($y+1);
@@ -914,7 +914,7 @@
unset($tmp_new_part_idx);
// ADVANCE INDEX $x TO AFTER
WHAT WE'VE ALREADY LOOKED AT
- if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop: advance x from ['.$x.']
to ['.$y.']<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop: advance x from ['.$x.']
to ['.$y.']<br />'; }
$x = $y;
}
elseif
((strstr($body_line,'--'.$info->custom['my_cookie'].'--'))
@@ -931,7 +931,7 @@
$tmp_cur_part_idx->lines =
$tmp_cur_part_idx->custom['part_end'] - $tmp_cur_part_idx->custom['part_start'];
$tmp_cur_part_idx->custom['detect_state'] = 'out';
// we are DONE with this part
for now
- if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop: final boundary at
['.(string)($x-1).'] byte cumula: ['.$tmp_cur_part_idx->bytes.'] lines:
['.$tmp_cur_part_idx->lines.']<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: create_embeded_fetchstructure: mime loop: final boundary at
['.(string)($x-1).'] byte cumula: ['.$tmp_cur_part_idx->bytes.'] lines:
['.$tmp_cur_part_idx->lines.']<br />'; }
// unset any unfilled elements
// NOTE: param to
unset_unfilled_fetchstructure is a REFERENCE
$this->unset_unfilled_fetchstructure(&$tmp_cur_part_idx);
@@ -968,7 +968,7 @@
&& (count($info->parts) == 0))
{
// Encapsulated "message/rfc822" MIME Part In
Need Of Discovered
- if ($this->debug_dcom >= 1) { echo 'pop3:
create_embeded_fetchstructure: Discovery Needed for Encapsulated
"message/rfc822" MIME Part<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
create_embeded_fetchstructure: Discovery Needed for Encapsulated
"message/rfc822" MIME Part<br />'; }
$range_start = $info->custom['part_start'];
$range_end = $info->custom['part_end'];
// is this range data valid
@@ -976,12 +976,12 @@
|| (!isset($info->custom['part_end']))
|| ($info->custom['part_end'] <=
$info->custom['part_start']))
{
- if ($this->debug_dcom >= 1) { echo
'pop3: Leaving create_embeded_fetchstructure with Error in "message/rfc2822"
range<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: Leaving create_embeded_fetchstructure with Error in "message/rfc2822"
range<br />'; }
return False;
}
// note that below we will iterate thru this
range
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: "mime loop", will iterate thru parents
body_array range ['.$range_start.'] to ['.$range_end.']<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: "mime loop", will iterate thru parents
body_array range ['.$range_start.'] to ['.$range_end.']<br />'; }
// encapsulated is not that tricky, we must so
this
// 1) Create New Sub Part Object
@@ -1006,7 +1006,7 @@
{
// grap this part header line
$part_header_blob .=
$this->body_array[$y]."\r\n";
- if ($this->debug_dcom >= 2) {
echo 'pop3: enc mime loop: part part_header_blob line['.$y.']:
'.htmlspecialchars($this->body_array[$y]).'<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: enc mime loop: part part_header_blob line['.$y.']:
'.htmlspecialchars($this->body_array[$y]).'<br />'; }
}
else
{
@@ -1027,7 +1027,7 @@
// make the header blob into an array of
strings, one array element per header line, throw away blank lines
$part_header_array = Array();
$part_header_array =
$this->glob_to_array($part_header_blob, False, '', True);
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: enc mime loop:
part_header_array:'.serialize($part_header_array).'<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: enc mime loop:
part_header_array:'.serialize($part_header_array).'<br />'; }
// 2) Feed these Headers thru
"sub_get_structure"
// fill the conventional info on this
fetchstructure sub-part
@@ -1044,7 +1044,7 @@
if ((!isset($tmp_enc_part_idx->subtype))
|| ((string)$tmp_enc_part_idx->subtype == ''))
{
- if ($this->debug_dcom >= 2) { echo
'pop3: create_embeded_fetchstructure: enc mime loop: CONTROVERSIAL uwash
imitation: adding subtype "plain" to immediate RFC822 child part, none was
specified<br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: create_embeded_fetchstructure: enc mime loop: CONTROVERSIAL uwash
imitation: adding subtype "plain" to immediate RFC822 child part, none was
specified<br />'; }
$tmp_enc_part_idx->ifsubtype = True;
$tmp_enc_part_idx->subtype = 'plain';
}
@@ -1066,7 +1066,7 @@
// do that crappy adding of charset param if
necessary
if ($found_charset == False)
{
- if ($this->debug_dcom >= 2) { echo
'pop3: create_embeded_fetchstructure: enc mime loop: CONTROVERSIAL uwash
imitation: adding param "charset=US-ASCII" to immediate RFC822 child part, none
was specified<br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: create_embeded_fetchstructure: enc mime loop: CONTROVERSIAL uwash
imitation: adding param "charset=US-ASCII" to immediate RFC822 child part, none
was specified<br />'; }
$new_idx =
count($tmp_enc_part_idx->parameters);
$tmp_enc_part_idx->parameters[$new_idx]
= new msg_params('charset','US-ASCII');
$tmp_enc_part_idx->ifparameters = true;
@@ -1082,12 +1082,12 @@
// 4) calculate byte size and # of lines of the
content within this parts start and end
$my_start =
$tmp_enc_part_idx->custom['part_start'];
$my_end = $tmp_enc_part_idx->custom['part_end'];
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: enc mime loop: this body range ['.$my_start.']
to ['.$my_end.']<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: enc mime loop: this body range ['.$my_start.']
to ['.$my_end.']<br />'; }
for ($x=$my_start; $x < $my_end+1 ;$x++)
{
// running byte size of this part
$body_line = $this->body_array[$x];
- if ($this->debug_dcom >= 2) { echo
'pop3: encap mime size loop ['.$x.']: '.htmlspecialchars($body_line).'<br>'; }
+ if ($this->debug_dcom >= 2) { echo
'pop3: encap mime size loop ['.$x.']: '.htmlspecialchars($body_line).'<br />'; }
// prevoius count
$prev_bytes = $tmp_enc_part_idx->bytes;
// add new count, +2 for the \r\n that
will end the line when we feed it to the client
@@ -1100,7 +1100,7 @@
$tmp_enc_part_idx->lines = $my_end - $my_start;
// we're done with the loop so the bytes have
been calculated in that loop
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: this part range byte size
['.$tmp_enc_part_idx->bytes.'] lines: ['.$tmp_enc_part_idx->lines.']<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: this part range byte size
['.$tmp_enc_part_idx->bytes.'] lines: ['.$tmp_enc_part_idx->lines.']<br />'; }
$info->parts[$enc_part_idx] = $tmp_enc_part_idx;
unset($tmp_enc_part_idx);
}
@@ -1112,18 +1112,18 @@
&& (count($info->parts) == 0))
{
// do NOTHING - this level has ALREADY been
filled
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: feed info encapsulated "message/rfc822" ALREADY
filled<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: feed info encapsulated "message/rfc822" ALREADY
filled<br />'; }
return False;
}
elseif ($info->custom['my_cookie'] == '')
{
// do NOTHING - this is NOT multipart
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: feed info not multipart<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: feed info not multipart<br />'; }
if ($this->debug_dcom >= 2)
{
- echo 'pop3:
create_embeded_fetchstructure: feed info not multipart DUMP EXAMINE:<br>';
+ echo 'pop3:
create_embeded_fetchstructure: feed info not multipart DUMP EXAMINE:<br />';
var_dump($info);
- echo '<br><br>';
+ echo '<br /><br />';
}
return False;
}
@@ -1131,20 +1131,20 @@
&& (count($info->parts) > 0))
{
// do NOTHING - this level has ALREADY been
filled
- if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: feed info multipart ALREADY filled<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
create_embeded_fetchstructure: feed info multipart ALREADY filled<br />'; }
return False;
}
else
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
create_embeded_fetchstructure: * * no mans land * *<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
create_embeded_fetchstructure: * * no mans land * *<br />'; }
}
//if ($this->debug_dcom >= 2)
//{
- // echo '<br>dumping create_embeded_fetchstructure
return info: <br>';
+ // echo '<br />dumping
create_embeded_fetchstructure return info: <br />';
// var_dump($info);
- // echo '<br><br>';
+ // echo '<br /><br />';
//}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
create_embeded_fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
create_embeded_fetchstructure<br />'; }
return True;
}
@@ -1170,7 +1170,7 @@
$debug_mime = False;
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
sub_get_structure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
sub_get_structure<br />'; }
/*
// initialize the structure
$info->custom['top_level'] = $extra_args['top_level'];
@@ -1187,7 +1187,7 @@
for ($i=0; $i < count($header_array) ;$i++)
{
$pos = strpos($header_array[$i],' ');
- //if ($debug_mime) { echo
'header_array['.$i.']: '.$header_array[$i].'<br>'; }
+ //if ($debug_mime) { echo
'header_array['.$i.']: '.$header_array[$i].'<br />'; }
if (is_int($pos) && ($pos==0))
{
continue;
@@ -1196,9 +1196,9 @@
$content =
trim(substr($header_array[$i],$pos+1));
if ($debug_mime)
{
- //echo 'pos: '.$pos.'<br>';
+ //echo 'pos: '.$pos.'<br />';
echo 'pop3: sub_get_structure: keyword:
['.htmlspecialchars($keyword).']'
- .' content:
['.htmlspecialchars($content).']<br>';
+ .' content:
['.htmlspecialchars($content).']<br />';
}
switch ($keyword)
{
@@ -1210,10 +1210,10 @@
$pos_param = strpos($content,';');
if ($pos_param > 0)
{
- if ($this->debug_dcom >= 2) {
echo 'pop3: sub_get_structure: apparent params exist in content
['.$content.']<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: sub_get_structure: apparent params exist in content
['.$content.']<br />'; }
// feed the whole param line
into this function
$content =
substr($content,$pos_param+1);
- if ($this->debug_dcom >= 2) {
echo 'pop3: sub_get_structure: calling parse_msg_params, feeding content
['.$content.']<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: sub_get_structure: calling parse_msg_params, feeding content
['.$content.']<br />'; }
// False = this is NOT a
disposition param, this is the more common regular param
// NOTE: first param to
parse_msg_params is a REFERENCE
$this->parse_msg_params(&$info,$content,False);
@@ -1282,9 +1282,9 @@
if ($this->debug_dcom >= 2)
{
- echo 'pop3: sub_get_structure: info->encoding
['.(string)$info->encoding.'] (if empty here it will get a default value
later)<br>';
+ echo 'pop3: sub_get_structure: info->encoding
['.(string)$info->encoding.'] (if empty here it will get a default value
later)<br />';
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
sub_get_structure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
sub_get_structure<br />'; }
return $info;
}
@@ -1301,7 +1301,7 @@
*/
function unset_unfilled_fetchstructure($info)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
unset_unfilled_fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
unset_unfilled_fetchstructure<br />'; }
// unset any unfilled elements, ALWAYS leave parts and
custom
if ((string)$info->type == '')
{
@@ -1361,7 +1361,7 @@
}
//$info->custom = array();
//$info->parts = array();
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
unset_unfilled_fetchstructure<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
unset_unfilled_fetchstructure<br />'; }
}
/*!
@@ -1377,7 +1377,7 @@
*/
function parse_type_subtype($info,$content)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
parse_type_subtype<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
parse_type_subtype<br />'; }
// used by pop_fetchstructure only
// get rid of any other params that might be here
$pos = strpos($content,';');
@@ -1397,7 +1397,7 @@
{
$prim_type = strtolower($content);
}
- if ($this->debug_dcom >= 2) { echo 'pop3:
parse_type_subtype: prim_type: '.$prim_type.'<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
parse_type_subtype: prim_type: '.$prim_type.'<br />'; }
$info->type = $this->type_str_to_int($prim_type);
if ($info->ifsubtype == False)
{
@@ -1407,11 +1407,11 @@
}
if ($this->debug_dcom >= 2)
{
- echo 'pop3: parse_type_subtype: info->type
['.$info->type.'] aka "'.$this->type_int_to_str($info->type).'"<br>';
- echo 'pop3: parse_type_subtype: info->ifsubtype
['.$info->ifsubtype.']<br>';
- echo 'pop3: parse_type_subtype: info->subtype
"'.$info->subtype.'"<br>';
+ echo 'pop3: parse_type_subtype: info->type
['.$info->type.'] aka "'.$this->type_int_to_str($info->type).'"<br />';
+ echo 'pop3: parse_type_subtype: info->ifsubtype
['.$info->ifsubtype.']<br />';
+ echo 'pop3: parse_type_subtype: info->subtype
"'.$info->subtype.'"<br />';
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
parse_type_subtype<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
parse_type_subtype<br />'; }
}
/*!
@@ -1431,9 +1431,9 @@
function
parse_msg_params($info,$content,$is_disposition_param=False)
{
if ($this->debug_dcom >= 2) {
- //echo 'pop3: *in parse_msg_params<br>';
- echo 'pop3: *in parse_msg_params: content
['.$content.']<br>';
- echo 'pop3: *in parse_msg_params:
is_disposition_param ['.(string)$is_disposition_param.']<br>';
+ //echo 'pop3: *in parse_msg_params<br />';
+ echo 'pop3: *in parse_msg_params: content
['.$content.']<br />';
+ echo 'pop3: *in parse_msg_params:
is_disposition_param ['.(string)$is_disposition_param.']<br />';
}
// bogus data detection
if (trim($content) == '')
@@ -1601,7 +1601,7 @@
*/
function size_msg($stream_notused,$msg_num)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
size_msg<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
size_msg<br />'; }
if (!$this->msg2socket('LIST
'.$msg_num,"^\+ok",&$response))
{
$this->error();
@@ -1610,8 +1610,8 @@
$list_response = explode(' ',$response);
$return_size = trim($list_response[2]);
$return_size = (int)$return_size * 1;
- if ($this->debug_dcom >= 1) { echo 'pop3: size_msg:
'.$return_size.'<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
size_msg<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: size_msg:
'.$return_size.'<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
size_msg<br />'; }
return $return_size;
}
@@ -1633,14 +1633,14 @@
*/
function
header($stream_notused,$msg_num,$fromlength='',$tolength='',$defaulthost='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
header<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
header<br />'; }
$info = new hdr_info_envelope;
$info->Size = $this->size_msg($stream_notused,$msg_num);
$info->size = $info->Size;
$header_array =
$this->get_header_array($stream_notused,$msg_num);
if (!$header_array)
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving header with error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving header with error<br />'; }
return False;
}
for ($i=0; $i < count($header_array); $i++)
@@ -1730,7 +1730,7 @@
}
if ($this->debug_dcom >= 1)
{
- echo 'pop3: Leaving header<br>';
+ echo 'pop3: Leaving header<br />';
}
return $info;
}
@@ -1748,7 +1748,7 @@
*/
function get_addr_details($people,$address,$header,$count)
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_addr_details<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_addr_details<br />'; }
if (!trim($address))
{
return False;
@@ -1873,7 +1873,7 @@
*/
function delete($stream_notused,$msg_num,$flags="")
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
delete<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
delete<br />'; }
// in PHP 4 msg_num can be
// a) an integer referencing a single message
// b1) a comma seperated list of message numbers "1,2,6"
@@ -1886,7 +1886,7 @@
for($i=0;$i < count($tmp_array);$i++)
{
$this_element = (string)$tmp_array[$i];
- if ($this->debug_dcom >= 2) { echo 'pop3:
delete prep: this_element: '.$this_element.'<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
delete prep: this_element: '.$this_element.'<br />'; }
$this_element = trim($this_element);
// do nothing if this is an empty array element
if ($this_element != '')
@@ -1912,7 +1912,7 @@
// add to the
msg_num_array
$new_idx =
count($msg_num_array);
$msg_num_array[$new_idx] = (int)$z;
- if ($this->debug_dcom
>= 2) { echo 'pop3: delete prep: range: msg_num_array['.$new_idx.'] =
'.$z.'<br>'; }
+ if ($this->debug_dcom
>= 2) { echo 'pop3: delete prep: range: msg_num_array['.$new_idx.'] = '.$z.'<br
/>'; }
}
}
else
@@ -1921,7 +1921,7 @@
// add to the msg_num_array
$new_idx =
count($msg_num_array);
$msg_num_array[$new_idx] =
(int)$this_element;
- if ($this->debug_dcom >= 2) {
echo 'pop3: delete prep: msg_num_array['.$new_idx.'] = '.$this_element.'<br>'; }
+ if ($this->debug_dcom >= 2) {
echo 'pop3: delete prep: msg_num_array['.$new_idx.'] = '.$this_element.'<br
/>'; }
}
}
}
@@ -1929,18 +1929,18 @@
for($i=0;$i < count($msg_num_array);$i++)
{
$this_msg_num = $msg_num_array[$i];
- if ($this->debug_dcom >= 2) { echo 'pop3:
delete: deleting this_msg_num '.$this_msg_num.'<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3:
delete: deleting this_msg_num '.$this_msg_num.'<br />'; }
if (!$this->msg2socket('DELE
'.$this_msg_num,"^\+ok",&$response))
{
$this->error();
- if ($this->debug_dcom >= 1) { echo
'pop3: Leaving delete with error deleting msgnum '.$this_msg_num.'<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: Leaving delete with error deleting msgnum '.$this_msg_num.'<br />'; }
return False;
}
}
// these messages are now marked for deletion by the
POP3 server
// they will be expunged when user sucessfully
explicitly logs out
// if we make it here I have to assume no errors
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
delete<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
delete<br />'; }
return True;
}
@@ -1962,7 +1962,7 @@
function fetchheader($stream_notused,$msg_num,$flags='')
{
// NEEDED: code for flags: FT_UID; FT_INTERNAL;
FT_PREFETCHTEXT
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetchheader<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetchheader<br />'; }
$header_glob =
$this->get_header_raw($stream_notused,$msg_num,$flags);
@@ -1975,7 +1975,7 @@
.$this->get_body($stream_notused,$msg_num,$flags);
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetchheader<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetchheader<br />'; }
return $header_glob;
}
@@ -1993,12 +1993,12 @@
*/
function get_header_array($stream_notused,$msg_num,$flags='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_header_array<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_header_array<br />'; }
// do we have a cached header_array ?
if ((count($this->header_array) > 0)
&& ((int)$this->header_array_msgnum == (int)($msg_num)))
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_array returning cached data<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_array returning cached data<br />'; }
return $this->header_array;
}
// NO cached data, get it
@@ -2014,7 +2014,7 @@
// cache this data for future use
$this->header_array = $header_array;
$this->header_array_msgnum = (int)($msg_num);
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
get_header_array<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
get_header_array<br />'; }
return $header_array;
}
@@ -2032,33 +2032,33 @@
*/
function get_header_raw($stream_notused,$msg_num,$flags='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_header_raw<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_header_raw<br />'; }
if ((!isset($msg_num))
|| (trim((string)$msg_num) == ''))
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_raw with error: Invalid msg_num<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_raw with error: Invalid msg_num<br />'; }
return False;
}
// do we have a cached header_glob ?
if (($this->header_glob != '')
&& ((int)$this->header_glob_msgnum == (int)($msg_num)))
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_raw returning cached data<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_raw returning cached data<br />'; }
return $this->header_glob;
}
// NO cached data, get it
- if ($this->debug_dcom >= 1) { echo 'pop3:
get_header_raw: issuing: TOP '.$msg_num.' 0 <br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
get_header_raw: issuing: TOP '.$msg_num.' 0 <br />'; }
if (!$this->msg2socket('TOP '.$msg_num.'
0',"^\+ok",&$response))
{
$this->error();
- if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_raw with error<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
Leaving get_header_raw with error<br />'; }
return False;
}
$glob = $this->read_port_glob('.');
// save this info for future ues
$this->header_glob = $glob;
$this->header_glob_msgnum = (int)$msg_num;
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
get_header_raw<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
get_header_raw<br />'; }
return $glob;
}
@@ -2091,19 +2091,19 @@
*/
function
fetchbody($stream_notused,$msg_num,$part_num='',$flags='')
{
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetchbody<br>'; }
- if ($this->debug_dcom >= 1) { echo 'pop3: fetchbody:
attempt to return part '.$part_num.'<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
fetchbody<br />'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: fetchbody:
attempt to return part '.$part_num.'<br />'; }
// totally under construction
// FORCE a pass thru fetchstructure to ENSURE all
necessary data is present and cached
- if ($this->debug_dcom >= 2) { echo 'pop3: fetchbody:
force a pass thru fetchstructure to ensure necessary data is present and
cached<br>'; }
+ if ($this->debug_dcom >= 2) { echo 'pop3: fetchbody:
force a pass thru fetchstructure to ensure necessary data is present and
cached<br />'; }
$bogus_data =
$this->fetchstructure($stream_notused,$msg_num,$flags);
// EXTREMELY BASIC part handling
// handle request for top level message headers
if ((int)$part_num == 0)
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody: returning top-level headers, part '.$part_num.', internally
['.$the_part.']<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody: returning top-level headers, part '.$part_num.', internally
['.$the_part.']<br />'; }
// grab the headers, as a glob, i.e. a string
NOT an array
$header_glob =
$this->get_header_raw($stream_notused,$msg_num,'');
// put this data in the var we will return below
@@ -2116,16 +2116,16 @@
$the_part = (int)$part_num;
$the_part = $the_part - 1;
// return part one
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody: returning part '.$part_num.', internally ['.$the_part.']<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody: returning part '.$part_num.', internally ['.$the_part.']<br />'; }
$tmp_msg_structure_parts =
$this->msg_structure->parts[$the_part];
if
((address@hidden($tmp_msg_structure_parts->custom['part_start']))
||
(!isset($tmp_msg_structure_parts->custom['part_start'])))
{
- if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: ERROR: required part data not present for '.$part_num.',
internally ['.$the_part.']<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: ERROR: required part data not present for '.$part_num.',
internally ['.$the_part.']<br />'; }
// screw it, just return the whole thing
- if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody - using fallback pass thru<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody - using fallback pass thru<br />'; }
$body_blob =
$this->get_body($stream_notused,$msg_num,$flags,False);
}
else
@@ -2133,7 +2133,7 @@
// attempt to make the part
$part_start =
(int)$tmp_msg_structure_parts->custom['part_start'];
$part_end =
(int)$tmp_msg_structure_parts->custom['part_end'];
- if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: returning part '.$part_num.' starts ['.$part_start.'] ends
['.$part_end.']<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: returning part '.$part_num.' starts ['.$part_start.'] ends
['.$part_end.']<br />'; }
// assemble the body [art part
$body_blob = '';
for($i=$part_start;$i <
$part_end+1;$i++)
@@ -2165,13 +2165,13 @@
$temp_part = $target_part;
}
// verify part data exists
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody: returning part '.$part_num.', internally
['.serialize($the_part_array).']<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody: returning part '.$part_num.', internally
['.serialize($the_part_array).']<br />'; }
if ((!isset($target_part->custom['part_start']))
|| (!isset($target_part->custom['part_start'])))
{
- if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: ERROR: required part data not present for '.$part_num.',
internally ['.serialize($the_part).']<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: ERROR: required part data not present for '.$part_num.',
internally ['.serialize($the_part).']<br />'; }
// screw it, just return the whole thing
- if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody - using fallback pass thru<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody - using fallback pass thru<br />'; }
$body_blob =
$this->get_body($stream_notused,$msg_num,$flags,False);
}
else
@@ -2179,7 +2179,7 @@
// attempt to make the part
$part_start =
(int)$target_part->custom['part_start'];
$part_end =
(int)$target_part->custom['part_end'];
- if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: returning part '.$part_num.' starts ['.$part_start.'] ends
['.$part_end.']<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: fetchbody: returning part '.$part_num.' starts ['.$part_start.'] ends
['.$part_end.']<br />'; }
// assemble the body [art part
$body_blob = '';
for($i=$part_start;$i <
$part_end+1;$i++)
@@ -2191,12 +2191,12 @@
else
{
// screw it, just return the whole thing
- if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody - something is unsupported, using fallback pass thru<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
fetchbody - something is unsupported, using fallback pass thru<br />'; }
// the false arg here is a temporary, custom
option, says to NOT include the headers in the return
$body_blob =
$this->get_body($stream_notused,$msg_num,$flags,False);
}
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetchbody<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
fetchbody<br />'; }
return $body_blob;
}
@@ -2217,7 +2217,7 @@
function
get_body($stream_notused,$msg_num,$flags='',$phpgw_include_header=True)
{
// NEEDED: code for flags: FT_UID; maybe FT_INTERNAL;
FT_NOT; flag FT_PEEK has no effect on POP3
- if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_body<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Entering
get_body<br />'; }
// do we have a cached body_array ?
if ((count($this->body_array) > 0)
@@ -2226,7 +2226,7 @@
&& (count($this->header_array) > 0)
&& ((int)$this->header_array_msgnum == (int)($msg_num)))
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
get_body: using cached body_array and header_array data imploded into a
glob<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
get_body: using cached body_array and header_array data imploded into a glob<br
/>'; }
// implode the header_array into a glob
$header_glob =
implode("\r\n",$this->header_array);
// implode the body_array into a glob
@@ -2234,13 +2234,13 @@
}
else
{
- if ($this->debug_dcom >= 1) { echo 'pop3:
get_body: NO Cached Data<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3:
get_body: NO Cached Data<br />'; }
// NO cached data we can use
// issue command to retrieve body
if (!$this->msg2socket('RETR
'.$msg_num,"^\+ok",&$response))
{
$this->error();
- if ($this->debug_dcom >= 1) { echo
'pop3: Leaving get_body with error<br>'; }
+ if ($this->debug_dcom >= 1) { echo
'pop3: Leaving get_body with error<br />'; }
return False;
}
// --- Get Header ---
@@ -2274,13 +2274,13 @@
/*
if ($this->debug_dcom >= 2)
{
- echo 'pop3: get_body DUMP<br>= = = First DUMP:
header_glob<br>';
- echo
'<pre>'.htmlspecialchars($header_glob).'</pre><br><br>';
- echo 'pop3: get_body DUMP<br>= = = Second DUMP:
body_glob<br>';
- echo
'<pre>'.htmlspecialchars($body_glob).'</pre><br><br>';
+ echo 'pop3: get_body DUMP<br />= = = First
DUMP: header_glob<br />';
+ echo
'<pre>'.htmlspecialchars($header_glob).'</pre><br /><br />';
+ echo 'pop3: get_body DUMP<br />= = = Second
DUMP: body_glob<br />';
+ echo
'<pre>'.htmlspecialchars($body_glob).'</pre><br /><br />';
}
*/
- if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
get_body<br>'; }
+ if ($this->debug_dcom >= 1) { echo 'pop3: Leaving
get_body<br />'; }
return $body_glob;
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc/class.mail_dcom_pop3_sock.inc.php, 1.20.2.1,
nomail <=