MDL-32573 - repository: make instance_config_form static

diff --git a/repository/alfresco/lib.php b/repository/alfresco/lib.php
index 62d9f75..705e6e9 100644 (file)
--- a/repository/alfresco/lib.php
+++ b/repository/alfresco/lib.php
@@ -270,7 +270,7 @@ class repository_alfresco extends repository {
      *
      * @return bool
      */
-    public function instance_config_form($mform) {
+    public static function instance_config_form($mform) {
         if (!class_exists('SoapClient')) {
             $mform->addElement('static', null, get_string('notice'), get_string('soapmustbeenabled', 'repository_alfresco'));
             return false;

diff --git a/repository/equella/lib.php b/repository/equella/lib.php
index 25a544f..b83dbe4 100644 (file)
--- a/repository/equella/lib.php
+++ b/repository/equella/lib.php
@@ -195,7 +195,7 @@ class repository_equella extends repository {
      *
      * @param moodleform $mform
      */
-    public function instance_config_form($mform) {
+    public static function instance_config_form($mform) {
         $mform->addElement('text', 'equella_url', get_string('equellaurl', 'repository_equella'));
         $mform->setType('equella_url', PARAM_URL);
 

diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
index 99b9dad..58eddbe 100644 (file)
--- a/repository/filesystem/lib.php
+++ b/repository/filesystem/lib.php
@@ -166,7 +166,7 @@ class repository_filesystem extends repository {
         return $ret;
     }
 
-    public function instance_config_form($mform) {
+    public static function instance_config_form($mform) {
         global $CFG, $PAGE;
         if (has_capability('moodle/site:config', get_system_context())) {
             $path = $CFG->dataroot . '/repository/';

diff --git a/repository/flickr_public/lib.php b/repository/flickr_public/lib.php
index 3b34b98..d422483 100644 (file)
--- a/repository/flickr_public/lib.php
+++ b/repository/flickr_public/lib.php
@@ -459,7 +459,7 @@ class repository_flickr_public extends repository {
      * Add Instance settings input to Moodle form
      * @param object $mform
      */
-    public function instance_config_form($mform) {
+    public static function instance_config_form($mform) {
         $mform->addElement('text', 'email_address', get_string('emailaddress', 'repository_flickr_public'));
         $mform->addElement('checkbox', 'usewatermarks', get_string('watermark', 'repository_flickr_public'));
         $mform->setDefault('usewatermarks', 0);

diff --git a/repository/lib.php b/repository/lib.php
index 5f72baf..e76fc30 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -2002,7 +2002,7 @@ abstract class repository {
      *
      * @param moodleform $mform Moodle form (passed by reference)
      */
-    public function instance_config_form($mform) {
+    public static function instance_config_form($mform) {
     }
 
     /**
@@ -2257,20 +2257,17 @@ final class repository_instance_form extends moodleform {
         $mform =& $this->_form;
 
         $this->add_defaults();
-        //add fields
-        if (!$this->instance) {
-            $result = repository::static_function($this->plugin, 'instance_config_form', $mform);
-            if ($result === false) {
-                $mform->removeElement('name');
-            }
-        } else {
+
+        // Add instance config options.
+        $result = repository::static_function($this->plugin, 'instance_config_form', $mform);
+        if ($result === false) {
+            // Remove the name element if no other config options.
+            $mform->removeElement('name');
+        }
+        if ($this->instance) {
             $data = array();
             $data['name'] = $this->instance->name;
             if (!$this->instance->readonly) {
-                $result = $this->instance->instance_config_form($mform);
-                if ($result === false) {
-                    $mform->removeElement('name');
-                }
                 // and set the data if we have some.
                 foreach ($this->instance->get_instance_option_names() as $config) {
                     if (!empty($this->instance->options[$config])) {

diff --git a/repository/webdav/lib.php b/repository/webdav/lib.php
index a8d4bb9..07c66b1 100644 (file)
--- a/repository/webdav/lib.php
+++ b/repository/webdav/lib.php
@@ -152,7 +152,7 @@ class repository_webdav extends repository {
         return array('webdav_type', 'webdav_server', 'webdav_port', 'webdav_path', 'webdav_user', 'webdav_password', 'webdav_auth');
     }
 
-    public function instance_config_form($mform) {
+    public static function instance_config_form($mform) {
         $choices = array(0 => get_string('http', 'repository_webdav'), 1 => get_string('https', 'repository_webdav'));
         $mform->addElement('select', 'webdav_type', get_string('webdav_type', 'repository_webdav'), $choices);
         $mform->addRule('webdav_type', get_string('required'), 'required', null, 'client');