moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[MDL-23317]

Browse source 
fixing issue with get_complete_user_data and improving related wiki comments functions
This commit is contained in:
Jordi Piguillem 2010-08-12 09:06:09 +00:00
parent a26a1a5b54
commit 9ffd2726df
2 changed files with 17 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

37
mod/wiki/locallib.php
View file

@ -526,10 +526,11 @@ function wiki_search_all($swid, $search) {
}
/**
* Get complete set of user data
* Get user data
*/
function wiki_get_user_info($userid) {
return get_complete_user_data('id', $userid);
global $DB;
return $DB->get_record('user', array('id' => $userid));
}
/**
@ -1081,38 +1082,10 @@ function wiki_get_comment($commentid){
* @param $context. Current context
* @param $pageid. Current pageid
**/
function wiki_get_comments($context, $pageid) {
global $CFG;
require_once($CFG->dirroot . '/comment/lib.php');
list($context, $course, $cm) = get_context_info_array($context->id);
$cmt = new stdclass();
$cmt->context = $context;
$cmt->itemid = $pageid;
$cmt->pluginname = 'wiki';
$cmt->area = 'wiki_page';
$cmt->course = $course;
$manager = new comment($cmt);
return ($manager->get_comments());
}
/**
* Returns all comments from wiki comments section by user
*
* @param $userid. User whose we want get the comments
**/
function wiki_get_comments_by_user($userid) {
function wiki_get_comments($contextid, $pageid) {
global $DB;
$area = 'wiki_page';
$sql = "SELECT c.*
FROM {comments} c
WHERE c.userid = ? and c.commentarea = ?";
return $DB->get_records_sql($sql, array($userid, $area));
return $DB->get_records('comments', array('contextid' => $contextid, 'itemid' => $pageid, 'commentarea' => 'wiki_page'));
}
/**

23
mod/wiki/pagelib.php
View file

@ -616,7 +616,7 @@ class page_wiki_comments extends page_wiki {
require_capability('mod/wiki:viewcomment', $context, NULL, true, 'noviewcommentpermission', 'wiki');
$comments = wiki_get_comments($context, $page->id);
$comments = wiki_get_comments($context->id, $page->id);
if (has_capability('mod/wiki:editcomment', $context)) {
echo '<div class="midpad"><a href="' . $CFG->wwwroot . '/mod/wiki/editcomments.php?action=add&amp;pageid=' . $page->id . '">' . get_string('addcomment', 'wiki') . '</a></div>';
@ -630,13 +630,14 @@ class page_wiki_comments extends page_wiki {
echo $OUTPUT->heading(get_string('nocomments', 'wiki'));
}
foreach ($comments as $num) {
$user = get_complete_user_data('username', $num->username);
foreach ($comments as $comment) {
$user = wiki_get_user_info($comment->userid);
$fullname = fullname($user, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
$by = new stdclass();
$by->name = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $user->id . '&amp;course=' . $course->id . '">' . $fullname . '</a>';
$by->date = userdate($num->timecreated);
$by->date = userdate($comment->timecreated);
$t = new html_table();
$cell1 = new html_table_cell($OUTPUT->user_picture($user, array('popup' => true)));
@ -654,14 +655,14 @@ class page_wiki_comments extends page_wiki {
if ($format != 'html') {
if ($format == 'creole') {
$parsedcontent = wiki_parse_content('creole', $num->content, $options);
$parsedcontent = wiki_parse_content('creole', $comment->content, $options);
} else if ($format == 'nwiki') {
$parsedcontent = wiki_parse_content('nwiki', $num->content, $options);
$parsedcontent = wiki_parse_content('nwiki', $comment->content, $options);
}
$cell4->text = html_entity_decode($parsedcontent['parsed_text']);
} else {
$cell4->text = $num->content;
$cell4->text = $comment->content;
}
$row2->cells[] = $cell4;
@ -670,12 +671,12 @@ class page_wiki_comments extends page_wiki {
$actionicons = false;
if ((has_capability('mod/wiki:managecomment', $context))) {
$urledit = new moodle_url('/mod/wiki/editcomments.php', array('commentid' => $num->id, 'pageid' => $page->id, 'action' => 'edit'));
$urldelet = new moodle_url('/mod/wiki/instancecomments.php', array('commentid' => $num->id, 'pageid' => $page->id, 'action' => 'delete'));
$urledit = new moodle_url('/mod/wiki/editcomments.php', array('commentid' => $comment->id, 'pageid' => $page->id, 'action' => 'edit'));
$urldelet = new moodle_url('/mod/wiki/instancecomments.php', array('commentid' => $comment->id, 'pageid' => $page->id, 'action' => 'delete'));
$actionicons = true;
} else if ((has_capability('mod/wiki:editcomment', $context)) and ($USER->id == $user->id)) {
$urledit = new moodle_url('/mod/wiki/editcomments.php', array('commentid' => $num->id, 'pageid' => $page->id, 'action' => 'edit'));
$urldelet = new moodle_url('/mod/wiki/instancecomments.php', array('commentid' => $num->id, 'pageid' => $page->id, 'action' => 'delete'));
$urledit = new moodle_url('/mod/wiki/editcomments.php', array('commentid' => $comment->id, 'pageid' => $page->id, 'action' => 'edit'));
$urldelet = new moodle_url('/mod/wiki/instancecomments.php', array('commentid' => $comment->id, 'pageid' => $page->id, 'action' => 'delete'));
$actionicons = true;
}