[Mapbender-commits] r6751 - branches/banjo_dev/mapbender/http/rest

[svn_mapbender at osgeo.org]

Author: banjo
Date: 2010-08-10 19:27:20 +0000 (Tue, 10 Aug 2010)
New Revision: 6751

Modified:
   branches/banjo_dev/mapbender/http/rest/user.php
Log:
Modifying json response


Modified: branches/banjo_dev/mapbender/http/rest/user.php
===================================================================
--- branches/banjo_dev/mapbender/http/rest/user.php	2010-08-10 17:55:15 UTC (rev 6750)
+++ branches/banjo_dev/mapbender/http/rest/user.php	2010-08-10 19:27:20 UTC (rev 6751)
@@ -21,6 +21,9 @@
   case 'post':
     break;
   case 'put':
+    parse_str(file_get_contents('php://input'), $put_vars);
+    $data = $put_vars;
+    send_put_response($data);
     break;
 }
 
@@ -34,8 +37,6 @@
   {
     die(send_rest_response(404));
   }
-  unset($row["mb_user_password"]);
-  unset($row["mb_user_login_count"]);
 
   //Prepare the response body according to responseFormat
   if(strcmp($responseFormat, "xml") == 0)
@@ -67,7 +68,22 @@
   else
   {
     //send json response
-    $body = json_encode($row);
+    $json_result = array("id" => $row['mb_user_id'], "name" => $row['mb_user_name'], "owner" => $row['mb_user_owner'],
+      "description" => $row['mb_user_description'], "email" => $row['mb_user_email'], "phone" => $row['mb_user_phone'],
+      "department" => $row['mb_user_department'], "resolution" => $row['mb_user_resolution'], "organisation_name" => $row['mb_user_organisation_name'],
+      "position_name" => $row['mb_user_position_name'], "phone1" => $row['mb_user_phone1'], "fascimile" => $row['mb_user_fascimile'],
+      "delivery_point" => $row['mb_user_delivery_point'], "city" => $row['mb_user_city'], "postal_code" => $row['mb_user_postal_code'],
+      "country" => $row['mb_user_country'], "online_resource" => $row['mb_user_onlne_resource']);
+    $body = json_encode($json_result);
     send_rest_response(200, $body, "applicaton/json");
   }
 }
+
+functon send_put_response($data)
+{
+  $userID = authenticate();
+  if(strcmp($userID, $data['id']) != 0)
+  {
+    die(send_rest_response(401));
+  }
+}