From 647c0c357c529da4d405bdc99e282baf34cd3f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Mon, 22 Nov 2010 23:29:09 +0100
Subject: [PATCH] Feature #2077 a bit more improve navigation into group forums

---
 main/forum/editpost.php         | 21 +++++++++++++++------
 main/forum/forumsearch.php      |  2 +-
 main/forum/newthread.php        | 14 ++++++++++----
 main/forum/reply.php            | 17 ++++++++++++-----
 main/lang/spanish/forum.inc.php |  1 +
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/main/forum/editpost.php b/main/forum/editpost.php
index 9cdd1ffd47..3fcf38db8b 100755
--- a/main/forum/editpost.php
+++ b/main/forum/editpost.php
@@ -52,6 +52,12 @@ $nameTools=get_lang('ToolForum');
 include 'forumconfig.inc.php';
 include 'forumfunction.inc.php';
 
+//
+$origin = '';
+if(isset($_GET['origin'])) {
+	$origin =  Security::remove_XSS($_GET['origin']);
+}
+
 // javascript
 $htmlHeadXtra[] = '<script>
 
@@ -94,13 +100,11 @@ if (!empty($gradebook) && $gradebook=='view') {
 		);
 }
 
-
-if (!empty($_SESSION['toolgroup'])) {
-
+if ($origin=='group') {	
 	$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
 	$group_properties  = GroupManager :: get_group_properties($_clean['toolgroup']);
 	$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."&amp;gidReq=".$_SESSION['toolgroup']."&amp;forum=".Security::remove_XSS($_GET['forum']),"name" => prepare4display($current_forum['forum_title']));
 	$interbreadcrumb[] = array("url" => "javascript: void (0);","name" => get_lang('EditPost'));
 
@@ -178,8 +182,13 @@ if (!api_is_allowed_to_edit(null,true) AND $current_forum['allow_edit']==0) {
 if ($origin!='learnpath') {
 	echo '<div class="actions">';
 	echo '<span style="float:right;">'.search_link().'</span>';
-	echo '<a href="index.php?gradebook='.$gradebook.'">'.Display::return_icon('back.png').' '.get_lang('BackToForumOverview').'</a>';
-	echo '<a href="viewforum.php?forum='.Security::remove_XSS($_GET['forum']).'">'.Display::return_icon('forum.gif').' '.get_lang('BackToForum').'</a>';
+	if ($origin=='group') {		
+		echo '<a href="../group/group_space.php?'.api_get_cidreq().'&amp;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').'</a>';
+	}
+	echo '<a href="viewforum.php?forum='.Security::remove_XSS($_GET['forum']).'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&origin=group">'.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').'</a>';
 	echo '</div>';
 }
 
diff --git a/main/forum/forumsearch.php b/main/forum/forumsearch.php
index c960da6b85..57775bb22c 100755
--- a/main/forum/forumsearch.php
+++ b/main/forum/forumsearch.php
@@ -66,7 +66,7 @@ if (!empty ($_GET['gidReq'])) {
 	api_session_register('toolgroup');
 }
 
-if (!empty($_SESSION['toolgroup'])) {
+if ($origin=='group') {
 	$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
 	$group_properties  = GroupManager :: get_group_properties($_clean['toolgroup']);
 	$interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups'));
diff --git a/main/forum/newthread.php b/main/forum/newthread.php
index 034a678f00..27c43b3293 100755
--- a/main/forum/newthread.php
+++ b/main/forum/newthread.php
@@ -105,11 +105,11 @@ if (!empty($_GET['gidReq'])) {
 }
 
 $session_toolgroup = 0;
-if (!empty($_SESSION['toolgroup'])) {
+if ($origin=='group') {
 	$session_toolgroup = intval($_SESSION['toolgroup']);
 	$group_properties  = GroupManager :: get_group_properties($session_toolgroup);
 	$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."&amp;gidReq=".$session_toolgroup."&forum=".Security::remove_XSS($_GET['forum']),"name" => $current_forum['forum_title']);
 	$interbreadcrumb[]=array("url" => "newthread.php?origin=".$origin."&forum=".Security::remove_XSS($_GET['forum']),"name" => get_lang('NewTopic'));
 } else {
@@ -190,8 +190,14 @@ handle_forum_and_forumcategories();
 // action links
 echo '<div class="actions">';
 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']).'&amp;gidReq='.$session_toolgroup.'">'.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').'</a>';
+
+if ($origin=='group') {	
+	echo '<a href="../group/group_space.php?'.api_get_cidreq().'&amp;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']).'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&origin=group">'.Display::return_icon('forum.gif',get_lang('BackToForum')).' '.get_lang('BackToForum').'</a>';
 echo '</div>';
 
 /*
diff --git a/main/forum/reply.php b/main/forum/reply.php
index adbd457756..64aa3bb5c0 100755
--- a/main/forum/reply.php
+++ b/main/forum/reply.php
@@ -80,11 +80,11 @@ if (!empty($gradebook) && $gradebook == 'view') {
 		);
 }
 
-if (!empty($_SESSION['toolgroup'])) {
+if ($origin=='group') {
 	$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
 	$group_properties  = GroupManager :: get_group_properties($_clean['toolgroup']);
 	$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" => "viewthread.php?origin=".$origin."&gradebook=".$gradebook."&forum=".Security::remove_XSS($_GET['forum'])."&amp;thread=".Security::remove_XSS($_GET['thread']),"name" => $current_thread['thread_title']);
 	$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') {
 	echo '<div class="actions">';
 	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']).'&amp;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']).'&amp;gradebook='.$gradebook.'&amp;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().'&amp;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']).'&amp;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']).'&amp;gradebook='.$gradebook.'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&origin=group">'.Display::return_icon('forumthread.gif',get_lang('BackToThread')).' '.get_lang('BackToThread').'</a>';
+	
 	echo '</div>';
 } else {
 	echo '<div style="height:15px">&nbsp;</div>';
diff --git a/main/lang/spanish/forum.inc.php b/main/lang/spanish/forum.inc.php
index 11e33ade82..09c6cae617 100644
--- a/main/lang/spanish/forum.inc.php
+++ b/main/lang/spanish/forum.inc.php
@@ -143,4 +143,5 @@ $ForumcategoryLocked = "Categoría de foro bloqueado";
 $PreviewImage = "Imagen previa";
 $UpdateImage = "Actualizar imagen";
 $EnableTimeLimits = "Activar limites de tiempo";
+$RemoveSearchResults ="Limpiar los resultados";
 ?>
\ No newline at end of file