Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rely on PHP5 to sort out references

  • Loading branch information...
commit 06197a1d37713cfe8c25c21cd7cd1e53225befc1 1 parent fded6fa
@CloCkWeRX CloCkWeRX authored
Showing with 29 additions and 29 deletions.
  1. +29 −29 Mail/Mime2.php
View
58 Mail/Mime2.php
@@ -488,14 +488,14 @@ function &_file2str($file_name)
* Adds a text subpart to the mimePart object and
* returns it during the build process.
*
- * @param mixed &$obj The object to add the part to, or
+ * @param mixed $obj The object to add the part to, or
* null if a new object is to be created.
* @param string $text The text to add.
*
* @return object The text mimePart object
* @access private
*/
- function &_addTextPart(&$obj, $text)
+ function _addTextPart($obj, $text)
{
$params['content_type'] = 'text/plain';
$params['encoding'] = $this->_build_params['text_encoding'];
@@ -515,13 +515,13 @@ function &_addTextPart(&$obj, $text)
* Adds a html subpart to the mimePart object and
* returns it during the build process.
*
- * @param mixed &$obj The object to add the part to, or
+ * @param mixed $obj The object to add the part to, or
* null if a new object is to be created.
*
* @return object The html mimePart object
* @access private
*/
- function &_addHtmlPart(&$obj)
+ function _addHtmlPart($obj)
{
$params['content_type'] = 'text/html';
$params['encoding'] = $this->_build_params['html_encoding'];
@@ -545,7 +545,7 @@ function &_addHtmlPart(&$obj)
* @return object The multipart/mixed mimePart object
* @access private
*/
- function &_addMixedPart()
+ function _addMixedPart()
{
$params = array();
$params['content_type'] = 'multipart/mixed';
@@ -561,13 +561,13 @@ function &_addMixedPart()
* object (or creates one), and returns it during
* the build process.
*
- * @param mixed &$obj The object to add the part to, or
+ * @param mixed $obj The object to add the part to, or
* null if a new object is to be created.
*
* @return object The multipart/mixed mimePart object
* @access private
*/
- function &_addAlternativePart(&$obj)
+ function _addAlternativePart($obj)
{
$params['content_type'] = 'multipart/alternative';
$params['eol'] = $this->_build_params['eol'];
@@ -585,13 +585,13 @@ function &_addAlternativePart(&$obj)
* object (or creates one), and returns it during
* the build process.
*
- * @param mixed &$obj The object to add the part to, or
+ * @param mixed $obj The object to add the part to, or
* null if a new object is to be created
*
* @return object The multipart/mixed mimePart object
* @access private
*/
- function &_addRelatedPart(&$obj)
+ function _addRelatedPart($obj)
{
$params['content_type'] = 'multipart/related';
$params['eol'] = $this->_build_params['eol'];
@@ -608,13 +608,13 @@ function &_addRelatedPart(&$obj)
* Adds an html image subpart to a mimePart object
* and returns it during the build process.
*
- * @param object &$obj The mimePart to add the image to
+ * @param object $obj The mimePart to add the image to
* @param array $value The image information
*
* @return object The image mimePart object
* @access private
*/
- function &_addHtmlImagePart(&$obj, $value)
+ function _addHtmlImagePart($obj, $value)
{
$params['content_type'] = $value['c_type'];
$params['encoding'] = 'base64';
@@ -639,13 +639,13 @@ function &_addHtmlImagePart(&$obj, $value)
* Adds an attachment subpart to a mimePart object
* and returns it during the build process.
*
- * @param object &$obj The mimePart to add the image to
+ * @param object $obj The mimePart to add the image to
* @param array $value The attachment information
*
* @return object The image mimePart object
* @access private
*/
- function &_addAttachmentPart(&$obj, $value)
+ function _addAttachmentPart($obj, $value)
{
$params['eol'] = $this->_build_params['eol'];
$params['filename'] = $value['name'];
@@ -887,18 +887,18 @@ function &get($params = null, $filename = null, $skip_head = false)
switch (true) {
case $text && !$attachments:
- $message =& $this->_addTextPart($null, $this->_txtbody);
+ $message = $this->_addTextPart($null, $this->_txtbody);
break;
case !$text && !$html && $attachments:
- $message =& $this->_addMixedPart();
+ $message = $this->_addMixedPart();
for ($i = 0; $i < count($this->_parts); $i++) {
$this->_addAttachmentPart($message, $this->_parts[$i]);
}
break;
case $text && $attachments:
- $message =& $this->_addMixedPart();
+ $message = $this->_addMixedPart();
$this->_addTextPart($message, $this->_txtbody);
for ($i = 0; $i < count($this->_parts); $i++) {
$this->_addAttachmentPart($message, $this->_parts[$i]);
@@ -907,11 +907,11 @@ function &get($params = null, $filename = null, $skip_head = false)
case $html && !$attachments && !$html_images:
if (isset($this->_txtbody)) {
- $message =& $this->_addAlternativePart($null);
+ $message = $this->_addAlternativePart($null);
$this->_addTextPart($message, $this->_txtbody);
$this->_addHtmlPart($message);
} else {
- $message =& $this->_addHtmlPart($null);
+ $message = $this->_addHtmlPart($null);
}
break;
@@ -922,10 +922,10 @@ function &get($params = null, $filename = null, $skip_head = false)
// * html
// * image...
if (isset($this->_txtbody)) {
- $message =& $this->_addAlternativePart($null);
+ $message = $this->_addAlternativePart($null);
$this->_addTextPart($message, $this->_txtbody);
- $ht =& $this->_addRelatedPart($message);
+ $ht = $this->_addRelatedPart($message);
$this->_addHtmlPart($ht);
for ($i = 0; $i < count($this->_html_images); $i++) {
$this->_addHtmlImagePart($ht, $this->_html_images[$i]);
@@ -934,7 +934,7 @@ function &get($params = null, $filename = null, $skip_head = false)
// * Content-Type: multipart/related;
// * html
// * image...
- $message =& $this->_addRelatedPart($null);
+ $message = $this->_addRelatedPart($null);
$this->_addHtmlPart($message);
for ($i = 0; $i < count($this->_html_images); $i++) {
$this->_addHtmlImagePart($message, $this->_html_images[$i]);
@@ -947,9 +947,9 @@ function &get($params = null, $filename = null, $skip_head = false)
// * text
// * html
// * image...
- $message =& $this->_addRelatedPart($null);
+ $message = $this->_addRelatedPart($null);
if (isset($this->_txtbody)) {
- $alt =& $this->_addAlternativePart($message);
+ $alt = $this->_addAlternativePart($message);
$this->_addTextPart($alt, $this->_txtbody);
$this->_addHtmlPart($alt);
} else {
@@ -962,9 +962,9 @@ function &get($params = null, $filename = null, $skip_head = false)
break;
case $html && $attachments && !$html_images:
- $message =& $this->_addMixedPart();
+ $message = $this->_addMixedPart();
if (isset($this->_txtbody)) {
- $alt =& $this->_addAlternativePart($message);
+ $alt = $this->_addAlternativePart($message);
$this->_addTextPart($alt, $this->_txtbody);
$this->_addHtmlPart($alt);
} else {
@@ -976,13 +976,13 @@ function &get($params = null, $filename = null, $skip_head = false)
break;
case $html && $attachments && $html_images:
- $message =& $this->_addMixedPart();
+ $message = $this->_addMixedPart();
if (isset($this->_txtbody)) {
- $alt =& $this->_addAlternativePart($message);
+ $alt = $this->_addAlternativePart($message);
$this->_addTextPart($alt, $this->_txtbody);
- $rel =& $this->_addRelatedPart($alt);
+ $rel = $this->_addRelatedPart($alt);
} else {
- $rel =& $this->_addRelatedPart($message);
+ $rel = $this->_addRelatedPart($message);
}
$this->_addHtmlPart($rel);
for ($i = 0; $i < count($this->_html_images); $i++) {
Please sign in to comment.
Something went wrong with that request. Please try again.