From: hickert Date: Tue, 12 Oct 2010 13:48:18 +0000 (+0000) Subject: Updated account creation X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=792ab75f0a362941afd5f7aa2cc394880562fdbe;p=gosa.git Updated account creation -Mechanism wasn't correct, if dn is 'new' do not check for account existence... git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20003 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc index a70e730e0..69c1e2bbc 100644 --- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc +++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc @@ -219,8 +219,10 @@ class Groupware extends plugin // If this is a new user, then do not try to check account status // the account cannot exists. + $this->mailLocations = $this->groupwareDao->get('mailLocations', array()); if($this->dn == "new"){ $this->initially_was_account = $this->is_account = FALSE; + $this->accountInitialized = TRUE; }else{ // Get rpc handle to fetch account info and feature availability. @@ -230,9 +232,6 @@ class Groupware extends plugin if($this->is_account){ $response = $this->groupwareDao->getComprehensiverUser($this->uid); $this->mapComprehensiveUserData($response); - }else{ - $emptyUser["mailLocations"] = $this->rpcExec('gwGetMailboxLocations'); - $this->mapComprehensiveUserData($emptyUser); } $this->accountInitialized = TRUE; } diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc index f7ad60711..858fe71ad 100644 --- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc +++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc @@ -1,4 +1,5 @@ array( "name" =>"Aufgaben",