[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: nntp/inc class.mail.inc.php,1.6.2.1,1.6.2.2 clas
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: nntp/inc class.mail.inc.php,1.6.2.1,1.6.2.2 class.nntp.inc.php,1.7,1.7.2.1 |
|
Date: |
Mon, 15 Apr 2002 00:02:58 -0400 |
Update of /cvsroot/phpgroupware/nntp/inc
In directory subversions:/tmp/cvs-serv14129/nntp/inc
Modified Files:
Tag: Version-0_9_14-branch
class.mail.inc.php class.nntp.inc.php
Log Message:
Hopefully cleared out the call-by-refernce warnings.
Index: class.mail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/nntp/inc/class.mail.inc.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** class.mail.inc.php 27 Jan 2002 00:34:59 -0000 1.6.2.1
--- class.mail.inc.php 15 Apr 2002 04:02:54 -0000 1.6.2.2
***************
*** 208,212 ****
function mode_reader()
{
! return $this->msg2socket('mode
reader',"^20[01]",&$response);
}
--- 208,212 ----
function mode_reader()
{
! return $this->msg2socket('mode
reader',"^20[01]",$response);
}
***************
*** 221,229 ****
if ($user <> '' && $pass <> '')
{
! if (!$this->msg2socket('authinfo user
'.$user,"^381",&$response))
{
return 0;
}
! if (!$this->msg2socket('authinfo pass
'.$pass,"^281",&$response))
{
return 0;
--- 221,229 ----
if ($user <> '' && $pass <> '')
{
! if (!$this->msg2socket('authinfo user
'.$user,"^381",$response))
{
return 0;
}
! if (!$this->msg2socket('authinfo pass
'.$pass,"^281",$response))
{
return 0;
***************
*** 236,240 ****
if(isset($this->mailbox) && $this->mailbox)
{
! return $this->msg2socket('group
'.$this->mailbox,"^211",&$response);
}
else
--- 236,240 ----
if(isset($this->mailbox) && $this->mailbox)
{
! return $this->msg2socket('group
'.$this->mailbox,"^211",$response);
}
else
***************
*** 249,253 ****
$expected_response = "^211";
! if
(!$this->msg2socket($str,$expected_response,&$response))
{
return 0;
--- 249,253 ----
$expected_response = "^211";
! if
(!$this->msg2socket($str,$expected_response,$response))
{
return 0;
***************
*** 263,267 ****
if ($this->type == 'nntp')
{
! if (!$this->msg2socket('group
'.$this->mailbox,"^211",&$response))
{
return 0;
--- 263,267 ----
if ($this->type == 'nntp')
{
! if (!$this->msg2socket('group
'.$this->mailbox,"^211",$response))
{
return 0;
***************
*** 278,282 ****
if ($this->type == 'nntp')
{
! if (!$this->msg2socket('group
'.$this->mailbox,"^211",&$response))
{
return 0;
--- 278,282 ----
if ($this->type == 'nntp')
{
! if (!$this->msg2socket('group
'.$this->mailbox,"^211",$response))
{
return 0;
***************
*** 289,293 ****
}
! function create_header($line,$header,$line2='')
{
$thead = explode(':',$line);
--- 289,293 ----
}
! function create_header($line,&$header,$line2='')
{
$thead = explode(':',$line);
***************
*** 340,344 ****
}
! if
(!$this->msg2socket($str,$expected_response,&$response))
{
return 0;
--- 340,344 ----
}
! if
(!$this->msg2socket($str,$expected_response,$response))
{
return 0;
***************
*** 351,355 ****
break;
}
!
$this->create_header($line,&$this->header,'True');
}
if ($this->type == 'pop')
--- 351,355 ----
break;
}
!
$this->create_header($line,$this->header,'True');
}
if ($this->type == 'pop')
***************
*** 372,376 ****
for ($i=0;$i<count($temp_array);$i++)
{
!
$this->decode->decode_author($temp_array[$i],&$email,&$name);
$temp = explode('@',$email);
$address[$i]->personal =
$this->decode->decode_header($name);
--- 372,376 ----
for ($i=0;$i<count($temp_array);$i++)
{
!
$this->decode->decode_author($temp_array[$i],$email,$name);
$temp = explode('@',$email);
$address[$i]->personal =
$this->decode->decode_header($name);
***************
*** 637,641 ****
}
! function split_uuencoded_into_parts($body,$boundary)
{
$binary = Array();
--- 637,641 ----
}
! function split_uuencoded_into_parts(&$body,$boundary)
{
$binary = Array();
***************
*** 753,757 ****
$end++;
$boundary =
substr($body,$start+7,$end - $start);
! $this->boundary =
$this->create_header('Content-Type: multipart/mixed;',&$this->header,'
boundary="'.$boundary.'"');
}
$boundary_found =
count(explode($boundary,$body));
--- 753,757 ----
$end++;
$boundary =
substr($body,$start+7,$end - $start);
! $this->boundary =
$this->create_header('Content-Type: multipart/mixed;',$this->header,'
boundary="'.$boundary.'"');
}
$boundary_found =
count(explode($boundary,$body));
***************
*** 762,767 ****
$mime_text_header =
'--'.$boundary."\n".'Content-Type: text/plain;
charset=us-ascii'."\n".'Content-Transfer-Encoding: 7bit'."\n\n";
$body =
$mime_text_header."\n".$body."\n".'--'.$boundary;
! $this->create_header('Content-Type:
multipart/mixed;',&$this->header,' boundary="'.$boundary.'"');
! $this->create_header('Mime-Version:
1.0',&$this->header);
$this->boundary = $boundary;
$boundary_found = 4;
--- 762,767 ----
$mime_text_header =
'--'.$boundary."\n".'Content-Type: text/plain;
charset=us-ascii'."\n".'Content-Transfer-Encoding: 7bit'."\n\n";
$body =
$mime_text_header."\n".$body."\n".'--'.$boundary;
! $this->create_header('Content-Type:
multipart/mixed;',$this->header,' boundary="'.$boundary.'"');
! $this->create_header('Mime-Version:
1.0',$this->header);
$this->boundary = $boundary;
$boundary_found = 4;
***************
*** 843,847 ****
}
! function get_encoding_type($header,$struct)
{
switch (strtolower($header))
--- 843,847 ----
}
! function get_encoding_type($header,&$struct)
{
switch (strtolower($header))
***************
*** 874,882 ****
if (isset($header['Content-Type']) &&
$header['Content-Type'])
{
!
$this->get_content_type($header['Content-Type'],&$struct);
}
if (isset($header['Content-Transfer-Encoding']) &&
$header['Content-Transfer-Encoding'])
{
!
$this->get_encoding_type($header['Content-Transfer-Encoding'],&$struct);
}
else
--- 874,882 ----
if (isset($header['Content-Type']) &&
$header['Content-Type'])
{
!
$this->get_content_type($header['Content-Type'],$struct);
}
if (isset($header['Content-Transfer-Encoding']) &&
$header['Content-Transfer-Encoding'])
{
!
$this->get_encoding_type($header['Content-Transfer-Encoding'],$struct);
}
else
***************
*** 922,926 ****
}
! function
split_mime_msg_parts($body,$boundary,$part,$sub_header,$sub_body)
{
$parts = explode('--'.$boundary,$body);
--- 922,926 ----
}
! function
split_mime_msg_parts($body,$boundary,$part,&$sub_header,&$sub_body)
{
$parts = explode('--'.$boundary,$body);
***************
*** 953,958 ****
// $lines[$i] =
$lines[$i - 1] . ';' . $lines[$i];
// }
! //
$this->create_header($lines[$i],&$sub_header,$lines[$i+1]);
!
$this->create_header($lines[$i],&$sub_header);
}
else
--- 953,958 ----
// $lines[$i] =
$lines[$i - 1] . ';' . $lines[$i];
// }
! //
$this->create_header($lines[$i],$sub_header,$lines[$i+1]);
!
$this->create_header($lines[$i],$sub_header);
}
else
***************
*** 967,973 ****
if($this->is_uu_encoded($sub_body))
{
!
$this->split_uuencoded_into_parts(&$sub_body,$boundary);
}
! $this->create_header('Lines: '.$j,&$sub_header);
}
--- 967,973 ----
if($this->is_uu_encoded($sub_body))
{
!
$this->split_uuencoded_into_parts($sub_body,$boundary);
}
! $this->create_header('Lines: '.$j,$sub_header);
}
***************
*** 981,987 ****
{
// echo 'This is a UUEncoded
message!<br>'."\n";
!
$this->split_uuencoded_into_parts(&$this->body,&$boundary);
! $this->create_header('Content-Type:
multipart/mixed;',&$this->header,' boundary="'.$boundary.'"');
! $this->create_header('Mime-Version:
1.0',&$this->header);
}
if (!$this->is_mime_encoded())
--- 981,987 ----
{
// echo 'This is a UUEncoded
message!<br>'."\n";
!
$this->split_uuencoded_into_parts($this->body,&$boundary);
! $this->create_header('Content-Type:
multipart/mixed;',$this->header,' boundary="'.$boundary.'"');
! $this->create_header('Mime-Version:
1.0',$this->header);
}
if (!$this->is_mime_encoded())
***************
*** 990,995 ****
$mime_text_header =
'--'.$boundary."\n".'Content-Type: text/plain;
charset=us-ascii'."\n".'Content-Transfer-Encoding: 7bit'."\n\n";
$this->body =
$mime_text_header."\n".$this->body."\n".'--'.$boundary;
! $this->create_header('Content-Type:
multipart/mixed;',&$this->header,' boundary="'.$boundary.'"');
! $this->create_header('Mime-Version:
1.0',&$this->header);
}
if ($this->is_mime_encoded())
--- 990,995 ----
$mime_text_header =
'--'.$boundary."\n".'Content-Type: text/plain;
charset=us-ascii'."\n".'Content-Transfer-Encoding: 7bit'."\n\n";
$this->body =
$mime_text_header."\n".$this->body."\n".'--'.$boundary;
! $this->create_header('Content-Type:
multipart/mixed;',$this->header,' boundary="'.$boundary.'"');
! $this->create_header('Mime-Version:
1.0',$this->header);
}
if ($this->is_mime_encoded())
***************
*** 1002,1007 ****
$this->header['Content-Type']
),
! $i,&$this->hsub[$i],
! &$this->bsub[$i]);
$this->sparts[$i] =
$this->build_mime_structure($this->hsub[$i]);
}
--- 1002,1007 ----
$this->header['Content-Type']
),
! $i,$this->hsub[$i],
! $this->bsub[$i]);
$this->sparts[$i] =
$this->build_mime_structure($this->hsub[$i]);
}
Index: class.nntp.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/nntp/inc/class.nntp.inc.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** class.nntp.inc.php 21 Dec 2001 03:59:13 -0000 1.7
--- class.nntp.inc.php 15 Apr 2002 04:02:56 -0000 1.7.2.1
***************
*** 109,113 ****
$retval['last'] = Array();
! if (!$this->msg2socket('LIST','^215',&$response))
{
return 0;
--- 109,113 ----
$retval['last'] = Array();
! if (!$this->msg2socket('LIST','^215',$response))
{
return 0;
***************
*** 199,203 ****
function xhdr($field,$first,$last)
{
! if (!$this->msg2socket('XHDR '.$field.'
'.$first.'-'.$last,'^221',&$response))
{
return 0;
--- 199,203 ----
function xhdr($field,$first,$last)
{
! if (!$this->msg2socket('XHDR '.$field.'
'.$first.'-'.$last,'^221',$response))
{
return 0;
***************
*** 279,287 ****
{
$retval = array();
! if (!$this->msg2socket('STAT
'.$msgnum,'^223',&$response))
{
return 0;
}
! if (!$this->msg2socket('NEXT','^223',&$response))
{
return 0;
--- 279,287 ----
{
$retval = array();
! if (!$this->msg2socket('STAT
'.$msgnum,'^223',$response))
{
return 0;
}
! if (!$this->msg2socket('NEXT','^223',$response))
{
return 0;
***************
*** 295,303 ****
{
$retval = array();
! if (!$this->msg2socket('STAT
'.$msgnum,'^223',&$response))
{
return 0;
}
! if (!$this->msg2socket('LAST','^223',&$response))
{
return 0;
--- 295,303 ----
{
$retval = array();
! if (!$this->msg2socket('STAT
'.$msgnum,'^223',$response))
{
return 0;
}
! if (!$this->msg2socket('LAST','^223',$response))
{
return 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: nntp/inc class.mail.inc.php,1.6.2.1,1.6.2.2 class.nntp.inc.php,1.7,1.7.2.1,
Mark A Peters <address@hidden> <=