From f4c85f469a4a188bd906fa423927b93c2b8cbb0f Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Tue, 18 Apr 2006 01:59:13 +0000 Subject: [PATCH] various small changes --- blog/edit.html | 4 -- blog/edit.php | 4 +- blog/header.php | 164 ++++++++++++++++++++++++++++-------------------- blog/index.php | 10 +-- blog/lib.php | 17 +++++ 5 files changed, 120 insertions(+), 79 deletions(-) diff --git a/blog/edit.html b/blog/edit.html index d71a2dfe0b..6bc848742d 100755 --- a/blog/edit.html +++ b/blog/edit.html @@ -114,12 +114,8 @@

'; helpbutton('writing', get_string('helpwriting'), 'moodle', true, true); echo '
'; - helpbutton('questions', get_string('helpquestions'), 'moodle', true, true); - echo '
'; if ($usehtmleditor) { helpbutton('richtext', get_string('helprichtext'), 'moodle', true, true); } else { diff --git a/blog/edit.php b/blog/edit.php index 9f40803858..00b3cffc4a 100755 --- a/blog/edit.php +++ b/blog/edit.php @@ -167,7 +167,7 @@ function do_delete($postid) { // check ownership $blogEntry = get_record('post','id',$postid); - if (blog_user_can_edit($blogEntry)) { + if (blog_user_can_edit_post($blogEntry)) { if (delete_records('post','id',$postid)) { //echo "bloginfo_arg:"; //debug @@ -188,7 +188,7 @@ function do_delete($postid) { //comment out this redirect to debug the deletion of entries - redirect($CFG->wwwroot .'/blog/index.php?userid='. $post->userid); + redirect($CFG->wwwroot .'/blog/index.php?userid='. $blogEntry->userid); } /** diff --git a/blog/header.php b/blog/header.php index dd2430630f..9b42f55c99 100755 --- a/blog/header.php +++ b/blog/header.php @@ -72,97 +72,123 @@ if (!isset($filtertype)) { /// course blogs - sitefullname -> course fullname ->blogs ->(?tag) /// group blogs - sitefullname -> course fullname ->group ->(?tag) /// user blogs - sitefullname -> (?coursefullname) -> participants -> blogs -> (?tag) + $blogstring = get_string('blogs','blog'); $tagstring = get_string('tag'); -switch ($filtertype) { - case 'site': - if ($tagid || !empty($tag)) { - print_header("$site->shortname: $blogstring", "$site->fullname", - ''. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); - } else { - print_header("$site->shortname: $blogstring", "$site->fullname", - "$blogstring",'','',true,$PAGE->get_extra_header_string()); - } - break; - - case 'course': - if ($tagid || !empty($tag)) { - print_header("$course->shortname: $blogstring", "$course->fullname", - ''.$course->shortname.' -> - '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); - } else { - print_header("$site->shortname: $blogstring", "$site->fullname", - ''.$course->shortname." -> - $blogstring",'','',true,$PAGE->get_extra_header_string()); - } - break; +if ($ME == 'http://yu.moodle.com/dev/blog/edit.php') { ///we are in edit mode, print editting header - case 'group': + // first we need to identify the user + if ($editid) { // if we are editting a post + $blogEntry = get_record('post','id',$editid); + $user = get_record('user','id',$blogEntry->userid); + } else { + $user = get_record('user','id',$filterselect); + } - $thisgroup = get_record('groups', 'id', $filterselect); + if ($editid) { + $formHeading = get_string('updateentrywithid', 'blog'); + } else { + $formHeading = get_string('addnewentry', 'blog'); + } + + print_header("$site->shortname: $blogstring", "$site->fullname", + ''.fullname($user).' -> + '.$blogstring.' -> '. $formHeading,'','',true,$PAGE->get_extra_header_string()); - if ($tagid || !empty($tag)) { - print_header("$course->shortname: $blogstring", "$course->fullname", - ''.$course->shortname.' -> - '.$thisgroup->name.' -> - '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); - } else { - print_header("$course->shortname: $blogstring", "$course->fullname", - ''.$course->shortname.' -> - '.$thisgroup->name." -> - $blogstring",'','',true,$PAGE->get_extra_header_string()); +} else { // else, we are in view mode - } - - break; +/// This is very messy atm. - case 'user': - $user = get_record('user', 'id', $filterselect); - $participants = get_string('participants'); + switch ($filtertype) { + case 'site': + if ($tagid || !empty($tag)) { + print_header("$site->shortname: $blogstring", "$site->fullname", + ''. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); + } else { + print_header("$site->shortname: $blogstring", "$site->fullname", + "$blogstring",'','',true,$PAGE->get_extra_header_string()); + } + break; - if (isset($course->id) && $course->id && $course->id != SITEID) { + case 'course': if ($tagid || !empty($tag)) { print_header("$course->shortname: $blogstring", "$course->fullname", - ''.$course->shortname.' -> - '.$participants.' -> - '.fullname($user).' -> - '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); + ''.$course->shortname.' -> + '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); + } else { + print_header("$site->shortname: $blogstring", "$site->fullname", + ''.$course->shortname." -> + $blogstring",'','',true,$PAGE->get_extra_header_string()); + } + break; + + case 'group': + $thisgroup = get_record('groups', 'id', $filterselect); + + if ($tagid || !empty($tag)) { + print_header("$course->shortname: $blogstring", "$course->fullname", + ''.$course->shortname.' -> + '.$thisgroup->name.' -> + '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); } else { print_header("$course->shortname: $blogstring", "$course->fullname", - ''.$course->shortname.' -> - '.$participants.' -> - '.fullname($user).' -> - '.$blogstring,'','',true,$PAGE->get_extra_header_string()); + ''.$course->shortname.' -> + '.$thisgroup->name." -> + $blogstring",'','',true,$PAGE->get_extra_header_string()); } - } - //in top view - else { + break; - if ($tagid || !empty($tag)) { - print_header("$site->shortname: $blogstring", "$site->fullname", - ''.fullname($user).' -> - '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); + case 'user': + $user = get_record('user', 'id', $filterselect); + $participants = get_string('participants'); - } else { - print_header("$site->shortname: $blogstring", "$site->fullname", - ''.fullname($user).' -> - '.$blogstring,'','',true,$PAGE->get_extra_header_string()); + if (isset($course->id) && $course->id && $course->id != SITEID) { + if ($tagid || !empty($tag)) { + print_header("$course->shortname: $blogstring", "$course->fullname", + ''.$course->shortname.' -> + '.$participants.' -> + '.fullname($user).' -> + '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); + + } else { + print_header("$course->shortname: $blogstring", "$course->fullname", + ''.$course->shortname.' -> + '.$participants.' -> + '.fullname($user).' -> + '.$blogstring,'','',true,$PAGE->get_extra_header_string()); + } } - - } - break; + //in top view + else { - default: //user click on add from block - print_header("$site->shortname: $blogstring", "$site->fullname", - ''.fullname($user).' -> - '.$blogstring,'','',true,$PAGE->get_extra_header_string()); - break; -} + if ($tagid || !empty($tag)) { + print_header("$site->shortname: $blogstring", "$site->fullname", + ''.fullname($user).' -> + '. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string()); + + } else { + print_header("$site->shortname: $blogstring", "$site->fullname", + ''.fullname($user).' -> + '.$blogstring,'','',true,$PAGE->get_extra_header_string()); + + } + + } + break; + + default: //user click on add from block + print_header("$site->shortname: $blogstring", "$site->fullname", + ''.fullname($user).' -> + '.$blogstring.' -> '.get_string('addentry','blog'),'','',true,$PAGE->get_extra_header_string()); + break; + } + +} /// close switch $editing = false; if ($PAGE->user_allowed_editing()) { diff --git a/blog/index.php b/blog/index.php index 7c5617d724..271da130a1 100755 --- a/blog/index.php +++ b/blog/index.php @@ -118,11 +118,15 @@ switch ($filtertype) { if ($CFG->bloglevel < BLOG_USER_LEVEL) { error ('Blogs is not enabled'); } - - blog_user_can_view_user_post($filterselect); + + if ($CFG->bloglevel == BLOG_USER_LEVEL and $USER->id != $filterselect and !isadmin()) { + error ('Under this setting, you can only view your own blogs'); + } /// check to see if the viewer is sharing no_group, visible group course. /// if not , check if the viewer is in any spg group as the user + blog_user_can_view_user_post($filterselect); + break; default: break; @@ -133,8 +137,6 @@ if ($limit == 'none') { $limit = get_user_preferences('blogpagesize',10); } -//$blogFilter =& new BlogFilter($userid, $postid, $limit, $start,$filtertype, $filterselect, $tagid, $tag); - include($CFG->dirroot .'/blog/header.php'); //prints the tabs diff --git a/blog/lib.php b/blog/lib.php index ef6376c29a..f8b8b9e798 100755 --- a/blog/lib.php +++ b/blog/lib.php @@ -168,6 +168,23 @@ echo ''."\n"; + switch ($template['publishstate']) { + case 'draft': + $blogtype = get_string('publishtonoone', 'blog'); + break; + case 'site': + $blogtype = get_string('publishtosite', 'blog'); + break; + case 'public': + $blogtype = get_string('publishtoworld', 'blog'); + break; + default: + break; + + } + + echo '
'.$blogtype.'
'; /// martin please fill in the class and css + // Print whole message echo format_text($template['body']); -- 2.39.5