From 10172887fd47e86eefbabd6f5e755cd93279960d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 18:48:10 +0200
Subject: [ticket/10965] Introduce a new profile field option to display no
 value

By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
---
 phpBB/includes/functions_profile_fields.php | 31 ++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes/functions_profile_fields.php')

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 16c193c15a..5391b781fa 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -122,7 +122,7 @@ class custom_profile
 
 			case FIELD_BOOL:
 				$field_value = (bool) $field_value;
-			
+
 				if (!$field_value && $field_data['field_required'])
 				{
 					return 'FIELD_REQUIRED';
@@ -134,7 +134,7 @@ class custom_profile
 				{
 					return false;
 				}
-				
+
 				$field_value = (int) $field_value;
 
 				if ($field_value < $field_data['field_minlen'])
@@ -521,7 +521,7 @@ class custom_profile
 		switch ($this->profile_types[$field_type])
 		{
 			case 'int':
-				if ($value === '')
+				if ($value === '' && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -530,7 +530,7 @@ class custom_profile
 
 			case 'string':
 			case 'text':
-				if (!$value)
+				if (!$value && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -548,7 +548,7 @@ class custom_profile
 				$month = (isset($date[1])) ? (int) $date[1] : 0;
 				$year = (isset($date[2])) ? (int) $date[2] : 0;
 
-				if (!$day && !$month && !$year)
+				if (!$day && !$month && !$year && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -571,12 +571,7 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
 				}
 
-				// If a dropdown field is required, users
-				// cannot choose the "no value" option.
-				// They must choose one of the other options.
-				// Therefore, here we treat a value equal to
-				// the "no value" as a lack of value, i.e. NULL.
-				if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required'])
+				if ($value == $ident_ary['data']['field_novalue'] && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -586,7 +581,14 @@ class custom_profile
 				// User not having a value assigned
 				if (!isset($this->options_lang[$field_id][$lang_id][$value]))
 				{
-					return NULL;
+					if ($ident_ary['data']['field_show_novalue'])
+					{
+						$value = $ident_ary['data']['field_novalue'];
+					}
+					else
+					{
+						return NULL;
+					}
 				}
 
 				return $this->options_lang[$field_id][$lang_id][$value];
@@ -600,6 +602,11 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_BOOL, false);
 				}
 
+				if (!$value && $ident_ary['data']['field_show_novalue'])
+				{
+					$value = $ident_ary['data']['field_default_value'];
+				}
+
 				if ($ident_ary['data']['field_length'] == 1)
 				{
 					return (isset($this->options_lang[$field_id][$lang_id][(int) $value])) ? $this->options_lang[$field_id][$lang_id][(int) $value] : NULL;
-- 
cgit v1.2.1


From 2f5692d4bbdf3e5a39d9a22b83354f5db9638fa8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 23 Jul 2012 22:38:38 +0200
Subject: [ticket/10965] Make sure all profile fields are always grabbed on
 viewtopic

PHPBB3-10965
---
 phpBB/includes/functions_profile_fields.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes/functions_profile_fields.php')

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 5391b781fa..8a5571fcce 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -456,6 +456,8 @@ class custom_profile
 
 			$user_fields = array();
 
+			$user_ids = $user_id;
+
 			// Go through the fields in correct order
 			foreach (array_keys($this->profile_cache) as $used_ident)
 			{
@@ -464,6 +466,12 @@ class custom_profile
 					$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
 					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
 				}
+
+				foreach ($user_ids as $user_id)
+				{
+					$user_fields[$user_id][$used_ident]['value'] = '';
+					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+				}
 			}
 
 			return $user_fields;
-- 
cgit v1.2.1


From 296fadfca463327752395ff2124e4a2c99cbacbe Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 23 Jul 2012 23:35:48 +0200
Subject: [ticket/10965] Profile data is only grabbed when show_novalue is
 enabled

PHPBB3-10965
---
 phpBB/includes/functions_profile_fields.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_profile_fields.php')

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 8a5571fcce..8573533c2c 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -469,8 +469,11 @@ class custom_profile
 
 				foreach ($user_ids as $user_id)
 				{
-					$user_fields[$user_id][$used_ident]['value'] = '';
-					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+					if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])
+					{
+						$user_fields[$user_id][$used_ident]['value'] = '';
+						$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+					}
 				}
 			}
 
-- 
cgit v1.2.1