Browse Source

Updated installation scripts

Yannick Warnier 15 years ago
parent
commit
838883b143
3 changed files with 25 additions and 20 deletions
  1. 22 15
      main/install/dokeos_main.sql
  2. 1 1
      main/install/index.php
  3. 2 4
      main/install/migrate-db-1.8.6-1.8.6.1-pre.sql

+ 22 - 15
main/install/dokeos_main.sql

@@ -350,8 +350,10 @@ CREATE TABLE language (
   isocode varchar(10) default NULL,
   dokeos_folder varchar(250) default NULL,
   available tinyint NOT NULL default '1',
+  parent_id tinyint unsigned,
   PRIMARY KEY  (id)
 );
+ALTER TABLE language ADD INDEX idx_language_dokeos_folder(dokeos_folder);
 
 --
 -- Dumping data for table language
@@ -715,7 +717,12 @@ VALUES
 ('allow_message_tool', NULL, 'radio', 'Tools', 'false', 'AllowMessageToolTitle', 'AllowMessageToolComment', NULL, NULL,0),
 ('allow_social_tool', NULL, 'radio', 'Tools', 'false', 'AllowSocialToolTitle', 'AllowSocialToolComment', NULL, NULL, 0),
 ('allow_students_to_browse_courses',NULL,'radio','Platform','true','AllowStudentsToBrowseCoursesTitle','AllowStudentsToBrowseCoursesComment',NULL,NULL, 1),
-('dokeos_database_version', NULL, 'textfield', NULL,'1.8.6.1.7945','DokeosDatabaseVersion','',NULL,NULL,0); 
+('allow_use_sub_language', NULL, 'radio', 'Platform', 'false', 'AllowUseSubLanguageTitle', 'AllowUseSubLanguageComment', NULL, NULL,0),
+('show_glossary_in_documents', NULL, 'radio', 'Course', 'none', 'ShowGlossaryInDocumentsTitle', 'ShowGlossaryInDocumentsComment', NULL, NULL),
+('allow_terms_conditions', NULL, 'radio', 'Platform', 'false', 'AllowTermsAndConditionsTitle', 'AllowTermsAndConditionsComment', NULL, NULL,0),
+('show_tutor_data',NULL,'radio','Platform','true','ShowTutorDataTitle','ShowTutorDataComment',NULL,NULL, 1),
+('show_teacher_data',NULL,'radio','Platform','true','ShowTeacherDataTitle','ShowTeacherDataComment',NULL,NULL, 1),
+('dokeos_database_version', NULL, 'textfield', NULL,'1.8.6.1.8171','DokeosDatabaseVersion','',NULL,NULL,0); 
 UNLOCK TABLES;
 /*!40000 ALTER TABLE settings_current ENABLE KEYS */;
 
@@ -881,7 +888,18 @@ VALUES
 ('allow_students_to_browse_courses','true','Yes'),
 ('allow_students_to_browse_courses','false','No'),
 ('show_email_of_teacher_or_tutor ', 'true', 'Yes'),
-('show_email_of_teacher_or_tutor ', 'false', 'No');
+('show_email_of_teacher_or_tutor ', 'false', 'No'),
+('allow_use_sub_language', 'true', 'Yes'),
+('allow_use_sub_language', 'false', 'No'),
+('show_glossary_in_documents', 'none', 'ShowGlossaryInDocumentsIsNone'),
+('show_glossary_in_documents', 'ismanual', 'ShowGlossaryInDocumentsIsManual'),
+('show_glossary_in_documents', 'isautomatic', 'ShowGlossaryInDocumentsIsAutomatic'),
+('allow_terms_conditions', 'true', 'Yes'),
+('allow_terms_conditions', 'false', 'No'),
+('show_tutor_data','true','Yes'),
+('show_tutor_data','false','No'),
+('show_teacher_data','true','Yes'),
+('show_teacher_data','false','No');
 
 UNLOCK TABLES;
 
@@ -2081,13 +2099,13 @@ CREATE TABLE user_friend(
   user_id int unsigned not null,
   friend_user_id int unsigned not null,
   relation_type int not null default 0,
+  last_edit DATETIME,
   PRIMARY KEY(id)
 );
 
 ALTER TABLE user_friend ADD INDEX idx_user_friend_user (user_id);
 ALTER TABLE user_friend ADD INDEX idx_user_friend_friend_user(friend_user_id);
 ALTER TABLE user_friend ADD INDEX idx_user_friend_user_friend_user(user_id,friend_user_id);
-ALTER TABLE user_friend ADD COLUMN last_edit DATETIME;
 
 --
 -- Table structure for table user_friend_relation_type
@@ -2129,6 +2147,7 @@ ALTER TABLE message ADD INDEX idx_message_user_sender(user_sender_id);
 ALTER TABLE message ADD INDEX idx_message_user_receiver(user_receiver_id);
 ALTER TABLE message ADD INDEX idx_message_user_sender_user_receiver(user_sender_id,user_receiver_id);
 ALTER TABLE message ADD INDEX idx_message_msg_status(msg_status);
+
 INSERT INTO user_friend_relation_type (id,title)
 VALUES
 (1,'SocialUnknow'),
