From: jerome <jerome>
Date: Mon, 15 Sep 2008 09:21:29 +0000 (+0000)
Subject: MDL-15402: fix a bug with parameter in the delete URL (wrong cleaning setting) +... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b8f46e17de553cbae2c21b3ed08f296d82bfac45;p=moodle.git

MDL-15402: fix a bug with parameter in the delete URL (wrong cleaning setting) + move flickr public email address setting from admin to instance
---

diff --git a/admin/repository.php b/admin/repository.php
index 69966b9d1f..9ff6dc0ae2 100644
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -6,13 +6,13 @@ require_once($CFG->libdir . '/adminlib.php');
 
 $CFG->pagepath = 'admin/managerepositories';
 
-$edit    = optional_param('edit', 0, PARAM_ALPHA);
+$edit    = optional_param('edit', 0, PARAM_ALPHAEXT);
 $new     = optional_param('new', '', PARAM_FORMAT);
-$hide    = optional_param('hide', 0, PARAM_ALPHA);
-$delete  = optional_param('delete', 0, PARAM_ALPHA);
+$hide    = optional_param('hide', 0, PARAM_ALPHAEXT);
+$delete  = optional_param('delete', 0, PARAM_ALPHAEXT);
 $sure    = optional_param('sure', '', PARAM_ALPHA);
-$move    = optional_param('move', '', PARAM_ALPHA);
-$type    = optional_param('type', '', PARAM_ALPHA);
+$move    = optional_param('move', '', PARAM_ALPHAEXT);
+$type    = optional_param('type', '', PARAM_ALPHAEXT);
 
 $display = true; // fall through to normal display
 
diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index c04643d2d8..6c4e9a593c 100644
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -50,7 +50,7 @@ class repository_flickr_public extends repository{
         $this->api_key = $this->get_option('api_key');
         $this->flickr = new phpFlickr($this->api_key);
 
-        $this->flickr_account = $this->get_option('public_account');
+        $this->flickr_account = $this->get_option('email_address');
 
         if(!empty($this->flickr_account)) {
             if(empty($action)){
@@ -210,7 +210,16 @@ class repository_flickr_public 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_public'));
+        //$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) {
@@ -220,11 +229,15 @@ class repository_flickr_public extends repository{
         }
         $strrequired = get_string('required');
         $mform->addElement('text', 'api_key', get_string('apikey', 'repository_flickr_public'), array('value'=>$api_key,'size' => '40'));
-        $mform->addElement('text', 'public_account', get_string('public_account', 'repository_flickr_public'), array('size' => '40'));
         $mform->addRule('api_key', $strrequired, 'required', null, 'client');
     }
-    public static function get_admin_option_names(){
-        return array('api_key', 'public_account');
+
+    public static function get_admin_option_names() {
+        return array('api_key');
+    }
+
+    public static function type_init() {
+        //here we create a default instances for this type
     }
 
 }