Branch 'ticket/3335' - lib/api

Daniel Hoffend hoffend at kolabsys.com
Wed Feb 18 23:21:51 CET 2015


 lib/api/kolab_api_service_form_value.php |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 3b8d87403f8e178f2b4a333b675ea697759c12f7
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Wed Feb 18 23:21:47 2015 +0100

    revert the targetfolder naming to the mail attribute

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() : '';
         }
     }
 




More information about the commits mailing list