diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php index c98066a301..828aef1550 100755 --- a/main/admin/dashboard_add_courses_to_user.php +++ b/main/admin/dashboard_add_courses_to_user.php @@ -157,7 +157,7 @@ if (intval($_POST['formSent']) == 1) { $courses_list = $_POST['CoursesList']; $affected_rows = CourseManager::suscribe_courses_to_hr_manager($hrm_id,$courses_list); if ($affected_rows) { - $msg = get_lang('AssignedCoursesHasBeenUpdatedSuccesslly'); + $msg = get_lang('AssignedCoursesHaveBeenUpdatedSuccessfully'); } } diff --git a/main/admin/dashboard_add_sessions_to_user.php b/main/admin/dashboard_add_sessions_to_user.php index 88eb9e49a2..684d98796a 100755 --- a/main/admin/dashboard_add_sessions_to_user.php +++ b/main/admin/dashboard_add_sessions_to_user.php @@ -160,7 +160,7 @@ if (intval($_POST['formSent']) == 1) { $sessions_list = $_POST['SessionsList']; $affected_rows = SessionManager::suscribe_sessions_to_hr_manager($hrm_id,$sessions_list); if ($affected_rows) { - $msg = get_lang('AssignedSessionsHasBeenUpdatedSuccesslly'); + $msg = get_lang('AssignedSessionsHaveBeenUpdatedSuccessfully'); } } diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php index 19644197bc..95f6def63c 100755 --- a/main/admin/dashboard_add_users_to_user.php +++ b/main/admin/dashboard_add_users_to_user.php @@ -153,7 +153,7 @@ if (intval($_POST['formSent']) == 1) { $user_list = $_POST['UsersList']; $affected_rows = UserManager::suscribe_users_to_hr_manager($hrm_id,$user_list); if ($affected_rows) { - $msg = get_lang('AssignedUsersHasBeenUpdatedSuccesslly'); + $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully'); } } diff --git a/main/dashboard/dashboard.php b/main/dashboard/dashboard.php index 1361440533..02f2494588 100755 --- a/main/dashboard/dashboard.php +++ b/main/dashboard/dashboard.php @@ -32,7 +32,7 @@ echo ''; if($dashboard_view == 'blocks') { if (isset($msg)) { - //Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccesslly')); + //Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully')); } if (count($blocks) > 0) { @@ -85,7 +85,7 @@ if($dashboard_view == 'blocks') { } else { // block dashboard list if (isset($success)) { - Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccesslly')); + Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully')); } $user_id = api_get_user_id(); diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 201a95754d..dba5cc24eb 100755 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -2111,7 +2111,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_GRADEBOOK."','gradebook/index.php','gradebook.gif','".string2binary(api_get_setting('course_create_active_tools', 'gradebook')). "','0','squaregrey.gif','NO','_self','authoring','0')"); Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_GLOSSARY."','glossary/index.php','glossary.gif','".string2binary(api_get_setting('course_create_active_tools', 'glossary')). "','0','squaregrey.gif','NO','_self','authoring','0')"); Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_NOTEBOOK."','notebook/index.php','notebook.gif','".string2binary(api_get_setting('course_create_active_tools', 'notebook'))."','0','squaregrey.gif','NO','_self','interaction','0')"); - Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_ATTENDANCE."','attendance/index.php','attendance.gif','".string2binary(api_get_setting('course_create_active_tools', 'attendance'))."','0','squaregrey.gif','NO','_self','interaction','0')"); + Database::query("INSERT INTO `" . $tbl_course_homepage . "` VALUES (NULL, '" . TOOL_ATTENDANCE."','attendance/index.php','attendance.gif','".string2binary(api_get_setting('course_create_active_tools', 'attendances'))."','0','squaregrey.gif','NO','_self','interaction','0')"); if(api_get_setting('service_visio','active')=='true') { $mycheck = api_get_setting('service_visio','visio_host'); diff --git a/main/inc/lib/course_description.lib.php b/main/inc/lib/course_description.lib.php index 0e389de7a3..e80282c6cc 100755 --- a/main/inc/lib/course_description.lib.php +++ b/main/inc/lib/course_description.lib.php @@ -302,7 +302,7 @@ class CourseDescription $question[5]= get_lang('CourseMaterialQuestions'); $question[6]= get_lang('HumanAndTechnicalResourcesQuestions'); $question[7]= get_lang('AssessmentQuestions'); - $question[8]= get_lang('thematicAdvanceQuestions'); + $question[8]= get_lang('ThematicAdvanceQuestions'); return $question; } diff --git a/main/install/dokeos_main.sql b/main/install/dokeos_main.sql index f3532d1532..c8f4cb4988 100755 --- a/main/install/dokeos_main.sql +++ b/main/install/dokeos_main.sql @@ -721,7 +721,7 @@ VALUES ('course_create_active_tools','survey','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Survey', 0), ('course_create_active_tools','glossary','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Glossary', 0), ('course_create_active_tools','notebook','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Notebook', 0), -('course_create_active_tools','attendance','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Attendance', 0), +('course_create_active_tools','attendances','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Attendances', 0), ('advanced_filemanager',NULL,'radio','Editor','false','AdvancedFileManagerTitle','AdvancedFileManagerComment',NULL,NULL, 0), ('allow_reservation', NULL, 'radio', 'Tools', 'false', 'AllowReservationTitle', 'AllowReservationComment', NULL, NULL, 0), ('profile','apikeys','checkbox','User','false','ProfileChangesTitle','ProfileChangesComment',NULL,'ApiKeys', 0), diff --git a/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql b/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql index c0d421ec07..c032d7b004 100755 --- a/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql +++ b/main/install/migrate-db-1.8.6.2-1.8.7-pre.sql @@ -44,6 +44,8 @@ ALTER TABLE access_url CHANGE tms tms DATETIME NOT NULL default '0000-00-00 00:0 INSERT INTO user_field(field_type, field_variable, field_display_text, field_visible, field_changeable) VALUES(11, 'timezone', 'Timezone', 0, 0); UPDATE settings_current SET selected_value = '1.8.7.10365' WHERE variable = 'dokeos_database_version'; +INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('course_create_active_tools','attendances','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Attendances', 0); + -- xxSTATSxx CREATE TABLE track_e_item_property(id int NOT NULL auto_increment PRIMARY KEY, course_id int NOT NULL, item_property_id int NOT NULL, title varchar(255), content text, progress int NOT NULL default 0, lastedit_date datetime NOT NULL default '0000-00-00 00:00:00', lastedit_user_id int NOT NULL, session_id int NOT NULL default 0); ALTER TABLE track_e_item_property ADD INDEX (course_id, item_property_id, session_id);