diff --git a/documentation/changelog.html b/documentation/changelog.html index 6cccb35515..3d7345687b 100755 --- a/documentation/changelog.html +++ b/documentation/changelog.html @@ -2,6 +2,7 @@ Chamilo Changelog + diff --git a/documentation/credits.html b/documentation/credits.html index 8e12e294cb..9864741ef3 100755 --- a/documentation/credits.html +++ b/documentation/credits.html @@ -2,6 +2,7 @@ Chamilo Credits + diff --git a/documentation/dependencies.html b/documentation/dependencies.html index cc905fc877..e8708dd399 100755 --- a/documentation/dependencies.html +++ b/documentation/dependencies.html @@ -2,6 +2,7 @@ Chamilo Server Dependencies + diff --git a/documentation/index.html b/documentation/index.html index 0684011082..ae5e5d87c6 100755 --- a/documentation/index.html +++ b/documentation/index.html @@ -2,6 +2,7 @@ Chamilo + @@ -20,11 +21,11 @@ + @@ -46,13 +47,13 @@

Are you interested in translating the installation guide to your own language? The best way to proceed is to ask us on the Chamilo forum for the latest version – there may be updates to the guide since - this version was released – and send new translations off to the translation@chamilo.com email address. + this version was released – and send new translations off to the translation@chamilo.com email address.

- +
Valid XHTML 1.0 Transitional diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html index 2141b25677..9372ce9dc2 100755 --- a/documentation/installation_guide.html +++ b/documentation/installation_guide.html @@ -2,6 +2,7 @@ Chamilo Installation Guide + diff --git a/documentation/installation_guide_es_ES.html b/documentation/installation_guide_es_ES.html index 38f23f15d2..f2b122d89f 100755 --- a/documentation/installation_guide_es_ES.html +++ b/documentation/installation_guide_es_ES.html @@ -1,7 +1,8 @@ - Guia de Instalación de Chamilo 1.9 + Guia de Instalación de Chamilo 1.10 + diff --git a/documentation/installation_guide_fr_FR.html b/documentation/installation_guide_fr_FR.html index ba58a10a85..5b9a78b67a 100644 --- a/documentation/installation_guide_fr_FR.html +++ b/documentation/installation_guide_fr_FR.html @@ -2,6 +2,7 @@ Guide d'installation de Chamilo + diff --git a/documentation/installation_guide_it_IT.html b/documentation/installation_guide_it_IT.html index 6d1b04a028..d87148249d 100644 --- a/documentation/installation_guide_it_IT.html +++ b/documentation/installation_guide_it_IT.html @@ -2,6 +2,7 @@ Guida di installazione di Chamilo LMS + diff --git a/documentation/license.html b/documentation/license.html index 6a00c8f31a..412cccf56c 100755 --- a/documentation/license.html +++ b/documentation/license.html @@ -1,7 +1,8 @@ - + Chamilo License + @@ -20,22 +21,22 @@ + -
+

Chamilo License

@@ -118,7 +119,7 @@ modification follow.

“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.

- +

“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and @@ -559,7 +560,7 @@ covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.

- +

If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties diff --git a/documentation/migration-checklist.html b/documentation/migration-checklist.html index c2f7577939..a596432063 100755 --- a/documentation/migration-checklist.html +++ b/documentation/migration-checklist.html @@ -2,6 +2,7 @@ Chamilo Migration Checklist + diff --git a/documentation/optimization.html b/documentation/optimization.html index ea70f8fbed..1b771e8b08 100755 --- a/documentation/optimization.html +++ b/documentation/optimization.html @@ -2,6 +2,7 @@ Chamilo Optimization Guide + @@ -20,11 +21,11 @@

+
@@ -347,7 +348,7 @@ SetEnvIfNoCase Request_URI \ # Make sure proxies don't deliver the wrong content Header append Vary User-Agent env=!dont-vary - +
Don't have time or resources to optimize your Chamilo installation yourself? Hire an official Chamilo provider and get it sorted out professionally by specialists. diff --git a/documentation/readme.html b/documentation/readme.html index 4689141b6e..d258aaedd6 100755 --- a/documentation/readme.html +++ b/documentation/readme.html @@ -1,10 +1,11 @@ - Chamilo Information - - - + Chamilo Information + + + + - +
- + - +

About Chamilo

Chamilo is an e-learning and course management web application, and free software under the GNU/GPLv3+ license. It's translated into more 30 languages, SCORM compatible, light and flexible.

@@ -51,7 +52,7 @@ Administrators provide support to trainers and trainee

-

Technically, Chamilo is a web application written in PHP that stores data in a MySQL database. +

Technically, Chamilo is a web application written in PHP that stores data in a MySQL database. Users access it using a web browser. The first stable version of Chamilo, 1.8.6.2 Salto, was based on the Dokeos(TM) 1.8.6.1 code and is meant to be the next software step for institutions currently using Dokeos.

@@ -135,6 +136,6 @@ Mail: info@chamilo.org Valid CSS - + diff --git a/documentation/security.html b/documentation/security.html index a6480c9c89..2fb16e6818 100755 --- a/documentation/security.html +++ b/documentation/security.html @@ -2,6 +2,7 @@ Chamilo Security Guide + @@ -44,7 +45,7 @@ Subscribe to our free security alerts mailing-list: the latest stable version of Firefox.

4. Moving your configuration file out of the web directory

-

It is considered unsafe to leave the configuration file inside the main/inc/conf/ directory, as it will be directly accessible for all users, which could lead crackers to download it, uninterpreted, and read through your configuration, which could lead to illicit +

It is considered unsafe to leave the configuration file inside the main/inc/conf/ directory, as it will be directly accessible for all users, which could lead crackers to download it, uninterpreted, and read through your configuration, which could lead to illicit access to your database if that one isn't well protected and many other stuff we'd prefer to avoid. To secure it, move the configuration file out of your web directory. If your Chamilo installation is in /var/www/, move your configuration to /etc/chamilo/configuration.php, for example. Then create a new main/inc/conf/configuration.php file, open it, and write the following:

