From a78b88e7387fd7e39aa7f80f0ec0bdaeda97d146 Mon Sep 17 00:00:00 2001
From: agrabs <agrabs>
Date: Tue, 29 Apr 2008 21:38:13 +0000
Subject: [PATCH] added missing log_display entries
---
mod/feedback/complete.php | 4 ++--
mod/feedback/complete_guest.php | 2 +-
mod/feedback/db/install.xml | 11 +++++++++++
mod/feedback/db/upgrade.php | 7 +++++++
mod/feedback/delete_completed.php | 2 +-
mod/feedback/index.php | 4 ++--
mod/feedback/version.php | 2 +-
mod/feedback/view.php | 2 +-
8 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 90f959dc74..062ec413ef 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -145,7 +145,7 @@
$userid = $USER->id; //arb
if($completedid = feedback_save_values($_POST, $USER->id, true)){
if($userid > 0) {
- add_to_log($course->id, "feedback", "startcomplete", "view.php?id=$cm->id", "$feedback->name", $cm->id, $userid);
+ add_to_log($course->id, 'feedback', 'startcomplete', 'view.php?id='.$cm->id, $feedback->id, $cm->id, $userid);
}
if(!$gonextpage AND !$gopreviouspage) $preservevalues = false;//es kann gespeichert werden
@@ -188,7 +188,7 @@
}else if($new_completed_id = feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted, $userid)) {
$savereturn = 'saved';
if($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
- add_to_log($course->id, "feedback", "submit", "view.php?id=$cm->id", "$feedback->name", $cm->id, $userid);
+ add_to_log($course->id, 'feedback', 'submit', 'view.php?id='.$cm->id, $feedback->id, $cm->id, $userid);
feedback_email_teachers($cm, $feedback, $course, $userid);
}else {
feedback_email_teachers_anonym($cm, $feedback, $course, $userid);
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 1fe50bc25b..1ececf702a 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -149,7 +149,7 @@
if(feedback_check_values($_POST, $startitempos, $lastitempos)) {
$userid = $USER->id; //arb
if($completedid = feedback_save_guest_values($_POST, $USER->sesskey)){
- add_to_log($course->id, "feedback", "startcomplete", "view.php?id=$cm->id", "$feedback->name"); //arb: log even guest submissions or at least the startcomplete since the other add log event is elsewhere
+ add_to_log($course->id, 'feedback', 'startcomplete', 'view.php?id='.$cm->id, $feedback->id); //arb: log even guest submissions or at least the startcomplete since the other add log event is elsewhere
if(!$gonextpage AND !$gopreviouspage) $preservevalues = false;//es kann gespeichert werden
diff --git a/mod/feedback/db/install.xml b/mod/feedback/db/install.xml
index c9e9837e44..d04f07b73f 100644
--- a/mod/feedback/db/install.xml
+++ b/mod/feedback/db/install.xml
@@ -157,4 +157,15 @@
</INDEXES>
</TABLE>
</TABLES>
+ <STATEMENTS>
+ <STATEMENT NAME="insert log_display" TYPE="insert" TABLE="log_display" COMMENT="Initial insert of records on table log_display">
+ <SENTENCES>
+ <SENTENCE TEXT="(module, action, mtable, field) VALUES ('feedback', 'startcomplete', 'feedback', 'name')" />
+ <SENTENCE TEXT="(module, action, mtable, field) VALUES ('feedback', 'submit', 'feedback', 'name')" />
+ <SENTENCE TEXT="(module, action, mtable, field) VALUES ('feedback', 'delete', 'feedback', 'name')" />
+ <SENTENCE TEXT="(module, action, mtable, field) VALUES ('feedback', 'view', 'feedback', 'name')" />
+ <SENTENCE TEXT="(module, action, mtable, field) VALUES ('feedback', 'view all', 'course', 'shortname')" />
+ </SENTENCES>
+ </STATEMENT>
+ </STATEMENTS>
</XMLDB>
diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index 83a12af9de..64e2936fe6 100644
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -167,6 +167,13 @@ function xmldb_feedback_upgrade($oldversion=0) {
}
}
+ if ($result && $oldversion < 2008042801) {
+ $result = $result && modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('feedback', 'startcomplete', 'feedback', 'name');");
+ $result = $result && modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('feedback', 'submit', 'feedback', 'name');");
+ $result = $result && modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('feedback', 'delete', 'feedback', 'name');");
+ $result = $result && modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('feedback', 'view', 'feedback', 'name');");
+ $result = $result && modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('feedback', 'view all', 'course', 'shortname');");
+ }
/// And upgrade begins here. For each one, you'll need one
/// block of code similar to the next one. Please, delete
diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index 312e11697d..964ccdc8c8 100644
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -55,7 +55,7 @@
if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){
if($completed = get_record('feedback_completed', 'id', $completedid)) {
feedback_delete_completed($completedid);
- add_to_log($course->id, "feedback", "delete", "view.php?id=$cm->id", "$feedback->name",$cm->id);
+ add_to_log($course->id, 'feedback', 'delete', 'view.php?id='.$cm->id, $feedback->id,$cm->id);
redirect('show_entries.php?id='.$id.'&do_show=showentries');
}
}
diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index 2844e2f469..6374b9831a 100644
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -18,9 +18,9 @@
}
$capabilities = feedback_load_course_capabilities($course->id);
- require_login($course->id, true, $cm);
+ require_login($course->id);
- add_to_log($course->id, "feedback", "view all", htmlspecialchars('index.php?id='.$course->id), "");
+ add_to_log($course->id, 'feedback', 'view all', htmlspecialchars('index.php?id='.$course->id), $course->id);
/// Print the page header
diff --git a/mod/feedback/version.php b/mod/feedback/version.php
index 443c161f30..79d93f9267 100644
--- a/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@ -10,7 +10,7 @@
*/
- $module->version = 2008042800; // The current module version (Date: YYYYMMDDXX)
+ $module->version = 2008042801; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2007101503; // Requires this Moodle version
$feedback_version_intern = 1; //this version is used for restore older backups
$module->cron = 0; // Period for cron to check this module (secs)
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index 20b3c9fe2e..0190d08687 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -48,7 +48,7 @@
}
if($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
- add_to_log($course->id, "feedback", "view", "view.php?id=$cm->id", "$feedback->name",$cm->id);
+ add_to_log($course->id, 'feedback', 'view', 'view.php?id='.$cm->id, $feedback->id,$cm->id);
}
/// Print the page header
--
2.39.5