+++ /dev/null
-<?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/>.
-
-/**
- * This file is part of the Database module for Moodle
- *
- * @copyright 2005 Martin Dougiamas http://dougiamas.com
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package mod-data
- */
-
-require_once('../../config.php');
-require_once('lib.php');
-require_once('comment_form.php');
-
-//param needed to go back to view.php
-$rid = required_param('rid', PARAM_INT); // Record ID
-$page = optional_param('page', 0, PARAM_INT); // Page ID
-
-//param needed for comment operations
-$mode = optional_param('mode','add',PARAM_ALPHA);
-$commentid = optional_param('commentid','',PARAM_INT);
-$confirm = optional_param('confirm','',PARAM_INT);
-
-$url = new moodle_url($CFG->wwwroot.'/mod/data/comment.php', array('rid'=>$rid));
-if ($page !== 0) {
- $url->param('page', $page);
-}
-if ($mode !== 'add') {
- $url->param('mode', $mode);
-}
-if ($commentid !== '') {
- $url->param('commentid', $commentid);
-}
-if ($confirm !== '') {
- $url->param('confirm', $confirm);
-}
-$PAGE->set_url($url);
-
-if (! $record = $DB->get_record('data_records', array('id'=>$rid))) {
- print_error('invalidrecord', 'data');
-}
-if (! $data = $DB->get_record('data', array('id'=>$record->dataid))) {
- print_error('invalidid', 'data');
-}
-if (! $course = $DB->get_record('course', array('id'=>$data->course))) {
- print_error('coursemisconf');
-}
-if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
- print_error('invalidcoursemodule');
-}
-
-require_login($course->id, false, $cm);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
-require_capability('mod/data:comment', $context);
-
-if ($commentid) {
- if (! $comment = $DB->get_record('data_comments', array('id'=>$commentid))) {
- print_error('commentmisconf');
- }
- if ($comment->recordid != $record->id) {
- print_error('commentmisconf');
- }
- if (!has_capability('mod/data:managecomments', $context) && $comment->userid != $USER->id) {
- print_error('cannoteditcomment');
- }
-} else {
- $comment = false;
-}
-
-
-$mform = new mod_data_comment_form();
-$mform->set_data(array('mode'=>$mode, 'page'=>$page, 'rid'=>$record->id, 'commentid'=>$commentid));
-if ($comment) {
- $format = $comment->format;
- $content = $comment->content;
- if (can_use_html_editor()) {
- $options = new object();
- $options->smiley = false;
- $options->filter = false;
- $content = format_text($content, $format, $options);
- $format = FORMAT_HTML;
- }
- $mform->set_data(array('content'=>$content, 'format'=>$format));
-}
-
-
-if ($mform->is_cancelled()) {
- redirect('view.php?rid='.$record->id.'&page='.$page);
-}
-
-switch ($mode) {
- case 'add':
- if (!$formadata = $mform->get_data()) {
- break; // something is wrong here, try again
- }
-
- $newcomment = new object();
- $newcomment->userid = $USER->id;
- $newcomment->created = time();
- $newcomment->modified = time();
- $newcomment->content = $formadata->content;
- $newcomment->recordid = $formadata->rid;
- if ($DB->insert_record('data_comments',$newcomment)) {
- redirect('view.php?rid='.$record->id.'&page='.$page);
- } else {
- print_error('cannotsavecomment');
- }
-
- break;
-
- case 'edit': //print edit form
- if (!$formadata = $mform->get_data()) {
- break; // something is wrong here, try again
- }
-
- $updatedcomment = new object();
- $updatedcomment->id = $formadata->commentid;
- $updatedcomment->content = $formadata->content;
- $updatedcomment->format = $formadata->format;
- $updatedcomment->modified = time();
-
- if ($DB->update_record('data_comments', $updatedcomment)) {
- redirect('view.php?rid='.$record->id.'&page='.$page);
- } else {
- print_error('cannotsavecomment');
- }
- break;
-
- case 'delete': //deletes single comment from db
- if ($confirm and confirm_sesskey() and $comment) {
- $DB->delete_records('data_comments', array('id'=>$comment->id));
- redirect('view.php?rid='.$record->id.'&page='.$page, get_string('commentdeleted', 'data'));
-
- } else { //print confirm delete form
- echo $OUTPUT->header();
- data_print_comment($data, $comment, $page);
-
- echo $OUTPUT->confirm(get_string('deletecomment','data'),
- 'comment.php?rid='.$record->id.'&commentid='.$comment->id.'&page='.$page.'&mode=delete&confirm=1',
- 'view.php?rid='.$record->id.'&page='.$page);
- echo $OUTPUT->footer();
- }
- die;
- break;
-
-}
-
-echo $OUTPUT->header();
-data_print_comments($data, $record, $page, $mform);
-echo $OUTPUT->footer();
-
+++ /dev/null
-<?php
-
-require_once $CFG->libdir.'/formslib.php';
-
-class mod_data_comment_form extends moodleform {
- function definition() {
- $mform =& $this->_form;
-
- // visible elements
- $mform->addElement('htmleditor', 'content', get_string('comment', 'data'), array('cols'=>85, 'rows'=>18));
- $mform->addRule('content', get_string('required'), 'required', null, 'client');
- $mform->setType('content', PARAM_RAW); // cleaned before the display
-
- $mform->addElement('format', 'format', get_string('format'));
- $mform->setHelpButton('format', array('textformat', get_string('helpformatting')));
-
- // hidden optional params
- $mform->addElement('hidden', 'mode', 'add');
- $mform->setType('mode', PARAM_ALPHA);
-
- $mform->addElement('hidden', 'page', 0);
- $mform->setType('page', PARAM_INT);
-
- $mform->addElement('hidden', 'rid', 0);
- $mform->setType('rid', PARAM_INT);
-
- $mform->addElement('hidden', 'commentid', 0);
- $mform->setType('commentid', PARAM_INT);
-
-//-------------------------------------------------------------------------------
- // buttons
- $this->add_action_buttons();
-
- }
-}
upgrade_mod_savepoint($result, 2009042000, 'data');
}
- if ($result && $oldversion < 2009111700) {
+ if ($result && $oldversion < 2009111701) {
require_once($CFG->libdir . '/commentlib.php');
+ upgrade_set_timeout(60*20);
/// Define table data_comments to be dropped
$table = new xmldb_table('data_comments');
$sql = 'SELECT d.id AS dataid,
d.course AS courseid,
r.id AS itemid,
+ c.id AS commentid,
c.content AS comment,
c.format AS format,
c.created AS timemodified
FROM {data_comments} c, {data_records} r, {data} d
- WHERE c.recordid=r.id AND r.dataid=d.id';
- /// move data comments to new comments table
+ WHERE c.recordid=r.id AND r.dataid=d.id ORDER BY dataid, courseid';
+
+ /// move data comments to new comments table
+ $lastdataid = null;
+ $lastcourseid = null;
+ $modcontext = null;
if ($rs = $DB->get_recordset_sql($sql)) {
- $error = false;
foreach($rs as $res) {
- if ($cm = get_coursemodule_from_instance('data', $res->dataid, $res->courseid)) {
- $context = get_context_instance(CONTEXT_MODULE, $cm->id);
- $cmt = new stdclass;
- $cmt->contextid = $context->id;
- $cmt->courseid = $res->courseid;
- $cmt->area = 'database_entry';
- $cmt->itemid = $res->itemid;
- $comment = new comment($cmt);
- try {
- $cmt = $comment->add($res->comment, $res->format);
- } catch (comment_exception $e) {
- add_to_log($res->courseid, 'comments', 'add', '', 'Cannot migrate data module comment with ID# '.$res->old_id);
- $error = true;
+ if ($res->dataid != $lastdataid || $res->courseid != $lastcourseid) {
+ $cm = get_coursemodule_from_instance('data', $res->dataid, $res->courseid);
+ if ($cm) {
+ $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
}
+ $lastdataid = $res->dataid;
+ $lastcourseid = $res->courseid;
+ }
+ $cmt = new stdclass;
+ $cmt->contextid = $modcontext->id;
+ $cmt->courseid = $res->courseid;
+ $cmt->area = 'database_entry';
+ $cmt->itemid = $res->itemid;
+ $comment = new comment($cmt);
+ // comments class will throw an exception if error occurs
+ $cmt = $comment->add($res->comment, $res->format);
+ if (!empty($cmt)) {
+ $DB->delete_records('data_comments', array('id'=>$res->commentid));
}
}
}
- if (empty($error)) {
- $dbman->drop_table($table);
- } else {
- print_error('cannotmigratedatacomments');
- }
+ // the default exception handler will stop the script if error occurs before
+ $dbman->drop_table($table);
}
/// data savepoint reached
- upgrade_mod_savepoint($result, 2009111700, 'data');
+ upgrade_mod_savepoint($result, 2009111701, 'data');
}
return $result;
}
projects / moodle.git / commitdiff