Version 4.2.0

system/Helpers/Form/Password.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Password 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
  * @since		11 Mar 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Helpers\Form;
@@ -42,6 +41,23 @@ class _Password extends Text
 		'checkStrength'		=> FALSE
 	);
 	
+	/**
+	 * Get Value
+	 *
+	 * @return	mixed
+	 */
+	public function getValue()
+	{
+		$value = parent::getValue();
+		
+		if ( $value === '********' )
+		{
+			$value = $this->defaultValue;
+		}
+		
+		return $value;
+	}
+	
 	/**
 	 * Validate
 	 *
@@ -127,7 +143,7 @@ class _Password extends Text
 	public function html()
 	{
 		/* 10/19/15 - adding htmlspecialchars around value if autocomplete is enabled so that html tag characters can be used (e.g. for members) */
-		/* This value is decoded by the JS widget before use. See https://community.invisionpower.com/4bugtrack/active-reports/cannot-pm-certain-members-r6181/ */
+		/* This value is decoded by the JS widget before use. */
 		if( $this->options['autocomplete'] and !empty( $this->value ) and is_array( $this->value ) )
 		{
 			foreach( $this->value as $key => $value )
@@ -135,7 +151,7 @@ class _Password extends Text
 				$this->value[ $key ] = htmlspecialchars( $value, ENT_QUOTES | \IPS\HTMLENTITIES, 'UTF-8', FALSE );
 			}
 		}
-
-		return \IPS\Theme::i()->getTemplate( 'forms', 'core', 'global' )->text( $this->name, $this->formType, $this->value, $this->required, $this->options['maxLength'], $this->options['size'], $this->options['disabled'], $this->options['autocomplete'], $this->options['placeholder'], NULL, $this->options['nullLang'], $this->htmlId, $this->options['showMeter'] );
+		
+		return \IPS\Theme::i()->getTemplate( 'forms', 'core', 'global' )->text( $this->name, $this->formType, ( $this->value and $this->value === $this->defaultValue and !$this->error ) ? '********' : $this->value, $this->required, $this->options['maxLength'], $this->options['size'], $this->options['disabled'], $this->options['autocomplete'], $this->options['placeholder'], NULL, $this->options['nullLang'], $this->htmlId, $this->options['showMeter'] );
 	}
 }