diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 6c1bad8..a0c6895 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -31,7 +31,6 @@
var $password = '';
var $port = 21;
var $passive = TRUE;
- var $secure = FALSE;
var $debug = FALSE;
var $conn_id;
@@ -80,11 +79,18 @@
* FTP Connect
*
* @access public
+ * @param array the connection values
+ * @param bool whether to use a secure or standard connection
* @return bool
*/
- function connect()
- {
- $method = ($this->secure == FALSE) ? 'ftp_connect' : 'ftp_ssl_connect';
+ function connect($config = array(), $secure = FALSE)
+ {
+ if (count($config) > 0)
+ {
+ $this->initialize($config);
+ }
+
+ $method = ($secure == FALSE) ? 'ftp_connect' : 'ftp_ssl_connect';
if (FALSE === ($this->conn_id = @$method($this->hostname, $this->port)))
{
@@ -112,6 +118,20 @@
return TRUE;
}
+
+ // --------------------------------------------------------------------
+
+ /**
+ * Secure FTP Connect
+ *
+ * @access public
+ * @param array the connection values
+ * @return bool
+ */
+ function sconnect($config = array())
+ {
+ return $this->connect($config, TRUE);
+ }
// --------------------------------------------------------------------
@@ -297,8 +317,8 @@
* Read a directory and recreate it remotely
*
* This function recursively reads a folder and everything it contains (including
- * sub-folders) and creates a mirror via FTP based on it. Whatever directory structure
- * is in the original file path will be recreated in the zip file.
+ * sub-folders) and creates a mirror via FTP based on it. Whatever the directory structure
+ * of the original file path will be recreated on the server.
*
* @access public
* @param string path to source with trailing slash
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index b8a68e9..96150ec 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -119,7 +119,7 @@
<p><strong>Note:</strong> Most of the preferences have default values that will be used if you do not set them.</p
-<h3>Setting Email Preferences in your Config File</h3>
+<h3>Setting Email Preferences in a Config File</h3>
<p>If you prefer not to set preferences using the above method, you can instead put them into a config file.
Simply create a new file called the <var>email.php</var>, add the <var>$config</var>
diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html
index ae025f5..4df9c54 100644
--- a/user_guide/libraries/ftp.html
+++ b/user_guide/libraries/ftp.html
@@ -183,7 +183,7 @@
<h2>$this->ftp->upload()</h2>
-<p>Uploads a file to your server. You must supply the local path and the remote path (with trailing slash), and you can optionally set the mode and permissions.
+<p>Uploads a file to your server. You must supply the local path and the remote path, and you can optionally set the mode and permissions.
Example:</p>