From e835ef583a618daeb4f10b0772f0610a6c9616f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Sat, 8 Jun 2013 11:55:31 +0200 Subject: [PATCH] MDL-39854 use classloader in add-on installer tool --- admin/tool/installaddon/classes/installer.php | 15 ++++++--------- .../installaddon/classes/installfromzip_form.php | 2 +- admin/tool/installaddon/deploy.php | 2 -- admin/tool/installaddon/index.php | 1 - admin/tool/installaddon/permcheck.php | 1 - admin/tool/installaddon/tests/installer_test.php | 3 --- admin/tool/installaddon/tests/validator_test.php | 3 --- admin/tool/installaddon/validate.php | 2 -- 8 files changed, 7 insertions(+), 22 deletions(-) diff --git a/admin/tool/installaddon/classes/installer.php b/admin/tool/installaddon/classes/installer.php index 9dd4236e112..0b888ba1a29 100644 --- a/admin/tool/installaddon/classes/installer.php +++ b/admin/tool/installaddon/classes/installer.php @@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die(); */ class tool_installaddon_installer { - /** @var tool_installaddon_installfromzip */ + /** @var tool_installaddon_installfromzip_form */ protected $installfromzipform = null; /** @@ -87,12 +87,9 @@ class tool_installaddon_installer { } /** - * @return tool_installaddon_installfromzip + * @return tool_installaddon_installfromzip_form */ public function get_installfromzip_form() { - global $CFG; - require_once(dirname(__FILE__).'/installfromzip_form.php'); - if (!is_null($this->installfromzipform)) { return $this->installfromzipform; } @@ -100,22 +97,22 @@ class tool_installaddon_installer { $action = $this->index_url(); $customdata = array('installer' => $this); - $this->installfromzipform = new tool_installaddon_installfromzip($action, $customdata); + $this->installfromzipform = new tool_installaddon_installfromzip_form($action, $customdata); return $this->installfromzipform; } /** - * Saves the ZIP file from the {@link tool_installaddon_installfromzip} form + * Saves the ZIP file from the {@link tool_installaddon_installfromzip_form} form * * The file is saved into the given temporary location for inspection and eventual * deployment. The form is expected to be submitted and validated. * - * @param tool_installaddon_installfromzip $form + * @param tool_installaddon_installfromzip_form $form * @param string $targetdir full path to the directory where the ZIP should be stored to * @return string filename of the saved file relative to the given target */ - public function save_installfromzip_file(tool_installaddon_installfromzip $form, $targetdir) { + public function save_installfromzip_file(tool_installaddon_installfromzip_form $form, $targetdir) { $filename = clean_param($form->get_new_filename('zipfile'), PARAM_FILE); $form->save_file('zipfile', $targetdir.'/'.$filename); diff --git a/admin/tool/installaddon/classes/installfromzip_form.php b/admin/tool/installaddon/classes/installfromzip_form.php index 18552faadb7..8a6d6a05082 100644 --- a/admin/tool/installaddon/classes/installfromzip_form.php +++ b/admin/tool/installaddon/classes/installfromzip_form.php @@ -33,7 +33,7 @@ require_once($CFG->libdir.'/formslib.php'); * @copyright 2013 David Mudrak * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class tool_installaddon_installfromzip extends moodleform { +class tool_installaddon_installfromzip_form extends moodleform { /** * Defines the form elements diff --git a/admin/tool/installaddon/deploy.php b/admin/tool/installaddon/deploy.php index f68ebed888b..7dea2cc415d 100644 --- a/admin/tool/installaddon/deploy.php +++ b/admin/tool/installaddon/deploy.php @@ -25,8 +25,6 @@ require(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir.'/filelib.php'); -require_once(dirname(__FILE__).'/classes/installer.php'); -require_once(dirname(__FILE__).'/classes/validator.php'); require_login(); require_capability('moodle/site:config', context_system::instance()); diff --git a/admin/tool/installaddon/index.php b/admin/tool/installaddon/index.php index cb0d2a62d44..5249694de7a 100644 --- a/admin/tool/installaddon/index.php +++ b/admin/tool/installaddon/index.php @@ -25,7 +25,6 @@ require(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir.'/adminlib.php'); -require_once(dirname(__FILE__).'/classes/installer.php'); admin_externalpage_setup('tool_installaddon_index'); diff --git a/admin/tool/installaddon/permcheck.php b/admin/tool/installaddon/permcheck.php index f38d109f59a..9bd433f07e1 100644 --- a/admin/tool/installaddon/permcheck.php +++ b/admin/tool/installaddon/permcheck.php @@ -28,7 +28,6 @@ define('AJAX_SCRIPT', true); require(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir.'/adminlib.php'); -require_once(dirname(__FILE__).'/classes/installer.php'); require_login(); diff --git a/admin/tool/installaddon/tests/installer_test.php b/admin/tool/installaddon/tests/installer_test.php index 1a938fba5b4..28e37bdd4a8 100644 --- a/admin/tool/installaddon/tests/installer_test.php +++ b/admin/tool/installaddon/tests/installer_test.php @@ -26,9 +26,6 @@ defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot.'/'.$CFG->admin.'/tool/installaddon/classes/installer.php'); - /** * Unit tests for the {@link tool_installaddon_installer} class diff --git a/admin/tool/installaddon/tests/validator_test.php b/admin/tool/installaddon/tests/validator_test.php index c008d9cfd31..dd556538c97 100644 --- a/admin/tool/installaddon/tests/validator_test.php +++ b/admin/tool/installaddon/tests/validator_test.php @@ -26,9 +26,6 @@ defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot.'/'.$CFG->admin.'/tool/installaddon/classes/validator.php'); - /** * Unit tests for the {@link tool_installaddon_installer} class diff --git a/admin/tool/installaddon/validate.php b/admin/tool/installaddon/validate.php index 2fc66cf3bc9..ef7454dda33 100644 --- a/admin/tool/installaddon/validate.php +++ b/admin/tool/installaddon/validate.php @@ -26,8 +26,6 @@ require(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/filelib.php'); -require_once(dirname(__FILE__).'/classes/installer.php'); -require_once(dirname(__FILE__).'/classes/validator.php'); navigation_node::override_active_url(new moodle_url('/admin/tool/installaddon/index.php')); admin_externalpage_setup('tool_installaddon_validate');