diff --git a/main/install/migrate-db-1.8.5-1.8.6-pre.sql b/main/install/migrate-db-1.8.5-1.8.6-pre.sql
index 08f10a8c1a..83d89d1532 100644
--- a/main/install/migrate-db-1.8.5-1.8.6-pre.sql
+++ b/main/install/migrate-db-1.8.5-1.8.6-pre.sql
@@ -123,763 +123,6 @@ CREATE TABLE session_field (id int NOT NULL auto_increment, field_type int NOT N
CREATE TABLE session_field_values(id int NOT NULL auto_increment, session_id int NOT NULL, field_id int NOT NULL, field_value text, tms TIMESTAMP, PRIMARY KEY(id));
ALTER TABLE templates ADD image VARCHAR( 250 ) NOT NULL ;
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.19011','DokeosDatabaseVersion','',NULL,NULL,1,0);
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleCourseTitle', 'TemplateTitleCourseTitleDescription', 'coursetitle.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-
- TITULUS 1
- TITULUS 2
-
- |
-
-  |
-
-
-
-
-
-
-
-');
-
-
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleCheckList', 'TemplateTitleCheckListDescription', 'checklist.gif', '
-
- {CSS}
-
-
-
-
-
-
- Lorem ipsum dolor sit amet
-
- - consectetur adipisicing elit
- - sed do eiusmod tempor incididunt
- - ut labore et dolore magna aliqua
-
-
- Ut enim ad minim veniam
-
- - quis nostrud exercitation ullamco
- - laboris nisi ut aliquip ex ea commodo consequat
- - Excepteur sint occaecat cupidatat non proident
-
-
- Sed ut perspiciatis unde omnis
-
- - iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam
- - eaque ipsa quae ab illo inventore veritatis
- - et quasi architecto beatae vitae dicta sunt explicabo.
-
-
- |
-
- Ut enim ad minima
- Veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur.
-
- 
- |
-
-
-
-
-
-
-
-');
-
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleTeacher', 'TemplateTitleTeacherDescription', 'yourinstructor.gif', '
-
- {CSS}
-
-
-
-
-
-
- |
- |
- |
-
-
- |
-
-
-
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis pellentesque.
- |
-
-  |
-
-
-
-
-
-
-
-');
-
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleLeftList', 'TemplateTitleListLeftListDescription', 'leftlist.gif', '
-
- {CSS}
-
-
-
-
-
- |
- 
- |
-
-
- Lorem
- ipsum dolor sit amet.
- |
-
-
-
- Vivamus
- a quam.
- |
-
-
-
- Proin
- a est stibulum ante ipsum. |
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleLeftRightList', 'TemplateTitleLeftRightListDescription', 'leftrightlist.gif', '
-
-
- {CSS}
-
-
-
-
-
- |
- 
- |
- |
-
-
- Lorem
- ipsum dolor sit amet.
- |
-
- Convallis
- ut. Cras dui magna. |
-
-
-
- Vivamus
- a quam.
- |
-
- Etiam
- lacinia stibulum ante.
- |
-
-
-
- Proin
- a est stibulum ante ipsum. |
-
- Consectetuer
- adipiscing elit.
- |
-
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleRightList', 'TemplateTitleRightListDescription', 'rightlist.gif', '
-
- {CSS}
-
-
-
-
-
- 
- |
- |
-
-
-
- Convallis
- ut. Cras dui magna. |
-
-
-
- Etiam
- lacinia.
- |
-
-
-
- Consectetuer
- adipiscing elit.
- |
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleComparison', 'TemplateTitleComparisonDescription', 'compare.gif', '
-
- {CSS}
-
-
-
-
-
- |
- 
- |
- |
-
-
-
- Lorem ipsum dolor sit amet.
- |
-
- Convallis
- ut. Cras dui magna. |
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleDiagram', 'TemplateTitleDiagramDescription', 'diagram.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-
- Etiam
- lacinia stibulum ante.
- Convallis
- ut. Cras dui magna. |
-
-  |
-
-
-
-  |
-
-
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleDesc', 'TemplateTitleCheckListDescription', 'description.gif', '
-
- {CSS}
-
-
-
-
-
-
-  Lorem ipsum dolor sit amet
-
- Ut enim ad minim veniam
- Duis aute irure dolor in reprehenderit
- Neque porro quisquam est |
-
-
- 
|
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleObjectives', 'TemplateTitleObjectivesDescription', 'courseobjectives.gif', '
-
- {CSS}
-
-
-
-
-
-
-
- 
- |
- |
-
-
-
- Lorem ipsum dolor sit amet
-
- - consectetur adipisicing elit
- - sed do eiusmod tempor incididunt
- - ut labore et dolore magna aliqua
-
- Ut enim ad minim veniam
-
- - quis nostrud exercitation ullamco
- - laboris nisi ut aliquip ex ea commodo consequat
- - Excepteur sint occaecat cupidatat non proident
-
- |
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleCycle', 'TemplateTitleCycleDescription', 'cyclechart.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
- Lorem ipsum
- |
-
- |
-
- Sed ut perspiciatis
- |
-
-
-
-
- - dolor sit amet
- - consectetur adipisicing elit
- - sed do eiusmod tempor
- - adipisci velit, sed quia non numquam
- - eius modi tempora incidunt ut labore et dolore magnam
-
- |
- |
-
-
- - ut enim ad minim veniam
- - quis nostrud exercitation
- ullamco laboris nisi ut
- - Quis autem vel eum iure reprehenderit qui in ea
- - voluptate velit esse quam nihil molestiae consequatur,
-
- |
-
-
-
-
- |
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleLearnerWonder', 'TemplateTitleLearnerWonderDescription', 'learnerwonder.gif', '
-
- {CSS}
-
-
-
-
-
-
-
- 
- |
- |
-
-
-
- Convallis
- ut. Cras dui magna. |
-
-
-
- Etiam
- lacinia stibulum ante.
- |
-
-
-
- Consectetuer
- adipiscing elit.
- |
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleTimeline', 'TemplateTitleTimelineDescription', 'phasetimeline.gif', '
-
- {CSS}
-
-
-
-
-
-
-
- Lorem ipsum |
- |
- Perspiciatis |
- |
- Nemo enim |
-
-
-
-
-
- - dolor sit amet
- - consectetur
- - adipisicing elit
-
-
- |
-
-
- |
-
-
-
- - ut labore
- - et dolore
- - magni dolores
-
- |
-
-
- |
-
-
-
- - neque porro
- - quisquam est
- - qui dolorem
-
-
- |
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleStopAndThink', 'TemplateTitleStopAndThinkDescription', 'stopthink.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-
- |
- |
-
-
-
- Attentio sectetur adipisicing elit
-
- - sed do eiusmod tempor incididunt
- - ut labore et dolore magna aliqua
- - quis nostrud exercitation ullamco
-
|
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleTable', 'TemplateTitleCheckListDescription', 'table.gif', '
-
- {CSS}
-
-
-
-
-
- A table
-
-
-
- City |
- 2005 |
- 2006 |
- 2007 |
- 2008 |
-
-
- Lima |
- 10,40 |
- 8,95 |
- 9,19 |
- 9,76 |
-
-
- New York |
- 18,39 |
- 17,52 |
- 16,57 |
- 16,60 |
-
-
- Barcelona |
- 0,10 |
- 0,10 |
- 0,05 |
- 0,05 |
-
-
- Paris |
- 3,38 |
- 3,63 |
- 3,63 |
- 3,54 |
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleAudio', 'TemplateTitleAudioDescription', 'audiocomment.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleVideo', 'TemplateTitleVideoDescription', 'video.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-
-
- Get the Flash Player to see this player.
- url={REL_PATH}main/default_course_document/video/flv/example.flv width=400 height=200 loop=false play=false downloadable=false fullscreen=true displayNavigation=true displayDigits=true align=left dispPlaylist=none playlistThumbs=false
-
-
-
-
- |
-
-
-
- Lorem ipsum dolor sit amet
-
- - consectetur adipisicing elit
- - sed do eiusmod tempor incididunt
- - ut labore et dolore magna aliqua
-
- Ut enim ad minim veniam
-
- - quis nostrud exercitation ullamco
- - laboris nisi ut aliquip ex ea commodo consequat
- - Excepteur sint occaecat cupidatat non proident
-
- |
-
-
-
-
-
-
-
-
-');
-
-INSERT INTO system_template (title, comment, image, content) VALUES
-('TemplateTitleFlash', 'TemplateTitleFlashDescription', 'flash.gif', '
-
- {CSS}
-
-
-
-
-
-
-
-
-
-');
-
-
-- xxSTATSxx
diff --git a/main/install/update-db-1.8.5-1.8.6.inc.php b/main/install/update-db-1.8.5-1.8.6.inc.php
index cffb172210..a652d00f82 100644
--- a/main/install/update-db-1.8.5-1.8.6.inc.php
+++ b/main/install/update-db-1.8.5-1.8.6.inc.php
@@ -1,4 +1,4 @@
-
+ {CSS}
+
+
+
+
+
+
+
+
+ TITULUS 1
+ TITULUS 2
+
+ |
+
+  |
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleCheckList\', \'TemplateTitleCheckListDescription\', \'checklist.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+ Lorem ipsum dolor sit amet
+
+ - consectetur adipisicing elit
+ - sed do eiusmod tempor incididunt
+ - ut labore et dolore magna aliqua
+
+
+ Ut enim ad minim veniam
+
+ - quis nostrud exercitation ullamco
+ - laboris nisi ut aliquip ex ea commodo consequat
+ - Excepteur sint occaecat cupidatat non proident
+
+
+ Sed ut perspiciatis unde omnis
+
+ - iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam
+ - eaque ipsa quae ab illo inventore veritatis
+ - et quasi architecto beatae vitae dicta sunt explicabo.
+
+
+ |
+
+ Ut enim ad minima
+ Veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur.
+
+ 
+ |
+
+
+
+
+
+
+
+ \');';
+
+
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleTeacher\', \'TemplateTitleTeacherDescription\', \'yourinstructor.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+ |
+ |
+ |
+
+
+ |
+
+
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis pellentesque.
+ |
+
+  |
+
+
+
+
+
+
+
+ \');
+ ';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleLeftList\', \'TemplateTitleListLeftListDescription\', \'leftlist.gif\', \'
+
+ {CSS}
+
+
+
+
+
+ |
+ 
+ |
+
+
+ Lorem
+ ipsum dolor sit amet.
+ |
+
+
+
+ Vivamus
+ a quam.
+ |
+
+
+
+ Proin
+ a est stibulum ante ipsum. |
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleLeftRightList\', \'TemplateTitleLeftRightListDescription\', \'leftrightlist.gif\', \'
+
+
+ {CSS}
+
+
+
+
+
+ |
+ 
+ |
+ |
+
+
+ Lorem
+ ipsum dolor sit amet.
+ |
+
+ Convallis
+ ut. Cras dui magna. |
+
+
+
+ Vivamus
+ a quam.
+ |
+
+ Etiam
+ lacinia stibulum ante.
+ |
+
+
+
+ Proin
+ a est stibulum ante ipsum. |
+
+ Consectetuer
+ adipiscing elit.
+ |
+
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleRightList\', \'TemplateTitleRightListDescription\', \'rightlist.gif\', \'
+
+ {CSS}
+
+
+
+
+
+ 
+ |
+ |
+
+
+
+ Convallis
+ ut. Cras dui magna. |
+
+
+
+ Etiam
+ lacinia.
+ |
+
+
+
+ Consectetuer
+ adipiscing elit.
+ |
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleComparison\', \'TemplateTitleComparisonDescription\', \'compare.gif\', \'
+
+ {CSS}
+
+
+
+
+
+ |
+ 
+ |
+ |
+
+
+
+ Lorem ipsum dolor sit amet.
+ |
+
+ Convallis
+ ut. Cras dui magna. |
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleDiagram\', \'TemplateTitleDiagramDescription\', \'diagram.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+
+ Etiam
+ lacinia stibulum ante.
+ Convallis
+ ut. Cras dui magna. |
+
+  |
+
+
+
+  |
+
+
+
+
+
+
+
+
+
+ \');
+ ';
+ $res = mysql_query($sql);
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleDesc\', \'TemplateTitleCheckListDescription\', \'description.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+  Lorem ipsum dolor sit amet
+
+ Ut enim ad minim veniam
+ Duis aute irure dolor in reprehenderit
+ Neque porro quisquam est |
+
+
+ 
|
+
+
+
+
+
+
+
+ \');
+ ';
+ $res = mysql_query($sql);
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleObjectives\', \'TemplateTitleObjectivesDescription\', \'courseobjectives.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+ 
+ |
+ |
+
+
+
+ Lorem ipsum dolor sit amet
+
+ - consectetur adipisicing elit
+ - sed do eiusmod tempor incididunt
+ - ut labore et dolore magna aliqua
+
+ Ut enim ad minim veniam
+
+ - quis nostrud exercitation ullamco
+ - laboris nisi ut aliquip ex ea commodo consequat
+ - Excepteur sint occaecat cupidatat non proident
+
+ |
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleCycle\', \'TemplateTitleCycleDescription\', \'cyclechart.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+ Lorem ipsum
+ |
+
+ |
+
+ Sed ut perspiciatis
+ |
+
+
+
+
+ - dolor sit amet
+ - consectetur adipisicing elit
+ - sed do eiusmod tempor
+ - adipisci velit, sed quia non numquam
+ - eius modi tempora incidunt ut labore et dolore magnam
+
+ |
+ |
+
+
+ - ut enim ad minim veniam
+ - quis nostrud exercitation
- ullamco laboris nisi ut
+ - Quis autem vel eum iure reprehenderit qui in ea
+ - voluptate velit esse quam nihil molestiae consequatur,
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleLearnerWonder\', \'TemplateTitleLearnerWonderDescription\', \'learnerwonder.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+ 
+ |
+ |
+
+
+
+ Convallis
+ ut. Cras dui magna. |
+
+
+
+ Etiam
+ lacinia stibulum ante.
+ |
+
+
+
+ Consectetuer
+ adipiscing elit.
+ |
+
+
+
+
+
+
+
+ \');
+ ';
+ $res = mysql_query($sql);
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleTimeline\', \'TemplateTitleTimelineDescription\', \'phasetimeline.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+ Lorem ipsum |
+ |
+ Perspiciatis |
+ |
+ Nemo enim |
+
+
+
+
+
+ - dolor sit amet
+ - consectetur
+ - adipisicing elit
+
+
+ |
+
+
+ |
+
+
+
+ - ut labore
+ - et dolore
+ - magni dolores
+
+ |
+
+
+ |
+
+
+
+ - neque porro
+ - quisquam est
+ - qui dolorem
+
+
+ |
+
+
+
+
+
+
+
+ \');
+ ';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleStopAndThink\', \'TemplateTitleStopAndThinkDescription\', \'stopthink.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+ Attentio sectetur adipisicing elit
+
+ - sed do eiusmod tempor incididunt
+ - ut labore et dolore magna aliqua
+ - quis nostrud exercitation ullamco
+
|
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleTable\', \'TemplateTitleCheckListDescription\', \'table.gif\', \'
+
+ {CSS}
+
+
+
+
+
+ A table
+
+
+
+ City |
+ 2005 |
+ 2006 |
+ 2007 |
+ 2008 |
+
+
+ Lima |
+ 10,40 |
+ 8,95 |
+ 9,19 |
+ 9,76 |
+
+
+ New York |
+ 18,39 |
+ 17,52 |
+ 16,57 |
+ 16,60 |
+
+
+ Barcelona |
+ 0,10 |
+ 0,10 |
+ 0,05 |
+ 0,05 |
+
+
+ Paris |
+ 3,38 |
+ 3,63 |
+ 3,63 |
+ 3,54 |
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleAudio\', \'TemplateTitleAudioDescription\', \'audiocomment.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+ \');';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleVideo\', \'TemplateTitleVideoDescription\', \'video.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+
+
+ Get the Flash Player to see this player.
+ url={REL_PATH}main/default_course_document/video/flv/example.flv width=400 height=200 loop=false play=false downloadable=false fullscreen=true displayNavigation=true displayDigits=true align=left dispPlaylist=none playlistThumbs=false
+
+
+
+
+ |
+
+
+
+ Lorem ipsum dolor sit amet
+
+ - consectetur adipisicing elit
+ - sed do eiusmod tempor incididunt
+ - ut labore et dolore magna aliqua
+
+ Ut enim ad minim veniam
+
+ - quis nostrud exercitation ullamco
+ - laboris nisi ut aliquip ex ea commodo consequat
+ - Excepteur sint occaecat cupidatat non proident
+
+ |
+
+
+
+
+
+
+
+
+ \'); ';
+ $res = mysql_query($sql);
+
+ $sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
+ (\'TemplateTitleFlash\', \'TemplateTitleFlashDescription\', \'flash.gif\', \'
+
+ {CSS}
+
+
+
+
+
+
+
+
+
+ \'); ';
+ $res = mysql_query($sql);
+
+
+
+
+
- // Check if course_module exists, as it was not installed in Dokeos 1.8.5 because of a broken query, and insert it if necessary
+ // Check if course_module exists, as it was not installed in Dokeos 1.8.5 because of a broken query, and $sql = 'INSERT it if necessary
$query = "SELECT * FROM $dbNameForm.course_module";
$result = mysql_query($query);
if ($result === false) {