"MDL-13766, make params unique"

diff --git a/repository/boxnet/boxlibphp5.php b/repository/boxnet/boxlibphp5.php
index 49ea476570755d947db44c9b2026de54c977379a..f4ed213ef6f654d02f69ed1c7800c0b6f6a46576 100755 (executable)
--- a/repository/boxnet/boxlibphp5.php
+++ b/repository/boxnet/boxlibphp5.php
@@ -139,6 +139,7 @@ class boxclient {
             return false;
         }
         $tree_count=count($data);
+        $entry_count = 0;
         for ($i=0; $i<$tree_count; $i++) {
             $a = $data[$i];
             switch ($a['tag'])

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 7cd4b06a22dcb62af066a9079a4acf4cd2389250..60be09175dda60f7bea7a4b438da09be8e97f87b 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -16,8 +16,8 @@ class repository_boxnet extends repository{
 
     public function __construct($repositoryid, $context = SITEID, $options = array()){
         global $SESSION, $action;
-        $options['username']   = optional_param('username', '', PARAM_RAW);
-        $options['password']   = optional_param('password', '', PARAM_RAW);
+        $options['username']   = optional_param('boxusername', '', PARAM_RAW);
+        $options['password']   = optional_param('boxpassword', '', PARAM_RAW);
         $options['ticket']     = optional_param('ticket', '', PARAM_RAW);
         $options['api_key']    = 'dmls97d8j3i9tn7av8y71m9eb55vrtj4';
         // reset session
@@ -135,19 +135,19 @@ class repository_boxnet extends repository{
                     $e1->value = $t['ticket'];
 
                     $e2->type = 'hidden';
-                    $e2->name = 'id';
+                    $e2->name = 'repo_id';
                     $e2->value = $this->repositoryid;
 
                     $e3->label = get_string('username', 'repository_boxnet');
                     $e3->id    = 'box_username';
                     $e3->type  = 'text';
-                    $e3->name  = 'username';
+                    $e3->name  = 'boxusername';
                     $e3->value = $ret->username;
                     
                     $e4->label = get_string('password', 'repository_boxnet');
                     $e4->id    = 'box_password';
                     $e4->type  = 'password';
-                    $e4->name  = 'password';
+                    $e4->name  = 'boxpassword';
 
                     $ret = array();
                     $ret['l'] = array($e1, $e2, $e3, $e4);

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index a9452cbc4da735aa1cb747512e5714979ca22f5c..220215a8f34413a3b053c3cf3ba69ee38a12e791 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -86,7 +86,7 @@ EOD;
                 $e2->name = 'remember';
 
                 $e3->type = 'hidden';
-                $e3->name = 'id';
+                $e3->name = 'repo_id';
                 $e3->value = $this->repositoryid;
                 $ret['l'] = array($e1, $e2, $e3);
                 return $ret;

diff --git a/repository/ws.php b/repository/ws.php
index 3513910032fa5addbb969fe2a460e9b7591fddc5..0593927789dd9345878ba4f8b1633e98d4816b0f 100644 (file)
--- a/repository/ws.php
+++ b/repository/ws.php
@@ -7,8 +7,6 @@ require_once('lib.php');
 $CFG->repository_cache_expire = 60*60;
 // page
 $p     = optional_param('p', '', PARAM_RAW);
-// id of repository
-$id     = optional_param('id', 1, PARAM_INT);
 // opened in editor or moodleform
 $env   = optional_param('env', 'form', PARAM_RAW);
 // file to download
@@ -17,8 +15,10 @@ $file  = optional_param('file', '', PARAM_RAW);
 $title = optional_param('title', '', PARAM_RAW);
 $action = optional_param('action', '', PARAM_RAW);
 $search = optional_param('s', '', PARAM_RAW);
+// id of repository
+$repo_id = optional_param('repo_id', 1, PARAM_INT);
 
-if(!$repository = $DB->get_record('repository', array('id'=>$id))) {
+if(!$repository = $DB->get_record('repository', array('id'=>$repo_id))) {
     $err = new stdclass;
     $err->e = get_string('invalidrepositoryid', 'repository');
     die(json_encode($err));
@@ -31,11 +31,11 @@ if(file_exists($CFG->dirroot.'/repository/'.
         $repository->repositorytype.'/repository.class.php');
     $classname = 'repository_' . $repository->repositorytype;
     try{
-        $repo = new $classname($id, SITEID, array('ajax'=>true));
+        $repo = new $classname($repo_id, SITEID, array('ajax'=>true));
     } catch (repository_exception $e){
         $err = new stdclass;
         $err->e = $e->getMessage();
-        die(json_encode($err.time()));
+        die(json_encode($err));
     }
 } else {
     $err = new stdclass;