Merge

14 years ago · b1b18e7a13
parent e098ae6b95 eb71a17134
commit b1b18e7a13
5 changed files with 22 additions and 17 deletions
--- a/main/course_home/course_home.php
+++ b/main/course_home/course_home.php
@ -240,9 +240,7 @@ if (!empty($auto_lunch)) {
    }
 }

-//Display::display_header($course_title, 'Home');
-Display::display_header('', get_lang('Home'));
-
+Display::display_header(null, 'Home');


 $tool_table = Database::get_course_table(TABLE_TOOL_LIST);
--- a/main/inc/header.inc.php
+++ b/main/inc/header.inc.php
@ -48,6 +48,23 @@ if (isset($httpHeadXtra) && $httpHeadXtra) {
 // Get language iso-code for this page - ignore errors
 $document_language = api_get_language_isocode();

+$course_title = $_course['name'];
+$title_list[] = api_get_setting('siteName');
+if (!empty($course_title)) {
+    $title_list[] = $course_title;
+}
+if ($nameTools != '') {
+    $title_list[] = $nameTools;
+}
+
+$title_string = '';
+for($i=0; $i<count($title_list);$i++) {
+    $title_string .=$title_list[$i];
+    if (isset($title_list[$i+1])) {
+        $title_string .=' - ';
+    }    
+}
+
 /*
 * HTML HEADER
 */
@ -59,18 +76,7 @@ $document_language = api_get_language_isocode();
 <head>
 <title>
 <?php
-$title_list[] = api_get_setting('siteName');
-$title_list[] = $nameTools;
-$title_list[] = $_course['official_code'];
-$title_string = '';
-
-for($i=0; $i<count($title_list);$i++) {
-    $title_string .=$title_list[$i];
-    if (isset($title_list[$i+1])) {
-        $title_string .=' - ';
-    }    
-}
-echo $title_string;
+echo Security::remove_XSS($title_string);
 ?>
 </title>
 <style type="text/css" media="screen, projection">
--- a/main/session/index.php
+++ b/main/session/index.php
@ -28,7 +28,7 @@ $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = api_get_jquery_ui_js(true);
 $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('Course'));

-Display :: display_header($nameTools);
+Display :: display_header(get_lang('Session'));

 $session_id     = intval($_GET['session_id']);
 if (empty($session_id)) {
--- a/main/social/home.php
+++ b/main/social/home.php
@ -65,7 +65,7 @@ if (api_get_setting('profile', 'picture') == 'true') {
 	}
 }

-Display :: display_header(get_lang('Home'));
+Display :: display_header(get_lang('SocialNetwork'));
 $user_info = UserManager :: get_user_info_by_id(api_get_user_id());
 $user_online_list = who_is_online(api_get_setting('time_limit_whosonline'),true);
 $user_online_count = count($user_online_list);
--- a/main/social/profile.php
+++ b/main/social/profile.php
@ -215,6 +215,7 @@ $_SESSION['social_user_id'] = intval($user_id);
 /**
 * Display
 */
+
 Display :: display_header($nametool);

 //Setting some course info