holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed typo calling not existing check_acl instead of check_acl_invite

Browse Source 
- fixed check_acl_invite to work with no acl set too
This commit is contained in:
Ralf Becker 2009-11-24 13:13:41 +00:00
parent d91933ac5f
commit 9726ed19fc
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -323,7 +323,7 @@ class calendar_boupdate extends calendar_bo
$removed[] = $uid; $removed[] = $uid;
} }
} }
echo "<p>".__METHOD__."($event[title],".($old_event?'$old_event':'NULL').") returning ".array2string($removed)."</p>"; //echo "<p>".__METHOD__."($event[title],".($old_event?'$old_event':'NULL').") returning ".array2string($removed)."</p>";
return $removed; return $removed;
} }
@ -336,12 +336,21 @@ class calendar_boupdate extends calendar_bo
public function check_acl_invite($uid) public function check_acl_invite($uid)
{ {
if (!is_numeric($uid)) return true; // nothing implemented for resources so far if (!is_numeric($uid)) return true; // nothing implemented for resources so far
if ($this->require_acl_invite == 'group' && $GLOBALS['egw']->accounts->get_type($uid) != 'g') if (!$this->require_acl_invite)
{ {
return true; // grant only required for groups $ret = true; // no grant required
} }
return $this->check_perms(EGW_ACL_INVITE,0,$uid); elseif ($this->require_acl_invite == 'group' && $GLOBALS['egw']->accounts->get_type($uid) != 'g')
{
$ret = true; // grant only required for groups
}
else
{
$ret = $this->check_perms(EGW_ACL_INVITE,0,$uid);
}
//error_log(__METHOD__."($uid) = ".array2string($ret));
return $ret;
} }
/** /**

2
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -292,7 +292,7 @@ class calendar_uiforms extends calendar_ui
foreach($this->bo->resources as $type => $data) if ($data['app'] == $app) break; foreach($this->bo->resources as $type => $data) if ($data['app'] == $app) break;
$uid = $this->bo->resources[$type]['app'] == $app ? $type.$id : false; $uid = $this->bo->resources[$type]['app'] == $app ? $type.$id : false;
// check if new entry is no account (or contact entry of an account) // check if new entry is no account (or contact entry of an account)
if ($app != 'addressbook' || !($data = $GLOBALS['egw']->accounts->name2id($id,'person_id')) || !$this->bo->check_acl($data)) if ($app != 'addressbook' || !($data = $GLOBALS['egw']->accounts->name2id($id,'person_id')) || !$this->bo->check_acl_invite($data))
{ {
if ($uid && $id) if ($uid && $id)
{ {