From 7f88fab2bffb7a434c39f47862e50c4c53f1b084 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 12 Oct 2010 14:31:31 +0000
Subject: [PATCH] Updated Account creation

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20005 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../personal/groupware/class_Groupware.inc    |  4 ++--
 .../personal/groupware/class_GroupwareDao.inc | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index a4c4b8a4a..dff1a0f4c 100644
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -112,8 +112,8 @@ class Groupware extends plugin
         plugin::plugin($config,$dn); 
 
         // Get attributes from parent object 
-        if(isset($this->attrs['cn'])){
-            $this->cn = $this->attrs['cn'][0];
+        if(isset($this->attrs['uid'])){
+            $this->uid = $this->attrs['uid'][0];
         }
 
 		// Initialize file browser list
diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 858fe71ad..64dc67a84 100644
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -171,9 +171,10 @@ class GroupwareDao{
         }
 
         if($this->groupwarePluginRef->isFeatureEnabled("forwardingAddresses")){
-		$FWaddresses = $this->get("forwardingAddresses", array($uid));		
-//		$FWaddresses = current($FWaddresses);
-            $resultArr["forwardingAddresses"] = key($FWaddresses);
+    		$FWaddresses = $this->get("forwardingAddresses", array($uid));		
+            if($FWaddresses) {
+                $resultArr["forwardingAddresses"] = key($FWaddresses);
+            }
         }
 
         // Location dropdownlist - only readable
@@ -202,11 +203,11 @@ class GroupwareDao{
                         "acls"=> array( 	
                             array(
                                 "name" => "wiwu",
-                                "acl"  => RIGHTS_ALL, 
+                                "acl"  => GROUPWARE_RIGHTS_ALL, 
                                 "type"=>"user"),
                             array(
                                 "name" => "2a",
-                                "acl" => RIGHTS_ALL, 
+                                "acl" => GROUPWARE_RIGHTS_ALL, 
                                 "type"=>"user"))), 
 
                     'user/wiwu/Entw\xc3\xbcrfe' =>array(
@@ -214,35 +215,35 @@ class GroupwareDao{
                         "acls" => array(	
                             array(
                                 "name" => "wiwu",
-                                "acl" => RIGHTS_ALL, 
+                                "acl" => GROUPWARE_RIGHTS_ALL, 
                                 "type"=>"user"))), 
                     'user/wiwu/Gel\xc3\xb6schte Objekte' => array( 
                         "name" => "Gel\xc3\xb6schte Objekte", 
                         "acls" => array(	
                             array(
                                 "name" => "wiwu",
-                                "acl" => RIGHTS_ALL, 
+                                "acl" => GROUPWARE_RIGHTS_ALL, 
                                 "type"=>"user"))), 
                     'user/wiwu/Synchronisierungsprobleme/Lokale Fehler'  => array( 
                             "name" => "Lokale Fehler", 
                             "acls" => array(	
                                 array(
                                     "name" => "wiwu",
-                                    "acl" => RIGHTS_ALL, 
+                                    "acl" => GROUPWARE_RIGHTS_ALL, 
                                     "type"=>"user"))), 
                     'user/wiwu/Synchronisierungsprobleme/Serverfehler'  => array( 
                             "name" => "Serverfehler", 
                             "acls" => array(	
                                 array(
                                     "name" => "wiwu",
-                                    "acl" => RIGHTS_ALL, 
+                                    "acl" => GROUPWARE_RIGHTS_ALL, 
                                     "type"=>"user"))), 
                     'shared/publicFolder'  => array( 
                             "name" => "publicFolder", 
                             "acls" => array(	
                                 array(
                                     "name" => "wiwu",
-                                    "acl" => RIGHTS_ALL, 
+                                    "acl" => GROUPWARE_RIGHTS_ALL, 
                                     "type"=>"user"))), 
                     );
 			
-- 
2.30.2