svn commit: r985302 - /shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php

[li...@apache.org]

Author: lindner
Date: Fri Aug 13 17:47:36 2010
New Revision: 985302

URL: http://svn.apache.org/viewvc?rev=985302&view=rev
Log:
SHINDIG-1408 | Patch from Ivo Jansch | sonDbOpensocialService->getPeople uses outdated way of processing ?fields= parameter

Modified:
    shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php

Modified: shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
URL: http://svn.apache.org/viewvc/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php?rev=985302&r1=985301&r2=985302&view=diff
==============================================================================
--- shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php (original)
+++ shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php Fri Aug 13 17:47:36 2010
@@ -261,22 +261,8 @@ class JsonDbOpensocialService implements
         }
         if (! $token->isAnonymous() && $id == $token->getOwnerId()) {
           $person['isOwner'] = true;
-        }
-        if ($fields && $fields[0] != '@all') {
-          $newPerson = array();
-          $newPerson['id'] = $id;
-          $newPerson['isOwner'] = isset($person['isOwner']) ? $person['isOwner'] : false;
-          $newPerson['isViewer'] = isset($person['isViewer']) ? $person['isViewer'] : false;
-          $newPerson['name'] = $person['name'];
-          $newPerson['displayName'] = $person['displayName'];
-          foreach ($fields as $field => $present) {
-            $present = strtolower($present);
-            if (isset($person[$present]) && ! isset($newPerson[$present])) {
-              $newPerson[$present] = $person[$present];
-            }
-          }
-          $person = $newPerson;
-        }
+        }   
+
         $people[] = $person;
       }
     }
@@ -289,6 +275,10 @@ class JsonDbOpensocialService implements
     } catch (Exception $e) {
       $people['filtered'] = 'false';
     }
+    
+   if ($fields) { 
+        $people = self::adjustFields($people, $fields);
+    }
 
     //TODO: The samplecontainer doesn't support any filters yet. We should fix this.
     $totalSize = count($people);