|
@@ -32,7 +32,11 @@ class CourseHome
|
|
|
case 'Basic':
|
|
|
$condition_display_tools = ' WHERE a.c_id = '.$course_id.' AND a.link=t.link AND t.position="basic" ';
|
|
|
if ((api_is_coach() || api_is_course_tutor()) && $_SESSION['studentview'] != 'studentview') {
|
|
|
- $condition_display_tools = ' WHERE a.c_id = '.$course_id.' AND a.link=t.link AND (t.position="basic" OR a.name = "'.TOOL_TRACKING.'") ';
|
|
|
+ $condition_display_tools = ' WHERE
|
|
|
+ a.c_id = '.$course_id.' AND
|
|
|
+ a.link=t.link AND
|
|
|
+ (t.position="basic" OR a.name = "'.TOOL_TRACKING.'")
|
|
|
+ ';
|
|
|
}
|
|
|
|
|
|
$sql = "SELECT a.*, t.image img, t.row, t.column
|
|
@@ -42,13 +46,20 @@ class CourseHome
|
|
|
case 'External':
|
|
|
if (api_is_allowed_to_edit()) {
|
|
|
$sql = "SELECT a.*, t.image img FROM $TBL_ACCUEIL a, $TABLE_TOOLS t
|
|
|
- WHERE a.c_id = $course_id AND ((a.link=t.link AND t.position='external')
|
|
|
- OR (a.visibility <= 1 AND (a.image = 'external.gif' OR a.image = 'scormbuilder.gif' OR t.image = 'blog.gif') AND a.image=t.image))
|
|
|
+ WHERE
|
|
|
+ a.c_id = $course_id AND
|
|
|
+ ((a.link=t.link AND t.position='external') OR
|
|
|
+ (a.visibility <= 1 AND
|
|
|
+ (a.image = 'external.gif' OR a.image = 'scormbuilder.gif' OR t.image = 'blog.gif') AND
|
|
|
+ a.image=t.image))
|
|
|
ORDER BY a.id";
|
|
|
} else {
|
|
|
$sql = "SELECT a.*, t.image img FROM $TBL_ACCUEIL a, $TABLE_TOOLS t
|
|
|
- WHERE a.c_id = $course_id AND (a.visibility = 1 AND ((a.link=t.link AND t.position='external')
|
|
|
- OR ((a.image = 'external.gif' OR a.image = 'scormbuilder.gif' OR t.image = 'blog.gif') AND a.image=t.image)))
|
|
|
+ WHERE
|
|
|
+ a.c_id = $course_id AND
|
|
|
+ (a.visibility = 1 AND ((a.link=t.link AND t.position='external') OR
|
|
|
+ ((a.image = 'external.gif' OR a.image = 'scormbuilder.gif' OR t.image = 'blog.gif') AND
|
|
|
+ a.image=t.image)))
|
|
|
ORDER BY a.id";
|
|
|
}
|
|
|
break;
|
|
@@ -167,12 +178,15 @@ class CourseHome
|
|
|
) {
|
|
|
if (strpos($tool['name'], 'visio_') !== false) {
|
|
|
$cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'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'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
- } elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
|
|
|
+ } elseif (strpos($tool['name'], 'chat') !== false &&
|
|
|
+ api_get_course_setting('allow_open_chat_window')
|
|
|
+ ) {
|
|
|
+ // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
$cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'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\')" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
- // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
} else {
|
|
|
- $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
// don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
+ $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'"><img src="'.$tool['img'].'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
+
|
|
|
}
|
|
|
} else {
|
|
|
// INVISIBLE
|
|
@@ -180,16 +194,16 @@ class CourseHome
|
|
|
if (strpos($tool['name'], 'visio_') !== false) {
|
|
|
$cell_content .= '<a href="javascript: void(0);" onclick="window.open(\''.$tool['link'].$link_annex.'\',\'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'].'"><img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
} elseif (strpos($tool['name'], 'chat') !== false && api_get_course_setting('allow_open_chat_window')) {
|
|
|
+ // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
$cell_content .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$tool['link'].$link_annex.'\',\'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\')" target="'.$tool['target'].'" class="text-muted"><img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
- // don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
} else {
|
|
|
- $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'" class="text-muted">
|
|
|
- <img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
// don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
+ $cell_content .= '<a href="'.$tool['link'].$link_annex.'" target="'.$tool['target'].'" class="text-muted">
|
|
|
+ <img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">'.$tool_name.'</a>';
|
|
|
}
|
|
|
} else {
|
|
|
- $cell_content .= '<img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">';
|
|
|
// don't replace img with display::return_icon because $tool['img'] = api_get_path(WEB_IMG_PATH).$tool['img']
|
|
|
+ $cell_content .= '<img src="'.str_replace(".gif", "_na.gif", $tool['img']).'" title="'.$tool_name.'" alt="'.$tool_name.'" align="absmiddle" border="0">';
|
|
|
$cell_content .= '<span class="text-muted">'.$tool_name.'</span>';
|
|
|
}
|
|
|
}
|
|
@@ -248,14 +262,14 @@ class CourseHome
|
|
|
$html = '';
|
|
|
$web_code_path = api_get_path(WEB_CODE_PATH);
|
|
|
$course_tool_table = Database::get_course_table(TABLE_TOOL_LIST);
|
|
|
-
|
|
|
$course_id = api_get_course_int_id();
|
|
|
-
|
|
|
switch ($course_tool_category) {
|
|
|
case TOOL_PUBLIC:
|
|
|
$condition_display_tools = ' WHERE c_id = '.$course_id.' AND visibility = 1 ';
|
|
|
if ((api_is_coach() || api_is_course_tutor()) && $_SESSION['studentview'] != 'studentview') {
|
|
|
- $condition_display_tools = ' WHERE c_id = '.$course_id.' AND (visibility = 1 OR (visibility = 0 AND name = "'.TOOL_TRACKING.'")) ';
|
|
|
+ $condition_display_tools = ' WHERE
|
|
|
+ c_id = '.$course_id.' AND
|
|
|
+ (visibility = 1 OR (visibility = 0 AND name = "'.TOOL_TRACKING.'")) ';
|
|
|
}
|
|
|
$result = Database::query("SELECT * FROM $course_tool_table $condition_display_tools ORDER BY id");
|
|
|
$col_link = "##003399";
|
|
@@ -566,7 +580,6 @@ class CourseHome
|
|
|
}
|
|
|
|
|
|
$allowEditionInSession = api_get_configuration_value('allow_edit_tool_visibility_in_session');
|
|
|
-
|
|
|
$toolWithSessionValue = [];
|
|
|
foreach ($tools as $row) {
|
|
|
if (!empty($row['session_id'])) {
|