(groupwareplugin) adde getLocations to display "account Location" dropdownbox, when...

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 448a5cda7f006239e050a7e3591c273c6426af99..0098901e6f0da8e750ac57bd707f1bdb6848a81f 100644 (file)
--- 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 1c6be18aeb5f9224cc19dc5e68524b151b8c4aa9..6f88b13b26c3bf9ea24f8d3347cf61c170e67cf3 100644 (file)
--- 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');\r
             $resultArr["mailLocation"] = $this->groupwarePluginRef->rpcExec('gwAcctGetLocation',$uid);\r
         }\r
-\r
         \r
         //TODO: getLocation muss ebenfalls geholt werden \r
-\r
         // Quota quotaUsage, quotaSize\r
         if($this->groupwarePluginRef->isFeatureEnabled("quotaSize") || \r
                 $this->groupwarePluginRef->isFeatureEnabled("quotaUsage") || \r