Version 4.1.19

system/File/Ftp.php

@@ -2,9 +2,9 @@
 /**
  * @brief		File Handler: FTP
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		06 May 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -138,7 +138,7 @@ class _Ftp extends \IPS\File
 	 */
 	public function baseUrl()
 	{
-		return $this->configuration['url'];
+		return rtrim( $this->configuration['url'], '/' );
 	}
 	
 	/**
@@ -181,7 +181,7 @@ class _Ftp extends \IPS\File
 		unlink( $tmpFileName );
 		
 		/* Set the URL */
-		$this->url = new \IPS\Http\Url( $this->fullyQualifiedUrl( "{$this->container}/{$this->filename}" ) );
+		$this->url = \IPS\Http\Url::createFromString( $this->fullyQualifiedUrl( "{$this->container}/{$this->filename}" ), FALSE );
 	}
 	
 	/**
@@ -193,6 +193,9 @@ class _Ftp extends \IPS\File
 	public function delete()
 	{
 		$this->ftp()->delete( $this->container . '/' . $this->filename );
+
+		/* Log deletion request */
+		$this->log( "file_deletion", 'delete', NULL, 'log' );
 	}
 		
 	/**
@@ -205,6 +208,12 @@ class _Ftp extends \IPS\File
 	public function deleteContainer( $container )
 	{
 		$this->ftp()->rmdir( $container, TRUE );
+
+		/* Log deletion request */
+		$realContainer = $this->container;
+		$this->container = $container;
+		$this->log( "container_deletion", 'delete', NULL, 'log' );
+		$this->container = $realContainer;
 	}
 	
 	/* !FTP Utility Methods */