From 3896a7f05d27c569df20329ef5827d012055a0ff Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Wed, 18 Mar 2015 17:13:08 -0500
Subject: [PATCH 01/23] Add missing configuration parameters - refs #4507

---
 main/inc/conf/configuration.dist.php | 205 +++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 main/inc/conf/configuration.dist.php

diff --git a/main/inc/conf/configuration.dist.php b/main/inc/conf/configuration.dist.php
new file mode 100644
index 0000000000..0a6cfdbb50
--- /dev/null
+++ b/main/inc/conf/configuration.dist.php
@@ -0,0 +1,205 @@
+<?php
+// Chamilo version 1.9.8
+// File generated by /install/index.php script - Thu, 21 Aug 2014 14:45:02 -0500
+/* For licensing terms, see /license.txt */
+/**
+ * Campus configuration
+ *
+ * This file contains a list of variables that can be modified by the campus
+ * site's server administrator. Pay attention when changing these variables,
+ * some changes may cause Chamilo to stop working.
+ * If you changed some settings and want to restore them, please have a look at
+ * configuration.dist.php. That file is an exact copy of the config file at
+ * install time.
+ */
+
+/**
+ * $_configuration define only the bare essential variables
+ * for configuring the platform (paths, database connections, ...).
+ * Changing a $_configuration variable CAN generally break the installation.
+ * Besides the $_configuration, a $_settings array also exists, that
+ * contains variables that can be changed and will not break the platform.
+ * These optional settings are defined in the database, now
+ * (table settings_current).
+ * example: $_configuration['tracking_enabled'] (assuming that the install
+ * script creates the necessary tables anyway).
+ */
+
+/**
+ * MYSQL connection settings
+ */
+// Your MySQL server
+$_configuration['db_host']     = 'localhost';
+// Your MySQL username
+$_configuration['db_user']     = 'root';
+// Your MySQL password
+$_configuration['db_password'] = 'yannoo';
+
+/**
+ * Database settings
+ */
+// Is tracking enabled?
+$_configuration['tracking_enabled']      = true;
+// Is single database enabled (DO NOT MODIFY THIS)
+$_configuration['single_database']       = false;
+// Prefix for course tables (IF NOT EMPTY, can be replaced by another prefix, else leave empty)
+$_configuration['table_prefix']          = '';
+// Separator between database and table name (DO NOT MODIFY THIS)
+$_configuration['db_glue']               = '`.`';
+// prefix all created bases (for courses) with this string
+$_configuration['db_prefix']             = '';
+// main Chamilo database
+$_configuration['main_database']         = 'chamilo198';
+// stats Chamilo database
+$_configuration['statistics_database']   ='chamilo198';
+// User Personal Database (where all the personal stuff of the user is stored
+// (personal agenda items, course sorting)
+$_configuration['user_personal_database']='chamilo198';
+// Enable access to database management for platform admins.
+$_configuration['db_manager_enabled'] = false;
+
+/**
+ * Directory settings
+ */
+// URL to the root of your Chamilo installation, e.g.: http://www.mychamilo.com/
+$_configuration['root_web']       = 'http://chamilo19x/';
+
+// Path to the webroot of system, example: /var/www/
+$_configuration['root_sys']       = '/var/www/chamilo19x/';
+
+// Path from your WWW-root to the root of your Chamilo installation, example: chamilo (this means chamilo is installed in /var/www/chamilo/
+$_configuration['url_append']     = '';
+
+// Directory of the Chamilo code. You could change this but it is not advised since this has not been tested yet.
+$_configuration['code_append']    = "main/";
+
+// Directory to store all course-related files. You could change this but it is not advised since this has not been tested yet.
+$_configuration['course_folder']  = "courses/";
+
+// URL to your phpMyAdmin installation.
+// If not empty, a link will be available in the Platform Administration
+$_configuration['db_admin_path']  = '';
+
+/**
+ * Login modules settings
+ */
+// CAS IMPLEMENTATION
+// -> Go to your portal Chamilo > Administration > CAS to activate CAS
+// You can leave these lines uncommented even if you don't use CAS authentification
+$extAuthSource["cas"]["login"] = $_configuration['root_sys'].$_configuration['code_append']."auth/cas/login.php";
+$extAuthSource["cas"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/cas/newUser.php";
+//
+// NEW LDAP IMPLEMENTATION BASED ON external_login info
+// -> Uncomment the two lines bellow to activate LDAP AND edit main/auth/external_login/ldap.conf.php for configuration
+// $extAuthSource["extldap"]["login"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/login.ldap.php";
+// $extAuthSource["extldap"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/newUser.ldap.php";
+//
+// FACEBOOK IMPLEMENTATION BASED ON external_login info
+// -> Uncomment the line bellow to activate Facebook Auth AND edit main/auth/external_login/ldap.conf.php for configuration
+// $_configuration['facebook_auth'] = 1;
+//
+// OTHER EXTERNAL LOGIN INFORMATION
+// To fetch external login information, uncomment those 2 lines and modify  files auth/external_login/newUser.php and auth/external_login/updateUser.php files
+// $extAuthSource["external_login"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/newUser.php";
+// $extAuthSource["external_login"]["updateUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/updateUser.php";
+
+/**
+ *
+ * Hosting settings - Allows you to set limits to the Chamilo portal when
+ * hosting it for a third party. These settings can be overwritten by an
+ * optionally-loaded extension file with only the settings (no comments).
+ * The settings use an index at the first level to represent the ID of the
+ * URL in case you use multi-url (otherwise it will always use 1, which is
+ * the ID of the only URL inside the access_url table).
+ */
+// Set a maximum number of users. Default (0) = no limit
+$_configuration[1]['hosting_limit_users'] = 0;
+// Set a maximum number of teachers. Default (0) = no limit
+$_configuration[1]['hosting_limit_teachers'] = 0;
+// Set a maximum number of courses. Default (0) = no limit
+$_configuration[1]['hosting_limit_courses'] = 0;
+// Set a maximum number of sessions. Default (0) = no limit
+$_configuration[1]['hosting_limit_sessions'] = 0;
+// Set a maximum disk space used, in MB (set to 1024 for 1GB, 5120 for 5GB).
+// Default (0) = no limit
+$_configuration[1]['hosting_limit_disk_space'] = 0;
+
+/**
+ * Content Delivery Network (CDN) settings. Only use if you need a separate
+ * server to serve your static data. If you don't know what a CDN is, you
+ * don't need it. These settings are for simple Origin Pull CDNs and are
+ * experimental. Enable only if you really know what you're doing.
+ * This might conflict with multiple-access urls.
+ */
+// Set the following setting to true to start using the CDN
+$_configuration['cdn_enable'] = false;
+// The following setting will be ignored if the previous one is set to false
+$_configuration['cdn'] = array(
+  //You can define several CDNs and split them by extensions
+  //Replace the following by your full CDN URL, which should point to
+  // your Chamilo's root directory. DO NOT INCLUDE a final slash! (won't work)
+  'http://cdn.chamilo.org' => array('.css','.js','.jpg','.jpeg','.png','.gif','.avi','.flv'),
+  // copy the line above and modify following your needs
+);
+
+/**
+ * Misc. settings
+ */
+// Verbose backup
+$_configuration['verbose_backup']    = false;
+// security word for password recovery
+$_configuration['security_key']      = 'adbeb884dffd2cb44d7ea5c2f49fc5c0';
+// Hash function method
+$_configuration['password_encryption']      = 'sha1';
+// You may have to restart your web server if you change this
+$_configuration['session_stored_in_db']     = false;
+// Session lifetime
+$_configuration['session_lifetime']  = 360000;
+// Activation for multi-url access
+//$_configuration['multiple_access_urls']					= true;
+$_configuration['software_name']     = 'Chamilo';
+$_configuration['software_url']	     = 'http://www.chamilo.org/';
+//Deny the elimination of users
+$_configuration['deny_delete_users'] = false;
+// Version settings
+$_configuration['system_version']    = '1.9.8';
+$_configuration['system_stable']     = true;
+
+/**
+ * Settings to be included as settings_current in future versions
+ */
+// Hide the main home section for connected users (to show announcements instead)
+//$_configuration['hide_home_top_when_connected'] = true;
+// Hide the global announcements for non-connected users
+//$_configuration['hide_global_announcements_when_not_connected'] = true;
+// Use this course as template for all new courses (define course real ID as value)
+//$_configuration['course_creation_use_template'] = 14;
+// Uncomment the following to prevent all admins to use the "login as" feature
+//$_configuration['login_as_forbidden_globally'] = true;
+// Add password strength checker
+//$_configuration['allow_strength_pass_checker'] = true;
+// Enable captcha
+//$_configuration['enable_captcha'] = true;
+//$_configuration['allow_captcha'] = true;
+// Prevent account from logging in for a certain amount of time if captcha is wrong for the specified number of times
+//$_configuration['captcha_number_mistakes_to_block_account'] = 5;
+// Prevent account from logging in for the specified number of minutes
+//$_configuration['captcha_time_to_block'] = 5;//minutes
+// Allow DRH role to access all content and users from the sessions he follows
+//$_configuration['drh_can_access_all_session_content'] = true;
+// Display group's forum in general forum tool
+//$_configuration['display_groups_forum_in_general_tool'] = true;
+// Boost query on last connection time
+//$_configuration['save_user_last_login'] = true;
+// Allow course tutors in sessions to add existing students to their session
+//$_configuration['allow_tutors_to_assign_students_to_session'] = 'false';
+// Allow select the return link in the LP view
+//$_configuration['allow_lp_return_link'] = false;
+// If true the export link is blocked.
+//$_configuration['hide_scorm_export_link'] = false;
+// If true the copy link is blocked.
+//$_configuration['hide_scorm_copy_link'] = false;
+// Enable Gravatar profile image if no local image has been given
+//$_configuration['gravatar_enabled'] = true;
+// If Gravatar is enabled, tells which type of picture we want (default is "mm"). Options: mm | identicon | monsterid | wavatar
+//$_configuration['gravatar_type'] = 'mm';

From e11305b247f7f33e2a00aa55757754d8c4a86690 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 08:20:35 +0100
Subject: [PATCH 02/23] Fix login.

---
 main/inc/lib/api.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index f30444e560..5d32250209 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -3304,10 +3304,10 @@ function api_not_allowed($print_headers = false, $message = null)
         // If the user has no user ID, then his session has expired
         $action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
         $action = str_replace('&amp;', '&', $action);
-        $form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked'));
-        $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'span3 autocapitalize_off')); //new
-        $form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'span3')); //new
-        $form->addElement('style_submit_button', 'submitAuth', get_lang('LoginEnter'), array('class' => 'btn span3'));
+        $form = new FormValidator('formLogin', 'post', $action, null, array(), FormValidator::LAYOUT_BOX_NO_LABEL);
+        $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'autocapitalize_off'));
+        $form->addElement('password', 'password', null, array('placeholder' => get_lang('Password')));
+        $form->addButton('submitAuth', get_lang('LoginEnter'), '', 'primary');
 
         // see same text in auth/gotocourse.php and main_api.lib.php function api_not_allowed (above)
         $content = Display::return_message(get_lang('NotAllowed'), 'error', false);

From a8832fb987b0e7af451bb2005980591edf0d4e48 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 09:32:28 +0100
Subject: [PATCH 03/23] Minor - format code.

---
 main/inc/lib/formvalidator/FormValidator.class.php |  4 ++--
 main/inc/lib/message.lib.php                       | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 9050abc388..306b07c6a3 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -578,12 +578,12 @@ EOT;
     /**
      * @param string $name
      * @param string $label
-     * @param string $options
+     * @param array $options
      * @param array  $attributes
      *
      * @return HTML_QuickForm_select
      */
-    public function addSelect($name, $label, $options = '', $attributes = array())
+    public function addSelect($name, $label, $options = array(), $attributes = array())
     {
         return $this->addElement('select', $name, $label, $options, $attributes);
     }
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index d9334c8bbc..8f598b79eb 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1329,8 +1329,8 @@ class MessageManager
 
     /**
      * Get array of links (download) for message attachment files
-     * @param int  		message id
-     * @param string	type message list (inbox/outbox)
+     * @param int  		$message_id
+     * @param string	$type message list (inbox/outbox)
      * @return array
      */
     public static function get_links_message_attachment_files($message_id, $type = '')
