@@ -386,6 +386,9 @@ if ($post->status == "draft") Flash::message(__("This post is a draft.")); + if ($post->groups() and !substr_count($post->status, "{".Visitor::current()->group->id."}")) + Flash::message(_f("This post is only visible by the following groups: %s.", $post->groups())); + $this->display(array("pages/view", "pages/index"), array("post" => $post, "posts" => array($post)), $post->title()); includes/controller/Main.php @@ -721,7 +721,7 @@ if ($visitor->group->can("view_private")) $statuses[] = "private"; - return "posts.status IN ('".implode("', '", $statuses)."') OR posts.status LIKE '%{".$visitor->group->id."}%'"; + return "posts.status IN ('".implode("', '", $statuses)."') XOR (posts.status LIKE '%{".$visitor->group->id."}%' OR posts.user_id = ".$visitor->id.")"; } /** @@ -744,4 +744,25 @@ return new User($this->user_id); } + + /** + * Function: groups + * Lists the groups who can view the post if the post's status is specific to certain groups. + */ + public function groups() { + if ($this->no_results) + return false; + + preg_match_all("/\{([0-9]+)\}/", $this->status, $groups, PREG_PATTERN_ORDER); + if (empty($groups[1])) + return false; + + $names = array(); + foreach ($groups[1] as $group_id) { + $group = new Group($group_id); + $names[] = $group->name; + } + + return list_notate($names); + } } includes/model/Post.php 3db2031326534389c121e17525740d0844a5a590 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/1f9bb11a28799baa28aeaddab88550c066da1918 1f9bb11a28799baa28aeaddab88550c066da1918 2008-11-02T08:20:43-08:00 2008-11-02T08:20:43-08:00 A post's creator can now view his post even if it's set to a group that is not his own. A helpful message will be displayed when they view the post to inform them. 7992e77704a1594977821fb2bd55dae61901159d Alex Suraci i.am@toogeneric.com