David Mudrák
f2d8ed45e3
This is not really new class. Originally, the validator was implemented in the scope of the tool_installaddon plugin. But we need its features in other parts at the core level (e.g. during the upgrade to validate available missing dependencies or available updates). Looking back, it was a mistake to have it implemented at the plugin level rather than the core level. So this patch moves the tool_installaddon_validator class to \core\update\validator class, together with associated unit tests, fixture files and strings. There were changes made in the tool_installaddon to make use of this new class instead of the old one. This is a great step towards the bright future, hopefully there won't be many regressions. AMOS BEGIN MOV [validationmsg_componentmatch,tool_installaddon],[validationmsg_componentmatch,core_plugin] MOV [validationmsg_componentmismatchname,tool_installaddon],[validationmsg_componentmismatchname,core_plugin] MOV [validationmsg_componentmismatchname_help,tool_installaddon],[validationmsg_componentmismatchname_help,core_plugin] MOV [validationmsg_componentmismatchname_info,tool_installaddon],[validationmsg_componentmismatchname_info,core_plugin] MOV [validationmsg_componentmismatchtype,tool_installaddon],[validationmsg_componentmismatchtype,core_plugin] MOV [validationmsg_componentmismatchtype_info,tool_installaddon],[validationmsg_componentmismatchtype_info,core_plugin] MOV [validationmsg_filenotexists,tool_installaddon],[validationmsg_filenotexists,core_plugin] MOV [validationmsg_filesnumber,tool_installaddon],[validationmsg_filesnumber,core_plugin] MOV [validationmsg_filestatus,tool_installaddon],[validationmsg_filestatus,core_plugin] MOV [validationmsg_filestatus_info,tool_installaddon],[validationmsg_filestatus_info,core_plugin] MOV [validationmsg_foundlangfile,tool_installaddon],[validationmsg_foundlangfile,core_plugin] MOV [validationmsg_maturity,tool_installaddon],[validationmsg_maturity,core_plugin] MOV [validationmsg_maturity_help,tool_installaddon],[validationmsg_maturity_help,core_plugin] MOV [validationmsg_missingcomponent,tool_installaddon],[validationmsg_missingcomponent,core_plugin] MOV [validationmsg_missingcomponent_help,tool_installaddon],[validationmsg_missingcomponent_help,core_plugin] MOV [validationmsg_missingcomponent_link,tool_installaddon],[validationmsg_missingcomponent_link,core_plugin] MOV [validationmsg_missingexpectedlangenfile,tool_installaddon],[validationmsg_missingexpectedlangenfile,core_plugin] MOV [validationmsg_missingexpectedlangenfile_info,tool_installaddon],[validationmsg_missingexpectedlangenfile_info,core_plugin] MOV [validationmsg_missinglangenfile,tool_installaddon],[validationmsg_missinglangenfile,core_plugin] MOV [validationmsg_missinglangenfolder,tool_installaddon],[validationmsg_missinglangenfolder,core_plugin] MOV [validationmsg_missingversion,tool_installaddon],[validationmsg_missingversion,core_plugin] MOV [validationmsg_missingversionphp,tool_installaddon],[validationmsg_missingversionphp,core_plugin] MOV [validationmsg_multiplelangenfiles,tool_installaddon],[validationmsg_multiplelangenfiles,core_plugin] MOV [validationmsg_onedir,tool_installaddon],[validationmsg_onedir,core_plugin] MOV [validationmsg_onedir_help,tool_installaddon],[validationmsg_onedir_help,core_plugin] MOV [validationmsg_pathwritable,tool_installaddon],[validationmsg_pathwritable,core_plugin] MOV [validationmsg_pluginversion,tool_installaddon],[validationmsg_pluginversion,core_plugin] MOV [validationmsg_release,tool_installaddon],[validationmsg_release,core_plugin] MOV [validationmsg_requiresmoodle,tool_installaddon],[validationmsg_requiresmoodle,core_plugin] MOV [validationmsg_rootdir,tool_installaddon],[validationmsg_rootdir,core_plugin] MOV [validationmsg_rootdir_help,tool_installaddon],[validationmsg_rootdir_help,core_plugin] MOV [validationmsg_rootdirinvalid,tool_installaddon],[validationmsg_rootdirinvalid,core_plugin] MOV [validationmsg_rootdirinvalid_help,tool_installaddon],[validationmsg_rootdirinvalid_help,core_plugin] MOV [validationmsg_targetexists,tool_installaddon],[validationmsg_targetexists,core_plugin] MOV [validationmsg_targetexists_help,tool_installaddon],[validationmsg_targetexists_help,core_plugin] MOV [validationmsg_unknowntype,tool_installaddon],[validationmsg_unknowntype,core_plugin] MOV [validationmsg_versionphpsyntax,tool_installaddon],[validationmsg_versionphpsyntax,core_plugin] MOV [validationmsglevel_debug,tool_installaddon],[validationmsglevel_debug,core_plugin] MOV [validationmsglevel_error,tool_installaddon],[validationmsglevel_error,core_plugin] MOV [validationmsglevel_info,tool_installaddon],[validationmsglevel_info,core_plugin] MOV [validationmsglevel_warning,tool_installaddon],[validationmsglevel_warning,core_plugin] AMOS END
93 lines
3.5 KiB
PHP
93 lines
3.5 KiB
PHP
<?php
|
|
|
|
// This file is part of Moodle - http://moodle.org/
|
|
//
|
|
// Moodle is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Moodle is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
/**
|
|
* The ZIP package validation.
|
|
*
|
|
* @package tool_installaddon
|
|
* @copyright 2013 David Mudrak <david@moodle.com>
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
|
|
require(dirname(__FILE__) . '/../../../config.php');
|
|
require_once($CFG->libdir.'/adminlib.php');
|
|
require_once($CFG->libdir.'/filelib.php');
|
|
|
|
navigation_node::override_active_url(new moodle_url('/admin/tool/installaddon/index.php'));
|
|
admin_externalpage_setup('tool_installaddon_validate');
|
|
|
|
if (!empty($CFG->disableonclickaddoninstall)) {
|
|
notice(get_string('featuredisabled', 'tool_installaddon'));
|
|
}
|
|
|
|
require_sesskey();
|
|
|
|
$jobid = required_param('jobid', PARAM_ALPHANUM);
|
|
$zipfilename = required_param('zip', PARAM_FILE);
|
|
$plugintype = required_param('type', PARAM_ALPHANUMEXT);
|
|
$rootdir = optional_param('rootdir', '', PARAM_PLUGIN);
|
|
|
|
$zipfilepath = $CFG->tempdir.'/tool_installaddon/'.$jobid.'/source/'.$zipfilename;
|
|
if (!file_exists($zipfilepath)) {
|
|
redirect(new moodle_url('/admin/tool/installaddon/index.php'),
|
|
get_string('invaliddata', 'core_error'));
|
|
}
|
|
|
|
$installer = tool_installaddon_installer::instance();
|
|
|
|
// Extract the ZIP contents.
|
|
fulldelete($CFG->tempdir.'/tool_installaddon/'.$jobid.'/contents');
|
|
$zipcontentpath = make_temp_directory('tool_installaddon/'.$jobid.'/contents');
|
|
$zipcontentfiles = $installer->extract_installfromzip_file($zipfilepath, $zipcontentpath, $rootdir);
|
|
|
|
// Validate the contents of the plugin ZIP file.
|
|
$validator = \core\update\validator::instance($zipcontentpath, $zipcontentfiles);
|
|
$validator->assert_plugin_type($plugintype);
|
|
$validator->assert_moodle_version($CFG->version);
|
|
$result = $validator->execute();
|
|
|
|
// Display the validation results.
|
|
$output = $PAGE->get_renderer('tool_installaddon');
|
|
$output->set_installer_instance($installer);
|
|
$output->set_validator_instance($validator);
|
|
|
|
echo $output->header();
|
|
echo $output->validation_page();
|
|
|
|
if ($result) {
|
|
$conturl = new moodle_url('/admin/tool/installaddon/deploy.php', array(
|
|
'sesskey' => sesskey(),
|
|
'jobid' => $jobid,
|
|
'type' => $plugintype,
|
|
'name' => $validator->get_rootdir())
|
|
);
|
|
$contbutton = $output->single_button($conturl, get_string('installaddon', 'tool_installaddon'), 'post',
|
|
array('class' => 'singlebutton continuebutton'));
|
|
echo $output->heading(get_string('acknowledgement', 'tool_installaddon'), 3);
|
|
echo $output->container(get_string('acknowledgementtext', 'tool_installaddon'));
|
|
|
|
} else {
|
|
$contbutton = '';
|
|
fulldelete($CFG->tempdir.'/tool_installaddon/'.$jobid);
|
|
}
|
|
|
|
$cancelbutton = $output->single_button(new moodle_url('/admin/tool/installaddon/index.php'), get_string('cancel', 'core'),
|
|
'get', array('class' => 'singlebutton cancelbutton'));
|
|
|
|
echo $output->container($cancelbutton.$contbutton, 'postvalidationbuttons');
|
|
echo $output->footer();
|