? wiki_log2.patch
Index: comments.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/comments.php,v
retrieving revision 1.3
diff -u -r1.3 comments.php
--- comments.php	30 Jul 2010 10:49:42 -0000	1.3
+++ comments.php	2 Apr 2011 11:30:40 -0000
@@ -59,7 +59,7 @@
 
 require_course_login($course->id, true, $cm);
 
-add_to_log($course->id, 'wiki', 'comments', 'comments.php?id=' . $cm->id, $wiki->id);
+add_to_log($course->id, 'wiki', 'view comments', "comments.php?pageid=$pageid", "$page->title", $cm->id);
 
 /// Print the page header
 $wikipage = new page_wiki_comments($wiki, $subwiki, $cm);
Index: create.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/create.php,v
retrieving revision 1.8
diff -u -r1.8 create.php
--- create.php	8 Nov 2010 06:33:00 -0000	1.8
+++ create.php	2 Apr 2011 11:30:40 -0000
@@ -66,10 +66,10 @@
 
 require_login($course->id, true, $cm);
 
-add_to_log($course->id, 'createpage', 'createpage', 'view.php?id=' . $cm->id, $wiki->id);
 
 $wikipage = new page_wiki_create($wiki, $subwiki, $cm);
 
+
 if (!empty($swid)) {
     $wikipage->set_gid($subwiki->groupid);
     $wikipage->set_uid($subwiki->userid);
@@ -80,22 +80,28 @@
     $wikipage->set_uid($uid);
 }
 
-if (!empty($title)) {
-    $wikipage->set_title($title);
-} else {
-    $wikipage->set_title(get_string('newpage', 'wiki'));
+if (empty($title)) {
+    $title = get_string('newpage', 'wiki');
 }
 
+$wikipage->set_title($title);
+
 // set page action, and initialise moodle form
 $wikipage->set_action($action);
 
 switch ($action) {
 case 'create':
-    $wikipage->create_page($title);
+    $newpageid = $wikipage->create_page($title);
+    $newtitle = $wikipage->get_title();
+    add_to_log($course->id, 'wiki', 'create page', "view.php?pageid=$newpageid", "$newtitle", $cm->id);
+    redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $newpageid);
     break;
 case 'new':
     if ((int)$wiki->forceformat == 1 && !empty($title)) {
-        $wikipage->create_page($title);
+        $newpageid = $wikipage->create_page($title);
+	$newtitle = $wikipage->get_title();
+	add_to_log($course->id, 'wiki', 'create page', "view.php?pageid=$newpageid", "$newtitle", $cm->id);
+        redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $newpageid);
     } else {
         // create link from moodle navigation block without pagetitle
         $wikipage->print_header();
Index: diff.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/diff.php,v
retrieving revision 1.3
diff -u -r1.3 diff.php
--- diff.php	30 Jul 2010 10:49:42 -0000	1.3
+++ diff.php	2 Apr 2011 11:30:40 -0000
@@ -67,13 +67,15 @@
 }
 
 require_course_login($course->id, true, $cm);
