From 19e146547f7938696b7d4be892db1164d7e91542 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Mon, 25 Oct 2010 23:12:35 +0000
Subject: [PATCH] Fix api registration fields when roles ar epassed in roles
 can be passed in as array of ids or array of types

---
 api.php                  | 7 ++++++-
 common.inc.bootstrap.php | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api.php b/api.php
index 646806d..2914e08 100644
--- a/api.php
+++ b/api.php
@@ -640,8 +640,13 @@ switch($request[0]) {
 			case 'fields':
 				$reqroles=$_POST['roles'];
 				if(is_array($reqroles)) {
+					for($x=0;$x<count($reqroles);$x++) {
+						if(is_numeric($reqroles[$x]))
+							$reqroles[$x]=$roles_by_id[$reqroles[$x]];
+						if(!array_key_exists($reqroles[$x],$roles))
+							unset($reqroles[$x]);
+					}
 					$ret['status']="ok";
-					echo "reqroles=";
 					$ret['fields']=user_get_fields($reqroles);
 				} else {
 					//load the currently logged in user
diff --git a/common.inc.bootstrap.php b/common.inc.bootstrap.php
index c1c656e..00b07b2 100644
--- a/common.inc.bootstrap.php
+++ b/common.inc.bootstrap.php
@@ -252,6 +252,7 @@ $roles=array();
 $q = mysql_query("SELECT * FROM roles");
 while(($r = mysql_fetch_assoc($q))) {
 	$roles[$r['type']] = $r;
+	$roles_by_id[$r['id']]=$r;
 }
 
 //and now pull the theme