@@ -2137,15 +2156,6 @@ VALUES
 (4,'SocialGoodFriend'),
 (5,'SocialEnemy'),
 (6,'SocialDeleted');
-INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('allow_use_sub_language', NULL, 'radio', 'Platform', 'false', 'AllowUseSubLanguageTitle', 'AllowUseSubLanguageComment', NULL, NULL);
-INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_use_sub_language', 'true', 'Yes');
-INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_use_sub_language', 'false', 'No');
-ALTER TABLE language ADD COLUMN parent_id tinyint unsigned;
-ALTER TABLE language ADD INDEX idx_dokeos_folder(dokeos_folder);
-INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('show_glossary_in_documents', NULL, 'radio', 'Course', 'none', 'ShowGlossaryInDocumentsTitle', 'ShowGlossaryInDocumentsComment', NULL, NULL);
-INSERT INTO settings_options (variable, value, display_text) VALUES ('show_glossary_in_documents', 'none', 'ShowGlossaryInDocumentsIsNone');
-INSERT INTO settings_options (variable, value, display_text) VALUES ('show_glossary_in_documents', 'ismanual', 'ShowGlossaryInDocumentsIsManual');
-INSERT INTO settings_options (variable, value, display_text) VALUES ('show_glossary_in_documents', 'isautomatic', 'ShowGlossaryInDocumentsIsAutomatic');
 
 --
 -- Table structure for table legal (Terms & Conditions)
@@ -2164,7 +2174,4 @@ CREATE TABLE  legal (
 
 INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'legal_accept','Legal',0,0);
 
-INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('allow_terms_conditions', NULL, 'radio', 'Platform', 'false', 'AllowTermsAndConditionsTitle', 'AllowTermsAndConditionsComment', NULL, NULL);
-INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_terms_conditions', 'true', 'Yes');
-INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_terms_conditions', 'false', 'No');
 

+ 1 - 1
main/install/index.php

@@ -157,7 +157,7 @@ elseif(!empty($dokeos_version)) //variable coming from installedVersion, normall
 }
 
 $new_version = '1.8.6.1';
-$new_version_stable = false;
+$new_version_stable = true;
 $new_version_major = false;
 /*
 ==============================================================================

+ 2 - 4
main/install/migrate-db-1.8.6-1.8.6.1-pre.sql

@@ -21,20 +21,18 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_glossary_in_documents', 'none', 'ShowGlossaryInDocumentsIsNone');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_glossary_in_documents', 'ismanual', 'ShowGlossaryInDocumentsIsManual');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_glossary_in_documents', 'isautomatic', 'ShowGlossaryInDocumentsIsAutomatic');
-
 CREATE TABLE legal (legal_id int NOT NULL auto_increment, language_id int NOT NULL, date int NOT NULL default 0, content text, type int NOT NULL, changes text NOT NULL, version int, PRIMARY KEY (legal_id));
 INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'legal_accept','Legal',0,0);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('allow_terms_conditions', NULL, 'radio', 'Platform', 'false', 'AllowTermsAndConditionsTitle', 'AllowTermsAndConditionsComment', NULL, NULL);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_terms_conditions', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_terms_conditions', 'false', 'No');
-
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('show_tutor_data',NULL,'radio','Platform','true','ShowTutorDataTitle','ShowTutorDataComment',NULL,NULL, 1);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('show_teacher_data',NULL,'radio','Platform','true','ShowTeacherDataTitle','ShowTeacherDataComment',NULL,NULL, 1);
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_tutor_data','true','Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_tutor_data','false','No');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_teacher_data','true','Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('show_teacher_data','false','No');
-INSERT IGNORE INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('dokeos_database_version',NULL,'textfield',NULL,'1.8.6.1.7945','DokeosDatabaseVersion','',NULL,NULL,1,0);
+INSERT IGNORE INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('dokeos_database_version',NULL,'textfield',NULL,'1.8.6.1.8171','DokeosDatabaseVersion','',NULL,NULL,1,0);
 ALTER TABLE user_friend ADD COLUMN last_edit DATETIME;
 
 -- xxSTATSxx
@@ -44,4 +42,4 @@ ALTER TABLE user_friend ADD COLUMN last_edit DATETIME;
 -- xxCOURSExx
 ALTER TABLE wiki CHANGE title title varchar(255), CHANGE reflink reflink varchar(255), ADD time_edit datetime NOT NULL default '0000-00-00 00:00:00' AFTER is_editing, ADD INDEX (title), ADD INDEX (reflink), ADD INDEX (group_id), ADD INDEX (page_id);
 ALTER TABLE wiki_conf DROP id, ADD task text NOT NULL AFTER page_id, ADD fprogress3 varchar(3) NOT NULL AFTER feedback3, ADD fprogress2 varchar(3) NOT NULL AFTER feedback3, ADD fprogress1 varchar(3) NOT NULL AFTER feedback3, ADD INDEX(page_id);
-ALTER TABLE link ADD COLUMN target char(10) DEFAULT '_self';
+ALTER TABLE link ADD COLUMN target char(10) DEFAULT '_self';