'.fullname($USER).
+ get_string('viewmyentries', 'blog').
+ "'.fullname($USER).
+ get_string('viewmyentries', 'blog').
+ "
'.
+ $DB->get_field('course', 'shortname', array('id'=>$courseid)) ."'.
+ $DB->get_field('user', 'username', array('id'=>$userid)).
+ "
'.
+ $DB->get_field($modname, 'name', array('id' => $modinfo->instance)).
+ "
'.
+ $DB->get_field('groups', 'name', array('id'=>$groupid)) ."| ';
print_user_picture($user, SITEID, $user->picture);
@@ -201,10 +219,43 @@
$attachedimages = '';
}
+ //retrieve associations in case they're needed early
+ $blog_associations = $DB->get_records('blog_association', array('blogid' => $blogEntry->id));
+ //determine text for publish state
switch ($template['publishstate']) {
case 'draft':
$blogtype = get_string('publishtonoone', 'blog');
break;
+ case 'course':
+ if(!empty($CFG->useassoc)) {
+ $coursename = '';
+ foreach($blog_associations as $assoc_rec) { //find the associated course for the publishstate string
+ $context_rec = $DB->get_record('context', array('id' => $assoc_rec->contextid));
+ if($context_rec->contextlevel != CONTEXT_COURSE) { //skip associations with something other than a course
+ continue;
+ }
+ $coursename = $DB->get_field('course', 'shortname', array('id' => $context_rec->instanceid));
+ }
+ $blogtype = get_string('publishtocourseassocparam', 'blog', $coursename);
+ } else {
+ $blogtype = get_string('publishtocourse', 'blog');
+ }
+ break;
+ case 'group':
+ if(!empty($CFG->useassoc)) {
+ $coursename = '';
+ foreach($blog_associations as $assoc_rec) { //find the associated course for the publishstate string
+ $context_rec = $DB->get_record('context', array('id' => $assoc_rec->contextid));
+ if($context_rec->contextlevel != CONTEXT_COURSE) { //skip associations with something other than a course
+ continue;
+ }
+ $coursename = $DB->get_field('course', 'shortname', array('id' => $context_rec->instanceid));
+ }
+ $blogtype = get_string('publishtogroupassocparam', 'blog', $coursename);
+ } else {
+ $blogtype = get_string('publishtogroup', 'blog');
+ }
+ break;
case 'site':
$blogtype = get_string('publishtosite', 'blog');
break;
@@ -234,13 +285,53 @@
echo '';
}
+ //add associations
+ if ( !empty($CFG->useassoc) && $blog_associations) {
+ echo ' ';
+ $assoc_str = '';
+ foreach($blog_associations as $assoc_rec) { //first find and show the associated course
+ $context_rec = $DB->get_record('context', array('id' => $assoc_rec->contextid));
+ if($context_rec->contextlevel == CONTEXT_COURSE) {
+ $assoc_str .= '';
+ $assoc_str .= ' ';
+ }
+
+ if($unassociatedpost) {
+ echo '';
+ $assoc_str .= $DB->get_field('course', 'shortname', array('id' => $context_rec->instanceid));
+ $assoc_str .= '';
+ }
+ }
+ foreach($blog_associations as $assoc_rec) { //now show each mod association
+ $context_rec = $DB->get_record('context', array('id' => $assoc_rec->contextid));
+ if($context_rec->contextlevel == CONTEXT_MODULE) {
+ $modinfo = $DB->get_record('course_modules', array('id' => $context_rec->instanceid));
+ $modname = $DB->get_field('modules', 'name', array('id' => $modinfo->module));
+ $assoc_str .= ', ';
+ $assoc_str .= '';
+ $assoc_str .= '';
+ $assoc_str .= $DB->get_field($modname, 'name', array('id' => $modinfo->instance));
+ $assoc_str .= '';
+ }
+ }
+ echo get_string('associations', 'blog') . ': '. $assoc_str;
+
+ echo ''.get_string('associationunviewable', 'blog').' ';
+ }
+
/// Commands
echo '';
if (blog_user_can_edit_post($blogEntry)) {
echo ''.$stredit.'';
- echo '| '.$strdelete.' | ';
+ if(!$DB->record_exists_sql('SELECT a.timedue, a.preventlate, a.emailteachers, a.var2, asub.grade
+ FROM {assignment} a, {assignment_submissions} as asub WHERE
+ a.id = asub.assignment AND userid = '.$USER->id.' AND a.assignmenttype = \'blog\'
+ AND asub.data1 = \''.$blogEntry->id.'\'')) {
+ echo '| '.$strdelete.'';
+ echo ' | ';
+ }
}
echo ''.get_string('permalink', 'blog').'';
@@ -338,7 +429,23 @@
$options = array ( 'draft' => get_string('publishtonoone', 'blog') );
}
- if ($CFG->bloglevel > BLOG_USER_LEVEL) {
+ if ($CFG->bloglevel >= BLOG_GROUP_LEVEL) {
+ if(!empty($CFG->useassoc)) {
+ $options['group'] = get_string('publishtogroupassoc', 'blog');
+ } else {
+ $options['group'] = get_string('publishtogroup', 'blog');
+ }
+ }
+
+ if ($CFG->bloglevel >= BLOG_COURSE_LEVEL) {
+ if(!empty($CFG->useassoc)) {
+ $options['course'] = get_string('publishtocourseassoc', 'blog');
+ } else {
+ $options['course'] = get_string('publishtocourse', 'blog');
+ }
+ }
+
+ if ($CFG->bloglevel >= BLOG_SITE_LEVEL) {
$options['site'] = get_string('publishtosite', 'blog');
}
@@ -462,152 +569,220 @@
/**
- * Main filter function.
+ * Generates an SQL query for retrieving blog entries
+ * @param array filters an array of filters (filtername => filtervalue) to narrow down results by
+ * available filters:
+ * post: id field of a specific post
+ * course: id of a course that the posts must be associated with
+ * mod: id of a course module that the posts must be associated with
+ * user: id of a user who must be the author of a post
+ * group: id of a group who the author must be a member of, and whose course must be associated with the post
+ * tag: id of a tag that must be applied to the post
+ * site: the entire site is searched
+ * @param string sort field and direction for sorting results from the SQL statement
+ * @param int userid id of the user fetching the posts (for permissions purposes)
+ * @return array blog post objects matching the search criteria
*/
- function blog_fetch_entries($postid='', $fetchlimit=10, $fetchstart='', $filtertype='', $filterselect='', $tagid='', $tag ='', $sort='lastmodified DESC', $limit=true) {
+ function blog_fetch_entries_sql($filters=array(), $sort='lastmodified DESC', $userid = false) {
global $CFG, $USER, $DB;
- /// the post table will be used for other things too
- $typesql = "AND p.module = 'blog'";
-
- /// set the tag id for searching
- if ($tagid) {
- $tag = $tagid;
- } else if ($tag) {
- if ($tagrec = $DB->get_record_sql("SELECT * FROM {tag} WHERE name LIKE ?", array($tag))) {
- $tag = $tagrec->id;
- } else {
- $tag = -1; //no records found
- }
+ if(!$userid) {
+ $userid = $USER->id;
}
- // If we have specified an ID
- // Just return 1 entry
+ // The query used to locate blog entries is complicated. It will be built from the following components:
+ $requiredfields = "p.*,u.firstname,u.lastname,u.email"; // the SELECT clause
+ $tables = array('p' => 'post', 'u' => 'user'); // components of the FROM clause (table_id => table_name)
+ $conditions = array('u.deleted = 0', 'p.userid = u.id', 'p.module = \'blog\''); // components of the WHERE clause (conjunction)
- if ($postid) {
- if ($post = $DB->get_record('post', array('id'=>$postid))) {
- if (blog_user_can_view_user_post($post->userid, $post)) {
+ // build up a clause for permission constraints
- if ($user = $DB->get_record('user', array('id'=>$post->userid))) {
- $post->email = $user->email;
- $post->firstname = $user->firstname;
- $post->lastname = $user->lastname;
- }
- $retarray[] = $post;
- return $retarray;
+ // fix for MDL-9165, use with readuserblogs capability in a user context can read that user's private blogs
+ // admins can see all blogs regardless of publish states, as described on the help page
+ if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM))) {
+ // don't add permission constraints
+ } else if(!empty($filters['user']) &&
+ has_capability('moodle/user:readuserblogs',
+ get_context_instance(CONTEXT_USER, (empty($filters['user']) ? 0 : $filters['user'])))) {
+ // don't add permission constraints
} else {
- return null;
+ if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $userid, false)) {
+ $usergroups = '';
+ $usercourses = '';
+ $assocexists = $DB->record_exists('blog_association', array()); //dont check association records if there aren't any
+
+ foreach($DB->get_records('groups_members', array('userid' => $userid)) as $rec) { //find all groups the user is in
+ $usergroups .= ($usergroups ? ', ' : '') . $rec->groupid;
+ }
+ foreach(get_my_courses($userid) as $course) { //find all courses the user is in
+ $usercourses .= ($usercourses ? ', ' : '') . $course->context->id;
}
- } else { // bad postid
- return null;
+ if(!empty($filter['course'])) { //optimization to make searches faster
+ $filtercontext = get_context_instance(CONTEXT_COURSE, $filter['course']);
+ if(!in_array($filtercontext->id, $usercourses)) {
+ return '';
+ }
+ if(!empty($filter['group'])) {
+ if(!in_array($filters['group'], $usergroups)) {
+ return '';
+ }
}
}
- $params = array();
+ //begin permission sql clause
+ $permissionsql = '(p.userid = '.$userid.' ';
- if ($tag) {
- $tagtablesql = ", {tag_instance} ti";
- $tagquerysql = "AND ti.itemid = p.id AND ti.tagid = :tag AND ti.itemtype = 'post'";
- $params['tag'] = $tag;
- } else {
- $tagtablesql = '';
- $tagquerysql = '';
+ if($CFG->bloglevel >= BLOG_SITE_LEVEL) { // add permission to view site-level posts
+ $permissionsql .= ' OR p.publishstate = \'site\' ';
}
- if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), $USER->id, false)) {
- $permissionsql = "AND (p.publishstate = 'site' OR p.publishstate = 'public' OR p.userid = :userid)";
- $params['userid'] = $USER->id;
- } else {
- $permissionsql = "AND p.publishstate = 'public'";
+ if($CFG->bloglevel >= BLOG_GLOBAL_LEVEL) { // add permission to view global posts
+ $permissionsql .= ' OR p.publishstate = \'public\' ';
}
- // fix for MDL-9165, use with readuserblogs capability in a user context can read that user's private blogs
- // admins can see all blogs regardless of publish states, as described on the help page
- if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM))) {
- $permissionsql = '';
- } else if ($filtertype=='user' && has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_USER, $filterselect))) {
- $permissionsql = '';
+ if(empty($CFG->useassoc)) { //permission rules when associations are not activated...
+ // insure viewer shares *any* course/group with the poster
+ if($usergroups and $CFG->bloglevel >= BLOG_GROUP_LEVEL) {
+ $tables['gm'] = 'groups_members';
+ $permissionsql .= ' OR (p.publishstate IN (\'group\', \'course\', \'public\', \'site\') '.
+ ' AND gm.userid = p.userid AND gm.groupid IN ('.$usergroups.'))';
+ }
+ if($usercourses and $CFG->bloglevel >= BLOG_COURSE_LEVEL) {
+ $tables['ra'] = 'role_assignments';
+ $permissionsql .= ' OR (p.publishstate IN (\'course\', \'public\', \'site\') '.
+ ' AND p.userid = ra.userid AND ra.contextid IN ('.$usercourses.'))';
+ }
+ } else if($assocexists) { // permission rules when associations are activated...
+ // insure viewer has access to the associated course (if course or group level access is used)
+ if($usercourses and $CFG->bloglevel >= BLOG_COURSE_LEVEL) {
+ $tables['ba'] = 'blog_association';
+ $permissionsql .=' OR (p.publishstate = \'course\' AND p.id = ba.blogid AND ba.contextid IN ('.$usercourses.'))';
+ }
+ if($usergroups and $CFG->bloglevel >= BLOG_GROUP_LEVEL) {
+ $tables['gma'] = 'groups_members';
+ $tables['gmb'] = 'groups_members';
+ $tables['ba'] = 'blog_association';
+ $permissionsql .= ' OR (p.publishstate = \'group\' AND p.id = ba.blogid AND ba.contextid IN ('.$usercourses.')
+ AND gma.groupid = gmb.groupid AND gma.userid = '.$userid.' AND gmb.userid = p.userid) ';
+ }
+ }
+ $permissionsql .= ') '; //close permissions sql clause
+ } else { // default is access to public posts
+ $permissionsql = "p.publishstate = 'public'";
+ }
+ $conditions[] = $permissionsql; //add permission constraints
}
- /****************************************
- * depending on the type, there are 4 *
- * different possible sqls *
- ****************************************/
- $requiredfields = "p.*, u.firstname,u.lastname,u.email";
- if ($filtertype == 'course' && $filterselect == SITEID) { // Really a site
- $filtertype = 'site';
+ // If a specific post id is specified, return a simple query with the permission sql
+ if (!empty($filters['post'])) {
+ $conditions[] = 'p.id = '.$filters['post'];
+
+ $tablessql = ''; // build up the FROM clause
+ foreach($tables as $tablename => $table) {
+ $tablessql .= ($tablessql ? ', ' : '').'{'.$table.'} '.$tablename;
}
- switch ($filtertype) {
+ return 'SELECT '.$requiredfields.' FROM '.$tablessql.' WHERE '.implode(' AND ', $conditions).' GROUP BY p.id ORDER BY '. $sort;
+ }
- case 'site':
+ //add conditions for tag filter
+ if (!empty($filters['tag'])) {
+ $tables['ti'] = 'tag_instance';
+ $conditions[] = 'ti.itemid = p.id';
+ $conditions[] = 'ti.tagid = '.$filters['tag'];
+ $conditions[] = 'ti.itemtype = \'post\'';
+ }
- $SQL = "SELECT $requiredfields
- FROM {post} p, {user} u $tagtablesql
- WHERE p.userid = u.id $tagquerysql
- AND u.deleted = 0
- $permissionsql $typesql";
+ //fix course filter if the course is really the site
+ if (!empty($filters['course'])) {
+ if($filters['course'] == SITEID) { // Really a site
+ $filters['site'] = true;
+ unset($filters['course']);
+ }
+ }
- break;
+ if(!empty($filters['site'])) { //view posts for the whole site
+ //no constraints to add in this case
+ }
- case 'course':
- // all users with a role assigned
- $context = get_context_instance(CONTEXT_COURSE, $filterselect);
+ if(!empty($filters['mod'])) { //only view posts associated with a particular mod
+ $context = get_context_instance(CONTEXT_MODULE, $filters['mod']);
+ $tables['bamod'] = 'blog_association';
+ $conditions[] = 'p.id = bamod.blogid';
+ $conditions[] = 'bamod.contextid = '.$context->id;
+ }
+
+ if(!empty($filters['course'])) { // view posts for all members of a course
+ $tables['ra'] = 'role_assignments';
+ $context = get_context_instance(CONTEXT_COURSE, $filters['course']);
// MDL-10037, hidden users' blogs should not appear
- if (has_capability('moodle/role:viewhiddenassigns', $context)) {
- $hiddensql = '';
- } else {
- $hiddensql = 'AND ra.hidden = 0';
+ if (!has_capability('moodle/role:viewhiddenassigns', $context)) {
+ $conditions[] = 'ra.hidden = 0';
}
- $SQL = "SELECT $requiredfields
- FROM {post} p, {user} u, {role_assignments} ra $tagtablesql
- WHERE p.userid = ra.userid $tagquerysql
- AND ra.contextid ".get_related_contexts_string($context)."
- AND u.id = p.userid
- AND u.deleted = 0
- $hiddensql $permissionsql $typesql";
-
- break;
+ $conditions[] = 'p.userid = ra.userid';
+ $conditions[] = 'ra.contextid '.get_related_contexts_string($context);
+ if(!empty($CFG->useassoc) && empty($filters['mod'])) { // only show blog entries associated with this course
+ $tables['ba'] = 'blog_association';
+ $conditions[] = 'p.id = ba.blogid';
+ $conditions[] = 'ba.contextid = '.$context->id;
+ }
+ }
- case 'group':
+ if(!empty($filters['group'])) { // view posts for all members of a group
+ $tables['gm'] = 'groups_members';
+ $conditions[] = 'p.userid = gm.userid';
+ $conditions[] = 'gm.groupid = '.$filters['group'];
+ if(!empty($CFG->useassoc)) { // only show blog entries associated with this course
+ $tables['ba'] = 'blog_association';
+ $course_context = get_context_instance(CONTEXT_COURSE, $DB->get_field('groups', 'courseid', array('id' => $filters['group'])));
+ $conditions[] = 'gm.groupid = '.$filters['group'];
+ $conditions[] = 'ba.contextid = '.$course_context->id;
+ $conditions[] = 'ba.blogid = p.id';
+ }
+ }
- $SQL = "SELECT $requiredfields
- FROM {post} p, {user} u, {groups_members} gm $tagtablesql
- WHERE p.userid = gm.userid AND u.id = p.userid $tagquerysql
- AND gm.groupid = :groupid
- AND u.deleted = 0
- $permissionsql $typesql";
- $params['groupid'] = $filterselect;
- break;
+ if(!empty($filters['user'])) { // view posts for a single user
+ $conditions[] = 'u.id = '.$filters['user'];
+ }
- case 'user':
+ $tablessql = ''; // build up the FROM clause
+ foreach($tables as $tablename => $table) {
+ $tablessql .= ($tablessql ? ', ' : '').'{'.$table.'} '.$tablename;
+ }
- $SQL = "SELECT $requiredfields
- FROM {post} p, {user} u $tagtablesql
- WHERE p.userid = u.id $tagquerysql
- AND u.id = :uid
- AND u.deleted = 0
- $permissionsql $typesql";
- $params['uid'] = $filterselect;
- break;
+ return 'SELECT '.$requiredfields.' FROM '.$tablessql.' WHERE '.implode(' AND ', $conditions).' GROUP BY p.id ORDER BY '. $sort;
}
- $limitfrom = 0;
- $limitnum = 0;
+ /**
+ * retrieves a set of blog posts matching the search criteria provided
+ * @param array filters an array of filters (filtername => filtervalue) to narrow down results by
+ * available filters:
+ * post: id field of a specific post
+ * course: id of a course that the posts must be associated with
+ * mod: id of a course module that the posts must be associated with
+ * user: id of a user who must be the author of a post
+ * group: id of a group who the author must be a member of, and whose course must be associated with the post
+ * tag: id of a tag that must be applied to the post
+ * site: the entire site is searched
+ * @param string sort field and direction for sorting results from the SQL statement
+ * @param int fetchlimit the maximum number of blog entries to return
+ * @param int fetchstart the number of results to skip
+ * @return array blog post objects matching the search criteria
+ */
+ function blog_fetch_entries($filters=array(), $sort='lastmodified DESC', $fetchlimit=0, $fetchstart=0) {
+ global $DB;
- if ($fetchstart !== '' && $limit) {
- $limitfrom = $fetchstart;
- $limitnum = $fetchlimit;
+ $SQL = blog_fetch_entries_sql($filters, $sort);
+ if(!$SQL) {
+ return array();
}
- $orderby = "ORDER BY $sort";
-
- $records = $DB->get_records_sql("$SQL $orderby", $params, $limitfrom, $limitnum);
+ $records = $DB->get_records_sql($SQL, array(), $fetchstart, $fetchlimit);
if (empty($records)) {
return array();
@@ -616,64 +791,59 @@
return $records;
}
-
/**
- * get the count of viewable entries, easiest way is to count blog_fetch_entries
- * this is used for print_paging_bar
- * this is not ideal, but because of the UNION in the sql in blog_fetch_entries,
- * it is hard to use $DB->count_records_sql
+ * retrieves the number of blog posts matching the search criteria provided
+ * @param array filters an array of filters (filtername => filtervalue) to narrow down results by
+ * available filters:
+ * post: id field of a specific post
+ * course: id of a course that the posts must be associated with
+ * mod: id of a course module that the posts must be associated with
+ * user: id of a user who must be the author of a post
+ * group: id of a group who the author must be a member of, and whose course must be associated with the post
+ * tag: id of a tag that must be applied to the post
+ * site: the entire site is searched
+ * @return int the number of entries matching the search criteria
*/
- function get_viewable_entry_count($postid='', $fetchlimit=10,
- $fetchstart='', $filtertype='', $filterselect='', $tagid='',
- $tag ='', $sort='lastmodified DESC') {
-
- $blogEntries = blog_fetch_entries($postid, $fetchlimit,
- $fetchstart, $filtertype, $filterselect, $tagid, $tag,
- $sort='lastmodified DESC', false);
-
- return count($blogEntries);
- }
-
-
- /// Find the base url from $_GET variables, for print_paging_bar
- function get_baseurl($filtertype, $filterselect) {
-
- $getcopy = $_GET;
-
- unset($getcopy['blogpage']);
-
- $strippedurl = strip_querystring(qualified_me());
- if(!empty($getcopy)) {
- $first = false;
- $querystring = '';
- foreach($getcopy as $var => $val) {
- if(!$first) {
- $first = true;
- if ($var != 'filterselect' && $var != 'filtertype') {
- $querystring .= '?'.$var.'='.$val;
- $hasparam = true;
- } else {
- $querystring .= '?';
- }
- } else {
- if ($var != 'filterselect' && $var != 'filtertype') {
- $querystring .= '&'.$var.'='.$val;
- $hasparam = true;
- }
- }
- }
- if (isset($hasparam)) {
- $querystring .= '&';
- } else {
- $querystring = '?';
- }
- } else {
- $querystring = '?';
+ function blog_get_viewable_entry_count($filters=array()) {
+ global $DB;
+ $SQL = blog_fetch_entries_sql($filters);
+
+ //cut out the select statement and the group by and order by statements:
+ $chunks = split('(FROM)|(GROUP)', $SQL); //the middle chunk (id: 1) is the one we want
+ //the following groups all rows together, since all 'module' values will be 'blog'
+ $SQL = 'SELECT p.id FROM ' . $chunks[1] . ' GROUP BY p.id';
+ if(!$SQL) {
+ return 0;
+ }
+ //count records relys on GROUP, and since we're already using GROUP to narrow down results,
+ //we cant use count_records here. Instead, we'll only retrieve something small (the id), and
+ //just count the results. There may be a more elegant solution for this.
+ return count($DB->get_records_sql($SQL));
}
- return strip_querystring(qualified_me()) . $querystring. 'filtertype='.
- $filtertype.'&filterselect='.$filterselect.'&';
-
+ /**
+ * generates the url of the page displaying entries matching the search criteria
+ * @param array filters an array of filters (filtername => filtervalue) to narrow down results by
+ * available filters:
+ * post: id field of a specific post
+ * course: id of a course that the posts must be associated with
+ * mod: id of a course module that the posts must be associated with
+ * user: id of a user who must be the author of a post
+ * group: id of a group who the author must be a member of, and whose course must be associated with the post
+ * tag: id of a tag that must be applied to the post
+ * site: the entire site is searched
+ * @return string the url of the page displaying entries matching the search criteria
+ */
+ function blog_get_blogs_url($filters) {
+ global $CFG;
+ return $CFG->wwwroot.'/blog/index.php?'.
+ (empty($filters['course']) ? '' : 'courseid='.$filters['course'].'&').
+ (empty($filters['mod']) ? '' : 'modid='.$filters['mod'].'&').
+ (empty($filters['group']) ? '' : 'groupid='.$filters['group'].'&').
+ (empty($filters['user']) ? '' : 'userid='.$filters['user'].'&').
+ (empty($filters['post']) ? '' : 'postid='.$filters['post'].'&').
+ (empty($filters['tag']) ? '' : 'tagid='.$filters['tag'].'&').
+ (empty($filters['tagtext']) ? '' : 'tag='.$filters['tagtext']);
}
/**
@@ -687,4 +857,40 @@
FROM {post}
WHERE module = 'blog' AND courseid = 0");
}
+
+
+ /**
+ * add a single association for a blog entry
+ * @param int blogid - id of blog entry
+ * @param int contextid - id of context to associate with the blog entry
+ */
+ function blog_add_association($blogid, $contextid) {
+ global $DB;
+
+ $assoc_object = new StdClass;
+ $assoc_object->contextid = $contextid;
+ $assoc_object->blogid = $blogid;
+ $DB->insert_record('blog_association', $assoc_object);
+ }
+
+ /**
+ * remove all associations for a blog post
+ * @param int blogid - id of the blog post
+ */
+ function blog_remove_associations_for_post($blogid) {
+ global $DB;
+ $DB->delete_records('blog_association', array('blogid' => $blogid));
+ }
+
+ /**
+ * remove all associations for the blog posts of a particular user
+ * @param int userid - id of user whose blog associations will be deleted
+ */
+ function blog_remove_associations_for_user($userid) {
+ global $DB;
+ foreach(blog_fetch_entries(array('user' => $userid), 'lasmodified DESC') as $post) {
+ blog_remove_associations_for_post($post->id);
+ }
+ }
+
?>
Index: course/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/lib.php,v
retrieving revision 1.612
diff -u -a -w -b -B -r1.612 lib.php
--- course/lib.php 8 Aug 2008 05:25:54 -0000 1.612
+++ course/lib.php 17 Aug 2008 22:32:09 -0000
@@ -2355,6 +2355,7 @@
function delete_course_module($id) {
global $CFG, $DB;
require_once($CFG->libdir.'/gradelib.php');
+ require_once($CFG->dirroot.'/blog/lib.php');
if (!$cm = $DB->get_record('course_modules', array('id'=>$id))) {
return true;
@@ -2374,7 +2375,9 @@
}
}
- return $DB->delete_records('course_modules', array('id'=>$cm->id));
+ $context = get_context_instance(CONTEXT_MODULE, $id);
+ return $DB->delete_records('course_modules', array('id'=>$cm->id)) &&
+ $DB->delete_records('blog_association', array('contextid'=>$context->id));
}
function delete_mod_from_section($mod, $section) {
Index: lang/en_utf8/admin.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php,v
retrieving revision 1.219
diff -u -a -w -b -B -r1.219 admin.php
--- lang/en_utf8/admin.php 16 Aug 2008 12:16:02 -0000 1.219
+++ lang/en_utf8/admin.php 17 Aug 2008 22:32:11 -0000
@@ -782,6 +782,8 @@
$string['webproxyinfo'] = 'Fill in following options if your Moodle server can not access internet directly. Internet access is required for download of environment data, language packs, RSS feeds, timezones, etc. PHP cURL extension is highly recommended.'; $string['xmlrpcrecommended'] = 'Installing the optional xmlrpc extension is useful for Moodle Networking functionality.'; $string['xmlstrictheaders'] = 'XML strict headers'; +$string['useassoc'] = 'Enable associations'; +$string['configuseassoc'] = 'Should users be able to organize their blog by associating entries with courses and course modules?'; $string['ziprequired'] = 'The Zip PHP extension is now required by Moodle, info-ZIP binaries or PclZip library are not used anymore.'; ?> Index: lang/en_utf8/assignment.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/assignment.php,v retrieving revision 1.28 diff -u -a -w -b -B -r1.28 assignment.php --- lang/en_utf8/assignment.php 11 Aug 2008 15:31:55 -0000 1.28 +++ lang/en_utf8/assignment.php 17 Aug 2008 22:32:11 -0000 @@ -132,6 +132,7 @@ $string['typeonline'] = 'Online text'; $string['typeupload'] = 'Advanced uploading of files'; $string['typeuploadsingle'] = 'Upload a single file'; +$string['typeblog'] = 'Blog post'; $string['unfinalize'] = 'Revert to draft'; $string['unfinalizeerror'] = 'An error occurred and that submission could not be reverted to draft'; $string['uploadbadname'] = 'This filename contained strange characters and couldn\'t be uploaded'; @@ -146,5 +147,6 @@ $string['viewfeedback'] = 'View assignment grades and feedback'; $string['viewsubmissions'] = 'View $a submitted assignments'; $string['yoursubmission'] = 'Your submission'; - +$string['maxpublishstate'] = 'Maximum visibility for blog entry before duedate'; +$string['selectblog'] = 'Select which blog entry you wish to submit'; ?> Index: lang/en_utf8/blog.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/blog.php,v retrieving revision 1.26 diff -u -a -w -b -B -r1.26 blog.php --- lang/en_utf8/blog.php 24 Jul 2008 04:59:29 -0000 1.26 +++ lang/en_utf8/blog.php 17 Aug 2008 22:32:11 -0000 @@ -67,5 +67,21 @@ $string['viewsiteentries'] = 'View site entries'; $string['wrongpostid'] = 'Wrong blog post id'; $string['worldblogs'] = 'The world can read entries set to be world-accessible'; - +$string['associations'] = 'Associations'; +$string['publishtocourse'] = 'Users sharing a course with you'; +$string['publishtogroup'] = 'Users sharing a group with you'; +$string['publishtocourseassoc'] = 'Members of the associated course'; +$string['publishtocourseassocparam'] = 'Members of $a'; +$string['publishtogroupassoc'] = 'Your group members in the associated course'; +$string['publishtogroupassocparam'] = 'Your group members in $a'; +$string['associationunviewable'] = 'This entry cannot be viewed by others until a course is associated with it or the \'Publish To\' field is changed'; +$string['mustassociatecourse'] = 'If you are publishing to course or group members, you must associate a course with this entry'; +$string['viewuserentries'] = 'View user entries'; +$string['viewmodentries'] = 'View module entries'; +$string['viewgroupentries'] = 'View group entries'; +$string['viewcourseblogs'] = 'View entries for course...'; +$string['viewmodblogs'] = 'View entries for module...'; +$string['viewgroupblogs'] = 'View entries for group...'; +$string['viewblogsfor'] = 'View all entries for...'; +$string['filterblogsby'] = 'Filter entries by...'; ?> Index: lib/accesslib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v retrieving revision 1.510 diff -u -a -w -b -B -r1.510 accesslib.php --- lib/accesslib.php 16 Aug 2008 12:16:05 -0000 1.510 +++ lib/accesslib.php 17 Aug 2008 22:32:16 -0000 @@ -2099,7 +2099,8 @@ if ($context = $DB->get_record('context', array('contextlevel'=>$contextlevel, 'instanceid'=>$instanceid))) { $result = $DB->delete_records('role_assignments', array('contextid'=>$context->id)) && $DB->delete_records('role_capabilities', array('contextid'=>$context->id)) && - $DB->delete_records('context', array('id'=>$context->id)); + $DB->delete_records('context', array('id'=>$context->id)) && + $DB->delete_records('blog_association', array('contextid'=>$context->id)); // do not mark dirty contexts if parents unknown if (!is_null($context->path) and $context->depth > 0) { Index: lib/db/install.xml =================================================================== RCS file: /cvsroot/moodle/moodle/lib/db/install.xml,v retrieving revision 1.166 diff -u -a -w -b -B -r1.166 install.xml --- lib/db/install.xml 15 Aug 2008 11:15:08 -0000 1.166 +++ lib/db/install.xml 17 Aug 2008 22:32:25 -0000 @@ -4,7 +4,21 @@ xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd" > |