From 0e50aaee77b2970263d326c1366ffe131a5cb8e7 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 17 Dec 2015 00:02:38 +0000 Subject: [PATCH] Remove no longer used preference for preselected group entering the planner --- calendar/inc/class.calendar_bo.inc.php | 5 ----- calendar/inc/class.calendar_hooks.inc.php | 9 --------- calendar/inc/class.calendar_ui.inc.php | 20 -------------------- calendar/inc/class.calendar_uiforms.inc.php | 3 +-- calendar/inc/class.calendar_uiviews.inc.php | 3 +-- 5 files changed, 2 insertions(+), 38 deletions(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 1ff3c7a174..111d8d80f9 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1965,10 +1965,6 @@ class calendar_bo $default_prefs =& $GLOBALS['egw']->preferences->default['calendar']; $forced_prefs =& $GLOBALS['egw']->preferences->forced['calendar']; - if (!($planner_start_with_group = $GLOBALS['egw']->accounts->name2id('Default'))) - { - $planner_start_with_group = '0'; - } $subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n"; $values = array( 'notifyAdded' => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'), @@ -1977,7 +1973,6 @@ class calendar_bo 'notifyDisinvited'=> $subject . lang ('You have been disinvited from the meeting at %1','$$startdate$$'), 'notifyResponse' => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'), 'notifyAlarm' => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'), - 'planner_start_with_group' => $planner_start_with_group, 'interval' => 30, ); foreach($values as $var => $default) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index f83eb154ae..275bcaa721 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -307,15 +307,6 @@ class calendar_hooks 'xmlrpc' => True, 'admin' => False ), - 'planner_start_with_group' => array( - 'type' => 'select', - 'label' => 'Preselected group for entering the planner', - 'name' => 'planner_start_with_group', - 'values' => $options, - 'help' => 'This group that is preselected when you enter the planner. You can change it in the planner anytime you want.', - 'xmlrpc' => True, - 'admin' => False, - ), 'planner_show_empty_rows' => array( 'type' => 'select', 'label' => 'Show empty rows in Planner', diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php index 1229aa3903..24150c15bd 100644 --- a/calendar/inc/class.calendar_ui.inc.php +++ b/calendar/inc/class.calendar_ui.inc.php @@ -391,26 +391,6 @@ class calendar_ui } if ($class == 'calendar_uiviews' || $class == 'calendar_uilist') { - // if planner_start_with_group is set in the users prefs: switch owner for planner to planner_start_with_group and back - if ($this->cal_prefs['planner_start_with_group']) - { - if ($this->cal_prefs['planner_start_with_group'] > 0) $this->cal_prefs['planner_start_with_group'] *= -1; // fix old 1.0 pref - - if (!$states_session && !$_GET['menuaction']) $this->view = ''; // first call to calendar - - if ($func == 'planner' && $this->view != 'planner' && $this->owner == $this->user) - { - //echo "

switched for planner to {$this->cal_prefs['planner_start_with_group']}, view was $this->view, func=$func, owner was $this->owner

\n"; - $states['save_owner'] = $this->save_owner = $this->owner; - $states['owner'] = $this->owner = $this->cal_prefs['planner_start_with_group']; - } - elseif ($func != 'planner' && $this->view == 'planner' && $this->owner == $this->cal_prefs['planner_start_with_group'] && $this->save_owner) - { - //echo "

switched back to $this->save_owner, view was $this->view, func=$func, owner was $this->owner

\n"; - $states['owner'] = $this->owner = $this->save_owner; - $states['save_owner'] = $this->save_owner = 0; - } - } $this->view = $states['view'] = $func; } $this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index'; diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index d12ae13c5e..4c9ae86ca9 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -85,8 +85,7 @@ class calendar_uiforms extends calendar_ui { $owner = $_GET['owner']; } - // dont set the planner start group as owner/participants if called from planner - elseif ($this->view != 'planner' || $this->owner != $this->cal_prefs['planner_start_with_group']) + else { $owner = $this->owner; } diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index d7bdc8df77..af0eedd09d 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -282,8 +282,7 @@ class calendar_uiviews extends calendar_ui 'date' => $this->bo->date2string($this->bo->now_su), 'cat_id' => 0, '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, + 'owner' => $this->user, 'multiple' => 0, 'view' => $this->bo->cal_prefs['mainscreen_showevents'], ));