From d0ddf08dc03614af5e9737a9582d3d693d44a89a Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Sun, 9 Jun 2013 12:19:54 +0200 Subject: [PATCH 1/3] MDL-29218 Repository: Hide the repo if repository::plugin_init returns false --- admin/repository.php | 4 +++- repository/lib.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/repository.php b/admin/repository.php index 3eb48b0da4d..f2aa3934e91 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -140,8 +140,10 @@ if (($action == 'edit') || ($action == 'new')) { $success = $repositorytype->update_options($settings); } else { $type = new repository_type($plugin, (array)$fromform, $visible); - $type->create(); $success = true; + if (!$repoid = $type->create()) { + $success = false; + } $data = data_submitted(); } if ($success) { diff --git a/repository/lib.php b/repository/lib.php index 42ed8886535..bdf05ab994a 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -255,6 +255,7 @@ class repository_type { } //run plugin_init function if (!repository::static_function($this->_typename, 'plugin_init')) { + $this->update_visibility(false); if (!$silent) { throw new repository_exception('cannotinitplugin', 'repository'); } From 832a19829bc06efd3672b0f57ef5ebe18d991f25 Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Mon, 26 Aug 2013 23:32:21 +0200 Subject: [PATCH 2/3] MDL-29218 Repository: $pname, get rid of all the useless code More details in the Tracker. --- repository/lib.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/repository/lib.php b/repository/lib.php index bdf05ab994a..da99c4304b3 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1088,14 +1088,6 @@ abstract class repository { return false; } - $pname = null; - if (is_object($plugin) || is_array($plugin)) { - $plugin = (object)$plugin; - $pname = $plugin->name; - } else { - $pname = $plugin; - } - $args = func_get_args(); if (count($args) <= 2) { $args = array(); From c7aac029252715ce97db3292e61de9534c93d40c Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Mon, 26 Aug 2013 23:35:39 +0200 Subject: [PATCH 3/3] MDL-29218 Repository: fixed a typo in the PHPDoc --- repository/lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/lib.php b/repository/lib.php index da99c4304b3..8ddb378ff4c 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1075,7 +1075,7 @@ abstract class repository { * * @static * @param string $plugin repository plugin name - * @param string $function funciton name + * @param string $function function name * @return mixed */ public static function static_function($plugin, $function) { @@ -2299,7 +2299,7 @@ abstract class repository { /** * For oauth like external authentication, when external repository direct user back to moodle, - * this funciton will be called to set up token and token_secret + * this function will be called to set up token and token_secret */ public function callback() { }