Author: chabotc
Date: Thu Sep 11 02:23:13 2008
New Revision: 694188
URL: http://svn.apache.org/viewvc?rev=694188&view=rev
Log:
SHINDIG-587 by Guido Barosio - Removal of some bogus control characters around
the PHP code
Modified:
incubator/shindig/trunk/php/config/container.php
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
Modified: incubator/shindig/trunk/php/config/container.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/config/container.php?rev=694188&r1=694187&r2=694188&view=diff
==============================================================================
--- incubator/shindig/trunk/php/config/container.php (original)
+++ incubator/shindig/trunk/php/config/container.php Thu Sep 11 02:23:13 2008
@@ -44,7 +44,7 @@
// Allow plain text security tokens, this is only here to allow the
sample files to work. Disable on a production site
'allow_plaintext_token' => true,
// Compress the inlined javascript, saves upto 50% of the document size
- 'compress_javascript' => true,
+ 'compress_javascript' => true,
// The URL Prefix under which shindig lives ie if you have
http://myhost.com/shindig/php set web_prefix to /shindig/php
'web_prefix' => '',
@@ -72,7 +72,7 @@
// The OAuth SSL certificates to use, and the pass phrase for the
private key
'private_key_file' => realpath(dirname(__FILE__) .
'/../certs').'/private.key',
'public_key_file' => realpath(dirname(__FILE__) .
'/../certs').'/public.crt',
- 'private_key_phrase' => 'partuza',
+ 'private_key_phrase' => 'partuza',
'jsondb_path' => realpath(dirname(__FILE__) .
'/../../javascript/sampledata').'/canonicaldb.json',
// Force these libraries to be external (included through <script
src="..."> tags), this way they could be cached by the browser
@@ -88,8 +88,8 @@
// Old-style wire format data handler, this is being depreciated
'handlers' => '',
// New RESTful API data service classes to use
- 'people_service' => 'JsonDbOpensocialService',
- 'activity_service' => 'JsonDbOpensocialService',
+ 'people_service' => 'JsonDbOpensocialService',
+ 'activity_service' => 'JsonDbOpensocialService',
'app_data_service' => 'JsonDbOpensocialService',
'messages_service' => 'JsonDbOpensocialService',
// Also scan these directories when looking for <Class>.php files. You
can include multiple paths by seperating them with a ,
Modified:
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php?rev=694188&r1=694187&r2=694188&view=diff
==============================================================================
---
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
(original)
+++
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
Thu Sep 11 02:23:13 2008
@@ -101,8 +101,8 @@
}
}
- /**
- * Get the set of user id's from a user and group
+ /**
+ * Get the set of user id's from a user and group
*/
private function getIdSet(UserId $user, $group, SecurityToken $token)
{
@@ -181,7 +181,7 @@
public function getPerson($userId, $groupId, $fields, SecurityToken
$token)
{
$person = $this->getPeople($userId, $groupId, new
CollectionOptions(), $fields, $token);
- // return of getPeople is a
ResponseItem(RestfulCollection(ArrayOfPeople)), disassemble to return just one
person
+ // return of getPeople is a
ResponseItem(RestfulCollection(ArrayOfPeople)), disassemble to return just one
person
$person = $person->getResponse()->getEntry();
if (is_array($person) && count($person) == 1) {
return new ResponseItem(null, null, $person[0]);
@@ -250,7 +250,7 @@
if ($sortOrder == 'name') {
usort($people, array($this, 'comparator'));
}
- //TODO: The samplecontainer doesn't support any filters yet. We
should fix this.
+ //TODO: The samplecontainer doesn't support any filters yet. We
should fix this.
$totalSize = count($people);
$last = $first + $max;
$last = min($last, $totalSize);
@@ -333,8 +333,8 @@
}
switch ($groupId->getType()) {
case 'self':
- foreach ($fields as $key => $present) {//TODO:
Implement this!
-}
+ foreach ($fields as $key => $present) {//TODO:
Implement this!
+ }
break;
default:
return new ResponseItem(NOT_IMPLEMENTED, "We
don't support deleting data in batches yet", null);
@@ -366,7 +366,7 @@
$activities = array_merge($activities,
$allActivities[$id]);
}
}
- // TODO: Sort them
+ // TODO: Sort them
return new ResponseItem(null, null,
RestfulCollection::createFromEntry($activities));
}