diff --git a/main/admin/group_add.php b/main/admin/group_add.php index 2468608821..ddfcb37fde 100755 --- a/main/admin/group_add.php +++ b/main/admin/group_add.php @@ -10,7 +10,7 @@ $language_file = array('admin', 'registration', 'userInfo'); $cidReset = true; // Including necessary libraries. -require '../inc/global.inc.php'; +require_once '../inc/global.inc.php'; $libpath = api_get_path(LIBRARY_PATH); // Section for the tabs @@ -96,7 +96,7 @@ $defaults['status'] = GROUP_PERMISSION_OPEN; $form->setDefaults($defaults); // Submit button -$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="add"'); +$form->addButtonCreate(get_lang('Add')); // Validate form if( $form->validate()) { diff --git a/main/admin/group_edit.php b/main/admin/group_edit.php index 3852c729d4..4528fcd0c5 100755 --- a/main/admin/group_edit.php +++ b/main/admin/group_edit.php @@ -86,7 +86,7 @@ $status[GROUP_PERMISSION_CLOSED] = get_lang('Closed'); $form->addElement('select', 'visibility', get_lang('GroupPermissions'), $status, array()); // Submit button -$form->addElement('style_submit_button', 'submit', get_lang('ModifyInformation'), 'class="save"'); +$form->addButtonUpdate(get_lang('ModifyInformation')); // Set default values $form->setDefaults($group_data); diff --git a/main/admin/group_list.php b/main/admin/group_list.php index d3f955d1fb..edc1a906f5 100755 --- a/main/admin/group_list.php +++ b/main/admin/group_list.php @@ -278,7 +278,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') { $active_group[] = $form->createElement('checkbox', 'keyword_active', '', get_lang('Active')); $active_group[] = $form->createElement('checkbox', 'keyword_inactive', '', get_lang('Inactive')); $form->addGroup($active_group, '', get_lang('ActiveAccount'), '
', false); - $form->addElement('style_submit_button', 'submit', get_lang('SearchUsers'), 'class="search"'); + $form->addButtonSearch(get_lang('SearchUsers')); $defaults['keyword_active'] = 1; $defaults['keyword_inactive'] = 1; $form->setDefaults($defaults); @@ -355,8 +355,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') { $renderer = & $form->defaultRenderer(); $renderer->setElementTemplate('{element} '); $form->addElement('text', 'keyword', get_lang('keyword')); - $form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="search"'); - //$form->addElement('static','search_advanced_link',null,''.get_lang('AdvancedSearch').''); + $form->addButtonSearch(get_lang('Search')); echo '

'; if (api_is_platform_admin()) { echo ''. diff --git a/main/course_description/add.php b/main/course_description/add.php index f426611ec2..85ab1c8e64 100755 --- a/main/course_description/add.php +++ b/main/course_description/add.php @@ -55,7 +55,7 @@ $form->addElement('hidden', 'sec_token',$token); $form->addText('title', get_lang('Title'), true, array('size'=>'width: 350px;')); $form->applyFilter('title','html_filter'); $form->addHtmlEditor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200')); -$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"'); +$form->addButtonCreate(get_lang('Save')); // display default questions if (isset ($question[$description_type])) { diff --git a/main/course_description/edit.php b/main/course_description/edit.php index 9d22f4dc0e..b0ef3378e1 100755 --- a/main/course_description/edit.php +++ b/main/course_description/edit.php @@ -59,7 +59,7 @@ $form->addElement('hidden', 'sec_token',$token); $form->addText('title', get_lang('Title'), true, array('size'=>'50')); $form->applyFilter('title','html_filter'); $form->addHtmlEditor('contentDescription', get_lang('Content'), true, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '200')); -$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"'); +$form->addButtonCreate(get_lang('Save')); // Set some default values if (!empty($description_title)) { diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php index 819f291cb0..9d2f0ea2d5 100755 --- a/main/course_info/infocours.php +++ b/main/course_info/infocours.php @@ -125,18 +125,18 @@ if (file_exists($course_path.'/course-pic85x85.png')) { } $form->addElement('html', $image_html); -$form->addText('title', get_lang('Title'), true, array('class' => 'span6')); +$form->addText('title', get_lang('Title'), true, array('class' => '')); $form->applyFilter('title', 'html_filter'); $form->applyFilter('title', 'trim'); $form->addElement('select', 'category_code', get_lang('Fac'), $categories, array('style'=>'width:350px', 'class'=>'chzn-select', 'id'=>'category_code')); $form->addElement('select_language', 'course_language', array(get_lang('Ln'), get_lang('TipLang'))); -$form->addText('department_name', get_lang('Department'), false, array('class' => 'span5')); +$form->addText('department_name', get_lang('Department'), false, array('class' => '')); $form->applyFilter('department_name', 'html_filter'); $form->applyFilter('department_name', 'trim'); -$form->addText('department_url', get_lang('DepartmentUrl'), false, array('class' => 'span5')); +$form->addText('department_url', get_lang('DepartmentUrl'), false, array('class' => '')); $form->applyFilter('department_url', 'html_filter'); // Picture @@ -163,7 +163,7 @@ $form->addGroup($group, '', array(get_lang("Stylesheets")), ''); $form->addElement('label', get_lang('DocumentQuota'), format_file_size(DocumentManager::get_course_quota())); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null,' '. get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', '
'); // COURSE ACCESS @@ -200,7 +200,7 @@ $form->addText('course_registration_password', get_lang('CourseRegistrationPassw $form->addElement('checkbox', 'activate_legal', array(null, get_lang('ShowALegalNoticeWhenEnteringTheCourse')), get_lang('ActivateLegal')); $form->addElement('textarea', 'legal', get_lang('CourseLegalAgreement'), array('class'=>'span6', 'rows' => 8)); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null, ' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); // Documents @@ -213,7 +213,7 @@ if (api_get_setting('documents_default_visibility_defined_in_course') == 'true') ); $form->addGroup($group, '', array(get_lang("DocumentsDefaultVisibility")), ''); - $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); + $form->addElement('style_submit_button', null,' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); } @@ -246,7 +246,7 @@ $group = array(); $group[]=$form->createElement('radio', 'email_alert_manager_on_new_quiz', get_lang('QuizEmailAlert'), get_lang('QuizEmailAlertActivate'), 1); $group[]=$form->createElement('radio', 'email_alert_manager_on_new_quiz', null, get_lang('QuizEmailAlertDeactivate'), 0); $form->addGroup($group, '', array(get_lang("QuizEmailAlert")), ''); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null, ' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); @@ -273,7 +273,7 @@ $group[]=$form->createElement('radio', 'allow_user_view_user_list', get_lang('Al $group[]=$form->createElement('radio', 'allow_user_view_user_list', null, get_lang('AllowUserViewUserListDeactivate'), 0); $form->addGroup($group, '', array(get_lang("AllowUserViewUserList")), ''); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null, ' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); // CHAT SETTINGS @@ -284,7 +284,7 @@ $group[]=$form->createElement('radio', 'allow_open_chat_window', get_lang('Allow $group[]=$form->createElement('radio', 'allow_open_chat_window', null, get_lang('AllowOpenChatWindowDeactivate'), 0); $form->addGroup($group, '', array(get_lang("AllowOpenchatWindow")), ''); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null,' '. get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); // LEARNING PATH @@ -327,7 +327,7 @@ if (isset($_configuration['allow_lp_return_link']) && $_configuration['allow_lp_ } if (is_settings_editable()) { - $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); + $form->addElement('style_submit_button', null, ' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); } else { // Is it allowed to edit the course settings? if (!is_settings_editable()) { @@ -347,7 +347,7 @@ $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', $group[]=$form->createElement('radio', 'display_info_advance_inside_homecourse', null, get_lang('DoNotDisplayAnyAdvance'), 0); $form->addGroup($group, '', array(get_lang("InfoAboutAdvanceInsideHomeCourse")), ''); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null,' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); // Document settings @@ -360,7 +360,7 @@ $group = array( ); $form->addGroup($group, '', array(get_lang("ShowSystemFolders")), ''); -$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); +$form->addElement('style_submit_button', null,' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); // Certificate settings @@ -371,7 +371,7 @@ if (api_get_setting('allow_public_certificates')=='true') { $group[]=$form->createElement('radio', 'allow_public_certificates', null, get_lang('No'), 0); $form->addGroup($group, '', array(get_lang("AllowPublicCertificates")), ''); - $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"'); + $form->addElement('style_submit_button', null,' '.get_lang('SaveSettings'), 'class="btn btn-primary"'); $form->addElement('html', ''); } @@ -529,6 +529,7 @@ echo ' diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php index b8e9035ad4..3dfd8bc9cf 100755 --- a/main/install/configuration.dist.php +++ b/main/install/configuration.dist.php @@ -301,3 +301,8 @@ $_configuration['system_stable'] = NEW_VERSION_STABLE; //$_configuration['prevent_session_admins_to_manage_all_users'] = false; // If there are any tool available and the user is not registered hide the group // $_configuration['hide_course_group_if_no_tools_available'] = false; + +// Attach a document to a work +// $_configuration['add_document_to_work'] = false; +// Allow user comments in work +// $_configuration['work_user_comments'] = false; diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 138cea2976..3eeccb6480 100755 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -885,7 +885,7 @@ VALUES ('tool_visible_by_default_at_creation','gradebook','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Gradebook', 1), ('prevent_session_admins_to_manage_all_users', NULL, 'radio', 'Session', 'false', 'PreventSessionAdminsToManageAllUsersTitle', 'PreventSessionAdminsToManageAllUsersComment', NULL, NULL, 1), ('documents_default_visibility_defined_in_course', NULL,'radio','Tools','false','DocumentsDefaultVisibilityDefinedInCourseTitle','DocumentsDefaultVisibilityDefinedInCourseComment',NULL, NULL, 1), -('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.18','DatabaseVersion','', NULL, NULL, 0); +('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.19','DatabaseVersion','', NULL, NULL, 0); UNLOCK TABLES; /*!40000 ALTER TABLE settings_current ENABLE KEYS */; @@ -3094,3 +3094,378 @@ CREATE TABLE session_field_options ( option_order INT, tms DATETIME ); + + +DROP TABLE IF EXISTS personal_agenda; +CREATE TABLE personal_agenda ( + id int NOT NULL auto_increment, + user int unsigned, + title text, + `text` text, + `date` datetime DEFAULT NULL, + enddate datetime DEFAULT NULL, + course varchar(255), + parent_event_id int NULL, + all_day int NOT NULL DEFAULT 0, + PRIMARY KEY id (id) +); + +DROP TABLE IF EXISTS personal_agenda_repeat; +CREATE TABLE personal_agenda_repeat ( + cal_id INT DEFAULT 0 NOT NULL, + cal_type VARCHAR(20), + cal_end INT, + cal_frequency INT DEFAULT 1, + cal_days CHAR(7), + PRIMARY KEY (cal_id) +); + +DROP TABLE IF EXISTS personal_agenda_repeat_not; +CREATE TABLE personal_agenda_repeat_not ( + cal_id INT NOT NULL, + cal_date INT NOT NULL, + PRIMARY KEY ( cal_id, cal_date ) +); + +DROP TABLE IF EXISTS user_course_category; +CREATE TABLE user_course_category ( + id int unsigned NOT NULL auto_increment, + user_id int unsigned NOT NULL default 0, + title text NOT NULL, + sort int, + PRIMARY KEY (id) +); + +ALTER TABLE personal_agenda ADD INDEX idx_personal_agenda_user (user); +ALTER TABLE personal_agenda ADD INDEX idx_personal_agenda_parent (parent_event_id); +ALTER TABLE user_course_category ADD INDEX idx_user_c_cat_uid (user_id); + +DROP TABLE IF EXISTS track_c_browsers; +CREATE TABLE track_c_browsers ( + id int NOT NULL auto_increment, + browser varchar(255) NOT NULL default '', + counter int NOT NULL default 0, + PRIMARY KEY (id) +); + +DROP TABLE IF EXISTS track_c_countries; +CREATE TABLE track_c_countries ( + id int NOT NULL auto_increment, + code varchar(40) NOT NULL default '', + country varchar(50) NOT NULL default '', + counter int NOT NULL default 0, + PRIMARY KEY (id) +); + +DROP TABLE IF EXISTS track_c_os; +CREATE TABLE track_c_os ( + id int NOT NULL auto_increment, + os varchar(255) NOT NULL default '', + counter int NOT NULL default 0, + PRIMARY KEY (id) +); + +DROP TABLE IF EXISTS track_c_providers; +CREATE TABLE track_c_providers ( + id int NOT NULL auto_increment, + provider varchar(255) NOT NULL default '', + counter int NOT NULL default 0, + PRIMARY KEY (id) +); + +DROP TABLE IF EXISTS track_c_referers; +CREATE TABLE track_c_referers ( + id int NOT NULL auto_increment, + referer varchar(255) NOT NULL default '', + counter int NOT NULL default 0, + PRIMARY KEY (id) +); + +DROP TABLE IF EXISTS track_e_access; +CREATE TABLE track_e_access ( + access_id int NOT NULL auto_increment, + access_user_id int unsigned default NULL, + access_date datetime NOT NULL default '0000-00-00 00:00:00', + c_id int not null, + access_tool varchar(30) default NULL, + access_session_id int NOT NULL default 0, + user_ip varchar(39) NOT NULL default '', + PRIMARY KEY (access_id), + KEY access_user_id (access_user_id), + KEY access_c_id (c_id) +); + +DROP TABLE IF EXISTS track_e_lastaccess; +CREATE TABLE track_e_lastaccess ( + access_id bigint NOT NULL auto_increment, + access_user_id int unsigned default NULL, + access_date datetime NOT NULL default '0000-00-00 00:00:00', + c_id int not null, + access_tool varchar(30) default NULL, + access_session_id int unsigned default NULL, + PRIMARY KEY (access_id), + KEY access_user_id (access_user_id), + KEY access_c_id (c_id), + KEY access_session_id (access_session_id) +); + +DROP TABLE IF EXISTS track_e_default; +CREATE TABLE track_e_default ( + default_id int NOT NULL auto_increment, + default_user_id int unsigned NOT NULL default 0, + c_id int not null, + default_date datetime NOT NULL default '0000-00-00 00:00:00', + default_event_type varchar(20) NOT NULL default '', + default_value_type varchar(20) NOT NULL default '', + default_value text NOT NULL, + PRIMARY KEY (default_id) +); + +DROP TABLE IF EXISTS track_e_downloads; +CREATE TABLE track_e_downloads ( + down_id int NOT NULL auto_increment, + down_user_id int unsigned default NULL, + down_date datetime NOT NULL default '0000-00-00 00:00:00', + c_id int NOT NULL, + down_doc_path varchar(255) NOT NULL default '', + down_session_id INT NOT NULL DEFAULT 0, + PRIMARY KEY (down_id), + KEY idx_ted_user_id (down_user_id), + KEY idx_ted_c_id (c_id) +); + +DROP TABLE IF EXISTS track_e_exercises; +CREATE TABLE track_e_exercises ( + exe_id int NOT NULL auto_increment, + exe_user_id int unsigned default NULL, + exe_date datetime NOT NULL default '0000-00-00 00:00:00', + c_id int NOT NULL, + exe_exo_id mediumint unsigned NOT NULL default 0, + exe_result float(6,2) NOT NULL default 0, + exe_weighting float(6,2) NOT NULL default 0, + user_ip varchar(39) NOT NULL default '', + PRIMARY KEY (exe_id), + KEY idx_tee_user_id (exe_user_id), + KEY idx_tee_c_id (c_id) +); + +ALTER TABLE track_e_exercises ADD status varchar(20) NOT NULL default ''; +ALTER TABLE track_e_exercises ADD data_tracking text NOT NULL default ''; +ALTER TABLE track_e_exercises ADD start_date datetime NOT NULL default '0000-00-00 00:00:00'; +ALTER TABLE track_e_exercises ADD steps_counter SMALLINT UNSIGNED NOT NULL default 0; +ALTER TABLE track_e_exercises ADD session_id SMALLINT UNSIGNED NOT NULL default 0; +ALTER TABLE track_e_exercises ADD INDEX ( session_id ) ; +ALTER TABLE track_e_exercises ADD orig_lp_id int NOT NULL default 0; +ALTER TABLE track_e_exercises ADD orig_lp_item_id int NOT NULL default 0; +ALTER TABLE track_e_exercises ADD exe_duration int UNSIGNED NOT NULL default 0; +ALTER TABLE track_e_exercises ADD COLUMN expired_time_control datetime NOT NULL DEFAULT '0000-00-00 00:00:00'; +ALTER TABLE track_e_exercises ADD COLUMN orig_lp_item_view_id INT NOT NULL DEFAULT 0; +ALTER TABLE track_e_exercises ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT ''; + +DROP TABLE IF EXISTS track_e_attempt; +CREATE TABLE track_e_attempt ( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + exe_id int default NULL, + user_id int NOT NULL default 0, + question_id int NOT NULL default 0, + answer text NOT NULL, + teacher_comment text NOT NULL, + marks float(6,2) NOT NULL default 0, + course_code varchar(40) NOT NULL default '', + c_id int NOT NULL, + position int default 0, + tms datetime NOT NULL default '0000-00-00 00:00:00', + session_id INT NOT NULL DEFAULT 0, + filename VARCHAR(255) DEFAULT NULL +); +ALTER TABLE track_e_attempt ADD INDEX (exe_id); +ALTER TABLE track_e_attempt ADD INDEX (user_id); +ALTER TABLE track_e_attempt ADD INDEX (question_id); +ALTER TABLE track_e_attempt ADD INDEX (session_id); + +DROP TABLE IF EXISTS track_e_attempt_recording; +CREATE TABLE track_e_attempt_recording ( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + exe_id int unsigned NOT NULL, + question_id int unsigned NOT NULL, + marks int NOT NULL, + insert_date datetime NOT NULL default '0000-00-00 00:00:00', + author int unsigned NOT NULL, + teacher_comment text NOT NULL, + session_id INT NOT NULL DEFAULT 0 +); +ALTER TABLE track_e_attempt_recording ADD INDEX (exe_id); +ALTER TABLE track_e_attempt_recording ADD INDEX (question_id); +ALTER TABLE track_e_attempt_recording ADD INDEX (session_id); + +DROP TABLE IF EXISTS track_e_hotpotatoes; +CREATE TABLE track_e_hotpotatoes ( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + exe_name VARCHAR( 255 ) NOT NULL , + exe_user_id int unsigned DEFAULT NULL , + exe_date DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL , + c_id int NOT NULL, + exe_result smallint default 0 NOT NULL , + exe_weighting smallint default 0 NOT NULL, + KEY idx_tehp_user_id (exe_user_id), + KEY idx_tehp_c_id (c_id) +); + +DROP TABLE IF EXISTS track_e_links; +CREATE TABLE track_e_links ( + links_id int NOT NULL auto_increment, + links_user_id int unsigned default NULL, + links_date datetime NOT NULL default '0000-00-00 00:00:00', + c_id int NOT NULL, + links_link_id int NOT NULL default 0, + links_session_id INT NOT NULL DEFAULT 0, + PRIMARY KEY (links_id), + KEY idx_tel_c_id (links_cours_id), + KEY idx_tel_user_id (links_user_id) +); + +DROP TABLE IF EXISTS track_e_login; +CREATE TABLE track_e_login ( + login_id int NOT NULL auto_increment, + login_user_id int unsigned NOT NULL default 0, + login_date datetime NOT NULL default '0000-00-00 00:00:00', + user_ip varchar(39) NOT NULL default '', + logout_date datetime NULL default NULL, + PRIMARY KEY (login_id), + KEY login_user_id (login_user_id) +); + +DROP TABLE IF EXISTS track_e_online; +CREATE TABLE track_e_online ( + login_id int NOT NULL auto_increment, + login_user_id int unsigned NOT NULL default 0, + login_date datetime NOT NULL default '0000-00-00 00:00:00', + user_ip varchar(39) NOT NULL default '', + c_id int NOT NULL, + session_id INT NOT NULL DEFAULT 0, + access_url_id INT NOT NULL DEFAULT 1, + PRIMARY KEY (login_id), + KEY login_user_id (login_user_id) +); +DROP TABLE IF EXISTS track_e_open; +CREATE TABLE track_e_open ( + open_id int NOT NULL auto_increment, + open_remote_host tinytext NOT NULL, + open_agent tinytext NOT NULL, + open_referer tinytext NOT NULL, + open_date datetime NOT NULL default '0000-00-00 00:00:00', + PRIMARY KEY (open_id) +); + +DROP TABLE IF EXISTS track_e_uploads; +CREATE TABLE track_e_uploads ( + upload_id int NOT NULL auto_increment, + upload_user_id int unsigned default NULL, + upload_date datetime NOT NULL default '0000-00-00 00:00:00', + upload_cours_id varchar(40) NOT NULL default '', + c_id int unsigned default NULL, + upload_work_id int NOT NULL default 0, + upload_session_id INT NOT NULL DEFAULT 0, + PRIMARY KEY (upload_id), + KEY upload_user_id (upload_user_id), + KEY upload_cours_id (upload_cours_id) +); + +DROP TABLE IF EXISTS track_e_course_access; +CREATE TABLE track_e_course_access ( + course_access_id int NOT NULL auto_increment, + c_id int NOT NULL, + user_id int NOT NULL, + login_course_date datetime NOT NULL default '0000-00-00 00:00:00', + logout_course_date datetime default NULL, + counter int NOT NULL, + session_id int NOT NULL default 0, + user_ip varchar(39) NOT NULL default '', + PRIMARY KEY (course_access_id) +); + +DROP TABLE IF EXISTS track_e_hotspot; +CREATE TABLE track_e_hotspot ( + hotspot_id int NOT NULL auto_increment, + hotspot_user_id int NOT NULL, + hotspot_course_code varchar(50) NOT NULL, + c_id int unsigned default NULL, + hotspot_exe_id int NOT NULL, + hotspot_question_id int NOT NULL, + hotspot_answer_id int NOT NULL, + hotspot_correct tinyint(3) unsigned NOT NULL, + hotspot_coordinate text NOT NULL, + PRIMARY KEY (hotspot_id), + KEY hotspot_course_code (hotspot_course_code), + KEY hotspot_user_id (hotspot_user_id), + KEY hotspot_exe_id (hotspot_exe_id), + KEY hotspot_question_id (hotspot_question_id) +); + +DROP TABLE IF EXISTS track_e_item_property; + +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_course_access ADD INDEX (user_id); +ALTER TABLE track_e_course_access ADD INDEX (login_course_date); +ALTER TABLE track_e_course_access ADD INDEX (session_id); +ALTER TABLE track_e_access ADD INDEX (access_session_id); + +ALTER TABLE track_e_online ADD INDEX (session_id); + +ALTER TABLE track_e_item_property ADD INDEX (course_id, item_property_id, session_id); +ALTER TABLE track_e_downloads ADD INDEX (down_session_id); +ALTER TABLE track_e_links ADD INDEX (links_session_id); +ALTER TABLE track_e_uploads ADD INDEX (upload_session_id); + +-- +-- Table structure for LP custom storage API +-- +DROP TABLE IF EXISTS track_stored_values; +CREATE TABLE IF NOT EXISTS track_stored_values ( + id int unsigned not null AUTO_INCREMENT PRIMARY KEY, + user_id INT NOT NULL, + sco_id INT NOT NULL, + course_id CHAR(40) NOT NULL, + sv_key CHAR(64) NOT NULL, + sv_value TEXT NOT NULL +); +ALTER TABLE track_stored_values ADD KEY (user_id, sco_id, course_id, sv_key); +ALTER TABLE track_stored_values ADD UNIQUE (user_id, sco_id, course_id, sv_key); + +DROP TABLE IF EXISTS track_stored_value_stack; +CREATE TABLE IF NOT EXISTS track_stored_values_stack ( + id int unsigned not null AUTO_INCREMENT PRIMARY KEY, + user_id INT NOT NULL, + sco_id INT NOT NULL, + stack_order INT NOT NULL, + course_id CHAR(40) NOT NULL, + sv_key CHAR(64) NOT NULL, + sv_value TEXT NOT NULL +); +ALTER TABLE track_stored_values_stack ADD KEY (user_id, sco_id, course_id, sv_key, stack_order); +ALTER TABLE track_stored_values_stack ADD UNIQUE (user_id, sco_id, course_id, sv_key, stack_order); + +DROP TABLE IF EXISTS track_e_attempt_coeff; +CREATE TABLE track_e_attempt_coeff ( + id int unsigned not null auto_increment primary key, + attempt_id INT NOT NULL, + marks_coeff float(6,2) +); + +-- Course + +CREATE TABLE IF NOT EXISTS c_student_publication_rel_document (id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, document_id INT NOT NULL, c_id INT NOT NULL); +CREATE TABLE IF NOT EXISTS c_student_publication_rel_user ( id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL); +CREATE TABLE IF NOT EXISTS c_student_publication_comment ( id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL); + diff --git a/main/install/db_stats.sql b/main/install/db_stats.sql deleted file mode 100755 index 72859b49ba..0000000000 --- a/main/install/db_stats.sql +++ /dev/null @@ -1,332 +0,0 @@ --- MySQL dump -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -DROP TABLE IF EXISTS track_c_browsers; -CREATE TABLE track_c_browsers ( - id int NOT NULL auto_increment, - browser varchar(255) NOT NULL default '', - counter int NOT NULL default 0, - PRIMARY KEY (id) -); - -DROP TABLE IF EXISTS track_c_countries; -CREATE TABLE track_c_countries ( - id int NOT NULL auto_increment, - code varchar(40) NOT NULL default '', - country varchar(50) NOT NULL default '', - counter int NOT NULL default 0, - PRIMARY KEY (id) -); - -DROP TABLE IF EXISTS track_c_os; -CREATE TABLE track_c_os ( - id int NOT NULL auto_increment, - os varchar(255) NOT NULL default '', - counter int NOT NULL default 0, - PRIMARY KEY (id) -); - -DROP TABLE IF EXISTS track_c_providers; -CREATE TABLE track_c_providers ( - id int NOT NULL auto_increment, - provider varchar(255) NOT NULL default '', - counter int NOT NULL default 0, - PRIMARY KEY (id) -); - -DROP TABLE IF EXISTS track_c_referers; -CREATE TABLE track_c_referers ( - id int NOT NULL auto_increment, - referer varchar(255) NOT NULL default '', - counter int NOT NULL default 0, - PRIMARY KEY (id) -); - -DROP TABLE IF EXISTS track_e_access; -CREATE TABLE track_e_access ( - access_id int NOT NULL auto_increment, - access_user_id int unsigned default NULL, - access_date datetime NOT NULL default '0000-00-00 00:00:00', - c_id int not null, - access_tool varchar(30) default NULL, - access_session_id int NOT NULL default 0, - user_ip varchar(39) NOT NULL default '', - PRIMARY KEY (access_id), - KEY access_user_id (access_user_id), - KEY access_c_id (c_id) -); - -DROP TABLE IF EXISTS track_e_lastaccess; -CREATE TABLE track_e_lastaccess ( - access_id bigint NOT NULL auto_increment, - access_user_id int unsigned default NULL, - access_date datetime NOT NULL default '0000-00-00 00:00:00', - c_id int not null, - access_tool varchar(30) default NULL, - access_session_id int unsigned default NULL, - PRIMARY KEY (access_id), - KEY access_user_id (access_user_id), - KEY access_c_id (c_id), - KEY access_session_id (access_session_id) -); - -DROP TABLE IF EXISTS track_e_default; -CREATE TABLE track_e_default ( - default_id int NOT NULL auto_increment, - default_user_id int unsigned NOT NULL default 0, - c_id int not null, - default_date datetime NOT NULL default '0000-00-00 00:00:00', - default_event_type varchar(20) NOT NULL default '', - default_value_type varchar(20) NOT NULL default '', - default_value text NOT NULL, - PRIMARY KEY (default_id) -); - -DROP TABLE IF EXISTS track_e_downloads; -CREATE TABLE track_e_downloads ( - down_id int NOT NULL auto_increment, - down_user_id int unsigned default NULL, - down_date datetime NOT NULL default '0000-00-00 00:00:00', - c_id int NOT NULL, - down_doc_path varchar(255) NOT NULL default '', - down_session_id INT NOT NULL DEFAULT 0, - PRIMARY KEY (down_id), - KEY idx_ted_user_id (down_user_id), - KEY idx_ted_c_id (c_id) -); - -DROP TABLE IF EXISTS track_e_exercises; -CREATE TABLE track_e_exercises ( - exe_id int NOT NULL auto_increment, - exe_user_id int unsigned default NULL, - exe_date datetime NOT NULL default '0000-00-00 00:00:00', - c_id int NOT NULL, - exe_exo_id mediumint unsigned NOT NULL default 0, - exe_result float(6,2) NOT NULL default 0, - exe_weighting float(6,2) NOT NULL default 0, - user_ip varchar(39) NOT NULL default '', - PRIMARY KEY (exe_id), - KEY idx_tee_user_id (exe_user_id), - KEY idx_tee_c_id (c_id) -); - -ALTER TABLE track_e_exercises ADD status varchar(20) NOT NULL default ''; -ALTER TABLE track_e_exercises ADD data_tracking text NOT NULL default ''; -ALTER TABLE track_e_exercises ADD start_date datetime NOT NULL default '0000-00-00 00:00:00'; -ALTER TABLE track_e_exercises ADD steps_counter SMALLINT UNSIGNED NOT NULL default 0; -ALTER TABLE track_e_exercises ADD session_id SMALLINT UNSIGNED NOT NULL default 0; -ALTER TABLE track_e_exercises ADD INDEX ( session_id ) ; -ALTER TABLE track_e_exercises ADD orig_lp_id int NOT NULL default 0; -ALTER TABLE track_e_exercises ADD orig_lp_item_id int NOT NULL default 0; -ALTER TABLE track_e_exercises ADD exe_duration int UNSIGNED NOT NULL default 0; -ALTER TABLE track_e_exercises ADD COLUMN expired_time_control datetime NOT NULL DEFAULT '0000-00-00 00:00:00'; -ALTER TABLE track_e_exercises ADD COLUMN orig_lp_item_view_id INT NOT NULL DEFAULT 0; -ALTER TABLE track_e_exercises ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT ''; - -DROP TABLE IF EXISTS track_e_attempt; -CREATE TABLE track_e_attempt ( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - exe_id int default NULL, - user_id int NOT NULL default 0, - question_id int NOT NULL default 0, - answer text NOT NULL, - teacher_comment text NOT NULL, - marks float(6,2) NOT NULL default 0, - course_code varchar(40) NOT NULL default '', - c_id int NOT NULL, - position int default 0, - tms datetime NOT NULL default '0000-00-00 00:00:00', - session_id INT NOT NULL DEFAULT 0, - filename VARCHAR(255) DEFAULT NULL -); -ALTER TABLE track_e_attempt ADD INDEX (exe_id); -ALTER TABLE track_e_attempt ADD INDEX (user_id); -ALTER TABLE track_e_attempt ADD INDEX (question_id); -ALTER TABLE track_e_attempt ADD INDEX (session_id); - -DROP TABLE IF EXISTS track_e_attempt_recording; -CREATE TABLE track_e_attempt_recording ( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - exe_id int unsigned NOT NULL, - question_id int unsigned NOT NULL, - marks int NOT NULL, - insert_date datetime NOT NULL default '0000-00-00 00:00:00', - author int unsigned NOT NULL, - teacher_comment text NOT NULL, - session_id INT NOT NULL DEFAULT 0 -); -ALTER TABLE track_e_attempt_recording ADD INDEX (exe_id); -ALTER TABLE track_e_attempt_recording ADD INDEX (question_id); -ALTER TABLE track_e_attempt_recording ADD INDEX (session_id); - -DROP TABLE IF EXISTS track_e_hotpotatoes; -CREATE TABLE track_e_hotpotatoes ( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - exe_name VARCHAR( 255 ) NOT NULL , - exe_user_id int unsigned DEFAULT NULL , - exe_date DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL , - c_id int NOT NULL, - exe_result smallint default 0 NOT NULL , - exe_weighting smallint default 0 NOT NULL, - KEY idx_tehp_user_id (exe_user_id), - KEY idx_tehp_c_id (c_id) -); - -DROP TABLE IF EXISTS track_e_links; -CREATE TABLE track_e_links ( - links_id int NOT NULL auto_increment, - links_user_id int unsigned default NULL, - links_date datetime NOT NULL default '0000-00-00 00:00:00', - c_id int NOT NULL, - links_link_id int NOT NULL default 0, - links_session_id INT NOT NULL DEFAULT 0, - PRIMARY KEY (links_id), - KEY idx_tel_c_id (links_cours_id), - KEY idx_tel_user_id (links_user_id) -); - -DROP TABLE IF EXISTS track_e_login; -CREATE TABLE track_e_login ( - login_id int NOT NULL auto_increment, - login_user_id int unsigned NOT NULL default 0, - login_date datetime NOT NULL default '0000-00-00 00:00:00', - user_ip varchar(39) NOT NULL default '', - logout_date datetime NULL default NULL, - PRIMARY KEY (login_id), - KEY login_user_id (login_user_id) -); - -DROP TABLE IF EXISTS track_e_online; -CREATE TABLE track_e_online ( - login_id int NOT NULL auto_increment, - login_user_id int unsigned NOT NULL default 0, - login_date datetime NOT NULL default '0000-00-00 00:00:00', - user_ip varchar(39) NOT NULL default '', - c_id int NOT NULL, - session_id INT NOT NULL DEFAULT 0, - access_url_id INT NOT NULL DEFAULT 1, - PRIMARY KEY (login_id), - KEY login_user_id (login_user_id) -); -DROP TABLE IF EXISTS track_e_open; -CREATE TABLE track_e_open ( - open_id int NOT NULL auto_increment, - open_remote_host tinytext NOT NULL, - open_agent tinytext NOT NULL, - open_referer tinytext NOT NULL, - open_date datetime NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (open_id) -); - -DROP TABLE IF EXISTS track_e_uploads; -CREATE TABLE track_e_uploads ( - upload_id int NOT NULL auto_increment, - upload_user_id int unsigned default NULL, - upload_date datetime NOT NULL default '0000-00-00 00:00:00', - upload_cours_id varchar(40) NOT NULL default '', - c_id int unsigned default NULL, - upload_work_id int NOT NULL default 0, - upload_session_id INT NOT NULL DEFAULT 0, - PRIMARY KEY (upload_id), - KEY upload_user_id (upload_user_id), - KEY upload_cours_id (upload_cours_id) -); - -DROP TABLE IF EXISTS track_e_course_access; -CREATE TABLE track_e_course_access ( - course_access_id int NOT NULL auto_increment, - c_id int NOT NULL, - user_id int NOT NULL, - login_course_date datetime NOT NULL default '0000-00-00 00:00:00', - logout_course_date datetime default NULL, - counter int NOT NULL, - session_id int NOT NULL default 0, - user_ip varchar(39) NOT NULL default '', - PRIMARY KEY (course_access_id) -); - -DROP TABLE IF EXISTS track_e_hotspot; -CREATE TABLE track_e_hotspot ( - hotspot_id int NOT NULL auto_increment, - hotspot_user_id int NOT NULL, - hotspot_course_code varchar(50) NOT NULL, - c_id int unsigned default NULL, - hotspot_exe_id int NOT NULL, - hotspot_question_id int NOT NULL, - hotspot_answer_id int NOT NULL, - hotspot_correct tinyint(3) unsigned NOT NULL, - hotspot_coordinate text NOT NULL, - PRIMARY KEY (hotspot_id), - KEY hotspot_course_code (hotspot_course_code), - KEY hotspot_user_id (hotspot_user_id), - KEY hotspot_exe_id (hotspot_exe_id), - KEY hotspot_question_id (hotspot_question_id) -); - -DROP TABLE IF EXISTS track_e_item_property; - -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_course_access ADD INDEX (user_id); -ALTER TABLE track_e_course_access ADD INDEX (login_course_date); -ALTER TABLE track_e_course_access ADD INDEX (session_id); -ALTER TABLE track_e_access ADD INDEX (access_session_id); - -ALTER TABLE track_e_online ADD INDEX (session_id); - -ALTER TABLE track_e_item_property ADD INDEX (course_id, item_property_id, session_id); -ALTER TABLE track_e_downloads ADD INDEX (down_session_id); -ALTER TABLE track_e_links ADD INDEX (links_session_id); -ALTER TABLE track_e_uploads ADD INDEX (upload_session_id); - --- --- Table structure for LP custom storage API --- -DROP TABLE IF EXISTS track_stored_values; -CREATE TABLE IF NOT EXISTS track_stored_values ( - id int unsigned not null AUTO_INCREMENT PRIMARY KEY, - user_id INT NOT NULL, - sco_id INT NOT NULL, - course_id CHAR(40) NOT NULL, - sv_key CHAR(64) NOT NULL, - sv_value TEXT NOT NULL -); -ALTER TABLE track_stored_values ADD KEY (user_id, sco_id, course_id, sv_key); -ALTER TABLE track_stored_values ADD UNIQUE (user_id, sco_id, course_id, sv_key); - -DROP TABLE IF EXISTS track_stored_value_stack; -CREATE TABLE IF NOT EXISTS track_stored_values_stack ( - id int unsigned not null AUTO_INCREMENT PRIMARY KEY, - user_id INT NOT NULL, - sco_id INT NOT NULL, - stack_order INT NOT NULL, - course_id CHAR(40) NOT NULL, - sv_key CHAR(64) NOT NULL, - sv_value TEXT NOT NULL -); -ALTER TABLE track_stored_values_stack ADD KEY (user_id, sco_id, course_id, sv_key, stack_order); -ALTER TABLE track_stored_values_stack ADD UNIQUE (user_id, sco_id, course_id, sv_key, stack_order); - -DROP TABLE IF EXISTS track_e_attempt_coeff; -CREATE TABLE track_e_attempt_coeff ( - id int unsigned not null auto_increment primary key, - attempt_id INT NOT NULL, - marks_coeff float(6,2) -); diff --git a/main/install/db_user.sql b/main/install/db_user.sql deleted file mode 100755 index 56d6021447..0000000000 --- a/main/install/db_user.sql +++ /dev/null @@ -1,53 +0,0 @@ --- MySQL dump -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -DROP TABLE IF EXISTS personal_agenda; -CREATE TABLE personal_agenda ( - id int NOT NULL auto_increment, - user int unsigned, - title text, - `text` text, - `date` datetime DEFAULT NULL, - enddate datetime DEFAULT NULL, - course varchar(255), - parent_event_id int NULL, - all_day int NOT NULL DEFAULT 0, - PRIMARY KEY id (id) -); - -DROP TABLE IF EXISTS personal_agenda_repeat; -CREATE TABLE personal_agenda_repeat ( - cal_id INT DEFAULT 0 NOT NULL, - cal_type VARCHAR(20), - cal_end INT, - cal_frequency INT DEFAULT 1, - cal_days CHAR(7), - PRIMARY KEY (cal_id) -); - -DROP TABLE IF EXISTS personal_agenda_repeat_not; -CREATE TABLE personal_agenda_repeat_not ( - cal_id INT NOT NULL, - cal_date INT NOT NULL, - PRIMARY KEY ( cal_id, cal_date ) -); - -DROP TABLE IF EXISTS user_course_category; -CREATE TABLE user_course_category ( - id int unsigned NOT NULL auto_increment, - user_id int unsigned NOT NULL default 0, - title text NOT NULL, - sort int, - PRIMARY KEY (id) -); - -ALTER TABLE personal_agenda ADD INDEX idx_personal_agenda_user (user); -ALTER TABLE personal_agenda ADD INDEX idx_personal_agenda_parent (parent_event_id); -ALTER TABLE user_course_category ADD INDEX idx_user_c_cat_uid (user_id); diff --git a/main/install/index.php b/main/install/index.php index dccc865918..5b5c84e302 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -13,14 +13,11 @@ * @todo (busy) organise code into functions * @package chamilo.install */ -/** - * Init - */ + /* CONSTANTS */ use \ChamiloSession as Session; - define('SYSTEM_INSTALLATION', 1); define('INSTALL_TYPE_UPDATE', 'update'); define('FORM_FIELD_DISPLAY_LENGTH', 40); @@ -314,7 +311,7 @@ if ($encryptPassForm == '1') { /*]]>*/ -