merge

main/admin/settings.php

@@ -18,7 +18,7 @@ if ($_GET['category']=='Templates') {
 }
 // resetting the course id
 $cidReset=true;
-// including some necessary dokeos files
+// including some necessary chamilo files
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
@@ -216,6 +216,9 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
  					if (api_get_setting('allow_social_tool') == 'true') {
  						if ($rowkeys['variable'] == 'show_tabs' && $rowkeys['subkey'] == 'my_profile') {continue;}
  					}
+ 					
+ 					//hiding the gradebook option
+ 					if ($rowkeys['variable'] == 'show_tabs' && $rowkeys['subkey'] == 'my_gradebook') {continue;}
 
 					$element = & $form->createElement('checkbox', $rowkeys['subkey'], '', get_lang($rowkeys['subkeytext']));
 					if ($row['access_url_changeable']==1) {

main/document/upload.php

@@ -243,6 +243,8 @@ if ($is_certificate_mode) {
 	$interbreadcrumb[] = array('url' => './document.php?curdirpath='.urlencode($path).$req_gid, 'name'=> get_lang('Documents'));
 }
 
+$this_section = SECTION_COURSES;
+
 // Display the header
 Display::display_header($nameTools, 'Doc');
 

main/gradebook/gradebook_add_eval.php

@@ -65,6 +65,7 @@ $interbreadcrumb[] = array (
 	'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$select_cat,
 	'name' => get_lang('Gradebook'
 ));
+$this_section = SECTION_COURSES;
 Display :: display_header(get_lang('NewEvaluation'));
 if ($evaladd->get_course_code() == null) {
 	Display :: display_normal_message(get_lang('CourseIndependentEvaluation'),false);

main/gradebook/gradebook_add_link.php

@@ -107,7 +107,7 @@ if (isset($_GET['typeselected']) && $_GET['typeselected'] != '0') {
 
 
 $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' .Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Gradebook'));
-
+$this_section = SECTION_COURSES;
 Display :: display_header(get_lang('MakeLink'));
 if (isset ($typeform)) {
 	$typeform->display();

main/gradebook/gradebook_display_certificate.php

@@ -27,6 +27,8 @@ $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_d
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['cat_id']),'name' => get_lang('Details'));
 $interbreadcrumb[] = array ('url' => 'gradebook_display_certificate.php?cat_id='.Security::remove_XSS($_GET['cat_id']),'name' => get_lang('GradebookListOfStudentsCertificates'));
 
+$this_section = SECTION_COURSES;
+
 Display::display_header('');
 ?>
 <?php

main/gradebook/gradebook_edit_all.php

@@ -4,7 +4,7 @@
 $language_file= 'gradebook';
 $cidReset= true;
 require_once '../inc/global.inc.php';
-$this_section = SECTION_MYGRADEBOOK;
+$this_section = SECTION_COURSES;
 
 require_once 'lib/be.inc.php';
 require_once 'lib/scoredisplay.class.php';

main/gradebook/gradebook_edit_cat.php

@@ -37,10 +37,8 @@ if ($form->validate()) {
 	exit;
 }
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
-$interbreadcrumb[] = array (
-	'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat,
-	'name' => get_lang('Gradebook'
-));
+$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat,'name' => get_lang('Gradebook'));
+$this_section = SECTION_COURSES;
 Display :: display_header(get_lang('EditCategory'));
 echo '<div class="actions-message">'.get_lang('EditCategory').'</div>';
 $form->display();

main/gradebook/gradebook_flatview.php

@@ -288,6 +288,7 @@ if (isset($_GET['search'])) {
 
 $offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
 $flatviewtable = new FlatViewTable($cat[0], $users, $alleval, $alllinks, true, $offset, $addparams);
+$this_section = SECTION_COURSES;
 
 if (isset($_GET['exportpdf'])) {
 	echo '<div class="normal-message">';

main/gradebook/gradebook_scoring_system.php

@@ -2,11 +2,11 @@
 /* For licensing terms, see /license.txt */
 $language_file= 'gradebook';
 //$cidReset= true;
-require_once ('../inc/global.inc.php');
-require_once ('lib/be.inc.php');
-require_once ('lib/gradebook_functions.inc.php');
-require_once ('lib/fe/scoredisplayform.class.php');
-require_once ('lib/scoredisplay.class.php');
+require_once '../inc/global.inc.php';
+require_once 'lib/be.inc.php';
+require_once 'lib/gradebook_functions.inc.php';
+require_once 'lib/fe/scoredisplayform.class.php';
+require_once 'lib/scoredisplay.class.php';
 api_block_anonymous_users();
 //api_protect_admin_script();
 
@@ -103,6 +103,7 @@ if ($scoreform->validate()) {
 	exit;
 }
 
+$this_section = SECTION_COURSES;
 Display :: display_header(get_lang('ScoreEdit'));
 
 if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') || (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))) {

main/gradebook/gradebook_showlog_eval.php

@@ -22,7 +22,7 @@ $interbreadcrumb[] = array (
 	'url' => 'gradebook_showlog_eval.php?visiblelog='.Security::remove_XSS($_GET['visiblelog']).'&selectcat='.Security::remove_XSS($_GET['selectcat']),
 	'name' => get_lang('GradebookQualifyLog')
 );
-
+$this_section = SECTION_COURSES;
 Display :: display_header('');
 echo '<div class="clear"></div>';
 echo '<div class="actions">';

main/gradebook/gradebook_showlog_link.php

@@ -14,7 +14,7 @@ block_students();
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?','name' => get_lang('Gradebook'));
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
 $interbreadcrumb[] = array ('url' => 'gradebook_showlog_link.php?visiblelink='.Security::remove_XSS($_GET['visiblelink']).'&selectcat='.Security::remove_XSS($_GET['selectcat']),	'name' => get_lang('GradebookQualifyLog'));
-
+$this_section = SECTION_COURSES;
 Display :: display_header('');
 echo '<div class="clear"></div>';
 echo '<div class="actions">';

main/gradebook/index.php

@@ -10,11 +10,13 @@ $course_code = api_get_course_id();
 //make sure the destination for scripts is index.php instead of gradebook.php
 $_SESSION['gradebook_dest'] = 'index.php';
 
-if (isset($_GET['cidReq'])) {
+/*if (isset($_GET['cidReq'])) {
 	$this_section = SECTION_COURSES;
 } else {
 	$this_section = SECTION_MYGRADEBOOK;
-}
+}*/
+
+$this_section = SECTION_COURSES;
 
 require_once 'lib/be.inc.php';
 require_once 'lib/scoredisplay.class.php';