Version 4.2.0

system/Helpers/Form/Ftp.php

@@ -1,13 +1,12 @@
 <?php
 /**
  * @brief		FTP Details input class for Form Builder
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @subpackage	Nexus
  * @since		17 Apr 2014
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Helpers\Form;
@@ -47,10 +46,35 @@ class _Ftp extends \IPS\Helpers\Form\FormAbstract
 	public function html()
 	{
 		\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'global_forms.js', 'nexus', 'global' ) );
+		
 		$value = is_array( $this->value ) ? $this->value : json_decode( \IPS\Text\Encrypt::fromTag( $this->value )->decrypt(), TRUE );
+		$defaultValue = is_array( $this->defaultValue ) ? $this->defaultValue : json_decode( \IPS\Text\Encrypt::fromTag( $this->defaultValue )->decrypt(), TRUE );
+		if ( isset( $value['pw'] ) and isset( $defaultValue['pw'] ) and $value['pw'] and $value['pw'] === $defaultValue['pw'] and !$this->error )
+		{
+			$value['pw'] = '********';
+		}
+		
 		return \IPS\Theme::i()->getTemplate( 'forms', 'core', 'global' )->ftp( $this->name, $value, $this->options['allowBypassValidation'] and $this->error );
 	}
 	
+	/**
+	 * Get Value
+	 *
+	 * @return	mixed
+	 */
+	public function getValue()
+	{
+		$value = parent::getValue();
+		
+		if ( isset( $value['pw'] ) and $value['pw'] === '********' )
+		{
+			$defaultValue = is_array( $this->defaultValue ) ? $this->defaultValue : json_decode( \IPS\Text\Encrypt::fromTag( $this->defaultValue )->decrypt(), TRUE );
+			$value['pw'] = $defaultValue['pw'];
+		}
+		
+		return $value;
+	}
+	
 	/** 
 	 * Validate
 	 *
@@ -76,7 +100,7 @@ class _Ftp extends \IPS\Helpers\Form\FormAbstract
 	/** 
 	 * Validate
 	 *
-	 * @return	string
+	 * @return	bool
 	 */
 	public function validate()
 	{
@@ -121,6 +145,8 @@ class _Ftp extends \IPS\Helpers\Form\FormAbstract
 		{
 			throw new \DomainException( 'form_required' );
 		}
+
+		return true;
 	}
 	
 	/**