MDL-13766, test api_key, and remove shared secret in flickr plug-in

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 1f9f2e858f3fe61f676cca4c6a83b46e2106284e..ebbd2fc4f77e5cdb8840684e9b0ae6a1981c2ff7 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -21,6 +21,9 @@ class repository_boxnet extends repository{
         $reset                 = optional_param('reset', 0, PARAM_INT);
         parent::__construct($repositoryid, $context, $options);
         $this->api_key = $this->get_option('api_key');
+        if (empty($this->api_key)) {
+            throw new repository_exception('invalidapikey', 'repository_boxnet');
+        }
         $sess_name = 'box_token'.$this->id;
         // reset session
         if(!empty($reset)) {

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index ce9ea6d95f059881651a687d5f42db3f1542e627..7bf2e699fc27b05b6d81430f27b6a7f2d55106da 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -17,10 +17,12 @@ class repository_flickr extends repository{
     public function __construct($repositoryid, $context = SITEID, $options = array()){
         global $SESSION, $action, $CFG;
         $options['page']    = optional_param('p', 1, PARAM_INT);
-        $options['secret']  = '7cb2f9d7cf70aebe';
         parent::__construct($repositoryid, $context, $options);
         $this->api_key = $this->get_option('api_key');
-        $this->flickr = new phpFlickr($this->api_key, $this->options['secret']);
+        if (empty($this->api_key)) {
+            throw new repository_exception('invalidapikey', 'repository_flickr');
+        }
+        $this->flickr = new phpFlickr($this->api_key);
 
         $reset = optional_param('reset', 0, PARAM_INT);
         $sess_name = 'flickrmail'.$this->id;