MDL-15402: flickr rep admin settings updated

diff --git a/lang/en_utf8/repository_flickr.php b/lang/en_utf8/repository_flickr.php
index bec2a78816b742af44222962378010cd4cf34f37..643640e10db7f5d8da890dc3167fe3c8e63a404d 100644 (file)
--- a/lang/en_utf8/repository_flickr.php
+++ b/lang/en_utf8/repository_flickr.php
@@ -1,9 +1,14 @@
 <?php
+$string['apikey'] = 'API Key';
+$string['callbackurl'] = 'Callback URL';
 $string['configplugin'] = 'Flickr configuration';
+$string['emailaddress'] = 'Email address';
+$string['invalidemail'] = 'Invalid email address for flickr';
+$string['notitle'] = 'notitle';
+$string['nullphotolist'] = 'There are no photos in this account';
+$string['remember'] = 'Remember me';
 $string['repositoryname'] = 'Flickr';
 $string['repositorydesc'] = 'Repository on flickr.com';
-$string['notitle'] = 'notitle';
+$string['secret'] = 'Secret';
 $string['username'] = 'Flickr account email';
-$string['remember'] = 'Remember me';
-$string['nullphotolist'] = 'There are no photos in this account';
-$string['invalidemail'] = 'Invalid email address for flickr';
+

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 0739167c17a19ef8e2ddcbb3b1ff111a8e0ed15b..6bfe7e2914dab0c4a28482d8a66e858dc34febd4 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -205,11 +205,11 @@ class repository_boxnet extends repository{
     }
 
     public static function has_instance_config() {
-        return true;
+        return false;
     }
 
     public static function has_multiple_instances(){
-        return true;
+        return false;
     }
 
     public static function get_admin_option_names(){
@@ -232,8 +232,8 @@ class repository_boxnet extends repository{
     }
 
     public function instance_config_form(&$mform) {
-        $share_url = get_config('boxnet', 'share_url');
-        $mform->addElement('text', 'share_url', get_string('shareurl', 'repository_boxnet'), array('value'=>$share_url));
+        //$share_url = get_config('boxnet', 'share_url');
+        $mform->addElement('text', 'share_url', get_string('shareurl', 'repository_boxnet'));
     }
 }
 

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 8f176c6687ba2f93ccc693b602933362b279aeb4..b8494ba1dcf6c6a4b7d7a64c352a9b3ca28710b1 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -217,18 +217,41 @@ class repository_flickr extends repository{
     }
 
     public static function has_instance_config() {
-        return false;
+        return true;
+    }
+
+    public function instance_config_form(&$mform) {
+        $mform->addElement('text', 'email_address', get_string('emailaddress', 'repository_flickr'));
+        //$mform->addRule('email_address', get_string('required'), 'required', null, 'client');
+    }
+
+    public static function get_instance_option_names(){
+        return array('email_address');
     }
 
     public function admin_config_form(&$mform) {
         $api_key = get_config('flickr', 'api_key');
+        $secret = get_config('flickr', 'secret');
+        $callbackurl = get_config('flickr', 'callbackurl');
         if (empty($api_key)) {
             $api_key = '';
         }
+        if (empty($secret)) {
+            $secret = '';
+        }
+        if (empty($callbackurl)) {
+            $callbackurl = '';
+        }
         $strrequired = get_string('required');
-        $mform->addElement('text', 'api_key', get_string('apikey', 'repository_boxnet'), array('value'=>$api_key,'size' => '40'));
+        $mform->addElement('text', 'api_key', get_string('apikey', 'repository_flickr'), array('value'=>$api_key,'size' => '40'));
+        $mform->addElement('text', 'secret', get_string('secret', 'repository_flickr'), array('value'=>$secret,'size' => '40'));
+        $mform->addElement('text', 'callbackurl', get_string('callbackurl', 'repository_flickr'), array('value'=>$callbackurl,'size' => '40'));
+
         $mform->addRule('api_key', $strrequired, 'required', null, 'client');
+        $mform->addRule('secret', $strrequired, 'required', null, 'client');
+        $mform->addRule('callbackurl', $strrequired, 'required', null, 'client');
     }
+
     public static function get_admin_option_names(){
         return array('api_key');
     }