From 9ffaea480fc77514ac1804ad3ca72487c7ba40e4 Mon Sep 17 00:00:00 2001
From: Tom Needham <tom@owncloud.com>
Date: Mon, 30 Jul 2012 12:44:34 +0000
Subject: [PATCH] Add the format parameter inside OC_API

---
 lib/api.php    |  2 +-
 ocs/routes.php | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/api.php b/lib/api.php
index 2203d86ac9..c61f50c1bc 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -40,7 +40,7 @@ class OC_API {
 	public static function register($method, $url, $action){
 		$name = strtolower($method).$url;
 		if(!isset(self::$actions[$name])){
-			OC_Router::create($name, $url)
+			OC_Router::create($name, $url.'.{format}')
 				->action('OC_API', 'call');
 			self::$actions[$name] = array();
 		}
diff --git a/ocs/routes.php b/ocs/routes.php
index e2f70342b8..2f8ab2a8f6 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -6,20 +6,20 @@
  */
 
 // Config
-OC_API::register('get', '/config.{format}', array('OC_OCS_Config', 'apiConfig'));
+OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'));
 // Person
-OC_API::register('post', '/person/check.{format}', array('OC_OCS_Person', 'check'));
+OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'));
 // Activity
-OC_API::register('get', '/activity.{format}', array('OC_OCS_Activity', 'activityGet'));
+OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'));
 // Privatedata
-OC_API::register('get', '/privatedata/getattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataGet'));
-OC_API::register('post', '/privatedata/setattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataPut'));
-OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}.{format}', array('OC_OCS_Privatedata', 'privatedataDelete'));
+OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataGet'));
+OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataPut'));
+OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'privatedataDelete'));
 // Cloud
-OC_API::register('get', '/cloud/system/webapps.{format}', array('OC_OCS_Cloud', 'systemwebapps'));
-OC_API::register('get', '/cloud/user/{user}.{format}', array('OC_OCS_Cloud', 'getQuota'));
-OC_API::register('post', '/cloud/user/{user}.{format}', array('OC_OCS_Cloud', 'setQuota'));
-OC_API::register('get', '/cloud/user/{user}/publickey.{format}', array('OC_OCS_Cloud', 'getPublicKey'));
-OC_API::register('get', '/cloud/user/{user}/privatekey.{format}', array('OC_OCS_Cloud', 'getPrivateKey'));
+OC_API::register('get', '/cloud/system/webapps', array('OC_OCS_Cloud', 'systemwebapps'));
+OC_API::register('get', '/cloud/user/{user}', array('OC_OCS_Cloud', 'getQuota'));
+OC_API::register('post', '/cloud/user/{user}', array('OC_OCS_Cloud', 'setQuota'));
+OC_API::register('get', '/cloud/user/{user}/publickey', array('OC_OCS_Cloud', 'getPublicKey'));
+OC_API::register('get', '/cloud/user/{user}/privatekey', array('OC_OCS_Cloud', 'getPrivateKey'));
 
 ?>
\ No newline at end of file