diff --git a/main/course_home/activity.php b/main/course_home/activity.php index f26033f5ad..70d2eef1e2 100644 --- a/main/course_home/activity.php +++ b/main/course_home/activity.php @@ -80,7 +80,6 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { if (api_get_setting('show_session_data') == 'true' && $id_session > 0) { - $content .= '
'.get_lang('SessionData').' '.CourseHome::show_session_data($id_session).' @@ -88,8 +87,7 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { '; } - $content .= '
- '.get_lang('Authoring').''; + $content .= '
'.get_lang('Authoring').''; $my_list = CourseHome::get_tools_category(TOOL_AUTHORING); $content .= CourseHome::show_tools_category($my_list).'
'; @@ -99,10 +97,9 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { $list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN); $my_list = array_merge($my_list,$list2); $content .= CourseHome::show_tools_category($my_list); - $content .= '
-
- '.get_lang('Administration').''; + +
'.get_lang('Administration').''; $theme = api_get_setting('homepage_view'); $rows = false; if ($theme == 'activity_big') { @@ -124,8 +121,8 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { $content .= '
'; $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW); $content .= CourseHome::show_tools_category($my_list); - $content .= '
'; -// TOOLS AUTHORING + $content .= '
'; + // TOOLS AUTHORING } else { $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW); diff --git a/main/course_home/vertical_activity.php b/main/course_home/vertical_activity.php index b6e1f9ad4c..767311d9eb 100644 --- a/main/course_home/vertical_activity.php +++ b/main/course_home/vertical_activity.php @@ -13,38 +13,21 @@ * @package chamilo.course_home */ -require_once api_get_path(LIBRARY_PATH).'course_home.lib.php'; - // MAIN CODE +$course_id = api_get_course_int_id(); if (api_is_allowed_to_edit(null, true)) { // HIDE if (!empty($_GET['hide'])) { // visibility 1 -> 0 - /* -- session condition for visibility - if (!empty($session_id)) { - $sql = "select session_id FROM $tool_table WHERE id='".intval($_GET["id"])."' AND session_id = '".intval($session_id)."'"; - $rs = Database::query($sql); - if (Database::num_rows($rs) > 0) { - $sql="UPDATE $tool_table SET visibility=0 WHERE id='".intval($_GET["id"])."' AND session_id = '".intval($session_id)."'"; - } else { - $sql_select = "select * FROM $tool_table WHERE id='".$_GET["id"]."'"; - $res_select = Database::query($sql_select); - $row_select = Database::fetch_array($res_select); - $sql = "INSERT INTO $tool_table(name,link,image,visibility,admin,address,added_tool,target,category,session_id) - VALUES('{$row_select['name']}','{$row_select['link']}','{$row_select['image']}','0','{$row_select['admin']}','{$row_select['address']}','{$row_select['added_tool']}','{$row_select['target']}','{$row_select['category']}','$session_id')"; - } - } else { - $sql="UPDATE $tool_table SET visibility=0 WHERE id='".intval($_GET["id"])."'"; - }*/ - $sql = "UPDATE $tool_table SET visibility=0 WHERE id='".intval($_GET["id"])."'"; + $sql = "UPDATE $tool_table SET visibility=0 WHERE c_id = $course_id AND id='".intval($_GET["id"])."'"; Database::query($sql); - Display::display_confirmation_message(get_lang('ToolIsNowHidden')); + $show_message = Display::return_message(get_lang('ToolIsNowHidden'), 'confirmation'); } elseif (!empty($_GET['restore'])) { // visibility 0,2 -> 1 // REACTIVATE - $sql = "UPDATE $tool_table SET visibility=1 WHERE id='".intval($_GET["id"])."'"; + $sql = "UPDATE $tool_table SET visibility=1 WHERE c_id = $course_id AND id='".intval($_GET["id"])."'"; Database::query($sql); - Display::display_confirmation_message(get_lang('ToolIsNowVisible')); + $show_message = Display::return_message(get_lang('ToolIsNowVisible'), 'confirmation'); } } @@ -53,20 +36,17 @@ if (api_is_platform_admin()) { // Show message to confirm that a tool it to be hidden from available tools // visibility 0,1->2 if (!empty($_GET['askDelete'])) { -?> -

    -  |  - -
-'.get_lang('DelLk').'
    + '.get_lang('No').' |  + '.get_lang('Yes').' +
'; + } elseif (isset($_GET['delete']) && $_GET['delete']) { + /* + * Process hiding a tools from available tools. + */ //where $id is set? $id = intval($id); - Database::query("DELETE FROM $tool_table WHERE id='$id' AND added_tool=1"); + Database::query("DELETE FROM $tool_table WHERE c_id = $course_id AND id='$id' AND added_tool=1"); } } @@ -86,86 +66,58 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { } else { $path_work = ''; } + + $content .= '
+ +
'; + -
+$content .= '
'; - 0) { -?> -
- -
- -
-
- -
- - - -
-
- - -
-
- - -
- 0) { + $content .= '
'.get_lang('SessionData').' + '.CourseHome::show_session_data($id_session).'
+
'; +} + +$content .= '
'.get_lang('Authoring').''; +$my_list = CourseHome::get_tools_category(TOOL_AUTHORING); +$content .= CourseHome::show_tools_category($my_list); +$content .= '
'; +$content .= '
'.get_lang('Interaction').''; +$my_list = CourseHome::get_tools_category(TOOL_INTERACTION); +$content .= CourseHome::show_tools_category($my_list); +$content .= '
'; + +$content .= '
'.get_lang('Administration').''; +$my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM); +$content .= CourseHome::show_tools_category($my_list); +$content .= '
'; + +} elseif (api_is_coach()) { if (api_get_setting('show_session_data') == 'true' && $id_session > 0) { -?> -
- - - -
-
-'.get_lang('SessionData').' + '; + $content .= CourseHome::show_session_data($id_session); + $content .= '
'; } -?> -
- -
-'; + $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW); + $content .= CourseHome::show_tools_category($my_list); + $content .= ''; + // TOOLS AUTHORING } else { $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW); if (count($my_list) > 0) { - echo '
'; + $content .= '
'; //ordering by get_lang name $order_tool_list = array(); foreach($my_list as $key=>$new_tool) { @@ -188,10 +140,9 @@ if (api_is_allowed_to_edit(null, true) && !api_is_coach()) { } $i++; } - CourseHome::show_tools_category($my_list1); - CourseHome::show_tools_category($my_list2); - echo '
'; + $content .=CourseHome::show_tools_category($my_list1); + $content .=CourseHome::show_tools_category($my_list2); + $content .= '
'; } } -?> - \ No newline at end of file +$content .= ''; \ No newline at end of file