diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index 1835295afe..59536f836d 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -1144,6 +1144,11 @@ class calendar_groupdav extends groupdav_handler $privileges = parent::current_user_privileges($path, $user); //error_log(__METHOD__."('$path', $user) parent gave ".array2string($privileges)); + if (!$user || $user == $GLOBALS['egw_info']['user']['account_id']) + { + $privileges['all'] = 'all'; + } + if ($this->bo->check_perms(EGW_ACL_FREEBUSY, 0, $user)) { $privileges['read-free-busy'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'read-free-busy', ''); diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 572dfde41c..e4f698d7fa 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @package calendar * @author Ralf Becker - * @copyright (c) 2005-12 by RalfBecker-At-outdoor-training.de + * @copyright (c) 2005-13 by RalfBecker-At-outdoor-training.de * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -77,7 +77,7 @@ class calendar_uilist extends calendar_ui $this->__construct(array( 'date' => $this->bo->date2string($this->bo->now_su), 'cat_id' => 0, - 'filter' => 'all', + 'filter' => 'default', 'owner' => $this->user, 'multiple' => 0, 'view' => $this->bo->cal_prefs['mainscreen_showevents'], diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index cb518c6e6f..79070972a7 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @package calendar * @author Ralf Becker - * @copyright (c) 2004-12 by RalfBecker-At-outdoor-training.de + * @copyright (c) 2004-13 by RalfBecker-At-outdoor-training.de * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -240,7 +240,7 @@ class calendar_uiviews extends calendar_ui $this->__construct(array( 'date' => $this->bo->date2string($this->bo->now_su), 'cat_id' => 0, - 'filter' => 'all', + 'filter' => 'default', 'owner' => substr($this->cal_prefs['mainscreen_showevents'],0,7) == 'planner' && $this->cal_prefs['planner_start_with_group'] ? $this->cal_prefs['planner_start_with_group'] : $this->user, 'multiple' => 0, @@ -277,6 +277,7 @@ class calendar_uiviews extends calendar_ui case 'day': return $group_warning.$this->day(true); + case 'day4': return $group_warning.$this->week(4,true); }