L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-39854 use classloader in add-on installer tool

Browse Source
This commit is contained in:
Petr Škoda
2013-06-18 09:10:23 +02:00
parent 299e107e97
commit e835ef583a
8 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/installaddon/classes/installer.php
+6 -9
View File
@@ -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);
admin/tool/installaddon/classes/installfromzip_form.php
+1 -1
View File
@@ -33,7 +33,7 @@ require_once($CFG->libdir.'/formslib.php');
* @copyright 2013 David Mudrak <[email protected]>
* @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
admin/tool/installaddon/deploy.php
-2
View File
@@ -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());
admin/tool/installaddon/index.php
-1
View File
@@ -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');
admin/tool/installaddon/permcheck.php
-1
View File
@@ -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();
admin/tool/installaddon/tests/installer_test.php
-3
View File
@@ -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
admin/tool/installaddon/tests/validator_test.php
-3
View File
@@ -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
admin/tool/installaddon/validate.php
-2
View File
@@ -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');