|
@@ -80,11 +80,11 @@ if (!empty($gradebook) && $gradebook == 'view') {
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
-if (!empty($_SESSION['toolgroup'])) {
|
|
|
|
|
|
+if ($origin=='group') {
|
|
$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
|
|
$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
|
|
$group_properties = GroupManager :: get_group_properties($_clean['toolgroup']);
|
|
$group_properties = GroupManager :: get_group_properties($_clean['toolgroup']);
|
|
$interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups'));
|
|
$interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups'));
|
|
- $interbreadcrumb[] = array ("url" => "../group/group_space.php?gidReq=".$_SESSION['toolgroup'], "name"=> get_lang('GroupSpace').' ('.$group_properties['name'].')');
|
|
|
|
|
|
+ $interbreadcrumb[] = array ("url" => "../group/group_space.php?gidReq=".$_SESSION['toolgroup'], "name"=> get_lang('GroupSpace').' '.$group_properties['name']);
|
|
$interbreadcrumb[]=array("url" => "viewforum.php?origin=".$origin."&forum=".Security::remove_XSS($_GET['forum']),"name" => $current_forum['forum_title']);
|
|
$interbreadcrumb[]=array("url" => "viewforum.php?origin=".$origin."&forum=".Security::remove_XSS($_GET['forum']),"name" => $current_forum['forum_title']);
|
|
$interbreadcrumb[]=array("url" => "viewthread.php?origin=".$origin."&gradebook=".$gradebook."&forum=".Security::remove_XSS($_GET['forum'])."&thread=".Security::remove_XSS($_GET['thread']),"name" => $current_thread['thread_title']);
|
|
$interbreadcrumb[]=array("url" => "viewthread.php?origin=".$origin."&gradebook=".$gradebook."&forum=".Security::remove_XSS($_GET['forum'])."&thread=".Security::remove_XSS($_GET['thread']),"name" => $current_thread['thread_title']);
|
|
$interbreadcrumb[]=array("url" => "javascript: void(0);","name" => get_lang('Reply'));
|
|
$interbreadcrumb[]=array("url" => "javascript: void(0);","name" => get_lang('Reply'));
|
|
@@ -140,9 +140,16 @@ if (!$_user['user_id'] AND $current_forum['allow_anonymous']==0) {
|
|
if ($origin != 'learnpath') {
|
|
if ($origin != 'learnpath') {
|
|
echo '<div class="actions">';
|
|
echo '<div class="actions">';
|
|
echo '<span style="float:right;">'.search_link().'</span>';
|
|
echo '<span style="float:right;">'.search_link().'</span>';
|
|
- echo '<a href="index.php?gradebook='.$gradebook.'">'.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').'</a>';
|
|
|
|
- echo '<a href="viewforum.php?forum='.Security::remove_XSS($_GET['forum']).'&gidReq='.$_SESSION['toolgroup'].'">'.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').'</a>';
|
|
|
|
- echo '<a href="viewthread.php?forum='.Security::remove_XSS($_GET['forum']).'&gradebook='.$gradebook.'&thread='.Security::remove_XSS($_GET['thread']).'">'.Display::return_icon('forumthread.gif',get_lang('BackToThread')).' '.get_lang('BackToThread').'</a>';
|
|
|
|
|
|
+ if ($origin=='group') {
|
|
|
|
+ echo '<a href="../group/group_space.php?'.api_get_cidreq().'&gidReq='.Security::remove_XSS($_GET['gidReq']).'&gradebook='.$gradebook.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('Groups')).get_lang('BackTo').' '.get_lang('GroupSpace').'</a>';
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ echo '<a href="index.php?gradebook='.$gradebook.'">'.Display::return_icon('back.png',get_lang('BackToForumOverview')).' '.get_lang('BackToForumOverview').'</a>';
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ echo '<a href="viewforum.php?forum='.Security::remove_XSS($_GET['forum']).'&gidReq='.Security::remove_XSS($_GET['gidReq']).'&origin=group">'.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').'</a>';
|
|
|
|
+ echo '<a href="viewthread.php?forum='.Security::remove_XSS($_GET['forum']).'&gradebook='.$gradebook.'&thread='.Security::remove_XSS($_GET['thread']).'&gidReq='.Security::remove_XSS($_GET['gidReq']).'&origin=group">'.Display::return_icon('forumthread.gif',get_lang('BackToThread')).' '.get_lang('BackToThread').'</a>';
|
|
|
|
+
|
|
echo '</div>';
|
|
echo '</div>';
|
|
} else {
|
|
} else {
|
|
echo '<div style="height:15px"> </div>';
|
|
echo '<div style="height:15px"> </div>';
|