diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php index 776839626e..4632cab248 100755 --- a/main/inc/ajax/exercise.ajax.php +++ b/main/inc/ajax/exercise.ajax.php @@ -1,6 +1,8 @@ ( '. $thematicScore .' )'; - - $infoUser = '
'; $infoUser .= '
@@ -258,7 +256,6 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
'; - $thematicItemOne = '
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php index e7633a8886..8a0ebad784 100755 --- a/main/inc/lib/course_home.lib.php +++ b/main/inc/lib/course_home.lib.php @@ -153,9 +153,9 @@ class CourseHome $cat == 'courseAdmin' || $cat == 'platformAdmin' ) { if (strpos($tool['name'], 'visio_') !== false) { - $cell_content .= ''.$tool_name.''.$tool_name.''; + $cell_content .= ''.$tool_name.''.$tool_name.''; } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) { - $cell_content .= ''.$tool_name.''.$tool_name.''; + $cell_content .= ''.$tool_name.''.$tool_name.''; // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img'] } else { $cell_content .= ''.$tool_name.''.$tool_name.''; @@ -165,9 +165,9 @@ class CourseHome // INVISIBLE if (api_is_allowed_to_edit(null, true)) { if (strpos($tool['name'], 'visio_') !== false) { - $cell_content .= ''.$tool_name.''.$tool_name.''; + $cell_content .= ''.$tool_name.''.$tool_name.''; } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) { - $cell_content .= ''; + $cell_content .= ''; // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img'] } else { $cell_content .= ''; + $html .= ''; } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) { - $html .= ''; + $html .= ''; } else { $html .= ''; } @@ -413,7 +413,7 @@ class CourseHome $html .= '
'; $html .= '
'; foreach ($lnk as & $this_link) { - if (!$tool['adminlink']) { + if (!$tool['adminlink']) { $html .= ''.$this_link['name'].''; } } @@ -828,7 +828,7 @@ class CourseHome 'id' => 'tooldesc_'.$toolId, 'href' => '"javascript: void(0);"', 'class' => $class, - 'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_visio'.$_SESSION['_cid'].'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', + 'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_visio'.api_get_course_id().'\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', 'target' => $tool['target'] ); } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) { @@ -836,7 +836,7 @@ class CourseHome 'id' => 'tooldesc_'.$toolId, 'class' => $class, 'href' => 'javascript: void(0);', - 'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', //Chat Open Windows + 'onclick' => 'javascript: window.open(\''.$tool['link'].'\',\'window_chat'.api_get_course_id().'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')', //Chat Open Windows 'target' => $tool['target'] ); } else { @@ -1203,7 +1203,7 @@ class CourseHome if (strpos($navigation_item['link'], 'chat') !== false && api_get_course_setting('allow_open_chat_window', $course_id) ) { - $html .= '