Browse Source

[svn r18622] in forum, add to gradebook, the breadcrumb until qualify.php see FS#3696

Carlos Vargas 16 years ago
parent
commit
27c5f6d248
2 changed files with 32 additions and 14 deletions
  1. 22 9
      main/forum/forumqualify.php
  2. 10 5
      main/forum/viewthread.php

+ 22 - 9
main/forum/forumqualify.php

@@ -103,16 +103,25 @@ if ($origin=='learnpath') {
 		// the last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string
 		Display :: display_header('');
 		api_display_tool_title($nameTools);
+	} else if (isset($_GET['gradebook']) and $_GET['gradebook']=='view'){
+		
+		$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
+		$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook'));
+		$interbreadcrumb[]=array("url" => "viewthread.php?forum=".Security::remove_XSS($_GET['forum'])."&thread=".Security::remove_XSS($_GET['thread'])."&gradebook=view","name" => prepare4display($current_thread['thread_title']));
+		$interbreadcrumb[]=array("url" => "#","name" => prepare4display($current_forum['forum_title']));
+		Display :: display_header('');
+		api_display_tool_title($nameTools);			
+		
 	} else {
+		
+		$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
 		$interbreadcrumb[]=array("url" => "index.php?search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => $nameTools);
 		$interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id']."&search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum_category['cat_title']));
-		if (isset($_GET['gradebook']) and $_GET['gradebook']=='view') {
-			$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
-			$interbreadcrumb[]=array("url" => "viewforum.php?forum=".$info_thread['forum_id']."&origin=".$origin."&search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));	
-		} else {
-			$interbreadcrumb[]=array("url" => "viewforum.php?forum=".Security::remove_XSS($_GET['forum'])."&origin=".$origin."&search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));
-		}
-	
+
+		$interbreadcrumb[]=array("url" => "viewforum.php?forum=".Security::remove_XSS($_GET['forum'])."&origin=".$origin."&search=".Security::remove_XSS(urlencode($_GET['search'])),"name" => prepare4display($current_forum['forum_title']));
+		
 		if ($message<>'PostDeletedSpecial') {
 			if (isset($_GET['gradebook']) and $_GET['gradebook']=='view') {
 				$info_thread=get_thread_information(Security::remove_XSS($_GET['thread']));
@@ -282,14 +291,18 @@ if ($allowed_to_edit) {
 	$counter= count($qualify_historic);
 	$act_qualify = $_REQUEST['idtextqualify'];	
 	if ($counter>0) {
+		if (isset($_GET['gradebook'])){
+			$view_gradebook='&gradebook=view';
+		}
 		echo '<h4>'.get_lang('QualificationChangesHistory').'</h4>';	
 		if ($_GET['type'] == 'false') {
-			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user='.Security::remove_XSS($_GET['user']).'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=true&idtextqualify='.$act_qualify.'#history">'.get_lang('MoreRecent').'</a>&nbsp;|
+			
+			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user='.Security::remove_XSS($_GET['user']).'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=true&idtextqualify='.$act_qualify.$view_gradebook.'#history">'.get_lang('MoreRecent').'</a>&nbsp;|
 					'.get_lang('Older').'
 				  </div>';
 		} else {
 			echo '<div style="float:left; clear:left">'.get_lang('OrderBy').'&nbsp;:'.get_lang('MoreRecent').' |
-					<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user='.Security::remove_XSS($_GET['user']).'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=false&idtextqualify='.$act_qualify.'#history">'.get_lang('Older').'</a>&nbsp;
+					<a href="forumqualify.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($_GET['forum']).'&origin='.$origin.'&thread='.$threadid.'&user='.Security::remove_XSS($_GET['user']).'&user_id='.Security::remove_XSS($_GET['user_id']).'&type=false&idtextqualify='.$act_qualify.$view_gradebook.'#history">'.get_lang('Older').'</a>&nbsp;
 				  </div>';
 		}				
 		$table_list.= '<a name="history" /><br /><br /><table class="data_table" style="width:100%">';	

+ 10 - 5
main/forum/viewthread.php

@@ -105,13 +105,18 @@ if (!empty($_SESSION['toolgroup'])) {
 	Display :: display_header('');
 	api_display_tool_title($nameTools);
 	
-} else {
-	if (!empty($_GET['gradebook'])) {
+} elseif (!empty($_GET['gradebook'])){
+	
 			$interbreadcrumb[]= array (
 				'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
-				'name' => get_lang('Gradebook')
-			);
-	}
+				'name' => get_lang('Gradebook'));
+			$interbreadcrumb[] = array("url" => "#","name" => prepare4display($current_thread['thread_title']));
+	
+	Display :: display_header('');
+	api_display_tool_title($nameTools);
+	
+} else {
+
 	$my_search=isset($_GET['search']) ? $_GET['search'] : '';