Branch 'kolab-webadmin-3.0' - lib/kolab_api_controller.php
Aleksander Machniak
machniak at kolabsys.com
Fri Aug 2 15:53:29 CEST 2013
lib/kolab_api_controller.php | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 455e973d5a537a681f0b00abe4793cf574c639d1
Author: Aleksander Machniak <alec at alec.pl>
Date: Fri Aug 2 15:52:57 2013 +0200
Make so system.select_domain request returns selected domain attributes
diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php
index a4a4b78..3c7ea84 100644
--- a/lib/kolab_api_controller.php
+++ b/lib/kolab_api_controller.php
@@ -410,11 +410,16 @@ class kolab_api_controller
*
* @param array $request GET request parameters
*
- * @return bool
+ * @return bool|array Domain attributes or False on failure
*/
- private function select_domain($request) {
+ private function select_domain($request)
+ {
if (!empty($request['domain']) && is_string($request['domain'])) {
- return $_SESSION['user']->set_domain($request['domain']);
+ if ($_SESSION['user']->set_domain($request['domain'])) {
+ $service = $this->get_service('domain');
+ $domain = $service->domain_info(array('domain' => $request['domain']), null);
+ return $domain;
+ }
}
return false;
More information about the commits
mailing list