mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-22 10:57:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-62958 admin: ensure uploaded plugin directory structure present.

Browse Source 
Including any empty directories, which would cause validation to
subsequently fail when they were skipped.

Co-authored-by: Leon Stringer <leon.stringer@ntlworld.com>
This commit is contained in:
Paul Holden 2024-06-24 11:39:08 +01:00
parent ad7fc69c25
commit 0105cf126e
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/update/code_manager.php
View File

@ -14,16 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides core\update\code_manager class.
*
* @package core_plugin
* @copyright 2012, 2013, 2015 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core\update;
use core_collator;
use core_component;
use coding_exception;
use moodle_exception;
@ -44,7 +37,8 @@ require_once($CFG->libdir.'/filelib.php');
* - archive existing version of the plugin source code
* - move (deploy) the plugin source code into the $CFG->dirroot
*
* @copyright 2015 David Mudrak <david@moodle.com>
* @package core
* @copyright 2012 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class code_manager {
@ -539,6 +533,8 @@ class code_manager {
protected function move_extracted_plugin_files($sourcedir, $targetdir, array $files) {
global $CFG;
// Iterate sorted file list (to ensure directories precede files within them).
core_collator::ksort($files);
foreach ($files as $file => $status) {
if ($status !== true) {
throw new moodle_exception('corrupted_archive_structure', 'core_plugin', '', $file, $status);
@ -548,12 +544,8 @@ class code_manager {
$target = $targetdir.'/'.$file;
if (is_dir($source)) {
continue;
mkdir($target, $CFG->directorypermissions, true);
} else {
if (!is_dir(dirname($target))) {
mkdir(dirname($target), $CFG->directorypermissions, true);
}
rename($source, $target);
}
}