@@ -1342,7 +1342,8 @@ class MessageManager
         $links_attach_file = array();
         if (!empty($message_id)) {
 
-            $sql = "SELECT * FROM $tbl_message_attach WHERE message_id = '$message_id'";
+            $sql = "SELECT * FROM $tbl_message_attach
+                    WHERE message_id = '$message_id'";
 
             $rs_file = Database::query($sql);
             if (Database::num_rows($rs_file) > 0) {
@@ -1363,14 +1364,15 @@ class MessageManager
 
     /**
      * Get message list by id
-     * @param int  message id
+     * @param int  $message_id
      * @return array
      */
     public static function get_message_by_id($message_id)
     {
         $tbl_message = Database::get_main_table(TABLE_MESSAGE);
         $message_id = intval($message_id);
-        $sql = "SELECT * FROM $tbl_message WHERE id = '$message_id' AND msg_status <> '".MESSAGE_STATUS_DELETED."' ";
+        $sql = "SELECT * FROM $tbl_message
+                WHERE id = '$message_id' AND msg_status <> '".MESSAGE_STATUS_DELETED."' ";
         $res = Database::query($sql);
         $item = array();
         if (Database::num_rows($res) > 0) {

From bfafc94c4ebcccdc288c5690df4804d1d1db348d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 09:45:28 +0100
Subject: [PATCH 04/23] Fix search form.

---
 main/inc/lib/usermanager.lib.php        | 104 +++++++++++++++++-------
 main/social/search.php                  |  32 ++++----
 main/template/default/social/search.tpl |  22 ++---
 3 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index ad24822037..1e7b129af4 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -1770,7 +1770,16 @@ class UserManager
         $fields = array();
         $t_uf = Database :: get_main_table(TABLE_MAIN_USER_FIELD);
         $t_ufo = Database :: get_main_table(TABLE_MAIN_USER_FIELD_OPTIONS);
-        $columns = array('id', 'field_variable', 'field_type', 'field_display_text', 'field_default_value', 'field_order', 'field_filter', 'tms');
+        $columns = array(
+            'id',
+            'field_variable',
+            'field_type',
+            'field_display_text',
+            'field_default_value',
+            'field_order',
+            'field_filter',
+            'tms'
+        );
         $column = intval($column);
         $sort_direction = '';
         if (in_array(strtoupper($direction), array('ASC', 'DESC'))) {
@@ -1809,7 +1818,9 @@ class UserManager
                     10 => '<a name="'.$rowf['id'].'"></a>',
                 );
 
-                $sqlo = "SELECT * FROM $t_ufo WHERE field_id = ".$rowf['id']." ORDER BY option_order ASC";
+                $sqlo = "SELECT * FROM $t_ufo
+                        WHERE field_id = ".$rowf['id']."
+                        ORDER BY option_order ASC";
                 $reso = Database::query($sqlo);
                 if (Database::num_rows($reso) > 0) {
                     while ($rowo = Database::fetch_array($reso)) {
@@ -3771,16 +3782,17 @@ class UserManager
     }
 
     /**
-      * Get extra filtrable user fields (type select)
+      * Get extra filtrable user fields (only type select)
       * @return array
       */
     public static function get_extra_filtrable_fields()
     {
         $extraFieldList = UserManager::get_extra_fields();
+
         $extraFiltrableFields = array();
         if (is_array($extraFieldList)) {
             foreach ($extraFieldList as $extraField) {
-                //if is enabled to filter and is a "<select>" field type
+                // If is enabled to filter and is a "<select>" field type
                 if ($extraField[8] == 1 && $extraField[2] == 4) {
                     $extraFiltrableFields[] = array(
                         'name' => $extraField[3],
@@ -3791,7 +3803,7 @@ class UserManager
             }
         }
 
-        if (is_array($extraFiltrableFields) && count($extraFiltrableFields) > 0 ) {
+        if (is_array($extraFiltrableFields) && count($extraFiltrableFields) > 0) {
             return $extraFiltrableFields;
         }
     }
@@ -3811,7 +3823,10 @@ class UserManager
                 if (UserManager::is_extra_field_available($extraField['variable'])) {
                     if (isset($_GET[$varName]) && $_GET[$varName]!='0') {
                         $useExtraFields = true;
-                        $extraFieldResult[]= UserManager::get_extra_user_data_by_value($extraField['variable'], $_GET[$varName]);
+                        $extraFieldResult[]= UserManager::get_extra_user_data_by_value(
+                            $extraField['variable'],
+                            $_GET[$varName]
+                        );
                     }
                 }
             }
@@ -3847,35 +3862,74 @@ class UserManager
      */
     public static function get_search_form($query)
     {
-        $extraFiltrableFields = UserManager::get_extra_filtrable_fields();
-        $extraFields = null;
-        if (is_array($extraFiltrableFields) && count($extraFiltrableFields)>0 ) {
-            foreach ($extraFiltrableFields as $extraField) {
-                $extraFields .=  '<label class="extra_field">'.$extraField['name'].'</label>';
+        $searchType = isset($_GET['search_type']) ? $_GET['search_type'] : null;
+        $form = new FormValidator(
+            'search_user',
+            'get',
+            api_get_path(WEB_PATH).'main/social/search.php',
+            '',
+            array(),
+            FormValidator::LAYOUT_INLINE
+        );
+
+        $form->addText('q', get_lang('UsersGroups'));
+        $options = array(
+            0 => get_lang('Select'),
+            1 => get_lang('User'),
+            2 => get_lang('Group'),
+        );
+        $form->addSelect(
+            'search_type',
+            get_lang('Type'),
+            $options,
+            array('onchange' => 'javascript: extra_field_toogle();')
+        );
+
+        // Extra fields
+
+        $extraFields = UserManager::get_extra_filtrable_fields();
+        $defaults = [];
+        if (is_array($extraFields) && count($extraFields) > 0) {
+            foreach ($extraFields as $extraField) {
                 $varName = 'field_'.$extraField['variable'];
-                $extraFields .=  '&nbsp;<select name="'.$varName.'" class="extra_field">';
-                $extraFields .=  '<option value="0">--'.get_lang('Select').'--</option>';
+
+                $options = [
+                    0 => get_lang('Select')
+                ];
                 foreach ($extraField['data'] as $option) {
-                    $checked='';
+                    $checked = '';
                     if (isset($_GET[$varName])) {
-                        if ($_GET[$varName]==$option[1]) {
-                            $checked = 'selected="true"';
+                        if ($_GET[$varName] == $option[1]) {
+                            $defaults[$option[1]] = true;
                         }
                     }
-                    $extraFields .=  '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+
+                    $options[$option[1]] = $option[1];
                 }
-                $extraFields .=  '</select>';
-                $extraFields .=  '&nbsp;&nbsp;';
+                $form->addSelect($varName, $extraField['name'], $options);
             }
         }
 
-        $searchType = isset($_GET['search_type']) ? $_GET['search_type'] : null;
+        $defaults['search_type'] = intval($searchType);
+        $defaults['q'] = api_htmlentities(Security::remove_XSS($query));
+        $form->setDefaults($defaults);
+
+        $form->addButtonSearch(get_lang('Search'));
+
+        $js = '<script>
+        extra_field_toogle();
+        function extra_field_toogle() {
+            if (jQuery("select[name=search_type]").val() != "1") { jQuery(".extra_field").hide(); } else { jQuery(".extra_field").show(); }
+        }
+        </script>';
+
+        return $js.$form->returnForm();
 
         return '
         <form method="GET" class="form-search" action="'.api_get_path(WEB_PATH).'main/social/search.php">
                 <input placeholder="'.get_lang('UsersGroups').'" type="text" value="'.api_htmlentities(Security::remove_XSS($query)).'" name="q"/> &nbsp;
                 ' . get_lang('Type') .'
-                <select name="search_type" onchange="javascript: extra_field_toogle();">
+
                 <option value="0">--'.get_lang('Select').'--</option>
                 <option value="1"' . (($searchType=='1')?'selected="selected"':"") . '>--' . get_lang('User') .'--</option>
                 <option value="2"' . (($searchType=='2')?'selected="selected"':"") . '>--' . get_lang('Group') . '--</option>
@@ -3883,13 +3937,7 @@ class UserManager
                 '.$extraFields.'
                 <button class="btn" type="submit" value="search">'.get_lang('Search').'</button>
         </form>
-        <script>
-        extra_field_toogle();
-        function extra_field_toogle()
-        {
-            if (jQuery("select[name=search_type]").val() != "1") { jQuery(".extra_field").hide(); } else { jQuery(".extra_field").show(); }
-        }
-        </script>
+
         ';
     }
 
diff --git a/main/social/search.php b/main/social/search.php
index 9c366cf893..613513bf15 100755
--- a/main/social/search.php
+++ b/main/social/search.php
@@ -34,15 +34,18 @@ if (!empty($extra_fields)) {
         }
     }
 }
-$user_info    = UserManager::get_user_info_by_id($user_id);
+$user_info = UserManager::get_user_info_by_id($user_id);
 //Block Social Avatar
 $social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'search');
 //Block Social Menu
 $social_menu_block = SocialManager::show_social_menu('search');
-$social_right_content = '<div class="span9">'.UserManager::get_search_form($query).'</div>';
+$social_right_content = '';
+$searchForm = UserManager::get_search_form($query);
 
 $groups = array();
 $totalGroups = array();
+$users = array();
+$totalUsers = array();
 
 // I'm searching something
 if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) {
@@ -54,7 +57,7 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
 
         $from = intval(($page - 1) * $itemPerPage);
         // Get users from tags
-        $users  = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
+        $users = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
     }
 
     if ($_GET['search_type']=='0' || $_GET['search_type']=='2') {
@@ -89,7 +92,7 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
                         <button class="btn btn-mini"><i class="fa fa-envelope"></i> '.get_lang('SendMessage').'</button></a>';
             if (empty($user['picture_uri'])) {
                 $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
-                $img             = '<img src="'.$picture['file'].'">';
+                $img = '<img src="'.$picture['file'].'">';
             } else {
                 $picture = UserManager::get_picture_user(
                     $user['user_id'],
@@ -110,10 +113,9 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
             $user_info['complete_name'] = Display::url($status_icon.$user_info['complete_name'], $url);
             $invitations = $user['tag'].$send_inv.$send_msg;
 
-            $results .= '<li class="span3">
-                            <div class="">
-                            <div class="row-fluid">
-                                <div class="span12">
+            $results .= '<li class="col-md-3">
+                            <div class="row">
+                                <div class="col-md-12">
                                     '.$user_info['complete_name'].'
                                 </div>
                                 <div class="col-md-4">
@@ -126,7 +128,6 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
                                     '.$invitations.'
                                     </div>
                                 </div>
-                                </div>
                             </div>
                         </li>';
         }
@@ -148,10 +149,9 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
         $totalUsers
     );
 
-
     $grid_groups = array();
     if (is_array($groups) && count($groups) > 0) {
-        $social_right_content .= '<div class="span9">';
+        $social_right_content .= '<div class="col-md-9">';
         $social_right_content .= Display::page_subheader(get_lang('Groups'));
 
         $social_right_content .= '<ul class="thumbnails">';
@@ -178,14 +178,14 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
             $item_1  = Display::tag('h3', $url_open.$name.$url_close).$members;
 
             $social_right_content .= '
-                <li class="span8">
-                    <div class="row-fluid">
-                        <div class="span1">
+                <li class="col-md-8">
+                    <div class="row">
+                        <div class="col-md-1">
                             <div class="media">
                                 '.$item_0.'
                             </div>
                         </div>
-                        <div class="span6">
+                        <div class="col-md-6">
                             '.$item_1.'
                             <p>'.$group['description'].'</p>
                             <p>'.$tags.'</p>
@@ -213,11 +213,11 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
     );
 }
 
-
 $tpl = new Template($tool_name);
 $tpl->assign('social_avatar_block', $social_avatar_block);
 $tpl->assign('social_menu_block', $social_menu_block);
 $tpl->assign('social_right_content', $social_right_content);
+$tpl->assign('search_form', $searchForm);
 
 $formModalTpl =  new Template();
 $formModalTpl->assign('messageForm', MessageManager::generate_message_form('send_message'));
diff --git a/main/template/default/social/search.tpl b/main/template/default/social/search.tpl
index 6e38fc79b8..5ca914bf05 100644
--- a/main/template/default/social/search.tpl
+++ b/main/template/default/social/search.tpl
@@ -8,26 +8,22 @@
             {{ social_menu_block }}
         </div>
     </div>
-    <div id="wallMessages" class="col-md-5" style="min-height:1px">
+    <div class="col-md-9" style="min-height:1px">
         <div class="row">
             <div class="col-md-12">
                 <div id="message_ajax_reponse" class=""></div>
             </div>
         </div>
         <div class="row">
-            {{ social_right_content}}
-        </div>
-        <div id="display_response_id" class="col-md-12"></div>
-        {{ socialAutoExtendLink }}
-    </div>
-    <div class="col-md-4">
-        <div class="row">
-            {{ socialRightInformation}}
+            <div class="col-md-12">
+                {{ search_form }}
+            </div>
+            {{ social_right_content }}
         </div>
     </div>
 </div>
 
-    {% if formModals is defined %}
-        {{ formModals }}
-    {% endif %}
-{% endblock %}
\ No newline at end of file
+{% if formModals is defined %}
+    {{ formModals }}
+{% endif %}
+{% endblock %}

From 901fd5065b01a4791eac56551fd6e51591d9242d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 10:01:39 +0100
Subject: [PATCH 05/23] Fix js paths.

---
 main/newscorm/lp_view.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index a5a37975c4..fa56d42782 100755
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -532,8 +532,8 @@ if ($is_allowed_to_edit) {
       {
       load: [
           { type:"script", id:"_fr1", src:"<?php echo api_get_jquery_web_path(); ?>"},
-          { type:"script", id:"_fr4", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js"},
-          { type:"stylesheet", id:"_fr5", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css"},
+          { type:"script", id:"_fr4", src:"<?php echo api_get_jquery_ui_js_web_path(); ?>"},
+          { type:"stylesheet", id:"_fr5", src:"<?php echo api_get_jquery_ui_css_web_path(); ?>"},
           { type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"}
       ]}
       );

From d78e60b288b50c7e1fd5354546115c3310b0b4a9 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 10:17:58 +0100
Subject: [PATCH 06/23] Fix UI

---
 main/calendar/agenda_js.php      |  8 +++++++-
 main/forum/forumfunction.inc.php |  2 +-
 main/forum/forumsearch.php       | 18 +++++++-----------
 main/inc/lib/agenda.lib.php      |  9 ++++++++-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/main/calendar/agenda_js.php b/main/calendar/agenda_js.php
index 14c966d772..d5a7ab8ee0 100755
--- a/main/calendar/agenda_js.php
+++ b/main/calendar/agenda_js.php
@@ -201,7 +201,13 @@ if (!empty($userId)) {
 $tpl->assign('web_agenda_ajax_url', $agenda_ajax_url);
 $course_code = api_get_course_id();
 
-$form = new FormValidator('form', 'get', null, null, array('id' => 'add_event_form'));
+$form = new FormValidator(
+    'form',
+    'get',
+    null,
+    null,
+    array('id' => 'add_event_form')
+);
 $form->addElement('html', '<div id="visible_to_input">');
 
 $sendTo = $agenda->parseAgendaFilter($userId);
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 2a4c29d4cc..1d42a56da8 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -3772,7 +3772,7 @@ function forum_search()
 
     // Setting the form elements.
     $form->addElement('header', '', get_lang('ForumSearch'));
-    $form->addElement('text', 'search_term', get_lang('SearchTerm'), 'class="input_titles" id="search_title"');
+    $form->addElement('text', 'search_term', get_lang('SearchTerm'), array('id' =>'search_title'));
     $form->applyFilter('search_term', 'html_filter');
     $form->addElement('static', 'search_information', '', get_lang('ForumSearchInformation'));
     $form->addButtonSearch(get_lang('Search'));
diff --git a/main/forum/forumsearch.php b/main/forum/forumsearch.php
index 98fa166af8..76fa6ed529 100755
--- a/main/forum/forumsearch.php
+++ b/main/forum/forumsearch.php
@@ -62,20 +62,16 @@ if (!empty($gradebook) && $gradebook == 'view') {
     );
 }
 
-if (!empty ($_GET['gidReq'])) {
-    $toolgroup = Database::escape_string($_GET['gidReq']);
-    Session::write('toolgroup',$toolgroup);
-}
+$groupId = api_get_group_id();
 
 if ($origin == 'group') {
-    $_clean['toolgroup']=(int)$_SESSION['toolgroup'];
-    $group_properties  = GroupManager :: get_group_properties($_clean['toolgroup']);
-    $interbreadcrumb[] = array('url' => '../group/group.php', 'name' => get_lang('Groups'));
-    $interbreadcrumb[] = array('url' => '../group/group_space.php?gidReq='.$_SESSION['toolgroup'], 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')');
-    $interbreadcrumb[] = array('url' => 'viewforum.php?origin='.$origin.'&amp;gidReq='.$_SESSION['toolgroup'].'&amp;forum='.Security::remove_XSS($_GET['forum']), 'name' => prepare4display($current_forum['forum_title']));
-    $interbreadcrumb[] = array('url' => 'forumsearch.php','name' => get_lang('ForumSearch'));
+    $group_properties  = GroupManager :: get_group_properties($groupId);
+    $interbreadcrumb[] = array('url' => '../group/group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' => '../group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')');
+    $interbreadcrumb[] = array('url' => 'viewforum.php?origin='.$origin.'&forum='.Security::remove_XSS($_GET['forum']).'&'.api_get_cidreq(), 'name' => prepare4display($current_forum['forum_title']));
+    $interbreadcrumb[] = array('url' => 'forumsearch.php?'.api_get_cidreq(),'name' => get_lang('ForumSearch'));
 } else {
-    $interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'', 'name' => $nameTools);
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => $nameTools);
     //$interbreadcrumb[] = array('url' => 'forumsearch.php', 'name' => );
     $nameTools = get_lang('ForumSearch');
 }
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index 9c70623c3b..b685003f8c 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -2232,7 +2232,14 @@ class Agenda
             if ($this->type == 'course') {
                 $form = null;
                 if (!isset($_GET['action'])) {
-                    $form = new FormValidator('form-search');
+
+                    $form = new FormValidator(
+                        'form-search',
+                        'post',
+                        '',
+                        '',
+                        array(),
+                        FormValidator::LAYOUT_INLINE);
                     $attributes = array(
                         'multiple' => false,
                         'id' => 'select_form_id_search'

From 8ed3cd0cb139cc85a27fa93f87596c83d5376628 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 10:34:53 +0100
Subject: [PATCH 07/23] Update multiselect UI

---
 .../pear/HTML/QuickForm/advmultiselect.php    | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php b/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
index 191d19af1b..d8884d8fcc 100755
--- a/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
+++ b/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
@@ -308,6 +308,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             $attr = array('class' => $this->_tableAttributes);
             $this->_removeAttr('class', $this->_attributes);
         }
+
         $this->_tableAttributes = $this->_getAttrString($attr);
 
         // set default add button attributes
@@ -409,7 +410,8 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
                     $this->_addButtonAttributes = array(
                         'name'  => 'add',
                         'value' => ' ',
-                        'type'  => 'button'
+                        'type'  => 'button',
+                        'class'=> 'btn btn-primary'
                     );
                 } else {
                     $this->_updateAttrArray(
@@ -420,10 +422,12 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
                 break;
             case 'remove':
                 if (is_null($attributes)) {
-                    $this->_removeButtonAttributes
-                        = array('name'  => 'remove',
+                    $this->_removeButtonAttributes = array(
+                        'name'  => 'remove',
                         'value' => '  ',
-                        'type'  => 'button');
+                        'type'  => 'button',
+                        'class'=> 'btn btn-primary'
+                    );
                 } else {
                     $this->_updateAttrArray($this->_removeButtonAttributes,
                         $this->_parseAttributes($attributes));
@@ -431,10 +435,11 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
                 break;
             case 'all':
                 if (is_null($attributes)) {
-                    $this->_allButtonAttributes
-                        = array('name'  => 'all',
+                    $this->_allButtonAttributes = array(
+                        'name'  => 'all',
                         'value' => ' Select All ',
-                        'type'  => 'button');
+                        'type'  => 'button'
+                    );
                 } else {
                     $this->_updateAttrArray($this->_allButtonAttributes,
                         $this->_parseAttributes($attributes));
@@ -533,10 +538,11 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
         } else {
             $this->_elementTemplate = '
 {javascript}
-  <div class="col-sm-3"><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
+<div class="row">
+  <div class="col-sm-5"><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
   <div class="col-sm-2"><div class="text-center">{add}{remove}</div></div>
-  <div class="col-sm-3"><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
-
+  <div class="col-sm-5"><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
+</div>
 ';
         }
         if ($js == false) {

From a6358afe8ef86bc4340c2b460985e869b757861b Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 10:48:43 +0100
Subject: [PATCH 08/23] Fix toggle

---
 main/survey/survey_invite.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index 1b02f5a9ab..a7a6343f59 100755
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -67,7 +67,7 @@ Display::display_header($tool_name,'Survey');
 echo '<script>
 $(function() {
     $("#check_mail").change(function() {
-        $("#mail_text").toggle();
+        $("#mail_text_wrapper").toggle();
     });
 });
 </script>';
@@ -108,18 +108,29 @@ foreach ($complete_user_list as & $user) {
 $users = $form->addElement('advmultiselect', 'course_users', get_lang('CourseUsers'), $possible_users, 'style="width: 250px; height: 200px;"');
 
 // Additional users
-$form->addElement('textarea', 'additional_users', array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')), array('class' => 'span6', 'rows' => 5));
+$form->addElement(
+	'textarea',
+	'additional_users',
+	array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
+	array('rows' => 5)
+);
 
 $form->addElement('html', '<div id="check_mail">');
 $form->addElement('checkbox', 'send_mail','', get_lang('SendMail'));
 $form->addElement('html', '</div>');
 
-$form->addElement('html', '<div id="mail_text">');
+$form->addElement('html', '<div id="mail_text_wrapper">');
 
 // The title of the mail
 $form->addElement('text', 'mail_title', get_lang('MailTitle'), array('class' => 'span6'));
 // The text of the mail
-$form->addElement('html_editor', 'mail_text', array(get_lang('MailText'), get_lang('UseLinkSyntax')), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '150'));
+$form->addElement(
+	'html_editor',
+	'mail_text',
+	array(get_lang('MailText'), get_lang('UseLinkSyntax')),
+	null,
+	array('ToolbarSet' => 'Survey', 'Height' => '150')
+);
 $form->addElement('html', '</div>');
 // You cab send a reminder to unanswered people if the survey is not anonymous
 if ($survey_data['anonymous'] != 1) {
@@ -129,7 +140,7 @@ if ($survey_data['anonymous'] != 1) {
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
 
 // Submit button
-$form->addElement('style_submit_button', 'submit', get_lang('PublishSurvey'), 'class="save"');
+$form->addButtonSave(get_lang('PublishSurvey'));
 // The rules (required fields)
 /*if ($survey_data['send_mail'] == 0) {
     $form->addRule('mail_title', get_lang('ThisFieldIsRequired'), 'required');

From 2e677e4333998c6fec389956f8cde8f17d21f9fc Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 13:32:08 +0100
Subject: [PATCH 09/23] Move course sql into a file instead of PHP

---
 main/inc/lib/add_course.lib.inc.php        | 1815 +-------------------
 main/install/course.sql                    | 1244 ++++++++++++++
 main/install/install.lib.php               |    2 +-
 main/install/install_db.inc.php            |    2 +-
 main/install/{db_main.sql => main.sql}     |    4 +-
 main/install/update-db-1.8.8-1.9.0.inc.php |    2 +-
 6 files changed, 1304 insertions(+), 1765 deletions(-)
 create mode 100644 main/install/course.sql
 rename main/install/{db_main.sql => main.sql} (99%)
 mode change 100755 => 100644

diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 1118f292d0..1000cfbb24 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -303,1738 +303,6 @@ class AddCourse
         }
     }
 
-    /**
-     * Creates all the necessary tables for a new course (deprecated since 1.9.0 as
-     * we only use a single database, configured at install time)
-     * @param string Course DB name
-     * @return int 0
-     * @assert (null) === false
-     */
-    public static function create_course_tables($course_db_name = null)
-    {
-        global $_configuration;
-        $charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci';
-        $use_one_db = true;
-
-        if ($use_one_db) {
-            $course_db_name = DB_COURSE_PREFIX;
-        } else {
-            if (!$_configuration['single_database']) {
-                Database::query(
-                    "CREATE DATABASE IF NOT EXISTS " . $course_db_name . "" . $charset_clause
-                );
-            }
-            $course_db_name = $_configuration['table_prefix'] . $course_db_name . $_configuration['db_glue'];
-        }
-
-        //@todo define the backticks inside those table names directly (instead of adding them afterwards)
-        $tbl_course_homepage = $course_db_name . 'tool';
-        $TABLEINTROS = $course_db_name . 'tool_intro';
-        $TABLEGROUPS = $course_db_name . 'group_info';
-        $TABLEGROUPCATEGORIES = $course_db_name . 'group_category';
-        $TABLEGROUPUSER = $course_db_name . 'group_rel_user';
-        $TABLEGROUPTUTOR = $course_db_name . 'group_rel_tutor';
-        $TABLEITEMPROPERTY = $course_db_name . 'item_property';
-        $TABLETOOLUSERINFOCONTENT = $course_db_name . 'userinfo_content';
-        $TABLETOOLUSERINFODEF = $course_db_name . 'userinfo_def';
-        $TABLETOOLCOURSEDESC = $course_db_name . 'course_description';
-        $TABLETOOLAGENDA = $course_db_name . 'calendar_event';
-        $TABLETOOLAGENDAREPEAT = $course_db_name . 'calendar_event_repeat';
-        $TABLETOOLAGENDAREPEATNOT = $course_db_name . 'calendar_event_repeat_not';
-        $TABLETOOLAGENDAATTACHMENT = $course_db_name . 'calendar_event_attachment';
-
-        // Announcements
-        $TABLETOOLANNOUNCEMENTS = $course_db_name . 'announcement';
-        $TABLETOOLANNOUNCEMENTSATTACHMENT = $course_db_name . 'announcement_attachment';
-
-        // Resourcelinker
-        $TABLEADDEDRESOURCES = $course_db_name . 'resource';
-
-        // Student Publication
-        $TABLETOOLWORKS = $course_db_name . 'student_publication';
-        $TABLETOOLWORKSASS = $course_db_name . 'student_publication_assignment';
-
-        // Document
-        $TABLETOOLDOCUMENT = $course_db_name . 'document';
-
-        // Forum
-        $TABLETOOLFORUMCATEGORY = $course_db_name . 'forum_category';
-        $TABLETOOLFORUM = $course_db_name . 'forum_forum';
-        $TABLETOOLFORUMTHREAD = $course_db_name . 'forum_thread';
-        $TABLETOOLFORUMPOST = $course_db_name . 'forum_post';
-        $TABLETOOLFORUMMAILCUE = $course_db_name . 'forum_mailcue';
-        $TABLETOOLFORUMATTACHMENT = $course_db_name . 'forum_attachment';
-        $TABLETOOLFORUMNOTIFICATION = $course_db_name . 'forum_notification';
-        $TABLETOOLFORUMQUALIFY = $course_db_name . 'forum_thread_qualify';
-        $TABLETOOLFORUMQUALIFYLOG = $course_db_name . 'forum_thread_qualify_log';
-
-        // Link
-        $TABLETOOLLINK = $course_db_name . 'link';
-        $TABLETOOLLINKCATEGORIES = $course_db_name . 'link_category';
-
-        $TABLETOOLONLINECONNECTED = $course_db_name . 'online_connected';
-        $TABLETOOLONLINELINK = $course_db_name . 'online_link';
-
-        // Chat
-        $TABLETOOLCHATCONNECTED = $course_db_name . 'chat_connected';
-
-        // Quiz (a.k.a. exercises)
-        $TABLEQUIZ = $course_db_name . 'quiz';
-        $TABLEQUIZQUESTION = $course_db_name . 'quiz_rel_question';
-        $TABLEQUIZQUESTIONLIST = $course_db_name . 'quiz_question';
-        $TABLEQUIZANSWERSLIST = $course_db_name . 'quiz_answer';
-        $TABLEQUIZQUESTIONOPTION = $course_db_name . 'quiz_question_option';
-        $table_quiz_question_category = $course_db_name . 'quiz_question_category';
-        $table_quiz_question_rel_category = $course_db_name . 'quiz_question_rel_category';
-
-        // Dropbox
-        $TABLETOOLDROPBOXPOST = $course_db_name . 'dropbox_post';
-        $TABLETOOLDROPBOXFILE = $course_db_name . 'dropbox_file';
-        $TABLETOOLDROPBOXPERSON = $course_db_name . 'dropbox_person';
-        $TABLETOOLDROPBOXCATEGORY = $course_db_name . 'dropbox_category';
-        $TABLETOOLDROPBOXFEEDBACK = $course_db_name . 'dropbox_feedback';
-
-        // New Learning path
-        $TABLELP = $course_db_name . 'lp';
-        $TABLELPITEM = $course_db_name . 'lp_item';
-        $TABLELPVIEW = $course_db_name . 'lp_view';
-        $TABLELPITEMVIEW = $course_db_name . 'lp_item_view';
-        $TABLELPIVINTERACTION = $course_db_name . 'lp_iv_interaction';
-        $TABLELPIVOBJECTIVE = $course_db_name . 'lp_iv_objective';
-
-        // Blogs
-        $tbl_blogs = $course_db_name . 'blog';
-        $tbl_blogs_comments = $course_db_name . 'blog_comment';
-        $tbl_blogs_posts = $course_db_name . 'blog_post';
-        $tbl_blogs_rating = $course_db_name . 'blog_rating';
-        $tbl_blogs_rel_user = $course_db_name . 'blog_rel_user';
-        $tbl_blogs_tasks = $course_db_name . 'blog_task';
-        $tbl_blogs_tasks_rel_user = $course_db_name . 'blog_task_rel_user';
-        $tbl_blogs_attachment = $course_db_name . 'blog_attachment';
-
-        //Blogs permissions
-        $tbl_permission_group = $course_db_name . 'permission_group';
-        $tbl_permission_user = $course_db_name . 'permission_user';
-        $tbl_permission_task = $course_db_name . 'permission_task';
-
-        //Blog roles
-        $tbl_role = $course_db_name . 'role';
-        $tbl_role_group = $course_db_name . 'role_group';
-        $tbl_role_permissions = $course_db_name . 'role_permissions';
-        $tbl_role_user = $course_db_name . 'role_user';
-
-        //Survey variables for course homepage;
-        $TABLESURVEY = $course_db_name . 'survey';
-        $TABLESURVEYQUESTION = $course_db_name . 'survey_question';
-        $TABLESURVEYQUESTIONOPTION = $course_db_name . 'survey_question_option';
-        $TABLESURVEYINVITATION = $course_db_name . 'survey_invitation';
-        $TABLESURVEYANSWER = $course_db_name . 'survey_answer';
-        $TABLESURVEYGROUP = $course_db_name . 'survey_group';
-
-        // Wiki
-        $TABLETOOLWIKI = $course_db_name . 'wiki';
-        $TABLEWIKICONF = $course_db_name . 'wiki_conf';
-        $TABLEWIKIDISCUSS = $course_db_name . 'wiki_discuss';
-        $TABLEWIKIMAILCUE = $course_db_name . 'wiki_mailcue';
-
-        // Course settings
-        $TABLESETTING = $course_db_name . 'course_setting';
-
-        // Glossary
-        $TBL_GLOSSARY = $course_db_name . 'glossary';
-
-        // Notebook
-        $TBL_NOTEBOOK = $course_db_name . 'notebook';
-
-        // Attendance
-        $TBL_ATTENDANCE = $course_db_name . 'attendance';
-        $TBL_ATTENDANCE_SHEET = $course_db_name . 'attendance_sheet';
-        $TBL_ATTENDANCE_CALENDAR = $course_db_name . 'attendance_calendar';
-        $TBL_ATTENDANCE_RESULT = $course_db_name . 'attendance_result';
-        $TBL_ATTENDANCE_SHEET_LOG = $course_db_name . 'attendance_sheet_log';
-
-        // Thematic
-        $TBL_THEMATIC = $course_db_name . 'thematic';
-        $TBL_THEMATIC_PLAN = $course_db_name . 'thematic_plan';
-        $TBL_THEMATIC_ADVANCE = $course_db_name . 'thematic_advance';
-        $TBL_METADATA = $course_db_name . 'metadata';
-
-        $add_to_all_tables = ' c_id INT NOT NULL, ';
-
-
-        /*  Announcement tool  */
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLANNOUNCEMENTS . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            title text,
-            content mediumtext,
-            end_date date default NULL,
-            display_order mediumint NOT NULL default 0,
-            email_sent tinyint default 0,
-            session_id int default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLANNOUNCEMENTS . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        // Announcement Attachment
-        $sql = "CREATE TABLE  `" . $TABLETOOLANNOUNCEMENTSATTACHMENT . "` (
-                $add_to_all_tables
-                id int NOT NULL auto_increment,
-                path varchar(255) NOT NULL,
-                comment text,
-                size int NOT NULL default 0,
-                announcement_id int NOT NULL,
-                filename varchar(255) NOT NULL,
-                PRIMARY KEY (c_id, id)
-                )" . $charset_clause;
-        Database::query($sql);
-
-        /*
-                Resources
-        */
-
-        $sql = "
-            CREATE TABLE `" . $TABLEADDEDRESOURCES . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            source_type varchar(50) default NULL,
-            source_id int unsigned default NULL,
-            resource_type varchar(50) default NULL,
-            resource_id int unsigned default NULL,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLUSERINFOCONTENT . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            user_id int unsigned NOT NULL,
-            definition_id int unsigned NOT NULL,
-            editor_ip varchar(39) default NULL,
-            edition_time datetime default NULL,
-            content text NOT NULL,
-            PRIMARY KEY (c_id, id),
-            KEY user_id (user_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        // Unused table. Temporarily ignored for tests.
-        // Reused because of user/userInfo and user/userInfoLib scripts
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLUSERINFODEF . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            title varchar(80) NOT NULL default '',
-            comment text,
-            line_count tinyint unsigned NOT NULL default 5,
-            rank tinyint unsigned NOT NULL default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        /* Forum tool  */
-
-        // Forum Category
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLFORUMCATEGORY . "` (
-             $add_to_all_tables
-             cat_id int NOT NULL auto_increment,
-             cat_title varchar(255) NOT NULL default '',
-             cat_comment text,
-             cat_order int NOT NULL default 0,
-             locked int NOT NULL default 0,
-             session_id int unsigned NOT NULL default 0,
-             PRIMARY KEY (c_id, cat_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLFORUMCATEGORY . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        // Forum
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLFORUM . "` (
-            $add_to_all_tables
-             forum_id int NOT NULL auto_increment,
-             forum_title varchar(255) NOT NULL default '',
-             forum_comment text,
-             forum_threads int default 0,
-             forum_posts int default 0,
-             forum_last_post int default 0,
-             forum_category int default NULL,
-             allow_anonymous int default NULL,
-             allow_edit int default NULL,
-             approval_direct_post varchar(20) default NULL,
-             allow_attachments int default NULL,
-             allow_new_threads int default NULL,
-             default_view varchar(20) default NULL,
-             forum_of_group varchar(20) default NULL,
-             forum_group_public_private varchar(20) default 'public',
-             forum_order int default NULL,
-             locked int NOT NULL default 0,
-             session_id int NOT NULL default 0,
-             forum_image varchar(255) NOT NULL default '',
-             start_time datetime NOT NULL default '0000-00-00 00:00:00',
-             end_time datetime NOT NULL default '0000-00-00 00:00:00',
-             PRIMARY KEY (c_id, forum_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        // Forum Threads
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLFORUMTHREAD . "` (
-             $add_to_all_tables
-             thread_id int NOT NULL auto_increment,
-             thread_title varchar(255) default NULL,
-             forum_id int default NULL,
-             thread_replies int default 0,
-             thread_poster_id int default NULL,
-             thread_poster_name varchar(100) default '',
-             thread_views int default 0,
-             thread_last_post int default NULL,
-             thread_date datetime default '0000-00-00 00:00:00',
-             thread_sticky tinyint unsigned default 0,
-             locked int NOT NULL default 0,
-             session_id int unsigned default NULL,
-             thread_title_qualify varchar(255) default '',
-             thread_qualify_max float(6,2) UNSIGNED NOT NULL default 0,
-             thread_close_date datetime default '0000-00-00 00:00:00',
-             thread_weight float(6,2) UNSIGNED NOT NULL default 0,
-             PRIMARY KEY (c_id, thread_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLFORUMTHREAD . "` ADD INDEX idx_forum_thread_forum_id (forum_id)";
-        Database::query($sql);
-
-        // Forum Posts
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLFORUMPOST . "` (
-             $add_to_all_tables
-             post_id int NOT NULL auto_increment,
-             post_title varchar(250) default NULL,
-             post_text text,
-             thread_id int default 0,
-             forum_id int default 0,
-             poster_id int default 0,
-             poster_name varchar(100) default '',
-             post_date datetime default '0000-00-00 00:00:00',
-             post_notification tinyint default 0,
-             post_parent_id int default 0,
-             visible tinyint default 1,
-             PRIMARY KEY (c_id, post_id),
-             KEY poster_id (poster_id),
-             KEY forum_id (forum_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLFORUMPOST . "` ADD INDEX idx_forum_post_thread_id (thread_id)";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLFORUMPOST . "` ADD INDEX idx_forum_post_visible (visible)";
-        Database::query($sql);
-
-        // Forum Mailcue
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLFORUMMAILCUE . "` (
-             $add_to_all_tables
-             id int NOT NULL auto_increment,
-             user_id int default NULL,
-             thread_id int default NULL,
-             post_id int default NULL,
-             PRIMARY KEY (id, c_id, thread_id, user_id, post_id )
-            )" . $charset_clause;
-        Database::query($sql);
-
-        // Forum Attachment
-        $sql = "CREATE TABLE  `" . $TABLETOOLFORUMATTACHMENT . "` (
-                  $add_to_all_tables
-                  id int NOT NULL auto_increment,
-                  path varchar(255) NOT NULL,
-                  comment text,
-                  size int NOT NULL default 0,
-                  post_id int NOT NULL,
-                  filename varchar(255) NOT NULL,
-                  PRIMARY KEY (c_id, id)
-                )" . $charset_clause;
-        Database::query($sql);
-
-        // Forum notification
-        $sql = "CREATE TABLE  `" . $TABLETOOLFORUMNOTIFICATION . "` (
-                  $add_to_all_tables
-                  id int NOT NULL auto_increment,
-                  user_id int,
-                  forum_id int,
-                  thread_id int,
-                  post_id int,
-                  KEY user_id (user_id),
-                  KEY forum_id (forum_id),
-                  PRIMARY KEY  (id, c_id, user_id, forum_id, thread_id, post_id )
-                )" . $charset_clause;
-        Database::query($sql);
-
-        // Forum thread qualify :Add table forum_thread_qualify
-        $sql = "CREATE TABLE  `" . $TABLETOOLFORUMQUALIFY . "` (
-                $add_to_all_tables
-                id int unsigned AUTO_INCREMENT,
-                user_id int unsigned NOT NULL,
-                thread_id int NOT NULL,
-                qualify float(6,2) NOT NULL default 0,
-                qualify_user_id int  default NULL,
-                qualify_time datetime default '0000-00-00 00:00:00',
-                session_id int  default NULL,
-                PRIMARY KEY (c_id, id)
-                )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLFORUMQUALIFY . "` ADD INDEX (user_id, thread_id)";
-        Database::query($sql);
-
-        //Forum thread qualify: Add table forum_thread_qualify_historical
-        $sql = "CREATE TABLE  `" . $TABLETOOLFORUMQUALIFYLOG . "` (
-                $add_to_all_tables
-                id int unsigned AUTO_INCREMENT,
-                user_id int unsigned NOT NULL,
-                thread_id int NOT NULL,
-                qualify float(6,2) NOT NULL default 0,
-                qualify_user_id int default NULL,
-                qualify_time datetime default '0000-00-00 00:00:00',
-                session_id int default NULL,
-                PRIMARY KEY (c_id, id)
-                )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLFORUMQUALIFYLOG . "` ADD INDEX (user_id, thread_id)";
-        Database::query($sql);
-
-        /*
-         * Exercise tool
-        */
-
-        // Exercise tool - Tests/exercises
-        $sql = "CREATE TABLE `" . $TABLEQUIZ . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            title varchar(255) NOT NULL,
-            description text default NULL,
-            sound varchar(255) default NULL,
-            type tinyint unsigned NOT NULL default 1,
-            random int NOT NULL default 0,
-            random_answers tinyint unsigned NOT NULL default 0,
-            active tinyint NOT NULL default 0,
-            results_disabled INT UNSIGNED NOT NULL DEFAULT 0,
-            access_condition TEXT DEFAULT NULL,
-            max_attempt int NOT NULL default 0,
-            start_time datetime NOT NULL default '0000-00-00 00:00:00',
-            end_time datetime NOT NULL default '0000-00-00 00:00:00',
-            feedback_type int NOT NULL default 0,
-            expired_time int NOT NULL default '0',
-            session_id int default 0,
-            propagate_neg INT NOT NULL DEFAULT 0,
-            review_answers INT NOT NULL DEFAULT 0,
-            random_by_category INT NOT NULL DEFAULT 0,
-            text_when_finished TEXT default NULL,
-            display_category_name INT NOT NULL DEFAULT 1,
-            pass_percentage INT DEFAULT NULL,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLEQUIZ . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        // Exercise tool - questions
-        $sql = "
-            CREATE TABLE `" . $TABLEQUIZQUESTIONLIST . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            question TEXT NOT NULL,
-            description text default NULL,
-            ponderation float(6,2) NOT NULL default 0,
-            position mediumint unsigned NOT NULL default 1,
-            type    tinyint unsigned NOT NULL default 2,
-            picture varchar(50) default NULL,
-            level   int unsigned NOT NULL default 0,
-            extra   varchar(255) default NULL,
-            question_code char(10) default '',
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLEQUIZQUESTIONLIST . "` ADD INDEX (position)";
-        Database::query($sql);
-
-        // Exercise tool - answers
-        $sql = "
-            CREATE TABLE `" . $TABLEQUIZANSWERSLIST . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL,
-            id_auto int NOT NULL AUTO_INCREMENT,
-            question_id int unsigned NOT NULL,
-            answer text NOT NULL,
-            correct mediumint unsigned default NULL,
-            comment text default NULL,
-            ponderation float(6,2) NOT NULL default 0,
-            position mediumint unsigned NOT NULL default 1,
-            hotspot_coordinates text,
-            hotspot_type enum('square','circle','poly','delineation','oar') default NULL,
-            destination text NOT NULL,
-            answer_code char(10) default '',
-            PRIMARY KEY (c_id, id_auto)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        // Exercise tool - answer options
-        $sql = "
-            CREATE TABLE `" . $TABLEQUIZQUESTIONOPTION . "` (
-            $add_to_all_tables
-            id          int NOT NULL auto_increment,
-            question_id int NOT NULL,
-            name        varchar(255),
-            position    int unsigned NOT NULL,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-
-        // Exercise tool - Test/question relations
-        $sql = "
-            CREATE TABLE `" . $TABLEQUIZQUESTION . "` (
-            $add_to_all_tables
-            question_id int unsigned NOT NULL,
-            exercice_id int unsigned NOT NULL,
-            question_order int unsigned NOT NULL default 1,
-            PRIMARY KEY (c_id, question_id,exercice_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-
-        $sql = "CREATE TABLE `" . $table_quiz_question_category . "` (
-          $add_to_all_tables
-          id int NOT NULL AUTO_INCREMENT,
-          title varchar(255) NOT NULL,
-          description text NOT NULL,
-          PRIMARY KEY (c_id,id)
-        )" . $charset_clause;
-        Database::query($sql);
-
-
-        $sql = "CREATE TABLE `" . $table_quiz_question_rel_category . "` (
-          $add_to_all_tables
-          question_id int NOT NULL,
-          category_id int NOT NULL,
-          PRIMARY KEY (c_id,question_id)
-        )" . $charset_clause;
-        Database::query($sql);
-
-
-        /*        Course description    */
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLCOURSEDESC . "` (
-            $add_to_all_tables
-            id int UNSIGNED NOT NULL auto_increment,
-            title VARCHAR(255),
-            content TEXT,
-            session_id int default 0,
-            description_type tinyint unsigned NOT NULL default 0,
-            progress INT NOT NULL default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLCOURSEDESC . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        /*  Course homepage tool list    */
-
-        $sql = "
-            CREATE TABLE `" . $tbl_course_homepage . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            name varchar(255) NOT NULL,
-            link varchar(255) NOT NULL,
-            image varchar(255) default NULL,
-            visibility tinyint unsigned default 0,
-            admin varchar(255) default NULL,
-            address varchar(255) default NULL,
-            added_tool tinyint unsigned default 1,
-            target enum('_self','_blank') NOT NULL default '_self',
-            category varchar(20) not null default 'authoring',
-            session_id int default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-        $sql = "ALTER TABLE `" . $tbl_course_homepage . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        /*        Agenda tool       */
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLAGENDA . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            title varchar(255) NOT NULL,
-            content text,
-            start_date datetime NOT NULL default '0000-00-00 00:00:00',
-            end_date datetime NOT NULL default '0000-00-00 00:00:00',
-            parent_event_id INT NULL,
-            session_id int unsigned NOT NULL default 0,
-            all_day INT NOT NULL DEFAULT 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLAGENDA . "` ADD INDEX ( session_id ) ;";
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLAGENDAREPEAT . "` (
-            $add_to_all_tables
-            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 (c_id, cal_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLAGENDAREPEATNOT . "` (
-            $add_to_all_tables
-            cal_id INT NOT NULL,
-            cal_date INT NOT NULL,
-            PRIMARY KEY (c_id, cal_id, cal_date )
-            )" . $charset_clause;
-        Database::query($sql);
-
-        // Agenda Attachment
-        $sql = "CREATE TABLE  `" . $TABLETOOLAGENDAATTACHMENT . "` (
-                    $add_to_all_tables
-                  id int NOT NULL auto_increment,
-                  path varchar(255) NOT NULL,
-                  comment text,
-                  size int NOT NULL default 0,
-                  agenda_id int NOT NULL,
-                  filename varchar(255) NOT NULL,
-                  PRIMARY KEY (c_id, id)
-                )" . $charset_clause;
-        Database::query($sql);
-
-        /*
-            Document tool
-        */
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLDOCUMENT . "` (
-                $add_to_all_tables
-                id int unsigned NOT NULL auto_increment,
-                path varchar(255) NOT NULL default '',
-                comment text,
-                title varchar(255) default NULL,
-                filetype set('file','folder') NOT NULL default 'file',
-                size int NOT NULL default 0,
-                readonly TINYINT UNSIGNED NOT NULL,
-                session_id int UNSIGNED NOT NULL default 0,
-                PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        /*
-            Student publications
-        */
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLWORKS . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            url varchar(255) default NULL,
-            title varchar(255) default NULL,
-            description text default NULL,
-            author varchar(255) default NULL,
-            active tinyint default NULL,
-            accepted tinyint default 0,
-            post_group_id int DEFAULT 0 NOT NULL,
-            sent_date datetime NOT NULL default '0000-00-00 00:00:00',
-            filetype set('file','folder') NOT NULL default 'file',
-            has_properties int UNSIGNED NOT NULL DEFAULT 0,
-            view_properties tinyint NULL,
-            qualification float(6,2) UNSIGNED NOT NULL DEFAULT 0,
-            date_of_qualification datetime NOT NULL default '0000-00-00 00:00:00',
-            parent_id INT UNSIGNED NOT NULL DEFAULT 0,
-            qualificator_id INT UNSIGNED NOT NULL DEFAULT 0,
-            weight float(6,2) UNSIGNED NOT NULL default 0,
-            session_id INT UNSIGNED NOT NULL default 0,
-            user_id INTEGER  NOT NULL,
-            allow_text_assignment INTEGER NOT NULL DEFAULT 0,
-            contains_file INTEGER NOT NULL DEFAULT 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLWORKSASS . "` (
-            $add_to_all_tables
-            id int NOT NULL auto_increment,
-            expires_on datetime NOT NULL default '0000-00-00 00:00:00',
-            ends_on datetime NOT NULL default '0000-00-00 00:00:00',
-            add_to_calendar tinyint NOT NULL,
-            enable_qualification tinyint NOT NULL,
-            publication_id int NOT NULL,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLWORKS . "` ADD INDEX ( session_id )";
-        Database::query($sql);
-
-        /*
-                Links tool
-        */
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLLINK . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            url TEXT NOT NULL,
-            title varchar(150) default NULL,
-            description text,
-            category_id int unsigned default NULL,
-            display_order int unsigned NOT NULL default 0,
-            on_homepage enum('0','1') NOT NULL default '0',
-            target char(10) default '_self',
-            session_id int default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLLINK . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLLINKCATEGORIES . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            category_title varchar(255) NOT NULL,
-            description text,
-            display_order mediumint unsigned NOT NULL default 0,
-            session_id int default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLLINKCATEGORIES . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        /* Wiki   */
-
-        $sql = "CREATE TABLE `" . $TABLETOOLWIKI . "` (
-            $add_to_all_tables
-            id int NOT NULL auto_increment,
-            page_id int NOT NULL default 0,
-            reflink varchar(255) NOT NULL default 'index',
-            title varchar(255) NOT NULL,
-            content mediumtext NOT NULL,
-            user_id int NOT NULL default 0,
-            group_id int DEFAULT NULL,
-            dtime datetime NOT NULL default '0000-00-00 00:00:00',
-            addlock int NOT NULL default 1,
-            editlock int NOT NULL default 0,
-            visibility int NOT NULL default 1,
-            addlock_disc int NOT NULL default 1,
-            visibility_disc int NOT NULL default 1,
-            ratinglock_disc int NOT NULL default 1,
-            assignment int NOT NULL default 0,
-            comment text NOT NULL,
-            progress text NOT NULL,
-            score int NULL default 0,
-            version int default NULL,
-            is_editing int NOT NULL default 0,
-            time_edit datetime NOT NULL default '0000-00-00 00:00:00',
-            hits int default 0,
-            linksto text NOT NULL,
-            tag text NOT NULL,
-            user_ip varchar(39) NOT NULL,
-            session_id int default 0,
-            PRIMARY KEY (c_id, id),
-            KEY reflink (reflink),
-            KEY group_id (group_id),
-            KEY page_id (page_id),
-            KEY session_id (session_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLEWIKICONF . "` (
-            $add_to_all_tables
-            page_id int NOT NULL default 0,
-            task text NOT NULL,
-            feedback1 text NOT NULL,
-            feedback2 text NOT NULL,
-            feedback3 text NOT NULL,
-            fprogress1 varchar(3) NOT NULL,
-            fprogress2 varchar(3) NOT NULL,
-            fprogress3 varchar(3) NOT NULL,
-            max_size int default NULL,
-            max_text int default NULL,
-            max_version int default NULL,
-            startdate_assig datetime NOT NULL default '0000-00-00 00:00:00',
-            enddate_assig datetime  NOT NULL default '0000-00-00 00:00:00',
-            delayedsubmit int NOT NULL default 0,
-            KEY page_id (page_id),
-            PRIMARY KEY  ( c_id, page_id )
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLEWIKIDISCUSS . "` (
-            $add_to_all_tables
-            id int NOT NULL auto_increment,
-            publication_id int NOT NULL default 0,
-            userc_id int NOT NULL default 0,
-            comment text NOT NULL,
-            p_score varchar(255) default NULL,
-            dtime datetime NOT NULL default '0000-00-00 00:00:00',
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLEWIKIMAILCUE . "` (
-            $add_to_all_tables
-            id int NOT NULL,
-            user_id int NOT NULL,
-            type text NOT NULL,
-            group_id int DEFAULT NULL,
-            session_id int default 0,
-            KEY (c_id, id),
-            PRIMARY KEY  ( c_id, id, user_id )
-            )" . $charset_clause;
-        Database::query($sql);
-
-        /*
-            Online
-        */
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLONLINECONNECTED . "` (
-            $add_to_all_tables
-            user_id int unsigned NOT NULL,
-            last_connection datetime NOT NULL default '0000-00-00 00:00:00',
-            PRIMARY KEY (c_id, user_id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLONLINELINK . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            name char(50) NOT NULL default '',
-            url char(100) NOT NULL,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $TABLETOOLCHATCONNECTED . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            user_id int unsigned NOT NULL default '0',
-            last_connection datetime NOT NULL default '0000-00-00 00:00:00',
-            session_id  INT NOT NULL default 0,
-            to_group_id INT NOT NULL default 0,
-            PRIMARY KEY  (c_id, id, user_id, last_connection)
-            )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLCHATCONNECTED . "` ADD INDEX char_connected_index(user_id, session_id, to_group_id) ";
-        Database::query($sql);
-
-        /*
-            Groups tool
-        */
-
-        Database::query(
-            "CREATE TABLE `" . $TABLEGROUPS . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            name varchar(100) default NULL,
-            status tinyint DEFAULT 1,
-            category_id int unsigned NOT NULL default 0,
-            description text,
-            max_student int unsigned NOT NULL default 8,
-            doc_state tinyint unsigned NOT NULL default 1,
-            calendar_state tinyint unsigned NOT NULL default 0,
-            work_state tinyint unsigned NOT NULL default 0,
-            announcements_state tinyint unsigned NOT NULL default 0,
-            forum_state tinyint unsigned NOT NULL default 0,
-            wiki_state tinyint unsigned NOT NULL default 1,
-            chat_state tinyint unsigned NOT NULL default 1,
-            secret_directory varchar(255) default NULL,
-            self_registration_allowed tinyint unsigned NOT NULL default '0',
-            self_unregistration_allowed tinyint unsigned NOT NULL default '0',
-            session_id int unsigned NOT NULL default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "ALTER TABLE `" . $TABLEGROUPS . "` ADD INDEX ( session_id )"
-        );
-
-        Database::query(
-            "CREATE TABLE `" . $TABLEGROUPCATEGORIES . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            title varchar(255) NOT NULL default '',
-            description text NOT NULL,
-            doc_state tinyint unsigned NOT NULL default 1,
-            calendar_state tinyint unsigned NOT NULL default 1,
-            work_state tinyint unsigned NOT NULL default 1,
-            announcements_state tinyint unsigned NOT NULL default 1,
-            forum_state tinyint unsigned NOT NULL default 1,
-            wiki_state tinyint unsigned NOT NULL default 1,
-            chat_state tinyint unsigned NOT NULL default 1,
-            max_student int unsigned NOT NULL default 8,
-            self_reg_allowed tinyint unsigned NOT NULL default 0,
-            self_unreg_allowed tinyint unsigned NOT NULL default 0,
-            groups_per_user int unsigned NOT NULL default 0,
-            display_order int unsigned NOT NULL default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "CREATE TABLE `" . $TABLEGROUPUSER . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            user_id int unsigned NOT NULL,
-            group_id int unsigned NOT NULL default 0,
-            status int NOT NULL default 0,
-            role char(50) NOT NULL,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "CREATE TABLE `" . $TABLEGROUPTUTOR . "` (
-            $add_to_all_tables
-            id int NOT NULL auto_increment,
-            user_id int NOT NULL,
-            group_id int NOT NULL default 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "CREATE TABLE `" . $TABLEITEMPROPERTY . "` (
-            $add_to_all_tables
-            id int NOT NULL auto_increment,
-            tool varchar(100) NOT NULL default '',
-            insert_user_id int unsigned NOT NULL default '0',
-            insert_date datetime NOT NULL default '0000-00-00 00:00:00',
-            lastedit_date datetime NOT NULL default '0000-00-00 00:00:00',
-            ref int NOT NULL default '0',
-            lastedit_type varchar(100) NOT NULL default '',
-            lastedit_user_id int unsigned NOT NULL default '0',
-            to_group_id int unsigned default NULL,
-            to_user_id int unsigned default NULL,
-            visibility tinyint NOT NULL default '1',
-            start_visible datetime NOT NULL default '0000-00-00 00:00:00',
-            end_visible datetime NOT NULL default '0000-00-00 00:00:00',
-            id_session INT NOT NULL DEFAULT 0,
-            PRIMARY KEY (c_id, id)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "ALTER TABLE `$TABLEITEMPROPERTY` ADD INDEX idx_item_property_toolref (tool,ref)"
-        );
-
-        /*           Tool introductions    */
-        Database::query(
-            "
-            CREATE TABLE `" . $TABLEINTROS . "` (
-            $add_to_all_tables
-            id varchar(50) NOT NULL,
-            intro_text MEDIUMTEXT NOT NULL,
-            session_id INT  NOT NULL DEFAULT 0,
-            PRIMARY KEY (c_id, id, session_id)
-            )" . $charset_clause
-        );
-
-        /* Dropbox tool */
-
-        Database::query(
-            "
-            CREATE TABLE `" . $TABLETOOLDROPBOXFILE . "` (
-            $add_to_all_tables
-            id int unsigned NOT NULL auto_increment,
-            uploader_id int unsigned NOT NULL default 0,
-            filename varchar(250) NOT NULL default '',
-            filesize int unsigned NOT NULL,
-            title varchar(250) default '',
-            description varchar(250) default '',
-            author varchar(250) default '',
-            upload_date datetime NOT NULL default '0000-00-00 00:00:00',
-            last_upload_date datetime NOT NULL default '0000-00-00 00:00:00',
-            cat_id int NOT NULL default 0,
-            session_id int UNSIGNED NOT NULL,
-            PRIMARY KEY (c_id, id),
-            UNIQUE KEY UN_filename (filename)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "ALTER TABLE `$TABLETOOLDROPBOXFILE` ADD INDEX ( session_id )"
-        );
-
-        Database::query(
-            "
-            CREATE TABLE `" . $TABLETOOLDROPBOXPOST . "` (
-            $add_to_all_tables
-            file_id int unsigned NOT NULL,
-            dest_user_id int unsigned NOT NULL default 0,
-            feedback_date datetime NOT NULL default '0000-00-00 00:00:00',
-            feedback text default '',
-            cat_id int NOT NULL default 0,
-            session_id int UNSIGNED NOT NULL,
-            PRIMARY KEY (c_id, file_id, dest_user_id)
-            )" . $charset_clause
-        );
-
-        Database::query(
-            "ALTER TABLE `$TABLETOOLDROPBOXPOST` ADD INDEX ( session_id )"
-        );
-
-        Database::query(
-            "
-            CREATE TABLE `" . $TABLETOOLDROPBOXPERSON . "` (
-            $add_to_all_tables
-            file_id int unsigned NOT NULL,
-            user_id int unsigned NOT NULL default 0,
-            PRIMARY KEY (c_id, file_id, user_id)
-            )" . $charset_clause
-        );
-
-        $sql = "CREATE TABLE `" . $TABLETOOLDROPBOXCATEGORY . "` (
-                  $add_to_all_tables
-                  cat_id int NOT NULL auto_increment,
-                  cat_name text NOT NULL,
-                  received tinyint unsigned NOT NULL default 0,
-                  sent tinyint unsigned NOT NULL default 0,
-                  user_id int NOT NULL default 0,
-                  session_id int NOT NULL default 0,
-                  PRIMARY KEY  (c_id, cat_id)
-                  )" . $charset_clause;
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLETOOLDROPBOXCATEGORY . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLETOOLDROPBOXFEEDBACK . "` (
-                    $add_to_all_tables
-                  feedback_id int NOT NULL auto_increment,
-                  file_id int NOT NULL default 0,
-                  author_user_id int NOT NULL default 0,
-                  feedback text NOT NULL,
-                  feedback_date datetime NOT NULL default '0000-00-00 00:00:00',
-                  PRIMARY KEY  (c_id, feedback_id),
-                  KEY file_id (file_id),
-                  KEY author_user_id (author_user_id)
-                  )" . $charset_clause;
-        Database::query($sql);
-
-        /*
-            New learning path tool
-        */
-
-        $sql = "CREATE TABLE IF NOT EXISTS `$TABLELP` (
-            $add_to_all_tables
-            " .
-            "id             int unsigned        auto_increment," .  // unique ID, generated by MySQL
-            "lp_type        int unsigned   not null," .                    // lp_types can be found in the main database's lp_type table
-            "name           varchar(255)        not null," .                    // name is the text name of the learning path (e.g. Word 2000)
-            "ref            tinytext            null," .                        // ref for SCORM elements is the SCORM ID in imsmanifest. For other learnpath types, just ignore
-            "description    text                null," .                         // textual description
-            "path           text                not null," .                    // path, starting at the platforms root (so all paths should start with 'courses/...' for now)
-            "force_commit   tinyint unsigned    not null default 0, " .         // stores the default behaviour regarding SCORM information
-            "default_view_mod   char(32)        not null default 'embedded'," . // stores the default view mode (embedded or fullscreen)
-            "default_encoding   char(32)        not null default 'UTF-8', " .   // stores the encoding detected at learning path reading
-            "display_order  int unsigned        not null default 0," .          // order of learnpaths display in the learnpaths list - not really important
-            "content_maker  tinytext            not null default ''," .         // the content make for this course (ENI, Articulate, ...)
-            "content_local  varchar(32)         not null default 'local'," .    // content localisation ('local' or 'distant')
-            "content_license    text            not null default ''," .         // content license
-            "prevent_reinit tinyint unsigned    not null default 1," .          // stores the default behaviour regarding items re-initialisation when viewed a second time after success
-            "js_lib         tinytext            not null default ''," .         // the JavaScript library to load for this lp
-            "debug          tinyint unsigned    not null default 0," .          // stores the default behaviour regarding items re-initialisation when viewed a second time after success
-            "theme          varchar(255)        not null default '', " .        // stores the theme of the LP
-            "preview_image  varchar(255)        not null default '', " .        // stores the theme of the LP
-            "author         varchar(255)        not null default '', " .        // stores the theme of the LP
-            "session_id     int unsigned        not null default 0, " .         // the session_id
-            "prerequisite   int unsigned        not null default 0," .          // pre requisite for next lp
-            "hide_toc_frame tinyint             NOT NULL DEFAULT 0, " .
-            "seriousgame_mode tinyint           NOT NULL DEFAULT 0, " .
-            "use_max_score  int unsigned        not null default 1, " .
-            "autolunch      int unsigned        not null default 0, " .          // auto lunch LP
-            "created_on     DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00', " .
-            "modified_on    DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00', " .
-            "publicated_on  DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00', " .
-            "expired_on     DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00',
-             PRIMARY KEY  (c_id, id)
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "CREATE TABLE IF NOT EXISTS `$TABLELPVIEW` (
-            $add_to_all_tables" .
-            "id             int unsigned        auto_increment," .  // unique ID from MySQL
-            "lp_id          int unsigned        not null," .                    // learnpath ID from 'lp'
-            "user_id        int unsigned        not null," .                    // user ID from main.user
-            "view_count     int unsigned   not null default 0," .          // integer counting the amount of times this learning path has been attempted
-            "last_item      int unsigned        not null default 0," .          // last item seen in this view
-            "progress       int unsigned        default 0," .
-            "session_id     int                 not null default 0,
-             PRIMARY KEY  (c_id, id)
-            )" . $charset_clause; // lp's progress for this user
-
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPVIEW` ADD INDEX (lp_id) ";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPVIEW` ADD INDEX (user_id) ";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPVIEW` ADD INDEX (session_id) ";
-        Database::query($sql);
-
-        $sql = "CREATE TABLE IF NOT EXISTS `$TABLELPITEM` (
-            $add_to_all_tables
-            " .
-            "id              int unsigned       auto_increment," .  // unique ID from MySQL
-            "lp_id          int unsigned        not null," .                    // lp_id from 'lp'
-            "item_type      char(32)            not null default 'dokeos_document'," .  // can be dokeos_document, dokeos_chapter or scorm_asset, scorm_sco, scorm_chapter
-            "ref            tinytext            not null default ''," .         // the ID given to this item in the imsmanifest file
-            "title          varchar(511)        not null," .                    // the title/name of this item (to display in the T.O.C.)
-            "description    varchar(511)        not null default ''," .         // the description of this item - deprecated
-            "path           text                not null," .                    // the path to that item, starting at 'courses/...' level
-            "min_score      float unsigned      not null default 0," .          // min score allowed
-            "max_score      float unsigned      default 100," .                 // max score allowed
-            "mastery_score  float unsigned      null," .                        // minimum score to pass the test
-            "parent_item_id     int unsigned    not null default 0," .          // the item one level higher
-            "previous_item_id   int unsigned    not null default 0," .          // the item before this one in the sequential learning order (MySQL id)
-            "next_item_id       int unsigned    not null default 0," .          // the item after this one in the sequential learning order (MySQL id)
-            "display_order      int unsigned    not null default 0," .          // this is needed for ordering items under the same parent (previous_item_id doesn't give correct order after reordering)
-            "prerequisite   text                null default null," .           // prerequisites in AICC scripting language as defined in the SCORM norm (allow logical operators)
-            "parameters     text                null," .                        // prerequisites in AICC scripting language as defined in the SCORM norm (allow logical operators)
-            "launch_data    text                not null default ''," .         // data from imsmanifest <item>
-            "max_time_allowed   char(13)        NULL default ''," .             // data from imsmanifest <adlcp:maxtimeallowed>
-            "terms          TEXT                NULL," .                        // contains the indexing tags (search engine)
-            "search_did     INT                 NULL," .                         // contains the internal search-engine id of this element
-            "audio          VARCHAR(250),
-            prerequisite_min_score float,
-            prerequisite_max_score float,
-            PRIMARY KEY  (c_id, id)
-        )" . $charset_clause;                   // contains the audio file that goes with the learning path step
-
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPITEM` ADD INDEX (lp_id)";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE $TABLELPITEM ADD INDEX idx_c_lp_item_cid_lp_id (c_id, lp_id)";
-        Database::query($sql);
-
-        $sql = "CREATE TABLE IF NOT EXISTS `$TABLELPITEMVIEW` (
-            $add_to_all_tables
-            " .
-            "id             bigint unsigned auto_increment," .      // unique ID
-            "lp_item_id     int unsigned    not null," .                        // item ID (MySQL id)
-            "lp_view_id     int unsigned    not null," .                        // learning path view id (attempt)
-            "view_count     int unsigned    not null default 0," .              // how many times this item has been viewed in the current attempt (generally 0 or 1)
-            "start_time     int unsigned    not null," .                        // when did the user open it?
-            "total_time     int unsigned    not null default 0," .              // after how many seconds did he close it?
-            "score          float unsigned  not null default 0," .              // score returned by SCORM or other techs
-            "status         char(32)        not null default 'not attempted'," .    // status for this item (SCORM)
-            "suspend_data   longtext null default ''," .
-            "lesson_location    text        null default ''," .
-            "core_exit      varchar(32)     not null default 'none'," .
-            "max_score      varchar(8)      default '',
-            PRIMARY KEY  (c_id, id)
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPITEMVIEW` ADD INDEX (lp_item_id) ";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPITEMVIEW` ADD INDEX (lp_view_id) ";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE $TABLELPITEMVIEW ADD INDEX idx_c_lp_item_view_cid_lp_view_id_lp_item_id (c_id, lp_view_id, lp_item_id) ";
-        Database::query($sql);
-
-
-        $sql = "CREATE TABLE IF NOT EXISTS `$TABLELPIVINTERACTION`(
-             $add_to_all_tables" .
-            "id             bigint unsigned     auto_increment," .
-            "order_id       int unsigned   not null default 0," .           // internal order (0->...) given by Dokeos
-            "lp_iv_id       bigint unsigned     not null," .                    // identifier of the related sco_view
-            "interaction_id varchar(255)        not null default ''," .         // sco-specific, given by the sco
-            "interaction_type   varchar(255)    not null default ''," .         // literal values, SCORM-specific (see p.63 of SCORM 1.2 RTE)
-            "weighting          double          not null default 0," .
-            "completion_time    varchar(16)     not null default ''," .         // completion time for the interaction (timestamp in a day's time) - expected output format is scorm time
-            "correct_responses  text            not null default ''," .         // actually a serialised array. See p.65 os SCORM 1.2 RTE)
-            "student_response   text            not null default ''," .         // student response (format depends on type)
-            "result         varchar(255)        not null default ''," .         // textual result
-            "latency        varchar(16)         not null default ''," .          // time necessary for completion of the interaction
-            "PRIMARY KEY  (c_id, id)" .
-            ")" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPIVINTERACTION` ADD INDEX (lp_iv_id) ";
-        Database::query($sql);
-
-        $sql = "CREATE TABLE IF NOT EXISTS `$TABLELPIVOBJECTIVE`(
-            $add_to_all_tables" .
-            "id             bigint unsigned     auto_increment," .
-            "lp_iv_id       bigint unsigned     not null," .                    // identifier of the related sco_view
-            "order_id       int unsigned   not null default 0," .           // internal order (0->...) given by Dokeos
-            "objective_id   varchar(255)        not null default ''," .         // sco-specific, given by the sco
-            "score_raw      float unsigned      not null default 0," .          // score
-            "score_max      float unsigned      not null default 0," .          // max score
-            "score_min      float unsigned      not null default 0," .          // min score
-            "status         char(32)            not null default 'not attempted', " . //status, just as sco status
-            "PRIMARY KEY  (c_id, id) " .
-            ")" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `$TABLELPIVOBJECTIVE` ADD INDEX (lp_iv_id) ";
-        Database::query($sql);
-
-        /* Blogs */
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs . "` (
-                $add_to_all_tables
-                blog_id int NOT NULL AUTO_INCREMENT ,
-                blog_name varchar( 250 ) NOT NULL default '',
-                blog_subtitle varchar( 250 ) default NULL ,
-                date_creation datetime NOT NULL default '0000-00-00 00:00:00',
-                visibility tinyint unsigned NOT NULL default 0,
-                session_id int default 0,
-                PRIMARY KEY (c_id, blog_id )
-            )" . $charset_clause . " COMMENT = 'Table with blogs in this course';";
-
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $tbl_blogs . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs_comments . "` (
-                $add_to_all_tables
-                comment_id int NOT NULL AUTO_INCREMENT ,
-                title varchar( 250 ) NOT NULL default '',
-                comment longtext NOT NULL ,
-                author_id int NOT NULL default 0,
-                date_creation datetime NOT NULL default '0000-00-00 00:00:00',
-                blog_id int NOT NULL default 0,
-                post_id int NOT NULL default 0,
-                task_id int default NULL ,
-                parent_comment_id int NOT NULL default 0,
-                PRIMARY KEY (c_id, comment_id )
-            )" . $charset_clause . " COMMENT = 'Table with comments on posts in a blog';";
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs_posts . "` (
-                $add_to_all_tables
-                post_id int NOT NULL AUTO_INCREMENT ,
-                title varchar( 250 ) NOT NULL default '',
-                full_text longtext NOT NULL ,
-                date_creation datetime NOT NULL default '0000-00-00 00:00:00',
-                blog_id int NOT NULL default 0,
-                author_id int NOT NULL default 0,
-                PRIMARY KEY (c_id, post_id )
-            )" . $charset_clause . " COMMENT = 'Table with posts / blog.';";
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs_rating . "` (
-                $add_to_all_tables
-                rating_id int NOT NULL AUTO_INCREMENT ,
-                blog_id int NOT NULL default 0,
-                rating_type enum( 'post', 'comment' ) NOT NULL default 'post',
-                item_id int NOT NULL default 0,
-                user_id int NOT NULL default 0,
-                rating int NOT NULL default 0,
-                PRIMARY KEY (c_id, rating_id )
-            )" . $charset_clause . " COMMENT = 'Table with ratings for post/comments in a certain blog';";
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs_rel_user . "` (
-                $add_to_all_tables
-                blog_id int NOT NULL default 0,
-                user_id int NOT NULL default 0,
-                PRIMARY KEY ( c_id, blog_id , user_id )
-            )" . $charset_clause . " COMMENT = 'Table representing users subscribed to a blog';";
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs_tasks . "` (
-                $add_to_all_tables
-                task_id int NOT NULL AUTO_INCREMENT ,
-                blog_id int NOT NULL default 0,
-                title varchar( 250 ) NOT NULL default '',
-                description text NOT NULL ,
-                color varchar( 10 ) NOT NULL default '',
-                system_task tinyint unsigned NOT NULL default 0,
-                PRIMARY KEY (c_id, task_id )
-            )" . $charset_clause . " COMMENT = 'Table with tasks for a blog';";
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_blogs_tasks_rel_user . "` (
-                $add_to_all_tables
-                blog_id int NOT NULL default 0,
-                user_id int NOT NULL default 0,
-                task_id int NOT NULL default 0,
-                target_date date NOT NULL default '0000-00-00',
-                PRIMARY KEY (c_id, blog_id , user_id , task_id )
-            )" . $charset_clause . " COMMENT = 'Table with tasks assigned to a user in a blog';";
-
-        Database::query($sql);
-
-        $sql = "CREATE TABLE  `" . $tbl_blogs_attachment . "` (
-              $add_to_all_tables
-              id int unsigned NOT NULL auto_increment,
-              path varchar(255) NOT NULL COMMENT 'the real filename',
-              comment text,
-              size int NOT NULL default '0',
-              post_id int NOT NULL,
-              filename varchar(255) NOT NULL COMMENT 'the user s file name',
-              blog_id int NOT NULL,
-              comment_id int NOT NULL default '0',
-              PRIMARY KEY  (c_id, id)
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_permission_group . "` (
-                $add_to_all_tables
-                id int NOT NULL AUTO_INCREMENT ,
-                group_id int NOT NULL default 0,
-                tool varchar( 250 ) NOT NULL default '',
-                action varchar( 250 ) NOT NULL default '',
-                PRIMARY KEY (c_id, id)
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_permission_user . "` (
-                $add_to_all_tables
-                id int NOT NULL AUTO_INCREMENT ,
-                user_id int NOT NULL default 0,
-                tool varchar( 250 ) NOT NULL default '',
-                action varchar( 250 ) NOT NULL default '',
-                PRIMARY KEY (c_id, id )
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_permission_task . "` (
-                $add_to_all_tables
-                id int NOT NULL AUTO_INCREMENT,
-                task_id int NOT NULL default 0,
-                tool varchar( 250 ) NOT NULL default '',
-                action varchar( 250 ) NOT NULL default '',
-                PRIMARY KEY (c_id, id )
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_role . "` (
-                $add_to_all_tables
-                role_id int NOT NULL AUTO_INCREMENT,
-                role_name varchar( 250 ) NOT NULL default '',
-                role_comment text,
-                default_role tinyint default 0,
-                PRIMARY KEY (c_id, role_id)
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_role_group . "` (
-                $add_to_all_tables
-                id int NOT NULL AUTO_INCREMENT,
-                role_id int NOT NULL default 0,
-                scope varchar( 20 ) NOT NULL default 'course',
-                group_id int NOT NULL default 0,
-                PRIMARY KEY  (id, c_id, group_id )
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_role_permissions . "` (
-                $add_to_all_tables
-                id int NOT NULL AUTO_INCREMENT,
-                role_id int NOT NULL default 0,
-                tool varchar( 250 ) NOT NULL default '',
-                action varchar( 50 ) NOT NULL default '',
-                default_perm tinyint NOT NULL default 0,
-                PRIMARY KEY  (id, c_id, role_id, tool, action )
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        $sql = "
-            CREATE TABLE `" . $tbl_role_user . "` (
-                $add_to_all_tables
-                role_id int NOT NULL default 0,
-                scope varchar( 20 ) NOT NULL default 'course',
-                user_id int NOT NULL default 0,
-                PRIMARY KEY  ( c_id, role_id, user_id )
-            )" . $charset_clause;
-
-        Database::query($sql);
-
-        /*
-         * Course Config Settings
-         *
-         */
-
-        Database::query(
-            "
-            CREATE TABLE `" . $TABLESETTING . "` (
-            $add_to_all_tables
-            id          int unsigned NOT NULL auto_increment,
-            variable    varchar(255) NOT NULL default '',
-            subkey      varchar(255) default NULL,
-            type        varchar(255) default NULL,
-            category    varchar(255) default NULL,
-            value       varchar(255) NOT NULL default '',
-            title       varchar(255) NOT NULL default '',
-            comment     varchar(255) default NULL,
-            subkeytext  varchar(255) default NULL,
-            PRIMARY KEY (c_id, id)
-             )" . $charset_clause
-        );
-
-        /*
-            Survey
-        */
-
-        $sql = "CREATE TABLE `" . $TABLESURVEY . "` (
-                $add_to_all_tables
-                  survey_id int unsigned NOT NULL auto_increment,
-                  code varchar(20) default NULL,
-                  title text default NULL,
-                  subtitle text default NULL,
-                  author varchar(20) default NULL,
-                  lang varchar(20) default NULL,
-                  avail_from date default NULL,
-                  avail_till date default NULL,
-                  is_shared char(1) default '1',
-                  template varchar(20) default NULL,
-                  intro text,
-                  surveythanks text,
-                  creation_date datetime NOT NULL default '0000-00-00 00:00:00',
-                  invited int NOT NULL,
-                  answered int NOT NULL,
-                  invite_mail text NOT NULL,
-                  reminder_mail text NOT NULL,
-                  mail_subject VARCHAR( 255 ) NOT NULL,
-                  anonymous enum('0','1') NOT NULL default '0',
-                  access_condition TEXT DEFAULT NULL,
-                  shuffle bool NOT NULL default '0',
-                  one_question_per_page bool NOT NULL default '0',
-                  survey_version varchar(255) NOT NULL default '',
-                  parent_id int unsigned NOT NULL,
-                  survey_type int NOT NULL default 0,
-                  show_form_profile int NOT NULL default 0,
-                  form_fields TEXT NOT NULL,
-                  session_id int unsigned NOT NULL default 0,
-                  visible_results int unsigned DEFAULT 0,
-                  PRIMARY KEY  (c_id, survey_id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TABLESURVEY . "` ADD INDEX ( session_id )";
-        Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLESURVEYINVITATION . "` (
-                  $add_to_all_tables
-                  survey_invitation_id int unsigned NOT NULL auto_increment,
-                  survey_code varchar(20) NOT NULL,
-                  user varchar(250) NOT NULL,
-                  invitation_code varchar(250) NOT NULL,
-                  invitation_date datetime NOT NULL,
-                  reminder_date datetime NOT NULL,
-                  answered int NOT NULL default 0,
-                  session_id int UNSIGNED NOT NULL default 0,
-                  PRIMARY KEY  (c_id, survey_invitation_id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLESURVEYQUESTION . "` (
-                  $add_to_all_tables
-                  question_id int unsigned NOT NULL auto_increment,
-                  survey_id int unsigned NOT NULL,
-                  survey_question text NOT NULL,
-                  survey_question_comment text NOT NULL,
-                  type varchar(250) NOT NULL,
-                  display varchar(10) NOT NULL,
-                  sort int NOT NULL,
-                  shared_question_id int,
-                  max_value int,
-                  survey_group_pri int unsigned NOT NULL default '0',
-                  survey_group_sec1 int unsigned NOT NULL default '0',
-                  survey_group_sec2 int unsigned NOT NULL default '0',
-                  PRIMARY KEY  (c_id, question_id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLESURVEYQUESTIONOPTION . "` (
-            $add_to_all_tables
-          question_option_id int unsigned NOT NULL auto_increment,
-          question_id int unsigned NOT NULL,
-          survey_id int unsigned NOT NULL,
-          option_text text NOT NULL,
-          sort int NOT NULL,
-          value int NOT NULL default '0',
-          PRIMARY KEY  (c_id, question_option_id)
-        )" . $charset_clause;
-
-        $result = Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLESURVEYANSWER . "` (
-                  $add_to_all_tables
-                  answer_id int unsigned NOT NULL auto_increment,
-                  survey_id int unsigned NOT NULL,
-                  question_id int unsigned NOT NULL,
-                  option_id TEXT NOT NULL,
-                  value int unsigned NOT NULL,
-                  user varchar(250) NOT NULL,
-                  PRIMARY KEY  (c_id, answer_id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "CREATE TABLE `" . $TABLESURVEYGROUP . "` (
-                    $add_to_all_tables
-                  id int unsigned NOT NULL auto_increment,
-                  name varchar(20) NOT NULL,
-                  description varchar(255) NOT NULL,
-                  survey_id int unsigned NOT NULL,
-                  PRIMARY KEY  (c_id, id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        // Table glosary
-        $sql = "CREATE TABLE `" . $TBL_GLOSSARY . "` (
-                  $add_to_all_tables
-                  glossary_id int unsigned NOT NULL auto_increment,
-                  name varchar(255) NOT NULL,
-                  description text not null,
-                  display_order int,
-                  session_id int default 0,
-                  PRIMARY KEY  (c_id, glossary_id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_GLOSSARY . "` ADD INDEX ( session_id ) ";
-        Database::query($sql);
-
-        // Table notebook
-        $sql = "CREATE TABLE `" . $TBL_NOTEBOOK . "` (
-                  $add_to_all_tables
-                  notebook_id int unsigned NOT NULL auto_increment,
-                  user_id int unsigned NOT NULL,
-                  course varchar(40) not null,
-                  session_id int NOT NULL default 0,
-                  title varchar(255) NOT NULL,
-                  description text NOT NULL,
-                  creation_date datetime NOT NULL default '0000-00-00 00:00:00',
-                  update_date datetime NOT NULL default '0000-00-00 00:00:00',
-                  status int,
-                  PRIMARY KEY  (c_id, notebook_id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        /* Attendance tool */
-
-        // Attendance table
-        $sql = "
-            CREATE TABLE `" . $TBL_ATTENDANCE . "` (
-                $add_to_all_tables
-                id int NOT NULL auto_increment,
-                name text NOT NULL,
-                description TEXT NULL,
-                active tinyint NOT NULL default 1,
-                attendance_qualify_title varchar(255) NULL,
-                attendance_qualify_max int NOT NULL default 0,
-                attendance_weight float(6,2) NOT NULL default '0.0',
-                session_id int NOT NULL default 0,
-                locked int NOT NULL default 0,
-                PRIMARY KEY  (c_id, id)
-            )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE . "` ADD INDEX (session_id)";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE . "` ADD INDEX (active)";
-        Database::query($sql);
-
-        // Attendance sheet table
-        $sql = "
-            CREATE TABLE `" . $TBL_ATTENDANCE_SHEET . "` (
-                $add_to_all_tables
-                user_id int NOT NULL,
-                attendance_calendar_id int NOT NULL,
-                presence tinyint NOT NULL DEFAULT 0,
-                PRIMARY KEY(c_id, user_id, attendance_calendar_id)
-            )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE_SHEET . "` ADD INDEX (presence) ";
-        Database::query($sql);
-
-        // Attendance calendar table
-        $sql = "
-            CREATE TABLE `" . $TBL_ATTENDANCE_CALENDAR . "` (
-                $add_to_all_tables
-                id int NOT NULL auto_increment,
-                attendance_id int NOT NULL ,
-                date_time datetime NOT NULL default '0000-00-00 00:00:00',
-                done_attendance tinyint NOT NULL default 0,
-                PRIMARY KEY(c_id, id)
-            )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE_CALENDAR . "` ADD INDEX (attendance_id)";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE_CALENDAR . "` ADD INDEX (done_attendance)";
-        Database::query($sql);
-
-        // Attendance result table
-        $sql = "
-            CREATE TABLE `" . $TBL_ATTENDANCE_RESULT . "` (
-                $add_to_all_tables
-                id int NOT NULL auto_increment,
-                user_id int NOT NULL,
-                attendance_id int NOT NULL,
-                score int NOT NULL DEFAULT 0,
-                PRIMARY KEY  (c_id, id)
-            )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE_RESULT . "` ADD INDEX (attendance_id)";
-        Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_ATTENDANCE_RESULT . "` ADD INDEX (user_id)";
-        Database::query($sql);
-
-        // attendance sheet log table
-        $sql = "CREATE TABLE `" . $TBL_ATTENDANCE_SHEET_LOG . "` (
-                      $add_to_all_tables
-                      id int  NOT NULL auto_increment,
-                      attendance_id int  NOT NULL DEFAULT 0,
-                      lastedit_date datetime  NOT NULL DEFAULT '0000-00-00 00:00:00',
-                      lastedit_type varchar(200)  NOT NULL,
-                      lastedit_user_id int  NOT NULL DEFAULT 0,
-                      calendar_date_value datetime NULL,
-                      PRIMARY KEY (c_id, id)
-                    )" . $charset_clause;
-        $result = Database::query($sql) or die(Database::error());
-
-
-        // Thematic table
-        $sql = "CREATE TABLE `" . $TBL_THEMATIC . "` (
-                    $add_to_all_tables
-                    id int NOT NULL auto_increment,
-                    title varchar(255) NOT NULL,
-                    content text NULL,
-                    display_order int unsigned NOT NULL DEFAULT 0,
-                    active tinyint NOT NULL DEFAULT 0,
-                    session_id int NOT NULL DEFAULT 0,
-                    PRIMARY KEY  (c_id, id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_THEMATIC . "` ADD INDEX (active, session_id)";
-        Database::query($sql);
-
-        // thematic plan table
-        $sql = "CREATE TABLE `" . $TBL_THEMATIC_PLAN . "` (
-                    $add_to_all_tables
-                    id int NOT NULL auto_increment,
-                    thematic_id int NOT NULL,
-                    title varchar(255) NOT NULL,
-                    description text NULL,
-                    description_type int NOT NULL,
-                    PRIMARY KEY  (c_id, id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_THEMATIC_PLAN . "` ADD INDEX (thematic_id, description_type)";
-        Database::query($sql);
-
-        // thematic advance table
-        $sql = "
-                CREATE TABLE `" . $TBL_THEMATIC_ADVANCE . "` (
-                    $add_to_all_tables
-                    id int NOT NULL auto_increment,
-                    thematic_id int NOT NULL,
-                    attendance_id int NOT NULL DEFAULT 0,
-                    content text NULL,
-                    start_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-                    duration int NOT NULL DEFAULT 0,
-                    done_advance tinyint NOT NULL DEFAULT 0,
-                    PRIMARY KEY  (c_id, id)
-                )" . $charset_clause;
-        $result = Database::query($sql);
-
-        $sql = "ALTER TABLE `" . $TBL_THEMATIC_ADVANCE . "` ADD INDEX (thematic_id)";
-        Database::query($sql);
-
-
-        $sql = "CREATE TABLE IF NOT EXISTS " . $TBL_METADATA . " (    " .
-            $add_to_all_tables .
-            "eid VARCHAR(250) NOT NULL," .      // entry-id, e.g. doc.1
-            "mdxmltext TEXT default ''," .      // MD-text, XML-formatted
-            "md5 CHAR(32) default ''," .        // hash-validator
-            "htmlcache1 TEXT default ''," .     // cached HTML, part 1
-            "htmlcache2 TEXT default ''," .     // cached HTML, part 2
-            "indexabletext TEXT default ''," .  // indexable for search
-            "PRIMARY KEY (c_id, eid)           )" . $charset_clause;
-
-        Database::query($sql);
-
-        // New course tables for 1.10.x come here
-
-
-        return 0;
-    }
 
     /**
      * Returns a list of all files in the given course directory. The requested
@@ -2150,6 +418,7 @@ class AddCourse
         $course_repository,
         $language,
         $fill_with_exemplary_content = null
+
     ) {
         if (is_null($fill_with_exemplary_content)) {
             $fill_with_exemplary_content = api_get_setting(
@@ -2220,7 +489,8 @@ class AddCourse
         /*    Course tools  */
 
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_COURSE_DESCRIPTION . "','course_description/','info.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_COURSE_DESCRIPTION . "','course_description/','info.gif','" . self::string2binary(
                 api_get_setting(
                     'course_create_active_tools',
                     'course_description'
@@ -2228,62 +498,74 @@ class AddCourse
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_CALENDAR_EVENT . "','calendar/agenda.php','agenda.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_CALENDAR_EVENT . "','calendar/agenda.php','agenda.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'agenda')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_DOCUMENT . "','document/document.php','folder_document.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage  (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_DOCUMENT . "','document/document.php','folder_document.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'documents')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_LEARNPATH . "','newscorm/lp_controller.php','scorms.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_LEARNPATH . "','newscorm/lp_controller.php','scorms.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'learning_path')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_LINK . "','link/link.php','links.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+             VALUES ($course_id, NULL, '" . TOOL_LINK . "','link/link.php','links.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'links')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_QUIZ . "','exercice/exercice.php','quiz.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage  (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES  ($course_id, NULL, '" . TOOL_QUIZ . "','exercice/exercice.php','quiz.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'quiz')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_ANNOUNCEMENT . "','announcements/announcements.php','valves.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_ANNOUNCEMENT . "','announcements/announcements.php','valves.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'announcements')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_FORUM . "','forum/index.php','forum.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_FORUM . "','forum/index.php','forum.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'forums')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_DROPBOX . "','dropbox/index.php','dropbox.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_DROPBOX . "','dropbox/index.php','dropbox.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'dropbox')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_USER . "','user/user.php','members.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_USER . "','user/user.php','members.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'users')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_GROUP . "','group/group.php','group.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_GROUP . "','group/group.php','group.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'groups')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_CHAT . "','chat/chat.php','chat.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_CHAT . "','chat/chat.php','chat.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'chat')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_STUDENTPUBLICATION . "','work/work.php','works.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_STUDENTPUBLICATION . "','work/work.php','works.gif','" . self::string2binary(
                 api_get_setting(
                     'course_create_active_tools',
                     'student_publications'
@@ -2291,37 +573,44 @@ class AddCourse
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_SURVEY . "','survey/survey_list.php','survey.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_SURVEY . "','survey/survey_list.php','survey.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'survey')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_WIKI . "','wiki/index.php','wiki.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_WIKI . "','wiki/index.php','wiki.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'wiki')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_GRADEBOOK . "','gradebook/index.php','gradebook.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_GRADEBOOK . "','gradebook/index.php','gradebook.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'gradebook')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_GLOSSARY . "','glossary/index.php','glossary.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_GLOSSARY . "','glossary/index.php','glossary.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'glossary')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_NOTEBOOK . "','notebook/index.php','notebook.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_NOTEBOOK . "','notebook/index.php','notebook.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'notebook')
             ) . "','0','squaregrey.gif','NO','_self','interaction','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_ATTENDANCE . "','attendance/index.php','attendance.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_ATTENDANCE . "','attendance/index.php','attendance.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'attendances')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_COURSE_PROGRESS . "','course_progress/index.php','course_progress.gif','" . self::string2binary(
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_COURSE_PROGRESS . "','course_progress/index.php','course_progress.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'course_progress')
             ) . "','0','squaregrey.gif','NO','_self','authoring','0')"
         );
@@ -2330,17 +619,20 @@ class AddCourse
             $mycheck = api_get_setting('service_visio', 'visio_host');
             if (!empty($mycheck)) {
                 Database::query(
-                    "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio_meeting.gif','1','0','squaregrey.gif','NO','_self','interaction','0')"
+                    "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+                     VALUES ($course_id, NULL, '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio_meeting.gif','1','0','squaregrey.gif','NO','_self','interaction','0')"
                 );
                 Database::query(
-                    "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_VISIO_CLASSROOM . "','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring','0')"
+                    "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+                     VALUES ($course_id, NULL, '" . TOOL_VISIO_CLASSROOM . "','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring','0')"
                 );
             }
         }
 
         if (api_get_setting('search_enabled') == 'true') {
             Database::query(
-                "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_SEARCH . "','search/','info.gif','" . self::string2binary(
+                "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+                VALUES ($course_id, NULL, '" . TOOL_SEARCH . "','search/','info.gif','" . self::string2binary(
                     api_get_setting(
                         'course_create_active_tools',
                         'enable_search'
@@ -2350,7 +642,8 @@ class AddCourse
         }
 
         // Smartblogs (Kevin Van Den Haute :: kevin@develop-it.be)
-        $sql = "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL,'" . TOOL_BLOGS . "','blog/blog_admin.php','blog_admin.gif','" . self::string2binary(
+        $sql = "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+                VALUES ($course_id, NULL,'" . TOOL_BLOGS . "','blog/blog_admin.php','blog_admin.gif','" . self::string2binary(
                 api_get_setting('course_create_active_tools', 'blogs')
             ) . "','1','squaregrey.gif','NO','_self','admin','0')";
         Database::query($sql);
@@ -2359,13 +652,16 @@ class AddCourse
         /*  Course homepage tools for course admin only    */
 
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_TRACKING . "','tracking/courseLog.php','statistics.gif','$visible_for_course_admin','1','', 'NO','_self','admin','0')"
+            "INSERT INTO $tbl_course_homepage  (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_TRACKING . "','tracking/courseLog.php','statistics.gif','$visible_for_course_admin','1','', 'NO','_self','admin','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_COURSE_SETTING . "','course_info/infocours.php','reference.gif','$visible_for_course_admin','1','', 'NO','_self','admin','0')"
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_COURSE_SETTING . "','course_info/infocours.php','reference.gif','$visible_for_course_admin','1','', 'NO','_self','admin','0')"
         );
         Database::query(
-            "INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_COURSE_MAINTENANCE . "','course_info/maintenance.php','backup.gif','$visible_for_course_admin','1','','NO','_self', 'admin','0')"
+            "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id)
+            VALUES ($course_id, NULL, '" . TOOL_COURSE_MAINTENANCE . "','course_info/maintenance.php','backup.gif','$visible_for_course_admin','1','','NO','_self', 'admin','0')"
         );
 
         $defaultEmailExerciseAlert = 1;
@@ -2923,7 +1219,6 @@ class AddCourse
         $language_interface = $language_interface_original;
         return true;
     }
-
     /**
      * string2binary converts the string "true" or "false" to the boolean true false (0 or 1)
      * This is used for the Chamilo Config Settings as these store true or false as string
diff --git a/main/install/course.sql b/main/install/course.sql
new file mode 100644
index 0000000000..22e71e9298
--- /dev/null
+++ b/main/install/course.sql
@@ -0,0 +1,1244 @@
+
+CREATE TABLE c_announcement(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title text,
+  content mediumtext,
+  end_date date default NULL,
+  display_order mediumint NOT NULL default 0,
+  email_sent tinyint default 0,
+  session_id int default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_announcement ADD INDEX ( session_id );
+
+CREATE TABLE c_announcement_attachment (
+    id int NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    path varchar(255) NOT NULL,
+    comment text,
+    size int NOT NULL default 0,
+    announcement_id int NOT NULL,
+    filename varchar(255) NOT NULL,
+    PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_resource (
+    id int unsigned NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    source_type varchar(50) default NULL,
+    source_id int unsigned default NULL,
+    resource_type varchar(50) default NULL,
+    resource_id int unsigned default NULL,
+    PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_userinfo_content (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL,
+  definition_id int unsigned NOT NULL,
+  editor_ip varchar(39) default NULL,
+  edition_time datetime default NULL,
+  content text NOT NULL,
+  PRIMARY KEY (id, c_id),
+  KEY user_id (user_id)
+);
+
+CREATE TABLE c_userinfo_def (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title varchar(80) NOT NULL default '',
+  comment text,
+  line_count tinyint unsigned NOT NULL default 5,
+  rank tinyint unsigned NOT NULL default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_forum_category(
+ cat_id int NOT NULL auto_increment,
+ c_id INT NOT NULL,
+ cat_title varchar(255) NOT NULL default '',
+ cat_comment text,
+ cat_order int NOT NULL default 0,
+ locked int NOT NULL default 0,
+ session_id int unsigned NOT NULL default 0,
+ PRIMARY KEY (cat_id, c_id)
+);
+
+ALTER TABLE c_forum_category ADD INDEX ( session_id );
+
+CREATE TABLE c_forum_forum(
+  forum_id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  forum_title varchar(255) NOT NULL default '',
+  forum_comment text,
+  forum_threads int default 0,
+  forum_posts int default 0,
+  forum_last_post int default 0,
+  forum_category int default NULL,
+  allow_anonymous int default NULL,
+  allow_edit int default NULL,
+  approval_direct_post varchar(20) default NULL,
+  allow_attachments int default NULL,
+  allow_new_threads int default NULL,
+  default_view varchar(20) default NULL,
+  forum_of_group varchar(20) default NULL,
+  forum_group_public_private varchar(20) default 'public',
+  forum_order int default NULL,
+  locked int NOT NULL default 0,
+  session_id int NOT NULL default 0,
+  forum_image varchar(255) NOT NULL default '',
+  start_time datetime NOT NULL default '0000-00-00 00:00:00',
+  end_time datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY (forum_id, c_id)
+);
+
+CREATE TABLE c_forum_thread  (
+ thread_id int NOT NULL auto_increment,
+ c_id INT NOT NULL,
+ thread_title varchar(255) default NULL,
+ forum_id int default NULL,
+ thread_replies int default 0,
+ thread_poster_id int default NULL,
+ thread_poster_name varchar(100) default '',
+ thread_views int default 0,
+ thread_last_post int default NULL,
+ thread_date datetime default '0000-00-00 00:00:00',
+ thread_sticky tinyint unsigned default 0,
+ locked int NOT NULL default 0,
+ session_id int unsigned default NULL,
+ thread_title_qualify varchar(255) default '',
+ thread_qualify_max float(6,2) UNSIGNED NOT NULL default 0,
+ thread_close_date datetime default '0000-00-00 00:00:00',
+ thread_weight float(6,2) UNSIGNED NOT NULL default 0,
+ PRIMARY KEY (thread_id, c_id)
+);
+
+ALTER TABLE c_forum_thread ADD INDEX idx_forum_thread_forum_id (forum_id);
+
+CREATE TABLE c_forum_post (
+    post_id int NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    post_title varchar(250) default NULL,
+    post_text text,
+    thread_id int default 0,
+    forum_id int default 0,
+    poster_id int default 0,
+    poster_name varchar(100) default '',
+    post_date datetime default '0000-00-00 00:00:00',
+    post_notification tinyint default 0,
+    post_parent_id int default 0,
+    visible tinyint default 1,
+    PRIMARY KEY (post_id, c_id),
+    KEY poster_id (poster_id),
+    KEY forum_id (forum_id)
+);
+
+ALTER TABLE c_forum_post ADD INDEX idx_forum_post_thread_id (thread_id);
+ALTER TABLE c_forum_post ADD INDEX idx_forum_post_visible (visible);
+
+CREATE TABLE c_forum_mailcue  (
+ id int NOT NULL auto_increment,
+ c_id INT NOT NULL,
+ user_id int default NULL,
+ thread_id int default NULL,
+ post_id int default NULL,
+ PRIMARY KEY (id, c_id, thread_id, user_id, post_id )
+);
+
+CREATE TABLE  c_forum_attachment  (
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  path varchar(255) NOT NULL,
+  comment text,
+  size int NOT NULL default 0,
+  post_id int NOT NULL,
+  filename varchar(255) NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_forum_notification(
+    id int NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    user_id int,
+    forum_id int,
+    thread_id int,
+    post_id int,
+    KEY user_id (user_id),
+    KEY forum_id (forum_id),
+    PRIMARY KEY (id, c_id, user_id, forum_id, thread_id, post_id )
+);
+
+CREATE TABLE c_forum_thread_qualify  (
+  id int unsigned AUTO_INCREMENT,
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL,
+  thread_id int NOT NULL,
+  qualify float(6,2) NOT NULL default 0,
+  qualify_user_id int  default NULL,
+  qualify_time datetime default '0000-00-00 00:00:00',
+  session_id int  default NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_forum_thread_qualify ADD INDEX (user_id, thread_id);
+
+CREATE TABLE c_forum_thread_qualify_log  (
+  id int unsigned AUTO_INCREMENT,
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL,
+  thread_id int NOT NULL,
+  qualify float(6,2) NOT NULL default 0,
+  qualify_user_id int default NULL,
+  qualify_time datetime default '0000-00-00 00:00:00',
+  session_id int default NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_forum_thread_qualify_log  ADD INDEX (user_id, thread_id);
+
+CREATE TABLE c_quiz (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title varchar(255) NOT NULL,
+  description text default NULL,
+  sound varchar(255) default NULL,
+  type tinyint unsigned NOT NULL default 1,
+  random int NOT NULL default 0,
+  random_answers tinyint unsigned NOT NULL default 0,
+  active tinyint NOT NULL default 0,
+  results_disabled INT UNSIGNED NOT NULL DEFAULT 0,
+  access_condition TEXT DEFAULT NULL,
+  max_attempt int NOT NULL default 0,
+  start_time datetime NOT NULL default '0000-00-00 00:00:00',
+  end_time datetime NOT NULL default '0000-00-00 00:00:00',
+  feedback_type int NOT NULL default 0,
+  expired_time int NOT NULL default '0',
+  session_id int default 0,
+  propagate_neg INT NOT NULL DEFAULT 0,
+  review_answers INT NOT NULL DEFAULT 0,
+  random_by_category INT NOT NULL DEFAULT 0,
+  text_when_finished TEXT default NULL,
+  display_category_name INT NOT NULL DEFAULT 1,
+  pass_percentage INT DEFAULT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_quiz  ADD INDEX ( session_id );
+
+CREATE TABLE c_quiz_question(
+  id int unsigned NOT NULL auto_increment,
+  question TEXT NOT NULL,
+  description text default NULL,
+  ponderation float(6,2) NOT NULL default 0,
+  position mediumint unsigned NOT NULL default 1,
+  type    tinyint unsigned NOT NULL default 2,
+  picture varchar(50) default NULL,
+  level   int unsigned NOT NULL default 0,
+  extra   varchar(255) default NULL,
+  question_code char(10) default '',
+  c_id INT NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_quiz_question  ADD INDEX (position);
+
+CREATE TABLE c_quiz_answer(
+  id int unsigned NOT NULL,
+  c_id INT NOT NULL,
+  id_auto int NOT NULL AUTO_INCREMENT,
+  question_id int unsigned NOT NULL,
+  answer text NOT NULL,
+  correct mediumint unsigned default NULL,
+  comment text default NULL,
+  ponderation float(6,2) NOT NULL default 0,
+  position mediumint unsigned NOT NULL default 1,
+  hotspot_coordinates text,
+  hotspot_type enum('square','circle','poly','delineation','oar') default NULL,
+  destination text NOT NULL,
+  answer_code char(10) default '',
+  PRIMARY KEY (id_auto, c_id)
+);
+
+CREATE TABLE c_quiz_question_option  (
+  id          int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  question_id int NOT NULL,
+  name        varchar(255),
+  position    int unsigned NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_quiz_rel_question  (
+  c_id INT NOT NULL,
+  question_id int unsigned NOT NULL,
+  exercice_id int unsigned NOT NULL,
+  question_order int unsigned NOT NULL default 1,
+  PRIMARY KEY (c_id, question_id, exercice_id)
+);
+
+CREATE TABLE c_quiz_question_category  (
+  id int NOT NULL AUTO_INCREMENT,
+  c_id INT NOT NULL,
+  title varchar(255) NOT NULL,
+  description text NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_quiz_question_rel_category  (
+  c_id INT NOT NULL,
+  question_id int NOT NULL,
+  category_id int NOT NULL,
+  PRIMARY KEY (c_id,question_id)
+);
+
+CREATE TABLE c_course_description(
+  id int UNSIGNED NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title VARCHAR(255),
+  content TEXT,
+  session_id int default 0,
+  description_type tinyint unsigned NOT NULL default 0,
+  progress INT NOT NULL default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_course_description  ADD INDEX ( session_id );
+
+CREATE TABLE c_tool(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  name varchar(255) NOT NULL,
+  link varchar(255) NOT NULL,
+  image varchar(255) default NULL,
+  visibility tinyint unsigned default 0,
+  admin varchar(255) default NULL,
+  address varchar(255) default NULL,
+  added_tool tinyint unsigned default 1,
+  target enum('_self','_blank') NOT NULL default '_self',
+  category varchar(20) not null default 'authoring',
+  session_id int default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_tool ADD INDEX ( session_id );
+
+CREATE TABLE c_calendar_event(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title varchar(255) NOT NULL,
+  content text,
+  start_date datetime NOT NULL default '0000-00-00 00:00:00',
+  end_date datetime NOT NULL default '0000-00-00 00:00:00',
+  parent_event_id INT NULL,
+  session_id int unsigned NOT NULL default 0,
+  all_day INT NOT NULL DEFAULT 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_calendar_event ADD INDEX ( session_id );
+
+CREATE TABLE c_calendar_event_repeat(
+  c_id INT NOT NULL,
+  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 (c_id, cal_id)
+);
+
+CREATE TABLE c_calendar_event_repeat_not  (
+  c_id INT NOT NULL,
+  cal_id INT NOT NULL,
+  cal_date INT NOT NULL,
+  PRIMARY KEY (c_id, cal_id, cal_date )
+);
+
+CREATE TABLE  c_calendar_event_attachment  (
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  path varchar(255) NOT NULL,
+  comment text,
+  size int NOT NULL default 0,
+  agenda_id int NOT NULL,
+  filename varchar(255) NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_document (
+    id int unsigned NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    path varchar(255) NOT NULL default '',
+    comment text,
+    title varchar(255) default NULL,
+    filetype set('file','folder') NOT NULL default 'file',
+    size int NOT NULL default 0,
+    readonly TINYINT UNSIGNED NOT NULL,
+    session_id int UNSIGNED NOT NULL default 0,
+    PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_student_publication  (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  url varchar(255) default NULL,
+  title varchar(255) default NULL,
+  description text default NULL,
+  author varchar(255) default NULL,
+  active tinyint default NULL,
+  accepted tinyint default 0,
+  post_group_id int DEFAULT 0 NOT NULL,
+  sent_date datetime NOT NULL default '0000-00-00 00:00:00',
+  filetype set('file','folder') NOT NULL default 'file',
+  has_properties int UNSIGNED NOT NULL DEFAULT 0,
+  view_properties tinyint NULL,
+  qualification float(6,2) UNSIGNED NOT NULL DEFAULT 0,
+  date_of_qualification datetime NOT NULL default '0000-00-00 00:00:00',
+  parent_id INT UNSIGNED NOT NULL DEFAULT 0,
+  qualificator_id INT UNSIGNED NOT NULL DEFAULT 0,
+  weight float(6,2) UNSIGNED NOT NULL default 0,
+  session_id INT UNSIGNED NOT NULL default 0,
+  user_id INTEGER  NOT NULL,
+  allow_text_assignment INTEGER NOT NULL DEFAULT 0,
+  contains_file INTEGER NOT NULL DEFAULT 0,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_student_publication_assignment(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  expires_on datetime NOT NULL default '0000-00-00 00:00:00',
+  ends_on datetime NOT NULL default '0000-00-00 00:00:00',
+  add_to_calendar tinyint NOT NULL,
+  enable_qualification tinyint NOT NULL,
+  publication_id int NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_student_publication  ADD INDEX ( session_id );
+
+CREATE TABLE c_link(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  url TEXT NOT NULL,
+  title varchar(150) default NULL,
+  description text,
+  category_id int unsigned default NULL,
+  display_order int unsigned NOT NULL default 0,
+  on_homepage enum('0','1') NOT NULL default '0',
+  target char(10) default '_self',
+  session_id int default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_link  ADD INDEX ( session_id );
+
+CREATE TABLE c_link_category (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  category_title varchar(255) NOT NULL,
+  description text,
+  display_order mediumint unsigned NOT NULL default 0,
+  session_id int default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_link_category  ADD INDEX ( session_id );
+
+CREATE TABLE c_wiki(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  page_id int NOT NULL default 0,
+  reflink varchar(255) NOT NULL default 'index',
+  title varchar(255) NOT NULL,
+  content mediumtext NOT NULL,
+  user_id int NOT NULL default 0,
+  group_id int DEFAULT NULL,
+  dtime datetime NOT NULL default '0000-00-00 00:00:00',
+  addlock int NOT NULL default 1,
+  editlock int NOT NULL default 0,
+  visibility int NOT NULL default 1,
+  addlock_disc int NOT NULL default 1,
+  visibility_disc int NOT NULL default 1,
+  ratinglock_disc int NOT NULL default 1,
+  assignment int NOT NULL default 0,
+  comment text NOT NULL,
+  progress text NOT NULL,
+  score int NULL default 0,
+  version int default NULL,
+  is_editing int NOT NULL default 0,
+  time_edit datetime NOT NULL default '0000-00-00 00:00:00',
+  hits int default 0,
+  linksto text NOT NULL,
+  tag text NOT NULL,
+  user_ip varchar(39) NOT NULL,
+  session_id int default 0,
+  PRIMARY KEY (id, c_id),
+  KEY reflink (reflink),
+  KEY group_id (group_id),
+  KEY page_id (page_id),
+  KEY session_id (session_id)
+);
+
+CREATE TABLE c_wiki_conf  (
+  c_id INT NOT NULL,
+  page_id int NOT NULL default 0,
+  task text NOT NULL,
+  feedback1 text NOT NULL,
+  feedback2 text NOT NULL,
+  feedback3 text NOT NULL,
+  fprogress1 varchar(3) NOT NULL,
+  fprogress2 varchar(3) NOT NULL,
+  fprogress3 varchar(3) NOT NULL,
+  max_size int default NULL,
+  max_text int default NULL,
+  max_version int default NULL,
+  startdate_assig datetime NOT NULL default '0000-00-00 00:00:00',
+  enddate_assig datetime  NOT NULL default '0000-00-00 00:00:00',
+  delayedsubmit int NOT NULL default 0,
+  KEY page_id (page_id),
+  PRIMARY KEY  ( c_id, page_id )
+);
+
+CREATE TABLE c_wiki_discuss  (
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  publication_id int NOT NULL default 0,
+  userc_id int NOT NULL default 0,
+  comment text NOT NULL,
+  p_score varchar(255) default NULL,
+  dtime datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_wiki_mailcue  (
+  c_id INT NOT NULL,
+  id int NOT NULL,
+  user_id int NOT NULL,
+  type text NOT NULL,
+  group_id int DEFAULT NULL,
+  session_id int default 0,
+  KEY (c_id, id),
+  PRIMARY KEY  ( c_id, id, user_id )
+);
+
+CREATE TABLE c_online_connected  (
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL,
+  last_connection datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY (c_id, user_id)
+);
+
+CREATE TABLE c_online_link (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  name char(50) NOT NULL default '',
+  url char(100) NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_chat_connected (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL default '0',
+  last_connection datetime NOT NULL default '0000-00-00 00:00:00',
+  session_id  INT NOT NULL default 0,
+  to_group_id INT NOT NULL default 0,
+  PRIMARY KEY  (id, c_id, user_id, last_connection)
+);
+
+ALTER TABLE c_chat_connected ADD INDEX char_connected_index(user_id, session_id, to_group_id);
+
+CREATE TABLE c_group_info(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  name varchar(100) default NULL,
+  status tinyint DEFAULT 1,
+  category_id int unsigned NOT NULL default 0,
+  description text,
+  max_student int unsigned NOT NULL default 8,
+  doc_state tinyint unsigned NOT NULL default 1,
+  calendar_state tinyint unsigned NOT NULL default 0,
+  work_state tinyint unsigned NOT NULL default 0,
+  announcements_state tinyint unsigned NOT NULL default 0,
+  forum_state tinyint unsigned NOT NULL default 0,
+  wiki_state tinyint unsigned NOT NULL default 1,
+  chat_state tinyint unsigned NOT NULL default 1,
+  secret_directory varchar(255) default NULL,
+  self_registration_allowed tinyint unsigned NOT NULL default '0',
+  self_unregistration_allowed tinyint unsigned NOT NULL default '0',
+  session_id int unsigned NOT NULL default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_group_info ADD INDEX ( session_id );
+
+CREATE TABLE c_group_category(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title varchar(255) NOT NULL default '',
+  description text NOT NULL,
+  doc_state tinyint unsigned NOT NULL default 1,
+  calendar_state tinyint unsigned NOT NULL default 1,
+  work_state tinyint unsigned NOT NULL default 1,
+  announcements_state tinyint unsigned NOT NULL default 1,
+  forum_state tinyint unsigned NOT NULL default 1,
+  wiki_state tinyint unsigned NOT NULL default 1,
+  chat_state tinyint unsigned NOT NULL default 1,
+  max_student int unsigned NOT NULL default 8,
+  self_reg_allowed tinyint unsigned NOT NULL default 0,
+  self_unreg_allowed tinyint unsigned NOT NULL default 0,
+  groups_per_user int unsigned NOT NULL default 0,
+  display_order int unsigned NOT NULL default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_group_rel_user(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL,
+  group_id int unsigned NOT NULL default 0,
+  status int NOT NULL default 0,
+  role char(50) NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_group_rel_tutor(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  user_id int NOT NULL,
+  group_id int NOT NULL default 0,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_item_property(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  tool varchar(100) NOT NULL default '',
+  insert_user_id int unsigned NOT NULL default '0',
+  insert_date datetime NOT NULL default '0000-00-00 00:00:00',
+  lastedit_date datetime NOT NULL default '0000-00-00 00:00:00',
+  ref int NOT NULL default '0',
+  lastedit_type varchar(100) NOT NULL default '',
+  lastedit_user_id int unsigned NOT NULL default '0',
+  to_group_id int unsigned default NULL,
+  to_user_id int unsigned default NULL,
+  visibility tinyint NOT NULL default '1',
+  start_visible datetime NOT NULL default '0000-00-00 00:00:00',
+  end_visible datetime NOT NULL default '0000-00-00 00:00:00',
+  id_session INT NOT NULL DEFAULT 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_item_property ADD INDEX idx_item_property_toolref (tool,ref);
+
+CREATE TABLE c_tool_intro(
+  id varchar(50) NOT NULL,
+  c_id INT NOT NULL,
+  intro_text MEDIUMTEXT NOT NULL,
+  session_id INT  NOT NULL DEFAULT 0,
+  PRIMARY KEY (id, c_id, session_id)
+);
+
+CREATE TABLE c_dropbox_file  (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  uploader_id int unsigned NOT NULL default 0,
+  filename varchar(250) NOT NULL default '',
+  filesize int unsigned NOT NULL,
+  title varchar(250) default '',
+  description varchar(250) default '',
+  author varchar(250) default '',
+  upload_date datetime NOT NULL default '0000-00-00 00:00:00',
+  last_upload_date datetime NOT NULL default '0000-00-00 00:00:00',
+  cat_id int NOT NULL default 0,
+  session_id int UNSIGNED NOT NULL,
+  PRIMARY KEY (id, c_id),
+  UNIQUE KEY UN_filename (filename)
+);
+
+ALTER TABLE c_dropbox_file ADD INDEX ( session_id );
+
+CREATE TABLE c_dropbox_post  (
+  c_id INT NOT NULL,
+  file_id int unsigned NOT NULL,
+  dest_user_id int unsigned NOT NULL default 0,
+  feedback_date datetime NOT NULL default '0000-00-00 00:00:00',
+  feedback text default '',
+  cat_id int NOT NULL default 0,
+  session_id int UNSIGNED NOT NULL,
+  PRIMARY KEY (c_id, file_id, dest_user_id)
+);
+
+ALTER TABLE c_dropbox_post ADD INDEX ( session_id );
+
+CREATE TABLE c_dropbox_person  (
+  c_id INT NOT NULL,
+  file_id int unsigned NOT NULL,
+  user_id int unsigned NOT NULL default 0,
+  PRIMARY KEY (c_id, file_id, user_id)
+);
+
+CREATE TABLE c_dropbox_category  (
+  cat_id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  cat_name text NOT NULL,
+  received tinyint unsigned NOT NULL default 0,
+  sent tinyint unsigned NOT NULL default 0,
+  user_id int NOT NULL default 0,
+  session_id int NOT NULL default 0,
+  PRIMARY KEY(cat_id, c_id)
+);
+
+ALTER TABLE c_dropbox_category ADD INDEX ( session_id );
+
+CREATE TABLE c_dropbox_feedback (
+  feedback_id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  file_id int NOT NULL default 0,
+  author_user_id int NOT NULL default 0,
+  feedback text NOT NULL,
+  feedback_date datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (feedback_id, c_id),
+  KEY file_id (file_id),
+  KEY author_user_id (author_user_id)
+);
+
+CREATE TABLE IF NOT EXISTS c_lp (
+  id             int unsigned        auto_increment,
+  c_id INT NOT NULL,
+  lp_type        int unsigned   not null,
+  name           varchar(255)        not null,
+  ref            tinytext            null,
+  description    text                null,
+  path           text                not null,
+  force_commit   tinyint unsigned    not null default 0,
+  default_view_mod   char(32)        not null default 'embedded',
+  default_encoding   char(32)        not null default 'UTF-8',
+  display_order  int unsigned        not null default 0,
+  content_maker  tinytext            not null default '',
+  content_local  varchar(32)         not null default 'local',
+  content_license    text            not null default '',
+  prevent_reinit tinyint unsigned    not null default 1,
+  js_lib         tinytext            not null default '',
+  debug          tinyint unsigned    not null default 0,
+  theme          varchar(255)        not null default '',
+  preview_image  varchar(255)        not null default '',
+  author         varchar(255)        not null default '',
+  session_id     int unsigned        not null default 0,
+  prerequisite   int unsigned        not null default 0,
+  hide_toc_frame tinyint             NOT NULL DEFAULT 0,
+  seriousgame_mode tinyint           NOT NULL DEFAULT 0,
+  use_max_score  int unsigned        not null default 1,
+  autolunch      int unsigned        not null default 0,
+  created_on     DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00',
+  modified_on    DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00',
+  publicated_on  DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00',
+  expired_on     DATETIME            NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY  (id, c_id)
+);
+
+CREATE TABLE IF NOT EXISTS c_lp_view (
+  id             int unsigned        auto_increment,
+  c_id INT NOT NULL,
+  lp_id          int unsigned        not null,
+  user_id        int unsigned        not null,
+  view_count     int unsigned   not null default 0,
+  last_item      int unsigned        not null default 0,
+  progress       int unsigned        default 0,
+  session_id     int                 not null default 0,
+  PRIMARY KEY  (id, c_id)
+);
+
+ALTER TABLE c_lp_view ADD INDEX (lp_id);
+ALTER TABLE c_lp_view ADD INDEX (user_id);
+ALTER TABLE c_lp_view ADD INDEX (session_id);
+
+CREATE TABLE IF NOT EXISTS c_lp_item (
+  id              int unsigned       auto_increment,
+  c_id INT NOT NULL,
+  lp_id          int unsigned        not null,
+  item_type      char(32)            not null default 'dokeos_document',
+  ref            tinytext            not null default '',
+  title          varchar(511)        not null,
+  description    varchar(511)        not null default '',
+  path           text                not null,
+  min_score      float unsigned      not null default 0,
+  max_score      float unsigned      default 100,
+  mastery_score  float unsigned      null,
+  parent_item_id     int unsigned    not null default 0,
+  previous_item_id   int unsigned    not null default 0,
+  next_item_id       int unsigned    not null default 0,
+  display_order      int unsigned    not null default 0,
+  prerequisite   text                null default null,
+  parameters     text                null,
+  launch_data    text                not null default '',
+  max_time_allowed   char(13)        NULL default '',
+  terms          TEXT                NULL,
+  search_did     INT                 NULL,
+  audio          VARCHAR(250),
+  prerequisite_min_score float,
+  prerequisite_max_score float,
+  PRIMARY KEY  (id, c_id)
+);
+
+ALTER TABLE c_lp_item ADD INDEX (lp_id);
+ALTER TABLE c_lp_item ADD INDEX idx_c_lp_item_cid_lp_id (c_id, lp_id);
+
+CREATE TABLE IF NOT EXISTS c_lp_item_view (
+  id bigint unsigned auto_increment,
+  c_id INT NOT NULL,
+  lp_item_id     int unsigned    not null,
+  lp_view_id     int unsigned    not null,
+  view_count     int unsigned    not null default 0,
+  start_time     int unsigned    not null,
+  total_time     int unsigned    not null default 0,
+  score          float unsigned  not null default 0,
+  status         char(32)        not null default 'not attempted',
+  suspend_data   longtext null default '',
+  lesson_location    text        null default '',
+  core_exit      varchar(32)     not null default 'none',
+  max_score      varchar(8)      default '',
+  PRIMARY KEY  (id, c_id)
+);
+
+ALTER TABLE c_lp_item_view ADD INDEX (lp_item_id);
+ALTER TABLE c_lp_item_view ADD INDEX (lp_view_id);
+ALTER TABLE c_lp_item_view ADD INDEX idx_c_lp_item_view_cid_lp_view_id_lp_item_id (c_id, lp_view_id, lp_item_id);
+
+CREATE TABLE IF NOT EXISTS c_lp_iv_interaction(
+  id             bigint unsigned     auto_increment,
+  c_id INT NOT NULL,
+  order_id       int unsigned   not null default 0,
+  lp_iv_id       bigint unsigned     not null,
+  interaction_id varchar(255)        not null default '',
+  interaction_type   varchar(255)    not null default '',
+  weighting          double          not null default 0,
+  completion_time    varchar(16)     not null default '',
+  correct_responses  text            not null default '',
+  student_response   text            not null default '',
+  result         varchar(255)        not null default '',
+  latency        varchar(16)         not null default '',
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_lp_iv_interaction ADD INDEX (lp_iv_id);
+
+CREATE TABLE IF NOT EXISTS c_lp_iv_objective(
+  id             bigint unsigned     auto_increment,
+  c_id INT NOT NULL,
+  lp_iv_id       bigint unsigned     not null,
+  order_id       int unsigned   not null default 0,
+  objective_id   varchar(255)        not null default '',
+  score_raw      float unsigned      not null default 0,
+  score_max      float unsigned      not null default 0,
+  score_min      float unsigned      not null default 0,
+  status         char(32)            not null default 'not attempted',
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_lp_iv_objective ADD INDEX (lp_iv_id);
+
+CREATE TABLE c_blog (
+  blog_id int NOT NULL AUTO_INCREMENT ,
+  c_id INT NOT NULL,
+  blog_name varchar( 250 ) NOT NULL default '',
+  blog_subtitle varchar( 250 ) default NULL ,
+  date_creation datetime NOT NULL default '0000-00-00 00:00:00',
+  visibility tinyint unsigned NOT NULL default 0,
+  session_id int default 0,
+  PRIMARY KEY (blog_id, c_id)
+);
+
+ALTER TABLE c_blog  ADD INDEX ( session_id );
+
+CREATE TABLE c_blog_comment (
+    comment_id int NOT NULL AUTO_INCREMENT ,
+    c_id INT NOT NULL,
+    title varchar( 250 ) NOT NULL default '',
+    comment longtext NOT NULL ,
+    author_id int NOT NULL default 0,
+    date_creation datetime NOT NULL default '0000-00-00 00:00:00',
+    blog_id int NOT NULL default 0,
+    post_id int NOT NULL default 0,
+    task_id int default NULL ,
+    parent_comment_id int NOT NULL default 0,
+    PRIMARY KEY (comment_id, c_id)
+);
+
+CREATE TABLE c_blog_post(
+    post_id int NOT NULL AUTO_INCREMENT ,
+    c_id INT NOT NULL,
+    title varchar( 250 ) NOT NULL default '',
+    full_text longtext NOT NULL ,
+    date_creation datetime NOT NULL default '0000-00-00 00:00:00',
+    blog_id int NOT NULL default 0,
+    author_id int NOT NULL default 0,
+    PRIMARY KEY (post_id, c_id)
+);
+
+CREATE TABLE c_blog_rating(
+    rating_id int NOT NULL AUTO_INCREMENT ,
+    c_id INT NOT NULL,
+    blog_id int NOT NULL default 0,
+    rating_type enum( 'post', 'comment' ) NOT NULL default 'post',
+    item_id int NOT NULL default 0,
+    user_id int NOT NULL default 0,
+    rating int NOT NULL default 0,
+    PRIMARY KEY (rating_id, c_id)
+);
+
+CREATE TABLE c_blog_rel_user(
+    c_id INT NOT NULL,
+    blog_id int NOT NULL default 0,
+    user_id int NOT NULL default 0,
+    PRIMARY KEY (c_id, blog_id , user_id )
+);
+
+CREATE TABLE c_blog_task(
+    task_id int NOT NULL AUTO_INCREMENT ,
+    c_id INT NOT NULL,
+    blog_id int NOT NULL default 0,
+    title varchar( 250 ) NOT NULL default '',
+    description text NOT NULL ,
+    color varchar( 10 ) NOT NULL default '',
+    system_task tinyint unsigned NOT NULL default 0,
+    PRIMARY KEY (task_id, c_id)
+);
+
+CREATE TABLE c_blog_task_rel_user  (
+    c_id INT NOT NULL,
+    blog_id int NOT NULL default 0,
+    user_id int NOT NULL default 0,
+    task_id int NOT NULL default 0,
+    target_date date NOT NULL default '0000-00-00',
+    PRIMARY KEY (c_id, blog_id , user_id , task_id )
+);
+
+CREATE TABLE  c_blog_attachment  (
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  path varchar(255) NOT NULL COMMENT 'the real filename',
+  comment text,
+  size int NOT NULL default '0',
+  post_id int NOT NULL,
+  filename varchar(255) NOT NULL COMMENT 'the user s file name',
+  blog_id int NOT NULL,
+  comment_id int NOT NULL default '0',
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_permission_group  (
+    id int NOT NULL AUTO_INCREMENT,
+    c_id INT NOT NULL,
+    group_id int NOT NULL default 0,
+    tool varchar( 250 ) NOT NULL default '',
+    action varchar( 250 ) NOT NULL default '',
+    PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_permission_user  (
+    id int NOT NULL AUTO_INCREMENT ,
+    c_id INT NOT NULL,
+    user_id int NOT NULL default 0,
+    tool varchar( 250 ) NOT NULL default '',
+    action varchar( 250 ) NOT NULL default '',
+    PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_permission_task(
+    id int NOT NULL AUTO_INCREMENT,
+    c_id INT NOT NULL,
+    task_id int NOT NULL default 0,
+    tool varchar( 250 ) NOT NULL default '',
+    action varchar( 250 ) NOT NULL default '',
+    PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_role(
+    role_id int NOT NULL AUTO_INCREMENT,
+    c_id INT NOT NULL,
+    role_name varchar( 250 ) NOT NULL default '',
+    role_comment text,
+    default_role tinyint default 0,
+    PRIMARY KEY (role_id, c_id)
+);
+
+CREATE TABLE c_role_group(
+    id int NOT NULL AUTO_INCREMENT,
+    c_id INT NOT NULL,
+    role_id int NOT NULL default 0,
+    scope varchar( 20 ) NOT NULL default 'course',
+    group_id int NOT NULL default 0,
+    PRIMARY KEY  (id, c_id, group_id )
+);
+
+CREATE TABLE c_role_permissions(
+    id int NOT NULL AUTO_INCREMENT,
+    c_id INT NOT NULL,
+    role_id int NOT NULL default 0,
+    tool varchar( 250 ) NOT NULL default '',
+    action varchar( 50 ) NOT NULL default '',
+    default_perm tinyint NOT NULL default 0,
+    PRIMARY KEY  (id, c_id, role_id, tool, action )
+);
+
+CREATE TABLE c_role_user  (
+    c_id INT NOT NULL,
+    role_id int NOT NULL default 0,
+    scope varchar( 20 ) NOT NULL default 'course',
+    user_id int NOT NULL default 0,
+    PRIMARY KEY  ( c_id, role_id, user_id )
+);
+
+CREATE TABLE c_course_setting  (
+  id          int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  variable    varchar(255) NOT NULL default '',
+  subkey      varchar(255) default NULL,
+  type        varchar(255) default NULL,
+  category    varchar(255) default NULL,
+  value       varchar(255) NOT NULL default '',
+  title       varchar(255) NOT NULL default '',
+  comment     varchar(255) default NULL,
+  subkeytext  varchar(255) default NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_survey  (
+  survey_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  code varchar(20) default NULL,
+  title text default NULL,
+  subtitle text default NULL,
+  author varchar(20) default NULL,
+  lang varchar(20) default NULL,
+  avail_from date default NULL,
+  avail_till date default NULL,
+  is_shared char(1) default '1',
+  template varchar(20) default NULL,
+  intro text,
+  surveythanks text,
+  creation_date datetime NOT NULL default '0000-00-00 00:00:00',
+  invited int NOT NULL,
+  answered int NOT NULL,
+  invite_mail text NOT NULL,
+  reminder_mail text NOT NULL,
+  mail_subject VARCHAR( 255 ) NOT NULL,
+  anonymous enum('0','1') NOT NULL default '0',
+  access_condition TEXT DEFAULT NULL,
+  shuffle bool NOT NULL default '0',
+  one_question_per_page bool NOT NULL default '0',
+  survey_version varchar(255) NOT NULL default '',
+  parent_id int unsigned NOT NULL,
+  survey_type int NOT NULL default 0,
+  show_form_profile int NOT NULL default 0,
+  form_fields TEXT NOT NULL,
+  session_id int unsigned NOT NULL default 0,
+  visible_results int unsigned DEFAULT 0,
+  PRIMARY KEY  (survey_id, c_id)
+);
+
+ALTER TABLE c_survey  ADD INDEX ( session_id );
+CREATE TABLE c_survey_invitation(
+  survey_invitation_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  survey_code varchar(20) NOT NULL,
+  user varchar(250) NOT NULL,
+  invitation_code varchar(250) NOT NULL,
+  invitation_date datetime NOT NULL,
+  reminder_date datetime NOT NULL,
+  answered int NOT NULL default 0,
+  session_id int UNSIGNED NOT NULL default 0,
+  PRIMARY KEY  (survey_invitation_id, c_id)
+);
+
+CREATE TABLE c_survey_question  (
+  question_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  survey_id int unsigned NOT NULL,
+  survey_question text NOT NULL,
+  survey_question_comment text NOT NULL,
+  type varchar(250) NOT NULL,
+  display varchar(10) NOT NULL,
+  sort int NOT NULL,
+  shared_question_id int,
+  max_value int,
+  survey_group_pri int unsigned NOT NULL default '0',
+  survey_group_sec1 int unsigned NOT NULL default '0',
+  survey_group_sec2 int unsigned NOT NULL default '0',
+  PRIMARY KEY (question_id, c_id)
+);
+
+CREATE TABLE c_survey_question_option  (
+  question_option_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  question_id int unsigned NOT NULL,
+  survey_id int unsigned NOT NULL,
+  option_text text NOT NULL,
+  sort int NOT NULL,
+  value int NOT NULL default '0',
+  PRIMARY KEY  (question_option_id, c_id)
+);
+
+CREATE TABLE c_survey_answer  (
+  answer_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  survey_id int unsigned NOT NULL,
+  question_id int unsigned NOT NULL,
+  option_id TEXT NOT NULL,
+  value int unsigned NOT NULL,
+  user varchar(250) NOT NULL,
+  PRIMARY KEY  (answer_id, c_id)
+);
+
+CREATE TABLE c_survey_group(
+  id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  name varchar(20) NOT NULL,
+  description varchar(255) NOT NULL,
+  survey_id int unsigned NOT NULL,
+  PRIMARY KEY  (id, c_id)
+);
+
+CREATE TABLE c_glossary(
+  glossary_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  name varchar(255) NOT NULL,
+  description text not null,
+  display_order int,
+  session_id int default 0,
+  PRIMARY KEY (glossary_id, c_id)
+);
+
+ALTER TABLE c_glossary ADD INDEX ( session_id );
+
+CREATE TABLE c_notebook (
+  notebook_id int unsigned NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  user_id int unsigned NOT NULL,
+  course varchar(40) not null,
+  session_id int NOT NULL default 0,
+  title varchar(255) NOT NULL,
+  description text NOT NULL,
+  creation_date datetime NOT NULL default '0000-00-00 00:00:00',
+  update_date datetime NOT NULL default '0000-00-00 00:00:00',
+  status int,
+  PRIMARY KEY (notebook_id, c_id)
+);
+
+CREATE TABLE c_attendance(
+    id int NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    name text NOT NULL,
+    description TEXT NULL,
+    active tinyint NOT NULL default 1,
+    attendance_qualify_title varchar(255) NULL,
+    attendance_qualify_max int NOT NULL default 0,
+    attendance_weight float(6,2) NOT NULL default '0.0',
+    session_id int NOT NULL default 0,
+    locked int NOT NULL default 0,
+    PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_attendance ADD INDEX (session_id);
+ALTER TABLE c_attendance ADD INDEX (active);
+
+CREATE TABLE c_attendance_sheet  (
+    c_id INT NOT NULL,
+    user_id int NOT NULL,
+    attendance_calendar_id int NOT NULL,
+    presence tinyint NOT NULL DEFAULT 0,
+    PRIMARY KEY(c_id, user_id, attendance_calendar_id)
+);
+
+ALTER TABLE c_attendance_sheet  ADD INDEX (presence);
+
+CREATE TABLE c_attendance_calendar(
+    id int NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    attendance_id int NOT NULL ,
+    date_time datetime NOT NULL default '0000-00-00 00:00:00',
+    done_attendance tinyint NOT NULL default 0,
+    PRIMARY KEY(id, c_id)
+);
+
+ALTER TABLE c_attendance_calendar ADD INDEX (attendance_id);
+ALTER TABLE c_attendance_calendar ADD INDEX (done_attendance);
+
+CREATE TABLE c_attendance_result(
+    id int NOT NULL auto_increment,
+    c_id INT NOT NULL,
+    user_id int NOT NULL,
+    attendance_id int NOT NULL,
+    score int NOT NULL DEFAULT 0,
+    PRIMARY KEY  (id, c_id)
+);
+
+ALTER TABLE c_attendance_result ADD INDEX (attendance_id);
+ALTER TABLE c_attendance_result ADD INDEX (user_id);
+
+CREATE TABLE c_attendance_sheet_log(
+  id int  NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  attendance_id int  NOT NULL DEFAULT 0,
+  lastedit_date datetime  NOT NULL DEFAULT '0000-00-00 00:00:00',
+  lastedit_type varchar(200)  NOT NULL,
+  lastedit_user_id int  NOT NULL DEFAULT 0,
+  calendar_date_value datetime NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+CREATE TABLE c_thematic(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  title varchar(255) NOT NULL,
+  content text NULL,
+  display_order int unsigned NOT NULL DEFAULT 0,
+  active tinyint NOT NULL DEFAULT 0,
+  session_id int NOT NULL DEFAULT 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_thematic ADD INDEX (active, session_id);
+
+CREATE TABLE c_thematic_plan(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  thematic_id int NOT NULL,
+  title varchar(255) NOT NULL,
+  description text NULL,
+  description_type int NOT NULL,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_thematic_plan ADD INDEX (thematic_id, description_type);
+
+CREATE TABLE c_thematic_advance(
+  id int NOT NULL auto_increment,
+  c_id INT NOT NULL,
+  thematic_id int NOT NULL,
+  attendance_id int NOT NULL DEFAULT 0,
+  content text NULL,
+  start_date datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  duration int NOT NULL DEFAULT 0,
+  done_advance tinyint NOT NULL DEFAULT 0,
+  PRIMARY KEY (id, c_id)
+);
+
+ALTER TABLE c_thematic_advance ADD INDEX (thematic_id);
+
+CREATE TABLE IF NOT EXISTS c_metadata (
+  c_id INT NOT NULL,
+  eid VARCHAR(250) NOT NULL,
+  mdxmltext TEXT default '',
+  md5 CHAR(32) default '',
+  htmlcache1 TEXT default '',
+  htmlcache2 TEXT default '',
+  indexabletext TEXT default '',
+  PRIMARY KEY (c_id, eid)
+);
+
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 4b7323dcef..573f7c295d 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -12,7 +12,7 @@
 
 /*      CONSTANTS */
 
-define('SYSTEM_MAIN_DATABASE_FILE', 'db_main.sql');
+define('SYSTEM_MAIN_DATABASE_FILE', 'main.sql');
 define('COUNTRY_DATA_FILENAME', 'country_data.csv');
 define('COURSES_HTACCESS_FILENAME', 'htaccess.dist');
 define('SYSTEM_CONFIG_FILENAME', 'configuration.dist.php');
diff --git a/main/install/install_db.inc.php b/main/install/install_db.inc.php
index 4984c936f5..9ab07fb575 100755
--- a/main/install/install_db.inc.php
+++ b/main/install/install_db.inc.php
@@ -118,7 +118,7 @@ load_main_database($installation_settings);
 
 AddCourse::drop_course_tables();
 
-AddCourse::create_course_tables();
+load_database_script('course.sql');
 
 $track_countries_table = "track_c_countries";
 fill_track_countries_table($track_countries_table);
diff --git a/main/install/db_main.sql b/main/install/main.sql
old mode 100755
new mode 100644
similarity index 99%
rename from main/install/db_main.sql
rename to main/install/main.sql
index 1004324a26..be80489d79
--- a/main/install/db_main.sql
+++ b/main/install/main.sql
@@ -3320,7 +3320,7 @@ CREATE TABLE track_e_links (
   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_c_id (c_id),
   KEY idx_tel_user_id (links_user_id)
 );
 
@@ -3483,5 +3483,5 @@ CREATE TABLE c_attendance_calendar_rel_group (
 
 -- Version
 LOCK TABLES settings_current WRITE;
-UPDATE settings_current SET selected_value = '1.10.0.21' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.22' WHERE variable = 'chamilo_database_version';
 UNLOCK TABLES;
diff --git a/main/install/update-db-1.8.8-1.9.0.inc.php b/main/install/update-db-1.8.8-1.9.0.inc.php
index b491eea92e..9c52a4e646 100755
--- a/main/install/update-db-1.8.8-1.9.0.inc.php
+++ b/main/install/update-db-1.8.8-1.9.0.inc.php
@@ -297,7 +297,7 @@ if (defined('SYSTEM_INSTALLATION')) {
     global $_configuration;
 
     AddCourse::drop_course_tables();
-    AddCourse::create_course_tables();
+    load_database_script('course.sql');
 
     $prefix = '';
     if ($singleDbForm) {

From 627a0d63fcca31ca58048921349c1006d8365454 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 13:34:23 +0100
Subject: [PATCH 10/23] Add group_id see BT#5715

---
 main/install/course.sql                      | 3 ++-
 main/install/migrate-db-1.9.0-1.10.0-pre.sql | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/main/install/course.sql b/main/install/course.sql
index 22e71e9298..663d2601c7 100644
--- a/main/install/course.sql
+++ b/main/install/course.sql
@@ -1053,7 +1053,8 @@ CREATE TABLE c_survey_invitation(
   reminder_date datetime NOT NULL,
   answered int NOT NULL default 0,
   session_id int UNSIGNED NOT NULL default 0,
-  PRIMARY KEY  (survey_invitation_id, c_id)
+  group_id INT NOT NULL,
+  PRIMARY KEY (survey_invitation_id, c_id)
 );
 
 CREATE TABLE c_survey_question  (
diff --git a/main/install/migrate-db-1.9.0-1.10.0-pre.sql b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
index d52a449612..1655d3a825 100644
--- a/main/install/migrate-db-1.9.0-1.10.0-pre.sql
+++ b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
@@ -91,7 +91,9 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('documents_
 
 -- xxCOURSExx
 
-ALTER TABLE c_survey ADD visible_results INT UNSIGNED DEFAULT 0;
+ALTER TABLE c_survey ADD COLUMN visible_results INT UNSIGNED DEFAULT 0;
+ALTER TABLE c_survey_invitation ADD COLUMN group_id INT NOT NULL;
+,
 ALTER TABLE c_lp_item ADD COLUMN prerequisite_min_score float;
 ALTER TABLE c_lp_item ADD COLUMN prerequisite_max_score float;
 ALTER TABLE c_student_publication ADD COLUMN document_id int DEFAULT 0;
@@ -103,4 +105,4 @@ CREATE TABLE IF NOT EXISTS c_student_publication_comment (id INT PRIMARY KEY NOT
 CREATE TABLE IF NOT EXISTS c_attendance_calendar_rel_group (id int NOT NULL auto_increment PRIMARY KEY, c_id INT NOT NULL, group_id INT NOT NULL, calendar_id INT NOT NULL);
 
 -- Do not move this query
-UPDATE settings_current SET selected_value = '1.10.0.21' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.22' WHERE variable = 'chamilo_database_version';

From 4f4e3920745751310ed78c8e14199e440733d7a7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 13:54:55 +0100
Subject: [PATCH 11/23] Update.

---
 composer.lock | 619 +++++++++++++++++++++++++-------------------------
 1 file changed, 311 insertions(+), 308 deletions(-)

diff --git a/composer.lock b/composer.lock
index 89bf615af9..2f4fae71e6 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "0f2dd6e4c3c50061a455ff5b91160b38",
+    "hash": "9412d5125c2c1b803ab2ae7a9e587a4b",
     "packages": [
         {
             "name": "aferrandini/phpqrcode",
@@ -164,243 +164,6 @@
             "homepage": "http://elfinder.org",
             "time": "2015-02-11 11:10:51"
         },
-        {
-            "name": "behat/behat",
-            "version": "v2.4.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Behat.git",
-                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/f1d2964667cf4b21bb6c2c1564f26829a6954155",
-                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "~2.2.9",
-                "php": ">=5.3.1",
-                "symfony/config": "~2.0",
-                "symfony/console": "~2.0",
-                "symfony/dependency-injection": "~2.0",
-                "symfony/event-dispatcher": "~2.0",
-                "symfony/finder": "~2.0",
-                "symfony/translation": "~2.0",
-                "symfony/yaml": "~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7.19"
-            },
-            "suggest": {
-                "behat/mink-extension": "for integration with Mink testing framework",
-                "behat/symfony2-extension": "for integration with Symfony2 web framework",
-                "behat/yii-extension": "for integration with Yii web framework"
-            },
-            "bin": [
-                "bin/behat"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Behat": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Scenario-oriented BDD framework for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Symfony2"
-            ],
-            "time": "2013-06-06 10:46:48"
-        },
-        {
-            "name": "behat/gherkin",
-            "version": "v2.2.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cca2c477921ca38578d6e9759ea5e450f29c2d8f",
-                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/finder": ">=2.0,<2.4-dev"
-            },
-            "require-dev": {
-                "symfony/config": ">=2.0,<2.4-dev",
-                "symfony/translation": ">=2.0,<2.4-dev",
-                "symfony/yaml": ">=2.0,<2.4-dev"
-            },
-            "suggest": {
-                "symfony/config": "If you want to use Config component to manage resources",
-                "symfony/translation": "If you want to use Symfony2 translations adapter",
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "2.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "DSL",
-                "Symfony2",
-                "parser"
-            ],
-            "time": "2013-03-02 10:38:40"
-        },
-        {
-            "name": "behat/mink",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/Mink.git",
-                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe",
-                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/css-selector": "~2.0"
-            },
-            "suggest": {
-                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
-                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
-                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "1.5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Mink": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Web acceptance testing framework for PHP 5.3",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "testing",
-                "web"
-            ],
-            "time": "2013-04-13 23:39:27"
-        },
-        {
-            "name": "behat/mink-extension",
-            "version": "v1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/MinkExtension.git",
-                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/b4522f19fe96d423883f2e3650615e19d3a48c05",
-                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05",
-                "shasum": ""
-            },
-            "require": {
-                "behat/behat": "~2.4.5",
-                "behat/mink": ">=1.4.3,<1.6-dev",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "behat/mink-goutte-driver": "~1.0"
-            },
-            "type": "behat-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\MinkExtension": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Mink extension for Behat",
-            "homepage": "http://mink.behat.org",
-            "keywords": [
-                "browser",
-                "gui",
-                "test",
-                "web"
-            ],
-            "time": "2013-06-04 12:18:22"
-        },
         {
             "name": "behat/transliterator",
             "version": "v1.0.1",
@@ -852,16 +615,16 @@
         },
         {
             "name": "cocur/slugify",
-            "version": "v1.0",
+            "version": "v1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cocur/slugify.git",
-                "reference": "2c929c56997e663747be9bb635e58db918a0134f"
+                "reference": "2b67d4e2b75dbaed2ebefa9eb5683e8940513847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cocur/slugify/zipball/2c929c56997e663747be9bb635e58db918a0134f",
-                "reference": "2c929c56997e663747be9bb635e58db918a0134f",
+                "url": "https://api.github.com/repos/cocur/slugify/zipball/2b67d4e2b75dbaed2ebefa9eb5683e8940513847",
+                "reference": "2b67d4e2b75dbaed2ebefa9eb5683e8940513847",
                 "shasum": ""
             },
             "require": {
@@ -870,7 +633,9 @@
             "require-dev": {
                 "codeclimate/php-test-reporter": "dev-master",
                 "laravel/framework": "~4.1",
+                "latte/latte": "~2.2",
                 "mockery/mockery": "~0.9",
+                "nette/di": "~2.2",
                 "phpunit/phpunit": "~3.7",
                 "sami/sami": "~1.3",
                 "satooshi/php-coveralls": "0.6.*",
@@ -908,7 +673,7 @@
                 "slug",
                 "slugify"
             ],
-            "time": "2014-11-26 22:45:14"
+            "time": "2015-03-18 08:21:30"
         },
         {
             "name": "doctrine/annotations",
@@ -3254,80 +3019,26 @@
             "time": "2015-03-13 17:37:22"
         },
         {
-            "name": "symfony/css-selector",
+            "name": "symfony/debug",
             "version": "v2.6.5",
-            "target-dir": "Symfony/Component/CssSelector",
+            "target-dir": "Symfony/Component/Debug",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f"
+                "url": "https://github.com/symfony/Debug.git",
+                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/86cf0aa16065ffc4545374e9479dd7878bf1d90f",
-                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
+                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.3",
+                "psr/log": "~1.0"
             },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-02-24 11:52:21"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v2.6.5",
-            "target-dir": "Symfony/Component/Debug",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Debug.git",
-                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
-                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {
                 "symfony/class-loader": "~2.2",
@@ -5333,7 +5044,299 @@
             "time": "2014-09-16 22:58:11"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "behat/behat",
+            "version": "v2.4.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Behat.git",
+                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/f1d2964667cf4b21bb6c2c1564f26829a6954155",
+                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "~2.2.9",
+                "php": ">=5.3.1",
+                "symfony/config": "~2.0",
+                "symfony/console": "~2.0",
+                "symfony/dependency-injection": "~2.0",
+                "symfony/event-dispatcher": "~2.0",
+                "symfony/finder": "~2.0",
+                "symfony/translation": "~2.0",
+                "symfony/yaml": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.19"
+            },
+            "suggest": {
+                "behat/mink-extension": "for integration with Mink testing framework",
+                "behat/symfony2-extension": "for integration with Symfony2 web framework",
+                "behat/yii-extension": "for integration with Yii web framework"
+            },
+            "bin": [
+                "bin/behat"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Behat": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Scenario-oriented BDD framework for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Symfony2"
+            ],
+            "time": "2013-06-06 10:46:48"
+        },
+        {
+            "name": "behat/gherkin",
+            "version": "v2.2.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cca2c477921ca38578d6e9759ea5e450f29c2d8f",
+                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "symfony/finder": ">=2.0,<2.4-dev"
+            },
+            "require-dev": {
+                "symfony/config": ">=2.0,<2.4-dev",
+                "symfony/translation": ">=2.0,<2.4-dev",
+                "symfony/yaml": ">=2.0,<2.4-dev"
+            },
+            "suggest": {
+                "symfony/config": "If you want to use Config component to manage resources",
+                "symfony/translation": "If you want to use Symfony2 translations adapter",
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "2.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "DSL",
+                "Symfony2",
+                "parser"
+            ],
+            "time": "2013-03-02 10:38:40"
+        },
+        {
+            "name": "behat/mink",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/minkphp/Mink.git",
+                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe",
+                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "symfony/css-selector": "~2.0"
+            },
+            "suggest": {
+                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
+                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
+                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Mink": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Web acceptance testing framework for PHP 5.3",
+            "homepage": "http://mink.behat.org/",
+            "keywords": [
+                "browser",
+                "testing",
+                "web"
+            ],
+            "time": "2013-04-13 23:39:27"
+        },
+        {
+            "name": "behat/mink-extension",
+            "version": "v1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/MinkExtension.git",
+                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/b4522f19fe96d423883f2e3650615e19d3a48c05",
+                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05",
+                "shasum": ""
+            },
+            "require": {
+                "behat/behat": "~2.4.5",
+                "behat/mink": ">=1.4.3,<1.6-dev",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "behat/mink-goutte-driver": "~1.0"
+            },
+            "type": "behat-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\MinkExtension": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Mink extension for Behat",
+            "homepage": "http://mink.behat.org",
+            "keywords": [
+                "browser",
+                "gui",
+                "test",
+                "web"
+            ],
+            "time": "2013-06-04 12:18:22"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v2.6.5",
+            "target-dir": "Symfony/Component/CssSelector",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/CssSelector.git",
+                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "http://symfony.com",
+            "time": "2015-02-24 11:52:21"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {

From bb60b9d8226e632a0bc5b0823900f1f22ee14892 Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 19 Mar 2015 08:29:20 -0500
Subject: [PATCH 12/23] Revert "Add missing configuration parameters - refs
 #4507"

This reverts commit 3896a7f05d27c569df20329ef5827d012055a0ff.

Signed-off-by: Imanol Losada <imanol.losada@gmail.com>
---
 main/inc/conf/configuration.dist.php | 205 ---------------------------
 1 file changed, 205 deletions(-)
 delete mode 100644 main/inc/conf/configuration.dist.php

diff --git a/main/inc/conf/configuration.dist.php b/main/inc/conf/configuration.dist.php
deleted file mode 100644
index 0a6cfdbb50..0000000000
--- a/main/inc/conf/configuration.dist.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-// Chamilo version 1.9.8
-// File generated by /install/index.php script - Thu, 21 Aug 2014 14:45:02 -0500
-/* For licensing terms, see /license.txt */
-/**
- * Campus configuration
- *
- * This file contains a list of variables that can be modified by the campus
- * site's server administrator. Pay attention when changing these variables,
- * some changes may cause Chamilo to stop working.
- * If you changed some settings and want to restore them, please have a look at
- * configuration.dist.php. That file is an exact copy of the config file at
- * install time.
- */
-
-/**
- * $_configuration define only the bare essential variables
- * for configuring the platform (paths, database connections, ...).
- * Changing a $_configuration variable CAN generally break the installation.
- * Besides the $_configuration, a $_settings array also exists, that
- * contains variables that can be changed and will not break the platform.
- * These optional settings are defined in the database, now
- * (table settings_current).
- * example: $_configuration['tracking_enabled'] (assuming that the install
- * script creates the necessary tables anyway).
- */
-
-/**
- * MYSQL connection settings
- */
-// Your MySQL server
-$_configuration['db_host']     = 'localhost';
-// Your MySQL username
-$_configuration['db_user']     = 'root';
-// Your MySQL password
-$_configuration['db_password'] = 'yannoo';
-
-/**
- * Database settings
- */
-// Is tracking enabled?
-$_configuration['tracking_enabled']      = true;
-// Is single database enabled (DO NOT MODIFY THIS)
-$_configuration['single_database']       = false;
-// Prefix for course tables (IF NOT EMPTY, can be replaced by another prefix, else leave empty)
-$_configuration['table_prefix']          = '';
-// Separator between database and table name (DO NOT MODIFY THIS)
-$_configuration['db_glue']               = '`.`';
-// prefix all created bases (for courses) with this string
-$_configuration['db_prefix']             = '';
-// main Chamilo database
-$_configuration['main_database']         = 'chamilo198';
-// stats Chamilo database
-$_configuration['statistics_database']   ='chamilo198';
-// User Personal Database (where all the personal stuff of the user is stored
-// (personal agenda items, course sorting)
-$_configuration['user_personal_database']='chamilo198';
-// Enable access to database management for platform admins.
-$_configuration['db_manager_enabled'] = false;
-
-/**
- * Directory settings
- */
-// URL to the root of your Chamilo installation, e.g.: http://www.mychamilo.com/
-$_configuration['root_web']       = 'http://chamilo19x/';
-
-// Path to the webroot of system, example: /var/www/
-$_configuration['root_sys']       = '/var/www/chamilo19x/';
-
-// Path from your WWW-root to the root of your Chamilo installation, example: chamilo (this means chamilo is installed in /var/www/chamilo/
-$_configuration['url_append']     = '';
-
-// Directory of the Chamilo code. You could change this but it is not advised since this has not been tested yet.
-$_configuration['code_append']    = "main/";
-
-// Directory to store all course-related files. You could change this but it is not advised since this has not been tested yet.
-$_configuration['course_folder']  = "courses/";
-
-// URL to your phpMyAdmin installation.
-// If not empty, a link will be available in the Platform Administration
-$_configuration['db_admin_path']  = '';
-
-/**
- * Login modules settings
- */
-// CAS IMPLEMENTATION
-// -> Go to your portal Chamilo > Administration > CAS to activate CAS
-// You can leave these lines uncommented even if you don't use CAS authentification
-$extAuthSource["cas"]["login"] = $_configuration['root_sys'].$_configuration['code_append']."auth/cas/login.php";
-$extAuthSource["cas"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/cas/newUser.php";
-//
-// NEW LDAP IMPLEMENTATION BASED ON external_login info
-// -> Uncomment the two lines bellow to activate LDAP AND edit main/auth/external_login/ldap.conf.php for configuration
-// $extAuthSource["extldap"]["login"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/login.ldap.php";
-// $extAuthSource["extldap"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/newUser.ldap.php";
-//
-// FACEBOOK IMPLEMENTATION BASED ON external_login info
-// -> Uncomment the line bellow to activate Facebook Auth AND edit main/auth/external_login/ldap.conf.php for configuration
-// $_configuration['facebook_auth'] = 1;
-//
-// OTHER EXTERNAL LOGIN INFORMATION
-// To fetch external login information, uncomment those 2 lines and modify  files auth/external_login/newUser.php and auth/external_login/updateUser.php files
-// $extAuthSource["external_login"]["newUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/newUser.php";
-// $extAuthSource["external_login"]["updateUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/updateUser.php";
-
-/**
- *
- * Hosting settings - Allows you to set limits to the Chamilo portal when
- * hosting it for a third party. These settings can be overwritten by an
- * optionally-loaded extension file with only the settings (no comments).
- * The settings use an index at the first level to represent the ID of the
- * URL in case you use multi-url (otherwise it will always use 1, which is
- * the ID of the only URL inside the access_url table).
- */
-// Set a maximum number of users. Default (0) = no limit
-$_configuration[1]['hosting_limit_users'] = 0;
-// Set a maximum number of teachers. Default (0) = no limit
-$_configuration[1]['hosting_limit_teachers'] = 0;
-// Set a maximum number of courses. Default (0) = no limit
-$_configuration[1]['hosting_limit_courses'] = 0;
-// Set a maximum number of sessions. Default (0) = no limit
-$_configuration[1]['hosting_limit_sessions'] = 0;
-// Set a maximum disk space used, in MB (set to 1024 for 1GB, 5120 for 5GB).
-// Default (0) = no limit
-$_configuration[1]['hosting_limit_disk_space'] = 0;
-
-/**
- * Content Delivery Network (CDN) settings. Only use if you need a separate
- * server to serve your static data. If you don't know what a CDN is, you
- * don't need it. These settings are for simple Origin Pull CDNs and are
- * experimental. Enable only if you really know what you're doing.
- * This might conflict with multiple-access urls.
- */
-// Set the following setting to true to start using the CDN
-$_configuration['cdn_enable'] = false;
-// The following setting will be ignored if the previous one is set to false
-$_configuration['cdn'] = array(
-  //You can define several CDNs and split them by extensions
-  //Replace the following by your full CDN URL, which should point to
-  // your Chamilo's root directory. DO NOT INCLUDE a final slash! (won't work)
-  'http://cdn.chamilo.org' => array('.css','.js','.jpg','.jpeg','.png','.gif','.avi','.flv'),
-  // copy the line above and modify following your needs
-);
-
-/**
- * Misc. settings
- */
-// Verbose backup
-$_configuration['verbose_backup']    = false;
-// security word for password recovery
-$_configuration['security_key']      = 'adbeb884dffd2cb44d7ea5c2f49fc5c0';
-// Hash function method
-$_configuration['password_encryption']      = 'sha1';
-// You may have to restart your web server if you change this
-$_configuration['session_stored_in_db']     = false;
-// Session lifetime
-$_configuration['session_lifetime']  = 360000;
-// Activation for multi-url access
-//$_configuration['multiple_access_urls']					= true;
-$_configuration['software_name']     = 'Chamilo';
-$_configuration['software_url']	     = 'http://www.chamilo.org/';
-//Deny the elimination of users
-$_configuration['deny_delete_users'] = false;
-// Version settings
-$_configuration['system_version']    = '1.9.8';
-$_configuration['system_stable']     = true;
-
-/**
- * Settings to be included as settings_current in future versions
- */
-// Hide the main home section for connected users (to show announcements instead)
-//$_configuration['hide_home_top_when_connected'] = true;
-// Hide the global announcements for non-connected users
-//$_configuration['hide_global_announcements_when_not_connected'] = true;
-// Use this course as template for all new courses (define course real ID as value)
-//$_configuration['course_creation_use_template'] = 14;
-// Uncomment the following to prevent all admins to use the "login as" feature
-//$_configuration['login_as_forbidden_globally'] = true;
-// Add password strength checker
-//$_configuration['allow_strength_pass_checker'] = true;
-// Enable captcha
-//$_configuration['enable_captcha'] = true;
-//$_configuration['allow_captcha'] = true;
-// Prevent account from logging in for a certain amount of time if captcha is wrong for the specified number of times
-//$_configuration['captcha_number_mistakes_to_block_account'] = 5;
-// Prevent account from logging in for the specified number of minutes
-//$_configuration['captcha_time_to_block'] = 5;//minutes
-// Allow DRH role to access all content and users from the sessions he follows
-//$_configuration['drh_can_access_all_session_content'] = true;
-// Display group's forum in general forum tool
-//$_configuration['display_groups_forum_in_general_tool'] = true;
-// Boost query on last connection time
-//$_configuration['save_user_last_login'] = true;
-// Allow course tutors in sessions to add existing students to their session
-//$_configuration['allow_tutors_to_assign_students_to_session'] = 'false';
-// Allow select the return link in the LP view
-//$_configuration['allow_lp_return_link'] = false;
-// If true the export link is blocked.
-//$_configuration['hide_scorm_export_link'] = false;
-// If true the copy link is blocked.
-//$_configuration['hide_scorm_copy_link'] = false;
-// Enable Gravatar profile image if no local image has been given
-//$_configuration['gravatar_enabled'] = true;
-// If Gravatar is enabled, tells which type of picture we want (default is "mm"). Options: mm | identicon | monsterid | wavatar
-//$_configuration['gravatar_type'] = 'mm';

From b41e42b48ba60d0b653fd4a7a74d65b75071f9a2 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 14:52:35 +0100
Subject: [PATCH 13/23] Use setCustomElementTemplate() instead of
 setElementTemplate

To manage templates setup by developers instead of default element
templates.
---
 main/admin/class_list.php                     |  2 +-
 main/admin/configure_homepage.php             |  2 +-
 main/admin/configure_inscription.php          |  2 +-
 main/admin/course_request_accepted.php        |  2 +-
 main/admin/course_request_rejected.php        |  2 +-
 main/admin/course_request_review.php          |  2 +-
 main/admin/group_list.php                     |  2 +-
 main/admin/special_exports.php                |  2 +-
 main/admin/specific_fields.php                |  2 +-
 main/admin/user_fields.php                    |  4 +--
 main/attendance/attendance_sheet.php          |  2 +-
 main/coursecopy/import_backup.php             |  2 +-
 main/exercice/exercise_show.php               |  2 +-
 main/exercice/feedback.php                    |  2 +-
 main/gradebook/lib/fe/catform.class.php       |  2 +-
 main/gradebook/lib/fe/dataform.class.php      |  2 +-
 main/gradebook/lib/fe/evalform.class.php      |  4 +--
 main/gradebook/lib/fe/linkform.class.php      |  2 +-
 main/gradebook/lib/fe/userform.class.php      |  2 +-
 main/group/group_creation.php                 |  3 +-
 main/inc/introductionSection.inc.php          |  2 +-
 .../pear/HTML/QuickForm/Renderer/Default.php  | 31 +++++++++++++++++--
 main/inc/lib/statistics.lib.php               |  2 +-
 main/survey/survey_question.php               |  8 ++---
 main/tracking/courseLog.php                   |  2 +-
 main/tracking/course_log_resources.php        |  2 +-
 main/upload/upload_word.php                   |  2 +-
 main/user/subscribe_user.php                  |  2 +-
 plugin/before_login/index.php                 |  4 +--
 plugin/ticket/src/myticket.php                |  2 +-
 30 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/main/admin/class_list.php b/main/admin/class_list.php
index d6151dbb82..60c62105f0 100755
--- a/main/admin/class_list.php
+++ b/main/admin/class_list.php
@@ -102,7 +102,7 @@ if (isset($_GET['action'])) {
 // Create a search-box
 $form = new FormValidator('search_simple', 'get', '', '', null, false);
 $renderer =& $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
+$renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('keyword'));
 $form->addElement('button', 'submit', get_lang('Search'));
 $content .= $form->return_form();
diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php
index da0251c075..fd17e46824 100755
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@@ -923,7 +923,7 @@ switch ($action) {
 		$renderer =& $form->defaultRenderer();
 		$renderer->setHeaderTemplate('');
 		$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-		$renderer->setElementTemplate('<tr><td>{element}</td></tr>');
+		$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
 		$renderer->setRequiredNoteTemplate('');
 		$form->addElement('hidden', 'formSent', '1');
 
diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php
index fe28bd7230..8ea65fc4b1 100755
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@@ -353,7 +353,7 @@ switch ($action){
         $renderer =& $form->defaultRenderer();
         $renderer->setHeaderTemplate('');
         $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-        $renderer->setElementTemplate('<tr><td>{element}</td></tr>');
+        $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
         $renderer->setRequiredNoteTemplate('');
         $form->addElement('hidden', 'formSent', '1');
         $default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
diff --git a/main/admin/course_request_accepted.php b/main/admin/course_request_accepted.php
index fef8b349fa..376f8cf249 100755
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
@@ -146,7 +146,7 @@ if (!$course_validation_feature) {
 // Create a simple search-box.
 $form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
 $renderer = $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
+$renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('keyword'));
 $form->addButtonSearch(get_lang('Search'));
 
diff --git a/main/admin/course_request_rejected.php b/main/admin/course_request_rejected.php
index c0c57d3789..8ebd1e74b7 100755
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
@@ -179,7 +179,7 @@ if (!$course_validation_feature) {
 // Create a simple search-box.
 $form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
 $renderer = $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
+$renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('keyword'));
 $form->addButtonSearch(get_lang('Search'));
 
diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index e1db0a7d98..9f12f6ae18 100755
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -227,7 +227,7 @@ if (!$course_validation_feature) {
 // Create a simple search-box.
 $form = new FormValidator('search_simple', 'get', '', '', 'width=200px', false);
 $renderer = $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
+$renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('keyword'));
 $form->addButtonSearch(get_lang('Search'));
 
diff --git a/main/admin/group_list.php b/main/admin/group_list.php
index 4ec95ac6e9..a999e6b5d7 100755
--- a/main/admin/group_list.php
+++ b/main/admin/group_list.php
@@ -377,7 +377,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
     // Create a search-box
     $form = new FormValidator('search_simple', 'get', '', '', null, false);
     $renderer = & $form->defaultRenderer();
-    $renderer->setElementTemplate('<span>{element}</span> ');
+    $renderer->setCustomElementTemplate('<span>{element}</span> ');
     $form->addElement('text', 'keyword', get_lang('keyword'));
     $form->addButtonSearch(get_lang('Search'));
     echo '<div class="actions" style="width:100%;">';
diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php
index 2d40b11ca4..ee6fd20892 100755
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
@@ -151,7 +151,7 @@ Display::display_footer();
 function form_special_export() {
     $form = new FormValidator('special_exports','post');
     $renderer = $form->defaultRenderer();
-    $renderer->setElementTemplate('<div>{element}</div> ');
+    $renderer->setCustomElementTemplate('<div>{element}</div> ');
     $form->addElement('radio', 'backup_option', '',  get_lang('SpecialCreateFullBackup'), 'full_backup');
     $form->addElement('radio', 'backup_option', '',  get_lang('SpecialLetMeSelectItems'), 'select_items');
     $form->addElement('html','<br />');
diff --git a/main/admin/specific_fields.php b/main/admin/specific_fields.php
index 3b8273f4c6..603868cdc0 100755
--- a/main/admin/specific_fields.php
+++ b/main/admin/specific_fields.php
@@ -27,7 +27,7 @@ include_once $libpath.'specific_fields_manager.lib.php';
 // Create an add-field box
 $form = new FormValidator('add_field','post','','',null,false);
 $renderer =& $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
+$renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
 
 // Create a sortable table with specific fields data
diff --git a/main/admin/user_fields.php b/main/admin/user_fields.php
index a4a4d0eef9..2da0db8715 100755
--- a/main/admin/user_fields.php
+++ b/main/admin/user_fields.php
@@ -127,7 +127,7 @@ if(1)
 	// Create an add-field box
 	$form = new FormValidator('add_field','post','','',null,false);
 	$renderer =& $form->defaultRenderer();
-	$renderer->setElementTemplate('<span>{element}</span> ');
+	$renderer->setCustomElementTemplate('<span>{element}</span> ');
 	//$form->addElement('text','label',get_lang('FieldLabel'));
 	//$form->addElement('text','type',get_lang('FieldType'));
 	//$form->addElement('text','title',get_lang('FieldTitle'));
@@ -384,4 +384,4 @@ function delete_user_fields($field_id)
 		// the field was not deleted so we return false
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index ba0f355747..9234f2f1f7 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -96,7 +96,7 @@ if (api_is_allowed_to_edit(null, true) ||
     }
 
     $renderer = $form->defaultRenderer();
-    $renderer->setElementTemplate('{label} {element} ');
+    $renderer->setCustomElementTemplate('{label} {element} ');
 
     $form->setDefaults(
         array(
diff --git a/main/coursecopy/import_backup.php b/main/coursecopy/import_backup.php
index 83e4b2e7ca..4886a4efef 100755
--- a/main/coursecopy/import_backup.php
+++ b/main/coursecopy/import_backup.php
@@ -161,7 +161,7 @@ if (Security::check_token('post') && (
     );
     $form->addElement('header', get_lang('SelectBackupFile'));
     $renderer = $form->defaultRenderer();
-    $renderer->setElementTemplate('<div>{element}</div> ');
+    $renderer->setCustomElementTemplate('<div>{element}</div> ');
 
     $form->addElement('hidden', 'action', 'restore_backup');
 
diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php
index 4a29cbe1f3..0fc7112e62 100755
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@@ -542,7 +542,7 @@ foreach ($questionList as $questionId) {
 			$feedback_form->addElement('html','<br>');
 			$renderer =& $feedback_form->defaultRenderer();
 			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
-			$renderer->setElementTemplate('<div align="left">{element}</div>');
+			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
 			$comnt = Event::get_comments($id, $questionId);
 			$default = array('comments_'.$questionId =>  $comnt);
 
diff --git a/main/exercice/feedback.php b/main/exercice/feedback.php
index f4421bcf9e..e679872c9b 100755
--- a/main/exercice/feedback.php
+++ b/main/exercice/feedback.php
@@ -52,7 +52,7 @@ Display::display_header($nameTools,"Exercise");
 	$form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
 	$obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
 	$renderer =& $obj_registration_form->defaultRenderer();
-	$renderer->setElementTemplate(
+	$renderer->setCustomElementTemplate(
 '<tr>
 	<td align="left" style="" valign="top" width=30%>{label}
 		<!-- BEGIN required --><span style="color: #ff0000">*</span><!-- END required -->
diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php
index b24e59d865..cc6c155a2b 100755
--- a/main/gradebook/lib/fe/catform.class.php
+++ b/main/gradebook/lib/fe/catform.class.php
@@ -53,7 +53,7 @@ class CatForm extends FormValidator
     protected function build_move_form()
     {
         $renderer =& $this->defaultRenderer();
-        $renderer->setElementTemplate('<span>{element}</span> ');
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement(
             'static',
             null,
diff --git a/main/gradebook/lib/fe/dataform.class.php b/main/gradebook/lib/fe/dataform.class.php
index 66c9a58756..7e79e9454a 100755
--- a/main/gradebook/lib/fe/dataform.class.php
+++ b/main/gradebook/lib/fe/dataform.class.php
@@ -42,7 +42,7 @@ class DataForm extends FormValidator
 	protected function build_pdf_export_form()
 	{
 		$renderer =& $this->defaultRenderer();
-		$renderer->setElementTemplate('<span>{element}</span>');
+		$renderer->setCustomElementTemplate('<span>{element}</span>');
 		$this->addElement('header', get_lang('ChooseOrientation'));
 		$this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
 		$this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');
diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php
index 1e95c762ea..dfdd285624 100755
--- a/main/gradebook/lib/fe/evalform.class.php
+++ b/main/gradebook/lib/fe/evalform.class.php
@@ -214,7 +214,7 @@ class EvalForm extends FormValidator
     protected function build_move_form()
     {
         $renderer = & $this->defaultRenderer();
-        $renderer->setElementTemplate('<span>{element}</span> ');
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement('static', null, null, '"' . $this->evaluation_object->get_name() . '" ');
         $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
@@ -332,7 +332,7 @@ class EvalForm extends FormValidator
         ));
         $userinfo = api_get_user_info($this->result_object->get_user_id());
         $renderer = & $this->defaultRenderer();
-        $renderer->setElementTemplate('<span>{element}</span> ');
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement('label', get_lang('User'), $userinfo['complete_name']);
 
         $this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(
diff --git a/main/gradebook/lib/fe/linkform.class.php b/main/gradebook/lib/fe/linkform.class.php
index 29e66bd5e2..454e11dc97 100755
--- a/main/gradebook/lib/fe/linkform.class.php
+++ b/main/gradebook/lib/fe/linkform.class.php
@@ -57,7 +57,7 @@ class LinkForm extends FormValidator
 	protected function build_move()
 	{
 		$renderer =& $this->defaultRenderer();
-		$renderer->setElementTemplate('<span>{element}</span> ');
+		$renderer->setCustomElementTemplate('<span>{element}</span> ');
 		$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
 		$this->addElement('static',null,null,get_lang('MoveTo').' : ');
 		$select = $this->addElement('select','move_cat',null,null);
diff --git a/main/gradebook/lib/fe/userform.class.php b/main/gradebook/lib/fe/userform.class.php
index 7397904934..6a948a324d 100755
--- a/main/gradebook/lib/fe/userform.class.php
+++ b/main/gradebook/lib/fe/userform.class.php
@@ -46,7 +46,7 @@ class UserForm extends FormValidator
 			));
 		}
 		$renderer =& $this->defaultRenderer();
-		$renderer->setElementTemplate('<span>{element}</span> ');
+		$renderer->setCustomElementTemplate('<span>{element}</span> ');
 		$this->addElement('text','keyword','');
 		$this->addElement('style_submit_button','submit',get_lang('Search'),'class="search"');
 	}
diff --git a/main/group/group_creation.php b/main/group/group_creation.php
index d3205b0258..97b9221ff6 100755
--- a/main/group/group_creation.php
+++ b/main/group/group_creation.php
@@ -155,7 +155,7 @@ elseif (isset($_POST['number_of_groups'])) {
 	</tr>
 
 EOT;
-		$renderer->setElementTemplate($element_template);
+		$renderer->setCustomElementTemplate($element_template);
         $form->addElement('header', $nameTools);
 		$form->addElement('hidden', 'action');
 		$form->addElement('hidden', 'number_of_groups');
@@ -163,6 +163,7 @@ EOT;
 		// Table heading
 		$group_el = array ();
 		$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
+
 		if (api_get_setting('allow_group_categories') == 'true') {
 			$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
 		}
diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php
index ac5e003411..a86601503e 100755
--- a/main/inc/introductionSection.inc.php
+++ b/main/inc/introductionSection.inc.php
@@ -50,7 +50,7 @@ if (!empty($courseId)) {
 }
 
 $renderer =& $form->defaultRenderer();
-$renderer->setElementTemplate('<div style="width: 80%; margin: 0px auto; padding-bottom: 10px; ">{element}</div>');
+$renderer->setCustomElementTemplate('<div style="width: 80%; margin: 0px auto; padding-bottom: 10px; ">{element}</div>');
 
 $toolbar_set = 'IntroductionTool';
 $width = '100%';
diff --git a/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php b/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
index 8f770e9021..57cf2db288 100755
--- a/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
+++ b/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
@@ -37,6 +37,24 @@
 class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
 {
     private $form;
+    private $customElementTemplate;
+
+    /**
+     * @return mixed
+     */
+    public function getCustomElementTemplate()
+    {
+        return $this->customElementTemplate;
+    }
+
+    /**
+     * This template will be taken instead of the default templates by element
+     * @param string $customElementTemplate
+     */
+    public function setCustomElementTemplate($customElementTemplate)
+    {
+        $this->customElementTemplate = $customElementTemplate;
+    }
 
    /**
     * The HTML of the form
@@ -277,10 +295,17 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
             // Custom template
             $html = str_replace('{label}', $nameLabel, $this->_templates[$name]);
         } else {
-            if (method_exists($element, 'getTemplate')) {
-                $template = $element->getTemplate($this->getForm()->getLayout());
+            $customElementTemplate = $this->getCustomElementTemplate();
+            if (empty($customElementTemplate)) {
+                if (method_exists($element, 'getTemplate')) {
+                    $template = $element->getTemplate(
+                        $this->getForm()->getLayout()
+                    );
+                } else {
+                    $template = $this->getForm()->getDefaultElementTemplate();
+                }
             } else {
-                $template = $this->getForm()->getDefaultElementTemplate();
+                $template = $customElementTemplate;
             }
             $html = str_replace('{label}', $nameLabel, $template);
         }
diff --git a/main/inc/lib/statistics.lib.php b/main/inc/lib/statistics.lib.php
index 89712cdfb8..135ad0102b 100644
--- a/main/inc/lib/statistics.lib.php
+++ b/main/inc/lib/statistics.lib.php
@@ -566,7 +566,7 @@ class Statistics
         // Create a search-box
         $form = new FormValidator('search_simple','get',api_get_path(WEB_CODE_PATH).'admin/statistics/index.php','','width=200px',false);
         $renderer =& $form->defaultRenderer();
-        $renderer->setElementTemplate('<span>{element}</span> ');
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $form->addElement('hidden','report','activities');
         $form->addElement('hidden','activities_direction','DESC');
         $form->addElement('hidden','activities_column','4');
diff --git a/main/survey/survey_question.php b/main/survey/survey_question.php
index 6eace3fb03..cd4fcafec5 100644
--- a/main/survey/survey_question.php
+++ b/main/survey/survey_question.php
@@ -116,15 +116,11 @@ class survey_question
     public function renderForm()
     {
         if (isset($_GET['question_id']) and !empty($_GET['question_id'])) {
-            $icon = 'pencil';
-            $text = get_lang('ModifyQuestionSurvey');
+            $this->buttonList[] = $this->getForm()->addButtonUpdate(get_lang('ModifyQuestionSurvey'), 'save', true);
         } else {
-            $icon = 'check';
-            $text = get_lang('CreateQuestionSurvey');
+            $this->buttonList[] = $this->getForm()->addButtonSave(get_lang('CreateQuestionSurvey'), 'save', true);
         }
 
-        $this->buttonList[] = $this->getForm()->createElement('button', 'save', $text, $icon);
-
         $this->getForm()->addGroup($this->buttonList, 'buttons');
     }
 
diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php
index ebaf7b1d91..a85f16d920 100755
--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@@ -263,7 +263,7 @@ $form_search = new FormValidator(
     FormValidator::LAYOUT_INLINE
 );
 $renderer = $form_search->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span>');
+$renderer->setCustomElementTemplate('<span>{element}</span>');
 $form_search->addElement('hidden', 'from', Security::remove_XSS($from));
 $form_search->addElement('hidden', 'session_id', $sessionId);
 $form_search->addElement('hidden', 'id_session', $sessionId);
diff --git a/main/tracking/course_log_resources.php b/main/tracking/course_log_resources.php
index 57cde0c7ac..0913767ba4 100755
--- a/main/tracking/course_log_resources.php
+++ b/main/tracking/course_log_resources.php
@@ -106,7 +106,7 @@ $form = new FormValidator(
     false
 );
 $renderer = $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span>');
+$renderer->setCustomElementTemplate('<span>{element}</span>');
 $form->addElement('text', 'keyword', get_lang('keyword'));
 $form->addElement('hidden', 'cidReq', api_get_course_id());
 $form->addElement('hidden', 'id_session', $session_id);
diff --git a/main/upload/upload_word.php b/main/upload/upload_word.php
index 085cbdb380..88cd47abad 100755
--- a/main/upload/upload_word.php
+++ b/main/upload/upload_word.php
@@ -153,7 +153,7 @@ $user_file_template =
         <!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
 </div>
 EOT;
-$renderer->setElementTemplate($user_file_template);
+$renderer->setCustomElementTemplate($user_file_template);
 
 $form -> addElement ('file', 'user_file','<img src="../img/word_big.gif" align="absbottom" />');
 if (api_get_setting('search_enabled')=='true') {
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index 52cc4f6fba..9522d5158e 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -61,7 +61,7 @@ if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
 // Build search-form
 $form = new FormValidator('search_user', 'get', '', '', null, false);
 $renderer = $form->defaultRenderer();
-$renderer->setElementTemplate('<span>{element}</span> ');
+$renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addText('keyword', '', false);
 $form->addElement('hidden', 'type', $type);
 $form->addButtonSearch(get_lang('Search'));
diff --git a/plugin/before_login/index.php b/plugin/before_login/index.php
index 58b8ddcbb7..7a9e08d1e5 100755
--- a/plugin/before_login/index.php
+++ b/plugin/before_login/index.php
@@ -36,7 +36,7 @@ if (api_is_anonymous()) {
 
     $renderer =& $form->defaultRenderer();
     $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-    $renderer->setElementTemplate('<tr><td>{element}</td></tr>');
+    $renderersetCustomElementTemplate->setCustomElementTemplate('<tr><td>{element}</td></tr>');
 
     $form->addElement('html', $option1);
     $form->addElement('checkbox', 'left', null, get_lang('Yes'));
@@ -57,7 +57,7 @@ if (api_is_anonymous()) {
         $renderer =& $form2->defaultRenderer();
         $renderer->setHeaderTemplate('');
         $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-        $renderer->setElementTemplate('<tr><td>{element}</td></tr>');
+        $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
 
         $form2->addElement('html', $option2);
         $form2->addElement('checkbox', 'right', null, get_lang('Yes'));
diff --git a/plugin/ticket/src/myticket.php b/plugin/ticket/src/myticket.php
index 63a4453ac3..6162684a1e 100755
--- a/plugin/ticket/src/myticket.php
+++ b/plugin/ticket/src/myticket.php
@@ -252,7 +252,7 @@ if ($isAdmin) {
     // Create a search-box
     $form = new FormValidator('search_simple', 'get', '', '', null, false);
     $renderer = & $form->defaultRenderer();
-    $renderer->setElementTemplate('<span>{element}</span> ');
+    $renderer->setCustomElementTemplate('<span>{element}</span> ');
     $form->addElement('text', 'keyword', get_lang('keyword'), 'size="25"');
     $form->addElement('style_submit_button', 'submit_simple', get_lang('Search'), 'class="search"');
     $form->addElement('static', 'search_advanced_link', null,

From 39579c38e83c16255e9428bb5327e09b8c18b424 Mon Sep 17 00:00:00 2001
From: Imanol Losada <imanol.losada@gmail.com>
Date: Thu, 19 Mar 2015 08:56:22 -0500
Subject: [PATCH 14/23] Add missing configuration parameters - refs #4507

---
 main/install/configuration.dist.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index 010269e7cf..6133a3c8f1 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -314,4 +314,7 @@ $_configuration['system_stable']     = NEW_VERSION_STABLE;
 //$_configuration['registration.soap.php.decode_utf8'] = false;
 // Show delete option in attendance
 //$_configuration['allow_delete_attendance'] = false;
-
+// Enable Gravatar profile image if no local image has been given
+//$_configuration['gravatar_enabled'] = true;
+// If Gravatar is enabled, tells which type of picture we want (default is "mm"). Options: mm | identicon | monsterid | wavatar
+//$_configuration['gravatar_type'] = 'mm';

From 86d56c0a8e20cb82cd51a50ed292c9c295b6c4ac Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 19 Mar 2015 15:56:52 +0100
Subject: [PATCH 15/23] Add user and group multiple select in survey see
 BT#5715

Missing double validation.
---
 main/inc/lib/AnnouncementManager.php | 32 ++-----------
 main/inc/lib/course.lib.php          | 28 +++++++++++
 main/survey/survey.lib.php           | 72 +++++++++++++++++++++++-----
 main/survey/survey_invite.php        | 45 +++++++++++++----
 4 files changed, 126 insertions(+), 51 deletions(-)

diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php
index feed917576..2e56e245a6 100755
--- a/main/inc/lib/AnnouncementManager.php
+++ b/main/inc/lib/AnnouncementManager.php
@@ -374,7 +374,7 @@ class AnnouncementManager
                     '0'
                 );
             } else {
-                $send_to = self::separate_users_groups($sentTo);
+                $send_to = CourseManager::separateUsersGroups($sentTo);
 
                 // Storing the selected groups
                 if (is_array($send_to['groups']) && !empty($send_to['groups'])) {
@@ -460,7 +460,7 @@ class AnnouncementManager
         // store in item_property (first the groups, then the users
 
         if (!isset($to_users)) { // !isset($to): when no user is selected we send it to everyone
-            $send_to = self::separate_users_groups($to);
+            $send_to = CourseManager::separateUsersGroups($to);
             // storing the selected groups
             if (is_array($send_to['groups'])) {
                 foreach ($send_to['groups'] as $group) {
@@ -541,7 +541,7 @@ class AnnouncementManager
         if (!is_null($to)) {
             // !is_null($to): when no user is selected we send it to everyone
 
-            $send_to = self::separate_users_groups($to);
+            $send_to = CourseManager::separateUsersGroups($to);
 
             // storing the selected groups
             if (is_array($send_to['groups'])) {
@@ -1088,33 +1088,7 @@ class AnnouncementManager
         }
     }
 
-    /**
-     * This function separates the users from the groups
-     * users have a value USER:XXX (with XXX the groups id have a value
-     *  GROUP:YYY (with YYY the group id)
-     * @param    array   Array of strings that define the type and id of each destination
-     * @return   array   Array of groups and users (each an array of IDs)
-     */
-    public static function separate_users_groups($to)
-    {
-        $grouplist = array();
-        $userlist = array();
-        foreach ($to as $to_item) {
-            list($type, $id) = explode(':', $to_item);
-            switch ($type) {
-                case 'GROUP':
-                    $grouplist[] = intval($id);
-                    break;
-                case 'USER':
-                    $userlist[] = intval($id);
-                    break;
-            }
-        }
 
-        $send_to['groups'] = $grouplist;
-        $send_to['users'] = $userlist;
-        return $send_to;
-    }
 
     /**
      * Returns all the users and all the groups a specific announcement item
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index f15b5470f6..29819eaf40 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -5330,6 +5330,34 @@ class CourseManager
         );
     }
 
+    /**
+     * This function separates the users from the groups
+     * users have a value USER:XXX (with XXX the groups id have a value
+     *  GROUP:YYY (with YYY the group id)
+     * @param    array   Array of strings that define the type and id of each destination
+     * @return   array   Array of groups and users (each an array of IDs)
+     */
+    public static function separateUsersGroups($to)
+    {
+        $grouplist = array();
+        $userlist = array();
+        foreach ($to as $to_item) {
+            list($type, $id) = explode(':', $to_item);
+            switch ($type) {
+                case 'GROUP':
+                    $grouplist[] = intval($id);
+                    break;
+                case 'USER':
+                    $userlist[] = intval($id);
+                    break;
+            }
+        }
+
+        $send_to['groups'] = $grouplist;
+        $send_to['users'] = $userlist;
+        return $send_to;
+    }
+
     /**
      * this function shows the form for sending a message to a specific group or user.
      */
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 265c618e59..11e9f4d016 100755
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -3368,9 +3368,19 @@ class SurveyUtil
      * @version January 2007
      *
      */
-    static function save_invitations($users_array, $invitation_title, $invitation_text, $reminder = 0, $sendmail = 0, $remindUnAnswered = 0)
-    {
-        if (!is_array($users_array)) return 0; // Should not happen
+    public static function save_invitations(
+        $users_array,
+        $invitation_title,
+        $invitation_text,
+        $reminder = 0,
+        $sendmail = 0,
+        $remindUnAnswered = 0
+    ) {
+        if (!is_array($users_array)) {
+            // Should not happen
+
+            return 0;
+        }
 
         // Getting the survey information
         $survey_data = survey_manager::get_survey($_GET['survey_id']);
@@ -3386,13 +3396,38 @@ class SurveyUtil
 
         $counter = 0;  // Nr of invitations "sent" (if sendmail option)
         $course_id = api_get_course_int_id();
-
         $session_id = api_get_session_id();
 
-        foreach ($users_array as $key=>$value) {
-            if (!isset($value) || $value == '') continue;
+        $result = CourseManager::separateUsersGroups($users_array);
+
+        $groupList = $result['groups'];
+        $users_array = $result['users'];
+
+        foreach ($groupList as $groupId) {
+            $userGroupList = GroupManager::getStudents($groupId);
+            $userGroupIdList = array_column($userGroupList, 'user_id');
+            $users_array = array_merge($users_array, $userGroupIdList);
+
+            $params = array(
+                'c_id' => $course_id,
+                'session_id' => $session_id,
+                'group_id' => $groupId,
+                'survey_code' => $survey_data['code']
+            );
+            self::save_invitation($params);
+        }
+
+        $users_array = array_unique($users_array);
+
+        foreach ($users_array as $key => $value) {
+            if (!isset($value) || $value == '') {
+                continue;
+            }
+
             // Skip user if reminding only unanswered people
-            if (in_array($value, $exclude_users)) continue;
+            if (in_array($value, $exclude_users)) {
+                continue;
+            }
             // Get the unique invitation code if we already have it
             if ($reminder == 1 && array_key_exists($value, $survey_invitations)) {
                 $invitation_code = $survey_invitations[$value]['invitation_code'];
@@ -3403,8 +3438,10 @@ class SurveyUtil
             // Store the invitation if user_id not in $already_invited['course_users'] OR email is not in $already_invited['additional_users']
             $addit_users_array = isset($already_invited['additional_users']) && !empty($already_invited['additional_users']) ? explode(';', $already_invited['additional_users']) : array();
 
-            $my_alredy_invited = ($already_invited['course_users'] == null) ? array() : $already_invited['course_users'];
-            if ((is_numeric($value) && !in_array($value, $my_alredy_invited)) || (!is_numeric($value) && !in_array($value, $addit_users_array))) {
+            $my_alredy_invited = $already_invited['course_users'] == null ? array() : $already_invited['course_users'];
+            if ((is_numeric($value) && !in_array($value, $my_alredy_invited)) ||
+                (!is_numeric($value) && !in_array($value, $addit_users_array))
+            ) {
                 $new_user = true;
                 if (!array_key_exists($value, $survey_invitations)) {
                     $params = array(
@@ -3418,6 +3455,7 @@ class SurveyUtil
                     self::save_invitation($params);
                 }
             }
+
             // Send the email if checkboxed
             if (($new_user || $reminder == 1) && $sendmail != 0) {
                 // Make a change for absolute url
@@ -3430,14 +3468,19 @@ class SurveyUtil
                 $counter++;
             }
         }
+
         return $counter; // Number of invitations sent
     }
 
+    /**
+     * @param $params
+     * @return bool|int
+     */
     static function save_invitation($params)
     {
         // Database table to store the invitations data
         $table_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-        if (!empty($params['c_id']) && !empty($params['user']) && !empty($params['survey_code'])) {
+        if (!empty($params['c_id']) && (!empty($params['user']) || !empty($params['group_id'])) && !empty($params['survey_code'])) {
             return Database::insert($table_survey_invitation, $params);
         }
         return false;
@@ -3580,7 +3623,7 @@ class SurveyUtil
 
         // Selecting all the invitations of this survey AND the additional emailaddresses (the left join)
         $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
-        $sql = "SELECT user
+        $sql = "SELECT user, group_id
 				FROM $table_survey_invitation as table_invitation
 				WHERE
 				    table_invitation.c_id = $course_id AND
@@ -3590,17 +3633,22 @@ class SurveyUtil
 
         $defaults = array();
         $defaults['course_users'] = array();
-        $defaults['additional_users'] = array();
+        $defaults['additional_users'] = array(); // Textarea
+        $defaults['users'] = array(); // user and groups
 
         $result = Database::query($sql);
         while ($row = Database::fetch_array($result)) {
             if (is_numeric($row['user'])) {
                 $defaults['course_users'][] = $row['user'];
+                $defaults['users'][] = 'USER:'.$row['user'];
             } else {
                 if (!empty($row['user'])) {
                     $defaults['additional_users'][] = $row['user'];
                 }
             }
+            if (isset($row['group_id'])) {
+                $defaults['users'][] = 'GROUP:'.$row['group_id'];
+            }
         }
 
         if (!empty($defaults['course_users'])) {
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index a7a6343f59..0bf5ada244 100755
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -91,7 +91,11 @@ if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) {
 }
 
 // Building the form for publishing the survey
-$form = new FormValidator('publish_form', 'post', api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidReq());
+$form = new FormValidator(
+	'publish_form',
+	'post',
+	api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidReq()
+);
 $form->addElement('header', '', $tool_name);
 
 // Course users
@@ -105,7 +109,17 @@ $possible_users = array();
 foreach ($complete_user_list as & $user) {
 	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 }
-$users = $form->addElement('advmultiselect', 'course_users', get_lang('CourseUsers'), $possible_users, 'style="width: 250px; height: 200px;"');
+
+
+CourseManager::addUserGroupMultiSelect($form, array());
+
+/*$form->addElement(
+	'advmultiselect',
+	'course_users',
+	get_lang('CourseUsers'),
+	$possible_users,
+	'style="width: 250px; height: 200px;"'
+);*/
 
 // Additional users
 $form->addElement(
@@ -122,13 +136,12 @@ $form->addElement('html', '</div>');
 $form->addElement('html', '<div id="mail_text_wrapper">');
 
 // The title of the mail
-$form->addElement('text', 'mail_title', get_lang('MailTitle'), array('class' => 'span6'));
+$form->addText('mail_title', get_lang('MailTitle'), false);
 // The text of the mail
-$form->addElement(
-	'html_editor',
+$form->addHtmlEditor(
 	'mail_text',
 	array(get_lang('MailText'), get_lang('UseLinkSyntax')),
-	null,
+	false,
 	array('ToolbarSet' => 'Survey', 'Height' => '150')
 );
 $form->addElement('html', '</div>');
@@ -163,7 +176,7 @@ $form->addElement('label', null, $auto_survey_link);
 
 if ($form->validate()) {
    	$values = $form->exportValues();
-    if ($values['send_mail'] == 1) {
+    if (isset($values['send_mail']) && $values['send_mail'] == 1) {
         if (empty($values['mail_title']) || empty($values['mail_text'])) {
             Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete'));
             // Getting the invited users
@@ -183,10 +196,22 @@ if ($form->validate()) {
         }
     }
     // Save the invitation mail
-	SurveyUtil::save_invite_mail($values['mail_text'], $values['mail_title'], !empty($survey_data['invite_mail']));
+	SurveyUtil::save_invite_mail(
+		$values['mail_text'],
+		$values['mail_title'],
+		!empty($survey_data['invite_mail'])
+	);
+
 	// Saving the invitations for the course users
-	$count_course_users = SurveyUtil::save_invitations($values['course_users'], $values['mail_title'],
-    $values['mail_text'], $values['resend_to_all'], $values['send_mail'], $values['remindUnAnswered']);
+	$count_course_users = SurveyUtil::save_invitations(
+		$values['users'],
+		$values['mail_title'],
+		$values['mail_text'],
+		$values['resend_to_all'],
+		$values['send_mail'],
+		$values['remindUnAnswered']
+	);
+
 	// Saving the invitations for the additional users
 	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
 	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators

From 88cbbed4ccffe00b8a0adf72401121c1d213e3a2 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 13:08:48 -0500
Subject: [PATCH 16/23] Remove divs endings non-existent

---
 main/template/default/layout/main.tpl        | 2 --
 main/template/default/layout/show_footer.tpl | 2 --
 2 files changed, 4 deletions(-)

diff --git a/main/template/default/layout/main.tpl b/main/template/default/layout/main.tpl
index d37549b910..acf2bec370 100755
--- a/main/template/default/layout/main.tpl
+++ b/main/template/default/layout/main.tpl
@@ -13,8 +13,6 @@
     {% if show_footer == true %}
         </div> <!-- end of #row" -->
         </div> <!-- end of #main" -->
-        </div> <!-- end of #page section -->
-        </div> <!-- end of #wrapper section -->
     {% endif %}
     {% include template ~ "/layout/main_footer.tpl" %}
 {% endblock %}
diff --git a/main/template/default/layout/show_footer.tpl b/main/template/default/layout/show_footer.tpl
index 24da11e707..895e00e8e7 100755
--- a/main/template/default/layout/show_footer.tpl
+++ b/main/template/default/layout/show_footer.tpl
@@ -19,8 +19,6 @@
 {% if show_footer == true %}
         </div> <!-- end of #row" -->
     </div> <!-- end of #main" -->
-    </div> <!-- end of #page section -->
-</div> <!-- end of #wrapper section -->
 
 {% endif %}
 

From 7f2f3a5da87a78c2c2dd14fb43ce9671d38d1523 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 13:18:55 -0500
Subject: [PATCH 17/23] Fix show/hide question description

---
 main/exercice/question.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index ecf0669f84..b866cbeb73 100755
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -1254,7 +1254,7 @@ abstract class Question
 			<a href="javascript://" onclick=" return show_media()"><span id="media_icon"><img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'</span></a>
 		');
 
-        $form->addElement ('html','<div class="HideFCKEditor" id="HiddenFCKquestionDescription" >');
+        $form->addElement ('html','<div class="HideFCKEditor" id="HiddenFCKquestionDescription" style="display: none;" >');
         $form->addHtmlEditor('questionDescription', get_lang('QuestionDescription'), false, false, $editor_config);
         $form->addElement ('html','</div>');
 

From 0e3c6562cac057b7bc02fa21f21224ec5026e10c Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 13:20:06 -0500
Subject: [PATCH 18/23] Fix add/edit Unique Answer form

---
 main/exercice/unique_answer.class.php | 69 +++++++++------------------
 1 file changed, 23 insertions(+), 46 deletions(-)

diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 7bb0c32a86..3829ed407a 100755
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -61,34 +61,27 @@ class UniqueAnswer extends Question
             //Scenario
             $editor_config['Width'] = '250';
             $editor_config['Height'] = '110';
-            $comment_title = '<th width="500px" >' . get_lang('Comment') . '</th>';
-            $feedback_title = '<th width="350px" >' . get_lang('Scenario') . '</th>';
+            $comment_title = '<th width="50%" >' . get_lang('Comment') . '</th>';
+            $feedback_title = '<th width="50%" >' . get_lang('Scenario') . '</th>';
         } else {
-            $comment_title = '<th>' . get_lang('Comment') . '</th>';
+            $comment_title = '<th width="50%">' . get_lang('Comment') . '</th>';
         }
 
-        $html = '<table class="data_table">
+        $html = '<table class="table table-striped table-hover">
+            <thead>
                 <tr style="text-align: center;">
-                    <th width="10px">
-                        ' . get_lang('Number') . '
-                    </th>
-                    <th width="10px" >
-                        ' . get_lang('True') . '
-                    </th>
-                    <th width="50%">
-                        ' . get_lang('Answer') . '
-                    </th>
+                    <th width="10">' . get_lang('Number') . '</th>
+                    <th width="10" >' . get_lang('True') . '</th>
+                    <th width="50%">' . get_lang('Answer') . '</th>
                         ' . $comment_title . '
                         ' . $feedback_title . '
-                    <th width="50px">
-                        ' . get_lang('Weighting') . '
-                    </th>
-                </tr>';
-
-        $form->addLabel(
-            get_lang('Answers') . '<br /> <img src="../img/fill_field.png">',
-            $html
-        );
+                    <th width="10">' . get_lang('Weighting') . '</th>
+                </tr>
+            </thead>
+            <tbody>';
+
+        $form->addHeader(get_lang('Answers'));
+        $form->addHtml($html);
 
         $defaults = array();
         $correct = 0;
@@ -278,8 +271,8 @@ class UniqueAnswer extends Question
             $form->addElement('html', '</tr>');
         }
 
-        $form->addElement('html', '</table>');
-        $form->addElement('html', '<br />');
+        $form->addHtml('</tbody>');
+        $form->addHtml('</table>');
 
         $navigator_info = api_get_navigator();
 
@@ -308,31 +301,15 @@ class UniqueAnswer extends Question
                 );
             } else {
                 //setting the save button here and not in the question class.php
-                $form->addElement(
-                    'style_submit_button',
-                    'lessAnswers',
-                    get_lang('LessAnswer'),
-                    'class="btn btn-primary"'
-                );
-                $form->addElement(
-                    'style_submit_button',
-                    'moreAnswers',
-                    get_lang('PlusAnswer'),
-                    'class="btn btn-primary"'
-                );
-                $form->addElement(
-                    'style_submit_button',
-                    'submitQuestion',
-                    $text,
-                    'class="' . $class . '"'
-                );
+                $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
+                $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
+                $form->addButtonSave($text, 'submitQuestion');
             }
         }
-        $renderer->setElementTemplate('{element}&nbsp;', 'submitQuestion');
-        $renderer->setElementTemplate('{element}&nbsp;', 'lessAnswers');
-        $renderer->setElementTemplate('{element}&nbsp;', 'moreAnswers');
 
-        $form->addHtml('</div></div>');
+        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessAnswers');
+        $renderer->setElementTemplate('{element}', 'moreAnswers');
+        $renderer->setElementTemplate('{element}</div></div>', 'submitQuestion');
 
         // We check the first radio button to be sure a radio button will be check
         if ($correct == 0) {

From 214accf3275f839a024e336f4abf60fe9559fc51 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 13:20:59 -0500
Subject: [PATCH 19/23] Update composer.lock

---
 composer.lock | 619 +++++++++++++++++++++++++-------------------------
 1 file changed, 311 insertions(+), 308 deletions(-)

diff --git a/composer.lock b/composer.lock
index 89bf615af9..2f4fae71e6 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "0f2dd6e4c3c50061a455ff5b91160b38",
+    "hash": "9412d5125c2c1b803ab2ae7a9e587a4b",
     "packages": [
         {
             "name": "aferrandini/phpqrcode",
@@ -164,243 +164,6 @@
             "homepage": "http://elfinder.org",
             "time": "2015-02-11 11:10:51"
         },
-        {
-            "name": "behat/behat",
-            "version": "v2.4.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Behat.git",
-                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/f1d2964667cf4b21bb6c2c1564f26829a6954155",
-                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "~2.2.9",
-                "php": ">=5.3.1",
-                "symfony/config": "~2.0",
-                "symfony/console": "~2.0",
-                "symfony/dependency-injection": "~2.0",
-                "symfony/event-dispatcher": "~2.0",
-                "symfony/finder": "~2.0",
-                "symfony/translation": "~2.0",
-                "symfony/yaml": "~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7.19"
-            },
-            "suggest": {
-                "behat/mink-extension": "for integration with Mink testing framework",
-                "behat/symfony2-extension": "for integration with Symfony2 web framework",
-                "behat/yii-extension": "for integration with Yii web framework"
-            },
-            "bin": [
-                "bin/behat"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Behat": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Scenario-oriented BDD framework for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Symfony2"
-            ],
-            "time": "2013-06-06 10:46:48"
-        },
-        {
-            "name": "behat/gherkin",
-            "version": "v2.2.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cca2c477921ca38578d6e9759ea5e450f29c2d8f",
-                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/finder": ">=2.0,<2.4-dev"
-            },
-            "require-dev": {
-                "symfony/config": ">=2.0,<2.4-dev",
-                "symfony/translation": ">=2.0,<2.4-dev",
-                "symfony/yaml": ">=2.0,<2.4-dev"
-            },
-            "suggest": {
-                "symfony/config": "If you want to use Config component to manage resources",
-                "symfony/translation": "If you want to use Symfony2 translations adapter",
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "2.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "DSL",
-                "Symfony2",
-                "parser"
-            ],
-            "time": "2013-03-02 10:38:40"
-        },
-        {
-            "name": "behat/mink",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/Mink.git",
-                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe",
-                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/css-selector": "~2.0"
-            },
-            "suggest": {
-                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
-                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
-                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "1.5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Mink": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Web acceptance testing framework for PHP 5.3",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "testing",
-                "web"
-            ],
-            "time": "2013-04-13 23:39:27"
-        },
-        {
-            "name": "behat/mink-extension",
-            "version": "v1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/MinkExtension.git",
-                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/b4522f19fe96d423883f2e3650615e19d3a48c05",
-                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05",
-                "shasum": ""
-            },
-            "require": {
-                "behat/behat": "~2.4.5",
-                "behat/mink": ">=1.4.3,<1.6-dev",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "behat/mink-goutte-driver": "~1.0"
-            },
-            "type": "behat-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\MinkExtension": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Mink extension for Behat",
-            "homepage": "http://mink.behat.org",
-            "keywords": [
-                "browser",
-                "gui",
-                "test",
-                "web"
-            ],
-            "time": "2013-06-04 12:18:22"
-        },
         {
             "name": "behat/transliterator",
             "version": "v1.0.1",
@@ -852,16 +615,16 @@
         },
         {
             "name": "cocur/slugify",
-            "version": "v1.0",
+            "version": "v1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cocur/slugify.git",
-                "reference": "2c929c56997e663747be9bb635e58db918a0134f"
+                "reference": "2b67d4e2b75dbaed2ebefa9eb5683e8940513847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cocur/slugify/zipball/2c929c56997e663747be9bb635e58db918a0134f",
-                "reference": "2c929c56997e663747be9bb635e58db918a0134f",
+                "url": "https://api.github.com/repos/cocur/slugify/zipball/2b67d4e2b75dbaed2ebefa9eb5683e8940513847",
+                "reference": "2b67d4e2b75dbaed2ebefa9eb5683e8940513847",
                 "shasum": ""
             },
             "require": {
@@ -870,7 +633,9 @@
             "require-dev": {
                 "codeclimate/php-test-reporter": "dev-master",
                 "laravel/framework": "~4.1",
+                "latte/latte": "~2.2",
                 "mockery/mockery": "~0.9",
+                "nette/di": "~2.2",
                 "phpunit/phpunit": "~3.7",
                 "sami/sami": "~1.3",
                 "satooshi/php-coveralls": "0.6.*",
@@ -908,7 +673,7 @@
                 "slug",
                 "slugify"
             ],
-            "time": "2014-11-26 22:45:14"
+            "time": "2015-03-18 08:21:30"
         },
         {
             "name": "doctrine/annotations",
@@ -3254,80 +3019,26 @@
             "time": "2015-03-13 17:37:22"
         },
         {
-            "name": "symfony/css-selector",
+            "name": "symfony/debug",
             "version": "v2.6.5",
-            "target-dir": "Symfony/Component/CssSelector",
+            "target-dir": "Symfony/Component/Debug",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f"
+                "url": "https://github.com/symfony/Debug.git",
+                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/86cf0aa16065ffc4545374e9479dd7878bf1d90f",
-                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
+                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.3",
+                "psr/log": "~1.0"
             },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-02-24 11:52:21"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v2.6.5",
-            "target-dir": "Symfony/Component/Debug",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Debug.git",
-                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
-                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {
                 "symfony/class-loader": "~2.2",
@@ -5333,7 +5044,299 @@
             "time": "2014-09-16 22:58:11"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "behat/behat",
+            "version": "v2.4.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Behat.git",
+                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/f1d2964667cf4b21bb6c2c1564f26829a6954155",
+                "reference": "f1d2964667cf4b21bb6c2c1564f26829a6954155",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "~2.2.9",
+                "php": ">=5.3.1",
+                "symfony/config": "~2.0",
+                "symfony/console": "~2.0",
+                "symfony/dependency-injection": "~2.0",
+                "symfony/event-dispatcher": "~2.0",
+                "symfony/finder": "~2.0",
+                "symfony/translation": "~2.0",
+                "symfony/yaml": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.19"
+            },
+            "suggest": {
+                "behat/mink-extension": "for integration with Mink testing framework",
+                "behat/symfony2-extension": "for integration with Symfony2 web framework",
+                "behat/yii-extension": "for integration with Yii web framework"
+            },
+            "bin": [
+                "bin/behat"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Behat": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Scenario-oriented BDD framework for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Symfony2"
+            ],
+            "time": "2013-06-06 10:46:48"
+        },
+        {
+            "name": "behat/gherkin",
+            "version": "v2.2.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cca2c477921ca38578d6e9759ea5e450f29c2d8f",
+                "reference": "cca2c477921ca38578d6e9759ea5e450f29c2d8f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "symfony/finder": ">=2.0,<2.4-dev"
+            },
+            "require-dev": {
+                "symfony/config": ">=2.0,<2.4-dev",
+                "symfony/translation": ">=2.0,<2.4-dev",
+                "symfony/yaml": ">=2.0,<2.4-dev"
+            },
+            "suggest": {
+                "symfony/config": "If you want to use Config component to manage resources",
+                "symfony/translation": "If you want to use Symfony2 translations adapter",
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "2.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "DSL",
+                "Symfony2",
+                "parser"
+            ],
+            "time": "2013-03-02 10:38:40"
+        },
+        {
+            "name": "behat/mink",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/minkphp/Mink.git",
+                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe",
+                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "symfony/css-selector": "~2.0"
+            },
+            "suggest": {
+                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
+                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
+                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Mink": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Web acceptance testing framework for PHP 5.3",
+            "homepage": "http://mink.behat.org/",
+            "keywords": [
+                "browser",
+                "testing",
+                "web"
+            ],
+            "time": "2013-04-13 23:39:27"
+        },
+        {
+            "name": "behat/mink-extension",
+            "version": "v1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/MinkExtension.git",
+                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/b4522f19fe96d423883f2e3650615e19d3a48c05",
+                "reference": "b4522f19fe96d423883f2e3650615e19d3a48c05",
+                "shasum": ""
+            },
+            "require": {
+                "behat/behat": "~2.4.5",
+                "behat/mink": ">=1.4.3,<1.6-dev",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "behat/mink-goutte-driver": "~1.0"
+            },
+            "type": "behat-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\MinkExtension": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Mink extension for Behat",
+            "homepage": "http://mink.behat.org",
+            "keywords": [
+                "browser",
+                "gui",
+                "test",
+                "web"
+            ],
+            "time": "2013-06-04 12:18:22"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v2.6.5",
+            "target-dir": "Symfony/Component/CssSelector",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/CssSelector.git",
+                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "http://symfony.com",
+            "time": "2015-02-24 11:52:21"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {

From 5716e100bfa197523533121ff7ece97538e86502 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 14:56:22 -0500
Subject: [PATCH 20/23] Minor - Format code

---
 main/exercice/multiple_answer.class.php | 221 ++++++++++++------------
 main/exercice/unique_answer.class.php   |  40 ++---
 2 files changed, 127 insertions(+), 134 deletions(-)

diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index 39516ed3cd..aea4e9d63d 100755
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -26,126 +26,133 @@ class MultipleAnswer extends Question
 	}
 
 	/**
-	 * function which redifines Question::createAnswersForm
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function createAnswersForm ($form)
+     * function which redifines Question::createAnswersForm
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function createAnswersForm($form)
     {
 
-		$nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4;  // The previous default value was 2. See task #1759.
-		$nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
-
-		$obj_ex = $_SESSION['objExercise'];
-
-		$html='<table class="data_table">
-					<tr>
-						<th width="10px">
-							'.get_lang('Number').'
-						</th>
-						<th width="10px">
-							'.get_lang('True').'
-						</th>
-						<th width="50%">
-							'.get_lang('Answer').'
-						</th>';
-				// show column comment when feedback is enable
-                $html .='<th>
-                            '.get_lang('Comment').'
-                        </th>';
-				$html .= '<th width="50px">
-							'.get_lang('Weighting').'
-						</th>
-					</tr>';
-		$form -> addElement ('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);
-
-		$defaults = array();
-		$correct = 0;
-        $answer = false;
-		if(!empty($this -> id))	{
-			$answer = new Answer($this -> id);
-			$answer -> read();
-			if(count($answer->nbrAnswers)>0 && !$form->isSubmitted()) {
-				$nb_answers = $answer->nbrAnswers;
-			}
-		}
-
-		$form -> addElement('hidden', 'nb_answers');
-		$boxes_names = array();
-
-		if ($nb_answers < 1) {
-			$nb_answers = 1;
-			Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
-		}
-
-		for ($i = 1 ; $i <= $nb_answers ; ++$i) {
-			if(is_object($answer)) {
-				$defaults['answer['.$i.']'] = $answer -> answer[$i];
-				$defaults['comment['.$i.']'] = $answer -> comment[$i];
-				$defaults['weighting['.$i.']'] = float_format($answer -> weighting[$i], 1);
-				$defaults['correct['.$i.']'] = $answer -> correct[$i];
-			} else {
-				$defaults['answer[1]']  = get_lang('DefaultMultipleAnswer2');
-				$defaults['comment[1]'] = get_lang('DefaultMultipleComment2');
-				$defaults['correct[1]'] = true;
-				$defaults['weighting[1]'] = 10;
-
-				$defaults['answer[2]']  = get_lang('DefaultMultipleAnswer1');
-				$defaults['comment[2]'] = get_lang('DefaultMultipleComment1');
-				$defaults['correct[2]'] = false;
-				$defaults['weighting[2]'] = -5;
-			}
-			$renderer = & $form->defaultRenderer();
+        $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4;  // The previous default value was 2. See task #1759.
+        $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
 
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'correct['.$i.']');
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'counter['.$i.']');
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'answer['.$i.']');
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
-            $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
+        $obj_ex = $_SESSION['objExercise'];
 
-			$answer_number=$form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
-			$answer_number->freeze();
+        $html = '<table class="data_table">
+            <tr>
+                <th width="10px">' . get_lang('Number') . '</th>
+                <th width="10px">' . get_lang('True') . '</th>
+                <th width="50%">' . get_lang('Answer') . '</th>
+                <th>' . get_lang('Comment') . '</th>
+                <th width="50px">' . get_lang('Weighting') . '</th>
+            </tr>';
+        $form->addElement('label', get_lang('Answers') . '<br /> <img src="../img/fill_field.png">', $html);
 
-			$form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox" style="margin-left: 0em;"');
-			$boxes_names[] = 'correct['.$i.']';
+        $defaults = array();
+        $correct = 0;
+        $answer = false;
+        if (!empty($this->id)) {
+            $answer = new Answer($this->id);
+            $answer->read();
+            if (count($answer->nbrAnswers) > 0 && !$form->isSubmitted()) {
+                $nb_answers = $answer->nbrAnswers;
+            }
+        }
 
-			$form->addElement('html_editor', 'answer['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
-			$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addElement('hidden', 'nb_answers');
+        $boxes_names = array();
 
-				$form->addElement('html_editor', 'comment['.$i.']',null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+        if ($nb_answers < 1) {
+            $nb_answers = 1;
+            Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
+        }
 
-			$form->addElement('text', 'weighting['.$i.']',null, array('class' => "span1", 'value' => '0'));
-			$form -> addElement ('html', '</tr>');
-		}
-		$form -> addElement ('html', '</table>');
-		$form -> addElement ('html', '<br />');
+        for ($i = 1; $i <= $nb_answers; ++$i) {
+            if (is_object($answer)) {
+                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
+                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
+                $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1);
+                $defaults['correct[' . $i . ']'] = $answer->correct[$i];
+            } else {
+                $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2');
+                $defaults['comment[1]'] = get_lang('DefaultMultipleComment2');
+                $defaults['correct[1]'] = true;
+                $defaults['weighting[1]'] = 10;
+
+                $defaults['answer[2]'] = get_lang('DefaultMultipleAnswer1');
+                $defaults['comment[2]'] = get_lang('DefaultMultipleComment1');
+                $defaults['correct[2]'] = false;
+                $defaults['weighting[2]'] = -5;
+            }
+            $renderer = & $form->defaultRenderer();
+
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'correct[' . $i . ']'
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'counter[' . $i . ']'
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'answer[' . $i . ']'
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'comment[' . $i . ']'
+            );
+            $renderer->setElementTemplate(
+                '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
+                'weighting[' . $i . ']'
+            );
+
+            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
+            $answer_number->freeze();
+
+            $form->addElement('checkbox', 'correct[' . $i . ']', null, null,
+                'class="checkbox" style="margin-left: 0em;"');
+            $boxes_names[] = 'correct[' . $i . ']';
+
+            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(),
+                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
+
+            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(),
+                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+
+            $form->addElement('text', 'weighting[' . $i . ']', null, array('class' => "span1", 'value' => '0'));
+            $form->addElement('html', '</tr>');
+        }
+        $form->addElement('html', '</table>');
+        $form->addElement('html', '<br />');
 
-		$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
+        $form->add_multiple_required_rule($boxes_names, get_lang('ChooseAtLeastOneCheckbox'), 'multiple_required');
 
-		global $text, $class;
-		if ($obj_ex->edit_exercise_in_lp == true) {
-			// setting the save button here and not in the question class.php
-			$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'),'class="btn minus"');
-			$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'),'class="btn plus"');
-			$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
-		}
+        global $text, $class;
+        if ($obj_ex->edit_exercise_in_lp == true) {
+            // setting the save button here and not in the question class.php
+            $form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
+            $form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
+            $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
+        }
 
-		$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
-		$renderer->setElementTemplate('{element}&nbsp;','submitQuestion');
-		$renderer->setElementTemplate('{element}&nbsp;','moreAnswers');
-		$form -> addElement ('html', '</div></div>');
+        $renderer->setElementTemplate('{element}&nbsp;', 'lessAnswers');
+        $renderer->setElementTemplate('{element}&nbsp;', 'submitQuestion');
+        $renderer->setElementTemplate('{element}&nbsp;', 'moreAnswers');
+        $form->addElement('html', '</div></div>');
 
-		$defaults['correct'] = $correct;
+        $defaults['correct'] = $correct;
 
-		if (!empty($this -> id)) {
-			$form -> setDefaults($defaults);
-		} else {
-			if ($this -> isContent == 1) {
-				$form -> setDefaults($defaults);
-			}
-		}
-		$form->setConstants(array('nb_answers' => $nb_answers));
-	}
+        if (!empty($this->id)) {
+            $form->setDefaults($defaults);
+        } else {
+            if ($this->isContent == 1) {
+                $form->setDefaults($defaults);
+            }
+        }
+        $form->setConstants(array('nb_answers' => $nb_answers));
+    }
 
 
 	/**
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 3829ed407a..5a4b36ec52 100755
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -45,14 +45,14 @@ class UniqueAnswer extends Question
 
         //this line defines how many questions by default appear when creating a choice question
         // The previous default value was 2. See task #1759.
-        $nb_answers = isset($_POST['nb_answers']) ? (int)$_POST['nb_answers'] : 4;
+        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 4;
         $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
 
         /*
-             Types of Feedback
-             $feedback_option[0]=get_lang('Feedback');
-            $feedback_option[1]=get_lang('DirectFeedback');
-            $feedback_option[2]=get_lang('NoFeedback');
+          Types of Feedback
+          $feedback_option[0]=get_lang('Feedback');
+          $feedback_option[1]=get_lang('DirectFeedback');
+          $feedback_option[2]=get_lang('NoFeedback');
          */
 
         $feedback_title = '';
@@ -106,8 +106,7 @@ class UniqueAnswer extends Question
                 }
                 $question = Question::read($questionid);
                 $select_question[$questionid] = 'Q' . $key . ' :' . cut(
-                    $question->selectTitle(),
-                    20
+                    $question->selectTitle(), 20
                 );
             }
         }
@@ -201,33 +200,22 @@ class UniqueAnswer extends Question
             );
 
             $answer_number = $form->addElement(
-                'text',
-                'counter[' . $i . ']',
-                null,
-                ' value = "' . $i . '"'
+                'text', 'counter[' . $i . ']', null, ' value = "' . $i . '"'
             );
             $answer_number->freeze();
             $form->addElement(
-                'radio',
-                'correct',
-                null,
-                null,
-                $i,
-                'class="checkbox"'
+                'radio', 'correct', null, null, $i, 'class="checkbox"'
             );
 
-            $form->addHtmlEditor('answer[' . $i . ']',null,null,true, $editor_config);
+            $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editor_config);
 
             $form->addRule(
-                'answer[' . $i . ']',
-                get_lang('ThisFieldIsRequired'),
-                'required'
+                'answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'
             );
 
             if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
-                $form->addHtmlEditor('comment[' . $i . ']',null,null,false,$editor_config);
+                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
                 // Direct feedback
-
                 //Adding extra feedback fields
                 $group = array();
                 $group['try' . $i] = $form->createElement(
@@ -263,11 +251,10 @@ class UniqueAnswer extends Question
                     '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}',
                     'scenario'
                 );
-
             } else {
-                $form->addHtmlEditor('comment[' . $i . ']',null,null,false,$editor_config);
+                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
             }
-            $form->addText('weighting[' . $i . ']', null,null, array('class' => "col-md-1", 'value' => '0'));
+            $form->addText('weighting[' . $i . ']', null, null, array('class' => "col-md-1", 'value' => '0'));
             $form->addElement('html', '</tr>');
         }
 
@@ -327,7 +314,6 @@ class UniqueAnswer extends Question
             } else {
                 $form->setDefaults(array('correct' => 1));
             }
-
         }
         $form->setConstants(array('nb_answers' => $nb_answers));
     }

From b1e9d310a1620c2bdc0a850ce09e87e685f526b8 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 15:09:55 -0500
Subject: [PATCH 21/23] Fix add/edit Multiple Answer form

---
 main/exercice/multiple_answer.class.php | 44 +++++++++++++++----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index aea4e9d63d..97d83373d4 100755
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -38,15 +38,21 @@ class MultipleAnswer extends Question
 
         $obj_ex = $_SESSION['objExercise'];
 
-        $html = '<table class="data_table">
-            <tr>
-                <th width="10px">' . get_lang('Number') . '</th>
-                <th width="10px">' . get_lang('True') . '</th>
-                <th width="50%">' . get_lang('Answer') . '</th>
-                <th>' . get_lang('Comment') . '</th>
-                <th width="50px">' . get_lang('Weighting') . '</th>
-            </tr>';
-        $form->addElement('label', get_lang('Answers') . '<br /> <img src="../img/fill_field.png">', $html);
+        $form->addHeader(get_lang('Answers'));
+
+        $html = '<table class="table table-striped table-hover">
+            <thead>
+                <tr>
+                    <th width="10">' . get_lang('Number') . '</th>
+                    <th width="10">' . get_lang('True') . '</th>
+                    <th width="50%">' . get_lang('Answer') . '</th>
+                    <th width="50%">' . get_lang('Comment') . '</th>
+                    <th width="10">' . get_lang('Weighting') . '</th>
+                </tr>
+            </thead>
+            <tbody>';
+
+        $form->addHtml($html);
 
         $defaults = array();
         $correct = 0;
@@ -68,6 +74,8 @@ class MultipleAnswer extends Question
         }
 
         for ($i = 1; $i <= $nb_answers; ++$i) {
+            $form->addHtml('<tr>');
+
             if (is_object($answer)) {
                 $defaults['answer[' . $i . ']'] = $answer->answer[$i];
                 $defaults['comment[' . $i . ']'] = $answer->comment[$i];
@@ -124,23 +132,23 @@ class MultipleAnswer extends Question
             $form->addElement('text', 'weighting[' . $i . ']', null, array('class' => "span1", 'value' => '0'));
             $form->addElement('html', '</tr>');
         }
-        $form->addElement('html', '</table>');
-        $form->addElement('html', '<br />');
+
+        $form->addHtml('</tbody>');
+        $form->addHtml('</table>');
 
         $form->add_multiple_required_rule($boxes_names, get_lang('ChooseAtLeastOneCheckbox'), 'multiple_required');
 
         global $text, $class;
         if ($obj_ex->edit_exercise_in_lp == true) {
             // setting the save button here and not in the question class.php
-            $form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'), 'class="btn minus"');
-            $form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'), 'class="btn plus"');
-            $form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
+            $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
+            $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
+            $form->addButtonSave($text, 'submitQuestion');
         }
 
-        $renderer->setElementTemplate('{element}&nbsp;', 'lessAnswers');
-        $renderer->setElementTemplate('{element}&nbsp;', 'submitQuestion');
-        $renderer->setElementTemplate('{element}&nbsp;', 'moreAnswers');
-        $form->addElement('html', '</div></div>');
+        $renderer->setElementTemplate('<div class="form-group"><div class="col-sm-offset-2">{element}', 'lessAnswers');
+        $renderer->setElementTemplate('{element}', 'moreAnswers');
+        $renderer->setElementTemplate('{element}</div></div>', 'submitQuestion');
 
         $defaults['correct'] = $correct;
 

From b7b6257b368a9d13923d743acfb29641aa7a90d8 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 15:22:36 -0500
Subject: [PATCH 22/23] Use form short for add elements to form

---
 main/exercice/multiple_answer.class.php | 13 ++++++++-----
 main/exercice/unique_answer.class.php   |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index 97d83373d4..5c76d0a9c0 100755
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -32,6 +32,11 @@ class MultipleAnswer extends Question
      */
     function createAnswersForm($form)
     {
+        $editorConfig = array(
+            'ToolbarSet' => 'TestProposedAnswer',
+            'Width' => '100%',
+            'Height' => '125'
+        );
 
         $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4;  // The previous default value was 2. See task #1759.
         $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
@@ -122,15 +127,13 @@ class MultipleAnswer extends Question
                 'class="checkbox" style="margin-left: 0em;"');
             $boxes_names[] = 'correct[' . $i . ']';
 
-            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(),
-                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addHtmlEditor("answer[$i]", null, null, true, $editorConfig);
             $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
 
-            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(),
-                array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addHtmlEditor("comment[$i]", null, null, true, $editorConfig);
 
             $form->addElement('text', 'weighting[' . $i . ']', null, array('class' => "span1", 'value' => '0'));
-            $form->addElement('html', '</tr>');
+            $form->addHtml('</tr>');
         }
 
         $form->addHtml('</tbody>');
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 5a4b36ec52..355882c50f 100755
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -131,7 +131,7 @@ class UniqueAnswer extends Question
         }
 
         for ($i = 1; $i <= $nb_answers; ++$i) {
-            $form->addElement('html', '<tr>');
+            $form->addHtml('<tr>');
             if (isset($answer) && is_object($answer)) {
                 if ($answer->correct[$i]) {
                     $correct = $i;
@@ -255,7 +255,7 @@ class UniqueAnswer extends Question
                 $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
             }
             $form->addText('weighting[' . $i . ']', null, null, array('class' => "col-md-1", 'value' => '0'));
-            $form->addElement('html', '</tr>');
+            $form->addHtml('</tr>');
         }
 
         $form->addHtml('</tbody>');

From 2c91bb6e9a61b3bbdab562aabc2cf110167cf6ef Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Mar 2015 15:32:13 -0500
Subject: [PATCH 23/23] User col offset to avoid an empty label

---
 main/inc/lib/formvalidator/FormValidator.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 306b07c6a3..e73152d7e1 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -118,8 +118,7 @@ class FormValidator extends HTML_QuickForm
         $this->setRequiredNote('<span class="form_required">*</span> <small>' . get_lang('ThisFieldIsRequired') . '</small>');
         $noteTemplate = <<<EOT
 	<div class="form-group">
-	    <div class="col-sm-2"></div>
-		<div class="col-sm-10">{requiredNote}</div>
+		<div class="col-sm-offset-2 col-sm-10">{requiredNote}</div>
 	</div>
 EOT;
         $renderer->setRequiredNoteTemplate($noteTemplate);