MDL-17427 another round of refactoring of upgrade related functions - this should...

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 3f63c10e94b066ecb9fc5ed429f466fd542cd928..64767744f2e9c34beec9d5273ece99afdc56eb31 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -804,7 +804,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         /// return to original debugging level
         $CFG->debug = $origdebug;
         error_reporting($CFG->debug);
-        upgrade_log_start();
+        upgrade_started();
 
         /// Both old .sql files and new install.xml are supported
         /// But we prioritise install.xml (XMLDB) if present
@@ -930,7 +930,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
             /// return to original debugging level
             $CFG->debug = $origdebug;
             error_reporting($CFG->debug);
-            upgrade_log_start();
+            upgrade_started();
 
             /// Upgrade current language pack if we can
             upgrade_language_pack();
@@ -1050,7 +1050,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
 
     /// just make sure upgrade logging is properly terminated
-    upgrade_log_finish();
+    upgrade_finished();
 
     /// Set up the site
     if (! $site = get_site()) {

diff --git a/admin/index.php b/admin/index.php
index 2ad600b5fa92c4d5b8ab1b5a3d71e4361d39e097..27b74138116b37b5cbb96b1bfb68513f75b23456 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -146,10 +146,10 @@
             }
         }
 
-        upgrade_log_start(true); // does not store ugprade runnign flag
+        upgrade_started(true); // does not store ugprade runnign flag
         print_heading('coresystem');
         $DB->get_manager()->install_from_xmldb_file("$CFG->libdir/db/install.xml");
-        upgrade_log_start();     // we want the flag to be stored in config table ;-)
+        upgrade_started();     // we want the flag to be stored in config table ;-)
 
     /// set all core default records and default settings
         require_once("$CFG->libdir/db/install.php");
@@ -263,7 +263,7 @@
         /// return to original debugging level
             $CFG->debug = $origdebug;
             error_reporting($CFG->debug);
-            upgrade_log_start();
+            upgrade_started();
 
         /// Upgrade current language pack if we can
             if (empty($CFG->skiplangupgrade)) {
@@ -331,7 +331,7 @@
         $sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
         if (!$sessionstarted) {
             // we neeed this redirect to setup proper session
-            upgrade_log_finish("index.php?sessionstarted=1&lang=$CFG->lang");
+            upgrade_finished("index.php?sessionstarted=1&lang=$CFG->lang");
         }
         $adminuser = create_admin_user();
         $adminuser->newadminuser = 1;
@@ -340,7 +340,7 @@
 
     } else {
     /// just make sure upgrade logging is properly terminated
-        upgrade_log_finish('upgradesettings.php');
+        upgrade_finished('upgradesettings.php');
     }
 
     // Turn xmlstrictheaders back on now.

diff --git a/admin/report/unittest/test_tables.php b/admin/report/unittest/test_tables.php
index ffa358e2b0e17254175a4e4588d9cf61251f0ce5..6cbaaaa8ea94eca1a75e11dec76cf72dd5bd3ecd 100644 (file)
--- a/admin/report/unittest/test_tables.php
+++ b/admin/report/unittest/test_tables.php
@@ -101,7 +101,7 @@ die;die;die;
     upgrade_local_db($return_url);  // Return here afterwards
 
 /// just make sure upgrade logging is properly terminated
-    upgrade_log_finish();
+    upgrade_finished();
 
 /// make sure admin user is created - this is the last step because we need
 /// session to be working properly in order to edit admin account

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 3b8768293ae3df04a1d5f8ac6fa96e671a3571f6..c0f8401f013f51c82a90aa4925e45f0a46a6a26b 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -28,7 +28,7 @@ define('INSECURE_DATAROOT_ERROR', 2);
  * @return void
  *
  */
