From a87aa28d514de977873e737ad05cd0f578add688 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 21 May 2012 00:33:58 +0200 Subject: [PATCH] MDL-32709 book: Fix logs handling --- .../restore_book_activity_task.class.php | 13 +++++++-- mod/book/db/log.php | 4 +-- mod/book/tool/exportimscp/db/log.php | 29 +++++++++++++++++++ mod/book/tool/exportimscp/index.php | 2 +- mod/book/tool/exportimscp/version.php | 3 +- mod/book/tool/importhtml/version.php | 3 +- mod/book/tool/print/db/log.php | 29 +++++++++++++++++++ mod/book/tool/print/version.php | 3 +- mod/book/version.php | 4 +-- 9 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 mod/book/tool/exportimscp/db/log.php create mode 100644 mod/book/tool/print/db/log.php diff --git a/mod/book/backup/moodle2/restore_book_activity_task.class.php b/mod/book/backup/moodle2/restore_book_activity_task.class.php index bbe9b4af08b..da1b75f94d4 100644 --- a/mod/book/backup/moodle2/restore_book_activity_task.class.php +++ b/mod/book/backup/moodle2/restore_book_activity_task.class.php @@ -96,10 +96,17 @@ class restore_book_activity_task extends restore_activity_task { static public function define_restore_log_rules() { $rules = array(); + $rules[] = new restore_log_rule('book', 'add', 'view.php?id={course_module}', '{book}'); + $rules[] = new restore_log_rule('book', 'update', 'view.php?id={course_module}&chapterid={book_chapter}', '{book}'); $rules[] = new restore_log_rule('book', 'update', 'view.php?id={course_module}', '{book}'); + $rules[] = new restore_log_rule('book', 'view', 'view.php?id={course_module}&chapterid={book_chapter}', '{book}'); $rules[] = new restore_log_rule('book', 'view', 'view.php?id={course_module}', '{book}'); - $rules[] = new restore_log_rule('book', 'view all', 'view.php?id={course_module}', '{book}'); - $rules[] = new restore_log_rule('book', 'print', 'view.php?id={course_module}', '{book}'); + $rules[] = new restore_log_rule('book', 'print', 'tool/print/index.php?id={course_module}&chapterid={book_chapter}', '{book}'); + $rules[] = new restore_log_rule('book', 'print', 'tool/print/index.php?id={course_module}', '{book}'); + $rules[] = new restore_log_rule('book', 'exportimscp', 'tool/exportimscp/index.php?id={course_module}', '{book}'); + // To convert old 'generateimscp' log entries + $rules[] = new restore_log_rule('book', 'generateimscp', 'tool/generateimscp/index.php?id={course_module}', '{book}', + 'book', 'exportimscp', 'tool/exportimscp/index.php?id={course_module}', '{book}'); return $rules; } @@ -119,6 +126,8 @@ class restore_book_activity_task extends restore_activity_task { static public function define_restore_log_rules_for_course() { $rules = array(); + $rules[] = new restore_log_rule('book', 'view all', 'index.php?id={course}', null); + return $rules; } } diff --git a/mod/book/db/log.php b/mod/book/db/log.php index 979f58e8e03..cec6003b1e2 100644 --- a/mod/book/db/log.php +++ b/mod/book/db/log.php @@ -25,7 +25,7 @@ defined('MOODLE_INTERNAL') || die(); $logs = array( + array('module'=>'book', 'action'=>'add', 'mtable'=>'book', 'field'=>'name'), array('module'=>'book', 'action'=>'update', 'mtable'=>'book', 'field'=>'name'), - array('module'=>'book', 'action'=>'view', 'mtable'=>'book', 'field'=>'name'), - array('module'=>'book', 'action'=>'view all', 'mtable'=>'book', 'field'=>'name'), + array('module'=>'book', 'action'=>'view', 'mtable'=>'book', 'field'=>'name') ); diff --git a/mod/book/tool/exportimscp/db/log.php b/mod/book/tool/exportimscp/db/log.php new file mode 100644 index 00000000000..4a130dc52c8 --- /dev/null +++ b/mod/book/tool/exportimscp/db/log.php @@ -0,0 +1,29 @@ +. + +/** + * Export to IMSCP booktool log events definition + * + * @package booktool_exportimscp + * @copyright 2012 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$logs = array( + array('module'=>'book', 'action'=>'exportimscp', 'mtable'=>'book', 'field'=>'name') +); diff --git a/mod/book/tool/exportimscp/index.php b/mod/book/tool/exportimscp/index.php index d243ddc4d94..a0fa3f2079e 100644 --- a/mod/book/tool/exportimscp/index.php +++ b/mod/book/tool/exportimscp/index.php @@ -48,7 +48,7 @@ $strbooks = get_string('modulenameplural', 'book'); $strbook = get_string('modulename', 'book'); $strtop = get_string('top', 'book'); -add_to_log($course->id, 'book', 'generateimscp', 'tool/generateimscp/index.php?id='.$cm->id, $book->id, $cm->id); +add_to_log($course->id, 'book', 'exportimscp', 'tool/exportimscp/index.php?id='.$cm->id, $book->id, $cm->id); $file = booktool_exportimscp_build_package($book, $context); diff --git a/mod/book/tool/exportimscp/version.php b/mod/book/tool/exportimscp/version.php index 34e022cc3d5..3fd6550db65 100644 --- a/mod/book/tool/exportimscp/version.php +++ b/mod/book/tool/exportimscp/version.php @@ -24,5 +24,6 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2011101400; // The current plugin version (Date: YYYYMMDDXX) $plugin->component = 'booktool_exportimscp'; // Full name of the plugin (used for diagnostics) +$plugin->version = 2012052100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2012051900; // Requires this Moodle version diff --git a/mod/book/tool/importhtml/version.php b/mod/book/tool/importhtml/version.php index 3c5d0f4a830..e7f46c6af45 100644 --- a/mod/book/tool/importhtml/version.php +++ b/mod/book/tool/importhtml/version.php @@ -24,5 +24,6 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2011101400; // The current plugin version (Date: YYYYMMDDXX) $plugin->component = 'booktool_importhtml'; // Full name of the plugin (used for diagnostics) +$plugin->version = 2012052100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2012051900; // Requires this Moodle version diff --git a/mod/book/tool/print/db/log.php b/mod/book/tool/print/db/log.php new file mode 100644 index 00000000000..efaa6844671 --- /dev/null +++ b/mod/book/tool/print/db/log.php @@ -0,0 +1,29 @@ +. + +/** + * Print booktool log events definition + * + * @package booktool_print + * @copyright 2012 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +$logs = array( + array('module'=>'book', 'action'=>'print', 'mtable'=>'book', 'field'=>'name') +); diff --git a/mod/book/tool/print/version.php b/mod/book/tool/print/version.php index 01ad0f171e1..0251d1fa6a5 100644 --- a/mod/book/tool/print/version.php +++ b/mod/book/tool/print/version.php @@ -24,5 +24,6 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2011101400; // The current plugin version (Date: YYYYMMDDXX) $plugin->component = 'booktool_print'; // Full name of the plugin (used for diagnostics) +$plugin->version = 2012052100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->requires = 2012051900; // Requires this Moodle version diff --git a/mod/book/version.php b/mod/book/version.php index 507b0e0b789..fe07130751e 100644 --- a/mod/book/version.php +++ b/mod/book/version.php @@ -25,6 +25,6 @@ defined('MOODLE_INTERNAL') || die; $module->component = 'mod_book'; // Full name of the plugin (used for diagnostics) -$module->version = 2012051500; // The current module version (Date: YYYYMMDDXX) -$module->requires = 2012051100; // Requires this Moodle version +$module->version = 2012052100; // The current module version (Date: YYYYMMDDXX) +$module->requires = 2012051900; // Requires this Moodle version $module->cron = 0; // Period for cron to check this module (secs)