From 699e12523f551287c354e77753e41746a06d190b Mon Sep 17 00:00:00 2001
From: james <james>
Date: Thu, 3 Mar 2011 18:11:36 +0000
Subject: [PATCH] make foodreq field based on configuration api
 registration/fields accepts both string (to json decode) or a post array, so
 the testapi page works

---
 api.php      | 6 +++++-
 user.inc.php | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/api.php b/api.php
index 7ee778c..3ae877a 100644
--- a/api.php
+++ b/api.php
@@ -842,7 +842,11 @@ switch($request[0]) {
 				return(fields array)
 			*/
 			case 'fields':
-				$reqroles=json_decode($_POST['roles'],true);
+				if(is_array($_POST['roles'])) {
+					$reqroles=$_POST['roles'];
+				} else {
+					$reqroles=json_decode($_POST['roles'],true);
+				}
 				if(is_array($reqroles)) {
 					for($x=0;$x<count($reqroles);$x++) {
 						if(is_numeric($reqroles[$x]))
diff --git a/user.inc.php b/user.inc.php
index 19bee1e..a60cfe6 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -320,13 +320,16 @@ function user_get_role_fields($role){
 			}
 			break;
 		case 'participant':
-			$fields = array('grade', 'schools_id', 'foodreq', 'medicalalert', 'registrations_id');
+			$fields = array('grade', 'schools_id', 'medicalalert', 'registrations_id');
 			if($config['participant_student_personal'] == "yes"){
 				$fields[] = 'dateofbirth';
 			}
 			if($config['participant_student_tshirt'] == "yes"){
 				$fields[] = 'tshirt';
 			}
+			if($config['participant_student_foodreq'] == "yes"){
+				$fields[] = 'foodreq';
+			}
 			break;
 		case 'fair':
 			$fields = array('fairs_id');