Version 4.2.0

applications/nexus/sources/Support/CustomField.php

@@ -1,13 +1,12 @@
 <?php
 /**
  * @brief		Custom Support Field Node
- * @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		16 Apr 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\nexus\Support;
@@ -140,7 +139,6 @@ class _CustomField extends \IPS\CustomField
 	public function form( &$form )
 	{
 		parent::form( $form );
-		
 
 		$form->add( new \IPS\Helpers\Form\Node( 'sf_departments', $this->departments === '*' ? 0 : explode( ',', $this->departments ), TRUE, array( 'class' => 'IPS\nexus\Support\Department', 'multiple' => TRUE, 'zeroVal' => 'all' ) ), 'pf_desc' );
 		$form->add( new \IPS\Helpers\Form\YesNo( 'sf_validate_ftp', extension_loaded('ftp') ? $this->validate : FALSE, FALSE, array( 'disabled' => !extension_loaded('ftp') ), NULL, NULL, NULL, 'sf_validate_ftp' ), 'pf_not_null' );
@@ -152,9 +150,10 @@ class _CustomField extends \IPS\CustomField
 		{
 			\IPS\Member::loggedIn()->language()->words['sf_validate_ftp_warning'] = \IPS\Member::loggedIn()->language()->addToStack( 'sf_validate_ftp_nosftp' );
 		}
-		
+
 		unset( $form->elements[''][1] );
 		unset( $form->elements['']['pf_search_type'] );
+		unset( $form->elements['']['pf_search_type_on_off'] );
 		unset( $form->elements['']['pf_format'] );
 	}
 	
@@ -180,6 +179,12 @@ class _CustomField extends \IPS\CustomField
 			}
 			unset( $values['sf_validate_ftp'] );
 		}
+
+		if( array_key_exists( 'pf_allow_attachments', $values ) )
+		{
+			$values[ 'allow_attachments' ] = $values[ 'pf_allow_attachments' ];
+			unset( $values[ 'pf_allow_attachments' ] );
+		}
 		
 		return parent::formatFormValues( $values );
 	}
@@ -208,16 +213,27 @@ class _CustomField extends \IPS\CustomField
 	/**
 	 * Display Value
 	 *
-	 * @param	mixed	$value	The value
+	 * @param	mixed	$value						The value
+	 * @param	bool	$showSensitiveInformation	If TRUE, potentially sensitive data (like passwords) will be displayed - otherwise will be blanked out
 	 * @return	string
 	 */
-	public function displayValue( $value=NULL )
+	public function displayValue( $value=NULL, $showSensitiveInformation=FALSE )
 	{
 		if ( $this->type === 'UserPass' )
 		{
-			return \IPS\Theme::i()->getTemplate( 'forms', 'nexus', 'global' )->usernamePasswordDisplay( json_decode( \IPS\Text\Encrypt::fromTag( $value )->decrypt(), TRUE ) );
+			if ( !is_array( $value ) )
+			{
+				$value = json_decode( \IPS\Text\Encrypt::fromTag( $value )->decrypt(), TRUE );
+			}
+			
+			if ( !$showSensitiveInformation )
+			{
+				$value['pw'] = '********';
+			}
+			
+			return \IPS\Theme::i()->getTemplate( 'forms', 'nexus', 'global' )->usernamePasswordDisplay( $value );
 		}
 		
-		return parent::displayValue( $value );
+		return parent::displayValue( $value, $showSensitiveInformation );
 	}
 }