MDL-15402: refactor get_admin_option_names() into get_type_option_names()

diff --git a/admin/repository.php b/admin/repository.php
index e5139f3b3a5ad184be0066136bb9f4d1f76c2955..6370142af905afbc580f435566bb7aa2f5ff1708 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -41,7 +41,7 @@ if (!empty($edit) || !empty($new)) {
     if (!empty($edit)) {
         $repositorytype = repository_get_type_by_typename($edit);
         $classname = 'repository_' . $repositorytype->get_typename();
-        $configs = call_user_func(array($classname,'get_admin_option_names'));
+        $configs = call_user_func(array($classname,'get_type_option_names'));
         $plugin = $repositorytype->get_typename();
     } else {
         $plugin = $new;
@@ -56,7 +56,7 @@ if (!empty($edit) || !empty($new)) {
     //detect if we create a new type without config (in this case if don't want to display a setting page during creation)
     $createnewtype = false;
     if (!empty($new)) {
-        $adminconfignames = repository_static_function($new, 'get_admin_option_names');
+        $adminconfignames = repository_static_function($new, 'get_type_option_names');
         $createnewtype = empty($adminconfignames);
     }
     // end setup, begin output

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index fd371e0cf95f704983b7e32a1bb616bc0a959300..d11f0b5ba1a2d10537da58635069a9f236e3f508 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -232,7 +232,7 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext))
         as $repositorytype)
     {
       //display setup page for plugins with: general options or multiple instances
-      $adminconfignames = repository_static_function($repositorytype->get_typename(), 'get_admin_option_names');
+      $adminconfignames = repository_static_function($repositorytype->get_typename(), 'get_type_option_names');
       if (!empty($adminconfignames)
           || repository_static_function($repositorytype->get_typename(), 'has_multiple_instances')) {
             $ADMIN->add('repositorysettings',

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 331fea12f86e5a750a1b15a855b6fa76e79c2014..e1d5c45985d9ae4398afd1074b43da7be38bb5a2 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6155,7 +6155,7 @@ class admin_setting_managerepository extends admin_setting {
         foreach ($instances as $i) {
             $settings = '';
             //display edit link only if you can config the type or if it has multiple instances
-            $adminconfignames = repository_static_function($i->get_typename(), 'get_admin_option_names');
+            $adminconfignames = repository_static_function($i->get_typename(), 'get_type_option_names');
             if ( !empty($adminconfignames)
                  || repository_static_function($i->get_typename(), 'has_multiple_instances')) {
                 $settings .= '<a href="' . $this->baseurl . '&amp;edit=' . $i->get_typename() . '">'

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 3d75b65bbed43e60dd42334121a556547dec69ba..28456c13a5a22cb9734449fc3c866a6f6369375d 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -161,7 +161,7 @@ class repository_boxnet extends repository {
         return false;
     }
 
-    public static function get_admin_option_names() {
+    public static function get_type_option_names() {
         return array('api_key');
     }
 

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 8bbad73696ee7db8b2f67bf301c28448aad30456..7b0f8e561b1bfee73d76940a98b8f2021e5cba75 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -222,7 +222,7 @@ class repository_flickr extends repository {
         $mform->addRule('secret', $strrequired, 'required', null, 'client');
     }
 
-    public static function get_admin_option_names() {
+    public static function get_type_option_names() {
         return array('api_key', 'secret');
     }
 

diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index a88f351a80c9868bdfc62111d0acc0ea86dab226..24724362eb19af355ed9d69b38638d479b7df118 100644 (file)
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -193,7 +193,7 @@ class repository_flickr_public extends repository {
         $mform->addElement('static', null, '',  get_string('information','repository_flickr_public'));
     }
 
-    public static function get_admin_option_names() {
+    public static function get_type_option_names() {
         return array('api_key');
     }
 

diff --git a/repository/lib.php b/repository/lib.php
index 8fe06fb4e3014f82f56599d118644c717ffc379d..4b57c8d79e80c955eda0c91ff4137ecdbe4089c5 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -113,7 +113,7 @@ class repository_type {
 
         //set options attribut
         $this->_options = array();
-        $options = repository_static_function($typename,'get_admin_option_names');
+        $options = repository_static_function($typename,'get_type_option_names');
         //check that the type can be setup
         if (!empty($options)) {
             //set the type options
@@ -941,7 +941,7 @@ abstract class repository {
      * By default: no general option name
      * @return array
      */
-    public static function get_admin_option_names() {
+    public static function get_type_option_names() {
         return array();
     }
 
@@ -1347,7 +1347,7 @@ final class repository_admin_form extends moodleform {
         // and set the data if we have some.
         if ($this->instance) {
             $data = array();
-            $option_names = call_user_func(array($classname,'get_admin_option_names'));
+            $option_names = call_user_func(array($classname,'get_type_option_names'));
             $instanceoptions = $this->instance->get_options();
             foreach ($option_names as $config) {
                 if (!empty($instanceoptions[$config])) {