Merge branch 'MDL-57170-31' of git://github.com/FMCorz/moodle into MOODLE_31_STABLE

2016-11-28 15:43:40 +08:00
parent adc22bb264 42d6fc0b83
commit 08d5732bf3
1 changed files with 22 additions and 0 deletions
@@ -651,4 +651,26 @@ class repository_dropbox_legacy extends repository {
            } catch (moodle_exception $e) {}
        }
    }
+
+    /**
+     * Get dropbox options
+     * @param string $config
+     * @return mixed
+     */
+    public function get_option($config = '') {
+        if ($config === 'dropbox_key') {
+            return trim(get_config('dropbox', 'dropbox_key'));
+        } else if ($config === 'dropbox_secret') {
+            return trim(get_config('dropbox', 'dropbox_secret'));
+        } else if ($config === 'dropbox_cachelimit') {
+            return $this->max_cache_bytes();
+        } else {
+            $options = parent::get_option();
+            $options['dropbox_key'] = trim(get_config('dropbox', 'dropbox_key'));
+            $options['dropbox_secret'] = trim(get_config('dropbox', 'dropbox_secret'));
+            $options['dropbox_cachelimit'] = $this->max_cache_bytes();
+        }
+
+        return $options;
+    }
 }