From b455294bc404e41a65f8c9260837e76ee1cc9bda Mon Sep 17 00:00:00 2001
From: leandronf <leandronf@gmail.com>
Date: Wed, 21 Mar 2012 23:54:26 -0300
Subject: (DSN) Delivery status notification feature

---
 system/libraries/Email.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index f30fe40b6..d870f9782 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -59,6 +59,7 @@ class CI_Email {
 	public $crlf		= "\n";			// The RFC 2045 compliant CRLF for quoted-printable is "\r\n".  Apparently some servers,
 									// even on the receiving end think they need to muck with CRLFs, so using "\n", while
 									// distasteful, is the only thing that seems to work for all environments.
+	var $dsn		= FALSE";		// Delivery Status Notification
 	public $send_multipart	= TRUE;		// TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override.  Set to FALSE for Yahoo.
 	public $bcc_batch_mode	= FALSE;	// TRUE/FALSE - Turns on/off Bcc batch feature
 	public $bcc_batch_size	= 200;		// If bcc_batch_mode = TRUE, sets max number of Bccs in each batch
@@ -1567,9 +1568,11 @@ class CI_Email {
 						$resp = 250;
 			break;
 			case 'to'	:
-
-						$this->_send_data('RCPT TO:<'.$data.'>');
-
+						
+						if($this->dsn)
+							$this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
+						else
+							$this->_send_data('RCPT TO:<'.$data.'>');
 						$resp = 250;
 			break;
 			case 'data'	:
-- 
cgit v1.2.3-24-g4f1b


From 7686c1208cf1b0d9e1f4e522fff8a4b4646b7a2d Mon Sep 17 00:00:00 2001
From: leandronf <leandronf@gmail.com>
Date: Thu, 22 Mar 2012 08:07:31 -0300
Subject: Update system/libraries/Email.php

---
 system/libraries/Email.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index d870f9782..8f383c939 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -59,7 +59,7 @@ class CI_Email {
 	public $crlf		= "\n";			// The RFC 2045 compliant CRLF for quoted-printable is "\r\n".  Apparently some servers,
 									// even on the receiving end think they need to muck with CRLFs, so using "\n", while
 									// distasteful, is the only thing that seems to work for all environments.
-	var $dsn		= FALSE";		// Delivery Status Notification
+	public $dsn		= FALSE;		// Delivery Status Notification
 	public $send_multipart	= TRUE;		// TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override.  Set to FALSE for Yahoo.
 	public $bcc_batch_mode	= FALSE;	// TRUE/FALSE - Turns on/off Bcc batch feature
 	public $bcc_batch_size	= 200;		// If bcc_batch_mode = TRUE, sets max number of Bccs in each batch
@@ -1569,10 +1569,14 @@ class CI_Email {
 			break;
 			case 'to'	:
 						
-						if($this->dsn)
+						if ($this->dsn)
+						{
 							$this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
+						}
 						else
+						{
 							$this->_send_data('RCPT TO:<'.$data.'>');
+						}
 						$resp = 250;
 			break;
 			case 'data'	:
-- 
cgit v1.2.3-24-g4f1b


From e684bdac2d6282e3b9a5c57e1006d5ed1664f647 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Mon, 26 Mar 2012 13:47:29 +0300
Subject: Clear some spaces and fix some inconsistencies in the Zip library and
 system/helpers/ files

---
 system/libraries/Zip.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e33eb4e5a..12f3a5e59 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
  * An open source application development framework for PHP 5.2.4 or newer
  *
  * NOTICE OF LICENSE
- * 
+ *
  * Licensed under the Open Software License version 3.0
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -101,7 +101,7 @@ class CI_Zip  {
 	{
 		// filemtime() may return false, but raises an error for non-existing files
 		$date = (file_exists($dir)) ? filemtime($dir): getdate($this->now);
-		
+
 		$time['file_mtime'] = ($date['hours'] << 11) + ($date['minutes'] << 5) + $date['seconds'] / 2;
 		$time['file_mdate'] = (($date['year'] - 1980) << 9) + ($date['mon'] << 5) + $date['mday'];
 
-- 
cgit v1.2.3-24-g4f1b