summaryrefslogtreecommitdiffstats
path: root/system/libraries/Email.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-24 13:55:35 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-24 13:55:35 +0200
commit5fd3ae8d33a4f5d3159b86683b9a670e973a63f5 (patch)
treee9d9b67931545e1059b2e27d532ac81ec5f33133 /system/libraries/Email.php
parent3639d4798cd1ac26b715d8d74ff7855474fb01d7 (diff)
[ci skip] style and phpdoc-related changes (rel #1295)
Diffstat (limited to 'system/libraries/Email.php')
-rw-r--r--system/libraries/Email.php20
1 files changed, 14 insertions, 6 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index c1130e915..83b442f58 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -94,6 +94,7 @@ class CI_Email {
*
* The constructor can be passed an array of config values
*
+ * @param array $config = array()
* @return void
*/
public function __construct($config = array())
@@ -188,8 +189,9 @@ class CI_Email {
/**
* Set FROM
*
- * @param string From
- * @param string Return-Path
+ * @param string $from
+ * @param string $name
+ * @param string $return_path = NULL Return-Path
* @return object
*/
public function from($from, $name = '', $return_path = NULL)
@@ -405,7 +407,10 @@ class CI_Email {
/**
* Assign file attachments
*
- * @param string
+ * @param string $filename
+ * @param string $disposition = 'attachment'
+ * @param string $newname = NULL
+ * @param string $mime = ''
* @return object
*/
public function attach($filename, $disposition = '', $newname = NULL, $mime = '')
@@ -1256,6 +1261,7 @@ class CI_Email {
/**
* Send Email
*
+ * @param bool $auto_clear = TRUE
* @return bool
*/
public function send($auto_clear = TRUE)
@@ -1368,6 +1374,7 @@ class CI_Email {
/**
* Strip line-breaks via callback
*
+ * @param string $matches
* @return string
*/
protected function _remove_nl_callback($matches)
@@ -1535,7 +1542,6 @@ class CI_Email {
/**
* SMTP Connect
*
- * @param string
* @return string
*/
protected function _smtp_connect()
@@ -1710,11 +1716,12 @@ class CI_Email {
/**
* Send SMTP data
*
+ * @param string $data
* @return bool
*/
protected function _send_data($data)
{
- if ( ! fwrite($this->_smtp_connect, $data . $this->newline))
+ if ( ! fwrite($this->_smtp_connect, $data.$this->newline))
{
$this->_set_error_message('lang:email_smtp_data_failure', $data);
return FALSE;
@@ -1786,7 +1793,8 @@ class CI_Email {
/**
* Set Message
*
- * @param string
+ * @param string $msg
+ * @param string $val = ''
* @return void
*/
protected function _set_error_message($msg, $val = '')