From dd606a640db335660fe5ebc6748aac0ecf9bdf10 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Mon, 14 May 2012 12:51:29 +0200 Subject: Add domain API service --- lib/kolab_api_controller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/kolab_api_controller.php') diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php index cfd984a..23556c8 100644 --- a/lib/kolab_api_controller.php +++ b/lib/kolab_api_controller.php @@ -56,15 +56,16 @@ class kolab_api_controller } // TODO: register services based on config or whatsoever + $this->add_service('domain', 'kolab_api_service_domain'); + $this->add_service('domains', 'kolab_api_service_domains'); $this->add_service('form_value', 'kolab_api_service_form_value'); $this->add_service('group_types', 'kolab_api_service_group_types'); $this->add_service('group', 'kolab_api_service_group'); $this->add_service('groups', 'kolab_api_service_groups'); + $this->add_service('roles', 'kolab_api_service_roles'); $this->add_service('user_types', 'kolab_api_service_user_types'); $this->add_service('user', 'kolab_api_service_user'); $this->add_service('users', 'kolab_api_service_users'); - $this->add_service('domains', 'kolab_api_service_domains'); - $this->add_service('roles', 'kolab_api_service_roles'); } /** -- cgit v1.1 From f323bc43f46c8b108121e81d5227c5c09acbead8 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Mon, 14 May 2012 12:12:34 +0100 Subject: Merge --- lib/kolab_api_controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/kolab_api_controller.php') diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php index 23556c8..3530083 100644 --- a/lib/kolab_api_controller.php +++ b/lib/kolab_api_controller.php @@ -48,11 +48,11 @@ class kolab_api_controller ); } else { - throw new Exception("Unknown method", 400); + throw new Exception("Unknown method " . $_GET['method'], 400); } } else { - throw new Exception("Unknown service", 400); + throw new Exception("Unknown service " . $_GET['service'], 400); } // TODO: register services based on config or whatsoever -- cgit v1.1 From 942f537ac18b13dbc18d11c0a5453aef68f533c3 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Mon, 14 May 2012 16:28:13 +0100 Subject: Fix domains with aliases mixing up the capabilities return --- lib/kolab_api_controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/kolab_api_controller.php') diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php index 3530083..5fbe099 100644 --- a/lib/kolab_api_controller.php +++ b/lib/kolab_api_controller.php @@ -308,11 +308,13 @@ class kolab_api_controller $this->domains[] = $_SESSION['user']->get_domain(); } + //console("\$this->domains:", $this->domains); + // add capabilities of all registered services foreach ($this->domains as $domain) { // TODO: 'associateddomain' is very specific to 389ds based deployments, and this // is supposed to be very generic. - $domain_name = is_array($domain) ? $domain['associateddomain'] : $domain; + $domain_name = is_array($domain) ? (is_array($domain['associateddomain']) ? $domain['associateddomain'][0] : $domain['associateddomain']) : $domain; // define our very own capabilities $actions = array( 'system.quit' => array('type' => 'w'), @@ -326,6 +328,8 @@ class kolab_api_controller } } + //console("api capabilities", $domain, $domain_name); + $result[$domain_name] = array('actions' => $actions); } -- cgit v1.1 From ffe21f242320ea991e5c9f47327d86c16a4fc459 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Tue, 15 May 2012 09:57:31 +0100 Subject: Disable console() calls --- lib/kolab_api_controller.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/kolab_api_controller.php') diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php index 5fbe099..e3a5640 100644 --- a/lib/kolab_api_controller.php +++ b/lib/kolab_api_controller.php @@ -133,7 +133,7 @@ class kolab_api_controller $method = $this->request['method']; $postdata = @json_decode($postdata, true); - console("Calling method " . $method . " on service " . $service); + //console("Calling method " . $method . " on service " . $service); // validate user session if ($service != 'system' || $method != 'authenticate') { @@ -181,7 +181,7 @@ class kolab_api_controller $method = $this->request['method']; $url = rtrim($url, '/') . '/' . $service . '.' . $method; - console("Proxying " . $url); + //console("Proxying " . $url); $request = new HTTP_Request2(); $url = new Net_URL2($url); @@ -297,7 +297,9 @@ class kolab_api_controller */ private function capabilities() { + //console("system.capabilities called"); $auth = Auth::get_instance(); + $this->domains = $auth->list_domains(); $result = array(); @@ -305,6 +307,7 @@ class kolab_api_controller // Should we have no permissions to list domain name spaces, // we should always return our own. if (count($this->domains) < 1) { + //console("As there is but one domain, we insert our own"); $this->domains[] = $_SESSION['user']->get_domain(); } -- cgit v1.1 From 68479de37f1b32eb0b3cd6f081e8d53923a9ac60 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Tue, 22 May 2012 17:37:44 +0100 Subject: Add resources to the API controller --- lib/kolab_api_controller.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'lib/kolab_api_controller.php') diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php index e3a5640..cd5782c 100644 --- a/lib/kolab_api_controller.php +++ b/lib/kolab_api_controller.php @@ -56,16 +56,19 @@ class kolab_api_controller } // TODO: register services based on config or whatsoever - $this->add_service('domain', 'kolab_api_service_domain'); - $this->add_service('domains', 'kolab_api_service_domains'); - $this->add_service('form_value', 'kolab_api_service_form_value'); - $this->add_service('group_types', 'kolab_api_service_group_types'); - $this->add_service('group', 'kolab_api_service_group'); - $this->add_service('groups', 'kolab_api_service_groups'); - $this->add_service('roles', 'kolab_api_service_roles'); - $this->add_service('user_types', 'kolab_api_service_user_types'); - $this->add_service('user', 'kolab_api_service_user'); - $this->add_service('users', 'kolab_api_service_users'); + $this->add_service('domain', 'kolab_api_service_domain'); + $this->add_service('domains', 'kolab_api_service_domains'); + $this->add_service('form_value', 'kolab_api_service_form_value'); + $this->add_service('group_types', 'kolab_api_service_group_types'); + $this->add_service('group', 'kolab_api_service_group'); + $this->add_service('groups', 'kolab_api_service_groups'); + $this->add_service('resource_types', 'kolab_api_service_resource_types'); + $this->add_service('resource', 'kolab_api_service_resource'); + $this->add_service('resources', 'kolab_api_service_resources'); + $this->add_service('roles', 'kolab_api_service_roles'); + $this->add_service('user_types', 'kolab_api_service_user_types'); + $this->add_service('user', 'kolab_api_service_user'); + $this->add_service('users', 'kolab_api_service_users'); } /** -- cgit v1.1 From 216ff1b095ea1f2a09b1ee4cd45bacbd9e934922 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Fri, 25 May 2012 11:58:10 +0100 Subject: Replace uses of error_log(), with console() and disable them --- lib/kolab_api_controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/kolab_api_controller.php') diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php index cd5782c..e7adbab 100644 --- a/lib/kolab_api_controller.php +++ b/lib/kolab_api_controller.php @@ -77,7 +77,7 @@ class kolab_api_controller public function add_service($service, $handler) { if ($this->services[$service]) { - error_log("Service $service is already registered."); + //console("Service $service is already registered."); return false; } @@ -104,7 +104,7 @@ class kolab_api_controller } } - error_log("Unknown service $service"); + //console("Unknown service $service"); throw new Exception("Unknown service", 400); } -- cgit v1.1