From 792ab75f0a362941afd5f7aa2cc394880562fdbe Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 12 Oct 2010 13:48:18 +0000
Subject: [PATCH] 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
---
 .../groupware/personal/groupware/class_Groupware.inc         | 5 ++---
 .../groupware/personal/groupware/class_GroupwareDao.inc      | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 @@
 <?php
+
  
 /*! \brief Data Access Object for groupwares 
  */
@@ -311,8 +312,8 @@ class GroupwareDao{
 	//This is a feature with many datasets inside which should be cut in slices and saved separately.
 	//Since the knowledge about the feature is only known in the plugin this has got to be moved.
 	
-	function saveFoldersAndAcls($id, $mailFolder){
-		echo "Hape";
+	function saveFoldersAndAcls($id, $mailFolder)
+    {
 		/*
 		 'user/wiwu/Aufgaben' => array( 
                         "name" =>"Aufgaben",
-- 
2.30.2