From: hzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 29 Sep 2010 14:01:45 +0000 (+0000)
Subject: (groupwareplugin) adde getLocations to display "account Location" dropdownbox, when... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b18d6cb6db6bdefdbf09ac0407cd087c30e3bd00;p=gosa.git

(groupwareplugin) adde getLocations to display "account Location" dropdownbox, when user does not exist.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19852 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 448a5cda7..0098901e6 100644
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -183,6 +183,8 @@ class Groupware extends plugin
 
         // Get rpc handle to fetch account info and feature availability.
         $status = $this->rpcExec('gwAcctExists', $this->uid);
+		// mailboxlocations for the dropdownBox
+        
         if($status !== NULL){
             $this->initially_was_account = $this->is_account = $status;
 
@@ -190,8 +192,13 @@ class Groupware extends plugin
                 $response = $this->groupwareDao->getComprehensiverUser($this->uid);
                 $this->mapComprehensiveUserData($response);
             }
+			else{
+				$emptyUser["mailLocations"] = $this->rpcExec('gwGetMailboxLocations');
+				$this->mapComprehensiveUserData($emptyUser);
+			}
             $this->accountInitialized = TRUE;
         }
+		
 
         // Set vacation start/stop if not set alreasy
         $this->vacationStart = time();
diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 1c6be18ae..6f88b13b2 100644
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -172,10 +172,8 @@ class GroupwareDao{
             $resultArr["mailLocations"] = $this->groupwarePluginRef->rpcExec('gwGetMailboxLocations');
             $resultArr["mailLocation"] = $this->groupwarePluginRef->rpcExec('gwAcctGetLocation',$uid);
         }
-
         
         //TODO: getLocation muss ebenfalls geholt werden 
-
         // Quota quotaUsage, quotaSize
         if($this->groupwarePluginRef->isFeatureEnabled("quotaSize") || 
                 $this->groupwarePluginRef->isFeatureEnabled("quotaUsage") ||