From 856dc92ef07c9fe06339349224533a12898b31d7 Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 19 Jun 2010 16:31:35 +0000 Subject: There was no point in group discussions having their own comment annotations, better to use the generic comments so this has been changed and a full group activity stream added. For v1.8, there will need to be an upgrade script which will change 'group_topic_post' -> 'generic_comment' and on all existing topics, take the first annotation of type 'group_topic_post' and populate the topic's description. git-svn-id: http://code.elgg.org/elgg/trunk@6526 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/object/groupforumtopic.php | 118 ++++++++++----------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'mod/groups/views/default/object') diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 8d5d655c0..e32f83cd4 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -1,71 +1,71 @@ - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ +/** + * Elgg Groups latest discussion listing + * + * @package ElggGroups + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 +*/ - //get the required variables - $title = htmlentities($vars['entity']->title, ENT_QUOTES, 'UTF-8'); - //$description = get_entity($vars['entity']->description); - $topic_owner = get_user($vars['entity']->owner_guid); - $group = get_entity($vars['entity']->container_guid); - $forum_created = friendly_time($vars['entity']->time_created); - $counter = $vars['entity']->countAnnotations("group_topic_post"); - $last_post = $vars['entity']->getAnnotations("group_topic_post", 1, 0, "desc"); - - //get the time and user - if ($last_post) { - foreach($last_post as $last) { - $last_time = $last->time_created; - $last_user = $last->owner_guid; - } +//get the required variables +$title = htmlentities($vars['entity']->title, ENT_QUOTES, 'UTF-8'); +//$description = get_entity($vars['entity']->description); +$topic_owner = get_user($vars['entity']->owner_guid); +$group = get_entity($vars['entity']->container_guid); +$forum_created = friendly_time($vars['entity']->time_created); +$counter = $vars['entity']->countAnnotations("generic_comment"); +$last_post = $vars['entity']->getAnnotations("generic_comment", 1, 0, "desc"); +//get the time and user +if ($last_post) { + foreach($last_post as $last) { + $last_time = $last->time_created; + $last_user = $last->owner_guid; } +} - $u = get_user($last_user); +$u = get_user($last_user); - //select the correct output depending on where you are - if(get_context() == "search"){ - - $info = "

" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "
"; - if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " getURL() . "\">" . $u->name . ""); - $info .= '

'; - //get the group avatar - $icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny')); - //get the group and topic title - $info .= "

" . elgg_echo('Topic') . ": guid}&group_guid={$group->guid}\">{$title}

"; - if ($group instanceof ElggGroup) { - $info .= "

" . elgg_echo('group') . ": getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."

"; - } - +//select the correct output depending on where you are +if(get_context() == "search"){ + var_export($counter); + if($counter == 1){ + $info = "

" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "
"; }else{ + $info = "

" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "
"; + } + if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " getURL() . "\">" . $u->name . ""); + $info .= '

'; + //get the group avatar + $icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny')); + //get the group and topic title + $info .= "

" . elgg_echo('Topic') . ": guid}&group_guid={$group->guid}\">{$title}

"; + if ($group instanceof ElggGroup) { + $info .= "

" . elgg_echo('group') . ": getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."

"; + } - $info = "

" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "

"; - $info .= "

" . elgg_echo('groups:started') . " " . $topic_owner->name . ": guid}&group_guid={$group->guid}\">{$title}

"; +}else{ + if($counter == 1){ + $info = "

" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "

"; + }else{ + $info = "

" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "

"; + } + $info .= "

" . elgg_echo('groups:started') . " " . $topic_owner->name . ": guid}&group_guid={$group->guid}\">{$title}

"; - if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) { - // display the delete link to those allowed to delete - $info .= "
" . elgg_view("output/confirmlink", array( - 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, - 'text' => " ", - 'confirm' => elgg_echo('deleteconfirm'), - )) . "
"; + if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) { + // display the delete link to those allowed to delete + $info .= "
" . elgg_view("output/confirmlink", array( + 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, + 'text' => " ", + 'confirm' => elgg_echo('deleteconfirm'), + )) . "
"; - } + } - if (($last_time) && ($u)) { - $info.= "

" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by getURL() . "\">" . $u->name . "

"; - } - //get the user avatar - $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny')); + if (($last_time) && ($u)) { + $info.= "

" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by getURL() . "\">" . $u->name . "

"; } + //get the user avatar + $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny')); +} - //display - echo elgg_view_listing($icon, $info); - -?> \ No newline at end of file +//display +echo elgg_view_listing($icon, $info); \ No newline at end of file -- cgit v1.2.3