Branch 'kolab-webadmin-3.0' - lib/hosted

[Jeroen van Meeuwen]

 lib/hosted/kolab_client_task_signup.php |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d43abf019f529fbe26cac53af972c22434bfc160
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Sep 18 13:58:22 2012 +0100

    Introduce a new setting [$domain]/hosted_parent_domain_only that will control whether a registration form displays any of the domain aliases for $domain

diff --git a/lib/hosted/kolab_client_task_signup.php b/lib/hosted/kolab_client_task_signup.php
index c23ed5e..4bcc194 100644
--- a/lib/hosted/kolab_client_task_signup.php
+++ b/lib/hosted/kolab_client_task_signup.php
@@ -293,7 +293,13 @@ class kolab_client_task_signup extends kolab_client_task
                 $domain_name = $domain_attrs[$domain_name_attribute];
             }
 
-            $domain_names = array_merge($domain_names, $_domain_names);
+            $parent_domain_only = $this->config->get($domain_name, 'hosted_parent_domain_only');
+
+            if (!empty($parent_domain_only) && in_array(strtolower($parent_domain_only), array('1', 'yes', 'true'))) {
+                $domain_names = array_merge($domain_names, array($domain_name));
+            } else {
+                $domain_names = array_merge($domain_names, $_domain_names);
+            }
         }
 
         // prepare array with proper key ids for form building