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

MDL-13114 tool_uploadcourse: Clean up after scheck scan

Browse Source
This commit is contained in:
Frederic Massart
2013-07-15 10:02:56 +08:00
parent 76fca7168c
commit 22b3be3633
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/uploadcourse/classes/helper.php
-1
View File
@@ -390,7 +390,6 @@ class tool_uploadcourse_helper {
* @return int category ID.
*/
public static function resolve_category($data, &$errors = array()) {
global $DB;
$catid = null;
if (!empty($data['category'])) {
admin/tool/uploadcourse/classes/step2_form.php
+1 -6
View File
@@ -38,7 +38,7 @@ class tool_uploadcourse_step2_form extends tool_uploadcourse_base_form {
* @return void.
*/
public function definition () {
global $CFG, $COURSE, $DB;
global $CFG;
$mform = $this->_form;
$data = $this->_customdata['data'];
@@ -134,9 +134,6 @@ class tool_uploadcourse_step2_form extends tool_uploadcourse_base_form {
$mform->setDefault('defaults[showreports]', $courseconfig->showreports);
if (!empty($CFG->legacyfilesinnewcourses)) {
if (empty($course->legacyfiles)) {
$choices = array('0' => get_string('no'), '2' => get_string('yes'));
}
$mform->addElement('select', 'defaults[legacyfiles]', get_string('courselegacyfiles'), $choices);
$mform->addHelpButton('defaults[legacyfiles]', 'courselegacyfiles');
if (!isset($courseconfig->legacyfiles)) {
@@ -198,8 +195,6 @@ class tool_uploadcourse_step2_form extends tool_uploadcourse_base_form {
* @return array $errors - form errors
*/
public function validation($data, $files) {
global $DB;
$errors = parent::validation($data, $files);
$columns = $this->_customdata['columns'];
$optype = $data['options']['mode'];
admin/tool/uploadcourse/classes/tracker.php
-2
View File
@@ -107,8 +107,6 @@ class tool_uploadcourse_tracker {
* @return void
*/
public function results($total, $created, $updated, $deleted, $errors) {
global $OUTPUT;
if ($this->outputmode == self::NO_OUTPUT) {
return;
}
admin/tool/uploadcourse/cli/uploadcourse.php
+2 -2
View File
@@ -192,9 +192,9 @@ $cir = new csv_import_reader($importid, 'uploadcourse');
$readcount = $cir->load_csv_content($content, $options['encoding'], $options['delimiter']);
unset($content);
if ($readcount === false) {
print_error('csvfileerror', 'tool_uploadcourse', $returnurl, $cir->get_error());
print_error('csvfileerror', 'tool_uploadcourse', '', $cir->get_error());
} else if ($readcount == 0) {
print_error('csvemptyfile', 'error', $returnurl, $cir->get_error());
print_error('csvemptyfile', 'error', '', $cir->get_error());
}
$processor = new tool_uploadcourse_processor($cir, $processoroptions, $defaults);
$processor->execute(new tool_uploadcourse_tracker(tool_uploadcourse_tracker::OUTPUT_PLAIN));