From e96b10b121f742ec6eedcb1ce2d586bc4aaac70d Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 4 Apr 2012 14:20:07 +1200 Subject: [PATCH] MDL-32009 message: Small changes before integration --- admin/message.php | 5 ++--- lib/pluginlib.php | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/admin/message.php b/admin/message.php index fde314de43f..8e78fc30231 100644 --- a/admin/message.php +++ b/admin/message.php @@ -24,7 +24,6 @@ require_once(dirname(__FILE__) . '/../config.php'); require_once($CFG->dirroot . '/message/lib.php'); require_once($CFG->libdir.'/adminlib.php'); -require_once($CFG->libdir.'/messagelib.php'); // This is an admin page admin_externalpage_setup('managemessageoutputs'); @@ -35,8 +34,8 @@ require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); // Get the submitted params $disable = optional_param('disable', 0, PARAM_INT); $enable = optional_param('enable', 0, PARAM_INT); -$uninstall = optional_param('uninstall', '', PARAM_INT); -$confirm = optional_param('confirm', 0, PARAM_BOOL); +$uninstall = optional_param('uninstall', 0, PARAM_INT); +$confirm = optional_param('confirm', false, PARAM_BOOL); $headingtitle = get_string('managemessageoutputs', 'message'); diff --git a/lib/pluginlib.php b/lib/pluginlib.php index d451f66d53c..6943db41fb4 100644 --- a/lib/pluginlib.php +++ b/lib/pluginlib.php @@ -1530,8 +1530,14 @@ class plugintype_enrol extends plugintype_base implements plugin_information { */ class plugintype_message extends plugintype_base implements plugin_information { + /** + * @var array An array of processor objects + */ private $processors; + /** + * Constructs a plugintype_message instance + */ protected function __construct() { global $CFG; require_once($CFG->dirroot . '/message/lib.php'); @@ -1539,23 +1545,27 @@ class plugintype_message extends plugintype_base implements plugin_information { } /** + * Returns a URL to the settings page for the plugin if there is one + * * @see plugin_information::get_settings_url() + * @return moodle_url|null */ public function get_settings_url() { if (isset($this->processors[$this->name])) { $processor = $this->processors[$this->name]; - } else { - return parent::get_settings_url(); - } - - if ($processor->available && $processor->hassettings) { - return new moodle_url('settings.php', array('section' => 'messagesetting'.$processor->name)); + if ($processor->available && $processor->hassettings) { + return new moodle_url('settings.php', array('section' => 'messagesetting'.$processor->name)); + } } + return parent::get_settings_url(); } /** + * Returns true if this plugin is enabled + * * @see plugintype_interface::is_enabled() + * @return bool */ public function is_enabled() { if (isset($this->processors[$this->name])) { @@ -1566,6 +1576,8 @@ class plugintype_message extends plugintype_base implements plugin_information { } /** + * Returns the URL used to uninstall the plugin if there is one. + * * @see plugintype_interface::get_uninstall_url() */ public function get_uninstall_url() { -- 2.43.0