From c17ec774d7b4101e38ea3793f1ed3bb817405920 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 12 Jun 2012 22:32:43 +0800 Subject: [PATCH] MDL-33552 - portfolio api E_STRICT fixes admin_config_form and admin_config_validation are now static --- lib/portfolio/forms.php | 17 ++++------------- lib/portfolio/plugin.php | 4 ++-- portfolio/boxnet/lib.php | 2 +- portfolio/flickr/lib.php | 2 +- portfolio/googledocs/lib.php | 2 +- portfolio/mahara/lib.php | 2 +- portfolio/picasa/lib.php | 2 +- portfolio/upgrade.txt | 9 +++++++++ 8 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 portfolio/upgrade.txt diff --git a/lib/portfolio/forms.php b/lib/portfolio/forms.php index 7b7c66908ed..2e95777326d 100644 --- a/lib/portfolio/forms.php +++ b/lib/portfolio/forms.php @@ -199,13 +199,9 @@ final class portfolio_admin_form extends moodleform { // let the plugin add the fields they want (either statically or not) if (portfolio_static_function($this->plugin, 'has_admin_config')) { - if (!$this->instance) { - require_once($CFG->libdir . '/portfolio/plugin.php'); - require_once($CFG->dirroot . '/portfolio/' . $this->plugin . '/lib.php'); - call_user_func(array('portfolio_plugin_' . $this->plugin, 'admin_config_form'), $mform); - } else { - $this->instance->admin_config_form($mform); - } + require_once($CFG->libdir . '/portfolio/plugin.php'); + require_once($CFG->dirroot . '/portfolio/' . $this->plugin . '/lib.php'); + call_user_func(array('portfolio_plugin_' . $this->plugin, 'admin_config_form'), $mform); } // and set the data if we have some. @@ -237,12 +233,7 @@ final class portfolio_admin_form extends moodleform { } $pluginerrors = array(); - if ($this->instance) { - $pluginerrors = $this->instance->admin_config_validation($data); - } - else { - $pluginerrors = portfolio_static_function($this->plugin, 'admin_config_validation', $data); - } + $pluginerrors = portfolio_static_function($this->plugin, 'admin_config_validation', $data); if (is_array($pluginerrors)) { $errors = array_merge($errors, $pluginerrors); } diff --git a/lib/portfolio/plugin.php b/lib/portfolio/plugin.php index 6c32ffc6420..34c40c8d3fd 100644 --- a/lib/portfolio/plugin.php +++ b/lib/portfolio/plugin.php @@ -347,7 +347,7 @@ abstract class portfolio_plugin_base { * * @param moodleform $mform passed by reference, add elements to it. */ - public function admin_config_form(&$mform) {} + public static function admin_config_form(&$mform) {} /** * Just like the moodle form validation function, @@ -356,7 +356,7 @@ abstract class portfolio_plugin_base { * * @param array $data data from form. */ - public function admin_config_validation($data) {} + public static function admin_config_validation($data) {} /** * mform to display to the user exporting data using this plugin. diff --git a/portfolio/boxnet/lib.php b/portfolio/boxnet/lib.php index 99c42ba940a..120f61e8030 100644 --- a/portfolio/boxnet/lib.php +++ b/portfolio/boxnet/lib.php @@ -106,7 +106,7 @@ class portfolio_plugin_boxnet extends portfolio_plugin_push_base { } } - public function admin_config_form(&$mform) { + public static function admin_config_form(&$mform) { global $CFG; $mform->addElement('text', 'apikey', get_string('apikey', 'portfolio_boxnet')); diff --git a/portfolio/flickr/lib.php b/portfolio/flickr/lib.php index fe63d9dbb17..2815a0f55c1 100644 --- a/portfolio/flickr/lib.php +++ b/portfolio/flickr/lib.php @@ -96,7 +96,7 @@ class portfolio_plugin_flickr extends portfolio_plugin_push_base { return true; } - public function admin_config_form(&$mform) { + public static function admin_config_form(&$mform) { global $CFG; $strrequired = get_string('required'); diff --git a/portfolio/googledocs/lib.php b/portfolio/googledocs/lib.php index 02ce15910ef..9695bc2ee75 100644 --- a/portfolio/googledocs/lib.php +++ b/portfolio/googledocs/lib.php @@ -100,7 +100,7 @@ class portfolio_plugin_googledocs extends portfolio_plugin_push_base { return array('clientid', 'secret'); } - public function admin_config_form(&$mform) { + public static function admin_config_form(&$mform) { $a = new stdClass; $a->docsurl = get_docs_url('Google_OAuth2_Setup'); $a->callbackurl = google_oauth::callback_url()->out(false); diff --git a/portfolio/mahara/lib.php b/portfolio/mahara/lib.php index beb43b1a37a..77c40d6f31a 100644 --- a/portfolio/mahara/lib.php +++ b/portfolio/mahara/lib.php @@ -84,7 +84,7 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base { return true; } - public function admin_config_form(&$mform) { + public static function admin_config_form(&$mform) { $strrequired = get_string('required'); $hosts = self::get_mnet_hosts(); // this is called by sanity check but it's ok because it's cached foreach ($hosts as $host) { diff --git a/portfolio/picasa/lib.php b/portfolio/picasa/lib.php index 70200c13af8..cb72e850217 100644 --- a/portfolio/picasa/lib.php +++ b/portfolio/picasa/lib.php @@ -100,7 +100,7 @@ class portfolio_plugin_picasa extends portfolio_plugin_push_base { return array('clientid', 'secret'); } - public function admin_config_form(&$mform) { + public static function admin_config_form(&$mform) { $a = new stdClass; $a->docsurl = get_docs_url('Google_OAuth2_Setup'); $a->callbackurl = google_oauth::callback_url()->out(false); diff --git a/portfolio/upgrade.txt b/portfolio/upgrade.txt new file mode 100644 index 00000000000..efc88ea345e --- /dev/null +++ b/portfolio/upgrade.txt @@ -0,0 +1,9 @@ +This files describes API changes in /portfolio/ portfolio system, +information provided here is intended especially for developers. + +=== 2.3 === + +required changes: +* The following methods must now be declared static for php5 compatibility: + - admin_config_form + - admin_config_validation -- 2.17.1