change in publish states

diff --git a/blog/edit.html b/blog/edit.html
index 7ad8217cbbc801bc7c59804b2948a415d70767cb..42809c9af275e8c1162f84ad76e96dfefef856b2 100755 (executable)
--- a/blog/edit.html
+++ b/blog/edit.html
@@ -41,7 +41,7 @@
     </td>
     <td colspan="2">
      <?php
-        $options = blog_applicable_publish_states($post->courseid); //$blogEntry may be null
+        $options = blog_applicable_publish_states(); //$blogEntry may be null
         choose_from_menu($options, 'publishstate', $post->publishstate, '');
      ?>
     <?php

diff --git a/blog/edit.php b/blog/edit.php
index 2b72a3bf636247b8e15b33835d64b52b73088ae1..d7461964a8ad8eba86f9b38824b5e6d051a57ccd 100755 (executable)
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -126,9 +126,7 @@ if (($post = data_submitted( get_referer() )) && confirm_sesskey()) {
 
 if ($editid != '') {  // User is editing a post
     // ensure that editing is allowed first - admin users can edit any posts
-    if (!isadmin() && $CFG->blog_enable_moderation && $blogEntry->entryPublishState != 'draft') {
-        error('You are not allowed to modify a published entry. A teacher must first change this post back to draft status.'); //Daryl Hawes note: localize this line
-    }
+
     $blogEntry = $PAGE->bloginfo->get_blog_entry_by_id($editid);
 
     //using an unformatted entry body here so that extra formatting information is not stored in the db

diff --git a/blog/index.php b/blog/index.php
index b69b91b184ed4a5a202e7ec5f27aff77dd1cbff3..439669be7163e68576c751e90615c62280398ec5 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -15,6 +15,11 @@ require_once('../config.php');
 require_once($CFG->dirroot .'/blog/lib.php');
 require_once($CFG->libdir .'/blocklib.php');
 
+/* rss testing code */
+require_once('rsslib.php');
+blog_rss_feeds();
+
+
 $id = optional_param('id', 0, PARAM_INT);
 $limit = optional_param('limit', 0, PARAM_INT);
 $start = optional_param('formstart', 0, PARAM_INT);

diff --git a/blog/lib.php b/blog/lib.php
index 3aef6a1fc88c5f03c639acb22b5ef1ceb0e0a41c..4e7edd35cc355f9dfecaa4be95bbe04eb13122c9 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -221,7 +221,7 @@ function blog_print_html_formatted_entries(&$blogFilter, $filtertype, $filtersel
  *     in its complete form (eg. archive page). If anything other than 'full'
  *     display the entry in its abbreviated format (eg. index page)
  */
-function blog_print_entry(&$blogEntry, $viewtype='full', $filtertype='', $filterselect='') {
+function blog_print_entry(&$blogEntry, $viewtype='full', $filtertype='', $filterselect='', $mode='loud') {
     global $CFG, $THEME, $USER;
     static $bloginfoarray;
 
@@ -247,12 +247,12 @@ function blog_print_entry(&$blogEntry, $viewtype='full', $filtertype='', $filter
     $template['created'] = $blogEntry->formattedEntryCreated;
     $template['publishtomenu'] = $blogEntry->get_publish_to_menu(true, true);
     //forum style printing of blogs
-    blog_print_entry_content ($template, $blogEntry->entryId, $filtertype, $filterselect);
+    blog_print_entry_content ($template, $blogEntry->entryId, $filtertype, $filterselect, $mode);
 
 }
 
 //forum style printing of blogs
-function blog_print_entry_content ($template, $entryid, $filtertype='', $filterselect='') {
+function blog_print_entry_content ($template, $entryid, $filtertype='', $filterselect='', $mode='loud') {
     global $USER, $CFG, $course, $ME;
 
     $stredit = get_string('edit');
@@ -327,21 +327,9 @@ function blog_applicable_publish_states($courseid='') {
     
     // everyone gets draft access
     $options = array ( 'draft' => get_string('publishtonoone', 'blog') );
-    if (is_numeric($courseid) && $courseid != SITEID && $course = get_record('course', 'id', $courseid, '', '', '', '', 'shortname') ) {
-        require_login($courseid);
-        // if we're viewing a course allow publishing to course teachers
-        $options['teacher'] = get_string('publishtoteachers', 'blog', $course->shortname);
-        if (!$CFG->blog_enable_moderation || isadmin() || isteacher($courseid) ) {
-            // only admins and teachers can publish to course members when moderation is enabled
-            $options['course'] = get_string('publishtocourse', 'blog', $course->shortname);
-        }
-    }
+    $options['site'] = get_string('publishtosite', 'blog');
+    $options['public'] = get_string('publishtoworld', 'blog');
 
-    if (isadmin() || (is_numeric($courseid) && isteacher($courseid)) ) {
-        // only admins and teachers can see site and public options when moderation is enabled
-        $options['site'] = get_string('publishtosite', 'blog');
-        $options['public'] = get_string('publishtoworld', 'blog');
-    }
     return $options;
 }