From 7aaca085fb4de37d378add1f08b3d8b1ef61c291 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Fri, 8 Sep 2017 13:51:40 +0800 Subject: [PATCH] MDL-59392 calendar: Deprecate old event filters --- calendar/lib.php | 82 ------------------------------------------ calendar/renderer.php | 18 ---------- calendar/set.php | 60 ------------------------------- lang/en/calendar.php | 35 +++++++++--------- lang/en/deprecated.txt | 16 +++++++++ 5 files changed, 34 insertions(+), 177 deletions(-) delete mode 100644 calendar/set.php diff --git a/calendar/lib.php b/calendar/lib.php index 11df73fc61c..c1b342b9629 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -1981,88 +1981,6 @@ function calendar_top_controls($type, $data) { return $content; } -/** - * Formats a filter control element. - * - * @param moodle_url $url of the filter - * @param int $type constant defining the type filter - * @return string html content of the element - */ -function calendar_filter_controls_element(moodle_url $url, $type) { - global $OUTPUT; - - switch ($type) { - case CALENDAR_EVENT_GLOBAL: - $typeforhumans = 'global'; - $class = 'calendar_event_global'; - break; - case CALENDAR_EVENT_COURSE: - $typeforhumans = 'course'; - $class = 'calendar_event_course'; - break; - case CALENDAR_EVENT_GROUP: - $typeforhumans = 'groups'; - $class = 'calendar_event_group'; - break; - case CALENDAR_EVENT_USER: - $typeforhumans = 'user'; - $class = 'calendar_event_user'; - break; - } - - if (calendar_show_event_type($type)) { - $icon = $OUTPUT->pix_icon('t/hide', get_string('hide')); - $str = get_string('hide' . $typeforhumans . 'events', 'calendar'); - } else { - $icon = $OUTPUT->pix_icon('t/show', get_string('show')); - $str = get_string('show' . $typeforhumans . 'events', 'calendar'); - } - $content = \html_writer::start_tag('li', array('class' => 'calendar_event')); - $content .= \html_writer::start_tag('a', array('href' => $url, 'rel' => 'nofollow')); - $content .= \html_writer::tag('span', $icon, array('class' => $class)); - $content .= \html_writer::tag('span', $str, array('class' => 'eventname')); - $content .= \html_writer::end_tag('a'); - $content .= \html_writer::end_tag('li'); - - return $content; -} - -/** - * Get the controls filter for calendar. - * - * Filter is used to hide calendar info from the display page. - * - - * @param moodle_url $returnurl return-url for filter controls - * @return string $content return filter controls in html - */ -function calendar_filter_controls(moodle_url $returnurl) { - $groupevents = true; - - $seturl = new \moodle_url('/calendar/set.php', array('return' => base64_encode($returnurl->out_as_local_url(false)), - 'sesskey' => sesskey())); - $content = \html_writer::start_tag('ul'); - - $seturl->param('var', 'showglobal'); - $content .= calendar_filter_controls_element($seturl, CALENDAR_EVENT_GLOBAL); - - $seturl->param('var', 'showcourses'); - $content .= calendar_filter_controls_element($seturl, CALENDAR_EVENT_COURSE); - - if (isloggedin() && !isguestuser()) { - if ($groupevents) { - // This course MIGHT have group events defined, so show the filter. - $seturl->param('var', 'showgroups'); - $content .= calendar_filter_controls_element($seturl, CALENDAR_EVENT_GROUP); - } - $seturl->param('var', 'showuser'); - $content .= calendar_filter_controls_element($seturl, CALENDAR_EVENT_USER); - } - $content .= \html_writer::end_tag('ul'); - - return $content; -} - /** * Return the representation day. * diff --git a/calendar/renderer.php b/calendar/renderer.php index d0fdec6cd66..dc597abf2e6 100644 --- a/calendar/renderer.php +++ b/calendar/renderer.php @@ -50,24 +50,6 @@ class core_calendar_renderer extends plugin_renderer_base { return html_writer::end_tag('div'); } - /** - * Produces the content for the filters block (pretend block) - * - * @param int $courseid - * @param int $day - * @param int $month - * @param int $year - * @param int $view - * @param int $courses - * @return string - */ - public function fake_block_filters($courseid, $day, $month, $year, $view, $courses) { - $returnurl = $this->page->url; - $returnurl->param('course', $courseid); - return html_writer::tag('div', calendar_filter_controls($returnurl), - array('class' => 'calendar_filters filters')); - } - /** * Produces the content for the three months block (pretend block) * diff --git a/calendar/set.php b/calendar/set.php deleted file mode 100644 index c69de934a1a..00000000000 --- a/calendar/set.php +++ /dev/null @@ -1,60 +0,0 @@ -. - -/** - * Sets the events filter for the calendar view. - * - * @package core_calendar - * @copyright 2003 Jon Papaioannou (pj@moodle.org) - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -require_once('../config.php'); -require_once($CFG->dirroot.'/calendar/lib.php'); - -$var = required_param('var', PARAM_ALPHA); -$return = clean_param(base64_decode(required_param('return', PARAM_RAW)), PARAM_LOCALURL); -$courseid = optional_param('id', -1, PARAM_INT); -if ($courseid != -1) { - $return = new moodle_url($return, array('course' => $courseid)); -} else { - $return = new moodle_url($return); -} - -if (!confirm_sesskey()) { - // Do not call require_sesskey() since this page may be accessed without session (for example by bots). - redirect($return); -} - -$url = new moodle_url('/calendar/set.php', array('return'=>base64_encode($return->out_as_local_url(false)), 'course' => $courseid, 'var'=>$var, 'sesskey'=>sesskey())); -$PAGE->set_url($url); -$PAGE->set_context(context_system::instance()); - -switch($var) { - case 'showgroups': - calendar_set_event_type_display(CALENDAR_EVENT_GROUP); - break; - case 'showcourses': - calendar_set_event_type_display(CALENDAR_EVENT_COURSE); - break; - case 'showglobal': - calendar_set_event_type_display(CALENDAR_EVENT_GLOBAL); - break; - case 'showuser': - calendar_set_event_type_display(CALENDAR_EVENT_USER); - break; -} - -redirect($return); diff --git a/lang/en/calendar.php b/lang/en/calendar.php index aad2d9138e4..30a936c1387 100644 --- a/lang/en/calendar.php +++ b/lang/en/calendar.php @@ -136,11 +136,6 @@ $string['gotocalendar'] = 'Go to calendar'; $string['group'] = 'Group'; $string['groupevent'] = 'Group event'; $string['groupevents'] = 'Group events'; -$string['hidecourseevents'] = 'Hide course events'; -$string['hideglobalevents'] = 'Hide global events'; -$string['hidegroupsevents'] = 'Hide group events'; -$string['hidemoduleevents'] = 'Hide module events'; -$string['hideuserevents'] = 'Hide user events'; $string['eventtypeglobal'] = 'global'; $string['eventtypesite'] = 'global'; $string['eventtypecourse'] = 'course'; @@ -205,10 +200,6 @@ $string['repeatweeksl'] = 'Repeat weekly, creating altogether'; $string['repeatweeksr'] = 'events'; $string['sat'] = 'Sat'; $string['saturday'] = 'Saturday'; -$string['showcourseevents'] = 'Show course events'; -$string['showglobalevents'] = 'Show global events'; -$string['showgroupsevents'] = 'Show group events'; -$string['showuserevents'] = 'Show user events'; $string['shown'] = 'shown'; $string['siteevents'] = 'Site events'; $string['spanningevents'] = 'Events underway'; @@ -229,14 +220,6 @@ $string['todayplustitle'] = 'Today {$a}'; $string['tomorrow'] = 'Tomorrow'; $string['tt_deleteevent'] = 'Delete event'; $string['tt_editevent'] = 'Edit event'; -$string['tt_hidecourse'] = 'Course events are shown (click to hide)'; -$string['tt_hideglobal'] = 'Global events are shown (click to hide)'; -$string['tt_hidegroups'] = 'Group events are shown (click to hide)'; -$string['tt_hideuser'] = 'User events are shown (click to hide)'; -$string['tt_showcourse'] = 'Course events are hidden (click to show)'; -$string['tt_showglobal'] = 'Global events are hidden (click to show)'; -$string['tt_showgroups'] = 'Group events are hidden (click to show)'; -$string['tt_showuser'] = 'User events are hidden (click to show)'; $string['tue'] = 'Tue'; $string['tuesday'] = 'Tuesday'; $string['typeclose'] = 'Close event'; @@ -264,3 +247,21 @@ $string['youcandeleteallrepeats'] = 'This event is part of a repeating event ser // Deprecated since Moodle 3.2. $string['for'] = 'for'; + +// Deprecated since Moodle 3.4. +$string['tt_hidecourse'] = 'Course events are shown (click to hide)'; +$string['tt_hideglobal'] = 'Global events are shown (click to hide)'; +$string['tt_hidegroups'] = 'Group events are shown (click to hide)'; +$string['tt_hideuser'] = 'User events are shown (click to hide)'; +$string['tt_showcourse'] = 'Course events are hidden (click to show)'; +$string['tt_showglobal'] = 'Global events are hidden (click to show)'; +$string['tt_showgroups'] = 'Group events are hidden (click to show)'; +$string['tt_showuser'] = 'User events are hidden (click to show)'; +$string['hidecourseevents'] = 'Hide course events'; +$string['hideglobalevents'] = 'Hide global events'; +$string['hidegroupsevents'] = 'Hide group events'; +$string['hideuserevents'] = 'Hide user events'; +$string['showcourseevents'] = 'Show course events'; +$string['showglobalevents'] = 'Show global events'; +$string['showgroupsevents'] = 'Show group events'; +$string['showuserevents'] = 'Show user events'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 995f16bc483..cd7bb58f4ea 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -63,3 +63,19 @@ sectionusedefaultname,core registermoochtips,core_hub monthnext,core_access monthprev,core_access +tt_hidecourse,core_calendar +tt_hideglobal,core_calendar +tt_hidegroups,core_calendar +tt_hideuser,core_calendar +tt_showcourse,core_calendar +tt_showglobal,core_calendar +tt_showgroups,core_calendar +tt_showuser,core_calendar +hidecourseevents,core_calendar +hideglobalevents,core_calendar +hidegroupsevents,core_calendar +hideuserevents,core_calendar +showcourseevents,core_calendar +showglobalevents,core_calendar +showgroupsevents,core_calendar +showuserevents,core_calendar