MDL-41792 block_calendar_upcoming: tidy existing code

This commit is contained in:
Mark Nelson 2013-09-25 15:40:23 +08:00
parent ec126f624e
commit bb74cdfef3

View File

@ -1,25 +1,53 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Handles displaying the calendar upcoming events block.
*
* @package block_calendar_upcoming
* @copyright 2004 Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class block_calendar_upcoming extends block_base {
function init() {
/**
* Initialise the block.
*/
public function init() {
$this->title = get_string('pluginname', 'block_calendar_upcoming');
}
function get_content() {
global $USER, $CFG, $SESSION;
$cal_m = optional_param( 'cal_m', 0, PARAM_INT );
$cal_y = optional_param( 'cal_y', 0, PARAM_INT );
/**
* Return the content of this block.
*
* @return stdClass the content
*/
public function get_content() {
global $CFG;
require_once($CFG->dirroot.'/calendar/lib.php');
if ($this->content !== NULL) {
if ($this->content !== null) {
return $this->content;
}
$this->content = new stdClass;
$this->content->text = '';
$filtercourse = array();
if (empty($this->instance)) { // Overrides: use no course at all
if (empty($this->instance)) { // Overrides: use no course at all.
$courseshown = false;
$this->content->footer = '';