mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-68500' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2020-05-05 09:48:24 +08:00
commit 37f48d2547
11 changed files with 341 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/user/user_bulk_download.php
View File

@ -25,7 +25,6 @@
define('NO_OUTPUT_BUFFERING', true);
require_once('../../config.php');
require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->libdir.'/dataformatlib.php');
require_once($CFG->dirroot.'/user/profile/lib.php');
$dataformat = optional_param('dataformat', '', PARAM_ALPHA);
@ -69,9 +68,9 @@ if ($dataformat) {
$downloadusers = new ArrayObject($SESSION->bulk_users);
$iterator = $downloadusers->getIterator();
download_as_dataformat($filename, $dataformat, $fields, $iterator, function($userid) use ($extrafields, $fields) {
\core\dataformat::download_data($filename, $dataformat, $fields, $iterator, function($userid) use ($extrafields, $fields) {
global $DB;
$row = array();
if (!$user = $DB->get_record('user', array('id' => $userid))) {
return null;
}

18
dataformat/pdf/classes/writer.php
View File

@ -72,6 +72,13 @@ class writer extends \core\dataformat\base {
public function send_http_headers() {
}
/**
* Start output to file, note that the actual writing of the file is done in {@see close_output_to_file()}
*/
public function start_output_to_file(): void {
$this->start_output();
}
public function start_output() {
$this->pdf->AddPage('L');
}
@ -126,6 +133,17 @@ class writer extends \core\dataformat\base {
$this->pdf->Output($filename, 'D');
}
/**
* Write data to disk
*
* @return bool
*/
public function close_output_to_file(): bool {
$this->pdf->Output($this->filepath, 'F');
return true;
}
/**
* Prints the heading row.
*/

10
dataformat/upgrade.txt
View File

@ -1,8 +1,16 @@
This files describes API changes in /dataformat/ download system,
information provided here is intended especially for developers.
=== 3.4 ===
=== 3.9 ===
* The following methods have been added to the base dataformat class to allow instances to export to a local
file. They can be overridden in extending classes to define how files should be created:
- start_output_to_file()
- close_output_to_file()
* Calls to the following dataformat plugin methods have been removed:
- write_header()
- write_footer()
=== 3.4 ===
* In order to allow multiple sheets in an exported file the functions write_header() and write_footer() have
been removed from core dataformat plugins and have been replaced.
- write_header() has been replaced with the two functions start_output() and start_sheet().

151
lib/classes/dataformat.php Normal file
View File

@ -0,0 +1,151 @@
<?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/>.
/**
* Class containing utility methods for dataformats
*
* @package core
* @copyright 2020 Moodle Pty Ltd <support@moodle.com>
* @author 2020 Paul Holden <paulh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @license Moodle Workplace License, distribution is restricted, contact support@moodle.com
*/
namespace core;
use coding_exception;
use core_php_time_limit;
/**
* Dataformat utility class
*
* @package core
* @copyright 2020 Moodle Pty Ltd <support@moodle.com>
* @author 2020 Paul Holden <paulh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @license Moodle Workplace License, distribution is restricted, contact support@moodle.com
*/
class dataformat {
/**
* Return an instead of a dataformat writer from given dataformat type
*
* @param string $dataformat
* @return dataformat\base
* @throws coding_exception
*/
protected static function get_format_instance(string $dataformat): \core\dataformat\base {
$classname = 'dataformat_' . $dataformat . '\writer';
if (!class_exists($classname)) {
throw new coding_exception('Invalid dataformat', $dataformat);
}
return new $classname();
}
/**
* Sends a formatted data file to the browser
*
* @param string $filename
* @param string $dataformat
* @param array $columns
* @param Iterable $iterator
* @param callable|null $callback
* @throws coding_exception
*/
public static function download_data(string $filename, string $dataformat, array $columns, Iterable $iterator,
callable $callback = null): void {
if (ob_get_length()) {
throw new coding_exception('Output can not be buffered before calling download_data()');
}
$format = self::get_format_instance($dataformat);
// The data format export could take a while to generate.
core_php_time_limit::raise();
// Close the session so that the users other tabs in the same session are not blocked.
\core\session\manager::write_close();
// If this file was requested from a form, then mark download as complete (before sending headers).
\core_form\util::form_download_complete();
$format->set_filename($filename);
$format->send_http_headers();
$format->start_output();
$format->start_sheet($columns);
$rownum = 0;
foreach ($iterator as $row) {
if (is_callable($callback)) {
$row = $callback($row);
}
if ($row === null) {
continue;
}
$format->write_record($row, $rownum++);
}
$format->close_sheet($columns);
$format->close_output();
}
/**
* Writes a formatted data file with specified filename
*
* @param string $filename
* @param string $dataformat
* @param array $columns
* @param Iterable $iterator
* @param callable|null $callback
* @return string Complete path to the file on disk
*/
public static function write_data(string $filename, string $dataformat, array $columns, Iterable $iterator,
callable $callback = null): string {
$format = self::get_format_instance($dataformat);
// The data format export could take a while to generate.
core_php_time_limit::raise();
// Close the session so that the users other tabs in the same session are not blocked.
\core\session\manager::write_close();
$filepath = make_request_directory() . '/' . $filename . $format->get_extension();
$format->set_filepath($filepath);
$format->start_output_to_file();
$format->start_sheet($columns);
$rownum = 0;
foreach ($iterator as $row) {
if (is_callable($callback)) {
$row = $callback($row);
}
if ($row === null) {
continue;
}
$format->write_record($row, $rownum++);
}
$format->close_sheet($columns);
$format->close_output_to_file();
return $filepath;
}
}

48
lib/classes/dataformat/base.php
View File

@ -25,6 +25,8 @@
namespace core\dataformat;
use coding_exception;
/**
* Base class for dataformat.
*
@ -44,6 +46,9 @@ abstract class base {
/** @var $filename */
protected $filename = '';
/** @var string The location to store the output content */
protected $filepath = '';
/**
* Get the file extension
*
@ -62,6 +67,24 @@ abstract class base {
$this->filename = $filename;
}
/**
* Set file path when writing to file
*
* @param string $filepath
* @throws coding_exception
*/
public function set_filepath(string $filepath): void {
$filedir = dirname($filepath);
if (!is_writable($filedir)) {
throw new coding_exception('File path is not writable');
}
$this->filepath = $filepath;
// Some dataformat writers may expect filename to be set too.
$this->set_filename(pathinfo($this->filepath, PATHINFO_FILENAME));
}
/**
* Set the title of the worksheet inside a spreadsheet
*
@ -95,6 +118,17 @@ abstract class base {
header("Content-Disposition: attachment; filename=\"$filename\"");
}
/**
* Set the dataformat to be output to current file. Calling code must call {@see base::close_output_to_file()} when finished
*/
public function start_output_to_file(): void {
// Raise memory limit to ensure we can store the entire content. Start collecting output.
raise_memory_limit(MEMORY_EXTRA);
ob_start();
$this->start_output();
}
/**
* Write the start of the file.
*/
@ -134,4 +168,18 @@ abstract class base {
public function close_output() {
// Override me if needed.
}
/**
* Write the data to disk. Calling code should have previously called {@see base::start_output_to_file()}
*
* @return bool Whether the write succeeded
*/
public function close_output_to_file(): bool {
$this->close_output();
$filecontent = ob_get_contents();
ob_end_clean();
return file_put_contents($this->filepath, $filecontent) !== false;
}
}

28
lib/classes/dataformat/spout_base.php
View File

@ -66,6 +66,23 @@ abstract class spout_base extends \core\dataformat\base {
$this->renamecurrentsheet = true;
}
/**
* Set the dataformat to be output to current file
*/
public function start_output_to_file(): void {
$this->writer = \Box\Spout\Writer\Common\Creator\WriterEntityFactory::createWriter($this->spouttype);
if (method_exists($this->writer, 'setTempFolder')) {
$this->writer->setTempFolder(make_request_directory());
}
$this->writer->openToFile($this->filepath);
// By default one sheet is always created, but we want to rename it when we call start_sheet().
$this->renamecurrentsheet = true;
$this->start_output();
}
/**
* Set the title of the worksheet inside a spreadsheet
*
@ -114,4 +131,15 @@ abstract class spout_base extends \core\dataformat\base {
$this->writer->close();
$this->writer = null;
}
/**
* Write data to disk
*
* @return bool
*/
public function close_output_to_file(): bool {
$this->close_output();
return true;
}
}

58
lib/dataformatlib.php
View File

@ -33,59 +33,13 @@
* @param string $dataformat A dataformat name
* @param array $columns An ordered map of column keys and labels
* @param Iterator $iterator An iterator over the records, usually a RecordSet
* @param function $callback An option function applied to each record before writing
* @param mixed $extra An optional value which is passed into the callback function
* @param callable $callback An option function applied to each record before writing
* @throws coding_exception
*
* @deprecated since Moodle 3.9 - MDL-68500 please use \core\dataformat::download_data
*/
function download_as_dataformat($filename, $dataformat, $columns, $iterator, $callback = null) {
debugging('download_as_dataformat() is deprecated, please use \core\dataformat::download_data() instead', DEBUG_DEVELOPER);
if (ob_get_length()) {
throw new coding_exception("Output can not be buffered before calling download_as_dataformat");
}
$classname = 'dataformat_' . $dataformat . '\writer';
if (!class_exists($classname)) {
throw new coding_exception("Unable to locate dataformat/$dataformat/classes/writer.php");
}
$format = new $classname;
// The data format export could take a while to generate...
set_time_limit(0);
// Close the session so that the users other tabs in the same session are not blocked.
\core\session\manager::write_close();
// If this file was requested from a form, then mark download as complete (before sending headers).
\core_form\util::form_download_complete();
$format->set_filename($filename);
$format->send_http_headers();
// This exists to support all dataformats - see MDL-56046.
if (method_exists($format, 'write_header')) {
error_log('The function write_header() does not support multiple sheets. In order to support multiple sheets you ' .
'must implement start_output() and start_sheet() and remove write_header() in your dataformat.');
$format->write_header($columns);
} else {
$format->start_output();
$format->start_sheet($columns);
}
$c = 0;
foreach ($iterator as $row) {
if ($callback) {
$row = $callback($row);
}
if ($row === null) {
continue;
}
$format->write_record($row, $c++);
}
// This exists to support all dataformats - see MDL-56046.
if (method_exists($format, 'write_footer')) {
error_log('The function write_footer() does not support multiple sheets. In order to support multiple sheets you ' .
'must implement close_sheet() and close_output() and remove write_footer() in your dataformat.');
$format->write_footer($columns);
} else {
$format->close_sheet($columns);
$format->close_output();
}
\core\dataformat::download_data($filename, $dataformat, $columns, $iterator, $callback);
}

76
lib/tests/dataformat_test.php Normal file
View File

@ -0,0 +1,76 @@
<?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/>.
/**
* Tests for the dataformat plugins
*
* @package core
* @copyright 2020 Paul Holden <paulh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core;
use core_component;
use core\dataformat;
/**
* Dataformat tests
*
* @package core
* @copyright 2020 Paul Holden <paulh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class dataformat_testcase extends \advanced_testcase {
/**
* Data provider for {@see test_write_data)
*
* @return array
*/
public function write_data_provider(): array {
$data = [];
$dataformats = core_component::get_plugin_list('dataformat');
foreach ($dataformats as $dataformat => $unused) {
$data[] = [$dataformat];
}
return $data;
}
/**
* Test writing dataformat export to local file
*
* @param string $dataformat
* @return void
*
* @dataProvider write_data_provider
*/
public function test_write_data(string $dataformat): void {
$columns = ['fruit', 'colour', 'animal'];
$rows = [
['banana', 'yellow', 'monkey'],
['apple', 'red', 'wolf'],
['melon', 'green', 'aardvark'],
];
// Export to file. Assert that the exported file exists and is non-zero in size.
$exportfile = dataformat::write_data('My export', $dataformat, $columns, $rows);
$this->assertFileExists($exportfile);
$this->assertGreaterThan(0, filesize($exportfile));
}
}

1
lib/upgrade.txt
View File

@ -52,6 +52,7 @@ information provided here is intended especially for developers.
* The core/notification module has been updated to use AMD modals for its confirmation and alert dialogues.
The confirmation dialogue no longer has a configurable "No" button as per similar changes in MDL-59759.
This set of confirmation modals was unintentionally missed from that deprecation process.
* The download_as_dataformat() method has been deprecated. Please use \core\dataformat::download_data() instead
=== 3.8 ===
* Add CLI option to notify all cron tasks to stop: admin/cli/cron.php --stop

4
mod/forum/export.php
View File

@ -25,7 +25,6 @@ define('NO_OUTPUT_BUFFERING', true);
require_once(__DIR__ . '/../../config.php');
require_once($CFG->libdir . '/adminlib.php');
require_once($CFG->libdir . '/dataformatlib.php');
require_once($CFG->dirroot . '/calendar/externallib.php');
$forumid = required_param('id', PARAM_INT);
@ -127,9 +126,8 @@ if ($form->is_cancelled()) {
$exportdata = new ArrayObject($datamapper->to_legacy_objects($posts));
$iterator = $exportdata->getIterator();
require_once($CFG->libdir . '/dataformatlib.php');
$filename = clean_filename('discussion');
download_as_dataformat(
\core\dataformat::download_data(
$filename,
$dataformat,
$fields,

4
user/action_redir.php
View File

@ -82,8 +82,6 @@ if ($formaction == 'bulkchange.php') {
$plugins = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
if (isset($plugins[$dataformat])) {
if ($plugins[$dataformat]->is_enabled()) {
require_once($CFG->dirroot . '/lib/dataformatlib.php');
if (empty($userids)) {
redirect($returnurl, get_string('noselectedusers', 'bulkusers'));
}
@ -111,7 +109,7 @@ if ($formaction == 'bulkchange.php') {
WHERE u.id $insql";
$rs = $DB->get_recordset_sql($sql, $inparams);
download_as_dataformat('courseid_' . $course->id . '_participants', $dataformat, $columnnames, $rs);
\core\dataformat::download_data('courseid_' . $course->id . '_participants', $dataformat, $columnnames, $rs);
$rs->close();
}
}