';
+ $addable = 0;
+
+ //if no type is set, we can create all type of instance
+ if (!$typename) {
+ $instancehtml .= '
';
+ $instancehtml .= get_string('createrepository', 'repository');
+ $instancehtml .= '
';
+
+ } else {
+ $instanceoptionnames = repository::static_function($typename, 'get_instance_option_names');
+ if (!empty($instanceoptionnames)) { //create a unique type of instance
+ $addable = 1;
+ $instancehtml .= "
";
+ }
+ }
+
+ if ($addable) {
+ $instancehtml .= '
';
diff --git a/lib/adminlib.php b/lib/adminlib.php
index f4bc86df4b7..89d0ac81c87 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6012,7 +6012,7 @@ class admin_setting_managerepository extends admin_setting {
return true;
}
}
- foreach (repository_get_types() as $instance) {
+ foreach (repository::get_types() as $instance) {
$title = $instance->get_typename();
if (strpos($textlib->strtolower($title), $query) !== false) {
return true;
@@ -6030,7 +6030,7 @@ class admin_setting_managerepository extends admin_setting {
$hiddenstr = get_string('hiddenshow', 'repository');
$deletestr = get_string('delete');
$plugins = get_list_of_plugins('repository');
- $instances = repository_get_types();
+ $instances = repository::get_types();
$instancesnumber = count($instances);
$alreadyplugins = array();
$table = new StdClass;
@@ -6041,8 +6041,8 @@ class admin_setting_managerepository extends admin_setting {
foreach ($instances as $i) {
$settings = '';
//display edit link only if you can config the type or if it has multiple instances (e.g. has instance config)
- $typeoptionnames = repository_static_function($i->get_typename(), 'get_type_option_names');
- $instanceoptionnames = repository_static_function($i->get_typename(), 'get_instance_option_names');
+ $typeoptionnames = repository::static_function($i->get_typename(), 'get_type_option_names');
+ $instanceoptionnames = repository::static_function($i->get_typename(), 'get_instance_option_names');
if ( !empty($typeoptionnames) || !empty($instanceoptionnames)) {
$settings .= ''
. $settingsstr .'' . "\n";
diff --git a/lib/simpletest/testrepositorylib.php b/lib/simpletest/testrepositorylib.php
new file mode 100644
index 00000000000..bb63c3456f6
--- /dev/null
+++ b/lib/simpletest/testrepositorylib.php
@@ -0,0 +1,67 @@
+dirroot . '/repository/lib.php');
+require_once($CFG->dirroot . '/admin/generator.php');
+
+// Generate a mock class for each plugin subclass present
+$repository_plugins = get_list_of_plugins('repository');
+
+foreach ($repository_plugins as $plugin) {
+ require_once($CFG->dirroot . "/repository/$plugin/repository.class.php");
+ Mock::generatePartial("repository_$plugin", "partialmock_$plugin", array('send_package'));
+}
+
+class repositorylib_test extends MoodleUnitTestCase {
+
+ function setup() {
+ parent::setup();
+ }
+
+ public function test_plugins() {
+ $plugins = get_list_of_plugins('repository');
+
+ foreach ($plugins as $plugin) {
+ // Instantiate a fake plugin instance
+ $plugin_class = "partialmock_$plugin";
+ $plugin = new $plugin_class(&$this);
+
+ // add common plugin tests here
+ }
+ }
+}
+?>
diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 3aaed3a9f2f..1bca8df6013 100755
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -271,7 +271,7 @@ class repository_flickr extends repository {
$mform->addElement('text', 'secret', get_string('secret', 'repository_flickr'), array('value'=>$secret,'size' => '40'));
//retrieve the flickr instances
- $instances = repository_get_instances(array(),null,false,"flickr");
+ $instances = repository::get_instances(array(),null,false,"flickr");
if (empty($instances)) {
$callbackurl = get_string("callbackwarning","repository_flickr");
$mform->addElement('static', null, '', $callbackurl);
@@ -280,7 +280,7 @@ class repository_flickr extends repository {
$callbackurl = $CFG->wwwroot.'/repository/ws.php?callback=yes&repo_id='.$instances[0]->id;
$mform->addElement('static', 'callbackurl', '', get_string('callbackurltext', 'repository_flickr', $callbackurl));
}
-
+
$mform->addRule('api_key', $strrequired, 'required', null, 'client');
$mform->addRule('secret', $strrequired, 'required', null, 'client');
}
diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index a1599c4f0ca..fa571597e8d 100644
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -335,8 +335,8 @@ class repository_flickr_public extends repository {
*/
public static function plugin_init() {
//here we create a default instance for this type
- repository_static_function('flickr_public','create', 'flickr_public', 0, get_system_context(), array('name' => get_string('repositoryname', 'repository_flickr_public'),'email_address' => null));
- }
+ repository::static_function('flickr_public','create', 'flickr_public', 0, get_system_context(), array('name' => get_string('repositoryname', 'repository_flickr_public'),'email_address' => null),1);
+ }
}
diff --git a/repository/javascript.php b/repository/javascript.php
index 4b78d006c9c..2a2f26ffa61 100644
--- a/repository/javascript.php
+++ b/repository/javascript.php
@@ -90,6 +90,15 @@ function repository_get_client($context, $filetypes = '*', $returnvalue = '*') {
.fp-grid .label{height:48px;text-align:center}
.fp-grid span{color:gray}
+
+
EOD;
$js = <<