Replacing the reduced_header.inc.php with the Display::display_reduced_header() function

skala
Julio Montoya 14 years ago
parent 33b2fc8871
commit 8cb390cdcd
  1. 3
      main/exercice/exercise_submit_modal.php
  2. 2
      main/forum/editpost.php
  3. 2
      main/forum/forumqualify.php
  4. 2
      main/forum/forumsearch.php
  5. 4
      main/forum/newthread.php
  6. 3
      main/forum/reply.php
  7. 3
      main/forum/viewforum.php
  8. 2
      main/forum/viewforumcategory.php
  9. 2
      main/forum/viewpost.php
  10. 2
      main/forum/viewthread.php
  11. 2
      main/work/work.php

@ -10,9 +10,10 @@
$language_file=array('exercice'); $language_file=array('exercice');
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
api_protect_course_script(false); api_protect_course_script(false);
require_once api_get_path(INCLUDE_PATH).'reduced_header.inc.php';
require_once api_get_path(LIBRARY_PATH).'geometry.lib.php'; require_once api_get_path(LIBRARY_PATH).'geometry.lib.php';
Display::display_reduced_header();
$dbg_local = 0; $dbg_local = 0;
require_once 'exercise.class.php'; require_once 'exercise.class.php';
require_once 'question.class.php'; require_once 'question.class.php';

@ -129,7 +129,7 @@ if (isset($_GET['origin'])) {
} }
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
include api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; Display::display_reduced_header();
} else { } else {
Display :: display_header(null); Display :: display_header(null);
} }

@ -66,7 +66,7 @@ if (!empty($gradebook) && $gradebook=='view') {
} }
if ($origin=='learnpath') { if ($origin=='learnpath') {
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); Display::display_reduced_header();
} else { } else {
if (!empty($_SESSION['toolgroup'])) { if (!empty($_SESSION['toolgroup'])) {

@ -81,7 +81,7 @@ if ($origin == 'group') {
// Display the header. // Display the header.
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
include api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; Display::display_reduced_header();
} else { } else {
Display :: display_header($nameTools); Display :: display_header($nameTools);
} }

@ -22,6 +22,8 @@
* @package chamilo.forum * @package chamilo.forum
*/ */
exit;
// Language file that need to be included. // Language file that need to be included.
$language_file = array('forum', 'document'); $language_file = array('forum', 'document');
@ -153,7 +155,7 @@ if (isset($_POST['add_resources']) AND $_POST['add_resources'] == get_lang('Reso
/* Header */ /* Header */
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
require_once api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; Display::display_reduced_header();
} else { } else {
Display :: display_header(null); Display :: display_header(null);
//api_display_tool_title($nameTools); //api_display_tool_title($nameTools);

@ -133,12 +133,9 @@ if (isset($_POST['add_resources']) AND $_POST['add_resources'] == get_lang('Reso
exit; exit;
} }
/* Header */ /* Header */
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
//include api_get_path(INCLUDE_PATH).'reduced_header.inc.php';
Display :: display_reduced_header(''); Display :: display_reduced_header('');
} else { } else {
// The last element of the breadcrumb navigation is already set in interbreadcrumb, so give an empty string. // The last element of the breadcrumb navigation is already set in interbreadcrumb, so give an empty string.

@ -144,11 +144,10 @@ if ($origin == 'group') {
} }
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
include api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; Display::display_reduced_header();
} else { } else {
// The last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string. // The last element of the breadcrumb navigation is already set in interbreadcrumb, so give empty string.
Display :: display_header(''); Display :: display_header('');
//api_display_tool_title($nameTools);
} }
/* Actions */ /* Actions */

@ -96,7 +96,7 @@ if (isset($_GET['origin'])) {
} }
if ($origin=='learnpath') { if ($origin=='learnpath') {
require_once api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; Display::display_reduced_header();
} else { } else {
Display :: display_header(null); Display :: display_header(null);
} }

@ -63,7 +63,7 @@ if (!empty($gradebook) && $gradebook == 'view') {
} }
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); Display::display_reduced_header();
} else { } else {
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&search='.Security::remove_XSS(urlencode($_GET['search'])), 'name' => $nameTools); $interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&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'])); $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']));

@ -74,7 +74,7 @@ if ($origin == 'group') {
} else { } else {
$my_search = isset($_GET['search']) ? $_GET['search'] : ''; $my_search = isset($_GET['search']) ? $_GET['search'] : '';
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
require_once api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; Display::display_reduced_header();
} else { } else {
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&search='.Security::remove_XSS(urlencode($my_search)), 'name' => $nameTools); $interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&search='.Security::remove_XSS(urlencode($my_search)), 'name' => $nameTools);
$interbreadcrumb[] = array('url' => 'viewforumcategory.php?forumcategory='.$current_forum_category['cat_id'].'&origin='.$origin.'&search='.Security::remove_XSS(urlencode($my_search)), 'name' => Security::remove_XSS($current_forum_category['cat_title'])); $interbreadcrumb[] = array('url' => 'viewforumcategory.php?forumcategory='.$current_forum_category['cat_id'].'&origin='.$origin.'&search='.Security::remove_XSS(urlencode($my_search)), 'name' => Security::remove_XSS($current_forum_category['cat_title']));

@ -238,7 +238,7 @@ if (!empty($group_id)) {
} else { } else {
//we are in the learnpath tool //we are in the learnpath tool
require api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; require Display::display_reduced_header();
} }
} }

Loading…
Cancel
Save