-add_to_log($course->id, "wiki", "diff", "diff.php?id=$cm->id", "$wiki->id");
 
 $wikipage = new page_wiki_diff($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
 $wikipage->set_comparison($compare, $comparewith);
 
+
+add_to_log($course->id, "wiki", "view diff", "diff.php?pageid=$pageid&comparewith=$comparewith&compare=$compare", "$page->title", $cm->id);
+
 $wikipage->print_header();
 
 $wikipage->print_content();
Index: edit.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/edit.php,v
retrieving revision 1.7
diff -u -r1.7 edit.php
--- edit.php	8 Nov 2010 06:33:00 -0000	1.7
+++ edit.php	2 Apr 2011 11:30:40 -0000
@@ -77,7 +77,6 @@
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:editpage', $context);
 
-add_to_log($course->id, 'wiki', 'edit', "edit.php?id=$cm->id", "$wiki->id");
 
 if ($option == get_string('save', 'wiki')) {
     if (!confirm_sesskey()) {
@@ -87,6 +86,7 @@
     $wikipage->set_page($page);
     $wikipage->set_newcontent($newcontent);
     $wikipage->set_upload(true);
+    add_to_log($course->id, 'wiki', 'edit', "view.php?pageid=$pageid", "$page->title", $cm->id);
 } else {
     if ($option == get_string('preview')) {
         if (!confirm_sesskey()) {
Index: history.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/history.php,v
retrieving revision 1.3
diff -u -r1.3 history.php
--- history.php	30 Jul 2010 10:49:42 -0000	1.3
+++ history.php	2 Apr 2011 11:30:40 -0000
@@ -59,7 +59,7 @@
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
-add_to_log($course->id, 'wiki', 'history', 'history.php?id=' . $cm->id, $wiki->id);
+add_to_log($course->id, 'wiki', 'view history', "history.php?pageid=$pageid", "$page->title", $cm->id);
 
 /// Print the page header
 $wikipage = new page_wiki_history($wiki, $subwiki, $cm);
Index: index.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/index.php,v
retrieving revision 1.37
diff -u -r1.37 index.php
--- index.php	30 Jul 2010 10:49:42 -0000	1.37
+++ index.php	2 Apr 2011 11:30:40 -0000
@@ -45,7 +45,7 @@
 $PAGE->set_pagelayout('incourse');
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
-add_to_log($course->id, 'wiki', 'view all', "index.php?id=$course->id", "");
+add_to_log($course->id, 'wiki', 'view all', "index.php?id=$id", "");
 
 /// Get all required stringswiki
 $strwikis = get_string("modulenameplural", "wiki");
Index: instancecomments.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/instancecomments.php,v
retrieving revision 1.5
diff -u -r1.5 instancecomments.php
--- instancecomments.php	2 Nov 2010 03:02:08 -0000	1.5
+++ instancecomments.php	2 Apr 2011 11:30:40 -0000
@@ -63,6 +63,7 @@
 $comm->set_page($page);
 
 if ($action == 'delete') {
+    add_to_log($course->id, 'wiki', 'delete comment', "comments.php?pageid=$pageid", "$page->title", $cm->id);
     $comm->set_action($action, $commentid, 0);
 } else {
     if (empty($newcontent)) {
@@ -74,9 +75,11 @@
     }
 
     if ($action == 'edit') {
+        add_to_log($course->id, 'wiki', 'edit comment', "comments.php?pageid=$pageid", "$page->title", $cm->id);
         $comm->set_action($action, $id, $content);
 
     } else {
+        add_to_log($course->id, 'wiki', 'add comment', "comments.php?pageid=$pageid", "$page->title", $cm->id);
         $action = 'add';
         $comm->set_action($action, 0, $content);
     }
Index: lock.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/lock.php,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 lock.php
--- lock.php	30 Mar 2011 16:22:42 -0000	1.4.2.1
+++ lock.php	2 Apr 2011 11:30:40 -0000
@@ -71,11 +71,14 @@
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:editpage', $context);
 
-//add_to_log($course->id, "wiki", "lock", "lock.php?id=$cm->id", "$wiki->id");
+
 
 $wikipage = new page_wiki_lock($wiki, $subwiki, $cm);
 $wikipage->set_page($page);
 
+
+add_to_log($course->id, "wiki", "lock", "view.php?pageid=$pageid", "$page->title", $cm->id);
+
 if (!empty($section)) {
     $wikipage->set_section($sectioncontent, $section);
 }
Index: map.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/map.php,v
retrieving revision 1.3
diff -u -r1.3 map.php
--- map.php	30 Jul 2010 10:49:42 -0000	1.3
+++ map.php	2 Apr 2011 11:30:40 -0000
@@ -55,7 +55,6 @@
 
 require_course_login($course->id, true, $cm);
 
-add_to_log($course->id, "wiki", "map", "map.php?id=$cm->id", "$wiki->id");
 
 /// Print page header
 
@@ -64,6 +63,9 @@
 
 $wikipage->set_view($option);
 $wikipage->set_page($page);
+
+add_to_log($course->id, "wiki", "view map", "map.php?pageid=$pageid", "$page->title", $cm->id);
+
 $wikipage->print_header();
 $wikipage->print_content();
 
Index: overridelocks.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/overridelocks.php,v
retrieving revision 1.4
diff -u -r1.4 overridelocks.php
--- overridelocks.php	12 Aug 2010 10:01:19 -0000	1.4
+++ overridelocks.php	2 Apr 2011 11:30:40 -0000
@@ -67,7 +67,6 @@
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:overridelock', $context);
 
-add_to_log($course->id, "wiki", "overridelocks", "overridelocks.php?id=$cm->id", "$wiki->id");
 
 if (!confirm_sesskey()) {
     print_error(get_string('invalidsesskey', 'wiki'));
@@ -80,6 +79,8 @@
     $wikipage->set_section($sectioncontent, $section);
 }
 
+add_to_log($course->id, "wiki", "overridelocks", "view.php?pageid=$pageid", "$page->title", $cm->id);
+
 $wikipage->print_header();
 
 $wikipage->print_content();
Index: pagelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/pagelib.php,v
retrieving revision 1.32.2.1
diff -u -r1.32.2.1 pagelib.php
--- pagelib.php	30 Mar 2011 16:22:42 -0000	1.32.2.1
+++ pagelib.php	2 Apr 2011 11:30:40 -0000
@@ -192,7 +192,11 @@
         $this->title = $page->title;
         $PAGE->set_title($this->title);
     }
-
+    
+    function get_title() {
+	return $this->title;
+    }   
+    
     /**
      * Method to set the current page title.
      * This method must be called when the current page is not created yet.
@@ -944,12 +948,14 @@
             $swid = wiki_add_subwiki($PAGE->activityrecord->id, $this->gid, $this->uid);
             $this->subwiki = wiki_get_subwiki($swid);
         }
+
         if ($data) {
             $id = wiki_create_page($this->subwiki->id, $data->pagetitle, $data->pageformat, $USER->id);
         } else {
             $id = wiki_create_page($this->subwiki->id, $pagetitle, $PAGE->activityrecord->defaultformat, $USER->id);
         }
-        redirect($CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $id);
+	
+	return $id;
     }
 }
 
Index: prettyview.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/prettyview.php,v
retrieving revision 1.3
diff -u -r1.3 prettyview.php
--- prettyview.php	30 Jul 2010 10:49:42 -0000	1.3
+++ prettyview.php	2 Apr 2011 11:30:40 -0000
@@ -56,12 +56,12 @@
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
 
-add_to_log($course->id, "wiki", "view", "prettyview.php?pageid=$pageid", "$wiki->id");
-
 $wikipage = new page_wiki_prettyview($wiki, $subwiki, $cm);
 
 $wikipage->set_page($page);
 
+add_to_log($course->id, "wiki", "view pretty", "prettyview.php?pageid=$pageid", "$page->title", $cm->id);
+
 $wikipage->print_header();
 $wikipage->print_content();
 $wikipage->print_footer();
Index: restoreversion.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/restoreversion.php,v
retrieving revision 1.5
diff -u -r1.5 restoreversion.php
--- restoreversion.php	12 Aug 2010 10:08:13 -0000	1.5
+++ restoreversion.php	2 Apr 2011 11:30:41 -0000
@@ -60,8 +60,6 @@
 
 require_login($course->id, true, $cm);
 
-add_to_log($course->id, "restore", "restore", "view.php?id=$cm->id", "$wiki->id");
-
 if ($confirm) {
 
     $wikipage = new page_wiki_confirmrestore($wiki, $subwiki, $cm);
@@ -76,6 +74,8 @@
 
 }
 
+add_to_log($course->id, "wiki", "restore", "view.php?pageid=$pageid", "$page->title : $versionid", $cm->id);
+
 $wikipage->print_header();
 $wikipage->print_content();
 
Index: view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/view.php,v
retrieving revision 1.120
diff -u -r1.120 view.php
--- view.php	29 Nov 2010 08:30:15 -0000	1.120
+++ view.php	2 Apr 2011 11:30:41 -0000
@@ -256,7 +256,6 @@
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);
 
-add_to_log($course->id, 'wiki', 'view', 'view.php?id=' . $cm->id, $wiki->id);
 
 if (($edit != - 1) and $PAGE->user_allowed_editing()) {
     $USER->editing = $edit;
@@ -276,6 +275,13 @@
 $wikipage->set_gid($currentgroup);
 $wikipage->set_page($page);
 
+
+if($pageid) {
+    add_to_log($course->id, 'wiki', 'view', "view.php?pageid=$pageid", "$page->title", $cm->id);
+} else if($id) {
+    add_to_log($course->id, 'wiki', 'view', "view.php?id=$id", "$page->title", $cm->id);
+}
+
 $wikipage->print_header();
 $wikipage->print_content();
 
Index: viewversion.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/viewversion.php,v
retrieving revision 1.3
diff -u -r1.3 viewversion.php
--- viewversion.php	30 Jul 2010 10:49:42 -0000	1.3
+++ viewversion.php	2 Apr 2011 11:30:41 -0000
@@ -59,7 +59,6 @@
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
-add_to_log($course->id, "wiki", "history", "history.php?id=$cm->id", "$wiki->id");
 
 /// Print the page header
 $wikipage = new page_wiki_viewversion($wiki, $subwiki, $cm);
@@ -67,6 +66,8 @@
 $wikipage->set_page($page);
 $wikipage->set_versionid($versionid);
 
+add_to_log($course->id, "wiki", "view version", "viewversion.php?pageid=$pageid&versionid=$versionid", "$page->title", $cm->id);
+
 $wikipage->print_header();
 $wikipage->print_content();