-function upgrade_log_display_entry($module, $action, $mtable, $field) {
+function update_log_display_entry($module, $action, $mtable, $field) {
     global $DB;
 
     if ($type = $DB->get_record('log_display', array('module'=>$module, 'action'=>$action))) {
@@ -424,7 +424,7 @@ function upgrade_plugins($type, $dir) {
                 $info->pluginversion  = $plugin->version;
                 $info->currentmoodle = $CFG->version;
                 $info->requiremoodle = $plugin->requires;
-                upgrade_log_start();
+                upgrade_started();
                 notify(get_string('pluginrequirementsnotmet', 'error', $info));
                 $updated_plugins = true;
                 continue;
@@ -444,7 +444,7 @@ function upgrade_plugins($type, $dir) {
             // do nothing
         } else if ($installedversion < $plugin->version) {
             $updated_plugins = true;
-            upgrade_log_start();
+            upgrade_started();
             print_heading($dir.'/'. $plugin->name .' plugin needs upgrading');
             @set_time_limit(0);  // To allow slow databases to complete the long SQL
 
@@ -565,7 +565,7 @@ function upgrade_activity_modules() {
                 $info->moduleversion  = $module->version;
                 $info->currentmoodle = $CFG->version;
                 $info->requiremoodle = $module->requires;
-                upgrade_log_start();
+                upgrade_started();
                 notify(get_string('modulerequirementsnotmet', 'error', $info));
                 continue;
             }
@@ -584,7 +584,7 @@ function upgrade_activity_modules() {
                     notify('Upgrade file ' . $mod . ': ' . $fullmod . '/db/upgrade.php is not readable');
                     continue;
                 }
-                upgrade_log_start();
+                upgrade_started();
 
                 print_heading($module->name .' module needs upgrading');
 
@@ -625,7 +625,7 @@ function upgrade_activity_modules() {
             }
 
         } else {    // module not installed yet, so install it
-            upgrade_log_start();
+            upgrade_started();
             print_heading($module->name);
 
         /// Execute install.xml (XMLDB) - must be present
@@ -852,7 +852,7 @@ function create_admin_user($user_input=NULL) {
  * Marks start of upgrade, blocks any other access to site.
  * The upgrade is finished at the end of script or after timeout.
  */
-function upgrade_log_start($preinstall=false) {
+function upgrade_started($preinstall=false) {
     global $CFG, $DB;
 
     static $started = false;
@@ -885,7 +885,7 @@ function upgrade_log_start($preinstall=false) {
  * Internal function - executed if upgrade interruped.
  */
 function upgrade_finished_handler() {
-    upgrade_log_finish();
+    upgrade_finished();
 }
 
 /**
@@ -893,7 +893,7 @@ function upgrade_finished_handler() {
  *
  * This function may be called repeatedly.
  */
-function upgrade_log_finish($continueurl=null) {
+function upgrade_finished($continueurl=null) {
     global $CFG, $DB;
 
     if (!empty($CFG->upgraderunning)) {

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 4727e40fc61d138668a98eec5f716976d822f1b1..eaf4015b434c0b0d398e8949d79caee2c3047651 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -1172,7 +1172,7 @@ function upgrade_blocks_plugins() {
                 // do nothing
             } else if ($currblock->version < $block->version) {
                 $updated_blocks = true;
-                upgrade_log_start();
+                upgrade_started();
 
                 print_heading('New version of '.$blocktitle.' ('.$block->name.') exists');
                 @set_time_limit(0);  // To allow slow databases to complete the long SQL
@@ -1239,7 +1239,7 @@ function upgrade_blocks_plugins() {
                 print_error('blocknameconflict', '', '', (object)array('name'=>$block->name, 'conflict'=>$conflictblock));
             }
             $updated_blocks = true;
-            upgrade_log_start();
+            upgrade_started();
             print_heading($block->name);
             @set_time_limit(0);  // To allow slow databases to complete the long SQL
 

diff --git a/lib/db/install.php b/lib/db/install.php
index e34b938a7a1d405bacca183dc5c07ae45a16018e..270d37c2759c27a90bd9fd855665b3678bdbc73f 100644 (file)
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -106,24 +106,24 @@ function xmldb_main_install() {
     $DB->insert_record('mnet_application', $mnet_app);
 
 /// insert log entries - replaces statements section in install.xml
-    upgrade_log_display_entry('user', 'view', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('course', 'user report', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('course', 'view', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'update', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'enrol', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'unenrol', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'report log', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'report live', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'report outline', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'report participation', 'course', 'fullname');
-    upgrade_log_display_entry('course', 'report stats', 'course', 'fullname');
-    upgrade_log_display_entry('message', 'write', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('message', 'read', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('message', 'add contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('message', 'remove contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('message', 'block contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('message', 'unblock contact', 'user', 'CONCAT(firstname,\' \',lastname)');
-    upgrade_log_display_entry('group', 'view', 'groups', 'name');
+    update_log_display_entry('user', 'view', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('course', 'user report', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('course', 'view', 'course', 'fullname');
+    update_log_display_entry('course', 'update', 'course', 'fullname');
+    update_log_display_entry('course', 'enrol', 'course', 'fullname');
+    update_log_display_entry('course', 'unenrol', 'course', 'fullname');
+    update_log_display_entry('course', 'report log', 'course', 'fullname');
+    update_log_display_entry('course', 'report live', 'course', 'fullname');
+    update_log_display_entry('course', 'report outline', 'course', 'fullname');
+    update_log_display_entry('course', 'report participation', 'course', 'fullname');
+    update_log_display_entry('course', 'report stats', 'course', 'fullname');
+    update_log_display_entry('message', 'write', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('message', 'read', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('message', 'add contact', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('message', 'remove contact', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('message', 'block contact', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('message', 'unblock contact', 'user', 'CONCAT(firstname,\' \',lastname)');
+    update_log_display_entry('group', 'view', 'groups', 'name');
 
 
 /// Create guest record

diff --git a/lib/locallib.php b/lib/locallib.php
index 0ca54faf9f240950722f2f09a23ab7288633f9d1..798f2f1bde0c09a88572e982ceb1074ccc15a8fa 100644 (file)
--- a/lib/locallib.php
+++ b/lib/locallib.php
@@ -127,7 +127,7 @@ function upgrade_local_db() {
     require($CFG->dirroot.'/local/version.php');  // Get code versions
 
     if (empty($CFG->local_version)) { // install
-        upgrade_log_start();
+        upgrade_started();
         if (file_exists($CFG->dirroot.'/local/db/install.php')) {
             require_once($CFG->dirroot.'/local/db/install.php');
             xmldb_local_install();
@@ -142,7 +142,7 @@ function upgrade_local_db() {
         return true;
 
     } else if ($local_version > $CFG->local_version) { // upgrade!
-        upgrade_log_start();
+        upgrade_started();
         if (file_exists($CFG->dirroot.'/local/db/upgrade.php')) {
             require_once($CFG->dirroot.'/local/db/upgrade.php');
             xmldb_local_upgrade($CFG->local_version);

diff --git a/mod/assignment/db/install.php b/mod/assignment/db/install.php
index 540c9e70167b8d5e672b53ccf589de69f8941068..eaefbd8b40513b65ce84752939fc39b03e85c72b 100644 (file)
--- a/mod/assignment/db/install.php
+++ b/mod/assignment/db/install.php
@@ -9,10 +9,10 @@ function xmldb_assignment_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('assignment', 'view', 'assignment', 'name');
-    upgrade_log_display_entry('assignment', 'add', 'assignment', 'name');
-    upgrade_log_display_entry('assignment', 'update', 'assignment', 'name');
-    upgrade_log_display_entry('assignment', 'view submission', 'assignment', 'name');
-    upgrade_log_display_entry('assignment', 'upload', 'assignment', 'name');
+    update_log_display_entry('assignment', 'view', 'assignment', 'name');
+    update_log_display_entry('assignment', 'add', 'assignment', 'name');
+    update_log_display_entry('assignment', 'update', 'assignment', 'name');
+    update_log_display_entry('assignment', 'view submission', 'assignment', 'name');
+    update_log_display_entry('assignment', 'upload', 'assignment', 'name');
 
 }

diff --git a/mod/chat/db/install.php b/mod/chat/db/install.php
index 6b355a417368aa6bc486a85151b8bcfdd7700f56..212e1d741b01150f74efe535f97448a8af299130 100644 (file)
--- a/mod/chat/db/install.php
+++ b/mod/chat/db/install.php
@@ -9,9 +9,9 @@ function xmldb_chat_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('chat', 'view', 'chat', 'name');
-    upgrade_log_display_entry('chat', 'add', 'chat', 'name');
-    upgrade_log_display_entry('chat', 'update', 'chat', 'name');
-    upgrade_log_display_entry('chat', 'report', 'chat', 'name');
-    upgrade_log_display_entry('chat', 'talk', 'chat', 'name');
+    update_log_display_entry('chat', 'view', 'chat', 'name');
+    update_log_display_entry('chat', 'add', 'chat', 'name');
+    update_log_display_entry('chat', 'update', 'chat', 'name');
+    update_log_display_entry('chat', 'report', 'chat', 'name');
+    update_log_display_entry('chat', 'talk', 'chat', 'name');
 }

diff --git a/mod/choice/db/install.php b/mod/choice/db/install.php
index e572adb2c9a451746e4e0709619814478b12a0e1..c34218a04dc49b9120cf68a341a13b3b2ab51b21 100644 (file)
--- a/mod/choice/db/install.php
+++ b/mod/choice/db/install.php
@@ -9,11 +9,11 @@ function xmldb_choice_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('choice', 'view', 'choice', 'name');
-    upgrade_log_display_entry('choice', 'update', 'choice', 'name');
-    upgrade_log_display_entry('choice', 'add', 'choice', 'name');
-    upgrade_log_display_entry('choice', 'report', 'choice', 'name');
-    upgrade_log_display_entry('choice', 'choose', 'choice', 'name');
-    upgrade_log_display_entry('choice', 'choose again', 'choice', 'name');
+    update_log_display_entry('choice', 'view', 'choice', 'name');
+    update_log_display_entry('choice', 'update', 'choice', 'name');
+    update_log_display_entry('choice', 'add', 'choice', 'name');
+    update_log_display_entry('choice', 'report', 'choice', 'name');
+    update_log_display_entry('choice', 'choose', 'choice', 'name');
+    update_log_display_entry('choice', 'choose again', 'choice', 'name');
 
 }

diff --git a/mod/data/db/install.php b/mod/data/db/install.php
index 51405635f166917a5b9c1b91be73f4a66ffe7eab..31c5cf4d7de51283227a83be101fe37aa77c3c40 100644 (file)
--- a/mod/data/db/install.php
+++ b/mod/data/db/install.php
@@ -9,13 +9,13 @@ function xmldb_data_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('data', 'view', 'data', 'name');
-    upgrade_log_display_entry('data', 'add', 'data', 'name');
-    upgrade_log_display_entry('data', 'update', 'data', 'name');
-    upgrade_log_display_entry('data', 'record delete', 'data', 'name');
-    upgrade_log_display_entry('data', 'fields add', 'data_fields', 'name');
-    upgrade_log_display_entry('data', 'fields update', 'data_fields', 'name');
-    upgrade_log_display_entry('data', 'templates saved', 'data', 'name');
-    upgrade_log_display_entry('data', 'templates def', 'data', 'name');
+    update_log_display_entry('data', 'view', 'data', 'name');
+    update_log_display_entry('data', 'add', 'data', 'name');
+    update_log_display_entry('data', 'update', 'data', 'name');
+    update_log_display_entry('data', 'record delete', 'data', 'name');
+    update_log_display_entry('data', 'fields add', 'data_fields', 'name');
+    update_log_display_entry('data', 'fields update', 'data_fields', 'name');
+    update_log_display_entry('data', 'templates saved', 'data', 'name');
+    update_log_display_entry('data', 'templates def', 'data', 'name');
 
 }

diff --git a/mod/feedback/db/install.php b/mod/feedback/db/install.php
index 2042406e6462065f3bb6de0ab5a6e8b8e3453bb7..e7968129e99812935652b085aca2e3997454b5a9 100644 (file)
--- a/mod/feedback/db/install.php
+++ b/mod/feedback/db/install.php
@@ -9,10 +9,10 @@ function xmldb_feedback_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('feedback', 'startcomplete', 'feedback', 'name');
-    upgrade_log_display_entry('feedback', 'submit', 'feedback', 'name');
-    upgrade_log_display_entry('feedback', 'delete', 'feedback', 'name');
-    upgrade_log_display_entry('feedback', 'view', 'feedback', 'name');
-    upgrade_log_display_entry('feedback', 'view all', 'course', 'shortname');
+    update_log_display_entry('feedback', 'startcomplete', 'feedback', 'name');
+    update_log_display_entry('feedback', 'submit', 'feedback', 'name');
+    update_log_display_entry('feedback', 'delete', 'feedback', 'name');
+    update_log_display_entry('feedback', 'view', 'feedback', 'name');
+    update_log_display_entry('feedback', 'view all', 'course', 'shortname');
 
 }

diff --git a/mod/forum/db/install.php b/mod/forum/db/install.php
index e4b4fdbc6fc4b817dd624a8b10d3899bb6709dcc..eb8ab485acf5cdefdbf926178bad21c2dade2ecf 100644 (file)
--- a/mod/forum/db/install.php
+++ b/mod/forum/db/install.php
@@ -9,17 +9,17 @@ function xmldb_forum_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('forum', 'add', 'forum', 'name');
-    upgrade_log_display_entry('forum', 'update', 'forum', 'name');
-    upgrade_log_display_entry('forum', 'add discussion', 'forum_discussions', 'name');
-    upgrade_log_display_entry('forum', 'add post', 'forum_posts', 'subject');
-    upgrade_log_display_entry('forum', 'update post', 'forum_posts', 'subject');
-    upgrade_log_display_entry('forum', 'user report', 'user', 'CONCAT(firstname," ",lastname)');
-    upgrade_log_display_entry('forum', 'move discussion', 'forum_discussions', 'name');
-    upgrade_log_display_entry('forum', 'view subscribers', 'forum', 'name');
-    upgrade_log_display_entry('forum', 'view discussion', 'forum_discussions', 'name');
-    upgrade_log_display_entry('forum', 'view forum', 'forum', 'name');
-    upgrade_log_display_entry('forum', 'subscribe', 'forum', 'name');
-    upgrade_log_display_entry('forum', 'unsubscribe', 'forum', 'name');
+    update_log_display_entry('forum', 'add', 'forum', 'name');
+    update_log_display_entry('forum', 'update', 'forum', 'name');
+    update_log_display_entry('forum', 'add discussion', 'forum_discussions', 'name');
+    update_log_display_entry('forum', 'add post', 'forum_posts', 'subject');
+    update_log_display_entry('forum', 'update post', 'forum_posts', 'subject');
+    update_log_display_entry('forum', 'user report', 'user', 'CONCAT(firstname," ",lastname)');
+    update_log_display_entry('forum', 'move discussion', 'forum_discussions', 'name');
+    update_log_display_entry('forum', 'view subscribers', 'forum', 'name');
+    update_log_display_entry('forum', 'view discussion', 'forum_discussions', 'name');
+    update_log_display_entry('forum', 'view forum', 'forum', 'name');
+    update_log_display_entry('forum', 'subscribe', 'forum', 'name');
+    update_log_display_entry('forum', 'unsubscribe', 'forum', 'name');
 
 }

diff --git a/mod/glossary/db/install.php b/mod/glossary/db/install.php
index 3d20ba47f223bc3c9eb38f64de1381909d7a67f9..bdedf3e4ea9a03435eb92a4ac3979bfc55bd0b8f 100644 (file)
--- a/mod/glossary/db/install.php
+++ b/mod/glossary/db/install.php
@@ -9,19 +9,19 @@ function xmldb_glossary_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('glossary', 'add', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'update', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'view', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'view all', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'add entry', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'update entry', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'add category', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'update category', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'delete category', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'add comment', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'update comment', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'delete comment', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'approve entry', 'glossary', 'name');
-    upgrade_log_display_entry('glossary', 'view entry', 'glossary_entries', 'concept');
+    update_log_display_entry('glossary', 'add', 'glossary', 'name');
+    update_log_display_entry('glossary', 'update', 'glossary', 'name');
+    update_log_display_entry('glossary', 'view', 'glossary', 'name');
+    update_log_display_entry('glossary', 'view all', 'glossary', 'name');
+    update_log_display_entry('glossary', 'add entry', 'glossary', 'name');
+    update_log_display_entry('glossary', 'update entry', 'glossary', 'name');
+    update_log_display_entry('glossary', 'add category', 'glossary', 'name');
+    update_log_display_entry('glossary', 'update category', 'glossary', 'name');
+    update_log_display_entry('glossary', 'delete category', 'glossary', 'name');
+    update_log_display_entry('glossary', 'add comment', 'glossary', 'name');
+    update_log_display_entry('glossary', 'update comment', 'glossary', 'name');
+    update_log_display_entry('glossary', 'delete comment', 'glossary', 'name');
+    update_log_display_entry('glossary', 'approve entry', 'glossary', 'name');
+    update_log_display_entry('glossary', 'view entry', 'glossary_entries', 'concept');
 
 }

diff --git a/mod/label/db/install.php b/mod/label/db/install.php
index 2ccae89b6757ec847115614d3371bf3657df2e0f..8228a8e74c9e8aea8c29264ed85f5f5a4ef572ea 100644 (file)
--- a/mod/label/db/install.php
+++ b/mod/label/db/install.php
@@ -9,7 +9,7 @@ function xmldb_label_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('label', 'add', 'label', 'name');
-    upgrade_log_display_entry('label', 'update', 'label', 'name');
+    update_log_display_entry('label', 'add', 'label', 'name');
+    update_log_display_entry('label', 'update', 'label', 'name');
 
 }

diff --git a/mod/lesson/db/install.php b/mod/lesson/db/install.php
index a3845947113b6c0cba91bd38f1e5e347a46aa9d6..5cbf2e377d422a1c0decc9b3be1685dfe4a5f70d 100644 (file)
--- a/mod/lesson/db/install.php
+++ b/mod/lesson/db/install.php
@@ -9,8 +9,8 @@ function xmldb_lesson_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('lesson', 'start', 'lesson', 'name');
-    upgrade_log_display_entry('lesson', 'end', 'lesson', 'name');
-    upgrade_log_display_entry('lesson', 'view', 'lesson_pages', 'title');
+    update_log_display_entry('lesson', 'start', 'lesson', 'name');
+    update_log_display_entry('lesson', 'end', 'lesson', 'name');
+    update_log_display_entry('lesson', 'view', 'lesson_pages', 'title');
 
 }

diff --git a/mod/quiz/db/install.php b/mod/quiz/db/install.php
index 260354499cf78539cb63dfa0cc8c89007484d83d..5dab01213ff3a92e744843b7bb45a01fd178ef9b 100644 (file)
--- a/mod/quiz/db/install.php
+++ b/mod/quiz/db/install.php
@@ -9,18 +9,18 @@ function xmldb_quiz_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('quiz', 'add', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'update', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'view', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'report', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'attempt', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'submit', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'review', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'editquestions', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'preview', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'start attempt', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'close attempt', 'quiz', 'name');
-    upgrade_log_display_entry('quiz', 'continue attempt', 'quiz', 'name');
+    update_log_display_entry('quiz', 'add', 'quiz', 'name');
+    update_log_display_entry('quiz', 'update', 'quiz', 'name');
+    update_log_display_entry('quiz', 'view', 'quiz', 'name');
+    update_log_display_entry('quiz', 'report', 'quiz', 'name');
+    update_log_display_entry('quiz', 'attempt', 'quiz', 'name');
+    update_log_display_entry('quiz', 'submit', 'quiz', 'name');
+    update_log_display_entry('quiz', 'review', 'quiz', 'name');
+    update_log_display_entry('quiz', 'editquestions', 'quiz', 'name');
+    update_log_display_entry('quiz', 'preview', 'quiz', 'name');
+    update_log_display_entry('quiz', 'start attempt', 'quiz', 'name');
+    update_log_display_entry('quiz', 'close attempt', 'quiz', 'name');
+    update_log_display_entry('quiz', 'continue attempt', 'quiz', 'name');
 
     $record = new object();
     $record->name         = 'overview';

diff --git a/mod/resource/db/install.php b/mod/resource/db/install.php
index 27689f198f4df64a19d930c1b675ca6dba8c23df..4a0abb1f5c8cc301870b98a03534e164f1f5fc03 100644 (file)
--- a/mod/resource/db/install.php
+++ b/mod/resource/db/install.php
@@ -10,8 +10,8 @@ function xmldb_resource_install() {
 
 /// Install logging support
 
-    upgrade_log_display_entry('resource', 'view', 'resource', 'name');
-    upgrade_log_display_entry('resource', 'update', 'resource', 'name');
-    upgrade_log_display_entry('resource', 'add', 'resource', 'name');
+    update_log_display_entry('resource', 'view', 'resource', 'name');
+    update_log_display_entry('resource', 'update', 'resource', 'name');
+    update_log_display_entry('resource', 'add', 'resource', 'name');
 
 }

diff --git a/mod/scorm/db/install.php b/mod/scorm/db/install.php
index 1b6807938c5425442ee880a12c365c7daa5985d9..f7b5ca9517157367aff801fc1943be0387129365 100644 (file)
--- a/mod/scorm/db/install.php
+++ b/mod/scorm/db/install.php
@@ -9,9 +9,9 @@ function xmldb_scorm_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('scorm', 'view', 'scorm', 'name');
-    upgrade_log_display_entry('scorm', 'review', 'scorm', 'name');
-    upgrade_log_display_entry('scorm', 'update', 'scorm', 'name');
-    upgrade_log_display_entry('scorm', 'add', 'scorm', 'name');
+    update_log_display_entry('scorm', 'view', 'scorm', 'name');
+    update_log_display_entry('scorm', 'review', 'scorm', 'name');
+    update_log_display_entry('scorm', 'update', 'scorm', 'name');
+    update_log_display_entry('scorm', 'add', 'scorm', 'name');
 
 }

diff --git a/mod/survey/db/install.php b/mod/survey/db/install.php
index e1d8e2a0518dfb99cad02147ffa8af314c668631..a3d75a0b8656da9e80c74386aeb231bd03c25580 100644 (file)
--- a/mod/survey/db/install.php
+++ b/mod/survey/db/install.php
@@ -9,13 +9,13 @@ function xmldb_survey_install() {
     global $DB;
 
 /// Install logging support
-    upgrade_log_display_entry('survey', 'add', 'survey', 'name');
-    upgrade_log_display_entry('survey', 'update', 'survey', 'name');
-    upgrade_log_display_entry('survey', 'download', 'survey', 'name');
-    upgrade_log_display_entry('survey', 'view form', 'survey', 'name');
-    upgrade_log_display_entry('survey', 'view graph', 'survey', 'name');
-    upgrade_log_display_entry('survey', 'view report', 'survey', 'name');
-    upgrade_log_display_entry('survey', 'submit', 'survey', 'name');
+    update_log_display_entry('survey', 'add', 'survey', 'name');
+    update_log_display_entry('survey', 'update', 'survey', 'name');
+    update_log_display_entry('survey', 'download', 'survey', 'name');
+    update_log_display_entry('survey', 'view form', 'survey', 'name');
+    update_log_display_entry('survey', 'view graph', 'survey', 'name');
+    update_log_display_entry('survey', 'view report', 'survey', 'name');
+    update_log_display_entry('survey', 'submit', 'survey', 'name');
 
 
 /// insert survey data