summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hoffend <dh@dotlan.net>2015-02-18 22:21:47 (GMT)
committerDaniel Hoffend <dh@dotlan.net>2015-02-18 22:21:47 (GMT)
commit3b8d87403f8e178f2b4a333b675ea697759c12f7 (patch)
treeeaad0e5d121afabbbea42dca61c46e0dfc85862c
parent77e67f34ac5560caad011a4e85e2a87ad11275dd (diff)
downloadkolab-wap-3b8d87403f8e178f2b4a333b675ea697759c12f7.tar.gz
revert the targetfolder naming to the mail attribute
-rw-r--r--lib/api/kolab_api_service_form_value.php14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 86e1a26..26a2fbf 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -581,22 +581,10 @@ class kolab_api_service_form_value extends kolab_api_service
return '';
}
- // determine the @emaildomain part
- $email_domain = '';
- $at_index = strrpos($postdata['mail'], "@");
- if (!(is_bool($at_index) && !$at_index)) {
- $email_domain = substr($postdata['mail'], $at_index+1);
- }
-
- // if no email is set or domain isn't valid return empty
- if (!$email_domain || !in_array($email_domain, $this->_get_valid_domains())) {
- return '';
- }
-
$cn = $postdata['cn'];
$imap_hierarchysep = '/';
- return $cn ? 'shared' . $imap_hierarchysep . $cn . '@' . $email_domain : '';
+ return $cn ? 'shared' . $imap_hierarchysep . $cn . '@' . $_SESSION['user']->get_domain() : '';
}
}