[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] nntp/inc class.mail.inc.php,1.9
From: |
powerstat |
Subject: |
[Phpgroupware-cvs] nntp/inc class.mail.inc.php,1.9 |
Date: |
Thu, 5 May 2005 16:59:00 +0200 |
Update of nntp/inc
Modified Files:
Branch: MAIN
class.mail.inc.php lines: +19 -19
Log Message:
Fixes deprecated (since 2003) call by reference functions calls. Some function
declarations have been changed for call by reference
====================================================
Index: nntp/inc/class.mail.inc.php
diff -u nntp/inc/class.mail.inc.php:1.8 nntp/inc/class.mail.inc.php:1.9
--- nntp/inc/class.mail.inc.php:1.8 Thu May 5 14:32:49 2005
+++ nntp/inc/class.mail.inc.php Thu May 5 14:59:34 2005
@@ -371,7 +371,7 @@
$temp_array = explode(';',$this->header[$key]);
for ($i=0;$i<count($temp_array);$i++)
{
-
$this->decode->decode_author($temp_array[$i],&$email,&$name);
+
$this->decode->decode_author($temp_array[$i],$email,$name);
$temp = explode('@',$email);
$address[$i]->personal =
$this->decode->decode_header($name);
$address[$i]->mailbox = $temp[0];
@@ -540,7 +540,7 @@
break;
}
- if
(!$this->msg2socket($str,$expected_response,&$response))
+ if
(!$this->msg2socket($str,$expected_response,$response))
{
return 0;
}
@@ -636,7 +636,7 @@
return $found_end;
}
- function split_uuencoded_into_parts($body,$boundary)
+ function split_uuencoded_into_parts(&$body,&$boundary)
{
$binary = Array();
$body = ereg_replace('<br>',"\n",$body);
@@ -752,7 +752,7 @@
{
$end++;
$boundary =
substr($body,$start+7,$end - $start);
- $this->boundary =
$this->create_header('Content-Type: multipart/mixed;',&$this->header,'
boundary="'.$boundary.'"');
+ $this->boundary =
$this->create_header('Content-Type: multipart/mixed;',$this->header,'
boundary="'.$boundary.'"');
}
$boundary_found =
count(explode($boundary,$body));
}
@@ -761,8 +761,8 @@
$boundary=uniqid('----=_NextPart');
$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->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;
}
@@ -778,7 +778,7 @@
return $is;
}
- function get_content_type($header,$struct)
+ function get_content_type($header,&$struct)
{
if(strpos($header,';') > 0)
{
@@ -842,7 +842,7 @@
unset($tttarray);
}
- function get_encoding_type($header,$struct)
+ function get_encoding_type($header,&$struct)
{
switch (strtolower($header))
{
@@ -873,11 +873,11 @@
$tempvar = True;
if (isset($header['Content-Type']) &&
$header['Content-Type'])
{
-
$this->get_content_type($header['Content-Type'],&$struct);
+
$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);
+
$this->get_encoding_type($header['Content-Transfer-Encoding'],$struct);
}
else
{
@@ -953,7 +953,7 @@
// $lines[$i] =
$lines[$i - 1] . ';' . $lines[$i];
// }
//
$this->create_header($lines[$i],&$sub_header,$lines[$i+1]);
-
$this->create_header($lines[$i],&$sub_header);
+
$this->create_header($lines[$i],$sub_header);
}
else
{
@@ -966,9 +966,9 @@
}
if($this->is_uu_encoded($sub_body))
{
-
$this->split_uuencoded_into_parts(&$sub_body,$boundary);
+
$this->split_uuencoded_into_parts($sub_body,$boundary);
}
- $this->create_header('Lines: '.$j,&$sub_header);
+ $this->create_header('Lines: '.$j,$sub_header);
}
function mail_fetchstructure($msgnum)
@@ -980,17 +980,17 @@
if ($this->is_uu_encoded($this->body))
{
// 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);
+
$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())
{
$boundary=uniqid('----=_NextPart');
$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);
+ $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())
{