summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8dfb282)
raw | patch | inline | side by side (parent: 8dfb282)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 12 Oct 2010 14:31:31 +0000 (14:31 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 12 Oct 2010 14:31:31 +0000 (14:31 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20005 594d385d-05f5-0310-b6e9-bd551577e9d8
gosa-plugins/groupware/personal/groupware/class_Groupware.inc | patch | blob | history | |
gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc | patch | blob | history |
diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index a4c4b8a4a53e8f2b697b0216381a27d50aca7a5a..dff1a0f4c38ffed62ccfe0878be3f961a8aa6455 100644 (file)
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 858fe71ad734926cbc4ca72664cdedb6c048a2cc..64dc67a848f98d41f85d6595dfed7dc306eedc11 100644 (file)
}
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
"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(
"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"))),
);