diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php index 66ff9b91fe..e8d096d5cf 100755 --- a/calendar/inc/class.uicalendar.inc.php +++ b/calendar/inc/class.uicalendar.inc.php @@ -3168,11 +3168,13 @@ 'bg_color' => $this->theme['bg_text'], 'calendar_action' => ($event['id']?lang('Calendar - Edit'):lang('Calendar - Add')), 'action_url' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update')), - 'common_hidden' => ''."\n" - . ''."\n" - . ''."\n" - . ($GLOBALS['HTTP_GET_VARS']['cal_id'] && $event['id'] == 0?''."\n": - (@isset($event['reference'])?''."\n":'')), + 'common_hidden' => ''."\n" + . ''."\n" + . ''."\n" + . ($GLOBALS['HTTP_GET_VARS']['cal_id'] && $event['id'] == 0?''."\n": + (@isset($event['reference'])?''."\n":'')) + . (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']? + ''."\n":''), 'errormsg' => ($param['cd']?$GLOBALS['phpgw']->common->check_code($param['cd']):'') ); $p->set_var($vars); @@ -3275,39 +3277,42 @@ ); // Participants - $accounts = $GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar'); - $users = Array(); - $this->build_part_list($users,$accounts,$this->bo->owner); - - $str = ''; - @asort($users); - @reset($users); - while (list($id,$user_array) = each($users)) + if(!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) { - if($id != intval($this->bo->owner)) + $accounts = $GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar'); + $users = Array(); + $this->build_part_list($users,$accounts,$this->bo->owner); + + $str = ''; + @asort($users); + @reset($users); + while (list($id,$user_array) = each($users)) { - $str .= ' '."\n"; + if($id != intval($this->bo->owner)) + { + $str .= ' '."\n"; + } } - } - $var[] = Array( - 'field' => lang('Participants'), - 'data' => "\n".' ' - ); + $var[] = Array( + 'field' => lang('Participants'), + 'data' => "\n".' ' + ); // I Participate - if((($event['id'] > 0) && isset($event['participants'][$this->bo->owner])) || !$event['id']) - { - $checked = ' checked'; + if((($event['id'] > 0) && isset($event['participants'][$this->bo->owner])) || !$event['id']) + { + $checked = ' checked'; + } + else + { + $checked = ''; + } + $var[] = Array( + 'field' => $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).' '.lang('Participates'), + 'data' => '' + ); } - else - { - $checked = ''; - } - $var[] = Array( - 'field' => $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).' '.lang('Participates'), - 'data' => '' - ); - + for($i=0;$ioutput_template_array($p,'row','list',$var[$i]); diff --git a/calendar/templates/default/header.inc.php b/calendar/templates/default/header.inc.php index 49216a8caf..80ccbbfc90 100755 --- a/calendar/templates/default/header.inc.php +++ b/calendar/templates/default/header.inc.php @@ -152,7 +152,7 @@ $tpl->parse('header_column','head_col',True); } - if(count($this->bo->grants) > 0) + if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0) { $hidden_vars = ' '."\n"; if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords']) diff --git a/calendar/templates/idsociety/header.inc.php b/calendar/templates/idsociety/header.inc.php index 49216a8caf..80ccbbfc90 100755 --- a/calendar/templates/idsociety/header.inc.php +++ b/calendar/templates/idsociety/header.inc.php @@ -152,7 +152,7 @@ $tpl->parse('header_column','head_col',True); } - if(count($this->bo->grants) > 0) + if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0) { $hidden_vars = ' '."\n"; if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords']) diff --git a/calendar/templates/justweb/header.inc.php b/calendar/templates/justweb/header.inc.php index 49216a8caf..80ccbbfc90 100755 --- a/calendar/templates/justweb/header.inc.php +++ b/calendar/templates/justweb/header.inc.php @@ -152,7 +152,7 @@ $tpl->parse('header_column','head_col',True); } - if(count($this->bo->grants) > 0) + if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0) { $hidden_vars = ' '."\n"; if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords']) diff --git a/calendar/templates/verdilak/header.inc.php b/calendar/templates/verdilak/header.inc.php index 49216a8caf..80ccbbfc90 100755 --- a/calendar/templates/verdilak/header.inc.php +++ b/calendar/templates/verdilak/header.inc.php @@ -152,7 +152,7 @@ $tpl->parse('header_column','head_col',True); } - if(count($this->bo->grants) > 0) + if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0) { $hidden_vars = ' '."\n"; if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords'])