merged the Groupware values already available with the dummy message in the FE Mask.

This will disply the original data in gosa the first time.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19595 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 e79e1ca86fa14d7a4d8c6022161fd4519e814c6e..1cd06d9ecee0a27d90e0c831e219b5b9c2beabc4 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
@@ -182,7 +182,7 @@ class groupware extends plugin
         if($status !== NULL){
                                
                var_dump($this->rpcExec('gwAcctGetLocation',$this->uid));
-               $User =$this->groupwareDao->getComprehensiverUser($this->uid);
+               $compResponse = $this->groupwareDao->getComprehensiverUser($this->uid);
                
                        $response = array("mailAddress"=>"hape@exdom.de",
             "mailLocation"=>"hape@exdom.de",
@@ -204,12 +204,15 @@ class groupware extends plugin
             "mailBoxAutomaticRemovalValue"=>"mailBoxAutomaticRemovalValue",
             "localDeliveryOnly"=>0,
             "dropOwnMails"=>0 );
+                       
+                       $response = array_merge( $response, $compResponse);
+                       $this->groupwareDao->debug("Merged Comp Array:", $response);
+                       
                        $this->mapComprehensiveUserData($response);
             $this->initially_was_account = $this->is_account = $status;
         
                $this->accountInitialized = TRUE;
         }
-
         // Set vacation start/stop if not set alreasy
         $this->vacationStart = time();
         $this->vacationStop = time() + (14 * 60*60*24);
@@ -771,7 +774,7 @@ class groupware extends plugin
            $this->filterRules = $callBackMap["filterRules"];
            $this->vacationTemplates = $callBackMap["vacationTemplates"];
        
-           $this->mailAddress = $callBackMap["mailAddress"];
+           $this->mailAddress = $callBackMap["primaryMail"];
            $this->mailLocation = $callBackMap["mailLocation"];
            $this->quotaUsage = $callBackMap["quotaUsage"];
            $this->quotaSize = $callBackMap["quotaSize"];
@@ -968,7 +971,7 @@ class groupware_dao{
                 */
                if($this->groupwarePluginRef->isFeatureEnabled("vacationMessage")){
                        
-                       $vacMessage = $this->get("vacationMessage", array($uid));
+                       //$vacMessage = $this->get("vacationMessage", array($uid));
                        
                        $resultArr["vacationMessage"] = "dummy Vacation message";
                }