Commit 5f219cf1 authored by Ben Kelada's avatar Ben Kelada Committed by Ryan Wyllie
Browse files

MDL-372 forum: Improve pinning and update for Moodle 3.0

parent 87b007b4
...@@ -93,7 +93,8 @@ class block_news_items extends block_base { ...@@ -93,7 +93,8 @@ class block_news_items extends block_base {
// descending order. The call to default sort order here will use // descending order. The call to default sort order here will use
// that unless the discussion that post is in has a timestart set // that unless the discussion that post is in has a timestart set
// in the future. // in the future.
$sort = forum_get_default_sort_order(true, 'p.modified'); // This sort will ignore pinned posts as we want the most recent.
$sort = forum_get_default_sort_order(true, 'p.modified', 'd', false);
if (! $discussions = forum_get_discussions($cm, $sort, false, if (! $discussions = forum_get_discussions($cm, $sort, false,
$currentgroup, $this->page->course->newsitems) ) { $currentgroup, $this->page->course->newsitems) ) {
$text .= '('.get_string('nonews', 'forum').')'; $text .= '('.get_string('nonews', 'forum').')';
......
...@@ -99,4 +99,25 @@ class discussion_pinned extends \core\event\base { ...@@ -99,4 +99,25 @@ class discussion_pinned extends \core\event\base {
throw new \coding_exception('objectid must be set to the discussionid.'); throw new \coding_exception('objectid must be set to the discussionid.');
} }
} }
/**
* Forum discussion object id mappings.
*
* @return array
*/
public static function get_objectid_mapping() {
return array('db' => 'forum_discussions', 'restore' => 'forum_discussion');
}
/**
* Forum id mappings.
*
* @return array
*/
public static function get_other_mapping() {
$othermapped = array();
$othermapped['forumid'] = array('db' => 'forum', 'restore' => 'forum');
return $othermapped;
}
} }
...@@ -99,4 +99,25 @@ class discussion_unpinned extends \core\event\base { ...@@ -99,4 +99,25 @@ class discussion_unpinned extends \core\event\base {
throw new \coding_exception('objectid must be set to the discussionid.'); throw new \coding_exception('objectid must be set to the discussionid.');
} }
} }
/**
* Forum discussion object id mappings.
*
* @return array
*/
public static function get_objectid_mapping() {
return array('db' => 'forum_discussions', 'restore' => 'forum_discussion');
}
/**
* Forum id mappings.
*
* @return array
*/
public static function get_other_mapping() {
$othermapped = array();
$othermapped['forumid'] = array('db' => 'forum', 'restore' => 'forum');
return $othermapped;
}
} }
...@@ -138,6 +138,11 @@ class mod_forum_post_form extends moodleform { ...@@ -138,6 +138,11 @@ class mod_forum_post_form extends moodleform {
$mform->addHelpButton('attachments', 'attachment', 'forum'); $mform->addHelpButton('attachments', 'attachment', 'forum');
} }
if (!$post->parent && has_capability('mod/forum:pindiscussions', $modcontext)) {
$mform->addElement('checkbox', 'pinned', get_string('discussionpinned', 'forum'));
$mform->addHelpButton('pinned', 'discussionpinned', 'forum');
}
if (empty($post->id) && $manageactivities) { if (empty($post->id) && $manageactivities) {
$mform->addElement('checkbox', 'mailnow', get_string('mailnow', 'forum')); $mform->addElement('checkbox', 'mailnow', get_string('mailnow', 'forum'));
} }
......
...@@ -226,7 +226,7 @@ $capabilities = array( ...@@ -226,7 +226,7 @@ $capabilities = array(
'mod/forum:pindiscussions' => array( 'mod/forum:pindiscussions' => array(
'captype' => 'read', 'captype' => 'write',
'contextlevel' => CONTEXT_MODULE, 'contextlevel' => CONTEXT_MODULE,
'archetypes' => array( 'archetypes' => array(
'teacher' => CAP_ALLOW, 'teacher' => CAP_ALLOW,
......
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<XMLDB PATH="mod/forum/db" VERSION="20141028" COMMENT="XMLDB file for Moodle mod/forum" <XMLDB PATH="mod/forum/db" VERSION="20160113" COMMENT="XMLDB file for Moodle mod/forum"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd" xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
> >
......
...@@ -26,21 +26,22 @@ ...@@ -26,21 +26,22 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
global $DB; // TODO: this is a hack, we should really do something with the SQL in SQL tables global $DB; // TODO: this is a hack, we should really do something with the SQL in SQL tables.
$logs = array( $logs = array(
array('module'=>'forum', 'action'=>'add', 'mtable'=>'forum', 'field'=>'name'), array('module' => 'forum', 'action' => 'add', 'mtable' => 'forum', 'field' => 'name'),
array('module'=>'forum', 'action'=>'update', 'mtable'=>'forum', 'field'=>'name'), array('module' => 'forum', 'action' => 'update', 'mtable' => 'forum', 'field' => 'name'),
array('module'=>'forum', 'action'=>'add discussion', 'mtable'=>'forum_discussions', 'field'=>'name'), array('module' => 'forum', 'action' => 'add discussion', 'mtable' => 'forum_discussions', 'field' => 'name'),
array('module'=>'forum', 'action'=>'add post', 'mtable'=>'forum_posts', 'field'=>'subject'), array('module' => 'forum', 'action' => 'add post', 'mtable' => 'forum_posts', 'field' => 'subject'),
array('module'=>'forum', 'action'=>'update post', 'mtable'=>'forum_posts', 'field'=>'subject'), array('module' => 'forum', 'action' => 'update post', 'mtable' => 'forum_posts', 'field' => 'subject'),
array('module'=>'forum', 'action'=>'user report', 'mtable'=>'user', 'field'=>$DB->sql_concat('firstname', "' '" , 'lastname')), array('module' => 'forum', 'action' => 'user report', 'mtable' => 'user',
array('module'=>'forum', 'action'=>'move discussion', 'mtable'=>'forum_discussions', 'field'=>'name'), 'field' => $DB->sql_concat('firstname', "' '", 'lastname')),
array('module'=>'forum', 'action'=>'view subscribers', 'mtable'=>'forum', 'field'=>'name'), array('module' => 'forum', 'action' => 'move discussion', 'mtable' => 'forum_discussions', 'field' => 'name'),
array('module'=>'forum', 'action'=>'view discussion', 'mtable'=>'forum_discussions', 'field'=>'name'), array('module' => 'forum', 'action' => 'view subscribers', 'mtable' => 'forum', 'field' => 'name'),
array('module'=>'forum', 'action'=>'view forum', 'mtable'=>'forum', 'field'=>'name'), array('module' => 'forum', 'action' => 'view discussion', 'mtable' => 'forum_discussions', 'field' => 'name'),
array('module'=>'forum', 'action'=>'subscribe', 'mtable'=>'forum', 'field'=>'name'), array('module' => 'forum', 'action' => 'view forum', 'mtable' => 'forum', 'field' => 'name'),
array('module'=>'forum', 'action'=>'unsubscribe', 'mtable'=>'forum', 'field'=>'name'), array('module' => 'forum', 'action' => 'subscribe', 'mtable' => 'forum', 'field' => 'name'),
array('module'=>'forum', 'action'=>'pin discussion', 'mtable'=>'forum_discussions', 'field'=>'name'), array('module' => 'forum', 'action' => 'unsubscribe', 'mtable' => 'forum', 'field' => 'name'),
array('module'=>'forum', 'action'=>'unpin discussion', 'mtable'=>'forum_discussions', 'field'=>'name'), array('module' => 'forum', 'action' => 'pin discussion', 'mtable' => 'forum_discussions', 'field' => 'name'),
array('module' => 'forum', 'action' => 'unpin discussion', 'mtable' => 'forum_discussions', 'field' => 'name'),
); );
\ No newline at end of file
...@@ -239,19 +239,6 @@ function xmldb_forum_upgrade($oldversion) { ...@@ -239,19 +239,6 @@ function xmldb_forum_upgrade($oldversion) {
// Moodle v2.8.0 release upgrade line. // Moodle v2.8.0 release upgrade line.
// Put any upgrade step following this. // Put any upgrade step following this.
if ($oldversion < 2014112400) {
// Add support for pinned discussions.
$table = new xmldb_table('forum_discussions');
$field = new xmldb_field('pinned', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'timeend');
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
// Forum savepoint reached.
upgrade_mod_savepoint(true, 2014112400, 'forum');
}
// Moodle v2.9.0 release upgrade line. // Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this. // Put any upgrade step following this.
...@@ -266,5 +253,18 @@ function xmldb_forum_upgrade($oldversion) { ...@@ -266,5 +253,18 @@ function xmldb_forum_upgrade($oldversion) {
// Moodle v3.0.0 release upgrade line. // Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this. // Put any upgrade step following this.
if ($oldversion < 2015120800) {
// Add support for pinned discussions.
$table = new xmldb_table('forum_discussions');
$field = new xmldb_field('pinned', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'timeend');
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
// Forum savepoint reached.
upgrade_mod_savepoint(true, 2015120800, 'forum');
}
return true; return true;
} }
...@@ -32,7 +32,7 @@ $mode = optional_param('mode', 0, PARAM_INT); // If set, changes the ...@@ -32,7 +32,7 @@ $mode = optional_param('mode', 0, PARAM_INT); // If set, changes the
$move = optional_param('move', 0, PARAM_INT); // If set, moves this discussion to another forum $move = optional_param('move', 0, PARAM_INT); // If set, moves this discussion to another forum
$mark = optional_param('mark', '', PARAM_ALPHA); // Used for tracking read posts if user initiated. $mark = optional_param('mark', '', PARAM_ALPHA); // Used for tracking read posts if user initiated.
$postid = optional_param('postid', 0, PARAM_INT); // Used for tracking read posts if user initiated. $postid = optional_param('postid', 0, PARAM_INT); // Used for tracking read posts if user initiated.
$pin = optional_param('pin', -1, PARAM_INT); // If set, pin or unpin this discussion. $pin = optional_param('pin', -1, PARAM_INT); // If set, pin or unpin this discussion.
$url = new moodle_url('/mod/forum/discuss.php', array('d'=>$d)); $url = new moodle_url('/mod/forum/discuss.php', array('d'=>$d));
if ($parent !== 0) { if ($parent !== 0) {
...@@ -172,7 +172,6 @@ if ($move > 0 and confirm_sesskey()) { ...@@ -172,7 +172,6 @@ if ($move > 0 and confirm_sesskey()) {
redirect($return.'&move=-1&sesskey='.sesskey()); redirect($return.'&move=-1&sesskey='.sesskey());
} }
// Pin or unpin discussion if requested. // Pin or unpin discussion if requested.
if ($pin !== -1 && confirm_sesskey()) { if ($pin !== -1 && confirm_sesskey()) {
require_capability('mod/forum:pindiscussions', $modcontext); require_capability('mod/forum:pindiscussions', $modcontext);
...@@ -181,19 +180,15 @@ if ($pin !== -1 && confirm_sesskey()) { ...@@ -181,19 +180,15 @@ if ($pin !== -1 && confirm_sesskey()) {
switch ($pin) { switch ($pin) {
case FORUM_DISCUSSION_PINNED: case FORUM_DISCUSSION_PINNED:
$DB->set_field('forum_discussions', 'pinned', $pin, array('id' => $discussion->id)); // Pin the discussion and trigger discussion pinned event.
$event = \mod_forum\event\discussion_pinned::create($params); forum_discussion_pin($modcontext, $forum, $discussion);
$event->add_record_snapshot('forum_discussions', $discussion);
$event->trigger();
break; break;
case FORUM_DISCUSSION_UNPINNED: case FORUM_DISCUSSION_UNPINNED:
$DB->set_field('forum_discussions', 'pinned', $pin, array('id' => $discussion->id)); // Unpin the discussion and trigger discussion unpinned event.
$event = \mod_forum\event\discussion_unpinned::create($params); forum_discussion_unpin($modcontext, $forum, $discussion);
$event->add_record_snapshot('forum_discussions', $discussion);
$event->trigger();
break; break;
default: default:
echo $OUTPUT->notfication("Invalid value when attempting to pin/unpin discussion"); echo $OUTPUT->notification("Invalid value when attempting to pin/unpin discussion");
break; break;
} }
...@@ -299,7 +294,7 @@ $neighbourlinks = $renderer->neighbouring_discussion_navigation($neighbours['pre ...@@ -299,7 +294,7 @@ $neighbourlinks = $renderer->neighbouring_discussion_navigation($neighbours['pre
echo $neighbourlinks; echo $neighbourlinks;
/// Print the controls across the top /// Print the controls across the top
echo '<div class="discussioncontrols clearfix">'; echo '<div class="discussioncontrols clearfix"><div class="controlscontainer">';
if (!empty($CFG->enableportfolios) && has_capability('mod/forum:exportdiscussion', $modcontext)) { if (!empty($CFG->enableportfolios) && has_capability('mod/forum:exportdiscussion', $modcontext)) {
require_once($CFG->libdir.'/portfoliolib.php'); require_once($CFG->libdir.'/portfoliolib.php');
...@@ -374,8 +369,8 @@ if (has_capability('mod/forum:pindiscussions', $modcontext)) { ...@@ -374,8 +369,8 @@ if (has_capability('mod/forum:pindiscussions', $modcontext)) {
echo html_writer::tag('div', $OUTPUT->render($button), array('class' => 'discussioncontrol pindiscussion')); echo html_writer::tag('div', $OUTPUT->render($button), array('class' => 'discussioncontrol pindiscussion'));
} }
echo '<div class="clearfloat">&nbsp;</div>';
echo "</div>"; echo "</div></div>";
if (!empty($forum->blockafter) && !empty($forum->blockperiod)) { if (!empty($forum->blockafter) && !empty($forum->blockperiod)) {
$a = new stdClass(); $a = new stdClass();
...@@ -386,7 +381,7 @@ if (!empty($forum->blockafter) && !empty($forum->blockperiod)) { ...@@ -386,7 +381,7 @@ if (!empty($forum->blockafter) && !empty($forum->blockperiod)) {
if ($forum->type == 'qanda' && !has_capability('mod/forum:viewqandawithoutposting', $modcontext) && if ($forum->type == 'qanda' && !has_capability('mod/forum:viewqandawithoutposting', $modcontext) &&
!forum_user_has_posted($forum->id,$discussion->id,$USER->id)) { !forum_user_has_posted($forum->id,$discussion->id,$USER->id)) {
echo $OUTPUT->notification(get_string('qandanotify','forum')); echo $OUTPUT->notification(get_string('qandanotify', 'forum'));
} }
if ($move == -1 and confirm_sesskey()) { if ($move == -1 and confirm_sesskey()) {
......
...@@ -649,7 +649,7 @@ class mod_forum_external extends external_api { ...@@ -649,7 +649,7 @@ class mod_forum_external extends external_api {
// Check they have the view forum capability. // Check they have the view forum capability.
require_capability('mod/forum:viewdiscussion', $modcontext, null, true, 'noviewdiscussionspermission', 'forum'); require_capability('mod/forum:viewdiscussion', $modcontext, null, true, 'noviewdiscussionspermission', 'forum');
$sort = 'd.' . $sortby . ' ' . $sortdirection; $sort = 'd.pinned DESC, d.' . $sortby . ' ' . $sortdirection;
$alldiscussions = forum_get_discussions($cm, $sort, true, -1, -1, true, $page, $perpage, FORUM_POSTS_ALL_USER_GROUPS); $alldiscussions = forum_get_discussions($cm, $sort, true, -1, -1, true, $page, $perpage, FORUM_POSTS_ALL_USER_GROUPS);
if ($alldiscussions) { if ($alldiscussions) {
...@@ -801,7 +801,8 @@ class mod_forum_external extends external_api { ...@@ -801,7 +801,8 @@ class mod_forum_external extends external_api {
'userpictureurl' => new external_value(PARAM_URL, 'Post author picture.'), 'userpictureurl' => new external_value(PARAM_URL, 'Post author picture.'),
'usermodifiedpictureurl' => new external_value(PARAM_URL, 'Post modifier picture.'), 'usermodifiedpictureurl' => new external_value(PARAM_URL, 'Post modifier picture.'),
'numreplies' => new external_value(PARAM_TEXT, 'The number of replies in the discussion'), 'numreplies' => new external_value(PARAM_TEXT, 'The number of replies in the discussion'),
'numunread' => new external_value(PARAM_INT, 'The number of unread discussions.') 'numunread' => new external_value(PARAM_INT, 'The number of unread discussions.'),
'pinned' => new external_value(PARAM_BOOL, 'Is the discussion pinned')
), 'post' ), 'post'
) )
), ),
...@@ -1115,6 +1116,7 @@ class mod_forum_external extends external_api { ...@@ -1115,6 +1116,7 @@ class mod_forum_external extends external_api {
'name' => new external_value(PARAM_ALPHANUM, 'name' => new external_value(PARAM_ALPHANUM,
'The allowed keys (value format) are: 'The allowed keys (value format) are:
discussionsubscribe (bool); subscribe to the discussion?, default to true discussionsubscribe (bool); subscribe to the discussion?, default to true
discussionpinned (bool); is the discussion pinned, default to false
'), '),
'value' => new external_value(PARAM_RAW, 'The value of the option, 'value' => new external_value(PARAM_RAW, 'The value of the option,
This param is validated in the external function.' This param is validated in the external function.'
...@@ -1151,7 +1153,8 @@ class mod_forum_external extends external_api { ...@@ -1151,7 +1153,8 @@ class mod_forum_external extends external_api {
)); ));
// Validate options. // Validate options.
$options = array( $options = array(
'discussionsubscribe' => true 'discussionsubscribe' => true,
'discussionpinned' => false
); );
foreach ($params['options'] as $option) { foreach ($params['options'] as $option) {
$name = trim($option['name']); $name = trim($option['name']);
...@@ -1159,6 +1162,9 @@ class mod_forum_external extends external_api { ...@@ -1159,6 +1162,9 @@ class mod_forum_external extends external_api {
case 'discussionsubscribe': case 'discussionsubscribe':
$value = clean_param($option['value'], PARAM_BOOL); $value = clean_param($option['value'], PARAM_BOOL);
break; break;
case 'discussionpinned':
$value = clean_param($option['value'], PARAM_BOOL);
break;
default: default:
throw new moodle_exception('errorinvalidparam', 'webservice', '', $name); throw new moodle_exception('errorinvalidparam', 'webservice', '', $name);
} }
...@@ -1210,6 +1216,11 @@ class mod_forum_external extends external_api { ...@@ -1210,6 +1216,11 @@ class mod_forum_external extends external_api {
$discussion->name = $discussion->subject; $discussion->name = $discussion->subject;
$discussion->timestart = 0; $discussion->timestart = 0;
$discussion->timeend = 0; $discussion->timeend = 0;
if (has_capability('mod/forum:pindiscussions', $context) && $options['discussionpinned']) {
$discussion->pinned = FORUM_DISCUSSION_PINNED;
} else {
$discussion->pinned = FORUM_DISCUSSION_UNPINNED;
}
if ($discussionid = forum_add_discussion($discussion)) { if ($discussionid = forum_add_discussion($discussion)) {
......
...@@ -139,7 +139,8 @@ $string['discussionname'] = 'Discussion name'; ...@@ -139,7 +139,8 @@ $string['discussionname'] = 'Discussion name';
$string['discussionnownotsubscribed'] = '{$a->name} will NOT be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\''; $string['discussionnownotsubscribed'] = '{$a->name} will NOT be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\'';
$string['discussionnowsubscribed'] = '{$a->name} will be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\''; $string['discussionnowsubscribed'] = '{$a->name} will be notified of new posts in \'{$a->discussion}\' of \'{$a->forum}\'';
$string['discussionpin'] = 'Pin'; $string['discussionpin'] = 'Pin';
$string['discussionpinned'] = 'Pinned: {$a}'; $string['discussionpinned'] = 'Pinned';
$string['discussionpinned_help'] = 'Pinned discussions will appear at the top of a forum.';
$string['discussionsubscribestop'] = 'I don\'t want to be notified of new posts in this discussion'; $string['discussionsubscribestop'] = 'I don\'t want to be notified of new posts in this discussion';
$string['discussionsubscribestart'] = 'Send me notifications of new posts in this discussion'; $string['discussionsubscribestart'] = 'Send me notifications of new posts in this discussion';
$string['discussionsubscription'] = 'Discussion subscription'; $string['discussionsubscription'] = 'Discussion subscription';
......
...@@ -2596,7 +2596,7 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $ ...@@ -2596,7 +2596,7 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $
} }
$allnames = get_all_user_name_fields(true, 'u'); $allnames = get_all_user_name_fields(true, 'u');
$sql = "SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid, d.timestart, d.timeend, d.pinned, $allnames, $sql = "SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid, d.timestart, d.timeend, d.pinned, $allnames,
u.email, u.picture, u.imagealt $umfields u.email, u.picture, u.imagealt $umfields
FROM {forum_discussions} d FROM {forum_discussions} d
JOIN {forum_posts} p ON p.discussion = d.id JOIN {forum_posts} p ON p.discussion = d.id
...@@ -2604,17 +2604,15 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $ ...@@ -2604,17 +2604,15 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $
$umtable $umtable
WHERE d.forum = ? AND p.parent = 0 WHERE d.forum = ? AND p.parent = 0
$timelimit $groupselect $timelimit $groupselect
ORDER BY pinned DESC, $forumsort"; ORDER BY $forumsort, d.id DESC";
return $DB->get_records_sql($sql, $params, $limitfrom, $limitnum); return $DB->get_records_sql($sql, $params, $limitfrom, $limitnum);
} }
/** /**
* Gets the neighbours (previous and next) of a discussion. * Gets the neighbours (previous and next) of a discussion.
* *
* The calculation is based on the timemodified of the discussion and does not handle * The calculation is based on the timemodified when time modified or time created is identical
* the neighbours having an identical timemodified. The reason is that we do not have any * It will revert to using the ID to sort consistently. This is better tha skipping a discussion.
* other mean to sort the records, e.g. we cannot use IDs as a greater ID can have a lower
* timemodified.
* *
* For blog-style forums, the calculation is based on the original creation time of the * For blog-style forums, the calculation is based on the original creation time of the
* blog post. * blog post.
...@@ -2623,8 +2621,6 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $ ...@@ -2623,8 +2621,6 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $
* by the user, it simply uses it as a reference to find the neighbours. On the other hand, * by the user, it simply uses it as a reference to find the neighbours. On the other hand,
* the returned neighbours are checked and are accessible to the current user. * the returned neighbours are checked and are accessible to the current user.
* *
* This function ignores whether a discussion is pinned.
*
* @param object $cm The CM record. * @param object $cm The CM record.
* @param object $discussion The discussion record. * @param object $discussion The discussion record.
* @param object $forum The forum instance record. * @param object $forum The forum instance record.
...@@ -2680,78 +2676,82 @@ function forum_get_discussion_neighbours($cm, $discussion, $forum) { ...@@ -2680,78 +2676,82 @@ function forum_get_discussion_neighbours($cm, $discussion, $forum) {
} }
} }
if ($forum->type === 'blog') { $params['forumid'] = $cm->instance;
$params['forumid'] = $cm->instance; $params['discid1'] = $discussion->id;
$params['discid1'] = $discussion->id; $params['discid2'] = $discussion->id;
$params['discid2'] = $discussion->id; $params['discid3'] = $discussion->id;
$params['discid4'] = $discussion->id;
$sql = "SELECT d.id, d.name, d.timemodified, d.groupid, d.timestart, d.timeend $params['disctimecompare1'] = $discussion->timemodified;
FROM {forum_discussions} d $params['disctimecompare2'] = $discussion->timemodified;
JOIN {forum_posts} p ON d.firstpost = p.id $params['pinnedstate1'] = (int) $discussion->pinned;
WHERE d.forum = :forumid $params['pinnedstate2'] = (int) $discussion->pinned;
AND d.id <> :discid1 $params['pinnedstate3'] = (int) $discussion->pinned;
$timelimit $params['pinnedstate4'] = (int) $discussion->pinned;
$groupselect";
$sub = "SELECT pp.created $sql = "SELECT d.id, d.name, d.timemodified, d.groupid, d.timestart, d.timeend
FROM {forum_discussions} dd FROM {forum_discussions} d
JOIN {forum_posts} pp ON dd.firstpost = pp.id JOIN {forum_posts} p ON d.firstpost = p.id
WHERE dd.id = :discid2"; WHERE d.forum = :forumid
AND d.id <> :discid1
$prevsql = $sql . " AND p.created < ($sub) $timelimit
ORDER BY p.created DESC"; $groupselect";
$comparefield = "d.timemodified";
$comparevalue = ":disctimecompare1";
$comparevalue2 = ":disctimecompare2";
if (!empty($CFG->forum_enabletimedposts)) {
// Here we need to take into account the release time (timestart)
// if one is set, of the neighbouring posts and compare it to the
// timestart or timemodified of *this* post depending on if the
// release date of this post is in the future or not.
// This stops discussions that appear later because of the
// timestart value from being buried under discussions that were
// made afterwards.
$comparefield = "CASE WHEN d.timemodified < d.timestart
THEN d.timestart ELSE d.timemodified END";
if ($discussion->timemodified < $discussion->timestart) {
// Normally we would just use the timemodified for sorting
// discussion posts. However, when timed discussions are enabled,
// then posts need to be sorted base on the later of timemodified
// or the release date of the post (timestart).
$params['disctimecompare1'] = $discussion->timestart;
$params['disctimecompare2'] = $discussion->timestart;
}
}
$orderbydesc = forum_get_default_sort_order(true, $comparefield, 'd', false);
$orderbyasc = forum_get_default_sort_order(false, $comparefield, 'd', false);
$nextsql = $sql . " AND p.created > ($sub) if ($forum->type === 'blog') {
ORDER BY p.created ASC"; $subselect = "SELECT pp.created
FROM {forum_discussions} dd
JOIN {forum_posts} pp ON dd.firstpost = pp.id ";
$neighbours['prev'] = $DB->get_record_sql($prevsql, $params, IGNORE_MULTIPLE); $subselectwhere1 = " WHERE dd.id = :discid3";
$neighbours['next'] = $DB->get_record_sql($nextsql, $params, IGNORE_MULTIPLE); $subselectwhere2 = " WHERE dd.id = :discid4";
} else { $comparefield = "p.created";
$params['forumid'] = $cm->instance;
$params['discid'] = $discussion->id;
$params['disctimemodified'] = $discussion->timemodified;
$sql = "SELECT d.id, d.name, d.timemodified, d.groupid, d.timestart, d.timeend $sub1 = $subselect.$subselectwhere1;
FROM {forum_discussions} d $comparevalue = "($sub1)";
WHERE d.forum = :forumid
AND d.id <> :discid
$timelimit
$groupselect";
if (empty($CFG->forum_enabletimedposts)) { $sub2 = $subselect.$subselectwhere2;
$prevsql = $sql . " AND d.timemodified < :disctimemodified"; $comparevalue2 = "($sub2)";
$nextsql = $sql . " AND d.timemodified > :disctimemodified";
} else { $orderbydesc = "d.pinned, p.created DESC";
// Normally we would just use the timemodified for sorting $orderbyasc = "d.pinned, p.created ASC";
// discussion posts. However, when timed discussions are enabled, }
// then posts need to be sorted base on the later of timemodified
// or the release date of the post (timestart).
$params['disctimecompare'] = $discussion->timemodified;
if ($discussion->timemodified < $discussion->timestart) {
$params['disctimecompare'] = $discussion->timestart;
}
// Here we need to take into account the release time (timestart) $prevsql = $sql . " AND ( (($comparefield < $comparevalue) AND :pinnedstate1 = d.pinned)
// if one is set, of the neighbouring posts and compare it to the OR ($comparefield = $comparevalue2 AND (d.pinned = 0 OR d.pinned = :pinnedstate4) AND d.id < :discid2)
// timestart or timemodified of *this* post depending on if the OR (d.pinned = 0 AND d.pinned <> :pinnedstate2))
// release date of this post is in the future or not. ORDER BY CASE WHEN d.pinned = :pinnedstate3 THEN 1 ELSE 0 END DESC, $orderbydesc, d.id DESC";
// This stops discussions that appear later because of the
// timestart value from being buried under discussions that were
// made afterwards.
$prevsql = $sql . " AND CASE WHEN d.timemodified < d.timestart
THEN d.timestart ELSE d.timemodified END < :disctimecompare";
$nextsql = $sql . " AND CASE WHEN d.timemodified < d.timestart
THEN d.timestart ELSE d.timemodified END > :disctimecompare";
}
$prevsql .= ' ORDER BY '.forum_get_default_sort_order();
$nextsql .= ' ORDER BY '.forum_get_default_sort_order(false);
$neighbours['prev'] = $DB->get_record_sql($prevsql, $params, IGNORE_MULTIPLE); $nextsql = $sql . " AND ( ((