diff --git a/main/inc/lib/gradebook.lib.php b/main/inc/lib/gradebook.lib.php
index 1f6236e958..1b972088aa 100644
--- a/main/inc/lib/gradebook.lib.php
+++ b/main/inc/lib/gradebook.lib.php
@@ -3,33 +3,20 @@
 /**
  *   This class provides methods for the notebook management.
  *   Include/require it in your code to use its features.
- * @package chamilo.library
+ *   @package chamilo.library
  */
 /**
  * Code
  */
-
 class Gradebook extends Model
 {
-
-    public $columns = array(
-        'id',
-        'name',
-        'description',
-        'course_code',
-        'parent_id',
-        'grade_model_id',
-        'session_id',
-        'weight',
-        'user_id'
-    );
-
+    public $columns = array('id', 'name', 'description', 'course_code', 'parent_id', 'grade_model_id', 'session_id', 'weight', 'user_id');
 
     public function __construct()
     {
-        $this->table                     = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
-        $this->table_skill               = Database::get_main_table(TABLE_MAIN_SKILL);
-        $this->table_skill_rel_gradebook = Database::get_main_table(TABLE_MAIN_SKILL_REL_GRADEBOOK);
+        $this->table                        = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
+        $this->table_skill                  = Database::get_main_table(TABLE_MAIN_SKILL);
+        $this->table_skill_rel_gradebook    = Database::get_main_table(TABLE_MAIN_SKILL_REL_GRADEBOOK);
     }
 
     /**
@@ -41,24 +28,28 @@ class Gradebook extends Model
      */
     public static function is_active($c_id = null)
     {
-        $name     = 'gradebook';
-        $table    = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-        $sql      = "SELECT * from $table WHERE variable='course_hide_tools' AND subkey='$name'";
-        $setting  = ResultSet::create($sql)->first();
-        $setting  = $setting ? $setting : array();
+        $name = 'gradebook';
+        $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $sql = "SELECT * from $table WHERE variable='course_hide_tools' AND subkey='$name' LIMIT 1";
+        $result = Database::query($sql);
+        $setting = Database::store_result($result);
+        $setting = isset($setting[0]) ? $setting[0] : null;
+        $setting = $setting ? $setting : array();
         $inactive = isset($setting['selected_value']) && $setting['selected_value'] == 'true';
 
         if ($inactive) {
             return false;
         }
-        $c_id  = $c_id ? intval($c_id) : api_get_course_int_id();
-        $table = Database::get_course_table(TABLE_TOOL_LIST);
-        $sql   = "SELECT * from $table WHERE c_id = $c_id and name='$name'";
-        $item  = ResultSet::create($sql)->first();
+
+        $c_id = $c_id ? intval($c_id) : api_get_course_int_id();
+        $table  = Database::get_course_table(TABLE_TOOL_LIST);
+        $sql = "SELECT * from $table WHERE c_id = $c_id and name='$name' LIMIT 1";
+        $result = Database::query($sql);
+        $item = Database::store_result($result, 'ASSOC');
+        $item = isset($item[0]) ? $item[0] : null;
         if (empty($item)) {
             return true;
         }
-
         return $item['visibility'] == '1';
     }
 
@@ -69,8 +60,8 @@ class Gradebook extends Model
             if (empty($gradebook['name'])) {
                 $gradebook['name'] = $gradebook['course_code'];
             }
+            //$gradebook['name'] = $gradebook['course_code'] .' > '.$gradebook['name'];
         }
-
         return $gradebooks;
     }
 
@@ -85,16 +76,14 @@ class Gradebook extends Model
         if (!empty($skill_list)) {
 
             //Cleaning skills
-            $skill_list              = array_map('intval', $skill_list);
-            $skill_list              = array_filter($skill_list);
-            $skill_gradebook         = new SkillRelGradebook();
-            $skill_gradebooks_source = $skill_gradebook->get_all(
-                array('where' => array('gradebook_id = ?' => $gradebook_id))
-            );
-            $clean_gradebook         = array();
+            $skill_list = array_map('intval', $skill_list);
+            $skill_list = array_filter($skill_list);
+            $skill_gradebook = new SkillRelGradebook();
+            $skill_gradebooks_source = $skill_gradebook->get_all(array('where'=>array('gradebook_id = ?' =>$gradebook_id)));
+            $clean_gradebook = array();
             if (!empty($skill_gradebooks_source)) {
-                foreach ($skill_gradebooks_source as $source) {
-                    $clean_gradebook[] = $source['skill_id'];
+                foreach($skill_gradebooks_source as $source) {
+                    $clean_gradebook[]= $source['skill_id'];
                 }
             }
             if (!empty($clean_gradebook)) {
@@ -102,7 +91,7 @@ class Gradebook extends Model
             }
 
             foreach ($skill_list as $skill_id) {
-                $params                 = array();
+                $params = array();
                 $params['gradebook_id'] = $gradebook_id;
                 $params['skill_id']     = $skill_id;
                 if (!$skill_gradebook->exists_gradebook_skill($gradebook_id, $skill_id)) {
@@ -111,15 +100,13 @@ class Gradebook extends Model
             }
 
             if (!empty($skill_to_remove)) {
-                foreach ($skill_to_remove as $remove) {
+                foreach($skill_to_remove as $remove) {
                     $skill_item = $skill_gradebook->get_skill_info($remove, $gradebook_id);
                     $skill_gradebook->delete($skill_item['id']);
                 }
             }
-
             return true;
         }
-
         return false;
     }
 
@@ -132,9 +119,8 @@ class Gradebook extends Model
      */
     public function show_skill_form($gradebook_id, $url, $header = null)
     {
-
         $form = new FormValidator('gradebook_add_skill', 'POST', $url);
-        // Settting the form elements
+        // Setting the form elements
         if (!isset($header)) {
             $header = get_lang('Add');
         }
@@ -142,44 +128,40 @@ class Gradebook extends Model
         $id = isset($_GET['id']) ? intval($_GET['id']) : '';
         $form->addElement('hidden', 'id', $id);
 
-        $skill            = new Skill();
-        $skills           = $skill->get_all();
+        $skill = new Skill();
+        $skills = $skill->get_all();
         $clean_skill_list = array();
         foreach ($skills as $skill) {
             $clean_skill_list[$skill['id']] = $skill['name'];
         }
-        $form->addElement(
-            'select',
-            'skill',
-            get_lang('Skills'),
-            $clean_skill_list,
-            array('width' => '450px', 'class' => 'chzn-select', 'multiple' => 'multiple')
-        );
-
-        $selected_skills       = self::get_skills_by_gradebook($gradebook_id);
+        $form->addElement('select', 'skill', get_lang('Skills'), $clean_skill_list, array('width'=>'450px', 'class'=>'chzn-select','multiple' => 'multiple'));
+
+        $selected_skills = self::get_skills_by_gradebook($gradebook_id);
         $clean_selected_skills = array();
         if (!empty($selected_skills)) {
-            foreach ($selected_skills as $skill) {
+            foreach($selected_skills as $skill) {
                 $clean_selected_skills[] = $skill['id'];
             }
         }
 
         $form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
 
-        $form->setDefaults(array('skill' => $clean_selected_skills));
-
+        $form->setDefaults(array('skill'=>$clean_selected_skills));
         return $form;
     }
 
+    /**
+     * @param int $gradebook_id
+     * @return array|resource
+     */
     function get_skills_by_gradebook($gradebook_id)
     {
         $gradebook_id = intval($gradebook_id);
-        $sql          = "SELECT skill.id, skill.name FROM {$this->table_skill} skill INNER JOIN {$this->table_skill_rel_gradebook} skill_rel_gradebook
+        $sql = "SELECT skill.id, skill.name FROM {$this->table_skill} skill INNER JOIN {$this->table_skill_rel_gradebook} skill_rel_gradebook
                     ON skill.id = skill_rel_gradebook.skill_id
                  WHERE skill_rel_gradebook.gradebook_id = $gradebook_id";
-        $result       = Database::query($sql);
-        $result       = Database::store_result($result, 'ASSOC');
-
+        $result = Database::query($sql);
+        $result = Database::store_result($result,'ASSOC');
         return $result;
     }
 
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index 059006fc23..cb764b8c52 100644
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -1,15 +1,14 @@
 <?php
-
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.survey
- * @author unknown, the initial survey that did not make it in 1.8 because of bad code
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
- * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code
- * @version $Id: create_new_survey.php 22297 2009-07-22 22:08:30Z cfasanando $
+ * 	@package chamilo.survey
+ * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
+ * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
+ * 	@author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code
+ * 	@version $Id: create_new_survey.php 22297 2009-07-22 22:08:30Z cfasanando $
  *
- * @todo only the available platform languages should be used => need an api get_languages and and api_get_available_languages (or a parameter)
+ * 	@todo only the available platform languages should be used => need an api get_languages and and api_get_available_languages (or a parameter)
  */
 // Language file that needs to be included
 $language_file = 'survey';
@@ -24,12 +23,24 @@ $this_section = SECTION_COURSES;
 /** @todo check if the starting / is needed. api_get_path probably ends with an / */
 //require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
 require_once 'survey.lib.php';
+//require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
 
 $htmlHeadXtra[] = '<script>
+    function advanced_parameters() {
+        if (document.getElementById(\'options\').style.display == \'none\') {
+            document.getElementById(\'options\').style.display = \'block\';
+            document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif', get_lang('Hide'), array('style' => 'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
+        } else {
+            document.getElementById(\'options\').style.display = \'none\';
+            document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif', get_lang('Show'), array('style' => 'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
+        }
+    }
+
     function setFocus(){
-      $("#surveycode_title").focus();
+        $("#surveycode_title").focus();
     }
+
     $(document).ready(function () {
       setFocus();
     });
@@ -44,10 +55,9 @@ $table_gradebook_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code) */
 // If user is not teacher or if he's a coach trying to access an element out of his session
 if (!api_is_allowed_to_edit()) {
-    if (!api_is_course_coach() || (!empty($_GET['survey_id']) && !api_is_element_in_the_session(
-        TOOL_SURVEY,
-        intval($_GET['survey_id'])
-    ))
+    if (!api_is_course_coach() ||
+        (!empty($_GET['survey_id']) &&
+        !api_is_element_in_the_session(TOOL_SURVEY, $_GET['survey_id']))
     ) {
         api_not_allowed(true);
         exit;
@@ -55,27 +65,35 @@ if (!api_is_allowed_to_edit()) {
 }
 
 // Getting the survey information
-$survey_id = Security::remove_XSS($_GET['survey_id']);
+$survey_id = isset($_GET['survey_id']) ? intval($_GET['survey_id']) : null;
 $survey_data = survey_manager::get_survey($survey_id);
 
 // Additional information
 $course_id = api_get_course_id();
 $session_id = api_get_session_id();
-$gradebook_link_type = 8; // LINK_SURVEY
-
-$urlname = $survey_data['title'];
+$gradebook_link_type = 8;
+$urlname = isset($survey_data['title']) ? strip_tags($survey_data['title']) : null;
 
 // Breadcrumbs
 if ($_GET['action'] == 'add') {
-    $interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq(),
+        'name' => get_lang('SurveyList')
+    );
     $tool_name = get_lang('CreateNewSurvey');
 }
 if ($_GET['action'] == 'edit' && is_numeric($survey_id)) {
-    $interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-    $interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => strip_tags($urlname));
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq(),
+        'name' => get_lang('SurveyList')
+    );
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&'.api_get_cidreq(),
+        'name' => Security::remove_XSS($urlname)
+    );
     $tool_name = get_lang('EditSurvey');
 }
-
+$gradebook_link_id = null;
 // Getting the default values
 if ($_GET['action'] == 'edit' && isset($survey_id) && is_numeric($survey_id)) {
     $defaults = $survey_data;
@@ -86,10 +104,7 @@ if ($_GET['action'] == 'edit' && isset($survey_id) && is_numeric($survey_id)) {
     $gradebook_link_id = $link_info['id'];
 
     if ($link_info) {
-        if ($sql_result_array = Database::fetch_array(
-            Database::query('SELECT weight FROM '.$table_gradebook_link.' WHERE id='.$gradebook_link_id)
-        )
-        ) {
+        if ($sql_result_array = Database::fetch_array(Database::query('SELECT weight FROM '.$table_gradebook_link.' WHERE id='.$gradebook_link_id))) {
             $defaults['survey_qualify_gradebook'] = $gradebook_link_id;
             $defaults['survey_weight'] = number_format($sql_result_array['weight'], 2, '.', '');
         }
@@ -99,82 +114,70 @@ if ($_GET['action'] == 'edit' && isset($survey_id) && is_numeric($survey_id)) {
     $defaults['start_date'] = date('d-F-Y H:i');
     $startdateandxdays = time() + 864000; // today + 10 days
     $defaults['end_date'] = date('d-F-Y H:i', $startdateandxdays);
+    //$defaults['survey_share']['survey_share'] = 0;
+    //$form_share_value = 1;
     $defaults['anonymous'] = 0;
 }
 
 // Initialize the object
-$form = new FormValidator('survey', 'post', api_get_self().'?action='.Security::remove_XSS(
-    $_GET['action']
-).'&survey_id='.$survey_id);
+$form = new FormValidator('survey', 'post', api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.$survey_id);
 
 $form->addElement('header', '', $tool_name);
 
-// Settting the form elements
+// Setting the form elements
 if ($_GET['action'] == 'edit' && isset($survey_id) && is_numeric($survey_id)) {
     $form->addElement('hidden', 'survey_id');
 }
 
-$survey_code = $form->addElement(
-    'text',
-    'survey_code',
-    get_lang('SurveyCode'),
-    array('size' => '20', 'maxlength' => '20', 'id' => 'surveycode_title')
-);
+$survey_code = $form->addElement('text', 'survey_code', get_lang('SurveyCode'), array('size' => '20', 'maxlength' => '20', 'id' => 'surveycode_title'));
 
-$form->addElement(
-    'html_editor',
-    'survey_title',
-    get_lang('SurveyTitle'),
-    null,
-    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '200')
-);
-$form->addElement(
-    'html_editor',
-    'survey_subtitle',
-    get_lang('SurveySubTitle'),
-    null,
-    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '100', 'ToolbarStartExpanded' => false)
-);
+if ($_GET['action'] == 'edit') {
+    $survey_code->freeze();
+    $form->applyFilter('survey_code', 'api_strtoupper');
+}
+
+$form->addElement('html_editor', 'survey_title', get_lang('SurveyTitle'), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '200'));
+$form->addElement('html_editor', 'survey_subtitle', get_lang('SurveySubTitle'), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '100', 'ToolbarStartExpanded' => false));
+
+/*
+  //Language selection has been disabled. If you want to re-enable, please
+  //disable the following line (hidden language field).
+  $lang_array = api_get_languages();
+  foreach ($lang_array['name'] as $key => $value) {
+  $languages[$lang_array['folder'][$key]] = $value;
+  }
+  $form->addElement('select', 'survey_language', get_lang('Language'), $languages);
+ */
 
 // Pass the language of the survey in the form
 $form->addElement('hidden', 'survey_language');
-$form->addElement('datepickerdate', 'start_date', get_lang('StartDate'), array('form_name' => 'survey'));
-$form->addElement('datepickerdate', 'end_date', get_lang('EndDate'), array('form_name' => 'survey'));
+$form->addElement('date_picker', 'start_date', get_lang('StartDate'));
+$form->addElement('date_picker', 'end_date', get_lang('EndDate'));
+
+//$group = '';
+//$group[] =& HTML_QuickForm::createElement('radio', 'survey_share', null, get_lang('Yes'), $form_share_value);
+/** TODO Maybe it is better to change this into false instead see line 95 in survey.lib.php */
+//$group[] =& HTML_QuickForm::createElement('radio', 'survey_share', null, get_lang('No'), 0);
+//$form->addGroup($group, 'survey_share', get_lang('ShareSurvey'), '&nbsp;');
 $form->addElement('checkbox', 'anonymous', null, get_lang('Anonymous'));
+$form->addElement('html_editor', 'survey_introduction', get_lang('SurveyIntroduction'), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
+$form->addElement('html_editor', 'survey_thanks', get_lang('SurveyThanks'), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
+
+// Aditional Parameters
 $form->addElement(
-    'html_editor',
-    'survey_introduction',
-    get_lang('SurveyIntroduction'),
-    null,
-    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false)
-);
-$form->addElement(
-    'html_editor',
-    'survey_thanks',
-    get_lang('SurveyThanks'),
-    null,
-    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false)
+    'advanced_settings',
+    '<a href="javascript: void(0);" onclick="javascript: advanced_parameters();">
+        <span id="plus_minus">&nbsp;'.
+        Display::return_icon('div_show.gif', null, array('style' => 'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a>'
 );
 
-$form->addElement('advanced_settings', 'options', get_lang('AdvancedParameters'));
-$form->addElement('html', '<div id="options_options" style="display: none;">');
+$form->addElement('html', '<div id="options" style="display: none;">');
 
 if (Gradebook::is_active()) {
     // An option: Qualify the fact that survey has been answered in the gradebook
-    $form->addElement(
-        'checkbox',
-        'survey_qualify_gradebook',
-        null,
-        get_lang('QualifyInGradebook'),
-        'onclick="javascript: if (this.checked) { document.getElementById(\'gradebook_options\').style.display = \'block\'; } else { document.getElementById(\'gradebook_options\').style.display = \'none\'; }"'
-    );
+    $form->addElement('checkbox', 'survey_qualify_gradebook', null, get_lang('QualifyInGradebook'), 'onclick="javascript: if (this.checked) { document.getElementById(\'gradebook_options\').style.display = \'block\'; } else { document.getElementById(\'gradebook_options\').style.display = \'none\'; }"');
     $form->addElement('html', '<div id="gradebook_options"'.($gradebook_link_id ? '' : ' style="display:none"').'>');
-    $form->addElement(
-        'text',
-        'survey_weight',
-        get_lang('QualifyWeight'),
-        'value="0.00" style="width: 40px;" onfocus="javascript: this.select();"'
-    );
+    $form->addElement('text', 'survey_weight', get_lang('QualifyWeight'), 'value="0.00" style="width: 40px;" onfocus="javascript: this.select();"');
     $form->applyFilter('survey_weight', 'html_filter');
     $form->addElement('html', '</div>');
 }
@@ -193,38 +196,32 @@ if ($_GET['action'] == 'add') {
     $defaults['parent_id'] = 0;
 }
 
-if ($survey_data['survey_type'] == 1 || $_GET['action'] == 'add') {
+if (isset($survey_data['survey_type']) && $survey_data['survey_type'] == 1 || $_GET['action'] == 'add') {
     $form->addElement('checkbox', 'one_question_per_page', null, get_lang('OneQuestionPerPage'));
     $form->addElement('checkbox', 'shuffle', null, get_lang('ActivateShuffle'));
 }
-
+$input_name_list = null;
 if ((isset($_GET['action']) && $_GET['action'] == 'edit') && !empty($survey_id)) {
     if ($survey_data['anonymous'] == 0) {
-
-        $form->addElement(
-            'checkbox',
-            'show_form_profile',
-            null,
-            get_lang('ShowFormProfile'),
-            'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'
-        );
+        $form->addElement('checkbox', 'show_form_profile', null, get_lang('ShowFormProfile'), 'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
 
         if ($survey_data['show_form_profile'] == 1) {
             $form->addElement('html', '<div id="options_field" style="display:block">');
         } else {
             $form->addElement('html', '<div id="options_field" style="display:none">');
         }
-        $input_name_list = null;
+
         $field_list = SurveyUtil::make_field_list();
         if (is_array($field_list)) {
             // TODO hide and show the list in a fancy DIV
             foreach ($field_list as $key => & $field) {
                 if ($field['visibility'] == 1) {
                     $form->addElement('checkbox', 'profile_'.$key, ' ', '&nbsp;&nbsp;'.$field['name']);
-                    $input_name_list .= 'profile_'.$key.',';
+                    $input_name_list.= 'profile_'.$key.',';
                 }
             }
-            // Needed to know the fields
+
+            // Necessary to know the fields
             $form->addElement('hidden', 'input_name_list', $input_name_list);
 
             // Set defaults form fields
@@ -238,6 +235,7 @@ if ((isset($_GET['action']) && $_GET['action'] == 'edit') && !empty($survey_id))
                 }
             }
         }
+
         $form->addElement('html', '</div>');
     }
 }
@@ -273,54 +271,62 @@ if ($form->validate()) {
     // Storing the survey
     $return = survey_manager::store_survey($values);
 
+    /* // Deleting the shared survey if the survey is getting unshared (this only happens when editing)
+      if (is_numeric($survey_data['survey_share']) && $values['survey_share']['survey_share'] == 0 && $values['survey_id'] != '') {
+      survey_manager::delete_survey($survey_data['survey_share'], true);
+      }
+      // Storing the already existing questions and options of a survey that gets shared (this only happens when editing)
+      if ($survey_data['survey_share'] == 0 && $values['survey_share']['survey_share'] !== 0 && $values['survey_id'] != '') {
+      survey_manager::get_complete_survey_structure($return['id']);
+      }
+     */
     if ($return['type'] == 'error') {
+        // Display the error
+        Display::display_error_message(get_lang($return['message']), false);
 
         // Displaying the header
         Display::display_header($tool_name);
 
-        // Display the error
-        Display::display_error_message(get_lang($return['message']), false);
-
         // Display the form
         $form->display();
     } else {
-        $gradebook_option = isset($values['survey_qualify_gradebook']) && $values['survey_qualify_gradebook'] > 0;
+        $gradebook_option = $values['survey_qualify_gradebook'] > 0;
         if ($gradebook_option) {
             $survey_id = intval($return['id']);
             if ($survey_id > 0) {
 
+                $title_gradebook = ''; // Not needed here.
+                $description_gradebook = ''; // Not needed here.
                 $survey_weight = floatval($_POST['survey_weight']);
                 $max_score = 1;
+                $date = time(); // TODO: Maybe time zones implementation is needed here.
+                $visible = 1; // 1 = visible
 
                 $link_info = is_resource_in_course_gradebook($course_id, $gradebook_link_type, $survey_id, $session_id);
                 $gradebook_link_id = $link_info['id'];
                 if (!$gradebook_link_id) {
-                    add_resource_to_course_gradebook(
-                        $course_id,
-                        $gradebook_link_type,
-                        $survey_id,
-                        null,
-                        $survey_weight,
-                        $max_score,
-                        null,
-                        1,
-                        $session_id
-                    );
+                    add_resource_to_course_gradebook($course_id, $gradebook_link_type, $survey_id, $title_gradebook, $survey_weight, $max_score, $description_gradebook, 1, $session_id);
                 } else {
-                    Database::query(
-                        'UPDATE '.$table_gradebook_link.' SET weight='.$survey_weight.' WHERE id='.$gradebook_link_id
-                    );
+                    Database::query('UPDATE '.$table_gradebook_link.' SET weight='.$survey_weight.' WHERE id='.$gradebook_link_id);
                 }
             }
         }
+    }
+
+    if ($config['survey']['debug']) {
+        // Displaying a feedback message
+        Display::display_confirmation_message($return['message'], false);
+    } else {
         // Redirecting to the survey page (whilst showing the return message)
-        header('location:survey.php?survey_id='.$return['id'].'&message='.$return['message']);
+        header('location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$return['id'].'&message='.$return['message'].'&'.api_get_cidreq());
         exit;
     }
 } else {
     // Displaying the header
     Display::display_header($tool_name);
+
     $form->display();
 }
+
 // Footer
 Display :: display_footer();
diff --git a/main/survey/fillsurvey.php b/main/survey/fillsurvey.php
index 8063a81439..be6c125154 100644
--- a/main/survey/fillsurvey.php
+++ b/main/survey/fillsurvey.php
@@ -1,18 +1,17 @@
 <?php
-
 /* For licensing terms, see /license.txt */
 
 /**
- *    @package chamilo.survey
- *     @author unknown, the initial survey that did not make it in 1.8 because of bad code
- *     @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
- *    @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code as well
- *     @version $Id: survey_list.php 10680 2007-01-11 21:26:23Z pcool $
- *
- *     @todo use quickforms for the forms
- *     @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again.
- *           alterantively we could not allow people from filling the survey twice.
- *     @todo performance could be improved if not the survey_id was stored with the invitation but the survey_code
+*    @package chamilo.survey
+*     @author unknown, the initial survey that did not make it in 1.8 because of bad code
+*     @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
+*    @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code as well
+*     @version $Id: survey_list.php 10680 2007-01-11 21:26:23Z pcool $
+*
+*     @todo use quickforms for the forms
+*     @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again.
+*           alterantively we could not allow people from filling the survey twice.
+*     @todo performance could be improved if not the survey_id was stored with the invitation but the survey_code
  */
 // Language file that needs to be included
 $language_file = 'survey';
@@ -27,15 +26,30 @@ if (!isset($_GET['cidReq'])) {
 require_once '../inc/global.inc.php';
 
 // Including additional libraries
+//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
 require_once 'survey.lib.php';
 
 // Breadcrumbs
 if (!empty($_user)) {
-    $interbreadcrumb[] = array('url' => 'survey_list.php?cidReq='.Security::remove_XSS($_GET['course']), 'name' => get_lang('SurveyList'));
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php?cidReq='.Security::remove_XSS($_GET['course']),
+        'name' => get_lang('SurveyList')
+    );
 }
-if (($_GET['invitationcode'] == 'auto' && isset($_GET['scode'])) && ((!(isset($_user['user_id']) && $_user['user_id']) || api_is_anonymous($_user['user_id'], true)))) {
-    // anonymous users not allowed
-    api_not_allowed();
+
+// Database table definitions
+$table_survey = Database :: get_course_table(TABLE_SURVEY);
+$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+
+// Check if user is anonymous or not
+if (api_is_anonymous($_user['user_id'], true)) {
+    $isAnonymous = true;
+} else {
+    $isAnonymous = false;
 }
 
 // getting all the course information
@@ -50,20 +64,25 @@ if (empty($course_info)) {
 }
 
 $course_id = $course_info['real_id'];
+$surveyCode = isset($_GET['scode']) ? Database::escape_string($_GET['scode']) : '';
+
+if ($surveyCode != "") {
+    // Firstly we check if this survey is ready for anonymous use:
+    $sqlAnonymous = "SELECT anonymous FROM $table_survey WHERE c_id = $course_id AND code ='".$surveyCode."'";
+    $resultAnonymous = Database::query($sqlAnonymous);
+    $rowAnonymous = Database::fetch_array($resultAnonymous, 'ASSOC');
+    // If is anonymous and is not allowed to take the survey to anonymous users, forbid access:
+    if (!isset($rowAnonymous['anonymous']) || ($rowAnonymous['anonymous'] == 0 && api_is_anonymous($_user['user_id'], true)) || count($rowAnonymous) == 0) {
+        api_not_allowed();
+    }
+// If is anonymous and it is allowed to take the survey as anonymous, mark survey as anonymous:
+} else {
+    //nothing to do
+}
 
 // Header
 Display :: display_header(get_lang('ToolSurvey'));
 
-// Database table definitions
-$table_survey = Database :: get_course_table(TABLE_SURVEY);
-$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-
-$table_user = Database :: get_main_table(TABLE_MAIN_USER);
-
-
 // First we check if the needed parameters are present
 if ((!isset($_GET['course']) || !isset($_GET['invitationcode'])) && !isset($_GET['user_id'])) {
     Display :: display_error_message(get_lang('SurveyParametersMissingUseCopyPaste'), false);
@@ -76,11 +95,16 @@ $invitationcode = $_GET['invitationcode'];
 // Start auto-invitation feature FS#3403 (all-users-can-do-the-survey-URL handling)
 if ($invitationcode == 'auto' && isset($_GET['scode'])) {
     $userid = $_user['user_id'];
+    $surveyCode = Database::escape_string($_GET['scode']); 	// Survey_code of the survey
+	  if ($isAnonymous) {
+	      $autoInvitationcode = "auto-ANONY_".md5(time())."-$surveyCode";
+    } else {
+        // New invitation code from userid
+        $autoInvitationcode = "auto-$userid-$surveyCode";
+    }
 
-    $scode = Database::escape_string($_GET['scode']); // Survey_code of the survey
-    $autoInvitationcode = "auto-$userid-$scode"; // New invitation code from userid
     // The survey code must exist in this course, or the URL is invalid
-    $sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code ='".$scode."'";
+    $sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code = '".$surveyCode."'";
     $result = Database::query($sql);
     if (Database :: num_rows($result) > 0) { // Ok
         // Check availability
@@ -92,7 +116,7 @@ if ($invitationcode == 'auto' && isset($_GET['scode'])) {
         $result = Database::query($sql);
         if (Database :: num_rows($result) == 0) { // Ok
             $sql = "INSERT INTO $table_survey_invitation (c_id, survey_code,user, invitation_code, invitation_date) ";
-            $sql .= " VALUES ($course_id, \"$scode\", \"$userid\", \"$autoInvitationcode\", now())";
+            $sql .= " VALUES ($course_id, \"$surveyCode\", \"$userid\", \"$autoInvitationcode\", now())";
             Database::query($sql);
         }
         // From here we use the new invitationcode auto-userid-surveycode string
@@ -102,7 +126,10 @@ if ($invitationcode == 'auto' && isset($_GET['scode'])) {
 }
 
 // Now we check if the invitationcode is valid
-$sql = "SELECT * FROM $table_survey_invitation WHERE c_id = $course_id AND invitation_code = '".Database :: escape_string($invitationcode)."'";
+$sql = "SELECT * FROM $table_survey_invitation
+        WHERE
+            c_id = $course_id AND
+            invitation_code = '".Database :: escape_string($invitationcode)."'";
 $result = Database::query($sql); // false = suppress errors
 if (Database::num_rows($result) < 1) {
     Display :: display_error_message(get_lang('WrongInvitationCode'), false);
@@ -113,7 +140,7 @@ if (Database::num_rows($result) < 1) {
 $survey_invitation = Database::fetch_array($result, 'ASSOC');
 
 // Now we check if the user already filled the survey
-if ($survey_invitation['answered'] == 1 && !isset($_GET['user_id'])) {
+if ($isAnonymous && isset($_SESSION['surveyuser']) || ($survey_invitation['answered'] == 1 && !isset($_GET['user_id']))) {
     Display :: display_error_message(get_lang('YouAlreadyFilledThisSurvey'), false);
     Display :: display_footer();
     exit;
@@ -121,7 +148,10 @@ if ($survey_invitation['answered'] == 1 && !isset($_GET['user_id'])) {
 
 // Checking if there is another survey with this code.
 // If this is the case there will be a language choice
-$sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code='".Database::escape_string($survey_invitation['survey_code'])."'";
+$sql = "SELECT * FROM $table_survey
+        WHERE
+            c_id = $course_id AND
+            code='".Database::escape_string($survey_invitation['survey_code'])."'";
 $result = Database::query($sql);
 
 if (Database::num_rows($result) > 1) {
@@ -152,15 +182,16 @@ $survey_data['survey_id'] = $survey_invitation['survey_id'];
 if (count($_POST) > 0) {
     if ($survey_data['survey_type'] === '0') {
         // Getting all the types of the question (because of the special treatment of the score question type
-        $sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'";
+        $sql = "SELECT * FROM $table_survey_question
+                WHERE
+                    c_id = $course_id AND
+                    survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'";
         $result = Database::query($sql);
 
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             $types[$row['question_id']] = $row['type'];
         }
-        if ($survey_data['anonymous'] == 0) {
-            $survey_invitation['user'] = api_get_user_id();
-        }
+
         // Looping through all the post values
         foreach ($_POST as $key => & $value) {
             // If the post value key contains the string 'question' then it is an answer on a question
@@ -183,11 +214,13 @@ if (count($_POST) > 0) {
                         }
                         SurveyUtil::store_answer($survey_invitation['user'], $survey_invitation['survey_id'], $survey_question_id, $option_id, $option_value, $survey_data);
                     }
-                }
-                // All the other question types (open question, multiple choice, percentage, ...)
-                else {
+                } else {
+                    // All the other question types (open question, multiple choice, percentage, ...)
                     if ($types[$survey_question_id] == 'percentage') {
-                        $sql = "SELECT * FROM $table_survey_question_option WHERE c_id = $course_id AND question_option_id='".Database::escape_string($value)."'";
+                        $sql = "SELECT * FROM $table_survey_question_option
+                                WHERE
+                                    c_id = $course_id AND
+                                    question_option_id='".Database::escape_string($value)."'";
                         $result = Database::query($sql);
                         $row = Database::fetch_array($result, 'ASSOC');
                         $option_value = $row['option_text'];
@@ -213,16 +246,16 @@ if (count($_POST) > 0) {
             $shuffle = ' ORDER BY RAND() ';
         }
         $sql = "SELECT * FROM $table_survey_question
-                WHERE c_id = $course_id AND survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'
-                AND survey_group_pri = '0' $shuffle";
+                WHERE
+                    c_id = $course_id AND
+                    survey_id = '".Database::escape_string($survey_invitation['survey_id'])."' AND
+                    survey_group_pri = '0' $shuffle";
         $result = Database::query($sql);
         // There is only one question type for conditional surveys
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             $types[$row['question_id']] = $row['type'];
         }
-        if ($survey_data['anonymous'] == 0) {
-            $survey_invitation['user'] = api_get_user_id();
-        }
+
         // Looping through all the post values
         foreach ($_POST as $key => & $value) {
             // If the post value key contains the string 'question' then it is an answer to a question
@@ -288,8 +321,12 @@ if ($survey_data['form_fields'] != '' && $survey_data['anonymous'] == 0 && is_ar
     }
 
     // We use the same form as in auth/profile.php
-    $form = new FormValidator('profile', 'post', api_get_self()."?".str_replace('&show_form=1', '&show_form=1', $_SERVER['QUERY_STRING']), null,
-            array('style' => 'width: 75%; float: '.($text_dir == 'rtl' ? 'right;' : 'left;'))
+    $form = new FormValidator(
+        'profile',
+        'post',
+        api_get_self()."?".str_replace('&show_form=1', '&show_form=1', $_SERVER['QUERY_STRING']),
+        null,
+        array('style' => 'width: 75%; float: '.($text_dir == 'rtl' ? 'right;' : 'left;'))
     );
 
     if (api_is_western_name_order()) {
@@ -498,27 +535,55 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
                 // Get the user into survey answer table (user or anonymus)
                 $my_user_id = ($survey_data['anonymous'] == 1) ? $_SESSION['surveyuser'] : api_get_user_id();
 
-                $sql = "SELECT survey_question.survey_group_sec1, survey_question.survey_group_sec2, survey_question.survey_group_pri,
-                    survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type, survey_question.max_value,
-                    survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
-                    FROM $table_survey_question survey_question
-                    LEFT JOIN $table_survey_question_option survey_question_option
-                    ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-                    WHERE survey_question.survey_id = '".Database :: escape_string($survey_invitation['survey_id'])."'
-                    AND survey_question.question_id NOT IN (SELECT sa.question_id FROM ".$table_survey_answer." sa WHERE sa.user='".$my_user_id."') AND
-                    survey_question.c_id =  $course_id
-                    ORDER BY survey_question.sort, survey_question_option.sort ASC";
+                $sql = "SELECT
+                            survey_question.survey_group_sec1,
+                            survey_question.survey_group_sec2,
+                            survey_question.survey_group_pri,
+                            survey_question.question_id,
+                            survey_question.survey_id,
+                            survey_question.survey_question,
+                            survey_question.display,
+                            survey_question.sort,
+                            survey_question.type,
+                            survey_question.max_value,
+                            survey_question_option.question_option_id,
+                            survey_question_option.option_text,
+                            survey_question_option.sort as option_sort
+                        FROM $table_survey_question survey_question
+                        LEFT JOIN $table_survey_question_option survey_question_option
+                            ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
+                        WHERE
+                            survey_question.survey_id = '".Database :: escape_string($survey_invitation['survey_id'])."' AND
+                            survey_question.question_id NOT IN (
+                                SELECT sa.question_id
+                                FROM ".$table_survey_answer." sa
+                                WHERE
+                                    sa.user='".$my_user_id."') AND
+                                    survey_question.c_id =  $course_id
+                                ORDER BY survey_question.sort, survey_question_option.sort ASC";
             } else {
-                $sql = "SELECT survey_question.survey_group_sec1, survey_question.survey_group_sec2, survey_question.survey_group_pri,
-                    survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type, survey_question.max_value,
-                    survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
-                    FROM $table_survey_question survey_question
-                    LEFT JOIN $table_survey_question_option survey_question_option
-                    ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-                    WHERE survey_question.survey_id = '".Database::escape_string($survey_invitation['survey_id'])."' AND
-                    survey_question.question_id IN (".implode(',', $paged_questions[$_GET['show']]).") AND
-                    survey_question.c_id =  $course_id
-                    ORDER BY survey_question.sort, survey_question_option.sort ASC";
+                $sql = "SELECT
+                            survey_question.survey_group_sec1,
+                            survey_question.survey_group_sec2,
+                            survey_question.survey_group_pri,
+                            survey_question.question_id,
+                            survey_question.survey_id,
+                            survey_question.survey_question,
+                            survey_question.display,
+                            survey_question.sort,
+                            survey_question.type,
+                            survey_question.max_value,
+                            survey_question_option.question_option_id,
+                            survey_question_option.option_text,
+                            survey_question_option.sort as option_sort
+                        FROM $table_survey_question survey_question
+                        LEFT JOIN $table_survey_question_option survey_question_option
+                            ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
+                        WHERE
+                            survey_question.survey_id = '".Database::escape_string($survey_invitation['survey_id'])."' AND
+                            survey_question.question_id IN (".implode(',', $paged_questions[$_GET['show']]).") AND
+                            survey_question.c_id =  $course_id
+                        ORDER BY survey_question.sort, survey_question_option.sort ASC";
             }
 
             $result = Database::query($sql);
@@ -538,9 +603,8 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
                     $questions[$row['sort']]['type'] = $row['type'];
                     $questions[$row['sort']]['options'][$row['question_option_id']] = $row['option_text'];
                     $questions[$row['sort']]['maximum_score'] = $row['max_value'];
-                }
-                // If the type is a pagebreak we are finished loading the questions for this page
-                else {
+                } else {
+                    // If the type is a pagebreak we are finished loading the questions for this page
                     break;
                 }
                 $counter++;
@@ -563,12 +627,14 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
             // Get current user results
             $results = array();
             $sql = "SELECT survey_group_pri, user, SUM(value) as value
-                    FROM $table_survey_answer as survey_answer INNER JOIN $table_survey_question as survey_question
-                    ON  (survey_question.question_id = survey_answer.question_id)
-                    WHERE  survey_answer.survey_id='".$my_survey_id."' AND
-                           survey_answer.user='".$current_user."' AND
-                           survey_answer.c_id = $course_id AND
-                           survey_question.c_id = $course_id AND
+                    FROM $table_survey_answer as survey_answer
+                    INNER JOIN $table_survey_question as survey_question
+                    ON (survey_question.question_id = survey_answer.question_id)
+                    WHERE
+                        survey_answer.survey_id='".$my_survey_id."' AND
+                       survey_answer.user='".$current_user."' AND
+                       survey_answer.c_id = $course_id AND
+                       survey_question.c_id = $course_id AND
                     GROUP BY survey_group_pri
                     ORDER BY survey_group_pri
                     ";
@@ -585,16 +651,20 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
             $totals = array();
             $sql = "SELECT SUM(temp.value) as value, temp.survey_group_pri FROM
                     (
-                    SELECT MAX(value) as value,  survey_group_pri, survey_question.question_id
-                    FROM $table_survey_question as survey_question
-                    INNER JOIN $table_survey_question_option as survey_question_option
-                    ON (survey_question.question_id = survey_question_option.question_id)
-                    WHERE  survey_question.survey_id='".$my_survey_id."'  AND
-                           survey_question.c_id = $course_id AND
-                           survey_question_option.c_id = $course_id AND
-                           survey_group_sec1='0' AND
-                           survey_group_sec2='0'
-                    GROUP BY survey_group_pri, survey_question.question_id
+                        SELECT
+                            MAX(value) as value,
+                            survey_group_pri,
+                            survey_question.question_id
+                        FROM $table_survey_question as survey_question
+                        INNER JOIN $table_survey_question_option as survey_question_option
+                        ON (survey_question.question_id = survey_question_option.question_id)
+                        WHERE
+                            survey_question.survey_id='".$my_survey_id."'  AND
+                            survey_question.c_id = $course_id AND
+                            survey_question_option.c_id = $course_id AND
+                            survey_group_sec1='0' AND
+                            survey_group_sec2='0'
+                        GROUP BY survey_group_pri, survey_question.question_id
                     ) as temp
 
                     GROUP BY temp.survey_group_pri
@@ -754,9 +824,11 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
                     if (empty($_SESSION['page_questions_sec']) && !is_array($_SESSION['page_questions_sec']) && count($_SESSION['page_questions_sec'] == 0)) {
 
                         $sql = "SELECT * FROM $table_survey_question
-                                     WHERE c_id = $course_id AND survey_id = '".$my_survey_id."'
-                                       AND ($secondary )
-                                     ORDER BY sort ASC";
+                                 WHERE
+                                    c_id = $course_id AND
+                                    survey_id = '".$my_survey_id."' AND
+                                    ($secondary )
+                                 ORDER BY sort ASC";
                         $result = Database::query($sql);
                         $counter = 0;
                         while ($row = Database::fetch_array($result, 'ASSOC')) {
@@ -790,15 +862,28 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
                     //echo '<pre>'; print_r($paged_questions_sec); echo '</pre>';
                     if (is_array($paged_questions_sec)) {
 
-                        $sql = "SELECT survey_question.survey_group_sec1, survey_question.survey_group_sec2, survey_question.survey_group_pri,
-                                survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type, survey_question.max_value,
-                                survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
+                        $sql = "SELECT
+                                    survey_question.survey_group_sec1,
+                                    survey_question.survey_group_sec2,
+                                    survey_question.survey_group_pri,
+                                    survey_question.question_id,
+                                    survey_question.survey_id,
+                                    survey_question.survey_question,
+                                    survey_question.display,
+                                    survey_question.sort,
+                                    survey_question.type,
+                                    survey_question.max_value,
+                                    survey_question_option.question_option_id,
+                                    survey_question_option.option_text,
+                                    survey_question_option.sort as option_sort
                                 FROM $table_survey_question survey_question
                                 LEFT JOIN $table_survey_question_option survey_question_option
-                                ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-                                WHERE   survey_question.survey_id = '".$my_survey_id."' AND
-                                        survey_question.c_id = $course_id AND
-                                        survey_question.question_id IN (".implode(',', $paged_questions_sec[$val]).")
+                                ON survey_question.question_id = survey_question_option.question_id AND
+                                survey_question_option.c_id = $course_id
+                                WHERE
+                                    survey_question.survey_id = '".$my_survey_id."' AND
+                                    survey_question.c_id = $course_id AND
+                                    survey_question.question_id IN (".implode(',', $paged_questions_sec[$val]).")
                                 ORDER  $shuffle ";
 
                         $result = Database::query($sql);
@@ -849,9 +934,12 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
 
             if (empty($_SESSION['paged_questions'])) {
                 $sql = "SELECT * FROM $table_survey_question
-                             WHERE c_id = $course_id AND survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'
-                               AND survey_group_sec1='0' AND survey_group_sec2='0'
-                             ORDER ".$order_sql." ";
+                        WHERE
+                            c_id = $course_id AND
+                            survey_id = '".Database::escape_string($survey_invitation['survey_id'])."' AND
+                            survey_group_sec1='0' AND
+                            survey_group_sec2='0'
+                        ORDER ".$order_sql." ";
                 //echo '<br />'; echo '<br />';
                 $result = Database::query($sql);
                 $counter = 0;
@@ -893,15 +981,28 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
                 if ($imploded != '') {
                     // The answers are always in the same order NO shuffle
                     $order_sql = ' BY survey_question.sort, survey_question_option.sort ASC ';
-                    $sql = "SELECT survey_question.survey_group_sec1, survey_question.survey_group_sec2, survey_question.survey_group_pri,
-                            survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type, survey_question.max_value,
-                            survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
+                    $sql = "SELECT
+                                survey_question.survey_group_sec1,
+                                survey_question.survey_group_sec2,
+                                survey_question.survey_group_pri,
+                                survey_question.question_id,
+                                survey_question.survey_id,
+                                survey_question.survey_question,
+                                survey_question.display,
+                                survey_question.sort,
+                                survey_question.type,
+                                survey_question.max_value,
+                                survey_question_option.question_option_id,
+                                survey_question_option.option_text,
+                                survey_question_option.sort as option_sort
                             FROM $table_survey_question survey_question
                             LEFT JOIN $table_survey_question_option survey_question_option
-                            ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-                            WHERE    survey_question.survey_id = '".Database :: escape_string($survey_invitation['survey_id'])."' AND
-                                     survey_question.c_id = $course_id  AND
-                                     survey_question.question_id IN (".$imploded.")
+                            ON survey_question.question_id = survey_question_option.question_id AND
+                            survey_question_option.c_id = $course_id
+                            WHERE
+                                survey_question.survey_id = '".Database :: escape_string($survey_invitation['survey_id'])."' AND
+                                 survey_question.c_id = $course_id  AND
+                                 survey_question.question_id IN (".$imploded.")
                             ORDER $order_sql ";
                     $result = Database::query($sql);
                     $question_counter_max = Database :: num_rows($result);
@@ -940,7 +1041,11 @@ if (isset($_GET['show']) || isset($_POST['personality'])) {
 }
 
 // Selecting the maximum number of pages
-$sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND type='".Database::escape_string('pagebreak')."' AND survey_id='".Database::escape_string($survey_invitation['survey_id'])."'";
+$sql = "SELECT * FROM $table_survey_question
+        WHERE
+            c_id = $course_id AND
+            type='".Database::escape_string('pagebreak')."' AND
+            survey_id='".Database::escape_string($survey_invitation['survey_id'])."'";
 $result = Database::query($sql);
 $numberofpages = Database::num_rows($result) + 1;
 
diff --git a/main/survey/generate_link.php b/main/survey/generate_link.php
index 6f1cc1f676..ad71d90ef5 100644
--- a/main/survey/generate_link.php
+++ b/main/survey/generate_link.php
@@ -1,5 +1,4 @@
 <?php
-
 /* For licensing terms, see /license.txt */
 
 $language_file = 'survey';
@@ -17,8 +16,8 @@ if (empty($survey_id)) {
 
 $survey_data = survey_manager::get_survey($survey_id);
 
-$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => strip_tags($survey_data['title']));
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => strip_tags($survey_data['title']));
 
 Display::display_header(get_lang('Survey'), 'Survey');
 
diff --git a/main/survey/link.php b/main/survey/link.php
index 4025de080b..5563018f69 100644
--- a/main/survey/link.php
+++ b/main/survey/link.php
@@ -3,11 +3,6 @@
 
 require_once '../inc/global.inc.php';
 
-/*
-if (!api_is_allowed_to_edit(false, true)) {
-    api_not_allowed(true);
-}*/
-
 $survey_id = isset($_REQUEST['i']) ? intval($_REQUEST['i']) : null;
 
 if (empty($survey_id)) {
@@ -41,4 +36,4 @@ if ($hash_is_valid && $course_info) {
     }
 } else {
     api_not_allowed(true);
-}
\ No newline at end of file
+}
diff --git a/main/survey/preview.php b/main/survey/preview.php
index 0c1d589770..bb748a47a3 100644
--- a/main/survey/preview.php
+++ b/main/survey/preview.php
@@ -26,14 +26,36 @@ $table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
 $table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
+$table_survey_invitation        = Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
 $course_id = api_get_course_int_id();
-
+$userId = api_get_user_id();
+$surveyId = Database::escape_string($_GET['survey_id']);
+$userInvited = 0;
+
+//query to ask if logged user is allowed to see the preview (if he is invited of he is a teacher)
+$sql = "SELECT survey_invitation.user
+        FROM $table_survey_invitation survey_invitation
+        LEFT JOIN $table_survey survey
+        ON survey_invitation.survey_code = survey.code
+        WHERE
+          survey_invitation.c_id = $course_id AND
+          survey.survey_id = $surveyId AND
+          survey_invitation.user = $userId";
+$result = Database::query($sql);
+if (Database::num_rows($result) > 0) {
+    $userInvited = 1;
+}
+if ($userInvited == 0) {
+    if(!api_is_allowed_to_edit()) {
+        api_not_allowed();
+    }
+}
 // We exit here if ther is no valid $_GET parameter
 if (!isset($_GET['survey_id']) || !is_numeric($_GET['survey_id'])){
-	Display :: display_header(get_lang('SurveyPreview'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
+	Display::display_header(get_lang('SurveyPreview'));
+	Display::display_error_message(get_lang('InvallidSurvey'), false);
+	Display::display_footer();
 	exit;
 }
 
@@ -42,22 +64,17 @@ $survey_id = intval($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('SurveyPreview'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
+	Display::display_header(get_lang('SurveyPreview'));
+	Display::display_error_message(get_lang('InvallidSurvey'), false);
+	Display::display_footer();
 	exit;
 }
 
-/*$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
-if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$urlname .= '...';
-}*/
-
 $urlname = strip_tags($survey_data['title']);
 
 // Breadcrumbs
-$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => $urlname);
 
 // Header
 Display :: display_header(get_lang('SurveyPreview'));
@@ -65,9 +82,14 @@ Display :: display_header(get_lang('SurveyPreview'));
 // We exit here is the first or last question is a pagebreak (which causes errors)
 SurveyUtil::check_first_last_question($survey_id, false);
 
-$counter_question = 0;
-$questions = array();
+// Only a course admin is allowed to preview a survey: you are NOT a course admin => error message
 
+/*
+if (!api_is_allowed_to_edit(false, true)) {
+	Display :: display_error_message(get_lang('NotAllowed'), false);
+}*/
+
+$counter_question = 0;
 // Only a course admin is allowed to preview a survey: you are a course admin
 if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView'] == 'true') || api_is_allowed_to_session_edit(false, true)) {
 	// Survey information
@@ -90,6 +112,8 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView'] ==
 		exit;
 	}
 
+    $questions = array();
+
 	if (isset($_GET['show'])) {
 		// Getting all the questions for this page and add them to a multidimensional array where the first index is the page.
 		// as long as there is no pagebreak fount we keep adding questions to the page
@@ -114,13 +138,24 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView'] ==
         }
 
 		if (array_key_exists($_GET['show'], $paged_questions)) {
-			$sql = "SELECT survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type, survey_question.max_value,
-							survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
-					FROM $table_survey_question survey_question LEFT JOIN $table_survey_question_option survey_question_option
+			$sql = "SELECT
+                        survey_question.question_id,
+                        survey_question.survey_id,
+                        survey_question.survey_question,
+                        survey_question.display,
+                        survey_question.sort,
+                        survey_question.type,
+                        survey_question.max_value,
+						survey_question_option.question_option_id,
+						survey_question_option.option_text,
+						survey_question_option.sort as option_sort
+					FROM $table_survey_question survey_question
+					LEFT JOIN $table_survey_question_option survey_question_option
 					ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-					WHERE 	survey_question.survey_id = '".Database::escape_string($survey_id)."' AND
-							survey_question.question_id IN (".Database::escape_string(implode(',',$paged_questions[$_GET['show']])).") AND
-							survey_question.c_id =  $course_id
+					WHERE
+					    survey_question.survey_id = '".Database::escape_string($survey_id)."' AND
+						survey_question.question_id IN (".Database::escape_string(implode(',',$paged_questions[$_GET['show']])).") AND
+						survey_question.c_id =  $course_id
 					ORDER BY survey_question.sort, survey_question_option.sort ASC";
 
 			$result = Database::query($sql);
@@ -145,8 +180,13 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView'] ==
 			}
 		}
 	}
+
 	// Selecting the maximum number of pages
-	$sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND type='".Database::escape_string('pagebreak')."' AND survey_id='".Database::escape_string($survey_id)."'";
+	$sql = "SELECT * FROM $table_survey_question
+	        WHERE
+	            c_id = $course_id AND
+	            type='".Database::escape_string('pagebreak')."' AND
+	            survey_id='".Database::escape_string($survey_id)."'";
 	$result = Database::query($sql);
 	$numberofpages = Database::num_rows($result) + 1;
 	// Displaying the form with the questions
@@ -155,9 +195,10 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView'] ==
 	} else {
 		$show = 0;
 	}
+
 	echo '<form id="question" name="question" method="post" action="'.api_get_self().'?survey_id='.Security::remove_XSS($survey_id).'&show='.$show.'">';
 
-	if (isset($questions) && is_array($questions) && count($questions) > 0) {
+	if (is_array($questions) && count($questions) > 0) {
 		foreach ($questions as $key => & $question) {
 			$ch_type = 'ch_'.$question['type'];
 			$display = new $ch_type;
diff --git a/main/survey/question.php b/main/survey/question.php
index 0c625f4aa0..758287d34c 100644
--- a/main/survey/question.php
+++ b/main/survey/question.php
@@ -22,8 +22,7 @@ $(document).ready( function() {
     $("button").click(function() {
         $("#is_executable").attr("value",$(this).attr("name"));
     });
-});
-</script>';
+} ); </script>';
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
@@ -35,7 +34,6 @@ if (!api_is_allowed_to_edit(false, true)) {
 
 // Is valid request
 $is_valid_request = isset($_REQUEST['is_executable']) ? $_REQUEST['is_executable'] : null;
-
 if ($request_index != $is_valid_request) {
 	if ($request_index == 'save_question') {
 		unset($_POST[$request_index]);
@@ -72,17 +70,20 @@ if (api_strlen(strip_tags($survey_data['title'])) > 40) {
 }
 
 if ($survey_data['survey_type'] == 1) {
-	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).' WHERE c_id = '.$course_id.' AND survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
+	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
+	        WHERE
+                c_id = '.$course_id.' AND
+                survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
 	$rs = Database::query($sql);
 	if(Database::num_rows($rs)===0) {
-		header('Location: survey.php?survey_id='.(int)$_GET['survey_id'].'&message='.'YouNeedToCreateGroups');
+		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id'].'&message='.'YouNeedToCreateGroups');
 		exit;
 	}
 }
 
 // Breadcrumbs
-$interbreadcrumb[] = array ('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array ('url' => 'survey.php?survey_id='.Security::remove_XSS($_GET['survey_id']), 'name' => strip_tags($urlname));
+$interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.Security::remove_XSS($_GET['survey_id']), 'name' => strip_tags($urlname));
 
 // Tool name
 if ($_GET['action'] == 'add') {
@@ -97,7 +98,7 @@ $possible_types = array('personality', 'yesno', 'multiplechoice', 'multiplerespo
 
 // Actions
 $actions = '<div class="actions">';
-$actions .= '<a href="survey.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
 $actions .= '</div>';
 // Checking if it is a valid type
 if (!in_array($_GET['type'], $possible_types)) {
@@ -118,7 +119,11 @@ if (empty($_POST['save_question']) && in_array($_GET['type'], $possible_types))
 		if (isset($_SESSION['temp_sys_message'])) {
 			$error_message=$_SESSION['temp_sys_message'];
 			unset($_SESSION['temp_sys_message']);
-			if ($error_message == 'PleaseEnterAQuestion' || $error_message == 'PleasFillAllAnswer'|| $error_message == 'PleaseChooseACondition'|| $error_message == 'ChooseDifferentCategories') {
+			if ($error_message == 'PleaseEnterAQuestion' ||
+                $error_message == 'PleasFillAllAnswer'||
+                $error_message == 'PleaseChooseACondition'||
+                $error_message == 'ChooseDifferentCategories'
+            ) {
 				Display::display_error_message(get_lang($error_message), true);
 			}
 		}
@@ -156,7 +161,10 @@ if (empty($_POST['save_question']) && in_array($_GET['type'], $possible_types))
 	// An action has been performed (for instance adding a possible answer, moving an answer, ...)
 	if ($_POST) {
 		$form_content = $_POST;
-		$form_content = $form->handle_action($form_content);
+		$form_content = $form->handle_action(
+            $survey_data,
+            $form_content
+        );
 	}
 
 	if ($error_message != '') {
@@ -171,12 +179,12 @@ if (empty($_POST['save_question']) && in_array($_GET['type'], $possible_types))
 		unset($_SESSION['temp_horizontalvertical']);
 	}
 
-	$form->create_form($form_content);
+	$form->create_form($survey_data, $form_content);
 	$form->render_form();
 } else {
 	$form_content = $_POST;
 	$form = new survey_question();
-	$form->handle_action($form_content);
+	$form->handle_action($survey_data, $form_content);
 }
 
 // Footer
diff --git a/main/survey/reporting.php b/main/survey/reporting.php
index c1a82ff1d1..6d9e9fe1da 100644
--- a/main/survey/reporting.php
+++ b/main/survey/reporting.php
@@ -17,7 +17,6 @@ $language_file = 'survey';
 require_once '../inc/global.inc.php';
 require_once 'survey.lib.php';
 $this_section = SECTION_COURSES;
-
 $survey_id = intval($_GET['survey_id']);
 
 // Export
@@ -25,17 +24,17 @@ $survey_id = intval($_GET['survey_id']);
  * @todo use export_table_csv($data, $filename = 'export')
  */
 if (isset($_POST['export_report']) && $_POST['export_report']) {
-	switch($_POST['export_format']) {
+	switch ($_POST['export_format']) {
 		case 'xls':
 			$survey_data = survey_manager::get_survey($survey_id);
 			$filename = 'survey_results_'.$survey_id.'.xls';
-			$data = SurveyUtil::export_complete_report_xls($filename, $_GET['user_id']);
+			$data = SurveyUtil::export_complete_report_xls($survey_data, $filename, $_GET['user_id']);
 			exit;
 			break;
 		case 'csv':
 		default:
 			$survey_data = survey_manager::get_survey($survey_id);
-			$data = SurveyUtil::export_complete_report($_GET['user_id']);
+			$data = SurveyUtil::export_complete_report($survey_data, $_GET['user_id']);
 
 			//$filename = 'fileexport.csv';
 			$filename = 'survey_results_'.$survey_id.'.csv';
@@ -61,8 +60,19 @@ if (isset($_POST['export_report']) && $_POST['export_report']) {
 	}
 }
 
+if ($survey_data['anonymous'] == 0) {
+    $people_filled_full_data = true;
+} else {
+    $people_filled_full_data = false;
+}
+$people_filled = survey_manager::get_people_who_filled_survey(
+    $_GET['survey_id'],
+    $people_filled_full_data
+);
+
 // Checking the parameters
-SurveyUtil::check_parameters();
+SurveyUtil::check_parameters($people_filled);
+
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
@@ -92,12 +102,15 @@ if (api_strlen(strip_tags($survey_data['title'])) > 40) {
 }
 
 // Breadcrumbs
-$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => $urlname);
 if (!$_GET['action'] OR $_GET['action'] == 'overview') {
 	$tool_name = get_lang('Reporting');
 } else {
-	$interbreadcrumb[] = array('url' => 'reporting.php?survey_id='.$survey_id, 'name' => get_lang('Reporting'));
+	$interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.$survey_id,
+        'name' => get_lang('Reporting')
+    );
 	switch ($_GET['action']) {
 		case 'questionreport':
 			$tool_name = get_lang('DetailedReportByQuestion');
@@ -118,19 +131,20 @@ if (!$_GET['action'] OR $_GET['action'] == 'overview') {
 Display::display_header($tool_name, 'Survey');
 
 // Action handling
-SurveyUtil::handle_reporting_actions();
+SurveyUtil::handle_reporting_actions($people_filled);
 
 // Actions bar
 echo '<div class="actions">';
-echo '<a href="survey.php?survey_id='.$survey_id.'">'.Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'">'.
+    Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 // Content
 if (!$_GET['action'] || $_GET['action'] == 'overview') {
 	$myweb_survey_id = $survey_id;
-	echo '<div class="sectiontitle"><a href="reporting.php?action=questionreport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_question.gif',get_lang('DetailedReportByQuestion')).' '.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>';
-	echo '<div class="sectiontitle"><a href="reporting.php?action=userreport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_user.gif',get_lang('DetailedReportByUser')).' '.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>';
-	echo '<div class="sectiontitle"><a href="reporting.php?action=comparativereport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_comparative.gif',get_lang('ComparativeReport')).' '.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>';
+	echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_question.gif',get_lang('DetailedReportByQuestion')).' '.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>';
+	echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_user.gif',get_lang('DetailedReportByUser')).' '.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>';
+	echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=comparativereport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_comparative.gif',get_lang('ComparativeReport')).' '.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>';
 	echo '<div class="sectiontitle"><a href="reporting.php?action=completereport&amp;survey_id='.$myweb_survey_id.'">'.Display::return_icon('survey_reporting_complete.gif',get_lang('CompleteReport')).' '.get_lang('CompleteReport').'</a></div><div class="sectioncomment">'.get_lang('CompleteReportDetail').'</div>';
 }
 
diff --git a/main/survey/survey.download.inc.php b/main/survey/survey.download.inc.php
index 89e1d4944d..53960f55b7 100644
--- a/main/survey/survey.download.inc.php
+++ b/main/survey/survey.download.inc.php
@@ -26,7 +26,10 @@ function check_download_survey($course, $invitation, $doc_url) {
 	$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
 	// Now we check if the invitationcode is valid
-	$sql = "SELECT * FROM $table_survey_invitation WHERE c_id = $course_id AND invitation_code = '".Database::escape_string($invitation)."'";
+	$sql = "SELECT * FROM $table_survey_invitation
+	        WHERE
+	            c_id = $course_id AND
+	            invitation_code = '".Database::escape_string($invitation)."'";
 	$result = Database::query($sql);
 	if (Database::num_rows($result) < 1) {
 		Display :: display_error_message(get_lang('WrongInvitationCode'), false);
@@ -47,13 +50,16 @@ function check_download_survey($course, $invitation, $doc_url) {
 	// Fetch survey ID
 
 	// If this is the case there will be a language choice
-	$sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code='".Database::escape_string($survey_invitation['survey_code'])."'";
+	$sql = "SELECT * FROM $table_survey
+	        WHERE
+	            c_id = $course_id AND
+	            code='".Database::escape_string($survey_invitation['survey_code'])."'";
 	$result = Database::query($sql);
 	if (Database::num_rows($result) > 1) {
 		if ($_POST['language']) {
 			$survey_invitation['survey_id'] = $_POST['language'];
 		} else {
-			echo '<form id="language" name="language" method="POST" action="'.api_get_self().'?course='.Security::remove_XSS($_GET['course']).'&invitationcode='.Security::remove_XSS($_GET['invitationcode']).'">';
+			echo '<form id="language" name="language" method="POST" action="'.api_get_self().'?course='.$_GET['course'].'&invitationcode='.$_GET['invitationcode'].'">';
 			echo '  <select name="language">';
 			while ($row = Database::fetch_assoc($result)) {
 				echo '<option value="'.$row['survey_id'].'">'.$row['lang'].'</option>';
@@ -69,22 +75,33 @@ function check_download_survey($course, $invitation, $doc_url) {
 		$survey_invitation['survey_id'] = $row['survey_id'];
 	}
 
-	$sql = "SELECT count(*) FROM $table_survey WHERE c_id = $course_id AND survey_id = ".$survey_invitation['survey_id']."
-								and (
-									title LIKE '%$doc_url%'
-									or subtitle LIKE '%$doc_url%'
-									or intro LIKE '%$doc_url%'
-									or surveythanks LIKE '%$doc_url%'
-								)
-		union select count(*) from $table_survey_question  where c_id = $course_id AND survey_id = ".$survey_invitation['survey_id']."
-								and (
-									survey_question LIKE '%$doc_url%'
-									or survey_question_comment LIKE '%$doc_url%'
-								)
-		union select count(*) from $table_survey_question_option where c_id = $course_id AND survey_id = ".$survey_invitation['survey_id']."
-								and (
-									option_text LIKE '%$doc_url%'
-								)";
+	$sql = "SELECT count(*)
+	        FROM $table_survey
+	        WHERE
+	            c_id = $course_id AND
+	            survey_id = ".$survey_invitation['survey_id']." AND (
+                    title LIKE '%$doc_url%'
+                    or subtitle LIKE '%$doc_url%'
+                    or intro LIKE '%$doc_url%'
+                    or surveythanks LIKE '%$doc_url%'
+                )
+		    UNION
+		        SELECT count(*)
+		        FROM $table_survey_question
+		        WHERE
+		            c_id = $course_id AND
+		            survey_id = ".$survey_invitation['survey_id']." AND (
+                        survey_question LIKE '%$doc_url%'
+                        or survey_question_comment LIKE '%$doc_url%'
+                    )
+		    UNION
+		        SELECT count(*)
+		        FROM $table_survey_question_option
+		        WHERE
+		            c_id = $course_id AND
+		            survey_id = ".$survey_invitation['survey_id']." AND (
+                        option_text LIKE '%$doc_url%'
+                    )";
 	$result = Database::query($sql);
 	if (Database::num_rows($result) == 0) {
 		Display :: display_error_message(get_lang('WrongInvitationCode'), false);
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 396ccfaee6..d05c16afad 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -1,5 +1,4 @@
 <?php
-
 /* For licensing terms, see /license.txt */
 /**
  * Survey manager class
@@ -7,55 +6,35 @@
  * @package chamilo.survey
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
  * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code
+ * @version $Id: survey.lib.php 22296 2009-07-22 22:05:50Z cfasanando $
  * @todo move this file to inc/lib
  * @todo use consistent naming for the functions (save vs store for instance)
  */
 /**
  * Code
  */
+$config['survey']['debug'] = false;
+
+$htmlHeadXtra[] = '<script>
+function setFocus(){
+    $("#search_title").focus();
+}
+$(document).ready(function () {
+    setFocus();
+});
+</script>';
 
-/**
- * Survey manager class
- * @package chamilo.survey
- */
 class survey_manager
 {
 
-    /**
-     * @param $code
-     * @return bool|string
-     */
-    public static function generate_unique_code($code)
-    {
-        if (empty($code)) {
-            return false;
-        }
-        $course_id = api_get_course_int_id();
-        $table_survey = Database::get_course_table(TABLE_SURVEY);
-        $code = Database::escape_string($code);
-        $num = 0;
-        $new_code = $code;
-        while (true) {
-            $sql = "SELECT * FROM $table_survey WHERE code = '$new_code' AND c_id = $course_id";
-            $result = Database::query($sql);
-            if (Database::num_rows($result)) {
-                $num++;
-                $new_code = $code.$num;
-            } else {
-                break;
-            }
-        }
-
-        return $code.$num;
-    }
-
     /**
      * Deletes all survey invitations of a user
      * @param int $user_id
      * @return boolean
      * @assert ('') === false
      */
-    public static function delete_all_survey_invitations_by_user($user_id) {
+    public static function delete_all_survey_invitations_by_user($user_id)
+    {
         $user_id = intval($user_id);
 
         if (empty($user_id)) {
@@ -64,7 +43,8 @@ class survey_manager
         $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
         $table_survey = Database :: get_course_table(TABLE_SURVEY);
 
-        $sql = "SELECT survey_invitation_id, survey_code FROM $table_survey_invitation WHERE user = '$user_id' AND c_id <> 0 ";
+        $sql = "SELECT survey_invitation_id, survey_code
+                FROM $table_survey_invitation WHERE user = '$user_id' AND c_id <> 0 ";
         $result = Database::query($sql);
         $deleted = array();
        	while ($row = Database::fetch_array($result ,'ASSOC')){
@@ -79,7 +59,7 @@ class survey_manager
         }
     }
 
-     /**
+    /**
      *
      * @param type $course_code
      * @param type $session_id
@@ -98,398 +78,349 @@ class survey_manager
         $sql = "SELECT * FROM $table_survey WHERE c_id = {$course_info['real_id']} $session_condition ";
         $result = Database::query($sql);
         $result = Database::store_result($result, 'ASSOC');
-
         return $result;
     }
 
-    /*
-     * SURVEY FUNCTIONS
-     */
-
-    /**
-     * Retrieves all the survey information
-     *
-     * @param integer $survey_id the id of the survey
-     * @param boolean $shared this parameter determines if we have to get the information of a survey from the central (shared) database or from the
-     *           course database
-     * @param string course code optional
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
+	/**
+	 * Retrieves all the survey information
+	 *
+	 * @param integer $survey_id the id of the survey
+	 * @param boolean $shared this parameter determines if
+     * we have to get the information of a survey from the central (shared) database or from the
+	 * 		  course database
+	 * @param string course code optional
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
      * @assert ('') === false
-     *
-     * @todo this is the same function as in create_new_survey.php
-     */
-    static function get_survey($survey_id, $shared = 0, $course_code = '', $simple_return = false)
+	 *
+	 * @todo this is the same function as in create_new_survey.php
+	 */
+    public static function get_survey($survey_id, $shared = 0, $course_code = '')
     {
+		// Table definition
+		if (!empty($course_code)) {
+			$my_course_id = $course_code;
+		} else if (isset($_GET['course'])) {
+			$my_course_id = Security::remove_XSS($_GET['course']);
+		} else {
+			$my_course_id = api_get_course_id();
+		}
+		$my_course_info = api_get_course_info($my_course_id);
+		$table_survey = Database :: get_course_table(TABLE_SURVEY);
 
-        // Table definition
-        if (!empty($course_code)) {
-            $my_course_id = $course_code;
-        } else {
-            if (isset($_GET['course'])) {
-                $my_course_id = Security::remove_XSS($_GET['course']);
-            } else {
-                $my_course_id = api_get_course_id();
-            }
-        }
-        if (empty($survey_id)) {
-            return array();
-        }
-        $my_course_info = api_get_course_info($my_course_id);
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-
-        if ($shared != 0) {
-            $table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+		if ($shared != 0) {
+			$table_survey	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
             $sql = "SELECT * FROM $table_survey WHERE survey_id='".Database::escape_string($survey_id)."' ";
-        } else {
-            $sql = "SELECT * FROM $table_survey WHERE survey_id='".Database::escape_string(
-                $survey_id
-            )."' AND c_id = ".$my_course_info['real_id'];
-        }
-
-        $result = Database::query($sql);
-        $return = array();
+		} else {
+		    $sql = "SELECT * FROM $table_survey WHERE survey_id='".Database::escape_string($survey_id)."' AND c_id = ".$my_course_info['real_id'];
+		}
 
-        if (Database::num_rows($result) > 0) {
-            $return = Database::fetch_array($result, 'ASSOC');
-            if ($simple_return) {
-                return $return;
-            }
-            // We do this (temporarily) to have the array match the quickform elements immediately
-            // idealiter the fields in the db match the quickform fields
-            $return['survey_code'] = $return['code'];
-            $return['survey_title'] = $return['title'];
-            $return['survey_subtitle'] = $return['subtitle'];
-            $return['survey_language'] = $return['lang'];
-            $return['start_date'] = $return['avail_from'];
-            $return['end_date'] = $return['avail_till'];
-            $return['survey_share'] = $return['is_shared'];
-            $return['survey_introduction'] = $return['intro'];
-            $return['survey_thanks'] = $return['surveythanks'];
-            $return['survey_type'] = $return['survey_type'];
-            $return['one_question_per_page'] = $return['one_question_per_page'];
-            $return['show_form_profile'] = $return['show_form_profile'];
-            $return['input_name_list'] = isset($return['input_name_list']) ? $return['input_name_list'] : null;
-            $return['shuffle'] = $return['shuffle'];
-            $return['parent_id'] = $return['parent_id'];
-            $return['survey_version'] = $return['survey_version'];
+		$result = Database::query($sql);
+		$return = array();
+
+		if (Database::num_rows($result)> 0) {
+			$return = Database::fetch_array($result,'ASSOC');
+			// We do this (temporarily) to have the array match the quickform elements immediately
+			// idealiter the fields in the db match the quickform fields
+			$return['survey_code'] 			= $return['code'];
+			$return['survey_title'] 		= $return['title'];
+			$return['survey_subtitle'] 		= $return['subtitle'];
+			$return['survey_language'] 		= $return['lang'];
+			$return['start_date'] 			= $return['avail_from'];
+			$return['end_date'] 			= $return['avail_till'];
+			$return['survey_share'] 		= $return['is_shared'];
+			$return['survey_introduction'] 	= $return['intro'];
+			$return['survey_thanks'] 		= $return['surveythanks'];
+			$return['survey_type'] 		    = $return['survey_type'];
+			$return['one_question_per_page']= $return['one_question_per_page'];
+			$return['show_form_profile']	= $return['show_form_profile'];
+			$return['input_name_list']		= isset($return['input_name_list']) ? $return['input_name_list'] : null;
+			$return['shuffle']				= $return['shuffle'];
+			$return['parent_id']			= $return['parent_id'];
+			$return['survey_version']		= $return['survey_version'];
         }
-
         return $return;
-    }
-
-    /**
-     * This function stores a survey in the database.
-     *
-     * @param array $values
-     * @return array $return the type of return message that has to be displayed and the message in it
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function store_survey($values)
+	}
+
+	/**
+	 * This function stores a survey in the database.
+	 *
+	 * @param array $values
+	 * @return array $return the type of return message that has to be displayed and the message in it
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+    public static function store_survey($values)
     {
-        // Table definitions
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $shared_survey_id = 0;
-
+        $_user = api_get_user_info();
         $course_id = api_get_course_int_id();
-
-        if (!$values['survey_id'] || !is_numeric($values['survey_id'])) {
-            // Check if the code doesn't soon exists in this language
-            $sql = 'SELECT 1 FROM '.$table_survey.'
-			        WHERE c_id = '.$course_id.' AND code="'.Database::escape_string(
-                $values['survey_code']
-            ).'" AND lang="'.Database::escape_string($values['survey_language']).'"';
-            $rs = Database::query($sql);
-            if (Database::num_rows($rs) > 0) {
-                $return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
-                $return['type'] = 'error';
-                $return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
-
-                return $return;
-            }
-
-            if ($values['anonymous'] == '') {
-                $values['anonymous'] = 0;
-            }
-
-            $additional['columns'] = '';
-            $additional['values'] = '';
-
-            if ($values['anonymous'] == 0) {
-                // Input_name_list
-                $additional['columns'] .= ', show_form_profile';
-                $additional['values'] .= ",'".Database::escape_string($values['show_form_profile'])."'";
-
-                if ($values['show_form_profile'] == 1) {
-                    // Input_name_list
-                    $fields = explode(',', $values['input_name_list']);
-                    $field_values = '';
-                    foreach ($fields as & $field) {
-                        if ($field != '') {
-                            if ($values[$field] == '') {
-                                $values[$field] = 0;
-                            }
-                            $field_values .= $field.':'.$values[$field].'@';
-                        }
-                    }
-                    $additional['columns'] .= ', form_fields';
-                    $additional['values'] .= ",'".Database::escape_string($field_values)."'";
-                } else {
-                    $additional['columns'] .= ', form_fields';
-                    $additional['values'] .= ",''";
-                }
-            } else {
-                // Input_name_list
-                $additional['columns'] .= ', show_form_profile';
-                $additional['values'] .= ",'0'";
-
-                $additional['columns'] .= ', form_fields';
-                $additional['values'] .= ",''";
-            }
-
-            if ($values['survey_type'] == 1) {
-                $additional['columns'] .= ', survey_type';
-                $additional['values'] .= ",'1'";
-
-                $additional['columns'] .= ', shuffle';
-                $additional['values'] .= ",'".Database::escape_string($values['shuffle'])."'";
-
-                $additional['columns'] .= ', one_question_per_page';
-                $additional['values'] .= ",'".Database::escape_string($values['one_question_per_page'])."'";
-
-                $additional['columns'] .= ', parent_id';
-                $additional['values'] .= ",'".Database::escape_string($values['parent_id'])."'";
-
-                // Logic for versioning surveys
-                if (!empty($values['parent_id'])) {
-                    $additional['columns'] .= ', survey_version';
-                    $sql = 'SELECT survey_version FROM '.$table_survey.' WHERE c_id = '.$course_id.' AND parent_id = '.Database::escape_string(
-                        $values['parent_id']
-                    ).' ORDER BY survey_version DESC LIMIT 1';
-                    $rs = Database::query($sql);
-                    if (Database::num_rows($rs) === 0) {
-                        $sql = 'SELECT survey_version FROM '.$table_survey.' WHERE  c_id = '.$course_id.' survey_id = '.Database::escape_string(
-                            $values['parent_id']
-                        );
-                        $rs = Database::query($sql);
-                        $getversion = Database::fetch_array($rs, 'ASSOC');
-                        if (empty($getversion['survey_version'])) {
-                            $additional['values'] .= ",'".++$getversion['survey_version']."'";
-                        } else {
-                            $additional['values'] .= ",'".$getversion['survey_version'].".1'";
-                        }
-                    } else {
-                        $row = Database::fetch_array($rs, 'ASSOC');
-                        $pos = api_strpos($row['survey_version']);
-                        if ($pos === false) {
-                            //$new_version = substr($row['survey_version'],$pos, count())
-                            $row['survey_version'] = $row['survey_version'] + 1;
-                            $additional['values'] .= ",'".$row['survey_version']."'";
-                        } else {
-                            $getlast = api_split('\.', $row['survey_version']);
-                            $lastversion = array_pop($getlast);
-                            $lastversion = $lastversion + 1;
-                            $add = implode('.', $getlast);
-                            if ($add != '') {
-                                $insertnewversion = $add.'.'.$lastversion;
-                            } else {
-                                $insertnewversion = $lastversion;
-                            }
-                            $additional['values'] .= ",'".$insertnewversion."'";
-                        }
-                    }
-                }
-            }
-            $course_id = api_get_course_int_id();
-            $sql = "INSERT INTO $table_survey (c_id, code, title, subtitle, author, lang, avail_from, avail_till, is_shared, template, intro, surveythanks, creation_date, anonymous".$additional['columns'].", session_id) VALUES (
+		$table_survey 	= Database :: get_course_table(TABLE_SURVEY);
+		$shared_survey_id = 0;
+
+		if (!$values['survey_id'] || !is_numeric($values['survey_id'])) {
+			// Check if the code doesn't soon exists in this language
+			$sql = 'SELECT 1 FROM '.$table_survey.'
+			        WHERE
+			            c_id = '.$course_id.' AND
+			            code="'.Database::escape_string($values['survey_code']).'" AND
+			            lang="'.Database::escape_string($values['survey_language']).'"';
+			$rs = Database::query($sql);
+			if (Database::num_rows($rs) > 0) {
+				$return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
+				$return['type'] = 'error';
+				$return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
+				return $return;
+			}
+
+			if ($values['anonymous'] == '') {
+				$values['anonymous'] = 0;
+			}
+
+			$additional['columns'] = '';
+			$additional['values'] = '';
+
+			if ($values['anonymous'] == 0) {
+				// Input_name_list
+				$additional['columns'] .= ', show_form_profile';
+				$additional['values'] .= ",'".Database::escape_string($values['show_form_profile'])."'";
+
+				if ($values['show_form_profile'] == 1) {
+					// Input_name_list
+					$fields = explode(',', $values['input_name_list']);
+					$field_values = '';
+					foreach ($fields as & $field) {
+						if ($field != '') {
+							if ($values[$field] == '') {
+								$values[$field] = 0;
+							}
+							$field_values.= $field.':'.$values[$field].'@';
+						}
+					}
+					$additional['columns'] .= ', form_fields';
+					$additional['values'] .= ",'".Database::escape_string($field_values)."'";
+				} else {
+					$additional['columns'] .= ', form_fields';
+					$additional['values'] .= ",''";
+				}
+			} else {
+				// Input_name_list
+				$additional['columns'] .= ', show_form_profile';
+				$additional['values'] .= ",'0'";
+
+				$additional['columns'] .= ', form_fields';
+				$additional['values'] .= ",''";
+			}
+
+			if ($values['survey_type'] == 1) {
+				$additional['columns'] .= ', survey_type';
+				$additional['values'] .= ",'1'";
+
+				$additional['columns'] .= ', shuffle';
+				$additional['values'] .= ",'".Database::escape_string($values['shuffle'])."'";
+
+				$additional['columns'] .= ', one_question_per_page';
+				$additional['values'] .= ",'".Database::escape_string($values['one_question_per_page'])."'";
+
+				$additional['columns'] .= ', parent_id';
+				$additional['values'] .= ",'".Database::escape_string($values['parent_id'])."'";
+
+				// Logic for versioning surveys
+				if (!empty($values['parent_id'])) {
+					$additional['columns'] .= ', survey_version';
+					$sql = 'SELECT survey_version FROM '.$table_survey.' WHERE c_id = '.$course_id.' AND parent_id = '.Database::escape_string($values['parent_id']).' ORDER BY survey_version DESC LIMIT 1';
+					$rs = Database::query($sql);
+					if (Database::num_rows($rs) === 0) {
+						$sql = 'SELECT survey_version FROM '.$table_survey.' WHERE  c_id = '.$course_id.' survey_id = '.Database::escape_string($values['parent_id']);
+						$rs = Database::query($sql);
+						$getversion = Database::fetch_array($rs, 'ASSOC');
+						if (empty($getversion['survey_version'])) {
+							$additional['values'] .= ",'".++$getversion['survey_version']."'";
+						} else {
+							$additional['values'] .= ",'".$getversion['survey_version'].".1'";
+						}
+					} else {
+						$row = Database::fetch_array($rs, 'ASSOC');
+						$pos = api_strpos($row['survey_version']);
+						if ($pos === false) {
+							//$new_version = substr($row['survey_version'],$pos, count())
+							$row['survey_version'] = $row['survey_version'] + 1;
+							$additional['values'] .= ",'".$row['survey_version']."'";
+						} else {
+							$getlast = api_split('\.', $row['survey_version']);
+							$lastversion = array_pop($getlast);
+							$lastversion = $lastversion + 1;
+							$add = implode('.', $getlast);
+							if ($add != '') {
+								$insertnewversion = $add.'.'.$lastversion;
+							} else {
+								$insertnewversion = $lastversion;
+							}
+							$additional['values'] .= ",'".$insertnewversion."'";
+						}
+					}
+				}
+			}
+			$course_id = api_get_course_int_id();
+			$sql = "INSERT INTO $table_survey (c_id, code, title, subtitle, author, lang, avail_from, avail_till, is_shared, template, intro, surveythanks, creation_date, anonymous".$additional['columns'].", session_id) VALUES (
 						$course_id,
-						'".Database::escape_string(
-                strtolower(CourseManager::generate_course_code(api_substr($values['survey_code'], 0)))
-            )."',
+						'".Database::escape_string(strtolower(generate_course_code(api_substr($values['survey_code'],0))))."',
 						'".Database::escape_string($values['survey_title'])."',
 						'".Database::escape_string($values['survey_subtitle'])."',
-						'".api_get_user_id()."',
+						'".Database::escape_string($_user['user_id'])."',
 						'".Database::escape_string($values['survey_language'])."',
 						'".Database::escape_string($values['start_date'])."',
 						'".Database::escape_string($values['end_date'])."',
 						'".Database::escape_string($shared_survey_id)."',
-						'template',
+						'".Database::escape_string('template')."',
 						'".Database::escape_string($values['survey_introduction'])."',
 						'".Database::escape_string($values['survey_thanks'])."',
-						'".api_get_utc_datetime()."',
+						'".date('Y-m-d H:i:s')."',
 						'".Database::escape_string($values['anonymous'])."'".$additional['values'].",
 						".api_get_session_id()."
 						)";
-            $result = Database::query($sql);
-            $survey_id = Database::insert_id();
-            if ($survey_id > 0) {
-                // Insert into item_property
-                api_item_property_update(
-                    api_get_course_info(),
-                    TOOL_SURVEY,
-                    $survey_id,
-                    'SurveyAdded',
-                    api_get_user_id()
-                );
-            }
-
-            if ($values['survey_type'] == 1 && !empty($values['parent_id'])) {
-                self::copy_survey($values['parent_id'], $survey_id);
-            }
-
-            $return['message'] = 'SurveyCreatedSuccesfully';
-            $return['type'] = 'confirmation';
-            $return['id'] = $survey_id;
-        } else {
-
-            // Check whether the code doesn't soon exists in this language
-            $sql = 'SELECT 1 FROM '.$table_survey.'
-                    WHERE c_id = '.$course_id.' AND code="'.Database::escape_string(
-                $values['survey_code']
-            ).'" AND lang="'.Database::escape_string($values['survey_language']).'" AND survey_id!='.intval(
-                $values['survey_id']
-            );
-            $rs = Database::query($sql);
-            if (Database::num_rows($rs) > 0) {
-                $return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
-                $return['type'] = 'error';
-                $return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
-
-                return $return;
-            }
-
-            if ($values['anonymous'] == '') {
-                $values['anonymous'] = 0;
-            }
-
-            $additionalsets = ", shuffle = '".Database::escape_string($values['shuffle'])."'";
-            $additionalsets .= ", one_question_per_page = '".Database::escape_string(
-                $values['one_question_per_page']
-            )."'";
-
-            if ($values['anonymous'] == 0) {
-                $additionalsets .= ", show_form_profile = '".Database::escape_string($values['show_form_profile'])."'";
-                if (isset($values['show_form_profile']) && $values['show_form_profile'] == 1) {
-                    $fields = explode(',', $values['input_name_list']);
-                    $field_values = '';
-                    foreach ($fields as & $field) {
-                        if ($field != '') {
-                            if ($values[$field] == '') {
-                                $values[$field] = 0;
-                            }
-                            $field_values .= $field.':'.$values[$field].'@';
-                        }
-                    }
-                    $additionalsets .= ", form_fields = '".Database::escape_string($field_values)."'";
-                } else {
-                    $additionalsets .= ", form_fields = '' ";
-                }
-            } else {
-                $additionalsets .= ", show_form_profile = '0'";
-                $additionalsets .= ", form_fields = '' ";
-            }
-
-            $sql = "UPDATE $table_survey SET
+			Database::query($sql);
+			$survey_id = Database::insert_id();
+			if ($survey_id > 0) {
+				// Insert into item_property
+				api_item_property_update(api_get_course_info(), TOOL_SURVEY, $survey_id, 'SurveyAdded', api_get_user_id());
+			}
+
+			if ($values['survey_type'] == 1 && !empty($values['parent_id'])) {
+				survey_manager::copy_survey($values['parent_id'],$survey_id);
+			}
+
+			$return['message'] = 'SurveyCreatedSuccesfully';
+			$return['type'] = 'confirmation';
+			$return['id'] = $survey_id;
+
+		} else {
+
+			// Check whether the code doesn't soon exists in this language
+			$sql = 'SELECT 1 FROM '.$table_survey.'
+			        WHERE c_id = '.$course_id.' AND code="'.Database::escape_string($values['survey_code']).'" AND lang="'.Database::escape_string($values['survey_language']).'" AND survey_id!='.intval($values['survey_id']);
+			$rs = Database::query($sql);
+			if (Database::num_rows($rs) > 0) {
+				$return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
+				$return['type'] = 'error';
+				$return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
+				return $return;
+			}
+
+			if ($values['anonymous'] == '') {
+				$values['anonymous'] = 0;
+			}
+
+			$additionalsets = ", shuffle = '".Database::escape_string($values['shuffle'])."'";
+			$additionalsets .= ", one_question_per_page = '".Database::escape_string($values['one_question_per_page'])."'";
+
+			if ($values['anonymous'] == 0) {
+				$additionalsets .= ", show_form_profile = '".Database::escape_string($values['show_form_profile'])."'";
+				if ($values['show_form_profile'] == 1) {
+					$fields = explode(',',$values['input_name_list']);
+					$field_values = '';
+					foreach ($fields as & $field) {
+						if ($field != '') {
+							if ($values[$field] == '') {
+								$values[$field] = 0;
+							}
+							$field_values.= $field.':'.$values[$field].'@';
+						}
+					}
+					$additionalsets .= ", form_fields = '".Database::escape_string($field_values)."'";
+				} else {
+					$additionalsets .= ", form_fields = '' ";
+				}
+			} else {
+				$additionalsets .= ", show_form_profile = '0'";
+				$additionalsets .= ", form_fields = '' ";
+			}
+
+			$sql = "UPDATE $table_survey SET
                         title 			= '".Database::escape_string($values['survey_title'])."',
-                        code            = '".Database::escape_string(
-                strtolower(CourseManager::generate_course_code(api_substr($values['survey_code'], 0)))
-            )."',
                         subtitle 		= '".Database::escape_string($values['survey_subtitle'])."',
-                        author 			= '".api_get_user_id()."',
+                        author 			= '".Database::escape_string($_user['user_id'])."',
                         lang 			= '".Database::escape_string($values['survey_language'])."',
                         avail_from 		= '".Database::escape_string($values['start_date'])."',
                         avail_till		= '".Database::escape_string($values['end_date'])."',
                         is_shared		= '".Database::escape_string($shared_survey_id)."',
-                        template 		= 'template',
+                        template 		= '".Database::escape_string('template')."',
                         intro			= '".Database::escape_string($values['survey_introduction'])."',
                         surveythanks	= '".Database::escape_string($values['survey_thanks'])."',
                         anonymous       = '".Database::escape_string($values['anonymous'])."'".$additionalsets."
 					WHERE c_id = $course_id AND survey_id = '".Database::escape_string($values['survey_id'])."'";
-            Database::query($sql);
+			Database::query($sql);
 
-            // Update into item_property (update)
-            api_item_property_update(
-                api_get_course_info(),
-                TOOL_SURVEY,
-                $values['survey_id'],
-                'SurveyUpdated',
-                api_get_user_id()
-            );
+			// Update into item_property (update)
+			api_item_property_update(api_get_course_info(), TOOL_SURVEY, $values['survey_id'], 'SurveyUpdated', api_get_user_id());
 
-            $return['message'] = 'SurveyUpdatedSuccesfully';
-            $return['type'] = 'confirmation';
-            $return['id'] = $values['survey_id'];
-        }
+			$return['message'] = 'SurveyUpdatedSuccesfully';
+			$return['type'] = 'confirmation';
+			$return['id']	= $values['survey_id'];
+		}
+		return $return;
+	}
+
+	/**
+	 * This function stores a shared survey in the central database.
+	 *
+	 * @param array $values
+	 * @return array $return the type of return message that has to be displayed and the message in it
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+    public function store_shared_survey($values)
+    {
+        $_user = api_get_user_info();
+        $_course = api_get_course_info();
 
-        return $return;
-    }
+		// Table defnitions
+		$table_survey	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
 
-    /**
-     * This function stores a shared survey in the central database.
-     *
-     * @param array $values
-     * @return array $return the type of return message that has to be displayed and the message in it
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    function store_shared_survey($values)
-    {
-        global $_user, $_course;
-
-        // Table defnitions
-        $table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
-
-        if (!$values['survey_id'] || !is_numeric(
-            $values['survey_id']
-        ) || $values['survey_share']['survey_share'] == 'true'
-        ) {
-            $sql = "INSERT INTO $table_survey (code, title, subtitle, author, lang, template, intro, surveythanks, creation_date, course_code) VALUES (
-                    '".Database::escape_string($values['survey_code'])."',
-                    '".Database::escape_string($values['survey_title'])."',
-                    '".Database::escape_string($values['survey_subtitle'])."',
-                    '".Database::escape_string($_user['user_id'])."',
-                    '".Database::escape_string($values['survey_language'])."',
-                    'template',
-                    '".Database::escape_string($values['survey_introduction'])."',
-                    '".Database::escape_string($values['survey_thanks'])."',
-                    '".api_get_utc_datetime()."',
+		if (!$values['survey_id'] || !is_numeric($values['survey_id']) || $values['survey_share']['survey_share'] == 'true') {
+			$sql = "INSERT INTO $table_survey (code, title, subtitle, author, lang, template, intro, surveythanks, creation_date, course_code) VALUES (
+						'".Database::escape_string($values['survey_code'])."',
+						'".Database::escape_string($values['survey_title'])."',
+						'".Database::escape_string($values['survey_subtitle'])."',
+						'".Database::escape_string($_user['user_id'])."',
+						'".Database::escape_string($values['survey_language'])."',
+						'".Database::escape_string('template')."',
+						'".Database::escape_string($values['survey_introduction'])."',
+						'".Database::escape_string($values['survey_thanks'])."',
+						'".date('Y-m-d H:i:s')."',
 						'".$_course['id']."')";
-            Database::query($sql);
-            $return = Database::insert_id();
-        } else {
-            $sql = "UPDATE $table_survey SET
+			Database::query($sql);
+			$return	= Database::insert_id();
+		} else {
+			$sql = "UPDATE $table_survey SET
                         code 			= '".Database::escape_string($values['survey_code'])."',
                         title 			= '".Database::escape_string($values['survey_title'])."',
                         subtitle 		= '".Database::escape_string($values['survey_subtitle'])."',
                         author 			= '".Database::escape_string($_user['user_id'])."',
                         lang 			= '".Database::escape_string($values['survey_language'])."',
-                        template 		= 'template',
+                        template 		= '".Database::escape_string('template')."',
                         intro			= '".Database::escape_string($values['survey_introduction'])."',
                         surveythanks	= '".Database::escape_string($values['survey_thanks'])."'
 					WHERE survey_id = '".Database::escape_string($values['survey_share']['survey_share'])."'";
-            Database::query($sql);
-            $return = $values['survey_share']['survey_share'];
-        }
-
-        return $return;
-    }
-
-    /**
-     * This function deletes a survey (and also all the question in that survey
-     *
-     * @param $survey_id the id of the survey that has to be deleted
-     * @return true
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function delete_survey($survey_id, $shared = false, $course_id = '')
-    {
-        // Database table definitions
+			Database::query($sql);
+			$return	= $values['survey_share']['survey_share'];
+		}
+		return $return;
+	}
+
+	/**
+	 * This function deletes a survey (and also all the question in that survey
+	 *
+	 * @param $survey_id the id of the survey that has to be deleted
+	 * @return true
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+    public static function delete_survey($survey_id, $shared = false, $course_id = '') {
+		// Database table definitions
         if (empty($course_id)) {
             $course_id = api_get_course_int_id();
         }
@@ -500,1011 +431,934 @@ class survey_manager
             return false;
         }
 
-        $course_info = api_get_course_info_by_id($course_id);
-        $course_id = $course_info['real_id'];
+		$course_info = api_get_course_info_by_id($course_id);
+		$course_id   = $course_info['real_id'];
 
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_question_group = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
+		$table_survey = Database :: get_course_table(TABLE_SURVEY);
+		$table_survey_question_group = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
 
-        if ($shared) {
-            $table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
-            // Deleting the survey
+		if ($shared) {
+			$table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
+			 // Deleting the survey
             $sql = "DELETE FROM $table_survey WHERE survey_id='".$survey_id."'";
-            $res = Database::query($sql);
-        } else {
-            $sql = "DELETE FROM $table_survey WHERE c_id = $course_id AND survey_id='".$survey_id."'";
-            $res = Database::query($sql);
-        }
-
-        // Deleting groups of this survey
-        $sql = "DELETE FROM $table_survey_question_group WHERE c_id = $course_id AND survey_id='".$survey_id."'";
-        $res = Database::query($sql);
+            Database::query($sql);
+		} else {
+		    $sql = "DELETE FROM $table_survey WHERE c_id = $course_id AND survey_id='".$survey_id."'";
+            Database::query($sql);
+		}
 
-        // Deleting the questions of the survey
-        self::delete_all_survey_questions($survey_id, $shared);
+		// Deleting groups of this survey
+		$sql = "DELETE FROM $table_survey_question_group WHERE c_id = $course_id AND survey_id='".$survey_id."'";
+		Database::query($sql);
 
-        // Update into item_property (delete)
-        api_item_property_update($course_info, TOOL_SURVEY, $survey_id, 'SurveyDeleted', api_get_user_id());
+		// Deleting the questions of the survey
+		survey_manager::delete_all_survey_questions($survey_id, $shared);
 
-        return true;
-    }
+		// Update into item_property (delete)
+		api_item_property_update($course_info, TOOL_SURVEY, $survey_id, 'SurveyDeleted', api_get_user_id());
+		return true;
+	}
 
-    static function copy_survey($survey_id, $new_survey_id = null)
+    /**
+     * @param int $parent_survey
+     * @param int $new_survey_id
+     * @return bool
+     */
+    public function copy_survey($parent_survey, $new_survey_id)
     {
-        $course_id = api_get_course_int_id();
-
-        // Database table definitions
-        $table_survey = Database::get_course_table(TABLE_SURVEY);
-        $table_survey_question_group = Database::get_course_table(TABLE_SURVEY_QUESTION_GROUP);
-        $table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_options = Database::get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $survey_id = Database::escape_string($survey_id);
-
-        // Get groups
-        $survey_data = self::get_survey($survey_id, 0, null, true);
-        if (empty($survey_data)) {
-            return true;
-        }
-
-        if (empty($new_survey_id)) {
-            $params = $survey_data;
-            $params['code'] = self::generate_unique_code($params['code']);
-            $params['c_id'] = $course_id;
-            unset($params['survey_id']);
-            $params['session_id'] = api_get_session_id();
-            $params['title'] = $params['title'].' '.get_lang('Copy');
-            Database::insert($table_survey, $params);
-            $new_survey_id = Database::insert_id();
-        } else {
-            $new_survey_id = intval($new_survey_id);
-        }
-
-        $sql = "SELECT * from $table_survey_question_group WHERE c_id = $course_id AND  survey_id='".$survey_id."'";
-        $res = Database::query($sql);
-        while ($row = Database::fetch_array($res, 'ASSOC')) {
-            $sql1 = 'INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) VALUES
-					('.$course_id.', \''.Database::escape_string($row['name']).'\',\''.Database::escape_string(
-                $row['description']
-            ).'\',\''.$new_survey_id.'\')';
-            Database::query($sql1);
-            $group_id[$row['id']] = Database::insert_id();
-        }
-
-        // Get questions
-        $sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND survey_id='".$survey_id."'";
-        $res = Database::query($sql);
-        while ($row = Database::fetch_array($res, 'ASSOC')) {
-            $sql2 = 'INSERT INTO '.$table_survey_question.' (c_id, survey_id,survey_question,survey_question_comment,type,display,sort,shared_question_id,max_value,survey_group_pri,survey_group_sec1,survey_group_sec2) VALUES '.
-                '('.$course_id.', \''.$new_survey_id.'\',\''.Database::escape_string(
-                $row['survey_question']
-            ).'\',\''.Database::escape_string(
-                $row['survey_comment']
-            ).'\',\''.$row['type'].'\',\''.$row['display'].'\',\''.$row['sort'].'\',\''.$row['shared_question_id'].'\',\''.$row['max_value'].
-                '\',\''.$group_id[$row['survey_group_pri']].'\',\''.$group_id[$row['survey_group_sec1']].'\',\''.$group_id[$row['survey_group_sec2']].'\')';
-            $res2 = Database::query($sql2);
-            $question_id[$row['question_id']] = Database::insert_id();
-        }
+	    $course_id = api_get_course_int_id();
+
+		// Database table definitions
+		$table_survey 					= Database::get_course_table(TABLE_SURVEY);
+		$table_survey_question_group 	= Database::get_course_table(TABLE_SURVEY_QUESTION_GROUP);
+		$table_survey_question 			= Database::get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_options 			= Database::get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$parent_survey 					= Database::escape_string($parent_survey);
+		// Get groups
+		$sql = "SELECT * from $table_survey_question_group WHERE c_id = $course_id AND  survey_id='".$parent_survey."'";
+		$res = Database::query($sql);
+		if (Database::num_rows($res) === 0) {
+			return true;
+		}
+		$new_survey_id = intval($new_survey_id);
+		while($row = Database::fetch_array($res, 'ASSOC')){
+			$sql1 = 'INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) VALUES
+					('.$course_id.', \''.Database::escape_string($row['name']).'\',\''.Database::escape_string($row['description']).'\',\''.$new_survey_id.'\')';
+			Database::query($sql1);
+			$group_id[$row['id']] = Database::insert_id();
+		}
 
-        // Get questions options
-        $sql = "SELECT * FROM $table_survey_options WHERE c_id = $course_id AND survey_id='".$survey_id."'";
-        $res = Database::query($sql);
-        while ($row = Database::fetch_array($res, 'ASSOC')) {
-            $sql3 = 'INSERT INTO '.$table_survey_options.' (c_id, question_id,survey_id,option_text,sort,value) VALUES ('.
-                " $course_id ,    '".$question_id[$row['question_id']]."','".$new_survey_id."','".Database::escape_string(
-                $row['option_text']
-            )."','".$row['sort']."','".$row['value']."')";
-            Database::query($sql3);
-        }
+		// Get questions
+		$sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND survey_id='".$parent_survey."'";
+		$res = Database::query($sql);
+		while($row = Database::fetch_array($res, 'ASSOC')){
+			$sql2 = 'INSERT INTO '.$table_survey_question.' (c_id, survey_id,survey_question,survey_question_comment,type,display,sort,shared_question_id,max_value,survey_group_pri,survey_group_sec1,survey_group_sec2) VALUES '.
+			'('.$course_id.', \''.$new_survey_id.'\',\''.Database::escape_string($row['survey_question']).'\',\''.Database::escape_string($row['survey_comment']).'\',\''.$row['type'].'\',\''.$row['display'].'\',\''.$row['sort'].'\',\''.$row['shared_question_id'].'\',\''.$row['max_value'].
+			'\',\''.$group_id[$row['survey_group_pri']].'\',\''.$group_id[$row['survey_group_sec1']].'\',\''.$group_id[$row['survey_group_sec2']].'\')';
+			Database::query($sql2);
+			$question_id[$row['question_id']] = Database::insert_id();
+		}
 
-        return true;
-    }
+		// Get questions options
+		$sql = "SELECT * FROM $table_survey_options WHERE c_id = $course_id AND survey_id='".$parent_survey."'";
+		$res = Database::query($sql);
+		while($row = Database::fetch_array($res ,'ASSOC')){
+			$sql3 = 'INSERT INTO '.$table_survey_options.' (c_id, question_id,survey_id,option_text,sort,value) VALUES ('.
+			" $course_id ,    '".$question_id[$row['question_id']]."','".$new_survey_id."','".Database::escape_string($row['option_text'])."','".$row['sort']."','".$row['value']."')";
+			Database::query($sql3);
+		}
 
-    /**
-     * This function duplicates a survey (and also all the question in that survey
-     *
-     * @param $survey_id the id of the survey that has to be duplicated
-     * @return true
-     *
-     * @author Eric Marguin <e.marguin@elixir-interactive.com>, Elixir Interactive
-     * @version October 2007
-     */
-    static function empty_survey($survey_id)
+		return true;
+	}
+
+	/**
+	 * This function duplicates a survey (and also all the question in that survey
+	 *
+	 * @param $survey_id the id of the survey that has to be duplicated
+	 * @return true
+	 *
+	 * @author Eric Marguin <e.marguin@elixir-interactive.com>, Elixir Interactive
+	 * @version October 2007
+	 */
+    public function empty_survey($survey_id)
     {
-        // Database table definitions
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
+		// Database table definitions
+		$table_survey_invitation      = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		$table_survey_answer          = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$table_survey                 = Database :: get_course_table(TABLE_SURVEY);
 
         $course_id = api_get_course_int_id();
 
-        $datas = self::get_survey($survey_id);
-        $session_where = '';
-        if (api_get_session_id() != 0) {
-            $session_where = ' AND session_id = "'.api_get_session_id().'" ';
-        }
+		$datas = survey_manager::get_survey($survey_id);
+		$session_where = '';
+		if (api_get_session_id() != 0) {
+			$session_where = ' AND session_id = "'.api_get_session_id().'" ';
+		}
 
-        $sql = 'DELETE FROM '.$table_survey_invitation.' WHERE c_id = '.$course_id.' AND survey_code = "'.Database::escape_string(
-            $datas['code']
-        ).'" '.$session_where.' ';
-        Database::query($sql);
+		$sql = 'DELETE FROM '.$table_survey_invitation.' WHERE c_id = '.$course_id.' AND survey_code = "'.Database::escape_string($datas['code']).'" '.$session_where.' ';
+		Database::query($sql);
 
-        $sql = 'DELETE FROM '.$table_survey_answer.' WHERE c_id = '.$course_id.' AND survey_id='.intval($survey_id);
-        Database::query($sql);
+		$sql = 'DELETE FROM '.$table_survey_answer.' WHERE c_id = '.$course_id.' AND survey_id='.intval($survey_id);
+		Database::query($sql);
 
-        $sql = 'UPDATE '.$table_survey.' SET invited=0, answered=0 WHERE c_id = '.$course_id.' AND survey_id='.intval(
-            $survey_id
-        );
-        Database::query($sql);
+		$sql = 'UPDATE '.$table_survey.' SET invited=0, answered=0 WHERE c_id = '.$course_id.' AND survey_id='.intval($survey_id);
+		Database::query($sql);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * This function recalculates the number of people who have taken the survey (=filled at least one question)
-     *
-     * @param $survey_id the id of the survey somebody
-     * @return true
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function update_survey_answered($survey_data, $user, $survey_code)
+	/**
+	 * This function recalculates the number of people who have taken the survey (=filled at least one question)
+	 *
+	 * @param int $survey_id the id of the survey somebody
+	 * @return true
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+    public static function update_survey_answered($survey_data, $user, $survey_code)
     {
-        // Database table definitions
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		// Database table definitions
+		$table_survey 				= Database :: get_course_table(TABLE_SURVEY);
+		$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
         $survey_id = $survey_data['survey_id'];
         $course_id = $survey_data['c_id'];
         $session_id = $survey_data['session_id'];
 
-        // Getting a list with all the people who have filled the survey
-        $people_filled = survey_manager::get_people_who_filled_survey($survey_id, false, $course_id);
-
-        $number = intval(count($people_filled));
-
-        // Storing this value in the survey table
-        $sql = "UPDATE $table_survey SET answered = $number WHERE c_id = $course_id AND survey_id = ".Database::escape_string(
-            $survey_id
-        );
-        Database::query($sql);
-
-        // Storing that the user has finished the survey.
-        $sql = "UPDATE $table_survey_invitation SET answered='1'
-                WHERE c_id = $course_id AND session_id='".$session_id."' AND user='".Database::escape_string(
-            $user
-        )."' AND survey_code='".Database::escape_string($survey_code)."'";
-        Database::query($sql);
-    }
-
-    /**
-     * This function gets a complete structure of a survey (all survey information, all question information
-     * of all the questions and all the options of all the questions.
-     *
-     * @param integer $survey_id the id of the survey
-     * @param boolean $shared this parameter determines if we have to get the information of a survey from the central (shared) database or from the
-     *           course database
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function get_complete_survey_structure($survey_id, $shared = 0)
+		// Getting a list with all the people who have filled the survey
+		$people_filled = survey_manager::get_people_who_filled_survey($survey_id, false, $course_id);
+
+		$number = intval(count($people_filled));
+
+		// Storing this value in the survey table
+		$sql = "UPDATE $table_survey
+		        SET answered = $number
+		        WHERE
+                    c_id = $course_id AND
+		            survey_id = ".Database::escape_string($survey_id);
+		Database::query($sql);
+
+		// Storing that the user has finished the survey.
+		$sql = "UPDATE $table_survey_invitation SET answered='1'
+                WHERE
+                    c_id = $course_id AND
+                    session_id='".$session_id."' AND
+                    user='".Database::escape_string($user)."' AND
+                    survey_code='".Database::escape_string($survey_code)."'";
+		Database::query($sql);
+	}
+
+	/**
+	 * This function gets a complete structure of a survey (all survey information, all question information
+	 * of all the questions and all the options of all the questions.
+	 *
+	 * @param integer $survey_id the id of the survey
+	 * @param boolean $shared this parameter determines if we have to get the information of a survey from the central (shared) database or from the
+	 * 		  course database
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+    public static function get_complete_survey_structure($survey_id, $shared = 0)
     {
-        $structure = survey_manager::get_survey($survey_id, $shared);
-        $structure['questions'] = survey_manager::get_questions($survey_id);
-    }
-
-    /*     * *
-     * SYRVEY QUESTION FUNCTIONS
-     */
-
-    /**
-     * This function return the "icon" of the question type
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function icon_question($type)
+		$structure = survey_manager::get_survey($survey_id, $shared);
+		$structure['questions'] = survey_manager::get_questions($survey_id);
+	}
+
+	/***
+	 * SURVEY QUESTION FUNCTIONS
+	 */
+
+	/**
+	 * This function return the "icon" of the question type
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+    public static function icon_question($type)
     {
-        // the possible question types
-        $possible_types = array(
-            'personality',
-            'yesno',
-            'multiplechoice',
-            'multipleresponse',
-            'open',
-            'dropdown',
-            'comment',
-            'pagebreak',
-            'percentage',
-            'score'
-        );
-
-        // the images array
-        $icon_question = array(
-            'yesno' => 'yesno.gif',
-            'personality' => 'yesno.gif',
-            'multiplechoice' => 'mcua.gif',
-            'multipleresponse' => 'mcma.gif',
-            'open' => 'open_answer.gif',
-            'dropdown' => 'dropdown.gif',
-            'percentage' => 'percentagequestion.gif',
-            'score' => 'scorequestion.gif',
-            'comment' => 'commentquestion.gif',
-            'pagebreak' => 'page_end.gif',
-        );
-
-        if (in_array($type, $possible_types)) {
-            return $icon_question[$type];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * This function retrieves all the information of a question
-     *
-     * @param integer $question_id the id of the question
-     * @return array
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @todo one sql call should do the trick
-     */
-    static function get_question($question_id, $shared = false)
+		// the possible question types
+		$possible_types = array('personality', 'yesno', 'multiplechoice', 'multipleresponse', 'open', 'dropdown', 'comment', 'pagebreak', 'percentage', 'score');
+
+		// the images array
+		$icon_question = array(
+			'yesno' 			=> 'yesno.gif',
+			'personality' 		=> 'yesno.gif',
+			'multiplechoice' 	=> 'mcua.gif',
+			'multipleresponse' 	=> 'mcma.gif',
+			'open' 				=> 'open_answer.gif',
+			'dropdown' 			=> 'dropdown.gif',
+			'percentage' 		=> 'percentagequestion.gif',
+			'score' 			=> 'scorequestion.gif',
+			'comment' 			=> 'commentquestion.gif',
+			'pagebreak' 		=> 'page_end.gif',
+		);
+
+		if (in_array($type, $possible_types)) {
+			return $icon_question[$type];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * This function retrieves all the information of a question
+	 *
+	 * @param integer $question_id the id of the question
+	 * @return array
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @todo one sql call should do the trick
+	 */
+    public static function get_question($question_id, $shared = false)
     {
-        // Table definitions
-        $tbl_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		// Table definitions
+		$tbl_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
         $course_id = api_get_course_int_id();
 
-        $sql = "SELECT * FROM $tbl_survey_question WHERE c_id = $course_id AND question_id='".Database::escape_string(
-            $question_id
-        )."' ORDER BY `sort` ";
-        $sql_survey_question_option = "SELECT * FROM $table_survey_question_option WHERE c_id = $course_id AND question_id='".Database::escape_string(
-            $question_id
-        )."' ORDER BY `sort` ";
-        if ($shared) {
-            $tbl_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
-            $table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
-
-            $sql = "SELECT * FROM $tbl_survey_question WHERE question_id='".Database::escape_string(
-                $question_id
-            )."' ORDER BY `sort` ";
-            $sql_survey_question_option = "SELECT * FROM $table_survey_question_option WHERE question_id='".Database::escape_string(
-                $question_id
-            )."' ORDER BY `sort` ";
-        }
-
-        // Getting the information of the question
-
-        $result = Database::query($sql);
-        $row = Database::fetch_array($result, 'ASSOC');
-        $return['survey_id'] = $row['survey_id'];
-        $return['question_id'] = $row['question_id'];
-        $return['type'] = $row['type'];
-        $return['question'] = $row['survey_question'];
-        $return['horizontalvertical'] = $row['display'];
-        $return['shared_question_id'] = $row['shared_question_id'];
-        $return['maximum_score'] = $row['max_value'];
-
-        if ($row['survey_group_pri'] != 0) {
-            $return['assigned'] = $row['survey_group_pri'];
-            $return['choose'] = 1;
-        } else {
-            $return['assigned1'] = $row['survey_group_sec1'];
-            $return['assigned2'] = $row['survey_group_sec2'];
-            $return['choose'] = 2;
-        }
-
-        // Getting the information of the question options
+        $sql = "SELECT * FROM $tbl_survey_question
+                WHERE c_id = $course_id AND question_id='".Database::escape_string($question_id)."' ORDER BY `sort` ";
+        $sql_survey_question_option = "SELECT * FROM $table_survey_question_option WHERE c_id = $course_id AND question_id='".Database::escape_string($question_id)."' ORDER BY `sort` ";
+		if ($shared) {
+			$tbl_survey_question 			= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+			$table_survey_question_option	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
 
-        $result = Database::query($sql_survey_question_option);
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            /** @todo this should be renamed to options instead of answers */
-            $return['answers'][] = $row['option_text'];
-            $return['values'][] = $row['value'];
-
-            /** @todo this can be done more elegantly (used in reporting) */
-            $return['answersid'][] = $row['question_option_id'];
-        }
+            $sql = "SELECT * FROM $tbl_survey_question WHERE question_id='".Database::escape_string($question_id)."' ORDER BY `sort` ";
+            $sql_survey_question_option = "SELECT * FROM $table_survey_question_option WHERE question_id='".Database::escape_string($question_id)."' ORDER BY `sort` ";
+		}
 
-        return $return;
-    }
+		// Getting the information of the question
+
+		$result = Database::query($sql);
+		$row = Database::fetch_array($result,'ASSOC');
+		$return['survey_id'] 			= $row['survey_id'];
+		$return['question_id'] 			= $row['question_id'];
+		$return['type'] 				= $row['type'];
+		$return['question'] 			= $row['survey_question'];
+		$return['horizontalvertical'] 	= $row['display'];
+		$return['shared_question_id']	= $row['shared_question_id'];
+		$return['maximum_score']		= $row['max_value'];
+
+  		if ($row['survey_group_pri'] != 0) {
+  			$return['assigned'] = $row['survey_group_pri'];
+	 		$return['choose'] = 1;
+   		} else {
+ 	 		$return['assigned1'] = $row['survey_group_sec1'];
+  			$return['assigned2'] = $row['survey_group_sec2'];
+	 		$return['choose'] = 2;
+  		}
+
+		// Getting the information of the question options
+
+		$result = Database::query($sql_survey_question_option);
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			/** @todo this should be renamed to options instead of answers */
+			$return['answers'][] = $row['option_text'];
+			$return['values'][] = $row['value'];
+
+			/** @todo this can be done more elegantly (used in reporting) */
+			$return['answersid'][] = $row['question_option_id'];
+		}
 
-    /**
-     * This function gets all the question of any given survey
-     *
-     * @param integer $survey_id the id of the survey
-     * @return array containing all the questions of the survey
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     *
-     * @todo one sql call should do the trick
-     */
-    static function get_questions($survey_id)
+		return $return;
+	}
+
+	/**
+	 * This function gets all the question of any given survey
+	 *
+	 * @param integer $survey_id the id of the survey
+	 * @return array containing all the questions of the survey
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 *
+	 * @todo one sql call should do the trick
+	 */
+    public static function get_questions($survey_id, $course_id = '')
     {
-        // Table definitions
-        $tbl_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-
-        $course_id = api_get_course_int_id();
+		// Table definitions
+		$tbl_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
-        // Getting the information of the question
-        $sql = "SELECT * FROM $tbl_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $survey_id
-        )."'";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            $return[$row['question_id']]['survey_id'] = $row['survey_id'];
-            $return[$row['question_id']]['question_id'] = $row['question_id'];
-            $return[$row['question_id']]['type'] = $row['type'];
-            $return[$row['question_id']]['question'] = $row['survey_question'];
-            $return[$row['question_id']]['horizontalvertical'] = $row['display'];
-            $return[$row['question_id']]['maximum_score'] = $row['max_value'];
-            $return[$row['question_id']]['sort'] = $row['sort'];
-        }
+		if (empty($course_id))
+		{
+			$course_id = api_get_course_int_id();
+		}
 
-        // Getting the information of the question options
-        $sql = "SELECT * FROM $table_survey_question_option WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $survey_id
-        )."'";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            $return[$row['question_id']]['answers'][] = $row['option_text'];
-        }
+		// Getting the information of the question
+		$sql = "SELECT * FROM $tbl_survey_question
+		        WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."'";
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			$return[$row['question_id']]['survey_id'] 			= $row['survey_id'];
+			$return[$row['question_id']]['question_id'] 		= $row['question_id'];
+			$return[$row['question_id']]['type'] 				= $row['type'];
+			$return[$row['question_id']]['question'] 			= $row['survey_question'];
+			$return[$row['question_id']]['horizontalvertical'] 	= $row['display'];
+			$return[$row['question_id']]['maximum_score'] 		= $row['max_value'];
+			$return[$row['question_id']]['sort'] 				= $row['sort'];
+		}
 
-        return $return;
-    }
+		// Getting the information of the question options
+		$sql = "SELECT * FROM $table_survey_question_option
+		        WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."'";
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			$return[$row['question_id']]['answers'][] = $row['option_text'];
+		}
 
-    /**
-     * This function saves a question in the database.
-     * This can be either an update of an existing survey or storing a new survey
-     *
-     * @param array $form_content all the information of the form
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function save_question($form_content)
+		return $return;
+	}
+
+	/**
+	 * This function saves a question in the database.
+	 * This can be either an update of an existing survey or storing a new survey
+	 *
+	 * @param array $form_content all the information of the form
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+    public function save_question($survey_data, $form_content)
     {
-        global $survey_data;
-
-        if (strlen($form_content['question']) > 1) { // Checks lenght of the question
-            $empty_answer = false;
-
-            if ($survey_data['survey_type'] == 1) {
-                if (empty($form_content['choose'])) {
-                    $return_message = 'PleaseChooseACondition';
-
-                    return $return_message;
-                }
-
-                if (($form_content['choose'] == 2) && ($form_content['assigned1'] == $form_content['assigned2'])) {
-                    $return_message = 'ChooseDifferentCategories';
-
-                    return $return_message;
-                }
-            }
-
-            if ($form_content['type'] != 'percentage') {
-                for ($i = 0; $i < count($form_content['answers']); $i++) {
-                    if (strlen($form_content['answers'][$i]) < 1) {
-                        $empty_answer = true;
-                        break;
-                    }
-                }
-            }
-
-            if ($form_content['type'] == 'score') {
-                if (strlen($form_content['maximum_score']) < 1) {
-                    $empty_answer = true;
-                }
-            }
-            $additional = array();
+		if (strlen($form_content['question']) > 1) { // Checks lenght of the question
+			$empty_answer = false;
+
+			if ($survey_data['survey_type'] == 1) {
+				if (empty($form_content['choose'])) {
+					$return_message = 'PleaseChooseACondition';
+					return $return_message;
+				}
+
+				if (($form_content['choose']==2)&&($form_content['assigned1'] == $form_content['assigned2'])) {
+					$return_message = 'ChooseDifferentCategories';
+					return $return_message;
+				}
+			}
+
+			if ($form_content['type'] != 'percentage') {
+				for ($i = 0; $i < count($form_content['answers']); $i++) {
+					if (strlen($form_content['answers'][$i]) < 1) {
+						$empty_answer = true;
+						break;
+					}
+				}
+			}
+
+			if ($form_content['type'] == 'score') {
+				if (strlen($form_content['maximum_score']) < 1) {
+					$empty_answer = true;
+				}
+			}
+			$additional = array();
 
             $course_id = api_get_course_int_id();
 
-            if (!$empty_answer) {
-                // Table definitions
-                $tbl_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-
-                // Getting all the information of the survey
-                $survey_data = self::get_survey($form_content['survey_id']);
-
-                // Storing the question in the shared database
-                if (is_numeric($survey_data['survey_share']) && $survey_data['survey_share'] != 0) {
-                    $shared_question_id = self::save_shared_question($form_content, $survey_data);
-                    $form_content['shared_question_id'] = $shared_question_id;
-                }
-
-                // Storing a new question
-                if ($form_content['question_id'] == '' || !is_numeric($form_content['question_id'])) {
-                    // Finding the max sort order of the questions in the given survey
-                    $sql = "SELECT max(sort) AS max_sort FROM $tbl_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-                        $form_content['survey_id']
-                    )."'";
-                    $result = Database::query($sql);
-                    $row = Database::fetch_array($result, 'ASSOC');
-                    $max_sort = $row['max_sort'];
-
-                    // Some variables defined for survey-test type
-                    $additional['column'] = '';
-                    $additional['value'] = '';
-
-                    if ($_POST['choose'] == 1) {
-                        $additional['column'] = ',survey_group_pri';
-                        $additional['value'] = ",'".Database::escape_string($_POST['assigned'])."'";
-                    } elseif ($_POST['choose'] == 2) {
-                        $additional['column'] = ',survey_group_sec1, survey_group_sec2';
-                        $additional['value'] = ",'".Database::escape_string(
-                            $_POST['assigned1']
-                        )."'".",'".Database::escape_string($_POST['assigned2'])."'";
-                    }
-
-                    // Adding the question to the survey_question table
-                    $sql = "INSERT INTO $tbl_survey_question (c_id, survey_id,survey_question,survey_question_comment,type,display, sort, shared_question_id, max_value".$additional['column'].") VALUES (
+			if (!$empty_answer) {
+				// Table definitions
+				$tbl_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+
+				// Getting all the information of the survey
+				$survey_data = survey_manager::get_survey($form_content['survey_id']);
+
+				// Storing the question in the shared database
+				if (is_numeric($survey_data['survey_share']) && $survey_data['survey_share'] != 0) {
+					$shared_question_id = survey_manager::save_shared_question($form_content, $survey_data);
+					$form_content['shared_question_id'] = $shared_question_id;
+				}
+
+				// Storing a new question
+				if ($form_content['question_id'] == '' || !is_numeric($form_content['question_id'])) {
+					// Finding the max sort order of the questions in the given survey
+					$sql = "SELECT max(sort) AS max_sort
+					        FROM $tbl_survey_question
+                            WHERE c_id = $course_id AND survey_id='".Database::escape_string($form_content['survey_id'])."'";
+					$result = Database::query($sql);
+					$row = Database::fetch_array($result,'ASSOC');
+					$max_sort = $row['max_sort'];
+
+					// Some variables defined for survey-test type
+					$additional['column'] = '';
+					$additional['value'] = '';
+
+					if ($_POST['choose'] == 1) {
+						$additional['column'] = ',survey_group_pri';
+						$additional['value'] = ",'".Database::escape_string($_POST['assigned'])."'";
+					} elseif($_POST['choose'] == 2) {
+						$additional['column'] = ',survey_group_sec1, survey_group_sec2';
+						$additional['value'] = ",'".Database::escape_string($_POST['assigned1'])."'".",'".Database::escape_string($_POST['assigned2'])."'";
+					}
+
+					// Adding the question to the survey_question table
+					$sql = "INSERT INTO $tbl_survey_question (c_id, survey_id,survey_question,survey_question_comment,type,display, sort, shared_question_id, max_value".$additional['column'].") VALUES (
 								$course_id,
 								'".Database::escape_string($form_content['survey_id'])."',
 								'".Database::escape_string($form_content['question'])."',
 								'".Database::escape_string($form_content['question_comment'])."',
 								'".Database::escape_string($form_content['type'])."',
 								'".Database::escape_string($form_content['horizontalvertical'])."',
-								'".Database::escape_string($max_sort + 1)."',
+								'".Database::escape_string($max_sort+1)."',
 								'".Database::escape_string($form_content['shared_question_id'])."',
 								'".Database::escape_string($form_content['maximum_score'])."'".
-                        $additional['value']."
+								$additional['value']."
 								)";
-                    Database::query($sql);
-                    $question_id = Database::insert_id();
-                    $form_content['question_id'] = $question_id;
-                    $return_message = 'QuestionAdded';
-                } else {
-                    // Updating an existing question
+					Database::query($sql);
+					$question_id = Database::insert_id();
+					$form_content['question_id'] = $question_id;
+					$return_message = 'QuestionAdded';
 
-                    $additionalsets = '';
+				} else {
+                    // Updating an existing question
 
-                    if ($_POST['choose'] == 1) {
-                        $additionalsets = ',survey_group_pri = \''.Database::escape_string(
-                            $_POST['assigned']
-                        ).'\', survey_group_sec1 = \'0\', survey_group_sec2 = \'0\' ';
-                    } elseif ($_POST['choose'] == 2) {
-                        $additionalsets = ',survey_group_pri = \'0\', survey_group_sec1 = \''.Database::escape_string(
-                            $_POST['assigned1']
-                        ).'\', survey_group_sec2 = \''.Database::escape_string($_POST['assigned2']).'\' ';
-                    }
-
-                    $setadditionals = $additional['set'][1].$additional['set'][2].$additional['set'][3];
-
-                    // Adding the question to the survey_question table
-                    $sql = "UPDATE $tbl_survey_question SET
-								survey_question 		= '".Database::escape_string($form_content['question'])."',
-								survey_question_comment = '".Database::escape_string($form_content['question_comment'])."',
-								display 				= '".Database::escape_string(
-                        $form_content['horizontalvertical']
-                    )."',
-								max_value 				= '".Database::escape_string(
-                        $form_content['maximum_score']
-                    )."'".
-                        $additionalsets."
-								WHERE c_id = $course_id AND question_id 		= '".Database::escape_string(
-                        $form_content['question_id']
-                    )."'";
-                    $result = Database::query($sql);
-                    $return_message = 'QuestionUpdated';
-                }
+					$additionalsets = '';
+
+					if ($_POST['choose'] == 1) {
+						$additionalsets = ',survey_group_pri = \''.Database::escape_string($_POST['assigned']).'\', survey_group_sec1 = \'0\', survey_group_sec2 = \'0\' ';
+					}
+					elseif ($_POST['choose'] == 2) {
+						$additionalsets = ',survey_group_pri = \'0\', survey_group_sec1 = \''.Database::escape_string($_POST['assigned1']).'\', survey_group_sec2 = \''.Database::escape_string($_POST['assigned2']).'\' ';
+					}
+
+					$setadditionals = $additional['set'][1].$additional['set'][2].$additional['set'][3];
+
+					// Adding the question to the survey_question table
+					$sql = "UPDATE $tbl_survey_question SET
+                                survey_question 		= '".Database::escape_string($form_content['question'])."',
+                                survey_question_comment = '".Database::escape_string($form_content['question_comment'])."',
+                                display 				= '".Database::escape_string($form_content['horizontalvertical'])."',
+                                max_value 				= '".Database::escape_string($form_content['maximum_score'])."'" .
+                                $additionalsets."
+                            WHERE c_id = $course_id AND question_id = '".Database::escape_string($form_content['question_id'])."'";
+					Database::query($sql);
+					$return_message = 'QuestionUpdated';
+				}
 
                 if (!empty($form_content['survey_id'])) {
                     //Updating survey
-                    api_item_property_update(
-                        api_get_course_info(),
-                        TOOL_SURVEY,
-                        $form_content['survey_id'],
-                        'SurveyUpdated',
-                        api_get_user_id()
-                    );
+                    api_item_property_update(api_get_course_info(), TOOL_SURVEY, $form_content['survey_id'], 'SurveyUpdated', api_get_user_id());
                 }
 
-                // Storing the options of the question
-                $message_options = self::save_question_options($form_content, $survey_data);
-            } else {
-                $return_message = 'PleasFillAllAnswer';
-            }
-        } else {
-            $return_message = 'PleaseEnterAQuestion';
-        }
-
-        return $return_message;
-    }
-
-    /**
-     * This function saves the question in the shared database
-     *
-     * @param array $form_content all the information of the form
-     * @param array $survey_data all the information of the survey
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     *
-     * @todo editing of a shared question
-     */
-    function save_shared_question($form_content, $survey_data)
+				// Storing the options of the question
+				$message_options=survey_manager::save_question_options($form_content, $survey_data);
+			} else {
+				$return_message = 'PleasFillAllAnswer';
+			}
+		} else {
+			$return_message = 'PleaseEnterAQuestion';
+		}
+		return $return_message;
+	}
+
+	/**
+	 * This function saves the question in the shared database
+	 *
+	 * @param array $form_content all the information of the form
+	 * @param array $survey_data all the information of the survey
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 *
+	 * @todo editing of a shared question
+	 */
+    public function save_shared_question($form_content, $survey_data)
     {
         $_course = api_get_course_info();
 
         // Table definitions
-        $tbl_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+        $tbl_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
 
         // Storing a new question
         if ($form_content['shared_question_id'] == '' || !is_numeric($form_content['shared_question_id'])) {
             // Finding the max sort order of the questions in the given survey
             $sql = "SELECT max(sort) AS max_sort FROM $tbl_survey_question
-						WHERE survey_id='".Database::escape_string($survey_data['survey_share'])."'
-						AND code='".Database::escape_string($_course['id'])."'";
+                    WHERE survey_id='".Database::escape_string($survey_data['survey_share'])."'
+                    AND code='".Database::escape_string($_course['id'])."'";
             $result = Database::query($sql);
-            $row = Database::fetch_array($result, 'ASSOC');
+            $row = Database::fetch_array($result,'ASSOC');
             $max_sort = $row['max_sort'];
 
             // Adding the question to the survey_question table
             $sql = "INSERT INTO $tbl_survey_question (survey_id, survey_question, survey_question_comment, type, display, sort, code) VALUES (
-							'".Database::escape_string($survey_data['survey_share'])."',
-							'".Database::escape_string($form_content['question'])."',
-							'".Database::escape_string($form_content['question_comment'])."',
-							'".Database::escape_string($form_content['type'])."',
-							'".Database::escape_string($form_content['horizontalvertical'])."',
-							'".Database::escape_string($max_sort + 1)."',
-							'".Database::escape_string($_course['id'])."')";
-            $result = Database::query($sql);
+                        '".Database::escape_string($survey_data['survey_share'])."',
+                        '".Database::escape_string($form_content['question'])."',
+                        '".Database::escape_string($form_content['question_comment'])."',
+                        '".Database::escape_string($form_content['type'])."',
+                        '".Database::escape_string($form_content['horizontalvertical'])."',
+                        '".Database::escape_string($max_sort+1)."',
+                        '".Database::escape_string($_course['id'])."')";
+            Database::query($sql);
             $shared_question_id = Database::insert_id();
-        } // Updating an existing question
-        else {
+        }  else {
+            // Updating an existing question
             // adding the question to the survey_question table
             $sql = "UPDATE $tbl_survey_question SET
-							survey_question = '".Database::escape_string($form_content['question'])."',
-							survey_question_comment = '".Database::escape_string($form_content['question_comment'])."',
-							display = '".Database::escape_string($form_content['horizontalvertical'])."'
-							WHERE question_id = '".Database::escape_string($form_content['shared_question_id'])."'
-							AND code='".Database::escape_string($_course['id'])."'";
-            $result = Database::query($sql);
+                        survey_question = '".Database::escape_string($form_content['question'])."',
+                        survey_question_comment = '".Database::escape_string($form_content['question_comment'])."',
+                        display = '".Database::escape_string($form_content['horizontalvertical'])."'
+                    WHERE
+                        question_id = '".Database::escape_string($form_content['shared_question_id'])."' AND
+                        code = '".Database::escape_string($_course['id'])."'";
+            Database::query($sql);
             $shared_question_id = $form_content['shared_question_id'];
         }
 
-        return $shared_question_id;
-    }
-
-    /**
-     * This functions moves a question of a survey up or down
-     *
-     * @param string $direction
-     * @param integer $survey_question_id
-     * @param integer $survey_id
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function move_survey_question($direction, $survey_question_id, $survey_id)
+		return $shared_question_id;
+	}
+
+	/**
+	 * This functions moves a question of a survey up or down
+	 *
+	 * @param string $direction
+	 * @param integer $survey_question_id
+	 * @param integer $survey_id
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+    public static function move_survey_question($direction, $survey_question_id, $survey_id)
     {
-        // Table definition
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-
-        $course_id = api_get_course_int_id();
+		// Table definition
+		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$course_id = api_get_course_int_id();
 
-        if ($direction == 'moveup') {
-            $sort = 'DESC';
-        }
-        if ($direction == 'movedown') {
-            $sort = 'ASC';
-        }
-
-        // Finding the two questions that needs to be swapped
-        $sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $survey_id
-        )."' ORDER BY sort $sort";
-        $result = Database::query($sql);
-        $found = false;
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            if ($found) {
-                $question_id_two = $row['question_id'];
-                $question_sort_two = $row['sort'];
-                $found = false;
-            }
-            if ($row['question_id'] == $survey_question_id) {
-                $found = true;
-                $question_id_one = $row['question_id'];
-                $question_sort_one = $row['sort'];
-            }
-        }
+		if ($direction == 'moveup') {
+			$sort = 'DESC';
+		}
+		if ($direction == 'movedown') {
+			$sort = 'ASC';
+		}
 
-        $sql1 = "UPDATE $table_survey_question SET sort = '".Database::escape_string(
-            $question_sort_two
-        )."' WHERE c_id = $course_id AND  question_id='".Database::escape_string($question_id_one)."'";
-        $result = Database::query($sql1);
-        $sql2 = "UPDATE $table_survey_question SET sort = '".Database::escape_string(
-            $question_sort_one
-        )."' WHERE c_id = $course_id AND question_id='".Database::escape_string($question_id_two)."'";
-        $result = Database::query($sql2);
-    }
+		// Finding the two questions that needs to be swapped
+		$sql = "SELECT * FROM $table_survey_question
+		        WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."'
+		        ORDER BY sort $sort";
+		$result = Database::query($sql);
+		$found = false;
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			if ($found) {
+				$question_id_two = $row['question_id'];
+				$question_sort_two = $row['sort'];
+				$found = false;
+			}
+			if ($row['question_id'] == $survey_question_id) {
+				$found = true;
+				$question_id_one = $row['question_id'];
+				$question_sort_one = $row['sort'];
+			}
+		}
 
-    /**
-     * This function deletes all the questions of a given survey
-     * This function is normally only called when a survey is deleted
-     *
-     * @param $survey_id the id of the survey that has to be deleted
-     * @return true
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function delete_all_survey_questions($survey_id, $shared = false)
+		$sql1 = "UPDATE $table_survey_question SET sort = '".Database::escape_string($question_sort_two)."'
+		        WHERE c_id = $course_id AND  question_id='".Database::escape_string($question_id_one)."'";
+		Database::query($sql1);
+		$sql2 = "UPDATE $table_survey_question SET sort = '".Database::escape_string($question_sort_one)."'
+		        WHERE c_id = $course_id AND question_id='".Database::escape_string($question_id_two)."'";
+		Database::query($sql2);
+	}
+
+	/**
+	 * This function deletes all the questions of a given survey
+	 * This function is normally only called when a survey is deleted
+	 *
+	 * @param int $survey_id the id of the survey that has to be deleted
+	 * @return true
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+    public static function delete_all_survey_questions($survey_id, $shared = false)
     {
-        $course_id = api_get_course_int_id();
+	    $course_id = api_get_course_int_id();
 
-        // Table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		// Table definitions
+		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
         $course_condition = " c_id = $course_id AND ";
-        if ($shared) {
-            $course_condition = "";
-            $table_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
-        }
-
-        $sql = "DELETE FROM $table_survey_question WHERE $course_condition survey_id='".Database::escape_string(
-            $survey_id
-        )."'";
-
-        // Deleting the survey questions
-
-        Database::query($sql);
-
-        // Deleting all the options of the questions of the survey
-        self::delete_all_survey_questions_options($survey_id, $shared);
-
-        // Deleting all the answers on this survey
-        self::delete_all_survey_answers($survey_id);
-    }
+		if ($shared) {
+		    $course_condition = "";
+			$table_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+		}
 
-    /**
-     * This function deletes a survey question and all its options
-     *
-     * @param integer $survey_id the id of the survey
-     * @param integer $question_id the id of the question
-     * @param integer $shared
-     *
-     * @todo also delete the answers to this question
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version March 2007
-     */
-    static function delete_survey_question($survey_id, $question_id, $shared = false)
+		$sql = "DELETE FROM $table_survey_question
+		        WHERE $course_condition survey_id='".Database::escape_string($survey_id)."'";
+
+		// Deleting the survey questions
+
+		Database::query($sql);
+
+		// Deleting all the options of the questions of the survey
+		survey_manager::delete_all_survey_questions_options($survey_id, $shared);
+
+		// Deleting all the answers on this survey
+		survey_manager::delete_all_survey_answers($survey_id);
+	}
+
+	/**
+	 * This function deletes a survey question and all its options
+	 *
+	 * @param integer $survey_id the id of the survey
+	 * @param integer $question_id the id of the question
+	 * @param integer $shared
+	 *
+	 * @todo also delete the answers to this question
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version March 2007
+	 */
+    public static function delete_survey_question($survey_id, $question_id, $shared = false)
     {
         $course_id = api_get_course_int_id();
-        // Table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        if ($shared) {
-            self::delete_shared_survey_question($survey_id, $question_id);
-        }
-
-        // Deleting the survey questions
-        $sql = "DELETE FROM $table_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $survey_id
-        )."' AND question_id='".Database::escape_string($question_id)."'";
-        $res = Database::query($sql);
-
-        // Deleting the options of the question of the survey
-        self::delete_survey_question_option($survey_id, $question_id, $shared);
-    }
+		// Table definitions
+		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		if ($shared) {
+			survey_manager::delete_shared_survey_question($survey_id, $question_id);
+		}
 
-    /**
-     * This function deletes a shared survey question from the main database and all its options
-     *
-     * @param integer $question_id the id of the question
-     * @param integer $shared
-     *
-     * @todo delete all the options of this question
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version March 2007
-     */
-    static function delete_shared_survey_question($survey_id, $question_id)
+		// Deleting the survey questions
+		$sql = "DELETE FROM $table_survey_question
+		        WHERE
+		            c_id = $course_id AND
+		            survey_id='".Database::escape_string($survey_id)."' AND
+		            question_id='".Database::escape_string($question_id)."'";
+		Database::query($sql);
+
+		// Deleting the options of the question of the survey
+		survey_manager::delete_survey_question_option($survey_id, $question_id, $shared);
+	}
+
+	/**
+	 * This function deletes a shared survey question from the main database and all its options
+	 *
+	 * @param int $question_id the id of the question
+	 * @param int $shared
+	 *
+	 * @todo delete all the options of this question
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version March 2007
+	 */
+    public static function delete_shared_survey_question($survey_id, $question_id)
     {
-        // Table definitions
-        $table_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
-
-        // First we have to get the shared_question_id
-        $question_data = survey_manager::get_question($question_id);
-
-        // Deleting the survey questions
-        $sql = "DELETE FROM $table_survey_question WHERE question_id='".Database::escape_string(
-            $question_data['shared_question_id']
-        )."'";
-        $res = Database::query($sql);
-
-        // Deleting the options of the question of the survey question
-        $sql = "DELETE FROM $table_survey_question_option WHERE question_id='".Database::escape_string(
-            $question_data['shared_question_id']
-        )."'";
-        $res = Database::query($sql);
-    }
-
-    /**
-     * SURVEY QUESTION OPTIONS FUNCTIONS
-     */
-
-    /**
-     * This function stores the options of the questions in the table
-     *
-     * @param array $form_content
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @todo writing the update statement when editing a question
-     */
-    static function save_question_options($form_content, $survey_data)
+		// Table definitions
+		$table_survey_question 	      = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+		$table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
+
+		// First we have to get the shared_question_id
+		$question_data = survey_manager::get_question($question_id);
+
+		// Deleting the survey questions
+		$sql = "DELETE FROM $table_survey_question WHERE question_id='".Database::escape_string($question_data['shared_question_id'])."'";
+		Database::query($sql);
+
+		// Deleting the options of the question of the survey question
+		$sql = "DELETE FROM $table_survey_question_option WHERE question_id='".Database::escape_string($question_data['shared_question_id'])."'";
+		Database::query($sql);
+	}
+
+	/**
+	 * SURVEY QUESTION OPTIONS FUNCTIONS
+	 */
+
+	/**
+	 * This function stores the options of the questions in the table
+	 *
+	 * @param array $form_content
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @todo writing the update statement when editing a question
+	 */
+    public function save_question_options($form_content, $survey_data)
     {
-        $course_id = api_get_course_int_id();
-        // A percentage question type has options 1 -> 100
-        if ($form_content['type'] == 'percentage') {
-            for ($i = 1; $i < 101; $i++) {
-                $form_content['answers'][] = $i;
-            }
-        }
-
-        if (is_numeric($survey_data['survey_share']) && $survey_data['survey_share'] != 0) {
-            self::save_shared_question_options($form_content, $survey_data);
-        }
+	    $course_id = api_get_course_int_id();
+		// A percentage question type has options 1 -> 100
+		if ($form_content['type'] == 'percentage') {
+			for($i = 1; $i < 101; $i++) {
+				$form_content['answers'][] = $i;
+			}
+		}
 
-        // Table defintion
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		if (is_numeric($survey_data['survey_share']) && $survey_data['survey_share'] != 0) {
+			survey_manager::save_shared_question_options($form_content, $survey_data);
+		}
 
-        // We are editing a question so we first have to remove all the existing options from the database
-        if (is_numeric($form_content['question_id'])) {
-            $sql = "DELETE FROM $table_survey_question_option WHERE c_id = $course_id AND question_id = '".Database::escape_string(
-                $form_content['question_id']
-            )."'";
-            $result = Database::query($sql);
-        }
+		// Table definition
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
-        $counter = 1;
-        if (is_array($form_content['answers'])) {
-            //foreach ($form_content['answers'] as $key => $answer) {
-            for ($i = 0; $i < count($form_content['answers']); $i++) {
-                $sql = "INSERT INTO $table_survey_question_option (c_id, question_id, survey_id, option_text, value,sort) VALUES (
-								$course_id,
-								'".Database::escape_string($form_content['question_id'])."',
-								'".Database::escape_string($form_content['survey_id'])."',
-								'".Database::escape_string($form_content['answers'][$i])."',
-								'".Database::escape_string($form_content['values'][$i])."',
-								'".Database::escape_string($counter)."')";
-                $result = Database::query($sql);
-                $counter++;
-            }
-        }
-    }
+		// We are editing a question so we first have to remove all the existing options from the database
+		if (is_numeric($form_content['question_id'])) {
+			$sql = "DELETE FROM $table_survey_question_option
+			        WHERE c_id = $course_id AND question_id = '".Database::escape_string($form_content['question_id'])."'";
+			Database::query($sql);
+		}
 
-    /**
-     * This function stores the options of the questions in the shared table
-     *
-     * @param array $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     *
-     * @todo writing the update statement when editing a question
-     */
-    function save_shared_question_options($form_content, $survey_data)
+		$counter = 1;
+		if (is_array($form_content['answers'])) {
+			//foreach ($form_content['answers'] as $key => $answer) {
+			for ($i = 0; $i < count($form_content['answers']); $i++) {
+				$sql = "INSERT INTO $table_survey_question_option (c_id, question_id, survey_id, option_text, value,sort) VALUES (
+                            $course_id,
+                            '".Database::escape_string($form_content['question_id'])."',
+                            '".Database::escape_string($form_content['survey_id'])."',
+                            '".Database::escape_string($form_content['answers'][$i])."',
+                            '".Database::escape_string($form_content['values'][$i])."',
+                            '".Database::escape_string($counter)."')";
+				Database::query($sql);
+				$counter++;
+			}
+		}
+	}
+
+	/**
+	 * This function stores the options of the questions in the shared table
+	 *
+	 * @param array $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 *
+	 * @todo writing the update statement when editing a question
+	 */
+    public function save_shared_question_options($form_content, $survey_data)
     {
-        if (is_array($form_content) && is_array($form_content['answers'])) {
-            // Table defintion
-            $table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
-
-            // We are editing a question so we first have to remove all the existing options from the database
-            $sql = "DELETE FROM $table_survey_question_option WHERE question_id = '".Database::escape_string(
-                $form_content['shared_question_id']
-            )."'";
-            $result = Database::query($sql);
-
-            $counter = 1;
-
-            foreach ($form_content['answers'] as $key => & $answer) {
-                $sql = "INSERT INTO $table_survey_question_option (question_id, survey_id, option_text, sort) VALUES (
-								'".Database::escape_string($form_content['shared_question_id'])."',
-								'".Database::escape_string($survey_data['is_shared'])."',
-								'".Database::escape_string($answer)."',
-								'".Database::escape_string($counter)."')";
-                $result = Database::query($sql);
-                $counter++;
-            }
-        }
-    }
-
-    /*
-      if (is_numeric($survey_data['survey_share']) AND $survey_data['survey_share'] != 0) {
-      $form_content = self::save_shared_question($form_content, $survey_data);
-      }
-     */
-
-    /**
-     * This function deletes all the options of the questions of a given survey
-     * This function is normally only called when a survey is deleted
-     *
-     * @param $survey_id the id of the survey that has to be deleted
-     * @return true
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function delete_all_survey_questions_options($survey_id, $shared = false)
+		if (is_array($form_content) && is_array($form_content['answers'])) {
+			// Table defintion
+			$table_survey_question_option 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
+
+			// We are editing a question so we first have to remove all the existing options from the database
+			$sql = "DELETE FROM $table_survey_question_option WHERE question_id = '".Database::escape_string($form_content['shared_question_id'])."'";
+			Database::query($sql);
+
+			$counter = 1;
+			foreach ($form_content['answers'] as & $answer) {
+				$sql = "INSERT INTO $table_survey_question_option (question_id, survey_id, option_text, sort) VALUES (
+                            '".Database::escape_string($form_content['shared_question_id'])."',
+                            '".Database::escape_string($survey_data['is_shared'])."',
+                            '".Database::escape_string($answer)."',
+                            '".Database::escape_string($counter)."')";
+				Database::query($sql);
+				$counter++;
+			}
+		}
+	}
+
+	/**
+	 * This function deletes all the options of the questions of a given survey
+	 * This function is normally only called when a survey is deleted
+	 *
+	 * @param $survey_id the id of the survey that has to be deleted
+	 * @return true
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function delete_all_survey_questions_options($survey_id, $shared = false)
     {
 
-        // Table definitions
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		// Table definitions
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
         $course_id = api_get_course_int_id();
         $course_condition = " c_id = $course_id AND ";
-        if ($shared) {
-            $course_condition = "";
-            $table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
-        }
-
-        $sql = "DELETE FROM $table_survey_question_option WHERE $course_condition survey_id='".Database::escape_string(
-            $survey_id
-        )."'";
-
-        // Deleting the options of the survey questions
-
-        $res = Database::query($sql);
-
-        return true;
-    }
+		if ($shared) {
+		    $course_condition = "";
+			$table_survey_question_option 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
+		}
 
-    /**
-     * This function deletes the options of a given question
-     *
-     * @param unknown_type $survey_id
-     * @param unknown_type $question_id
-     * @param unknown_type $shared
-     * @return unknown
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version March 2007
-     */
-    static function delete_survey_question_option($survey_id, $question_id, $shared = false)
+        $sql = "DELETE FROM $table_survey_question_option
+                WHERE $course_condition survey_id='".Database::escape_string($survey_id)."'";
+
+		// Deleting the options of the survey questions
+		Database::query($sql);
+		return true;
+	}
+
+	/**
+	 * This function deletes the options of a given question
+	 *
+	 * @param int $survey_id
+	 * @param int $question_id
+	 * @param int $shared
+	 * @return bool
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+     * @author Julio Montoya
+	 * @version March 2007
+	 */
+    public static function delete_survey_question_option($survey_id, $question_id, $shared = false)
     {
-        $course_id = api_get_course_int_id();
+	    $course_id = api_get_course_int_id();
         $course_condition = " c_id = $course_id AND ";
 
-        // Table definitions
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        if ($shared) {
-            $course_condition = "";
-            $table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
-        }
-
-        // Deleting the options of the survey questions
-        $sql = "DELETE from $table_survey_question_option WHERE $course_condition survey_id='".Database::escape_string(
-            $survey_id
-        )."' AND question_id='".Database::escape_string($question_id)."'";
-        Database::query($sql);
-
-        return true;
-    }
-
-    /**
-     * SURVEY ANSWERS FUNCTIONS
-     */
+		// Table definitions
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		if ($shared) {
+		    $course_condition = "";
+			$table_survey_question_option 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
+		}
 
-    /**
-     * This function deletes all the answers anyone has given on this survey
-     * This function is normally only called when a survey is deleted
-     *
-     * @param $survey_id the id of the survey that has to be deleted
-     * @return true
-     *
-     * @todo write the function
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007,december 2008
-     */
-    static function delete_all_survey_answers($survey_id)
+		// Deleting the options of the survey questions
+		$sql = "DELETE from $table_survey_question_option
+		        WHERE
+		            $course_condition survey_id='".Database::escape_string($survey_id)."' AND
+		            question_id='".Database::escape_string($question_id)."'";
+		Database::query($sql);
+		return true;
+	}
+
+	/**
+	 * SURVEY ANSWERS FUNCTIONS
+	 */
+
+	/**
+	 * This function deletes all the answers anyone has given on this survey
+	 * This function is normally only called when a survey is deleted
+	 *
+	 * @param $survey_id the id of the survey that has to be deleted
+	 * @return true
+	 *
+	 * @todo write the function
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007,december 2008
+	 */
+    public static function delete_all_survey_answers($survey_id)
     {
         $course_id = api_get_course_int_id();
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $survey_id = intval($survey_id);
-        Database::query("DELETE FROM $table_survey_answer WHERE c_id = $course_id AND survey_id=$survey_id");
-
-        return true;
-    }
-
-    static function is_user_filled_survey($user_id, $survey_id, $course_id)
-    {
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-
-        $user_id = intval($user_id);
-        $course_id = intval($course_id);
-        $survey_id = intval($survey_id);
-
-        $sql = "SELECT DISTINCT user FROM $table_survey_answer
-			        WHERE	c_id		= $course_id AND
-							user		= $user_id AND
-							survey_id	= $survey_id";
-        $result = Database::query($sql);
-        if (Database::num_rows($result)) {
-            return true;
-        }
-
-        return false;
-    }
+		$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$survey_id = intval($survey_id);
+		Database::query("DELETE FROM $table_survey_answer WHERE c_id = $course_id AND survey_id=$survey_id");
+		return true;
+	}
 
     /**
-     * This function gets all the persons who have filled the survey
-     *
-     * @param integer $survey_id
-     * @return array
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
+     * @param int $user_id
+     * @param int $survey_id
+     * @param int $course_id
+     * @return bool
      */
-    static function get_people_who_filled_survey($survey_id, $all_user_info = false, $course_id = null)
+    public static function is_user_filled_survey($user_id, $survey_id, $course_id)
     {
+		$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
 
-        // Database table definition
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
+		$user_id	= intval($user_id);
+		$course_id	= intval($course_id);
+		$survey_id	= intval($survey_id);
 
-        // Variable initialisation
-        $return = array();
+		$sql = "SELECT DISTINCT user FROM $table_survey_answer
+                WHERE
+                    c_id		= $course_id AND
+                    user		= $user_id AND
+                    survey_id	= $survey_id";
+        $result = Database::query($sql);
+		if (Database::num_rows($result)) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * This function gets all the persons who have filled the survey
+	 *
+	 * @param integer $survey_id
+	 * @return array
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function get_people_who_filled_survey($survey_id, $all_user_info = false, $course_id = null)
+    {
+		// Database table definition
+		$table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$table_user					= Database :: get_main_table(TABLE_MAIN_USER);
 
-        // Getting the survey information
-        $survey_data = self::get_survey($survey_id);
+		// Variable initialisation
+		$return = array();
 
-        if (empty($course_id)) {
-            $course_id = api_get_course_int_id();
+		if (empty($course_id)) {
+            $course_id  = api_get_course_int_id();
         } else {
             $course_id = intval($course_id);
         }
 
-        if ($all_user_info) {
-            $order_clause = api_sort_by_first_name(
-            ) ? ' ORDER BY user.firstname, user.lastname' : ' ORDER BY user.lastname, user.firstname';
-            $sql = "SELECT DISTINCT answered_user.user as invited_user, user.firstname, user.lastname, user.user_id
-						FROM $table_survey_answer answered_user
-						LEFT JOIN $table_user as user ON answered_user.user = user.user_id
-						WHERE 	answered_user.c_id = $course_id AND
-								survey_id= '".Database::escape_string($survey_data['survey_id'])."' ".
-                $order_clause;
-        } else {
-            $sql = "SELECT DISTINCT user FROM $table_survey_answer
-			        WHERE c_id = $course_id AND survey_id= '".Database::escape_string(
-                $survey_data['survey_id']
-            )."' AND user <> '' ";
-        }
-
-        $res = Database::query($sql);
-        while ($row = Database::fetch_array($res, 'ASSOC')) {
-            if ($all_user_info) {
-                $return[] = $row;
-            } else {
-                $return[] = $row['user'];
-            }
-        }
+		if ($all_user_info) {
+			$order_clause = api_sort_by_first_name() ? ' ORDER BY user.firstname, user.lastname' : ' ORDER BY user.lastname, user.firstname';
+			$sql = "SELECT DISTINCT
+			            answered_user.user as invited_user, user.firstname, user.lastname, user.user_id
+                    FROM $table_survey_answer answered_user
+                    LEFT JOIN $table_user as user ON answered_user.user = user.user_id
+                    WHERE
+                        answered_user.c_id = $course_id AND
+                        survey_id= '".Database::escape_string($survey_id)."' ".
+                    $order_clause;
+		} else {
+			$sql = "SELECT DISTINCT user FROM $table_survey_answer
+			        WHERE c_id = $course_id AND survey_id= '".Database::escape_string($survey_id)."'  ";
+		}
 
-        return $return;
-    }
+		$res = Database::query($sql);
+		while ($row = Database::fetch_array($res, 'ASSOC')) {
+			if ($all_user_info) {
+				$return[] = $row;
+			} else {
+				$return[] = $row['user'];
+			}
+		}
+		return $return;
+	}
 
     static function survey_generation_hash_available()
     {
         if (extension_loaded('mcrypt')) {
             return true;
         }
-
         return false;
     }
 
     static function generate_survey_hash($survey_id, $course_id, $session_id, $group_id)
     {
         $hash = hash('sha512', api_get_security_key().'_'.$course_id.'_'.$session_id.'_'.$group_id.'_'.$survey_id);
-
         return $hash;
     }
 
@@ -1514,391 +1368,353 @@ class survey_manager
         if ($survey_generated_hash == $hash) {
             return true;
         }
-
         return false;
     }
 
     static function generate_survey_link($survey_id, $course_id, $session_id, $group_id)
     {
         $code = self::generate_survey_hash($survey_id, $course_id, $session_id, $group_id);
-
-        return api_get_path(WEB_CODE_PATH).'survey/link.php?h='.$code.'&i='.$survey_id.'&c='.intval(
-            $course_id
-        ).'&s='.intval($session_id).'&g='.$group_id;
+        return api_get_path(WEB_CODE_PATH).'survey/link.php?h='.$code.'&i='.$survey_id.'&c='.intval($course_id).'&s='.intval($session_id).'&g='.$group_id;
     }
-
 }
 
+
 class survey_question
 {
-    // The html code of the form
-    public $html;
 
-    /**
-     * This function does the generic part of any survey question: the question field
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @todo the form_text has to become a wysiwyg editor or adding a question_comment field
-     * @todo consider adding a question_comment form element
-     */
-    function create_form($form_content)
+	// The html code of the form
+	public $html;
+
+	/**
+	 * This function does the generic part of any survey question: the question field
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @todo the form_text has to become a wysiwyg editor or adding a question_comment field
+	 * @todo consider adding a question_comment form element
+	 */
+	function create_form($survey_data, $form_content)
     {
-        global $survey_data;
-        $tool_name = Display::return_icon(
+        $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : null;
+        $questionId = isset($_GET['question_id']) ? Security::remove_XSS($_GET['question_id']) : null;
+		$tool_name = Display::return_icon(
             survey_manager::icon_question(Security::remove_XSS($_GET['type'])),
             get_lang(ucfirst(Security::remove_XSS($_GET['type']))),
             array('align' => 'middle', 'height' => '22px')
         ).' ';
-        if ($_GET['action'] == 'add') {
-            $tool_name .= get_lang('AddQuestion');
-        }
-        if ($_GET['action'] == 'edit') {
-            $tool_name .= get_lang('EditQuestion');
-        }
-
-        if ($_GET['type'] == 'yesno') {
-            $tool_name .= ': '.get_lang('YesNo');
-        } else {
-            if ($_GET['type'] == 'multiplechoice') {
-                $tool_name .= ': '.get_lang('UniqueSelect');
-            } else {
-                $tool_name .= ': '.get_lang(api_ucfirst(Security::remove_XSS($_GET['type'])));
-            }
-        }
-
-        $question_id = isset($_GET['question_id']) ? Security::remove_XSS($_GET['question_id']) : null;
-
-        $this->html .= '<form class="form-horizontal" id="question_form" name="question_form" method="post" action="'.api_get_self(
-        ).'?action='.Security::remove_XSS($_GET['action']).'&type='.Security::remove_XSS(
-            $_GET['type']
-        ).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&question_id='.$question_id.'">';
-        $this->html .= '<legend>'.$tool_name.'</legend>';
-        $this->html .= '		<input type="hidden" name="survey_id" id="survey_id" value="'.Security::remove_XSS(
-            $_GET['survey_id']
-        ).'"/>';
-        $this->html .= '		<input type="hidden" name="question_id" id="question_id" value="'.$question_id.'"/>';
-        $this->html .= '		<input type="hidden" name="shared_question_id" id="shared_question_id" value="'.Security::remove_XSS(
-            $form_content['shared_question_id']
-        ).'"/>';
-        $this->html .= '		<input type="hidden" name="type" id="type" value="'.Security::remove_XSS(
-            $_GET['type']
-        ).'"/>';
-
-        // question field
-        $this->html .= '	<div class="control-group">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= '			<span class="form_required">*</span> '.get_lang('Question');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="controls">';
-        $this->html .= api_return_html_area(
-            'question',
-            Security::remove_XSS($form_content['question'], STUDENT),
-            '',
-            '',
-            null,
-            array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')
-        );
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-
-        if ($survey_data['survey_type'] == 1) {
-            $table_survey_question_group = Database::get_course_table(TABLE_SURVEY_QUESTION_GROUP);
-            $sql = 'SELECT id,name FROM '.$table_survey_question_group.' WHERE survey_id = '.(int)$_GET['survey_id'].' ORDER BY name';
-            $rs = Database::query($sql);
-            $glist = null;
-            while ($row = Database::fetch_array($rs, 'NUM')) {
-                $glist .= '<option value="'.$row[0].'" >'.$row[1].'</option>';
-            }
 
-            $grouplist = $grouplist1 = $grouplist2 = $glist;
-
-            if (!empty($form_content['assigned'])) {
-                $grouplist = str_replace(
-                    '<option value="'.$form_content['assigned'].'"',
-                    '<option value="'.$form_content['assigned'].'" selected',
-                    $glist
-                );
-            }
+		if ($action == 'add') {
+			$tool_name .= get_lang('AddQuestion');
+		}
+		if ($action == 'edit') {
+			$tool_name .= get_lang('EditQuestion');
+		}
 
-            if (!empty($form_content['assigned1'])) {
-                $grouplist1 = str_replace(
-                    '<option value="'.$form_content['assigned1'].'"',
-                    '<option value="'.$form_content['assigned1'].'" selected',
-                    $glist
-                );
-            }
+		if ($_GET['type'] == 'yesno') {
+			$tool_name .= ': '.get_lang('YesNo');
+		} else if ($_GET['type'] == 'multiplechoice') {
+			$tool_name .= ': '.get_lang('UniqueSelect');
+		} else {
+			$tool_name .= ': '.get_lang(api_ucfirst(Security::remove_XSS($_GET['type'])));
+		}
 
-            if (!empty($form_content['assigned2'])) {
-                $grouplist2 = str_replace(
-                    '<option value="'.$form_content['assigned2'].'"',
-                    '<option value="'.$form_content['assigned2'].'" selected',
-                    $glist
-                );
-            }
+        $url = api_get_self().'?action='.$action.'&type='.Security::remove_XSS($_GET['type']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&question_id='.$questionId;
 
-            $this->html .= '	<tr><td colspan="">
+		$this->html .= '<form class="form-horizontal" id="question_form" name="question_form" method="post" action="'.$url.'">';
+        $this->html .= '<legend>'.$tool_name.'</legend>';
+		$this->html .= '		<input type="hidden" name="survey_id" id="survey_id" value="'.Security::remove_XSS($_GET['survey_id']).'"/>';
+		$this->html .= '		<input type="hidden" name="question_id" id="question_id" value="'.$questionId.'"/>';
+		$this->html .= '		<input type="hidden" name="shared_question_id" id="shared_question_id" value="'.Security::remove_XSS($form_content['shared_question_id']).'"/>';
+		$this->html .= '		<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_GET['type']).'"/>';
+
+		// question field
+		$this->html .= '	<div class="control-group">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= '			<span class="form_required">*</span> '.get_lang('Question');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="controls">';
+		$this->html .= api_return_html_area('question', Security::remove_XSS(stripslashes($form_content['question']), STUDENT), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120'));
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		if ($survey_data['survey_type'] == 1) {
+			$table_survey_question_group = Database::get_course_table(TABLE_SURVEY_QUESTION_GROUP);
+			$sql = 'SELECT id,name FROM '.$table_survey_question_group.' WHERE survey_id = '.(int)$_GET['survey_id'].' ORDER BY name';
+			$rs = Database::query($sql);
+
+			while ($row = Database::fetch_array($rs, 'NUM')) {
+				$glist .= '<option value="'.$row[0].'" >'.$row[1].'</option>';
+			}
+
+			$grouplist = $grouplist1 = $grouplist2 = $glist;
+
+			if (!empty($form_content['assigned'])) {
+				$grouplist = str_replace('<option value="'.$form_content['assigned'].'"','<option value="'.$form_content['assigned'].'" selected',$glist);
+			}
+
+			if (!empty($form_content['assigned1'])) {
+				$grouplist1 = str_replace('<option value="'.$form_content['assigned1'].'"','<option value="'.$form_content['assigned1'].'" selected',$glist);
+			}
+
+			if (!empty($form_content['assigned2'])) {
+				$grouplist2 = str_replace('<option value="'.$form_content['assigned2'].'"','<option value="'.$form_content['assigned2'].'" selected',$glist);
+			}
+
+			$this->html .= '	<tr><td colspan="">
 			<fieldset style="border:1px solid black"><legend>'.get_lang('Condition').'</legend>
 
 			<b>'.get_lang('Primary').'</b><br />
 			'.'<input type="radio" name="choose" value="1" '.(($form_content['choose'] == 1) ? 'checked' : '').
-                '><select name="assigned">'.$grouplist.'</select><br />';
+			'><select name="assigned">'.$grouplist.'</select><br />';
 
-            $this->html .= '
+			$this->html .= '
 			<b>'.get_lang('Secondary').'</b><br />
-			'.'<input type="radio" name="choose" value="2" '.(($form_content['choose'] == 2) ? 'checked' : '').
-                '><select name="assigned1">'.$grouplist1.'</select> '.
-                '<select name="assigned2">'.$grouplist2.'</select>'
-                .'</fieldset><br />';
-        }
+			'.'<input type="radio" name="choose" value="2" '.(($form_content['choose']==2)?'checked':'').
+			'><select name="assigned1">'.$grouplist1.'</select> '.
+			'<select name="assigned2">'.$grouplist2.'</select>'
+			.'</fieldset><br />';
+		}
 
-        return $this->html;
-    }
+		return $this->html;
+	}
+
+	/**
+	 * This functions displays the form after the html variable has correctly been finished
+	 * (adding a submit button, closing the table and closing the form)
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 */
+	function render_form()
+    {
+		if (isset($_GET['question_id']) and !empty($_GET['question_id'])) {
+			$class = 'save';
+			$text = get_lang('ModifyQuestionSurvey');
+		} else {
+			$class = 'add';
+			$text = get_lang('CreateQuestionSurvey');
+		}
 
-    /**
-     * This functions displays the form after the html variable has correctly been finished
-     * (adding a submit button, closing the table and closing the form)
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     */
-    function render_form()
+		if ($_GET['type'] == 'yesno' || $_GET['type'] == 'open'|| $_GET['type'] == 'percentage' || $_GET['type'] == 'comment' || $_GET['type'] == 'pagebreak') {
+			$this->html .= '	<div class="control-group">';
+			$this->html .= '		<div class="controls">';
+		}
+		$this->html .= '			<button class="'.$class.'"type="submit" name="save_question">'.$text.'</button>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		//$this->html .= '	</table>';
+
+		$this->html .= '</form>';
+		echo $this->html;
+	}
+
+	/**
+	 * This function handles the actions on a question and its answers
+	 *
+	 * @todo consider using $form_content instead of $_POST
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function handle_action($survey_data, $form_content)
     {
-        if (isset($_GET['question_id']) and !empty($_GET['question_id'])) {
-            $class = 'save';
-            $text = get_lang('ModifyQuestionSurvey');
-        } else {
-            $class = 'add';
-            $text = get_lang('CreateQuestionSurvey');
-        }
+	    $course_id = api_get_course_int_id();
+		global $config;
+
+		// Moving an answer up
+		if ($_POST['move_up']) {
+			foreach ($_POST['move_up'] as $key => & $value) {
+				$id1		= $key;
+				$content1 	= $form_content['answers'][$id1];
+				$id2		= $key - 1;
+				$content2	= $form_content['answers'][$id2];
+				$form_content['answers'][$id1] = $content2;
+				$form_content['answers'][$id2] = $content1;
+			}
+		}
 
-        if ($_GET['type'] == 'yesno' || $_GET['type'] == 'open' || $_GET['type'] == 'percentage' || $_GET['type'] == 'comment' || $_GET['type'] == 'pagebreak') {
-            $this->html .= '	<div class="control-group">';
-            $this->html .= '		<div class="controls">';
-        }
-        $this->html .= '			<button class="'.$class.'"type="submit" name="save_question">'.$text.'</button>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
+		// Moving an answer down
+		if ($_POST['move_down']) {
+			foreach ($_POST['move_down'] as $key => & $value) {
+				$id1		= $key;
+				$content1 	= $form_content['answers'][$id1];
+				$id2		= $key + 1;
+				$content2	= $form_content['answers'][$id2];
+				$form_content['answers'][$id1] = $content2;
+				$form_content['answers'][$id2] = $content1;
+			}
+		}
 
-        //$this->html .= '	</table>';
+		// Adding an answer
+		if (isset($_POST['add_answer'])) {
+			$form_content['answers'][] = '';
+		}
 
-        $this->html .= '</form>';
-        echo $this->html;
-    }
+		// Removing an answer
+		if (isset($_POST['remove_answer'])) {
+			$max_answer = count($form_content['answers']);
+			unset($form_content['answers'][$max_answer - 1]);
+		}
 
-    /**
-     * This function handles the actions on a question and its answers
-     *
-     * @todo consider using $form_content instead of $_POST
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function handle_action($form_content)
-    {
-        $course_id = api_get_course_int_id();
-        global $config;
-
-        // Moving an answer up
-        if ($_POST['move_up']) {
-            foreach ($_POST['move_up'] as $key => & $value) {
-                $id1 = $key;
-                $content1 = $form_content['answers'][$id1];
-                $id2 = $key - 1;
-                $content2 = $form_content['answers'][$id2];
-                $form_content['answers'][$id1] = $content2;
-                $form_content['answers'][$id2] = $content1;
-            }
-        }
+		// Saving a question
+		if (isset($_POST['save_question'])) {
+			$message = survey_manager::save_question(
+                $survey_data,
+                $form_content
+            );
 
-        // Moving an answer down
-        if ($_POST['move_down']) {
-            foreach ($_POST['move_down'] as $key => & $value) {
-                $id1 = $key;
-                $content1 = $form_content['answers'][$id1];
-                $id2 = $key + 1;
-                $content2 = $form_content['answers'][$id2];
-                $form_content['answers'][$id1] = $content2;
-                $form_content['answers'][$id2] = $content1;
-            }
-        }
+			if ($message == 'QuestionAdded' || $message == 'QuestionUpdated' ) {
+				$sql='SELECT COUNT(*) FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION).' WHERE c_id = '.$course_id.' AND survey_id = '.intval($_GET['survey_id']);
+				$res = Database :: fetch_array (Database::query($sql));
 
-        // Adding an answer
-        if (isset($_POST['add_answer'])) {
-            $form_content['answers'][] = '';
-        }
+				if ($config['survey']['debug']) {
+					Display :: display_header();
+					Display :: display_confirmation_message($message.'<br />'.get_lang('ReturnTo').' <a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.intval($_GET['survey_id']).'">'.get_lang('Survey').'</a>', false);
+				} else {
+					header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.intval($_GET['survey_id']).'&message='.$message);
+                    exit;
+				}
+			} else {
+				if ($message == 'PleaseEnterAQuestion' || $message == 'PleasFillAllAnswer'|| $message == 'PleaseChooseACondition'|| $message == 'ChooseDifferentCategories') {
+					$_SESSION['temp_user_message'] = $form_content['question'];
+					$_SESSION['temp_horizontalvertical'] = $form_content['horizontalvertical'];
+					$_SESSION['temp_sys_message'] = $message;
+					$_SESSION['temp_answers'] = $form_content['answers'];
+					$_SESSION['temp_values'] = $form_content['values'];
+					header('location: '.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&question_id='.intval($_GET['question_id']).'&survey_id='.intval($_GET['survey_id']).'&action='.Security::remove_XSS($_GET['action']).'&type='.Security::remove_XSS($_GET['type']).'');
+                    exit;
+				}
+			}
+		}
 
-        // Removing an answer
-        if (isset($_POST['remove_answer'])) {
-            $max_answer = count($form_content['answers']);
-            unset($form_content['answers'][$max_answer - 1]);
-        }
+		/**
+		 * This solution is a little bit strange but I could not find a different solution.
+		 */
+		if ($_POST['delete_answer']) {
+			foreach ($_POST['delete_answer'] as $key => & $value) {
+				unset($form_content['answers'][$key]);
+				$deleted = $key;
+			}
+			foreach ($form_content['answers'] as $key => & $value) {
+				if ($key > $deleted) {
+					$form_content['answers'][$key - 1] = $form_content['answers'][$key];
+					unset($form_content['answers'][$key]);
+				}
+			}
+		}
+		return $form_content;
+	}
+
+	/**
+	 * This functions adds two buttons. One to add an option, one to remove an option
+	 *
+	 * @param string $form_content
+	 * @return string code
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+     * @author Julio Montoya - 2013
+	 * @version January 2007
+	 */
+	function add_remove_buttons($form_content)
+    {
+		if (count($form_content['answers']) <= 2) {
+			$remove_answer_attribute = 'disabled="disabled"';
+		}
 
-        // Saving a question
-        if (isset($_POST['save_question'])) {
-            $message = survey_manager::save_question($form_content);
+		$return = '	<div class="row">';
+		$return .= '		<div class="formw">';
+		$return .= '		<input type="hidden" name="is_executable" id="is_executable" value="-" />';
+		$return .= '			<button class="minus" type="submit" name="remove_answer" "'.$remove_answer_attribute.'">'.get_lang('RemoveAnswer').' </button>';
+		$return .= '			<button class="plus" type="submit" name="add_answer">'.get_lang('AddAnswer').'</button>';
+
+		return $return;
+	}
+
+	/**
+	 * Render the question. In this case this starts with the form tag
+	 *
+	 * @param string $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content)
+    {
+		$this->html = '<form id="question" name="question" method="post" action="'.api_get_self().'?survey_id='.intval($_GET['survey_id']).'">';
+		echo $this->html;
+	}
+}
 
-            if ($message == 'QuestionAdded' || $message == 'QuestionUpdated') {
-                $sql = 'SELECT COUNT(*) FROM '.Database :: get_course_table(
-                    TABLE_SURVEY_QUESTION
-                ).' WHERE c_id = '.$course_id.' AND survey_id = '.intval($_GET['survey_id']);
-                $res = Database :: fetch_array(Database::query($sql));
+class ch_yesno extends survey_question
+{
 
-                header('Location:survey.php?survey_id='.intval($_GET['survey_id']).'&message='.$message);
-                exit();
-            } else {
-                if ($message == 'PleaseEnterAQuestion' || $message == 'PleasFillAllAnswer' || $message == 'PleaseChooseACondition' || $message == 'ChooseDifferentCategories') {
-                    $_SESSION['temp_user_message'] = $form_content['question'];
-                    $_SESSION['temp_horizontalvertical'] = $form_content['horizontalvertical'];
-                    $_SESSION['temp_sys_message'] = $message;
-                    $_SESSION['temp_answers'] = $form_content['answers'];
-                    $_SESSION['temp_values'] = $form_content['values'];
-                    header(
-                        'location:question.php?'.api_get_cidreq().'&question_id='.intval(
-                            $_GET['question_id']
-                        ).'&survey_id='.intval($_GET['survey_id']).'&action='.Security::remove_XSS(
-                            $_GET['action']
-                        ).'&type='.Security::remove_XSS($_GET['type']).''
-                    );
-                    exit;
-                }
-            }
-        }
-
-        /**
-         * This solution is a little bit strange but I could not find a different solution.
-         */
-        if ($_POST['delete_answer']) {
-            foreach ($_POST['delete_answer'] as $key => & $value) {
-                unset($form_content['answers'][$key]);
-                $deleted = $key;
-            }
-            foreach ($form_content['answers'] as $key => & $value) {
-                if ($key > $deleted) {
-                    $form_content['answers'][$key - 1] = $form_content['answers'][$key];
-                    unset($form_content['answers'][$key]);
-                }
-            }
-        }
-
-        return $form_content;
-    }
-
-    /**
-     * This functions adds two buttons. One to add an option, one to remove an option
-     *
-     * @param unknown_type $form_content
-     * @return html code
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function add_remove_buttons($form_content)
-    {
-        if (count($form_content['answers']) <= 2) {
-            $remove_answer_attribute = 'disabled="disabled"';
-        }
-
-        $return .= '	<div class="row">';
-        $return .= '		<div class="formw">';
-        $return .= '		<input type="hidden" name="is_executable" id="is_executable" value="-" />';
-        $return .= '			<button class="minus" type="submit" name="remove_answer" "'.$remove_answer_attribute.'">'.get_lang(
-            'RemoveAnswer'
-        ).' </button>';
-        $return .= '			<button class="plus" type="submit" name="add_answer">'.get_lang(
-            'AddAnswer'
-        ).'</button>';
-
-        return $return;
-    }
-
-    /**
-     * Render the question. In this case this starts with the form tag
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content)
-    {
-        $this->html = '<form id="question" name="question" method="post" action="'.api_get_self().'?survey_id='.intval(
-            $_GET['survey_id']
-        ).'">';
-        echo $this->html;
-    }
-
-}
-
-class ch_yesno extends survey_question
-{
-
-    /**
-     * This function creates the form elements for the yesno questions
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for the yesno questions
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function create_form($survey_data, $form_content)
     {
-        $this->html = parent::create_form($form_content);
-        // Horizontal or vertical
-        $this->html .= '	<div class="control-group">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('DisplayAnswersHorVert');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="controls">';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
-        if (empty($form_content['horizontalvertical']) or $form_content['horizontalvertical'] == 'horizontal') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= '/>'.get_lang('Horizontal').'<br />';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
-        if ($form_content['horizontalvertical'] == 'vertical') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= ' />'.get_lang('Vertical').'';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-
-        // The options
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('AnswerOptions');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $this->html .= '			<table>';
-        $this->html .= '	<tr>';
-        $this->html .= '		<td align="right"><label for="answers[0]">1</label></td>';
-        $this->html .= '		<td width="550">'.api_return_html_area('answers[0]', stripslashes($form_content['answers'][0]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
-        $this->html .= '		<td><input style="width:22px" src="'.api_get_path(WEB_IMG_PATH).'icons/22/down.png"  type="image" class="down" value="move_down[0]" name="move_down[0]"/></td>';
-        $this->html .= '	</tr>';
-        $this->html .= '	<tr>';
-        $this->html .= '		<td align="right"><label for="answers[1]">2</label></td>';
-        //$this->html .= '		<td><input type="text" name="answers[1]" id="answers[1]" value="'.$form_content['answers'][1].'" /></td>';
-        $this->html .= '		<td width="550">'.api_return_html_area('answers[1]', stripslashes($form_content['answers'][1]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
-        $this->html .= '		<td><input style="width:22px" type="image" src="'.api_get_path(WEB_IMG_PATH).'icons/22/up.png" value="move_up[1]" name="move_up[1]" /></td>';
-        $this->html .= '	</tr>';
-        $this->html .= '			</table>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-    }
-
-    /**
-     * Render the yes not question type
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content, $answers = array())
+		$this->html = parent::create_form($survey_data, $form_content);
+		// Horizontal or vertical
+		$this->html .= '	<div class="control-group">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('DisplayAnswersHorVert');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="controls">';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
+		if (empty($form_content['horizontalvertical']) or $form_content['horizontalvertical'] == 'horizontal') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= '/>'.get_lang('Horizontal').'<br />';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
+		if ($form_content['horizontalvertical'] == 'vertical') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= ' />'.get_lang('Vertical').'';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		// The options
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('AnswerOptions');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$this->html .= '			<table>';
+		$this->html .= '	<tr>';
+		$this->html .= '		<td align="right"><label for="answers[0]">1</label></td>';
+
+		$this->html .= '		<td width="550">'.api_return_html_area('answers[0]', stripslashes($form_content['answers'][0]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+		$this->html .= '		<td><input style="width:22px" src="../img/icons/22/down.png"  type="image" class="down" value="move_down[0]" name="move_down[0]"/></td>';
+		$this->html .= '	</tr>';
+		$this->html .= '	<tr>';
+		$this->html .= '		<td align="right"><label for="answers[1]">2</label></td>';
+		//$this->html .= '		<td><input type="text" name="answers[1]" id="answers[1]" value="'.$form_content['answers'][1].'" /></td>';
+		$this->html .= '		<td width="550">'.api_return_html_area('answers[1]', stripslashes($form_content['answers'][1]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+		$this->html .= '		<td><input style="width:22px" type="image" src="../img/icons/22/up.png" value="move_up[1]" name="move_up[1]" /></td>';
+		$this->html .= '	</tr>';
+		$this->html .= '			</table>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+	}
+
+	/**
+	 * Render the yes not question type
+	 *
+	 * @param string $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content, $answers = array())
     {
-
-        if (is_array($form_content['options'])) { // Check if data is correct
-            foreach ($form_content['options'] as $key => & $value) {
+		if (is_array($form_content['options'])) { // Check if data is correct
+			foreach ($form_content['options'] as $key => & $value) {
                 if ($form_content['display'] == 'vertical') {
                     $this->html .= '<label class="radio">';
                 } else {
@@ -1908,643 +1724,605 @@ class ch_yesno extends survey_question
 
                 if (substr_count($value, '<p>') == 1) {
                     $value_to_show = substr($value, 3, (strlen($value) - 7));
-                }
+				}
                 $this->html .= '<input name="question'.$form_content['question_id'].'" type="radio" value="'.$key.'"';
-                if (is_array($answers)) {
-                    if (in_array($key, $answers)) {
-                        $this->html .= 'checked="checked"';
-                    }
-                }
+				if (is_array($answers)) {
+					if (in_array($key,$answers)) {
+						$this->html .= 'checked="checked"';
+					}
+				}
                 $this->html .= '/>';
                 $this->html .= $value_to_show.'</label>';
                 if ($form_content['display'] == 'vertical') {
-                    //$this->html .= '<br />';
+						//$this->html .= '<br />';
                 }
-            }
-        }
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo $this->html;
-        echo '</div>';
-    }
-
+			}
+		}
+		echo '<div class="survey_question_wrapper">';
+            echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+            echo $this->html;
+		echo '</div>';
+	}
 }
 
 class ch_multiplechoice extends survey_question
 {
 
-    /**
-     * This function creates the form elements for the multiple choice questions
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for the multiple choice questions
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function create_form($survey_data, $form_content)
     {
-
-        $this->html = parent::create_form($form_content);
-        // Horizontal or vertical
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('DisplayAnswersHorVert');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
-        if (empty($form_content['horizontalvertical']) or $form_content['horizontalvertical'] == 'horizontal') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= '/>'.get_lang('Horizontal').'</label><br />';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
-        if ($form_content['horizontalvertical'] == 'vertical') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= ' />'.get_lang('Vertical').'</label>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-
-        // The Options
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('AnswerOptions');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $total_number_of_answers = count($form_content['answers']);
-        $this->html .= ' 			<table>';
-        if (is_array($form_content['answers'])) { // Check if data is correct
-            foreach ($form_content['answers'] as $key => $value) {
-                $this->html .= '	<tr>';
-                $this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
-                //$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
-                $this->html .= '		<td width="550">'.api_return_html_area(
-                    'answers['.$key.']',
-                    api_html_entity_decode(stripslashes($form_content['answers'][$key]), ENT_QUOTES),
-                    '',
-                    '',
-                    null,
-                    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')
-                ).'</td>';
-                $this->html .= '		<td>';
-                if ($key < $total_number_of_answers - 1) {
-                    $this->html .= '<input style="width:22px" type="image" src="'.api_get_path(WEB_IMG_PATH).'icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
-                }
-                if ($key > 0) {
-                    $this->html .= '<input style="width:22px" type="image" src="'.api_get_path(WEB_IMG_PATH).'icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
-                }
-                if ($total_number_of_answers > 2) {
-                    $this->html .= '<input style="width:22px" type="image" src="'.api_get_path(WEB_IMG_PATH).'icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
-                }
-                $this->html .= ' 		</td>';
-                $this->html .= '	</tr>';
-            }
-        }
-        // The buttons for adding or removing
-        $this->html .= ' 			</table>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-
-        $this->html .= parent :: add_remove_buttons($form_content);
-    }
-
-    /**
-     * render the multiple choice question type
-     *
-     * @param unknown_type $form_content
-     *
-     * @todo it would make more sense to consider yesno as a special case of multiplechoice and not the other way around
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content, $answers = array())
+		$this->html = parent::create_form($survey_data, $form_content);
+		// Horizontal or vertical
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('DisplayAnswersHorVert');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
+		if (empty($form_content['horizontalvertical']) or $form_content['horizontalvertical'] == 'horizontal') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= '/>'.get_lang('Horizontal').'</label><br />';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
+		if ($form_content['horizontalvertical'] == 'vertical') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= ' />'.get_lang('Vertical').'</label>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		// The Options
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('AnswerOptions');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$total_number_of_answers = count($form_content['answers']);
+		$this->html .= ' 			<table>';
+		if (is_array($form_content['answers'])) { // Check if data is correct
+			foreach ($form_content['answers'] as $key => $value) {
+				$this->html .= '	<tr>';
+				$this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key+1).'</label></td>';
+				//$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
+				$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key]), ENT_QUOTES), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+				$this->html .= '		<td>';
+				if ($key<$total_number_of_answers-1) {
+					$this->html .= '			<input style="width:22px" type="image" src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+				}
+				if ($key>0) {
+					$this->html .= '			<input style="width:22px" type="image" src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+				}
+				if ($total_number_of_answers> 2) {
+					$this->html .= '			<input style="width:22px" type="image" src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+				}
+				$this->html .= ' 		</td>';
+				$this->html .= '	</tr>';
+			}
+		}
+		// The buttons for adding or removing
+		$this->html .= ' 			</table>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		$this->html .= parent :: add_remove_buttons($form_content);
+	}
+
+	/**
+	 * render the multiple choice question type
+	 *
+	 * @param string $form_content
+	 *
+	 * @todo it would make more sense to consider yesno as a special case of multiplechoice and not the other way around
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content, $answers = array())
     {
-        $question = new ch_yesno();
-        $question->render_question($form_content, $answers);
-    }
-
+		$question = new ch_yesno();
+		$question->render_question($form_content, $answers);
+	}
 }
 
 class ch_personality extends survey_question
 {
 
-    /**
-     * This function creates the form elements for the multiple response questions
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for the multiple response questions
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function create_form($survey_data, $form_content)
     {
-        $this->html = parent::create_form($form_content);
-        $this->html .= '	<tr>';
-        $this->html .= '		<td colspan="2"><strong>'.get_lang('DisplayAnswersHorVert').'</strong></td>';
-        $this->html .= '	</tr>';
-        // Horizontal or vertical
-        $this->html .= '	<tr>';
-        $this->html .= '		<td align="right" valign="top">&nbsp;</td>';
-        $this->html .= '		<td>';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
-        if (empty($form_content['horizontalvertical']) || $form_content['horizontalvertical'] == 'horizontal') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= '/>'.get_lang('Horizontal').'</label><br />';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
+		$this->html = parent::create_form($survey_data, $form_content);
+		$this->html .= '	<tr>';
+		$this->html .= '		<td colspan="2"><strong>'.get_lang('DisplayAnswersHorVert').'</strong></td>';
+		$this->html .= '	</tr>';
+		// Horizontal or vertical
+		$this->html .= '	<tr>';
+		$this->html .= '		<td align="right" valign="top">&nbsp;</td>';
+		$this->html .= '		<td>';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
+		if (empty($form_content['horizontalvertical']) || $form_content['horizontalvertical'] == 'horizontal') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= '/>'.get_lang('Horizontal').'</label><br />';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
 
-        if ($form_content['horizontalvertical'] == 'vertical') {
-            $this->html .= 'checked="checked"';
-        }
+		if ($form_content['horizontalvertical'] == 'vertical') {
+			$this->html .= 'checked="checked"';
+		}
 
-        $this->html .= ' />'.get_lang('Vertical').'</label>';
-        $this->html .= '		</td>';
-        $this->html .= '		<td>&nbsp;</td>';
-        $this->html .= '	</tr>';
-        $this->html .= '		<tr>
+		$this->html .= ' />'.get_lang('Vertical').'</label>';
+		$this->html .= '		</td>';
+		$this->html .= '		<td>&nbsp;</td>';
+		$this->html .= '	</tr>';
+		$this->html .= '		<tr>
 								<td colspan="">&nbsp;</td>
 							</tr>';
 
-        // The options
-        $this->html .= '	<tr>';
-        $this->html .= '		<td colspan="3"><strong>'.get_lang('AnswerOptions').'</strong></td>';
-        $this->html .= '	</tr>';
-        $total_number_of_answers = count($form_content['answers']);
-
-        $question_values = array();
-
-        // Values of question options
-        if (is_array($form_content['values'])) { // Check if data is correct
-            foreach ($form_content['values'] as $key => & $value) {
-                $question_values [] = '<input size="3" type="text" id="values['.$key.']" name="values['.$key.']" value="'.$value.'" />';
-            }
-        }
-        $count = 0;
-        if (is_array($form_content['answers'])) {
-            foreach ($form_content['answers'] as $key => & $value) {
-                $this->html .= '	<tr>';
-                $this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
-                //$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
-                $this->html .= '		<td width="550">'.api_return_html_area(
-                    'answers['.$key.']',
-                    api_html_entity_decode(stripslashes($form_content['answers'][$key])),
-                    '',
-                    '',
-                    null,
-                    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')
-                ).'</td>';
-                $this->html .= '		<td>';
-
-                if ($total_number_of_answers > 2) {
-                    $this->html .= $question_values[$count];
-                }
-
-                if ($key < $total_number_of_answers - 1) {
-                    $this->html .= '		<input type="image" style="width:22px"   src="'.api_get_path(WEB_IMG_PATH).'icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
-                }
-                if ($key > 0) {
-                    $this->html .= '		<input type="image" style="width:22px"   src="'.api_get_path(WEB_IMG_PATH).'icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
-                }
-                if ($total_number_of_answers > 2) {
-                    $this->html .= '			<input type="image" style="width:22px"   src="'.api_get_path(WEB_IMG_PATH).'icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
-                }
-                $this->html .= ' 		</td>';
-                $this->html .= '	</tr>';
-                $count++;
-            }
-        }
-        // The buttons for adding or removing
-        //$this->html .= parent :: add_remove_buttons($form_content);
-    }
+		// The options
+		$this->html .= '	<tr>';
+		$this->html .= '		<td colspan="3"><strong>'.get_lang('AnswerOptions').'</strong></td>';
+		$this->html .= '	</tr>';
+		$total_number_of_answers = count($form_content['answers']);
 
-    /**
-     * Render the multiple response question type
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content, $answers = array())
-    {
-        $question = new ch_yesno();
-        $question->render_question($form_content, $answers);
-    }
+		$question_values = array();
 
+		// Values of question options
+		if (is_array($form_content['values'])) { // Check if data is correct
+			foreach ($form_content['values'] as $key => & $value) {
+				$question_values [] = '<input size="3" type="text" id="values['.$key.']" name="values['.$key.']" value="'.$value.'" />';
+			}
+		}
+		$count = 0;
+		if (is_array($form_content['answers'])) {
+			foreach ($form_content['answers'] as $key => & $value) {
+				$this->html .= '	<tr>';
+				$this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key+1).'</label></td>';
+				//$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
+				$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key])), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+				$this->html .= '		<td>';
+
+				if ($total_number_of_answers > 2) {
+					$this->html .= $question_values[$count];
+				}
+
+				if ($key < $total_number_of_answers - 1) {
+					$this->html .= '		<input type="image" style="width:22px"   src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+				}
+				if ($key > 0) {
+					$this->html .= '		<input type="image" style="width:22px"   src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+				}
+				if ($total_number_of_answers > 2) {
+					$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+				}
+				$this->html .= ' 		</td>';
+				$this->html .= '	</tr>';
+				$count++;
+			}
+		}
+		// The buttons for adding or removing
+		//$this->html .= parent :: add_remove_buttons($form_content);
+	}
+
+	/**
+	 * Render the multiple response question type
+	 *
+	 * @param string $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content, $answers = array()) {
+		$question = new ch_yesno();
+		$question->render_question($form_content, $answers);
+	}
 }
 
 class ch_multipleresponse extends survey_question
 {
 
-    /**
-     * This function creates the form elements for the multiple response questions
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function create_form($form_content)
-    {
-
-        $this->html = parent::create_form($form_content);
-        // Horizontal or vertical
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('DisplayAnswersHorVert');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
-        if (empty($form_content['horizontalvertical']) || $form_content['horizontalvertical'] == 'horizontal') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= '/>'.get_lang('Horizontal').'</label><br />';
-        $this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
-        if ($form_content['horizontalvertical'] == 'vertical') {
-            $this->html .= 'checked="checked"';
-        }
-        $this->html .= ' />'.get_lang('Vertical').'</label>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-
-        // The options
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('AnswerOptions');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $total_number_of_answers = count($form_content['answers']);
-        $this->html .= ' 			<table>';
-        if (is_array($form_content['answers'])) { // Values of question options
-            foreach ($form_content['answers'] as $key => & $value) {
-                $this->html .= '	<tr>';
-                $this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
-                //$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
-                $this->html .= '		<td width="550">'.api_return_html_area(
-                    'answers['.$key.']',
-                    api_html_entity_decode(stripslashes($form_content['answers'][$key]), ENT_QUOTES),
-                    '',
-                    '',
-                    null,
-                    array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')
-                ).'</td>';
-                $this->html .= '		<td>';
-                if ($key < $total_number_of_answers - 1) {
-                    $this->html .= '			<input type="image" style="width:22px"   src="'.api_get_path(WEB_IMG_PATH).'icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
-                }
-
-                if ($key > 0) {
-                    $this->html .= '			<input type="image" style="width:22px"   src="'.api_get_path(WEB_IMG_PATH).'icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
-                }
-
-                if ($total_number_of_answers > 2) {
-                    $this->html .= '			<input type="image" style="width:22px"   src="'.api_get_path(WEB_IMG_PATH).'icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
-                }
-                $this->html .= ' 		</td>';
-                $this->html .= '	</tr>';
-            }
-        }
-        // The buttons for adding or removing
-        $this->html .= ' 			</table>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-        $this->html .= parent :: add_remove_buttons($form_content);
-    }
-
-    /**
-     * Render the multiple response question type
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content, $answers = array())
+	/**
+	 * This function creates the form elements for the multiple response questions
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function create_form($survey_data, $form_content) {
+
+		$this->html = parent::create_form($survey_data, $form_content);
+		// Horizontal or vertical
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('DisplayAnswersHorVert');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="horizontal" ';
+		if (empty($form_content['horizontalvertical']) || $form_content['horizontalvertical'] == 'horizontal') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= '/>'.get_lang('Horizontal').'</label><br />';
+		$this->html .= '		  <input name="horizontalvertical" type="radio" value="vertical" ';
+		if ($form_content['horizontalvertical'] == 'vertical') {
+			$this->html .= 'checked="checked"';
+		}
+		$this->html .= ' />'.get_lang('Vertical').'</label>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		// The options
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('AnswerOptions');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$total_number_of_answers = count($form_content['answers']);
+		$this->html .= ' 			<table>';
+		if (is_array($form_content['answers'])) { // Values of question options
+			foreach ($form_content['answers'] as $key => & $value) {
+				$this->html .= '	<tr>';
+				$this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
+				//$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
+				$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key]), ENT_QUOTES), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+				$this->html .= '		<td>';
+				if ($key<$total_number_of_answers - 1) {
+					$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+				}
+
+				if ($key > 0) {
+					$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+				}
+
+				if ($total_number_of_answers > 2) {
+					$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+				}
+				$this->html .= ' 		</td>';
+				$this->html .= '	</tr>';
+			}
+		}
+		// The buttons for adding or removing
+		$this->html .= ' 			</table>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+		$this->html .= parent :: add_remove_buttons($form_content);
+	}
+
+	/**
+	 * Render the multiple response question type
+	 *
+	 * @param unknown_type $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content, $answers = array())
     {
-        foreach ($form_content['options'] as $key => & $value) {
-            $this->html .= '<label class="checkbox"><input name="question'.$form_content['question_id'].'[]" type="checkbox" value="'.$key.'"';
-            if (is_array($answers)) {
-                if (in_array($key, $answers)) {
-                    $this->html .= 'checked="checked"';
-                }
-            }
-            if (substr_count($value, '<p>') == 1) {
-                $this->html .= '/>'.substr($value, 3, (strlen($value) - 7)).'</label>';
-                if ($form_content['display'] == 'vertical') {
-                    $this->html .= '<br />';
-                }
+		foreach ($form_content['options'] as $key => & $value) {
+			if ($form_content['display'] == 'vertical') {
+			    $this->html .= '<label class="checkbox"><input name="question'.$form_content['question_id'].'[]" type="checkbox" value="'.$key.'"';
             } else {
-                $this->html .= '/>'.$value.'</label>';
+                $this->html .= '<label class="checkbox inline"><input name="question'.$form_content['question_id'].'[]" type="checkbox" value="'.$key.'"';
             }
-        }
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo '<div class="control-group">';
-        echo $this->html;
-        echo '</div>';
-        echo '</div>';
-    }
-
+			if (is_array($answers)) {
+				if (in_array($key, $answers)) {
+					$this->html .= 'checked="checked"';
+				}
+			}
+			if (substr_count($value, '<p>') == 1) {
+				$this->html .= '/>'.substr($value, 3, (strlen($value) - 7)).'</label>';
+				if ($form_content['display'] == 'vertical') {
+					$this->html .= '<br />';
+				}
+			} else {
+				$this->html .= '/>'.$value.'</label>';
+			}
+		}
+		echo '<div class="survey_question_wrapper">';
+		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+		echo '<div class="control-group">';
+		echo $this->html;
+		echo '</div>';
+		echo '</div>';
+	}
 }
 
 class ch_dropdown extends survey_question
 {
 
-    /**
-     * This function creates the form elements for the dropdown questions
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for the dropdown questions
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function create_form($survey_data, $form_content)
     {
-
-        $this->html = parent::create_form($form_content);
-        // The answers
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('AnswerOptions');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $total_number_of_answers = count($form_content['answers']);
-        $this->html .= ' 			<table>';
-        foreach ($form_content['answers'] as $key => & $value) {
-            $this->html .= '	<tr>';
-            $this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
-            $this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.stripslashes(
-                $form_content['answers'][$key]
-            ).'" /></td>';
-            $this->html .= '		<td>';
-            if ($key < $total_number_of_answers - 1) {
-                $this->html .= '<input type="image" style="width:22px"   src='.api_get_path(WEB_IMG_PATH).'icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
-            }
-            if ($key > 0) {
-                $this->html .= '<input type="image" style="width:22px"   src='.api_get_path(WEB_IMG_PATH).'icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
-            }
-            if ($total_number_of_answers > 2) {
-                $this->html .= '<input type="image" style="width:22px"   src='.api_get_path(WEB_IMG_PATH).'icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
-            }
-            $this->html .= ' 		</td>';
-            $this->html .= '	</tr>';
-        }
-        // The buttons for adding or removing
-        $this->html .= ' 			</table>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-        $this->html .= parent :: add_remove_buttons($form_content);
-    }
-
-    /**
-     * Render the dropdown question type
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content, $answers = array())
+		$this->html = parent::create_form($survey_data, $form_content);
+		// The answers
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('AnswerOptions');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$total_number_of_answers = count($form_content['answers']);
+		$this->html .= ' 			<table>';
+		foreach ($form_content['answers'] as $key => & $value) {
+			$this->html .= '	<tr>';
+			$this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
+			$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.stripslashes($form_content['answers'][$key]).'" /></td>';
+			$this->html .= '		<td>';
+			if ($key < $total_number_of_answers - 1) {
+				$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+			}
+			if ($key > 0) {
+				$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+			}
+			if ($total_number_of_answers> 2) {
+				$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+			}
+			$this->html .= ' 		</td>';
+			$this->html .= '	</tr>';
+		}
+		// The buttons for adding or removing
+		$this->html .= ' 			</table>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+		$this->html .= parent :: add_remove_buttons($form_content);
+	}
+
+	/**
+	 * Render the dropdown question type
+	 *
+	 * @param unknown_type $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content, $answers = array())
     {
-        foreach ($form_content['options'] as $key => & $value) {
-            $this->html .= '<option value="'.$key.'" ';
-            if (is_array($answers)) {
-                if (in_array($key, $answers)) {
-                    $this->html .= 'selected="selected"';
-                }
-            }
-            $this->html .= '>'.$value.'</option>';
-        }
-
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo '<div class="survey_question_options">';
-        echo '<select name="question'.$form_content['question_id'].'" id="select">';
-        echo $this->html;
-        echo '</select>';
-        echo '</div>';
-        echo '</div>';
-        /*
-          <option value="test">test</option>
-         */
-    }
+		foreach ($form_content['options'] as $key => & $value) {
+			$this->html .= '<option value="'.$key.'" ';
+			if (is_array($answers)) {
+				if (in_array($key, $answers)) {
+					$this->html .= 'selected="selected"';
+				}
+			}
+			$this->html .= '>'.$value.'</option>';
+		}
 
+		echo '<div class="survey_question_wrapper">';
+		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+		echo '<div class="survey_question_options">';
+		echo '<select name="question'.$form_content['question_id'].'" id="select">';
+		echo $this->html;
+		echo '</select>';
+		echo '</div>';
+		echo '</div>';
+		/*
+			<option value="test">test</option>
+		*/
+	}
 }
 
+
 class ch_open extends survey_question
 {
 
-    /**
-     * This function creates the form elements for the open questions
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @todo add a limit for the number of characters that can be type
-     * @todo add a checkbox weither the answer is a textarea or a wysiwyg editor
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for the open questions
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @todo add a limit for the number of characters that can be type
+	 * @todo add a checkbox weither the answer is a textarea or a wysiwyg editor
+	 */
+	function create_form($survey_data, $form_content)
     {
-        $this->html = parent::create_form($form_content);
-    }
-
-    /**
-     * render the open question type
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content, $answers = array())
+		$this->html = parent::create_form($survey_data, $form_content);
+	}
+
+	/**
+	 * render the open question type
+	 *
+	 * @param unknown_type $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content, $answers = array())
     {
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo '<div class="survey_question_options">';
-        if (is_array($answers)) {
-            $content = implode('', $answers);
-        } else {
-            $content = $answers;
-        }
-        echo '<label for="question'.$form_content['question_id'].'"></label><textarea name="question'.$form_content['question_id'].'" id="textarea" style="width: 400px; height: 130px;">'.$content.'</textarea>';
-        echo '</div>';
-        echo '</div>';
-    }
-
+		echo '<div class="survey_question_wrapper">';
+		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+		echo '<div class="survey_question_options">';
+		if (is_array($answers)) {
+			$content = implode('', $answers);
+		} else {
+			$content = $answers;
+		}
+		echo '<label for="question'.$form_content['question_id'].'"></label>
+              <textarea name="question'.$form_content['question_id'].'" id="textarea" style="width: 400px; height: 130px;">'.$content.'</textarea>';
+		echo '</div>';
+		echo '</div>';
+	}
 }
 
+
 class ch_comment extends survey_question
 {
 
-    /**
-     * This function creates the form elements for a comment.
-     * A comment is nothing more than a block of text that the user can read
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @param array $form_content
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for a comment.
+	 * A comment is nothing more than a block of text that the user can read
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @param array $form_content
+	 */
+	function create_form($survey_data, $form_content)
     {
-        $this->html = parent::create_form($form_content);
-    }
-
-    /**
-     * Render the comment "question" type
-     *
-     * @param unknown_type $form_content
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    function render_question($form_content)
+		$this->html = parent::create_form($survey_data, $form_content);
+	}
+
+	/**
+	 * Render the comment "question" type
+	 *
+	 * @param unknown_type $form_content
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	function render_question($form_content)
     {
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo '</div>';
-    }
-
+		echo '<div class="survey_question_wrapper">';
+		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+		echo '</div>';
+	}
 }
 
 class ch_pagebreak extends survey_question
 {
 
-    /**
-     * This function creates the form elements for a comment.
-     * A comment is nothing more than a block of text that the user can read
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @param array $form_content
-     */
-    function create_form($form_content)
+	/**
+	 * This function creates the form elements for a comment.
+	 * A comment is nothing more than a block of text that the user can read
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @param array $form_content
+	 */
+	function create_form($survey_data, $form_content)
     {
-        $this->html = parent::create_form($form_content);
-    }
-
+		$this->html = parent::create_form($survey_data, $form_content);
+	}
 }
 
+
 class ch_percentage extends survey_question
 {
-
-    function create_form($form_content)
-    {
-        $this->html = parent::create_form($form_content);
-    }
-
-    function render_question($form_content, $answers = array())
+	function create_form($survey_data, $form_content)
     {
-        $this->html .= '<option value="--">--</option>';
-        foreach ($form_content['options'] as $key => & $value) {
-            $this->html .= '<option value="'.$key.'" ';
-            if (is_array($answers)) {
-                if (in_array($key, $answers)) {
-                    $this->html .= 'selected="selected"';
-                }
-            }
-            $this->html .= '>'.$value.'</option>';
-        }
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo '<div class="survey_question_options">';
-        echo '<select name="question'.$form_content['question_id'].'" id="select">';
-        echo $this->html;
-        echo '</select>';
-        echo '</div>';
-        echo '</div>';
-    }
-
+		$this->html = parent::create_form($survey_data, $form_content);
+	}
+
+	function render_question($form_content, $answers = array()) {
+		$this->html .= '<option value="--">--</option>';
+		foreach ($form_content['options'] as $key => & $value) {
+			$this->html .= '<option value="'.$key.'" ';
+			if (is_array($answers)) {
+				if (in_array($key, $answers)) {
+					$this->html .= 'selected="selected"';
+				}
+			}
+			$this->html .= '>'.$value.'</option>';
+		}
+		echo '<div class="survey_question_wrapper">';
+		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+		echo '<div class="survey_question_options">';
+		echo '<select name="question'.$form_content['question_id'].'" id="select">';
+		echo $this->html;
+		echo '</select>';
+		echo '</div>';
+		echo '</div>';
+	}
 }
 
 class ch_score extends survey_question
 {
-
-    function create_form($form_content)
+	function create_form($survey_data, $form_content)
     {
-        $this->html = parent::create_form($form_content);
-        // The maximum score that can be given
-        $this->html .= '	<div class="control-group">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= '			<span class="form_required">*</span>'.get_lang('MaximumScore');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="controls">';
-        $this->html .= '			<input type="text" name="maximum_score" value="'.$form_content['maximum_score'].'">';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-
-        // The answers
-        $this->html .= '	<div class="row">';
-        $this->html .= '		<label class="control-label">';
-        $this->html .= get_lang('AnswerOptions');
-        $this->html .= '		</label>';
-        $this->html .= '		<div class="formw">';
-        $total_number_of_answers = count($form_content['answers']);
-        $this->html .= ' 			<table>';
-        foreach ($form_content['answers'] as $key => & $value) {
-            $this->html .= '	<tr>';
-            $this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
-            //$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
-            $this->html .= '		<td width="550">'.api_return_html_area(
-                'answers['.$key.']',
-                stripslashes($form_content['answers'][$key]),
-                '',
-                '',
-                null,
-                array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')
-            ).'</td>';
-            $this->html .= '		<td>';
-            if ($key < $total_number_of_answers - 1) {
-                $this->html .= '			<input type="image" style="width:22px"   src='.api_get_path(WEB_IMG_PATH).'icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
-            }
-            if ($key > 0) {
-                $this->html .= '			<input type="image" style="width:22px"   src='.api_get_path(WEB_IMG_PATH).'icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
-            }
-            if ($total_number_of_answers > 2) {
-                $this->html .= '			<input type="image" style="width:22px"   src='.api_get_path(WEB_IMG_PATH).'icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
-            }
-            $this->html .= ' 		</td>';
-            $this->html .= '	</tr>';
-        }
-        // The buttons for adding or removing
-        $this->html .= ' 			</table>';
-        $this->html .= '		</div>';
-        $this->html .= '	</div>';
-        $this->html .= parent :: add_remove_buttons($form_content);
-    }
-
-    function render_question($form_content, $answers = array())
+		$this->html = parent::create_form($survey_data, $form_content);
+		// The maximum score that can be given
+		$this->html .= '	<div class="control-group">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= '			<span class="form_required">*</span>'.get_lang('MaximumScore');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="controls">';
+		$this->html .= '			<input type="text" name="maximum_score" value="'.$form_content['maximum_score'].'">';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+
+		// The answers
+		$this->html .= '	<div class="row">';
+		$this->html .= '		<label class="control-label">';
+		$this->html .= 				get_lang('AnswerOptions');
+		$this->html .= '		</label>';
+		$this->html .= '		<div class="formw">';
+		$total_number_of_answers = count($form_content['answers']);
+		$this->html .= ' 			<table>';
+		foreach ($form_content['answers'] as $key => & $value) {
+			$this->html .= '	<tr>';
+			$this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key+1).'</label></td>';
+			//$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
+			$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', stripslashes($form_content['answers'][$key]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+			$this->html .= '		<td>';
+			if ($key<$total_number_of_answers - 1) {
+				$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+			}
+			if ($key > 0) {
+				$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+			}
+			if ($total_number_of_answers > 2) {
+				$this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+			}
+			$this->html .= ' 		</td>';
+			$this->html .= '	</tr>';
+		}
+		// The buttons for adding or removing
+		$this->html .= ' 			</table>';
+		$this->html .= '		</div>';
+		$this->html .= '	</div>';
+		$this->html .= parent :: add_remove_buttons($form_content);
+	}
+
+	function render_question($form_content, $answers = array())
     {
-        /*
-          echo '<div style="border: 1px solid red;">';
-          echo '<pre>';
-          print_r($answers);
-          echo '</pre></div>';
-         */
-        $this->html = '<table>';
-        foreach ($form_content['options'] as $key => & $value) {
-            $this->html .= '<tr>
+		/*
+		echo '<div style="border: 1px solid red;">';
+		echo '<pre>';
+		print_r($answers);
+		echo '</pre></div>';
+		*/
+		$this->html = '<table>';
+		foreach ($form_content['options'] as $key => & $value) {
+			$this->html .= '<tr>
 								<td>'.$value.'</td>';
-            $this->html .= '	<td>';
-            $this->html .= '<select name="question'.$form_content['question_id'].'['.$key.']">';
-            $this->html .= '<option value="--">--</option>';
-            for ($i = 1; $i <= $form_content['maximum_score']; $i++) {
-                $this->html .= '<option value="'.$i.'"';
-                if ($answers[$key] == $i) {
-                    $this->html .= 'selected="selected" ';
-                }
-                $this->html .= '>'.$i.'</option>';
-            }
-            $this->html .= '</select>';
-            $this->html .= '	</td>';
-            $this->html .= '</tr>';
-        }
-        $this->html .= '</table>';
-        echo '<div class="survey_question_wrapper">';
-        echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
-        echo '<div class="survey_question_options">';
-        //echo '<select name="question'.$form_content['question_id'].'" id="select">';
-        echo $this->html;
-        //echo '</select>';
-        echo '</div>';
-        echo '</div>';
-    }
-
+			$this->html .= '	<td>';
+			$this->html .= '<select name="question'.$form_content['question_id'].'['.$key.']">';
+			$this->html .= '<option value="--">--</option>';
+			for ($i=1; $i <= $form_content['maximum_score']; $i++) {
+				$this->html .= '<option value="'.$i.'"';
+				if ($answers[$key] == $i) {
+					$this->html .= 'selected="selected" ';
+				}
+				$this->html .= '>'.$i.'</option>';
+			}
+			$this->html .= '</select>';
+			$this->html .= '	</td>';
+			$this->html .= '</tr>';
+		}
+		$this->html .= '</table>';
+		echo '<div class="survey_question_wrapper">';
+		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
+		echo '<div class="survey_question_options">';
+		//echo '<select name="question'.$form_content['question_id'].'" id="select">';
+		echo $this->html;
+		//echo '</select>';
+		echo '</div>';
+		echo '</div>';
+	}
 }
 
+
 /**
  * This class offers a series of general utility functions for survey querying and display
  * @package chamilo.survey
@@ -2552,100 +2330,97 @@ class ch_score extends survey_question
 class SurveyUtil
 {
 
-    /**
-     * Checks whether the given survey has a pagebreak question as the first or the last question.
-     * If so, break the current process, displaying an error message
-     * @param    integer    Survey ID (database ID)
-     * @param    boolean    Optional. Whether to continue the current process or exit when breaking condition found. Defaults to true (do not break).
-     * @return    void
-     */
-    static function check_first_last_question($survey_id, $continue = true)
+	/**
+	 * Checks whether the given survey has a pagebreak question as the first or the last question.
+	 * If so, break the current process, displaying an error message
+	 * @param	integer	Survey ID (database ID)
+	 * @param	boolean	Optional. Whether to continue the current process or exit when breaking condition found. Defaults to true (do not break).
+	 * @return	void
+	 */
+	static function check_first_last_question($survey_id, $continue = true)
     {
-        // Table definitions
-        $tbl_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		// Table definitions
+		$tbl_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
         $course_id = api_get_course_int_id();
 
-        // Getting the information of the question
-        $sql = "SELECT * FROM $tbl_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $survey_id
-        )."' ORDER BY sort ASC";
-        $result = Database::query($sql);
-        $total = Database::num_rows($result);
-        $counter = 1;
-        $error = false;
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            if ($counter == 1 && $row['type'] == 'pagebreak') {
-                Display::display_error_message(get_lang('PagebreakNotFirst'), false);
-                $error = true;
-            }
-            if ($counter == $total && $row['type'] == 'pagebreak') {
-                Display::display_error_message(get_lang('PagebreakNotLast'), false);
-                $error = true;
-            }
-            $counter++;
-        }
-
-        if (!$continue && $error) {
-            Display::display_footer();
-            exit;
-        }
-    }
+		// Getting the information of the question
+		$sql = "SELECT * FROM $tbl_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."' ORDER BY sort ASC";
+		$result = Database::query($sql);
+		$total = Database::num_rows($result);
+		$counter = 1;
+		$error = false;
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			if ($counter == 1 && $row['type'] == 'pagebreak') {
+				Display::display_error_message(get_lang('PagebreakNotFirst'), false);
+				$error = true;
+			}
+			if ($counter == $total && $row['type'] == 'pagebreak') {
+				Display::display_error_message(get_lang('PagebreakNotLast'), false);
+				$error = true;
+			}
+			$counter++;
+		}
 
-    /**
-     * This function removes an (or multiple) answer(s) of a user on a question of a survey
-     *
-     * @param mixed   The user id or email of the person who fills the survey
-     * @param integer The survey id
-     * @param integer The question id
-     * @param integer The option id
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function remove_answer($user, $survey_id, $question_id, $course_id)
-    {
+		if (!$continue && $error) {
+			Display::display_footer();
+			exit;
+		}
+	}
+
+	/**
+	 * This function removes an (or multiple) answer(s) of a user on a question of a survey
+	 *
+	 * @param mixed   The user id or email of the person who fills the survey
+	 * @param integer The survey id
+	 * @param integer The question id
+	 * @param integer The option id
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function remove_answer($user, $survey_id, $question_id, $course_id) {
         $course_id = intval($course_id);
-        // table definition
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $sql = "DELETE FROM $table_survey_answer
+		// table definition
+		$table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$sql = "DELETE FROM $table_survey_answer
 				WHERE   c_id = $course_id AND
 				        user = '".Database::escape_string($user)."'
 				AND survey_id = '".Database::escape_string($survey_id)."'
 				AND question_id = '".Database::escape_string($question_id)."'";
-        $result = Database::query($sql);
-    }
-
-    /**
-     * This function stores an answer of a user on a question of a survey
-     *
-     * @param mixed   The user id or email of the person who fills the survey
-     * @param integer Survey id
-     * @param integer Question id
-     * @param integer Option id
-     * @param string  Option value
-     * @param array      Survey data settings
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function store_answer($user, $survey_id, $question_id, $option_id, $option_value, $survey_data)
+		Database::query($sql);
+	}
+
+	/**
+	 * This function stores an answer of a user on a question of a survey
+	 *
+	 * @param mixed   The user id or email of the person who fills the survey
+	 * @param integer Survey id
+	 * @param integer Question id
+	 * @param integer Option id
+	 * @param string  Option value
+	 * @param array	  Survey data settings
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function store_answer($user, $survey_id, $question_id, $option_id, $option_value, $survey_data)
     {
-        // Table definition
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-
-        // Make the survey anonymous
-        if ($survey_data['anonymous'] == 1) {
-            if (!$_SESSION['surveyuser']) {
-                $user = md5($user.time());
-                $_SESSION['surveyuser'] = $user;
-            } else {
-                $user = $_SESSION['surveyuser'];
-            }
-        }
-        $course_id = $survey_data['c_id'];
+		// Table definition
+		$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		// Make the survey anonymous
+		if ($survey_data['anonymous'] == 1) {
+			if (!$_SESSION['surveyuser']) {
+				$user = md5($user.time());
+				$_SESSION['surveyuser'] = $user;
+			} else {
+				$user = $_SESSION['surveyuser'];
+			}
+		}
+		$course_id = $survey_data['c_id'];
 
-        $sql = "INSERT INTO $table_survey_answer (c_id, user, survey_id, question_id, option_id, value) VALUES (
+		$sql = "INSERT INTO $table_survey_answer (c_id, user, survey_id, question_id, option_id, value) VALUES (
 				$course_id,
 				'".Database::escape_string($user)."',
 				'".Database::escape_string($survey_id)."',
@@ -2653,716 +2428,608 @@ class SurveyUtil
 				'".Database::escape_string($option_id)."',
 				'".Database::escape_string($option_value)."'
 				)";
-        Database::query($sql);
-    }
-
-    /**
-     * This function checks the parameters that are used in this page
-     *
-     * @return     string     The header, an error and the footer if any parameter fails, else it returns true
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function check_parameters()
+		Database::query($sql);
+	}
+
+	/**
+	 * This function checks the parameters that are used in this page
+	 *
+	 * @return 	string 	The header, an error and the footer if any parameter fails, else it returns true
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function check_parameters($people_filled)
     {
-        $error = false;
-
-        // Getting the survey data
-        $survey_data = survey_manager::get_survey($_GET['survey_id']);
-
-        $action = isset($_GET['action']) ? $_GET['action'] : null;
+		$error = false;
 
-        // $_GET['survey_id'] has to be numeric
-        if (!is_numeric($_GET['survey_id'])) {
-            $error = get_lang('IllegalSurveyId');
-        }
-
-        // $_GET['action']
-        $allowed_actions = array(
-            'overview',
-            'questionreport',
-            'userreport',
-            'comparativereport',
-            'completereport',
-            'deleteuserreport'
-        );
-        if (!empty($action) && !in_array($action, $allowed_actions)) {
-            $error = get_lang('ActionNotAllowed');
-        }
+		// Getting the survey data
+		$survey_data = survey_manager::get_survey($_GET['survey_id']);
 
-        // User report
-        if ($action == 'userreport') {
-            global $people_filled;
-            if ($survey_data['anonymous'] == 0) {
-                $people_filled_full_data = true;
-            } else {
-                $people_filled_full_data = false;
-            }
-            $people_filled = survey_manager::get_people_who_filled_survey($_GET['survey_id'], $people_filled_full_data);
-            if ($survey_data['anonymous'] == 0) {
-                foreach ($people_filled as $key => & $value) {
-                    $people_filled_userids[] = $value['invited_user'];
-                }
-            } else {
-                $people_filled_userids = $people_filled;
-            }
+		// $_GET['survey_id'] has to be numeric
+		if (!is_numeric($_GET['survey_id'])) {
+			$error = get_lang('IllegalSurveyId');
+		}
 
-            if (isset($_GET['user']) && !in_array($_GET['user'], $people_filled_userids)) {
-                $error = get_lang('UnknowUser');
-            }
-        }
+		// $_GET['action']
+		$allowed_actions = array('overview', 'questionreport', 'userreport', 'comparativereport', 'completereport','deleteuserreport');
+		if (isset($_GET['action']) && !in_array($_GET['action'], $allowed_actions)) {
+			$error = get_lang('ActionNotAllowed');
+		}
 
-        // Question report
-        if ($action == 'questionreport') {
-            if (isset($_GET['question']) && !is_numeric($_GET['question'])) {
-                $error = get_lang('UnknowQuestion');
-            }
-        }
+		// User report
+		if (isset($_GET['action']) && $_GET['action'] == 'userreport') {
+			if ($survey_data['anonymous'] == 0) {
+				foreach ($people_filled as $key => & $value) {
+					$people_filled_userids[] = $value['invited_user'];
+				}
+			} else {
+				$people_filled_userids = $people_filled;
+			}
+
+			if (isset($_GET['user']) && !in_array($_GET['user'], $people_filled_userids)) {
+				$error = get_lang('UnknowUser');
+			}
+		}
 
-        if ($error) {
-            $tool_name = get_lang('Reporting');
-            Display::display_header($tool_name);
-            Display::display_error_message(get_lang('Error').': '.$error, false);
-            Display::display_footer();
-            exit;
-        } else {
-            return true;
-        }
-    }
+		// Question report
+		if (isset($_GET['action']) && $_GET['action'] == 'questionreport') {
+			if (isset($_GET['question']) && !is_numeric($_GET['question'])) {
+				$error = get_lang('UnknowQuestion');
+			}
+		}
 
-    /**
-     * This function deals with the action handling
-     * @return    void
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function handle_reporting_actions()
+		if ($error) {
+			$tool_name = get_lang('Reporting');
+			Display::display_header($tool_name);
+			Display::display_error_message(get_lang('Error').': '.$error, false);
+			Display::display_footer();
+			exit;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * This function deals with the action handling
+	 * @return	void
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function handle_reporting_actions($people_filled)
     {
-        // Getting the number of question
-        $temp_questions_data = survey_manager::get_questions($_GET['survey_id']);
-
-        // Sorting like they should be displayed and removing the non-answer question types (comment and pagebreak)
-        $my_temp_questions_data = ($temp_questions_data == null) ? array() : $temp_questions_data;
-        foreach ($my_temp_questions_data as $key => & $value) {
-            if ($value['type'] != 'comment' && $value['type'] != 'pagebreak') {
-                $questions_data[$value['sort']] = $value;
-            }
-        }
+        $action = isset($_GET['action']) ? $_GET['action'] : null;
 
-        // Counting the number of questions that are relevant for the reporting
-        $survey_data['number_of_questions'] = count($questions_data);
+		// Getting the number of question
+		$temp_questions_data = survey_manager::get_questions($_GET['survey_id']);
 
-        $action = isset($_GET['action']) ? $_GET['action'] : null;
+		// Sorting like they should be displayed and removing the non-answer question types (comment and pagebreak)
+		$my_temp_questions_data=($temp_questions_data==null) ? array() : $temp_questions_data;
+		foreach ($my_temp_questions_data as $key => & $value) {
+			if ($value['type'] != 'comment' && $value['type'] != 'pagebreak') {
+				$questions_data[$value['sort']] = $value;
+			}
+		}
 
-        if ($action == 'questionreport') {
-            SurveyUtil::display_question_report($survey_data);
-        }
-        if ($action == 'userreport') {
-            SurveyUtil::display_user_report();
-        }
-        if ($action == 'comparativereport') {
-            SurveyUtil::display_comparative_report();
-        }
-        if ($action == 'completereport') {
-            SurveyUtil::display_complete_report();
-        }
-        if ($action == 'deleteuserreport') {
-            SurveyUtil::delete_user_report($_GET['survey_id'], $_GET['user']);
-        }
-    }
+		// Counting the number of questions that are relevant for the reporting
+		$survey_data['number_of_questions'] = count($questions_data);
 
-    /**
-     * This function deletes the report of an user who wants to retake the survey
-     * @param integer survey_id
-     * @param integer user_id
-     * @return void
-     * @author Christian Fasanando Flores <christian.fasanando@dokeos.com>
-     * @version November 2008
-     */
-    function delete_user_report($survey_id, $user_id)
+		if ($action == 'questionreport') {
+			SurveyUtil::display_question_report($survey_data);
+		}
+		if ($action == 'userreport') {
+			SurveyUtil::display_user_report($people_filled, $survey_data);
+		}
+		if ($action == 'comparativereport') {
+			SurveyUtil::display_comparative_report();
+		}
+		if ($action == 'completereport') {
+			SurveyUtil::display_complete_report($survey_data);
+		}
+		if ($action == 'deleteuserreport') {
+			SurveyUtil::delete_user_report($_GET['survey_id'], $_GET['user']);
+			//SurveyUtil::display_user_report(); //Could work but looks a bit clunky
+		}
+	}
+
+	/**
+	 * This function deletes the report of an user who wants to retake the survey
+	 * @param integer survey_id
+	 * @param integer user_id
+	 * @return void
+	 * @author Christian Fasanando Flores <christian.fasanando@dokeos.com>
+	 * @version November 2008
+	 */
+	function delete_user_report($survey_id, $user_id)
     {
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
+		$table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		$table_survey 				= Database :: get_course_table(TABLE_SURVEY);
 
         $course_id = api_get_course_int_id();
 
-        if (!empty($survey_id) && !empty($user_id)) {
-            // delete data from survey_answer by user_id and survey_id
-            $sql = "DELETE FROM $table_survey_answer WHERE c_id = $course_id AND survey_id = '".(int)$survey_id."' AND user = '".(int)$user_id."'";
-            $result = Database::query($sql);
-            // update field answered from survey_invitation by user_id and survey_id
-            $sql = "UPDATE $table_survey_invitation SET answered = '0' WHERE c_id = $course_id AND survey_code = (SELECT code FROM $table_survey WHERE c_id = $course_id AND survey_id = '".(int)$survey_id."') AND user = '".(int)$user_id."'";
-            $result = Database::query($sql);
-        }
-        if ($result !== false) {
-            $message = get_lang('SurveyUserAnswersHaveBeenRemovedSuccessfully').'<br />
-					<a href="reporting.php?action=userreport&survey_id='.Security::remove_XSS($survey_id).'">'.get_lang(
-                'GoBack'
-            ).'</a>';
-            Display::display_confirmation_message($message, false);
-        }
-    }
+		if (!empty($survey_id) && !empty($user_id)) {
+			// delete data from survey_answer by user_id and survey_id
+			$sql = "DELETE FROM $table_survey_answer WHERE c_id = $course_id AND survey_id = '".(int)$survey_id."' AND user = '".(int)$user_id."'";
+			Database::query($sql);
+			// update field answered from survey_invitation by user_id and survey_id
+			$sql = "UPDATE $table_survey_invitation SET answered = '0' WHERE c_id = $course_id AND survey_code = (SELECT code FROM $table_survey WHERE c_id = $course_id AND survey_id = '".(int)$survey_id."') AND user = '".(int)$user_id."'";
+			$result = Database::query($sql);
+		}
 
-    /**
-     * This function displays the user report which is basically nothing more than a one-page display of all the questions
-     * of the survey that is filled with the answers of the person who filled the survey.
-     *
-     * @return     string    html code of the one-page survey with the answers of the selected user
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007 - Updated March 2008
-     */
-    static function display_user_report()
+		if ($result !== false) {
+			$message = get_lang('SurveyUserAnswersHaveBeenRemovedSuccessfully').'<br />
+					<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&survey_id='.Security::remove_XSS($survey_id).'">'.get_lang('GoBack').'</a>';
+			Display::display_confirmation_message($message, false);
+		}
+	}
+
+	/**
+	 * This function displays the user report which is basically nothing more than a one-page display of all the questions
+	 * of the survey that is filled with the answers of the person who filled the survey.
+	 *
+	 * @return 	string	html code of the one-page survey with the answers of the selected user
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007 - Updated March 2008
+	 */
+	static function display_user_report($people_filled, $survey_data)
     {
-        $course_id = api_get_course_int_id();
-        $answers = array();
-        $questions = array();
-
-        global $people_filled, $survey_data;
-
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-
-        // Actions bar
-        echo '<div class="actions">';
-        echo '<a href="reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon(
-            'back.png',
-            get_lang('BackTo').' '.get_lang('ReportingOverview'),
-            '',
-            ICON_SIZE_MEDIUM
-        ).'</a>';
-        if (isset($_GET['user'])) {
-
-            // The delete link
-            echo '<a href="reporting.php?action=deleteuserreport&amp;survey_id='.Security::remove_XSS(
-                $_GET['survey_id']
-            ).'&amp;user='.Security::remove_XSS($_GET['user']).'" >'.Display::return_icon(
-                'delete.png',
-                get_lang('Delete'),
-                '',
-                ICON_SIZE_MEDIUM
-            ).'</a>';
-
-            // Export the user report
-            echo '<a href="javascript: void(0);" onclick="document.form1a.submit();">'.Display::return_icon(
-                'export_csv.png',
-                get_lang('ExportAsCSV'),
-                '',
-                ICON_SIZE_MEDIUM
-            ).'</a> ';
-            echo '<a href="javascript: void(0);" onclick="document.form1b.submit();">'.Display::return_icon(
-                'export_excel.png',
-                get_lang('ExportAsXLS'),
-                '',
-                ICON_SIZE_MEDIUM
-            ).'</a> ';
-            echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self(
-            ).'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS(
-                $_GET['survey_id']
-            ).'&user_id='.Security::remove_XSS($_GET['user']).'">';
-            echo '<input type="hidden" name="export_report" value="export_report">';
-            echo '<input type="hidden" name="export_format" value="csv">';
-            echo '</form>';
-            echo '<form id="form1b" name="form1b" method="post" action="'.api_get_self(
-            ).'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS(
-                $_GET['survey_id']
-            ).'&user_id='.Security::remove_XSS($_GET['user']).'">';
-            echo '<input type="hidden" name="export_report" value="export_report">';
-            echo '<input type="hidden" name="export_format" value="xls">';
-            echo '</form>';
-            echo '<form id="form2" name="form2" method="post" action="'.api_get_self().'?action='.Security::remove_XSS(
-                $_GET['action']
-            ).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
-        }
-        echo '</div>';
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		// Actions bar
+		echo '<div class="actions">';
+		echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+		if (isset($_GET['user'])) {
+			// The delete link
+			echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=deleteuserreport&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;user='.Security::remove_XSS($_GET['user']).'" >'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_MEDIUM).'</a>';
+
+			// Export the user report
+			echo '<a href="javascript: void(0);" onclick="document.form1a.submit();">'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
+			echo '<a href="javascript: void(0);" onclick="document.form1b.submit();">'.Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
+			echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user_id='.Security::remove_XSS($_GET['user']).'">';
+			echo '<input type="hidden" name="export_report" value="export_report">';
+			echo '<input type="hidden" name="export_format" value="csv">';
+			echo '</form>';
+			echo '<form id="form1b" name="form1b" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user_id='.Security::remove_XSS($_GET['user']).'">';
+			echo '<input type="hidden" name="export_report" value="export_report">';
+			echo '<input type="hidden" name="export_format" value="xls">';
+			echo '</form>';
+			echo '<form id="form2" name="form2" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
+		}
+		echo '</div>';
 
-        // Step 1: selection of the user
-        echo "<script>
+		// Step 1: selection of the user
+		echo "<script language=\"JavaScript\" type=\"text/javascript\">
+		<!--
 		function jumpMenu(targ,selObj,restore)
 		{
 		  eval(targ+\".location='\"+selObj.options[selObj.selectedIndex].value+\"'\");
 		  if (restore) selObj.selectedIndex=0;
 		}
+		//-->
 		</script>";
-        echo get_lang('SelectUserWhoFilledSurvey').'<br />';
-        echo '<select name="user" onchange="jumpMenu(\'parent\',this,0)">';
-        echo '<option value="reporting.php?action='.Security::remove_XSS(
-            $_GET['action']
-        ).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.get_lang('SelectUser').'</option>';
-
-        foreach ($people_filled as $key => & $person) {
-            if ($survey_data['anonymous'] == 0) {
-                $name = api_get_person_name($person['firstname'], $person['lastname']);
-                $id = $person['user_id'];
-                if ($id == '') {
-                    $id = $person['invited_user'];
-                    $name = $person['invited_user'];
-                }
-            } else {
-                $name = $key + 1;
-                $id = $person;
-            }
-            echo '<option value="reporting.php?action='.Security::remove_XSS(
-                $_GET['action']
-            ).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;user='.Security::remove_XSS($id).'" ';
-            if (isset($_GET['user']) && $_GET['user'] == $id) {
-                echo 'selected="selected"';
-            }
-            echo '>'.$name.'</option>';
-        }
-        echo '</select>';
-
-        // Step 2: displaying the survey and the answer of the selected users
-        if (isset($_GET['user'])) {
-            Display::display_normal_message(get_lang('AllQuestionsOnOnePage'), false);
-
-            // Getting all the questions and options
-            $sql = "SELECT 	survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.max_value, survey_question.sort, survey_question.type,
-							survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
+		echo get_lang('SelectUserWhoFilledSurvey').'<br />';
+		echo '<select name="user" onchange="jumpMenu(\'parent\',this,0)">';
+		echo '<option value="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.get_lang('SelectUser').'</option>';
+
+		foreach ($people_filled as $key => & $person) {
+			if ($survey_data['anonymous'] == 0) {
+				$name = api_get_person_name($person['firstname'], $person['lastname']);
+				$id = $person['user_id'];
+				if ($id == '') {
+					$id = $person['invited_user'];
+					$name = $person['invited_user'];
+				}
+			} else {
+				$name  = $key + 1;
+				$id = $person;
+			}
+			echo '<option value="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;user='.Security::remove_XSS($id).'" ';
+			if ($_GET['user'] == $id) {
+				echo 'selected="selected"';
+			}
+			echo '>'.$name.'</option>';
+		}
+		echo '</select>';
+		$course_id = api_get_course_int_id();
+		// Step 2: displaying the survey and the answer of the selected users
+		if (isset($_GET['user'])) {
+			Display::display_normal_message(get_lang('AllQuestionsOnOnePage'), false);
+
+			// Getting all the questions and options
+			$sql = "SELECT
+			            survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.max_value, survey_question.sort, survey_question.type,
+                        survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
 					FROM $table_survey_question survey_question
 					LEFT JOIN $table_survey_question_option survey_question_option
 					ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-					WHERE 	survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
-							survey_question.c_id = $course_id
+					WHERE
+					    survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+                        survey_question.c_id = $course_id
 					ORDER BY survey_question.sort, survey_question_option.sort ASC";
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result, 'ASSOC')) {
-                if ($row['type'] != 'pagebreak') {
-                    $questions[$row['sort']]['question_id'] = $row['question_id'];
-                    $questions[$row['sort']]['survey_id'] = $row['survey_id'];
-                    $questions[$row['sort']]['survey_question'] = $row['survey_question'];
-                    $questions[$row['sort']]['display'] = $row['display'];
-                    $questions[$row['sort']]['type'] = $row['type'];
-                    $questions[$row['sort']]['maximum_score'] = $row['max_value'];
-                    $questions[$row['sort']]['options'][$row['question_option_id']] = $row['option_text'];
-                }
-            }
-
-            // Getting all the answers of the user
-            $sql = "SELECT * FROM $table_survey_answer WHERE c_id = $course_id AND survey_id = '".Database::escape_string(
-                $_GET['survey_id']
-            )."' AND user = '".Database::escape_string($_GET['user'])."'";
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result, 'ASSOC')) {
-                $answers[$row['question_id']][] = $row['option_id'];
-                $all_answers[$row['question_id']][] = $row;
-            }
-            // Displaying all the questions
-            $second_parameter = array();
-
-            foreach ($questions as $key => & $question) {
-                // If the question type is a scoring then we have to format the answers differently
-                if ($question['type'] == 'score') {
-                    if (is_array($second_parameter) && is_array($question) && is_array($all_answers)) {
-                        foreach ($all_answers[$question['question_id']] as $key => & $answer_array) {
-                            $second_parameter[$answer_array['option_id']] = $answer_array['value'];
-                        }
-                    }
-                } else {
-                    $second_parameter = isset($answers[$question['question_id']]) ? $answers[$question['question_id']] : array();
-                    if ($question['type'] == 'open') {
-                        $second_parameter = array();
-                        $second_parameter[] = $all_answers[$question['question_id']][0]['option_id'];
-                    }
-                }
-                $ch_type = 'ch_'.$question['type'];
-                $display = new $ch_type;
-                $display->render_question($question, $second_parameter);
-            }
-        }
-    }
-
-    /**
-     * This function displays the report by question.
-     *
-     * It displays a table with all the options of the question and the number of users who have answered positively on the option.
-     * The number of users who answered positive on a given option is expressed in an absolute number, in a percentage of the total
-     * and graphically using bars
-     * By clicking on the absolute number you get a list with the persons who have answered this.
-     * You can then click on the name of the person and you will then go to the report by user where you see all the
-     * answers of that user.
-     *
-     * @param     array     All the survey data
-     * @return     string    html code that displays the report by question
-     * @todo allow switching between horizontal and vertical.
-     * @todo multiple response: percentage are probably not OK
-     * @todo the question and option text have to be shortened and should expand when the user clicks on it.
-     * @todo the pagebreak and comment question types should not be shown => removed from $survey_data before
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007 - Updated March 2008
-     */
-    static function display_question_report($survey_data)
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result, 'ASSOC')) {
+				if($row['type'] != 'pagebreak') {
+					$questions[$row['sort']]['question_id'] 						= $row['question_id'];
+					$questions[$row['sort']]['survey_id'] 							= $row['survey_id'];
+					$questions[$row['sort']]['survey_question'] 					= $row['survey_question'];
+					$questions[$row['sort']]['display'] 							= $row['display'];
+					$questions[$row['sort']]['type'] 								= $row['type'];
+					$questions[$row['sort']]['maximum_score'] 						= $row['max_value'];
+					$questions[$row['sort']]['options'][$row['question_option_id']] = $row['option_text'];
+				}
+			}
+
+			// Getting all the answers of the user
+			$sql = "SELECT * FROM $table_survey_answer
+			        WHERE
+                        c_id = $course_id AND
+                        survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+                        user = '".Database::escape_string($_GET['user'])."'";
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result, 'ASSOC')) {
+				$answers[$row['question_id']][] = $row['option_id'];
+				$all_answers[$row['question_id']][] = $row;
+			}
+			// Displaying all the questions
+			$second_parameter=array();
+
+			foreach ($questions as $key => & $question) {
+				// If the question type is a scoring then we have to format the answers differently
+				if ($question['type'] == 'score') {
+					if (is_array($question) && is_array($all_answers)) {
+						foreach ($all_answers[$question['question_id']] as $key => & $answer_array) {
+							$second_parameter[$answer_array['option_id']] = $answer_array['value'];
+						}
+					}
+				} else {
+					$second_parameter = $answers[$question['question_id']];
+					if ($question['type'] == 'open') {
+						$second_parameter = array();
+						$second_parameter[] = $all_answers[$question['question_id']][0]['option_id'];
+					}
+				}
+				$ch_type = 'ch_'.$question['type'];
+				$display = new $ch_type;
+				$display->render_question($question, $second_parameter);
+			}
+		}
+	}
+
+	/**
+	 * This function displays the report by question.
+	 *
+	 * It displays a table with all the options of the question and the number of users who have answered positively on the option.
+	 * The number of users who answered positive on a given option is expressed in an absolute number, in a percentage of the total
+	 * and graphically using bars
+	 * By clicking on the absolute number you get a list with the persons who have answered this.
+	 * You can then click on the name of the person and you will then go to the report by user where you see all the
+	 * answers of that user.
+	 *
+	 * @param 	array 	All the survey data
+	 * @return 	string	html code that displays the report by question
+	 * @todo allow switching between horizontal and vertical.
+	 * @todo multiple response: percentage are probably not OK
+	 * @todo the question and option text have to be shortened and should expand when the user clicks on it.
+	 * @todo the pagebreak and comment question types should not be shown => removed from $survey_data before
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007 - Updated March 2008
+	 */
+	function display_question_report($survey_data)
     {
-        $course_id = api_get_course_int_id();
-        $data = array();
-        $number_of_answers = 0;
-
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-
-        // Determining the offset of the sql statement (the n-th question of the survey)
-        if (!isset($_GET['question'])) {
-            $offset = 0;
-        } else {
-            $offset = Database::escape_string($_GET['question']);
-        }
+	    $course_id = api_get_course_int_id();
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		// Determining the offset of the sql statement (the n-th question of the survey)
+		if (!isset($_GET['question'])) {
+			$offset = 0;
+		} else {
+			$offset = Database::escape_string($_GET['question']);
+		}
 
-        echo '<div class="actions">';
-        echo '<a href="reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon(
-            'back.png',
-            get_lang('BackTo').' '.get_lang('ReportingOverview'),
-            '',
-            ICON_SIZE_MEDIUM
-        ).'</a>';
+		echo '<div class="actions">';
+		echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
 
-        if ($survey_data['number_of_questions'] > 0) {
-            echo '<div id="question_report_questionnumbers">'.get_lang('GoToQuestion').': ';
-            for ($i = 1; $i <= $survey_data['number_of_questions']; $i++) {
-                if ($offset != $i - 1) {
-                    echo '<a href="reporting.php?action=questionreport&amp;survey_id='.Security::remove_XSS(
-                        $_GET['survey_id']
-                    ).'&amp;question='.($i - 1).'">'.$i.'</a>';
-                } else {
-                    echo $i;
-                }
-                if ($i < $survey_data['number_of_questions']) {
-                    echo ' | ';
-                }
-            }
-            echo '</div>';
-
-            // Getting the question information
-            $sql = "SELECT * FROM $table_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-                $_GET['survey_id']
-            )."' AND type<>'pagebreak' AND type<>'comment' ORDER BY sort ASC LIMIT ".$offset.",1";
-            $result = Database::query($sql);
-            $question = Database::fetch_array($result);
-
-            // Navigate through the questions (next and previous)
-            if ($_GET['question'] != 0) {
-                echo '<a href="reporting.php?action='.Security::remove_XSS(
-                    $_GET['action']
-                ).'&amp;survey_id='.$_GET['survey_id'].'&amp;question='.Security::remove_XSS(
-                    $offset - 1
-                ).'">'.Display::return_icon(
-                    'action_prev.png',
-                    get_lang('PreviousQuestion'),
-                    array('align' => 'middle')
-                ).' '.get_lang('PreviousQuestion').'</a>  ';
-            } else {
-                echo Display::return_icon(
-                    'action_prev.png',
-                    get_lang('PreviousQuestion'),
-                    array('align' => 'middle')
-                ).' '.get_lang('PreviousQuestion').' ';
-            }
-            echo ' | ';
-            if ($_GET['question'] < ($survey_data['number_of_questions'] - 1)) {
-                echo '<a href="reporting.php?action='.Security::remove_XSS(
-                    $_GET['action']
-                ).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.Security::remove_XSS(
-                    $offset + 1
-                ).'">'.get_lang('NextQuestion').' '.Display::return_icon(
-                    'action_next.png',
-                    get_lang('NextQuestion'),
-                    array('align' => 'middle')
-                ).'</a>';
-            } else {
-                echo get_lang('NextQuestion').' '.Display::return_icon(
-                    'action_next.png',
-                    get_lang('NextQuestion'),
-                    array('align' => 'middle')
-                );
-            }
-        }
+		if ($survey_data['number_of_questions'] > 0) {
+			echo '<div id="question_report_questionnumbers">'.get_lang('GoToQuestion').': ';
+			for ($i = 1; $i <= $survey_data['number_of_questions']; $i++) {
+				if ($offset != $i - 1) {
+					echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.($i-1).'">'.$i.'</a>';
+				} else {
+					echo $i;
+				}
+				if ($i < $survey_data['number_of_questions']) {
+					echo ' | ';
+				}
+			}
+			echo '</div>';
+
+			// Getting the question information
+			$sql = "SELECT * FROM $table_survey_question
+			        WHERE
+			            c_id = $course_id AND
+                        survey_id='".Database::escape_string($_GET['survey_id'])."' AND
+                        type<>'pagebreak' AND type<>'comment'
+                    ORDER BY sort ASC
+                    LIMIT ".$offset.",1";
+			$result = Database::query($sql);
+			$question = Database::fetch_array($result);
+
+			// Navigate through the questions (next and previous)
+			if ($_GET['question'] != 0) {
+				echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&amp;survey_id='.$_GET['survey_id'].'&amp;question='.Security::remove_XSS($offset-1).'">'.Display::return_icon('action_prev.png', get_lang('PreviousQuestion'), array('align' => 'middle')).' '.get_lang('PreviousQuestion').'</a>  ';
+			} else {
+				echo Display::return_icon('action_prev.png', get_lang('PreviousQuestion'), array('align' => 'middle')).' '.get_lang('PreviousQuestion').' ';
+			}
+			echo ' | ';
+			if ($_GET['question'] < ($survey_data['number_of_questions'] - 1)) {
+				echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.Security::remove_XSS($offset+1).'">'.get_lang('NextQuestion').' '.Display::return_icon('action_next.png', get_lang('NextQuestion'), array('align' => 'middle')).'</a>';
+			} else {
+				echo get_lang('NextQuestion').' '.Display::return_icon('action_next.png', get_lang('NextQuestion'), array('align' => 'middle'));
+			}
+		}
 
-        echo $question['survey_question'];
-
-        if ($question['type'] == 'score') {
-            /** @todo This function should return the options as this is needed further in the code */
-            $options = SurveyUtil::display_question_report_score($survey_data, $question, $offset);
-        } elseif ($question['type'] == 'open') {
-            /** @todo Also get the user who has answered this */
-            $sql = "SELECT * FROM $table_survey_answer
-                        WHERE   c_id = $course_id AND
-                                survey_id='".Database::escape_string($_GET['survey_id'])."' AND
-                                question_id = '".Database::escape_string($question['question_id'])."'";
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result)) {
-                echo $row['option_id'].'<hr noshade="noshade" size="1" />';
-            }
-        } else {
-            // Getting the options
-            $sql = "SELECT * FROM $table_survey_question_option
-						WHERE c_id = $course_id AND survey_id='".Database::escape_string($_GET['survey_id'])."'
-						AND question_id = '".Database::escape_string($question['question_id'])."'
-						ORDER BY sort ASC";
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result)) {
-                $options[$row['question_option_id']] = $row;
-            }
-            // Getting the answers
-            $sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
+		echo $question['survey_question'];
+
+		if ($question['type'] == 'score') {
+			/** @todo This function should return the options as this is needed further in the code */
+			$options = SurveyUtil::display_question_report_score($survey_data, $question, $offset);
+		} elseif ($question['type'] == 'open') {
+			/** @todo Also get the user who has answered this */
+			$sql = "SELECT * FROM $table_survey_answer
+                    WHERE
+                        c_id = $course_id AND
+                        survey_id='".Database::escape_string($_GET['survey_id'])."' AND
+                        question_id = '".Database::escape_string($question['question_id'])."'";
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result)) {
+				echo $row['option_id'].'<hr noshade="noshade" size="1" />';
+			}
+		} else {
+			// Getting the options
+			$sql = "SELECT * FROM $table_survey_question_option
+                    WHERE
+                        c_id = $course_id AND survey_id='".Database::escape_string($_GET['survey_id'])."' AND
+                        question_id = '".Database::escape_string($question['question_id'])."'
+                    ORDER BY sort ASC";
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result)) {
+				$options[$row['question_option_id']] = $row;
+			}
+			// Getting the answers
+			$sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
 						WHERE c_id = $course_id AND
 						      survey_id='".Database::escape_string($_GET['survey_id'])."' AND
 						      question_id = '".Database::escape_string($question['question_id'])."'
 						GROUP BY option_id, value";
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result)) {
-                $number_of_answers += $row['total'];
-                $data[$row['option_id']] = $row;
-            }
-
-
-            // displaying the table: headers
-            echo '<table class="data_table">';
-            echo '	<tr>';
-            echo '		<th>&nbsp;</th>';
-            echo '		<th>'.get_lang('AbsoluteTotal').'</th>';
-            echo '		<th>'.get_lang('Percentage').'</th>';
-            echo '		<th>'.get_lang('VisualRepresentation').'</th>';
-            echo '	<tr>';
-
-            // Displaying the table: the content
-            if (is_array($options)) {
-                foreach ($options as $key => & $value) {
-                    $absolute_number = $data[$value['question_option_id']]['total'];
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result)) {
+				$number_of_answers += $row['total'];
+				$data[$row['option_id']] = $row;
+			}
+
+
+			// displaying the table: headers
+			echo '<table class="data_table">';
+			echo '	<tr>';
+			echo '		<th>&nbsp;</th>';
+			echo '		<th>'.get_lang('AbsoluteTotal').'</th>';
+			echo '		<th>'.get_lang('Percentage').'</th>';
+			echo '		<th>'.get_lang('VisualRepresentation').'</th>';
+			echo '	<tr>';
+
+			// Displaying the table: the content
+			if (is_array($options)) {
+				foreach ($options as $key => & $value) {
+					$absolute_number = $data[$value['question_option_id']]['total'];
                     if ($question['type'] == 'percentage' && empty($absolute_number)) {
                         continue;
                     }
-                    if ($number_of_answers == 0) {
-                        $answers_number = 0;
-                    } else {
-                        $answers_number = $absolute_number / $number_of_answers * 100;
-                    }
-                    echo '	<tr>';
-                    echo '		<td>'.$value['option_text'].'</td>';
-                    echo '		<td align="right"><a href="reporting.php?action='.Security::remove_XSS(
-                        $_GET['action']
-                    ).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.Security::remove_XSS(
-                        $offset
-                    ).'&amp;viewoption='.$value['question_option_id'].'">'.$absolute_number.'</a></td>';
-                    echo '		<td align="right">'.round($answers_number, 2).' %</td>';
-                    echo '		<td align="right">';
-                    $size = $answers_number * 2;
-                    if ($size > 0) {
-                        echo '<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
-                    }
-                    echo '		</td>';
-                    echo '	</tr>';
-                }
-            }
-            // displaying the table: footer (totals)
-            echo '	<tr>';
-            echo '		<td style="border-top:1px solid black;"><b>'.get_lang('Total').'</b></td>';
-            echo '		<td style="border-top:1px solid black;" align="right"><b>'.($number_of_answers == 0 ? '0' : $number_of_answers).'</b></td>';
-            echo '		<td style="border-top:1px solid black;">&nbsp;</td>';
-            echo '		<td style="border-top:1px solid black;">&nbsp;</td>';
-            echo '	</tr>';
-
-            echo '</table>';
-        }
-
-        if (isset($_GET['viewoption'])) {
-            echo get_lang('PeopleWhoAnswered').': '.$options[Security::remove_XSS(
-                $_GET['viewoption']
-            )]['option_text'].'<br />';
+					if ($number_of_answers == 0) {
+						$answers_number = 0;
+					} else {
+						$answers_number = $absolute_number/$number_of_answers*100;
+					}
+					echo '	<tr>';
+					echo '		<td>'.$value['option_text'].'</td>';
+					echo '		<td align="right"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.Security::remove_XSS($offset).'&amp;viewoption='.$value['question_option_id'].'">'.$absolute_number.'</a></td>';
+					echo '		<td align="right">'.round($answers_number, 2).' %</td>';
+					echo '		<td align="right">';
+					$size = $answers_number*2;
+					if ($size > 0) {
+						echo '<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
+					}
+					echo '		</td>';
+					echo '	</tr>';
+				}
+			}
+			// displaying the table: footer (totals)
+			echo '	<tr>';
+			echo '		<td style="border-top:1px solid black;"><b>'.get_lang('Total').'</b></td>';
+			echo '		<td style="border-top:1px solid black;" align="right"><b>'.($number_of_answers==0?'0':$number_of_answers).'</b></td>';
+			echo '		<td style="border-top:1px solid black;">&nbsp;</td>';
+			echo '		<td style="border-top:1px solid black;">&nbsp;</td>';
+			echo '	</tr>';
+
+			echo '</table>';
+		}
 
-            if (is_numeric($_GET['value'])) {
-                $sql_restriction = "AND value='".Database::escape_string($_GET['value'])."'";
-            }
+		if (isset($_GET['viewoption'])) {
+			echo get_lang('PeopleWhoAnswered').': '.$options[Security::remove_XSS($_GET['viewoption'])]['option_text'].'<br />';
 
-            $sql = "SELECT user FROM $table_survey_answer WHERE c_id = $course_id AND option_id = '".Database::escape_string(
-                $_GET['viewoption']
-            )."' $sql_restriction";
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result)) {
-                $user_info = api_get_user_info($row['user']);
-                echo '<a href="reporting.php?action=userreport&survey_id='.Security::remove_XSS(
-                    $_GET['survey_id']
-                ).'&user='.$row['user'].'">'.$user_info['complete_name'].'</a><br />';
-            }
-        }
-    }
+			if (is_numeric($_GET['value'])) {
+				$sql_restriction = "AND value='".Database::escape_string($_GET['value'])."'";
+			}
 
-    /**
-     * Display score data about a survey question
-     * @param    array    Question info
-     * @param    integer    The offset of results shown
-     * @return    void     (direct output)
-     */
-    function display_question_report_score($survey_data, $question, $offset)
+			$sql = "SELECT user FROM $table_survey_answer WHERE c_id = $course_id AND option_id = '".Database::escape_string($_GET['viewoption'])."' $sql_restriction";
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result)) {
+			    $user_info = api_get_user_info($row['user']);
+				echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user='.$row['user'].'">'.$user_info['complete_name'].'</a><br />';
+			}
+		}
+	}
+
+	/**
+	 * Display score data about a survey question
+	 * @param	array	Question info
+	 * @param	integer	The offset of results shown
+	 * @return	void 	(direct output)
+	 */
+	function display_question_report_score($survey_data, $question, $offset)
     {
-        $course_id = api_get_course_int_id();
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+	    $course_id = api_get_course_int_id();
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
 
         $course_id = api_get_course_int_id();
 
-        // Getting the options
-        $sql = "SELECT * FROM $table_survey_question_option
-					WHERE c_id = $course_id AND
-					       survey_id='".Database::escape_string($_GET['survey_id'])."'
-					AND question_id = '".Database::escape_string($question['question_id'])."'
-					ORDER BY sort ASC";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            $options[$row['question_option_id']] = $row;
-        }
-
-        // Getting the answers
-        $sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
-					WHERE
-					   c_id = $course_id AND
-					   survey_id='".Database::escape_string($_GET['survey_id'])."'
-					   AND question_id = '".Database::escape_string($question['question_id'])."'
-					GROUP BY option_id, value";
-        $result = Database::query($sql);
-        $number_of_answers = 0;
-        while ($row = Database::fetch_array($result)) {
-            $number_of_answers += $row['total'];
-            $data[$row['option_id']][$row['value']] = $row;
-        }
-        // Displaying the table: headers
-        echo '<table class="data_table">';
-        echo '	<tr>';
-        echo '		<th>&nbsp;</th>';
-        echo '		<th>'.get_lang('Score').'</th>';
-        echo '		<th>'.get_lang('AbsoluteTotal').'</th>';
-        echo '		<th>'.get_lang('Percentage').'</th>';
-        echo '		<th>'.get_lang('VisualRepresentation').'</th>';
-        echo '	<tr>';
-        // Displaying the table: the content
-        foreach ($options as $key => & $value) {
-            for ($i = 1; $i <= $question['max_value']; $i++) {
-                $absolute_number = $data[$value['question_option_id']][$i]['total'];
-                echo '	<tr>';
-                echo '		<td>'.$value['option_text'].'</td>';
-                echo '		<td>'.$i.'</td>';
-                echo '		<td><a href="reporting.php?action='.Security::remove_XSS(
-                    $_GET['action']
-                ).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.Security::remove_XSS(
-                    $offset
-                ).'&amp;viewoption='.$value['question_option_id'].'&amp;value='.$i.'">'.$absolute_number.'</a></td>';
-                echo '		<td>'.round($absolute_number / $number_of_answers * 100, 2).' %</td>';
-                echo '		<td>';
-                $size = ($absolute_number / $number_of_answers * 100 * 2);
-                if ($size > 0) {
-                    echo '			<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
-                }
-                echo '		</td>';
-                echo '	</tr>';
-            }
-        }
-        // Displaying the table: footer (totals)
-        echo '	<tr>';
-        echo '		<td style="border-top:1px solid black"><b>'.get_lang('Total').'</b></td>';
-        echo '		<td style="border-top:1px solid black">&nbsp;</td>';
-        echo '		<td style="border-top:1px solid black"><b>'.$number_of_answers.'</b></td>';
-        echo '		<td style="border-top:1px solid black">&nbsp;</td>';
-        echo '		<td style="border-top:1px solid black">&nbsp;</td>';
-        echo '	</tr>';
-
-        echo '</table>';
-    }
+		// Getting the options
+		$sql = "SELECT * FROM $table_survey_question_option
+                WHERE
+                    c_id = $course_id AND
+                    survey_id='".Database::escape_string($_GET['survey_id'])."' AND
+                    question_id = '".Database::escape_string($question['question_id'])."'
+                ORDER BY sort ASC";
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			$options[$row['question_option_id']] = $row;
+		}
 
-    /**
-     * This functions displays the complete reporting
-     * @return    string    HTML code
-     * @todo open questions are not in the complete report yet.
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function display_complete_report()
+		// Getting the answers
+		$sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
+                WHERE
+                   c_id = $course_id AND
+                   survey_id='".Database::escape_string($_GET['survey_id'])."' AND
+                   question_id = '".Database::escape_string($question['question_id'])."'
+                GROUP BY option_id, value";
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			$number_of_answers += $row['total'];
+			$data[$row['option_id']][$row['value']] = $row;
+		}
+		// Displaying the table: headers
+		echo '<table class="data_table">';
+		echo '	<tr>';
+		echo '		<th>&nbsp;</th>';
+		echo '		<th>'.get_lang('Score').'</th>';
+		echo '		<th>'.get_lang('AbsoluteTotal').'</th>';
+		echo '		<th>'.get_lang('Percentage').'</th>';
+		echo '		<th>'.get_lang('VisualRepresentation').'</th>';
+		echo '	<tr>';
+		// Displaying the table: the content
+		foreach ($options as $key => & $value) {
+			for ($i = 1; $i <= $question['max_value']; $i++) {
+				$absolute_number = $data[$value['question_option_id']][$i]['total'];
+				echo '	<tr>';
+				echo '		<td>'.$value['option_text'].'</td>';
+				echo '		<td>'.$i.'</td>';
+				echo '		<td><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&amp;survey_id='.Security::remove_XSS($_GET['survey_id']).'&amp;question='.Security::remove_XSS($offset).'&amp;viewoption='.$value['question_option_id'].'&amp;value='.$i.'">'.$absolute_number.'</a></td>';
+				echo '		<td>'.round($absolute_number/$number_of_answers*100, 2).' %</td>';
+				echo '		<td>';
+				$size = ($absolute_number/$number_of_answers*100*2);
+				if ($size > 0) {
+					echo '			<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
+				}
+				echo '		</td>';
+				echo '	</tr>';
+			}
+		}
+		// Displaying the table: footer (totals)
+		echo '	<tr>';
+		echo '		<td style="border-top:1px solid black"><b>'.get_lang('Total').'</b></td>';
+		echo '		<td style="border-top:1px solid black">&nbsp;</td>';
+		echo '		<td style="border-top:1px solid black"><b>'.$number_of_answers.'</b></td>';
+		echo '		<td style="border-top:1px solid black">&nbsp;</td>';
+		echo '		<td style="border-top:1px solid black">&nbsp;</td>';
+		echo '	</tr>';
+
+		echo '</table>';
+	}
+
+	/**
+	 * This functions displays the complete reporting
+	 * @return	string	HTML code
+	 * @todo open questions are not in the complete report yet.
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function display_complete_report($survey_data)
     {
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-
-        // Actions bar
-        echo '<div class="actions">';
-        echo '<a href="reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">
-		'.Display::return_icon(
-            'back.png',
-            get_lang('BackTo').' '.get_lang('ReportingOverview'),
-            '',
-            ICON_SIZE_MEDIUM
-        ).'</a>';
-        echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1a.submit();">
-		'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
-        echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1b.submit();">
-		'.Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
-        echo '</div>';
-
-        // The form
-        echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self().'?action='.Security::remove_XSS(
-            $_GET['action']
-        ).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
-        echo '<input type="hidden" name="export_report" value="export_report">';
-        echo '<input type="hidden" name="export_format" value="csv">';
-        echo '</form>';
-        echo '<form id="form1b" name="form1b" method="post" action="'.api_get_self().'?action='.Security::remove_XSS(
-            $_GET['action']
-        ).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
-        echo '<input type="hidden" name="export_report" value="export_report">';
-        echo '<input type="hidden" name="export_format" value="xls">';
-        echo '</form>';
-
-        echo '<form id="form2" name="form2" method="post" action="'.api_get_self().'?action='.Security::remove_XSS(
-            $_GET['action']
-        ).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
-
-        // The table
-        echo '<br /><table class="data_table" border="1">';
-        // Getting the number of options per question
-        echo '	<tr>';
-        echo '		<th>';
-        if ($_POST['submit_question_filter'] || $_POST['export_report']) {
-            echo '<button class="cancel" type="submit" name="reset_question_filter" value="'.get_lang(
-                'ResetQuestionFilter'
-            ).'">'.get_lang('ResetQuestionFilter').'</button>';
-        }
-        echo '<button class="save" type="submit" name="submit_question_filter" value="'.get_lang(
-            'SubmitQuestionFilter'
-        ).'">'.get_lang('SubmitQuestionFilter').'</button>';
-        echo '</th>';
-
-        $display_extra_user_fields = false;
-        if (!($_POST['submit_question_filter'] || $_POST['export_report']) || !empty($_POST['fields_filter'])) {
-            // Show user fields section with a big th colspan that spans over all fields
-            $extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false, true);
-            $num = count($extra_user_fields);
-            if ($num > 0) {
-                echo '<th '.($num > 0 ? ' colspan="'.$num.'"' : '').'>';
-                echo '<label><input type="checkbox" name="fields_filter" value="1" checked="checked"/> ';
-                echo get_lang('UserFields');
-                echo '</label>';
-                echo '</th>';
-                $display_extra_user_fields = true;
-            }
-        }
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		// Actions bar
+		echo '<div class="actions">';
+		echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">
+		'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+		echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1a.submit();">
+		'.Display::return_icon('export_csv.png',get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+		echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1b.submit();">
+		'.Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a>';
+		echo '</div>';
+
+		// The form
+		echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
+		echo '<input type="hidden" name="export_report" value="export_report">';
+		echo '<input type="hidden" name="export_format" value="csv">';
+		echo '</form>';
+		echo '<form id="form1b" name="form1b" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
+		echo '<input type="hidden" name="export_report" value="export_report">';
+		echo '<input type="hidden" name="export_format" value="xls">';
+		echo '</form>';
+
+		echo '<form id="form2" name="form2" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
+
+		// The table
+		echo '<br /><table class="data_table" border="1">';
+		// Getting the number of options per question
+		echo '	<tr>';
+		echo '		<th>';
+		if ($_POST['submit_question_filter'] || $_POST['export_report']) {
+			echo '<button class="cancel" type="submit" name="reset_question_filter" value="'.get_lang('ResetQuestionFilter').'">'.get_lang('ResetQuestionFilter').'</button>';
+		}
+		echo '<button class="save" type="submit" name="submit_question_filter" value="'.get_lang('SubmitQuestionFilter').'">'.get_lang('SubmitQuestionFilter').'</button>';
+		echo '</th>';
+
+		$display_extra_user_fields = false;
+		if (!($_POST['submit_question_filter'] || $_POST['export_report']) || !empty($_POST['fields_filter'])) {
+			// Show user fields section with a big th colspan that spans over all fields
+			$extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false, true);
+			$num = count($extra_user_fields);
+			if ($num > 0 ) {
+				echo '<th '.($num>0?' colspan="'.$num.'"':'').'>';
+				echo '<label><input type="checkbox" name="fields_filter" value="1" checked="checked"/> ';
+				echo get_lang('UserFields');
+				echo '</label>';
+				echo '</th>';
+				$display_extra_user_fields = true;
+			}
+		}
 
-        $course_id = api_get_course_int_id();
+		$course_id = api_get_course_int_id();
 
 
-        // Get all the questions ordered by the "sort" column
-        // <hub> modify the query to display open questions too
-        //		$sql = "SELECT q.question_id, q.type, q.survey_question, count(o.question_option_id) as number_of_options
-        //				FROM $table_survey_question q LEFT JOIN $table_survey_question_option o
-        //				ON q.question_id = o.question_id
-        //				WHERE q.question_id = o.question_id
-        //				AND q.survey_id = '".Database::escape_string($_GET['survey_id'])."'
-        //				GROUP BY q.question_id
-        //				ORDER BY q.sort ASC";
-        $sql = "SELECT q.question_id, q.type, q.survey_question, count(o.question_option_id) as number_of_options
+		// Get all the questions ordered by the "sort" column
+		// <hub> modify the query to display open questions too
+		//		$sql = "SELECT q.question_id, q.type, q.survey_question, count(o.question_option_id) as number_of_options
+		//				FROM $table_survey_question q LEFT JOIN $table_survey_question_option o
+		//				ON q.question_id = o.question_id
+		//				WHERE q.question_id = o.question_id
+		//				AND q.survey_id = '".Database::escape_string($_GET['survey_id'])."'
+		//				GROUP BY q.question_id
+		//				ORDER BY q.sort ASC";
+		$sql = "SELECT q.question_id, q.type, q.survey_question, count(o.question_option_id) as number_of_options
 				FROM $table_survey_question q LEFT JOIN $table_survey_question_option o
 				ON q.question_id = o.question_id
 				WHERE q.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
@@ -3370,549 +3037,466 @@ class SurveyUtil
 				o.c_id = $course_id
 				GROUP BY q.question_id
 				ORDER BY q.sort ASC";
-        // </hub>
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            // We show the questions if
-            // 1. there is no question filter and the export button has not been clicked
-            // 2. there is a quesiton filter but the question is selected for display
-            //if (!($_POST['submit_question_filter'] || $_POST['export_report']) || in_array($row['question_id'], $_POST['questions_filter'])) {
-            if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array(
-                $row['question_id'],
-                $_POST['questions_filter']
-            ))
-            ) {
-                // We do not show comment and pagebreak question types
-                if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
-                    echo '		<th';
-                    // <hub> modified tst to include percentage
-                    if ($row['number_of_options'] > 0 && $row['type'] != 'percentage') {
-                        // </hub>
-                        echo ' colspan="'.$row['number_of_options'].'"';
-                    }
-                    echo '>';
-
-                    echo '<label><input type="checkbox" name="questions_filter[]" value="'.$row['question_id'].'" checked="checked"/> ';
-                    echo $row['survey_question'];
-                    echo '</label>';
-                    echo '</th>';
-                }
-                // No column at all if it's not a question
-            }
-            $questions[$row['question_id']] = $row;
-        }
-        echo '	</tr>';
-        // Getting all the questions and options
-        echo '	<tr>';
-        echo '		<th>&nbsp;</th>'; // the user column
-
-        if (!($_POST['submit_question_filter'] || $_POST['export_report']) || !empty($_POST['fields_filter'])) {
-            //show the fields names for user fields
-            foreach ($extra_user_fields as & $field) {
-                echo '<th>'.$field[3].'</th>';
-            }
-        }
+		// </hub>
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			// We show the questions if
+			// 1. there is no question filter and the export button has not been clicked
+			// 2. there is a quesiton filter but the question is selected for display
+			//if (!($_POST['submit_question_filter'] || $_POST['export_report']) || in_array($row['question_id'], $_POST['questions_filter'])) {
+			if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array($row['question_id'], $_POST['questions_filter']))) {
+				// We do not show comment and pagebreak question types
+				if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
+					echo '		<th';
+					// <hub> modified tst to include percentage
+					if ($row['number_of_options'] > 0 && $row['type'] != 'percentage') {
+					// </hub>
+						echo ' colspan="'.$row['number_of_options'].'"';
+					}
+					echo '>';
+
+					echo '<label><input type="checkbox" name="questions_filter[]" value="'.$row['question_id'].'" checked="checked"/> ';
+					echo $row['survey_question'];
+					echo '</label>';
+					echo '</th>';
+				}
+				// No column at all if it's not a question
+			}
+			$questions[$row['question_id']] = $row;
+		}
+		echo '	</tr>';
+		// Getting all the questions and options
+		echo '	<tr>';
+		echo '		<th>&nbsp;</th>'; // the user column
+
+		if (!($_POST['submit_question_filter'] || $_POST['export_report']) || !empty($_POST['fields_filter'])) {
+			//show the fields names for user fields
+			foreach($extra_user_fields as & $field) {
+				echo '<th>'.$field[3].'</th>';
+			}
+		}
 
-        // cells with option (none for open question)
-        $sql = "SELECT 	sq.question_id, sq.survey_id,
+		// cells with option (none for open question)
+		$sql = "SELECT 	sq.question_id, sq.survey_id,
 						sq.survey_question, sq.display,
 						sq.sort, sq.type, sqo.question_option_id,
 						sqo.option_text, sqo.sort as option_sort
 				FROM $table_survey_question sq
 				LEFT JOIN $table_survey_question_option sqo
 				ON sq.question_id = sqo.question_id
-				WHERE sq.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
-				sq.c_id = $course_id AND
-				sqo.c_id = $course_id
+				WHERE
+				    sq.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+                    sq.c_id = $course_id AND
+                    sqo.c_id = $course_id
 				ORDER BY sq.sort ASC, sqo.sort ASC";
-        $result = Database::query($sql);
-
-        $display_percentage_header = 1; // in order to display only once the cell option (and not 100 times)
-        while ($row = Database::fetch_array($result)) {
-            // We show the options if
-            // 1. there is no question filter and the export button has not been clicked
-            // 2. there is a question filter but the question is selected for display
-            //if (!($_POST['submit_question_filter'] || $_POST['export_report']) || in_array($row['question_id'], $_POST['questions_filter'])) {
-            if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array(
-                $row['question_id'],
-                $_POST['questions_filter']
-            ))
-            ) {
-                // <hub> modif 05-05-2010
-                // we do not show comment and pagebreak question types
-                if ($row['type'] == 'open') {
-                    echo '<th>&nbsp;-&nbsp;</th>';
-                    $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
-                    $display_percentage_header = 1;
-                } else {
-                    if ($row['type'] == 'percentage' && $display_percentage_header) {
-                        echo '<th>&nbsp;%&nbsp;</th>';
-                        $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
-                        $display_percentage_header = 0;
-                    } else {
-                        if ($row['type'] == 'percentage') {
-                            $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
-                        } else {
-                            if ($row['type'] <> 'comment' AND $row['type'] <> 'pagebreak' AND $row['type'] <> 'percentage') {
-                                echo '<th>';
-                                echo $row['option_text'];
-                                echo '</th>';
-                                $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
-                                $display_percentage_header = 1;
-                            }
-                        }
-                    }
-                }
-                //no column at all if the question was not a question
-                // </hub>
-            }
-        }
-
-        echo '	</tr>';
-
-        // Getting all the answers of the users
-        $old_user = '';
-        $answers_of_user = array();
-        $sql = "SELECT * FROM $table_survey_answer WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $_GET['survey_id']
-        )."' ORDER BY user ASC";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            if ($old_user != $row['user'] && $old_user != '') {
-                SurveyUtil::display_complete_report_row(
-                    $possible_answers,
-                    $answers_of_user,
-                    $old_user,
-                    $questions,
-                    $display_extra_user_fields
-                );
-                $answers_of_user = array();
-            }
-            if ($questions[$row['question_id']]['type'] != 'open') {
-                $answers_of_user[$row['question_id']][$row['option_id']] = $row;
-            } else {
-                $answers_of_user[$row['question_id']][0] = $row;
-            }
-            $old_user = $row['user'];
-        }
-        SurveyUtil::display_complete_report_row(
-            $possible_answers,
-            $answers_of_user,
-            $old_user,
-            $questions,
-            $display_extra_user_fields
-        ); // This is to display the last user
-
-        echo '</table>';
-
-        echo '</form>';
-    }
+		$result = Database::query($sql);
+
+		$display_percentage_header = 1;	// in order to display only once the cell option (and not 100 times)
+		while ($row = Database::fetch_array($result)) {
+			// We show the options if
+			// 1. there is no question filter and the export button has not been clicked
+			// 2. there is a question filter but the question is selected for display
+			//if (!($_POST['submit_question_filter'] || $_POST['export_report']) || in_array($row['question_id'], $_POST['questions_filter'])) {
+			if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array($row['question_id'], $_POST['questions_filter']))) {
+				// <hub> modif 05-05-2010
+				// we do not show comment and pagebreak question types
+				if ($row['type'] == 'open') {
+					echo '<th>&nbsp;-&nbsp;</th>';
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
+					$display_percentage_header = 1;
+				} else if ($row['type'] == 'percentage' && $display_percentage_header) {
+					echo '<th>&nbsp;%&nbsp;</th>';
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
+					$display_percentage_header = 0;
+				} else if ($row['type'] == 'percentage') {
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
+				} else if ($row['type'] <> 'comment' AND $row['type'] <> 'pagebreak' AND $row['type'] <> 'percentage') {
+					echo '<th>';
+					echo $row['option_text'];
+					echo '</th>';
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
+					$display_percentage_header = 1;
+				}
+				//no column at all if the question was not a question
+				// </hub>
+			}
+		}
 
-    /**
-     * This function displays a row (= a user and his/her answers) in the table of the complete report.
-     *
-     * @param     array    Possible options
-     * @param     array     User answers
-     * @param    mixed    User ID or user details string
-     * @param    boolean    Whether to show extra user fields or not
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007 - Updated March 2008
-     */
-    static function display_complete_report_row(
-        $possible_options,
-        $answers_of_user,
-        $user,
-        $questions,
-        $display_extra_user_fields = false
-    ) {
-        global $survey_data;
+		echo '	</tr>';
+
+		// Getting all the answers of the users
+		$old_user = '';
+		$answers_of_user = array();
+		$sql = "SELECT * FROM $table_survey_answer WHERE c_id = $course_id AND survey_id='".Database::escape_string($_GET['survey_id'])."' ORDER BY user ASC";
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			if ($old_user != $row['user'] && $old_user != '') {
+				SurveyUtil::display_complete_report_row($survey_data, $possible_answers, $answers_of_user, $old_user, $questions, $display_extra_user_fields);
+				$answers_of_user=array();
+			}
+			if ($questions[$row['question_id']]['type'] != 'open') {
+				$answers_of_user[$row['question_id']][$row['option_id']] = $row;
+			} else {
+				$answers_of_user[$row['question_id']][0] = $row;
+			}
+			$old_user = $row['user'];
+		}
+		SurveyUtil::display_complete_report_row($survey_data, $possible_answers, $answers_of_user, $old_user, $questions, $display_extra_user_fields);
+		// This is to display the last user
+		echo '</table>';
+		echo '</form>';
+	}
+
+	/**
+	 * This function displays a row (= a user and his/her answers) in the table of the complete report.
+	 *
+     * @param array $survey_data
+	 * @param 	array	Possible options
+	 * @param 	array 	User answers
+	 * @param	mixed	User ID or user details string
+	 * @param	boolean	Whether to show extra user fields or not
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007 - Updated March 2008
+	 */
+	static function display_complete_report_row($survey_data, $possible_options, $answers_of_user, $user, $questions, $display_extra_user_fields = false)
+    {
         $user = Security::remove_XSS($user);
-        echo '<tr>';
-        if ($survey_data['anonymous'] == 0) {
-            if (intval($user) !== 0) {
-                $sql = 'SELECT firstname, lastname FROM '.Database::get_main_table(
-                    TABLE_MAIN_USER
-                ).' WHERE user_id='.intval($user);
-                $rs = Database::query($sql);
-                if ($row = Database::fetch_array($rs)) {
-                    $user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
-                } else {
-                    $user_displayed = '-';
-                }
-                echo '<th><a href="'.api_get_self().'?action=userreport&survey_id='.Security::remove_XSS(
-                    $_GET['survey_id']
-                ).'&user='.$user.'">'.$user_displayed.'</a></th>'; // the user column
-            } else {
-                echo '<th>'.$user.'</th>'; // the user column
-            }
-        } else {
-            echo '<th>-</th>';
-        }
-
-        if ($display_extra_user_fields) {
-            // Show user fields data, if any, for this user
-            $user_fields_values = UserManager::get_extra_user_data(intval($user), false, false, false, true);
-            foreach ($user_fields_values as & $value) {
-                echo '<td align="center">'.$value.'</td>';
-            }
-        }
-        if (is_array($possible_options)) {
-            // <hub> modified to display open answers and percentage
-            foreach ($possible_options as $question_id => & $possible_option) {
-                if ($questions[$question_id]['type'] == 'open') {
-                    echo '<td align="center">';
-                    echo $answers_of_user[$question_id]['0']['option_id'];
-                    echo '</td>';
-                } else {
-                    foreach ($possible_option as $option_id => & $value) {
-                        if ($questions[$question_id]['type'] == 'percentage') {
-                            if (!empty($answers_of_user[$question_id][$option_id])) {
-                                echo "<td align='center'>";
-                                echo $answers_of_user[$question_id][$option_id]['value'];
-                                echo "</td>";
-                            }
-                        } else {
-                            echo '<td align="center">';
-                            if (!empty($answers_of_user[$question_id][$option_id])) {
-                                if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
-                                    echo $answers_of_user[$question_id][$option_id]['value'];
-                                } else {
-                                    echo 'v';
-                                }
-                            }
-                        } // </hub>
-                    }
-                }
-            }
-        }
-        echo '</tr>';
-    }
+		echo '<tr>';
+		if ($survey_data['anonymous'] == 0) {
+			if (intval($user) !== 0) {
+				$sql = 'SELECT firstname, lastname FROM '.Database::get_main_table(TABLE_MAIN_USER).' WHERE user_id='.intval($user);
+				$rs = Database::query($sql);
+				if ($row = Database::fetch_array($rs)) {
+					$user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
+				} else {
+					$user_displayed = '-';
+				}
+				echo '<th><a href="'.api_get_self().'?action=userreport&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user='.$user.'">'.$user_displayed.'</a></th>'; // the user column
+			} else {
+				echo '<th>'.$user.'</th>'; // the user column
+			}
+		} else {
+			echo '<th>' . get_lang('Anonymous') . '</th>';
+		}
 
-    /**
-     * Quite similar to display_complete_report(), returns an HTML string
-     * that can be used in a csv file
-     * @todo consider merging this function with display_complete_report
-     * @return    string    The contents of a csv file
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function export_complete_report($user_id = 0)
+		if ($display_extra_user_fields) {
+			// Show user fields data, if any, for this user
+			$user_fields_values = UserManager::get_extra_user_data(intval($user), false, false, false, true);
+			foreach ($user_fields_values as & $value) {
+				echo '<td align="center">'.$value.'</td>';
+			}
+		}
+		if (is_array($possible_options)) {
+			// <hub> modified to display open answers and percentage
+			foreach ($possible_options as $question_id => & $possible_option) {
+				if ($questions[$question_id]['type'] == 'open') {
+					echo '<td align="center">';
+					echo $answers_of_user[$question_id]['0']['option_id'];
+					echo '</td>';
+				} else {
+					foreach ($possible_option as $option_id => & $value) {
+						if ($questions[$question_id]['type'] == 'percentage') {
+							if (!empty($answers_of_user[$question_id][$option_id])) {
+								echo "<td align='center'>";
+								echo $answers_of_user[$question_id][$option_id]['value'];
+								echo "</td>";
+							}
+						}
+						else {
+							echo '<td align="center">';
+							if (!empty($answers_of_user[$question_id][$option_id])) {
+								if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
+									echo $answers_of_user[$question_id][$option_id]['value'];
+								}
+								else {
+									echo 'v';
+								}
+							}
+						} // </hub>
+					}
+				}
+			}
+		}
+		echo '</tr>';
+	}
+
+	/**
+	 * Quite similar to display_complete_report(), returns an HTML string
+	 * that can be used in a csv file
+	 * @todo consider merging this function with display_complete_report
+	 * @return	string	The contents of a csv file
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function export_complete_report($survey_data, $user_id = 0)
     {
 
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		// The first column
+		$return = ';';
 
-        // The first column
-        $return = ';';
+		// Show extra fields blank space (enough for extra fields on next line)
 
-        // Show extra fields blank space (enough for extra fields on next line)
-        //if (!empty($_REQUEST['fields_filter'])) {
-        //show user fields section with a big th colspan that spans over all fields
         $extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false, true);
 
         $num = count($extra_user_fields);
         $return .= str_repeat(';', $num);
-        //}
 
-        $course_id = api_get_course_int_id();
+		$course_id = api_get_course_int_id();
 
-        $sql = "SELECT questions.question_id, questions.type, questions.survey_question, count(options.question_option_id) as number_of_options
-				FROM $table_survey_question questions LEFT JOIN $table_survey_question_option options
+		$sql = "SELECT questions.question_id, questions.type, questions.survey_question, count(options.question_option_id) as number_of_options
+				FROM $table_survey_question questions
+                LEFT JOIN $table_survey_question_option options
 				ON questions.question_id = options.question_id  AND options.c_id = $course_id
-				WHERE   questions.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
-				        questions.c_id = $course_id
+				WHERE
+				    questions.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+                    questions.c_id = $course_id
 				GROUP BY questions.question_id
 				ORDER BY questions.sort ASC";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            // We show the questions if
-            // 1. there is no question filter and the export button has not been clicked
-            // 2. there is a quesiton filter but the question is selected for display
-            if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array(
-                $row['question_id'],
-                $_POST['questions_filter']
-            ))
-            ) {
-                // We do not show comment and pagebreak question types
-                if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
-                    if ($row['number_of_options'] == 0 && $row['type'] == 'open') {
-                        $return .= str_replace(
-                            "\r\n",
-                            '  ',
-                            api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)
-                        ).';';
-                    } else {
-                        for ($ii = 0; $ii < $row['number_of_options']; $ii++) {
-                            $return .= str_replace(
-                                "\r\n",
-                                '  ',
-                                api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)
-                            ).';';
-                        }
-                    }
-                }
-            }
-        }
-        $return .= "\n";
-
-        // Getting all the questions and options
-        $return .= ';';
-
-        // Show extra field values
-        //if (!($_POST['submit_question_filter'] || $_POST['export_report']) || !empty($_POST['fields_filter'])) {
-        // Show the fields names for user fields
-        if (!empty($extra_user_fields)) {
-            foreach ($extra_user_fields as & $field) {
-                $return .= '"'.str_replace(
-                    "\r\n",
-                    '  ',
-                    api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES)
-                ).'";';
-            }
-        }
-        //}
-
-        $sql = "SELECT 	survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type,
-						survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			// We show the questions if
+			// 1. there is no question filter and the export button has not been clicked
+			// 2. there is a quesiton filter but the question is selected for display
+			if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array($row['question_id'], $_POST['questions_filter']))) {
+				// We do not show comment and pagebreak question types
+				if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
+					if ($row['number_of_options'] == 0 && $row['type'] == 'open') {
+						$return .= str_replace("\r\n",'  ', api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)).';';
+					} else {
+						for ($ii = 0; $ii < $row['number_of_options']; $ii++) {
+							$return .= str_replace("\r\n",'  ', api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)).';';
+						}
+					}
+				}
+			}
+		}
+		$return .= "\n";
+
+		// Getting all the questions and options
+		$return .= ';';
+
+		// Show extra field values
+		//if (!($_POST['submit_question_filter'] || $_POST['export_report']) || !empty($_POST['fields_filter'])) {
+			// Show the fields names for user fields
+			if (!empty($extra_user_fields)) {
+				foreach ($extra_user_fields as & $field) {
+					$return .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES)).'";';
+				}
+			}
+		//}
+
+		$sql = "SELECT
+		            survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type,
+                    survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
 				FROM $table_survey_question survey_question
 				LEFT JOIN $table_survey_question_option survey_question_option
 				ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-				WHERE survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
-				survey_question.c_id = $course_id
+				WHERE
+				    survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+				    survey_question.c_id = $course_id
 				ORDER BY survey_question.sort ASC, survey_question_option.sort ASC";
-        $result = Database::query($sql);
-        $possible_answers = array();
-        $possible_answers_type = array();
-        while ($row = Database::fetch_array($result)) {
-            // We show the options if
-            // 1. there is no question filter and the export button has not been clicked
-            // 2. there is a quesiton filter but the question is selected for display
-            if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array(
-                $row['question_id'],
-                $_POST['questions_filter']
-            ))
-            ) {
-                // We do not show comment and pagebreak question types
-                if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
-                    $row['option_text'] = str_replace(array("\r", "\n"), array('', ''), $row['option_text']);
-                    $return .= api_html_entity_decode(strip_tags($row['option_text']), ENT_QUOTES).';';
-                    $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
-                    $possible_answers_type[$row['question_id']] = $row['type'];
-                }
-            }
-        }
-        $return .= "\n";
-
-        // Getting all the answers of the users
-        $old_user = '';
-        $answers_of_user = array();
-        $sql = "SELECT * FROM $table_survey_answer WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $_GET['survey_id']
-        )."'";
-        if ($user_id != 0) {
-            $sql .= "AND user='".Database::escape_string($user_id)."' ";
-        }
-        $sql .= "ORDER BY user ASC";
-
-        $open_question_iterator = 1;
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            if ($old_user != $row['user'] && $old_user != '') {
-                $return .= SurveyUtil::export_complete_report_row($possible_answers, $answers_of_user, $old_user, true);
-                $answers_of_user = array();
-            }
-            if ($possible_answers_type[$row['question_id']] == 'open') {
-                $temp_id = 'open'.$open_question_iterator;
-                $answers_of_user[$row['question_id']][$temp_id] = $row;
-                $open_question_iterator++;
-            } else {
-                $answers_of_user[$row['question_id']][$row['option_id']] = $row;
-            }
-            $old_user = $row['user'];
-        }
-        $return .= SurveyUtil::export_complete_report_row(
-            $possible_answers,
-            $answers_of_user,
-            $old_user,
-            true
-        ); // This is to display the last user
-        return $return;
-    }
-
-    /**
-     * Add a line to the csv file
-     *
-     * @param    array    Possible answers
-     * @param    array    User's answers
-     * @param     mixed    User ID or user details as string - Used as a string in the result string
-     * @param    boolean    Whether to display user fields or not
-     * @return    string    One line of the csv file
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function export_complete_report_row(
-        $possible_options,
-        $answers_of_user,
-        $user,
-        $display_extra_user_fields = false
-    ) {
-        global $survey_data;
-        $return = '';
-        if ($survey_data['anonymous'] == 0) {
-            if (intval($user) !== 0) {
-                $sql = 'SELECT firstname, lastname FROM '.Database::get_main_table(
-                    TABLE_MAIN_USER
-                ).' WHERE user_id='.intval($user);
-                $rs = Database::query($sql);
-                if ($row = Database::fetch_array($rs)) {
-                    $user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
-                } else {
-                    $user_displayed = '-';
-                }
-                $return .= $user_displayed.';';
-            } else {
-                $return .= $user.';';
-            }
-        } else {
-            $return .= '-;'; // The user column
-        }
-
-        if ($display_extra_user_fields) {
-            // Show user fields data, if any, for this user
-            $user_fields_values = UserManager::get_extra_user_data($user, false, false, false, true);
-            foreach ($user_fields_values as & $value) {
-                $return .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($value), ENT_QUOTES)).'";';
-            }
-        }
-
-        if (is_array($possible_options)) {
-            foreach ($possible_options as $question_id => $possible_option) {
-                if (is_array($possible_option) && count($possible_option) > 0) {
-                    foreach ($possible_option as $option_id => & $value) {
-                        $my_answer_of_user = ($answers_of_user[$question_id] == null) ? array() : $answers_of_user[$question_id];
-                        $key = array_keys($my_answer_of_user);
-                        if (substr($key[0], 0, 4) == 'open') {
-                            $return .= '"'.str_replace(
-                                '"',
-                                '""',
-                                api_html_entity_decode(
-                                    strip_tags($answers_of_user[$question_id][$key[0]]['option_id']),
-                                    ENT_QUOTES
-                                )
-                            ).'"';
-                        } elseif (!empty($answers_of_user[$question_id][$option_id])) {
-                            //$return .= 'v';
-                            if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
-                                $return .= $answers_of_user[$question_id][$option_id]['value'];
-                            } else {
-                                $return .= 'v';
-                            }
-                        }
-                        $return .= ';';
-                    }
-                }
-            }
-        }
-        $return .= "\n";
-
-        return $return;
-    }
-
-    /**
-     * Quite similar to display_complete_report(), returns an HTML string
-     * that can be used in a csv file
-     * @todo consider merging this function with display_complete_report
-     * @return    string    The contents of a csv file
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function export_complete_report_xls($filename, $user_id = 0)
+		$result = Database::query($sql);
+		$possible_answers = array();
+		$possible_answers_type = array();
+		while ($row = Database::fetch_array($result)) {
+			// We show the options if
+			// 1. there is no question filter and the export button has not been clicked
+			// 2. there is a quesiton filter but the question is selected for display
+			if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array($row['question_id'], $_POST['questions_filter']))) {
+				// We do not show comment and pagebreak question types
+				if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
+					$row['option_text'] = str_replace(array("\r","\n"),array('',''),$row['option_text']);
+					$return .= api_html_entity_decode(strip_tags($row['option_text']), ENT_QUOTES).';';
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
+					$possible_answers_type[$row['question_id']] = $row['type'];
+				}
+			}
+		}
+		$return .= "\n";
+
+		// Getting all the answers of the users
+		$old_user = '';
+		$answers_of_user = array();
+		$sql = "SELECT * FROM $table_survey_answer
+		        WHERE c_id = $course_id AND survey_id='".Database::escape_string($_GET['survey_id'])."'";
+		if ($user_id != 0) {
+			$sql .= "AND user='".Database::escape_string($user_id)."' ";
+		}
+		$sql .= "ORDER BY user ASC";
+
+		$open_question_iterator = 1;
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			if ($old_user != $row['user'] && $old_user != '') {
+				$return .= SurveyUtil::export_complete_report_row($survey_data, $possible_answers, $answers_of_user, $old_user, true);
+				$answers_of_user=array();
+			}
+			if($possible_answers_type[$row['question_id']] == 'open') {
+				$temp_id = 'open'.$open_question_iterator;
+				$answers_of_user[$row['question_id']][$temp_id] = $row;
+				$open_question_iterator++;
+			} else {
+				$answers_of_user[$row['question_id']][$row['option_id']] = $row;
+			}
+			$old_user = $row['user'];
+		}
+		$return .= SurveyUtil::export_complete_report_row($survey_data, $possible_answers, $answers_of_user, $old_user, true); // This is to display the last user
+		return $return;
+	}
+
+	/**
+	 * Add a line to the csv file
+	 *
+	 * @param	array	Possible answers
+	 * @param	array	User's answers
+	 * @param 	mixed	User ID or user details as string - Used as a string in the result string
+	 * @param	boolean	Whether to display user fields or not
+	 * @return	string	One line of the csv file
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function export_complete_report_row($survey_data, $possible_options, $answers_of_user, $user, $display_extra_user_fields = false)
     {
+		$return = '';
+		if ($survey_data['anonymous'] == 0) {
+			if (intval($user) !== 0) {
+				$sql = 'SELECT firstname, lastname FROM '.Database::get_main_table(TABLE_MAIN_USER).' WHERE user_id='.intval($user);
+				$rs = Database::query($sql);
+				if ($row = Database::fetch_array($rs)) {
+					$user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
+				} else {
+					$user_displayed = '-';
+				}
+				$return .= $user_displayed.';';
+			} else {
+				$return .= $user.';';
+			}
+		} else {
+			$return .= '-;'; // The user column
+		}
 
-        require_once api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php';
-        $workbook = new Spreadsheet_Excel_Writer();
-        $workbook->setTempDir(api_get_path(SYS_ARCHIVE_PATH));
-        $workbook->send($filename);
-        $workbook->setVersion(8); // BIFF8
-        $worksheet = & $workbook->addWorksheet('Report 1');
-        $worksheet->setInputEncoding(api_get_system_encoding());
-        $line = 0;
-        $column = 1; // Skip the first column (row titles)
-        // Show extra fields blank space (enough for extra fields on next line)
-        $display_extra_user_fields = false;
-        //if (!empty($_REQUEST['fields_filter'])) {
-        // Show user fields section with a big th colspan that spans over all fields
-        $extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false, true);
-        $num = count($extra_user_fields);
-        for ($i = 0; $i < $num; $i++) {
-            $worksheet->write($line, $column, '');
-            $column++;
-        }
-        $display_extra_user_fields = true;
-        //}
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-
-        $course_id = api_get_course_int_id();
+		if ($display_extra_user_fields) {
+			// Show user fields data, if any, for this user
+			$user_fields_values = UserManager::get_extra_user_data($user,false,false, false, true);
+			foreach ($user_fields_values as & $value) {
+				$return .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($value), ENT_QUOTES)).'";';
+			}
+		}
 
-        // First line (questions)
-        $sql = "SELECT questions.question_id, questions.type, questions.survey_question, count(options.question_option_id) as number_of_options
-				FROM $table_survey_question questions LEFT JOIN $table_survey_question_option options
+		if (is_array($possible_options)) {
+			foreach ($possible_options as $question_id => $possible_option) {
+				if (is_array($possible_option) && count($possible_option) > 0) {
+					foreach ($possible_option as $option_id => & $value) {
+						$my_answer_of_user = ($answers_of_user[$question_id] == null) ? array() : $answers_of_user[$question_id];
+						$key = array_keys($my_answer_of_user);
+						if (substr($key[0], 0, 4) == 'open') {
+							$return .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($answers_of_user[$question_id][$key[0]]['option_id']), ENT_QUOTES)).'"';
+						} elseif (!empty($answers_of_user[$question_id][$option_id])) {
+							//$return .= 'v';
+							if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
+								$return .= $answers_of_user[$question_id][$option_id]['value'];
+							} else {
+								$return .= 'v';
+							}
+						}
+						$return .= ';';
+					}
+				}
+			}
+		}
+		$return .= "\n";
+		return $return;
+	}
+
+	/**
+	 * Quite similar to display_complete_report(), returns an HTML string
+	 * that can be used in a csv file
+	 * @todo consider merging this function with display_complete_report
+	 * @return	string	The contents of a csv file
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function export_complete_report_xls($survey_data, $filename, $user_id = 0)
+    {
+		require_once api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php';
+		$workbook = new Spreadsheet_Excel_Writer();
+		$workbook ->setTempDir(api_get_path(SYS_ARCHIVE_PATH));
+		$workbook->send($filename);
+		$workbook->setVersion(8); // BIFF8
+		$worksheet =& $workbook->addWorksheet('Report 1');
+		$worksheet->setInputEncoding(api_get_system_encoding());
+		$line = 0;
+		$column = 1; // Skip the first column (row titles)
+
+		// Show extra fields blank space (enough for extra fields on next line)
+		$display_extra_user_fields = false;
+		//if (!empty($_REQUEST['fields_filter'])) {
+			// Show user fields section with a big th colspan that spans over all fields
+			$extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false, true);
+			$num = count($extra_user_fields);
+			for ($i = 0; $i < $num; $i++) {
+				$worksheet->write($line, $column, '');
+				$column++;
+			}
+			$display_extra_user_fields = true;
+		//}
+
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		$course_id = api_get_course_int_id();
+
+		// First line (questions)
+		$sql = "SELECT questions.question_id, questions.type, questions.survey_question, count(options.question_option_id) as number_of_options
+				FROM $table_survey_question questions
+				LEFT JOIN $table_survey_question_option options
 				     ON questions.question_id = options.question_id AND options.c_id = $course_id
-				WHERE questions.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
-				questions.c_id = $course_id
+				WHERE
+				    questions.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+				    questions.c_id = $course_id
 				GROUP BY questions.question_id
 				ORDER BY questions.sort ASC";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            // We show the questions if
-            // 1. there is no question filter and the export button has not been clicked
-            // 2. there is a quesiton filter but the question is selected for display
-            if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array(
-                $row['question_id'],
-                $_POST['questions_filter']
-            ))
-            ) {
-                // We do not show comment and pagebreak question types
-                if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
-                    if ($row['number_of_options'] == 0 && $row['type'] == 'open') {
-                        $worksheet->write(
-                            $line,
-                            $column,
-                            api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)
-                        );
-                        $column++;
-                    } else {
-                        for ($ii = 0; $ii < $row['number_of_options']; $ii++) {
-                            $worksheet->write(
-                                $line,
-                                $column,
-                                api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)
-                            );
-                            $column++;
-                        }
-                    }
-                }
-            }
-        }
-        $line++;
-        $column = 1;
-
-        // Show extra field values
-        if ($display_extra_user_fields) {
-            // Show the fields names for user fields
-            foreach ($extra_user_fields as & $field) {
-                $worksheet->write($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES));
-                $column++;
-            }
-        }
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			// We show the questions if
+			// 1. there is no question filter and the export button has not been clicked
+			// 2. there is a quesiton filter but the question is selected for display
+			if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array($row['question_id'], $_POST['questions_filter']))) {
+				// We do not show comment and pagebreak question types
+				if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
+					if ($row['number_of_options'] == 0 && $row['type'] == 'open') {
+						$worksheet->write($line,$column,api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES));
+						$column ++;
+					} else {
+						for ($ii = 0; $ii < $row['number_of_options']; $ii ++) {
+							$worksheet->write($line, $column, api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES));
+							$column ++;
+						}
+					}
+				}
+			}
+		}
+		$line++;
+		$column = 1;
+
+		// Show extra field values
+		if ($display_extra_user_fields) {
+			// Show the fields names for user fields
+			foreach ($extra_user_fields as & $field) {
+				$worksheet->write($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES));
+				$column++;
+			}
+		}
 
-        // Getting all the questions and options (second line)
-        $sql = "SELECT 	survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type,
+		// Getting all the questions and options (second line)
+		$sql = "SELECT 	survey_question.question_id, survey_question.survey_id, survey_question.survey_question, survey_question.display, survey_question.sort, survey_question.type,
 						survey_question_option.question_option_id, survey_question_option.option_text, survey_question_option.sort as option_sort
 				FROM $table_survey_question survey_question
 				LEFT JOIN $table_survey_question_option survey_question_option
@@ -3920,648 +3504,509 @@ class SurveyUtil
 				WHERE survey_question.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
 				survey_question.c_id = $course_id
 				ORDER BY survey_question.sort ASC, survey_question_option.sort ASC";
-        $result = Database::query($sql);
-        $possible_answers = array();
-        $possible_answers_type = array();
-        while ($row = Database::fetch_array($result)) {
-            // We show the options if
-            // 1. there is no question filter and the export button has not been clicked
-            // 2. there is a quesiton filter but the question is selected for display
-            if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array(
-                $row['question_id'],
-                $_POST['questions_filter']
-            ))
-            ) {
-                // We do not show comment and pagebreak question types
-                if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
-                    $worksheet->write(
-                        $line,
-                        $column,
-                        api_html_entity_decode(strip_tags($row['option_text']), ENT_QUOTES)
-                    );
-                    $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
-                    $possible_answers_type[$row['question_id']] = $row['type'];
-                    $column++;
-                }
-            }
-        }
-
-        // Getting all the answers of the users
-        $line++;
-        $column = 0;
-        $old_user = '';
-        $answers_of_user = array();
-        $sql = "SELECT * FROM $table_survey_answer WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $_GET['survey_id']
-        )."' ";
-        if ($user_id != 0) {
-            $sql .= "AND user='".Database::escape_string($user_id)."' ";
-        }
-        $sql .= "ORDER BY user ASC";
-
-        $open_question_iterator = 1;
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            if ($old_user != $row['user'] && $old_user != '') {
-                $return = SurveyUtil::export_complete_report_row_xls(
-                    $possible_answers,
-                    $answers_of_user,
-                    $old_user,
-                    true
-                );
-                foreach ($return as $elem) {
-                    $worksheet->write($line, $column, $elem);
-                    $column++;
-                }
-                $answers_of_user = array();
-                $line++;
-                $column = 0;
-            }
-            if ($possible_answers_type[$row['question_id']] == 'open') {
-                $temp_id = 'open'.$open_question_iterator;
-                $answers_of_user[$row['question_id']][$temp_id] = $row;
-                $open_question_iterator++;
-            } else {
-                $answers_of_user[$row['question_id']][$row['option_id']] = $row;
-            }
-            $old_user = $row['user'];
-        }
-        $return = SurveyUtil::export_complete_report_row_xls(
-            $possible_answers,
-            $answers_of_user,
-            $old_user,
-            true
-        ); // this is to display the last user
-        foreach ($return as $elem) {
-            $worksheet->write($line, $column, $elem);
-            $column++;
-        }
-        $workbook->close();
-
-        return null;
-    }
-
-    /**
-     * Add a line to the csv file
-     *
-     * @param    array    Possible answers
-     * @param    array    User's answers
-     * @param     mixed    User ID or user details as string - Used as a string in the result string
-     * @param    boolean    Whether to display user fields or not
-     * @return    string    One line of the csv file
-     */
-    static function export_complete_report_row_xls(
-        $possible_options,
-        $answers_of_user,
-        $user,
-        $display_extra_user_fields = false
-    ) {
-
-        $return = array();
-        global $survey_data;
-        if ($survey_data['anonymous'] == 0) {
-            if (intval($user) !== 0) {
-                $sql = 'SELECT firstname, lastname FROM '.Database::get_main_table(
-                    TABLE_MAIN_USER
-                ).' WHERE user_id='.intval($user);
-                $rs = Database::query($sql);
-                if ($row = Database::fetch_array($rs)) {
-                    $user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
-                } else {
-                    $user_displayed = '-';
-                }
-                //echo '		<th><a href="'.api_get_self().'?action=userreport&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user='.$user.'">'.$user_displayed.'</a></th>'; // the user column
-                $return[] = $user_displayed;
-            } else {
-                //echo '		<th>'.$user.'</th>'; // The user column
-                $return[] = $user;
-            }
-        } else {
-            $return[] = '-'; // The user column
-        }
-
-        if ($display_extra_user_fields) {
-            //show user fields data, if any, for this user
-            $user_fields_values = UserManager::get_extra_user_data(intval($user), false, false, false, true);
-            foreach ($user_fields_values as $value) {
-                $return[] = api_html_entity_decode(strip_tags($value), ENT_QUOTES);
-            }
-        }
-
-        if (is_array($possible_options)) {
-            foreach ($possible_options as $question_id => & $possible_option) {
-                if (is_array($possible_option) && count($possible_option) > 0) {
-                    foreach ($possible_option as $option_id => & $value) {
-                        $my_answers_of_user = ($answers_of_user[$question_id] == null) ? array() : $answers_of_user[$question_id];
-                        $key = array_keys($my_answers_of_user);
-                        if (substr($key[0], 0, 4) == 'open') {
-                            $return[] = api_html_entity_decode(
-                                strip_tags($answers_of_user[$question_id][$key[0]]['option_id']),
-                                ENT_QUOTES
-                            );
-                        } elseif (!empty($answers_of_user[$question_id][$option_id])) {
-                            //$return .= 'v';
-                            if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
-                                $return[] = $answers_of_user[$question_id][$option_id]['value'];
-                            } else {
-                                $return[] = 'v';
-                            }
-                        } else {
-                            $return[] = '';
-                        }
-                    }
-                }
-            }
-        }
-
-        return $return;
-    }
+		$result = Database::query($sql);
+		$possible_answers = array();
+		$possible_answers_type = array();
+		while ($row = Database::fetch_array($result)) {
+			// We show the options if
+			// 1. there is no question filter and the export button has not been clicked
+			// 2. there is a quesiton filter but the question is selected for display
+			if (!($_POST['submit_question_filter']) || (is_array($_POST['questions_filter']) && in_array($row['question_id'], $_POST['questions_filter']))) {
+				// We do not show comment and pagebreak question types
+				if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
+					$worksheet->write($line,$column,api_html_entity_decode(strip_tags($row['option_text']), ENT_QUOTES));
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
+					$possible_answers_type[$row['question_id']] = $row['type'];
+					$column++;
+				}
+			}
+		}
 
-    /**
-     * This function displays the comparative report which allows you to compare two questions
-     * A comparative report creates a table where one question is on the x axis and a second question is on the y axis.
-     * In the intersection is the number of people who have answerd positive on both options.
-     *
-     * @return    string    HTML code
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function display_comparative_report()
+		// Getting all the answers of the users
+		$line ++;
+		$column = 0;
+		$old_user = '';
+		$answers_of_user = array();
+		$sql = "SELECT * FROM $table_survey_answer WHERE c_id = $course_id AND survey_id='".Database::escape_string($_GET['survey_id'])."' ";
+		if ($user_id != 0) {
+			$sql .= "AND user='".Database::escape_string($user_id)."' ";
+		}
+		$sql .=	"ORDER BY user ASC";
+
+		$open_question_iterator = 1;
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			if ($old_user != $row['user'] && $old_user != '') {
+				$return = SurveyUtil::export_complete_report_row_xls($survey_data, $possible_answers, $answers_of_user, $old_user, true);
+				foreach ($return as $elem) {
+					$worksheet->write($line, $column, $elem);
+					$column++;
+				}
+				$answers_of_user = array();
+				$line++;
+				$column = 0;
+			}
+			if ($possible_answers_type[$row['question_id']] == 'open') {
+				$temp_id = 'open'.$open_question_iterator;
+				$answers_of_user[$row['question_id']][$temp_id] = $row;
+				$open_question_iterator++;
+			} else {
+				$answers_of_user[$row['question_id']][$row['option_id']] = $row;
+			}
+			$old_user = $row['user'];
+		}
+		$return = SurveyUtil::export_complete_report_row_xls($survey_data, $possible_answers, $answers_of_user, $old_user, true); // this is to display the last user
+		foreach ($return as $elem) {
+			$worksheet->write($line, $column, $elem);
+			$column++;
+		}
+		$workbook->close();
+		return null;
+	}
+
+	/**
+	 * Add a line to the csv file
+	 *
+	 * @param	array	Possible answers
+	 * @param	array	User's answers
+	 * @param 	mixed	User ID or user details as string - Used as a string in the result string
+	 * @param	boolean	Whether to display user fields or not
+	 * @return	string	One line of the csv file
+	 */
+	static function export_complete_report_row_xls($survey_data, $possible_options, $answers_of_user, $user, $display_extra_user_fields = false)
     {
-        // Allowed question types for comparative report
-        $allowed_question_types = array(
-            'yesno',
-            'multiplechoice',
-            'multipleresponse',
-            'dropdown',
-            'percentage',
-            'score'
-        );
-
-        // Getting all the questions
-        $questions = survey_manager::get_questions($_GET['survey_id']);
-
-        // Actions bar
-        echo '<div class="actions">';
-        echo '<a href="reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon(
-            'back.png',
-            get_lang('BackTo').' '.get_lang('ReportingOverview'),
-            '',
-            ICON_SIZE_MEDIUM
-        ).'</a>';
-        echo '</div>';
+		$return = array();
+		if ($survey_data['anonymous'] == 0) {
+			if (intval($user) !== 0) {
+				$sql = 'SELECT firstname, lastname FROM '.Database::get_main_table(TABLE_MAIN_USER).' WHERE user_id='.intval($user);
+				$rs = Database::query($sql);
+				if($row = Database::fetch_array($rs)) {
+					$user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
+				} else {
+					$user_displayed = '-';
+				}
+				//echo '		<th><a href="'.api_get_self().'?action=userreport&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user='.$user.'">'.$user_displayed.'</a></th>'; // the user column
+				$return[] = $user_displayed;
+			} else {
+				//echo '		<th>'.$user.'</th>'; // The user column
+				$return[] = $user;
+			}
+		} else {
+			$return[] = '-'; // The user column
+		}
 
-        // Displaying an information message that only the questions with predefined answers can be used in a comparative report
-        Display::display_normal_message(get_lang('OnlyQuestionsWithPredefinedAnswers'), false);
-
-        // The form for selecting the axis of the table
-        echo '<form id="form1" name="form1" method="get" action="'.api_get_self().'?action='.Security::remove_XSS(
-            $_GET['action']
-        ).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&xaxis='.Security::remove_XSS(
-            $_GET['xaxis']
-        ).'&y='.Security::remove_XSS($_GET['yaxis']).'">';
-        // Survey_id
-        echo '<input type="hidden" name="action" value="'.Security::remove_XSS($_GET['action']).'"/>';
-        echo '<input type="hidden" name="survey_id" value="'.Security::remove_XSS($_GET['survey_id']).'"/>';
-        // X axis
-        echo get_lang('SelectXAxis').': ';
-        echo '<select name="xaxis">';
-        echo '<option value="">---</option>';
-        foreach ($questions as $key => & $question) {
-            if (is_array($allowed_question_types)) {
-                if (in_array($question['type'], $allowed_question_types)) {
-                    echo '<option value="'.$question['question_id'].'"';
-                    if (isset($_GET['xaxis']) && $_GET['xaxis'] == $question['question_id']) {
-                        echo ' selected="selected"';
-                    }
-                    echo '">'.api_substr(strip_tags($question['question']), 0, 50).'</option>';
-                }
-            }
-        }
-        echo '</select><br /><br />';
-        // Y axis
-        echo get_lang('SelectYAxis').': ';
-        echo '<select name="yaxis">';
-        echo '<option value="">---</option>';
-        foreach ($questions as $key => & $question) {
-            if (in_array($question['type'], $allowed_question_types)) {
-                echo '<option value="'.$question['question_id'].'"';
-                if (isset($_GET['xaxis']) && $_GET['yaxis'] == $question['question_id']) {
-                    echo ' selected="selected"';
-                }
-                echo '">'.api_substr(strip_tags($question['question']), 0, 50).'</option>';
-            }
-        }
-        echo '</select><br /><br />';
-        echo '<button class="save" type="submit" name="Submit" value="Submit">'.get_lang(
-            'CompareQuestions'
-        ).'</button>';
-        echo '</form>';
-
-        // Getting all the information of the x axis
-        if (isset($_GET['xaxis']) && is_numeric($_GET['xaxis'])) {
-            $question_x = survey_manager::get_question($_GET['xaxis']);
-        }
+		if ($display_extra_user_fields) {
+			//show user fields data, if any, for this user
+			$user_fields_values = UserManager::get_extra_user_data(intval($user),false,false, false, true);
+			foreach($user_fields_values as $value) {
+				$return[] = api_html_entity_decode(strip_tags($value), ENT_QUOTES);
+			}
+		}
 
-        // Getting all the information of the y axis
-        if (isset($_GET['yaxis']) && is_numeric($_GET['yaxis'])) {
-            $question_y = survey_manager::get_question($_GET['yaxis']);
-        }
+		if (is_array($possible_options)) {
+			foreach ($possible_options as $question_id => & $possible_option) {
+				if (is_array($possible_option) && count($possible_option) > 0) {
+					foreach ($possible_option as $option_id => & $value) {
+						$my_answers_of_user = ($answers_of_user[$question_id]==null) ? array() : $answers_of_user[$question_id];
+						$key = array_keys($my_answers_of_user);
+						if (substr($key[0], 0, 4) == 'open') {
+							$return[] = api_html_entity_decode(strip_tags($answers_of_user[$question_id][$key[0]]['option_id']), ENT_QUOTES);
+						} elseif (!empty($answers_of_user[$question_id][$option_id])) {
+							//$return .= 'v';
+							if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
+								$return[] = $answers_of_user[$question_id][$option_id]['value'];
+							} else {
+								$return[] = 'v';
+							}
+						} else {
+							$return[] = '';
+						}
+					}
+				}
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * This function displays the comparative report which allows you to compare two questions
+	 * A comparative report creates a table where one question is on the x axis and a second question is on the y axis.
+	 * In the intersection is the number of people who have answerd positive on both options.
+	 *
+	 * @return	string	HTML code
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function display_comparative_report() {
+		// Allowed question types for comparative report
+		$allowed_question_types = array('yesno', 'multiplechoice', 'multipleresponse', 'dropdown', 'percentage', 'score');
+
+		// Getting all the questions
+		$questions = survey_manager::get_questions($_GET['survey_id']);
+
+		// Actions bar
+		echo '<div class="actions">';
+		echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+		echo '</div>';
+
+		// Displaying an information message that only the questions with predefined answers can be used in a comparative report
+		Display::display_normal_message(get_lang('OnlyQuestionsWithPredefinedAnswers'), false);
+
+		// The form for selecting the axis of the table
+		echo '<form id="form1" name="form1" method="get" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&xaxis='.Security::remove_XSS($_GET['xaxis']).'&y='.Security::remove_XSS($_GET['yaxis']).'">';
+		// Survey_id
+		echo '<input type="hidden" name="action" value="'.Security::remove_XSS($_GET['action']).'"/>';
+		echo '<input type="hidden" name="survey_id" value="'.Security::remove_XSS($_GET['survey_id']).'"/>';
+		// X axis
+		echo get_lang('SelectXAxis').': ';
+		echo '<select name="xaxis">';
+		echo '<option value="">---</option>';
+		foreach ($questions as $key => & $question) {
+			if (is_array($allowed_question_types)) {
+				if (in_array($question['type'], $allowed_question_types)) {
+					echo '<option value="'.$question['question_id'].'"';
+					if ($_GET['xaxis'] == $question['question_id']) {
+						echo ' selected="selected"';
+					}
+					echo '">'.api_substr(strip_tags($question['question']), 0, 50).'</option>';
+				}
+			}
 
-        if (isset($_GET['xaxis']) && is_numeric($_GET['xaxis']) && isset($_GET['yaxis']) && is_numeric(
-            $_GET['yaxis']
-        )
-        ) {
-            // Getting the answers of the two questions
-            $answers_x = SurveyUtil::get_answers_of_question_by_user($_GET['survey_id'], $_GET['xaxis']);
-            $answers_y = SurveyUtil::get_answers_of_question_by_user($_GET['survey_id'], $_GET['yaxis']);
-
-            // Displaying the table
-            echo '<table border="1" class="data_table">';
-
-            // The header
-            echo '	<tr>';
-            for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
-                if ($ii == 0) {
-                    echo '		<th>&nbsp;</th>';
-                } else {
-                    if ($question_x['type'] == 'score') {
-                        for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
-                            echo '		<th>'.$question_x['answers'][($ii - 1)].'<br />'.$x.'</th>';
-                        }
-                        $x = '';
-                    } else {
-                        echo '		<th>'.$question_x['answers'][($ii - 1)].'</th>';
-                    }
-                }
-            }
-            echo '	</tr>';
-
-            // The main part
-            for ($ij = 0; $ij < count($question_y['answers']); $ij++) {
-                // The Y axis is a scoring question type so we have more rows than the options (actually options * maximum score)
-                if ($question_y['type'] == 'score') {
-                    for ($y = 1; $y <= $question_y['maximum_score']; $y++) {
-                        echo '	<tr>';
-                        for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
-                            if ($question_x['type'] == 'score') {
-                                for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
-                                    if ($ii == 0) {
-                                        echo '		<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
-                                        break;
-                                    } else {
-                                        echo '		<td align="center">';
-                                        echo SurveyUtil::comparative_check(
-                                            $answers_x,
-                                            $answers_y,
-                                            $question_x['answersid'][($ii - 1)],
-                                            $question_y['answersid'][($ij)],
-                                            $x,
-                                            $y
-                                        );
-                                        echo '</td>';
-                                    }
-                                }
-                            } else {
-                                if ($ii == 0) {
-                                    echo '		<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
-                                } else {
-                                    echo '		<td align="center">';
-                                    echo SurveyUtil::comparative_check(
-                                        $answers_x,
-                                        $answers_y,
-                                        $question_x['answersid'][($ii - 1)],
-                                        $question_y['answersid'][($ij)],
-                                        0,
-                                        $y
-                                    );
-                                    echo '</td>';
-                                }
-                            }
-                        }
-                        echo '	</tr>';
-                    }
-                } // The Y axis is NOT a score question type so the number of rows = the number of options
-                else {
-                    echo '	<tr>';
-                    for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
-                        if ($question_x['type'] == 'score') {
-                            for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
-                                if ($ii == 0) {
-                                    echo '		<th>'.$question_y['answers'][($ij)].'</th>';
-                                    break;
-                                } else {
-                                    echo '		<td align="center">';
-                                    echo SurveyUtil::comparative_check(
-                                        $answers_x,
-                                        $answers_y,
-                                        $question_x['answersid'][($ii - 1)],
-                                        $question_y['answersid'][($ij)],
-                                        $x,
-                                        0
-                                    );
-                                    echo '</td>';
-                                }
-                            }
-                        } else {
-                            if ($ii == 0) {
-                                echo '		<th>'.$question_y['answers'][($ij)].'</th>';
-                            } else {
-                                echo '		<td align="center">';
-                                echo SurveyUtil::comparative_check(
-                                    $answers_x,
-                                    $answers_y,
-                                    $question_x['answersid'][($ii - 1)],
-                                    $question_y['answersid'][($ij)]
-                                );
-                                echo '</td>';
-                            }
-                        }
-                    }
-                    echo '	</tr>';
-                }
-            }
-            echo '</table>';
-        }
-    }
+		}
+		echo '</select><br /><br />';
+		// Y axis
+		echo get_lang('SelectYAxis').': ';
+		echo '<select name="yaxis">';
+		echo '<option value="">---</option>';
+		foreach ($questions as $key => & $question) {
+			if (in_array($question['type'], $allowed_question_types)) {
+				echo '<option value="'.$question['question_id'].'"';
+				if ($_GET['yaxis'] == $question['question_id']) {
+					echo ' selected="selected"';
+				}
+				echo '">'.api_substr(strip_tags($question['question']), 0, 50).'</option>';
+			}
+		}
+		echo '</select><br /><br />';
+		echo '<button class="save" type="submit" name="Submit" value="Submit">'.get_lang('CompareQuestions').'</button>';
+		echo '</form>';
 
-    /**
-     * Get all the answers of a question grouped by user
-     *
-     * @param    integer    Survey ID
-     * @param    integer    Question ID
-     * @return     Array    Array containing all answers of all users, grouped by user
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007 - Updated March 2008
-     */
-    static function get_answers_of_question_by_user($survey_id, $question_id)
-    {
-        $course_id = api_get_course_int_id();
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		// Getting all the information of the x axis
+		if (isset($_GET['xaxis']) && is_numeric($_GET['xaxis'])) {
+			$question_x = survey_manager::get_question($_GET['xaxis']);
+		}
+
+		// Getting all the information of the y axis
+		if (isset($_GET['yaxis']) && is_numeric($_GET['yaxis'])) {
+			$question_y = survey_manager::get_question($_GET['yaxis']);
+		}
 
-        $sql = "SELECT * FROM $table_survey_answer
+		if (isset($_GET['xaxis']) && is_numeric($_GET['xaxis']) && isset($_GET['yaxis']) && is_numeric($_GET['yaxis'])) {
+			// Getting the answers of the two questions
+			$answers_x = SurveyUtil::get_answers_of_question_by_user($_GET['survey_id'], $_GET['xaxis']);
+			$answers_y = SurveyUtil::get_answers_of_question_by_user($_GET['survey_id'], $_GET['yaxis']);
+
+			// Displaying the table
+			echo '<table border="1" class="data_table">';
+
+			// The header
+			echo '	<tr>';
+			for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
+				if ($ii == 0) {
+					echo '		<th>&nbsp;</th>';
+				} else {
+					if ($question_x['type'] == 'score') {
+						for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
+							echo '		<th>'.$question_x['answers'][($ii-1)].'<br />'.$x.'</th>';
+						}
+						$x = '';
+					} else {
+						echo '		<th>'.$question_x['answers'][($ii-1)].'</th>';
+					}
+				}
+			}
+			echo '	</tr>';
+
+			// The main part
+			for ($ij = 0; $ij < count($question_y['answers']); $ij++) {
+				// The Y axis is a scoring question type so we have more rows than the options (actually options * maximum score)
+				if ($question_y['type'] == 'score') {
+					for ($y = 1; $y <= $question_y['maximum_score']; $y++) {
+						echo '	<tr>';
+						for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
+							if ($question_x['type'] == 'score') {
+								for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
+									if ($ii == 0) {
+										echo '		<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
+										break;
+									} else {
+										echo '		<td align="center">';
+										echo SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii-1)], $question_y['answersid'][($ij)], $x, $y);
+										echo '</td>';
+									}
+								}
+							} else {
+								if ($ii == 0) {
+									echo '		<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
+								} else {
+									echo '		<td align="center">';
+									echo SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii-1)], $question_y['answersid'][($ij)], 0, $y);
+									echo '</td>';
+								}
+							}
+						}
+						echo '	</tr>';
+					}
+				}
+				// The Y axis is NOT a score question type so the number of rows = the number of options
+				else {
+					echo '	<tr>';
+					for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
+							if ($question_x['type'] == 'score') {
+								for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
+									if ($ii == 0) {
+										echo '		<th>'.$question_y['answers'][($ij)].'</th>';
+										break;
+									} else {
+										echo '		<td align="center">';
+										echo SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii-1)], $question_y['answersid'][($ij)], $x, 0);
+										echo '</td>';
+									}
+								}
+							} else {
+								if ($ii == 0) {
+									echo '		<th>'.$question_y['answers'][($ij)].'</th>';
+								} else {
+									echo '		<td align="center">';
+									echo SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii-1)], $question_y['answersid'][($ij)]);
+									echo '</td>';
+								}
+							}
+					}
+					echo '	</tr>';
+				}
+			}
+			echo '</table>';
+		}
+	}
+
+	/**
+	 * Get all the answers of a question grouped by user
+	 *
+	 * @param	integer	Survey ID
+	 * @param	integer	Question ID
+	 * @return 	Array	Array containing all answers of all users, grouped by user
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007 - Updated March 2008
+	 */
+	static function get_answers_of_question_by_user($survey_id, $question_id) {
+	    $course_id = api_get_course_int_id();
+		// Database table definitions
+		$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+
+		$sql = "SELECT * FROM $table_survey_answer
 					WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."'
 					AND question_id='".Database::escape_string($question_id)."'
 					ORDER BY USER ASC";
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            if ($row['value'] == 0) {
-                $return[$row['user']][] = $row['option_id'];
-            } else {
-                $return[$row['user']][] = $row['option_id'].'*'.$row['value'];
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Count the number of users who answer positively on both options
-     *
-     * @param    array    All answers of the x axis
-     * @param    array    All answers of the y axis
-     * @param    integer x axis value (= the option_id of the first question)
-     * @param    integer y axis value (= the option_id of the second question)
-     * @return    integer Number of users who have answered positively to both options
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version February 2007
-     */
-    static function comparative_check($answers_x, $answers_y, $option_x, $option_y, $value_x = 0, $value_y = 0)
-    {
-        if ($value_x == 0) {
-            $check_x = $option_x;
-        } else {
-            $check_x = $option_x.'*'.$value_x;
-        }
-        if ($value_y == 0) {
-            $check_y = $option_y;
-        } else {
-            $check_y = $option_y.'*'.$value_y;
-        }
-
-        $counter = 0;
-        if (is_array($answers_x)) {
-            foreach ($answers_x as $user => & $answers) {
-                // Check if the user has given $option_x as answer
-                if (in_array($check_x, $answers)) {
-                    // Check if the user has given $option_y as an answer
-                    if (in_array($check_y, $answers_y[$user])) {
-                        $counter++;
-                    }
-                }
-            }
-        }
-
-        return $counter;
-    }
-
-    /**
-     * Get all the information about the invitations of a certain survey
-     *
-     * @return    array    Lines of invitation [user, code, date, empty element]
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @todo use survey_id parameter instead of $_GET
-     */
-    static function get_survey_invitations_data()
-    {
-        $course_id = api_get_course_int_id();
-        // Database table definition
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			if ($row['value'] == 0) {
+				$return[$row['user']][] = $row['option_id'];
+			} else {
+				$return[$row['user']][] = $row['option_id'].'*'.$row['value'];
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * Count the number of users who answer positively on both options
+	 *
+	 * @param	array	All answers of the x axis
+	 * @param	array	All answers of the y axis
+	 * @param	integer x axis value (= the option_id of the first question)
+	 * @param	integer y axis value (= the option_id of the second question)
+	 * @return	integer Number of users who have answered positively to both options
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version February 2007
+	 */
+	static function comparative_check($answers_x, $answers_y, $option_x, $option_y, $value_x = 0, $value_y = 0) {
+		if ($value_x == 0) {
+			$check_x = $option_x;
+		} else {
+			$check_x = $option_x.'*'.$value_x;
+		}
+		if ($value_y == 0) {
+			$check_y = $option_y;
+		} else {
+			$check_y = $option_y.'*'.$value_y;
+		}
 
-        $sql = "SELECT
+		$counter = 0;
+		if (is_array($answers_x)) {
+			foreach ($answers_x as $user => & $answers) {
+				// Check if the user has given $option_x as answer
+				if (in_array($check_x, $answers)) {
+					// Check if the user has given $option_y as an answer
+					if (in_array($check_y, $answers_y[$user])) {
+						$counter++;
+					}
+				}
+			}
+		}
+		return $counter;
+	}
+
+	/**
+	 * Get all the information about the invitations of a certain survey
+	 *
+	 * @return	array	Lines of invitation [user, code, date, empty element]
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @todo use survey_id parameter instead of $_GET
+	 */
+	static function get_survey_invitations_data() {
+	    $course_id = api_get_course_int_id();
+		// Database table definition
+		$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
+
+		$sql = "SELECT
 					survey_invitation.user as col1,
 					survey_invitation.invitation_code as col2,
 					survey_invitation.invitation_date as col3,
 					'' as col4
 					FROM $table_survey_invitation survey_invitation
-			LEFT JOIN $table_user user ON  survey_invitation.user = user.user_id
-			WHERE survey_invitation.c_id = $course_id AND survey_invitation.survey_id = '".Database::escape_string(
-            $_GET['survey_id']
-        )."' AND session_id='".api_get_session_id()."'  ";
-        $res = Database::query($sql);
-        while ($row = Database::fetch_array($res)) {
-            $survey_invitation_data[] = $row;
-        }
-
-        return $survey_invitation_data;
-    }
-
-    /**
-     * Get the total number of survey invitations for a given survey (through $_GET['survey_id'])
-     *
-     * @return    integer    Total number of survey invitations
-     *
-     * @todo use survey_id parameter instead of $_GET
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function get_number_of_survey_invitations()
-    {
-        $course_id = api_get_course_int_id();
-
-        // Database table definition
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-
-        $sql = "SELECT count(user) AS total FROM $table_survey_invitation WHERE c_id = $course_id AND survey_id='".Database::escape_string(
-            $_GET['survey_id']
-        )."' AND session_id='".api_get_session_id()."' AND user <> '' ";
-        $res = Database::query($sql);
-        $row = Database::fetch_array($res, 'ASSOC');
-
-        return $row['total'];
-    }
-
-    /**
-     * Save the invitation mail
-     *
-     * @param string     Text of the e-mail
-     * @param integer    Whether the mail contents are for invite mail (0, default) or reminder mail (1)
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function save_invite_mail($mailtext, $mail_subject, $reminder = 0)
+                LEFT JOIN $table_user user
+                ON survey_invitation.user = user.user_id
+                WHERE
+                    survey_invitation.c_id = $course_id AND
+                    survey_invitation.survey_id = '".Database::escape_string($_GET['survey_id'])."' AND
+                    session_id='".api_get_session_id()."'  ";
+		$res = Database::query($sql);
+		while ($row = Database::fetch_array($res)) {
+			$survey_invitation_data[] = $row;
+		}
+		return $survey_invitation_data;
+	}
+
+	/**
+	 * Get the total number of survey invitations for a given survey (through $_GET['survey_id'])
+	 *
+	 * @return	integer	Total number of survey invitations
+	 *
+	 * @todo use survey_id parameter instead of $_GET
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function get_number_of_survey_invitations()
     {
-        $course_id = api_get_course_int_id();
-        // Database table definition
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-
-        // Reminder or not
-        if ($reminder == 0) {
-            $mail_field = 'invite_mail';
-        } else {
-            $mail_field = 'reminder_mail';
-        }
+	    $course_id = api_get_course_int_id();
+
+		// Database table definition
+		$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+
+		$sql = "SELECT count(user) AS total
+		        FROM $table_survey_invitation
+		        WHERE
+                    c_id = $course_id AND
+                    survey_id='".Database::escape_string($_GET['survey_id'])."' AND
+                    session_id='".api_get_session_id()."' ";
+		$res = Database::query($sql);
+		$row = Database::fetch_array($res,'ASSOC');
+		return $row['total'];
+	}
+
+	/**
+	 * Save the invitation mail
+	 *
+	 * @param string 	Text of the e-mail
+	 * @param integer	Whether the mail contents are for invite mail (0, default) or reminder mail (1)
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function save_invite_mail($mailtext, $mail_subject, $reminder = 0) {
+	    $course_id = api_get_course_int_id();
+		// Database table definition
+		$table_survey = Database :: get_course_table(TABLE_SURVEY);
+
+		// Reminder or not
+		if ($reminder == 0) {
+			$mail_field = 'invite_mail';
+		} else {
+			$mail_field = 'reminder_mail';
+		}
 
-        $sql = "UPDATE $table_survey SET mail_subject='".Database::escape_string(
-            $mail_subject
-        )."', $mail_field = '".Database::escape_string($mailtext)."'
+		$sql = "UPDATE $table_survey
+		        SET
+		        mail_subject='".Database::escape_string($mail_subject)."',
+		        $mail_field = '".Database::escape_string($mailtext)."'
 		        WHERE c_id = $course_id AND survey_id = '".Database::escape_string($_GET['survey_id'])."'";
-        Database::query($sql);
-    }
-
-    static function get_group_invitations($survey_code)
-    {
-        $course_id = api_get_course_int_id();
-        // Database table definition
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-
-        $sql = "SELECT group_id FROM $table_survey_invitation
-                WHERE c_id = $course_id AND survey_code = '".Database::escape_string(
-            $survey_code
-        )."' AND user = '' AND group_id <> 0";
-        $result = Database::query($sql);
-        $return = array();
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            $return[$row['group_id']] = $row['group_id'];
-        }
-
-        return $return;
-    }
-
-    /**
-     * This function saves all the invitations of course users and additional users in the database
-     * and sends the invitations by email
-     *
-     * @param    array    Users array can be both a list of course uids AND a list of additional emailaddresses
-     * @param     string    Title of the invitation, used as the title of the mail
-     * @param     string    Text of the invitation, used as the text of the mail.
-     *                  The text has to contain a **link** string or this will automatically be added to the end
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+		Database::query($sql);
+	}
+
+	/**
+	 * This function saves all the invitations of course users and additional users in the database
+	 * and sends the invitations by email
+	 *
+	 * @param	array	Users array can be both a list of course uids AND a list of additional emailaddresses
+	 * @param 	string	Title of the invitation, used as the title of the mail
+	 * @param 	string	Text of the invitation, used as the text of the mail.
+	 * 				 The text has to contain a **link** string or this will automatically be added to the end
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @author Julio Montoya - Adding auto-generated link support
-     * @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
-        }
-
-        // Getting the survey information
-        $survey_data = survey_manager::get_survey($_GET['survey_id']);
-        $survey_invitations = SurveyUtil::get_invitations($survey_data['survey_code']);
-        $already_invited = SurveyUtil::get_invited_users($survey_data['code']);
-
-        // Remind unanswered is a special version of remind all reminder
-        $exclude_users = array();
-        if ($remindUnAnswered == 1) { // Remind only unanswered users
-            $reminder = 1;
-            $exclude_users = survey_manager::get_people_who_filled_survey($_GET['survey_id']);
-        }
+	 * @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
+
+		// Getting the survey information
+		$survey_data = survey_manager::get_survey($_GET['survey_id']);
+		$survey_invitations = SurveyUtil::get_invitations($survey_data['survey_code']);
+		$already_invited = SurveyUtil::get_invited_users($survey_data['code']);
+
+		// Remind unanswered is a special version of remind all reminder
+		$exclude_users = array();
+		if ($remindUnAnswered == 1) { // Remind only unanswered users
+			$reminder = 1;
+			$exclude_users = survey_manager::get_people_who_filled_survey($_GET['survey_id']);
+		}
 
-        $counter = 0; // Nr of invitations "sent" (if sendmail option)
-        $course_id = api_get_course_int_id();
+		$counter = 0;  // Nr of invitations "sent" (if sendmail option)
+		$course_id = api_get_course_int_id();
 
         $session_id = api_get_session_id();
 
-        $send_to = UserManager::separate_users_groups_array($users_array, true);
-        $users_array = $send_to['users'];
-
-        $group_list_added = self::get_group_invitations($survey_data['code']);
-
-        if (!empty($send_to['groups'])) {
-            foreach ($send_to['groups'] as $group_id) {
-                if (!in_array($group_id, $group_list_added)) {
-                    $params = array(
-                        'c_id' => $course_id,
-                        'session_id' => $session_id,
-                        'group_id' => $group_id,
-                        'survey_code' => $survey_data['code'],
-                        'invitation_date' => api_get_utc_datetime()
-                    );
-                    self::save_invitation($params);
-                }
-            }
-        }
-
-        foreach ($users_array as $value) {
-            if (!isset($value) || $value == '') {
-                continue;
-            }
-            // Skip user if reminding only unanswered people
-            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'];
-            } else {
-                $invitation_code = md5($value.microtime());
-            }
-            $new_user = false; // User not already invited
-            // 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
-            ))
-            ) {
-                $new_user = true;
-                if (!array_key_exists($value, $survey_invitations)) {
+		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;
+			// 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'];
+			} else {
+				$invitation_code = md5($value.microtime());
+			}
+			$new_user = false; // User not already invited
+			// 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))) {
+				$new_user = true;
+				if (!array_key_exists($value, $survey_invitations)) {
                     $params = array(
                         'c_id' => $course_id,
                         'session_id' => $session_id,
@@ -4570,159 +4015,136 @@ class SurveyUtil
                         'invitation_code' => $invitation_code,
                         'invitation_date' => api_get_utc_datetime()
                     );
-                    self::save_invitation($params);
-                }
-            }
-            // Send the email if checkboxed
-            if (($new_user || $reminder == 1) && $sendmail != 0) {
-                // Make a change for absolute url
-                if (isset($invitation_text)) {
+					self::save_invitation($params);
+				}
+			}
+			// Send the email if checkboxed
+			if (($new_user || $reminder == 1) && $sendmail != 0) {
+				// Make a change for absolute url
+				if (isset($invitation_text)) {
                     $invitation_text = api_html_entity_decode($invitation_text, ENT_QUOTES);
-                    $invitation_text = str_replace('src="../../', 'src="'.api_get_path(WEB_PATH), $invitation_text);
-                    $invitation_text = trim(stripslashes($invitation_text));
-                }
-                SurveyUtil::send_invitation_mail($value, $invitation_code, $invitation_title, $invitation_text);
-                $counter++;
-            }
-        }
-
-        return $counter; // Number of invitations sent
-    }
+					$invitation_text = str_replace('src="../../', 'src="'.api_get_path(WEB_PATH), $invitation_text);
+					$invitation_text = trim(stripslashes($invitation_text));
+				}
+				SurveyUtil::send_invitation_mail($value, $invitation_code, $invitation_title, $invitation_text);
+				$counter++;
+			}
+		}
+		return $counter; // Number of invitations sent
+	}
 
     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['group_id'])) && !empty($params['survey_code'])) {
+        if (!empty($params['c_id']) && !empty($params['user']) && !empty($params['survey_code'])) {
             return Database::insert($table_survey_invitation, $params);
         }
-
         return false;
     }
 
-    /**
-     * Send the invitation by mail.
-     *
-     * @param    invitedUser - the userId (course user) or emailaddress of additional user
-     * $param       $invitation_code - the unique invitation code for the URL
-     * @return    void
-     */
-    static function send_invitation_mail($invitedUser, $invitation_code, $invitation_title, $invitation_text)
+	/**
+	 * Send the invitation by mail.
+	 *
+	 * @param int invitedUser - the userId (course user) or emailaddress of additional user
+	 * $param string $invitation_code - the unique invitation code for the URL
+	 * @return	void
+	 */
+	static function send_invitation_mail($invitedUser, $invitation_code, $invitation_title, $invitation_text)
     {
-        global $_user, $_course, $_configuration;
-
-        $portal_url = api_get_path(WEB_CODE_PATH);
-        if (api_is_multiple_url_enabled()) {
-            $access_url_id = api_get_current_access_url_id();
-            if ($access_url_id != -1) {
-                $url = api_get_access_url($access_url_id);
-                $portal_url = $url['url'];
-            }
-        }
+        $_user = api_get_user_info();
+        $_course = api_get_course_info();
+
+		// Replacing the **link** part with a valid link for the user
+		$survey_link = api_get_path(WEB_CODE_PATH).'survey/fillsurvey.php?course='.$_course['code'].'&invitationcode='.$invitation_code;
+		$text_link = '<a href="'.$survey_link.'">'.get_lang('ClickHereToAnswerTheSurvey')."</a><br />\r\n<br />\r\n".get_lang('OrCopyPasteTheFollowingUrl')." <br />\r\n ".$survey_link;
 
-        // Replacing the **link** part with a valid link for the user
-        $survey_link = api_get_path(
-            WEB_CODE_PATH
-        ).'survey/fillsurvey.php?course='.$_course['code'].'&invitationcode='.$invitation_code;
-        $text_link = '<a href="'.$survey_link.'">'.get_lang(
-            'ClickHereToAnswerTheSurvey'
-        )."</a><br />\r\n<br />\r\n".get_lang('OrCopyPasteTheFollowingUrl')." <br />\r\n ".$survey_link;
-
-        $replace_count = 0;
-        $full_invitation_text = api_str_ireplace('**link**', $text_link, $invitation_text, $replace_count);
-        if ($replace_count < 1) {
-            $full_invitation_text = $full_invitation_text."<br />\r\n<br />\r\n".$text_link;
-        }
+		$replace_count = 0;
+		$full_invitation_text = api_str_ireplace('**link**', $text_link ,$invitation_text, $replace_count);
+		if ($replace_count < 1) {
+			$full_invitation_text = $full_invitation_text."<br />\r\n<br />\r\n".$text_link;
+		}
 
         // Sending the mail
-        $sender_name = api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
-        $sender_email = $_user['mail'];
+		$sender_name  = api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
+		$sender_email = $_user['mail'];
         $sender_user_id = api_get_user_id();
 
 		$replyto = array();
-        if (api_get_setting('survey_email_sender_noreply') == 'noreply') {
-            $noReply = api_get_setting('noreply_email_address');
-            if (!empty($noReply)) {
-                $sender_name = $noReply;
-                $sender_email = $noReply;
+		if (api_get_setting('survey_email_sender_noreply') == 'noreply') {
+			$noreply = api_get_setting('noreply_email_address');
+			if (!empty($noreply)) {
+				$replyto['Reply-to'] = $noreply;
+				$sender_name = $noreply;
+				$sender_email = $noreply;
                 $sender_user_id = null;
-            }
-        }
-
-        // Optionally: finding the e-mail of the user
-        if (is_numeric($invitedUser)) {
-            MessageManager::send_message(
-                $invitedUser,
-                $invitation_title,
-                $full_invitation_text,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                $sender_user_id
-            );
-        } else {
-            /** @todo check if the address is a valid email */
-            $recipient_email = $invitedUser;
-            @api_mail_html(
-                null,
-                $recipient_email,
-                $invitation_title,
-                $full_invitation_text,
-                $sender_name,
-                $sender_email
-            );
-        }
-    }
+			}
+		}
 
-    /**
-     * This function recalculates the number of users who have been invited and updates the survey table with this value.
-     *
-     * @param    string    Survey code
-     * @return    void
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function update_count_invited($survey_code)
+		// Optionally: finding the e-mail of the course user
+		if (is_numeric($invitedUser)) {
+			$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+			$sql = "SELECT firstname, lastname, email FROM $table_user WHERE user_id='".Database::escape_string($invitedUser)."'";
+			$result = Database::query($sql);
+			$row = Database::fetch_array($result);
+			$recipient_email = $row['email'];
+			$recipient_name = api_get_person_name($row['firstname'], $row['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
+
+            MessageManager::send_message($invitedUser, $invitation_title, $full_invitation_text, null, null, null, null, null, null, $sender_user_id);
+
+		} else {
+			/** @todo check if the address is a valid email	 */
+			$recipient_email = $invitedUser;
+            @api_mail_html($recipient_name, $recipient_email, $invitation_title, $full_invitation_text, $sender_name, $sender_email, $replyto);
+		}
+	}
+
+	/**
+	 * This function recalculates the number of users who have been invited and updates the survey table with this value.
+	 *
+	 * @param	string	Survey code
+	 * @return	void
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function update_count_invited($survey_code)
     {
-        $course_id = api_get_course_int_id();
-
-        // Database table definition
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-
-        // Counting the number of people that are invited
-        $sql = "SELECT count(user) as total FROM $table_survey_invitation
-                WHERE c_id = $course_id AND survey_code = '".Database::escape_string($survey_code)."' AND group_id = 0";
-        $result = Database::query($sql);
-        $row = Database::fetch_array($result);
-        $total_invited = $row['total'];
-
-        // Updating the field in the survey table
-        $sql = "UPDATE $table_survey SET invited = '".Database::escape_string(
-            $total_invited
-        )."' WHERE c_id = $course_id AND code = '".Database::escape_string($survey_code)."'";
-        Database::query($sql);
-    }
-
-    /**
-     * This function gets all the invited users for a given survey code.
-     *
-     * @param    string    Survey code
-     * @param    string    optional - course database
-     * @return     array    Array containing the course users and additional users (non course users)
-     *
-     * @todo consider making $defaults['additional_users'] also an array
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	    $course_id = api_get_course_int_id();
+
+		// Database table definition
+		$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		$table_survey 				= Database :: get_course_table(TABLE_SURVEY);
+
+		// Counting the number of people that are invited
+		$sql = "SELECT count(user) as total FROM $table_survey_invitation
+		        WHERE c_id = $course_id AND survey_code = '".Database::escape_string($survey_code)."'";
+		$result = Database::query($sql);
+		$row = Database::fetch_array($result);
+		$total_invited = $row['total'];
+
+		// Updating the field in the survey table
+		$sql = "UPDATE $table_survey
+		        SET invited = '".Database::escape_string($total_invited)."'
+		        WHERE c_id = $course_id AND code = '".Database::escape_string($survey_code)."'";
+		Database::query($sql);
+	}
+
+	/**
+	 * This function gets all the invited users for a given survey code.
+	 *
+	 * @param	string	Survey code
+	 * @param	string	optional - course database
+	 * @return 	array	Array containing the course users and additional users (non course users)
+	 *
+	 * @todo consider making $defaults['additional_users'] also an array
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @author Julio Montoya, adding c_id fixes - Dec 2012
-     * @version January 2007
-     */
-    static function get_invited_users($survey_code, $course_code = '', $session_id = 0)
+	 * @version January 2007
+	 */
+	static function get_invited_users($survey_code, $course_code = '', $session_id = 0)
     {
-        if (!empty($course_code)) {
+	    if (!empty($course_code)) {
             $course_info = api_get_course_info($course_code);
             $course_id = $course_info['real_id'];
         } else {
@@ -4733,33 +4155,33 @@ class SurveyUtil
             $session_id = api_get_session_id();
         }
 
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+	    $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
-        // 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
+		// 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
 				FROM $table_survey_invitation as table_invitation
-				WHERE   table_invitation.c_id = $course_id AND
-                        survey_code='".Database::escape_string($survey_code)."' AND
-                        session_id = $session_id AND group_id = 0
+				WHERE
+				    table_invitation.c_id = $course_id AND
+                    survey_code='".Database::escape_string($survey_code)."' AND
+                    session_id = $session_id
                 ";
 
+		$defaults = array();
+		$defaults['course_users'] = array();
+		$defaults['additional_users'] = array();
 
-        $defaults = array();
-        $defaults['course_users'] = array();
-        $defaults['additional_users'] = array();
-
-        $result = Database::query($sql);
-        while ($row = Database::fetch_array($result)) {
-            if (is_numeric($row['user'])) {
-                $defaults['course_users'][] = $row['user'];
-            } else {
+		$result = Database::query($sql);
+		while ($row = Database::fetch_array($result)) {
+			if (is_numeric($row['user'])) {
+				$defaults['course_users'][] = $row['user'];
+			} else {
                 if (!empty($row['user'])) {
                     $defaults['additional_users'][] = $row['user'];
                 }
-            }
-        }
+			}
+		}
 
         if (!empty($defaults['course_users'])) {
             $user_ids = implode("','", $defaults['course_users']);
@@ -4772,70 +4194,56 @@ class SurveyUtil
             $defaults['course_users'] = $fixed_users;
         }
 
-        $sql = "SELECT group_id
-				FROM $table_survey_invitation as table_invitation
-				WHERE   table_invitation.c_id = $course_id AND
-                        survey_code='".Database::escape_string($survey_code)."' AND
-                        session_id = $session_id AND group_id <> 0
-                ";
-        $result = Database::query($sql);
-        $defaults['course_groups'] = array();
-        if (Database::num_rows($result)) {
-            while ($row = Database::fetch_array($result)) {
-                $defaults['course_groups'][] = $row['group_id'];
-            }
-        }
-
         if (!empty($defaults['additional_users'])) {
             $defaults['additional_users'] = implode(';', $defaults['additional_users']);
         }
-
-        return $defaults;
-    }
-
-    /**
-     * Get all the invitations
-     *
-     * @param    string    Survey code
-     * @return    array    Database rows matching the survey code
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version September 2007
-     */
-    static function get_invitations($survey_code)
+        //error_log(print_r($defaults, 1));
+		return $defaults;
+	}
+
+	/**
+	 * Get all the invitations
+	 *
+	 * @param	string	Survey code
+	 * @return	array	Database rows matching the survey code
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version September 2007
+	 */
+	static function get_invitations($survey_code)
     {
-        $course_id = api_get_course_int_id();
-        // Database table definition
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-
-        $sql = "SELECT * FROM $table_survey_invitation
-                WHERE c_id = $course_id AND survey_code = '".Database::escape_string($survey_code)."' AND user <> '' ";
-        $result = Database::query($sql);
-        $return = array();
-        while ($row = Database::fetch_array($result)) {
-            $return[$row['user']] = $row;
-        }
-
-        return $return;
-    }
-
-    /**
-     * This function displays the form for searching a survey
-     *
-     * @return    void    (direct output)
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     *
-     * @todo use quickforms
-     * @todo consider moving this to surveymanager.inc.lib.php
-     */
-    static function display_survey_search_form()
+	    $course_id = api_get_course_int_id();
+		// Database table definition
+		$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+
+		$sql = "SELECT * FROM $table_survey_invitation
+		        WHERE
+		            c_id = $course_id AND
+		            survey_code = '".Database::escape_string($survey_code)."'";
+		$result = Database::query($sql);
+		$return = array();
+		while ($row = Database::fetch_array($result)) {
+			$return[$row['user']] = $row;
+		}
+		return $return;
+	}
+
+	/**
+	 * This function displays the form for searching a survey
+	 *
+	 * @return	void	(direct output)
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 *
+	 * @todo use quickforms
+	 * @todo consider moving this to surveymanager.inc.lib.php
+	 */
+	static function display_survey_search_form()
     {
-
-        echo '<form class="form-horizontal" method="get" action="survey_list.php?search=advanced">';
-        echo '<legend>'.get_lang('SearchASurvey').'</legend>';
-        echo '	<div class="control-group">
+		echo '<form class="form-horizontal" method="get" action="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?search=advanced">';
+		echo '<legend>'.get_lang('SearchASurvey').'</legend>';
+		echo '	<div class="control-group">
 					<label class="control-label">
 						'.get_lang('Title').'
 					</label>
@@ -4843,7 +4251,7 @@ class SurveyUtil
 						<input type="text" id="search_title" name="keyword_title"/>
 					</div>
 				</div>';
-        echo '	<div class="control-group">
+		echo '	<div class="control-group">
 					<label class="control-label">
 						'.get_lang('Code').'
 					</label>
@@ -4851,715 +4259,698 @@ class SurveyUtil
 						<input type="text" name="keyword_code"/>
 					</div>
 				</div>';
-        echo '	<div class="control-group">
+		echo '	<div class="control-group">
 					<label class="control-label">
 						'.get_lang('Language').'
 					</label>
 					<div class="controls">';
-        echo '			<select name="keyword_language"><option value="%">'.get_lang('All').'</option>';
-        $languages = api_get_languages();
-        foreach ($languages['name'] as $index => & $name) {
-            echo '<option value="'.$languages['folder'][$index].'">'.$name.'</option>';
-        }
-        echo '			</select>';
-        echo '		</div>
+		echo '			<select name="keyword_language"><option value="%">'.get_lang('All').'</option>';
+		$languages = api_get_languages();
+		foreach ($languages['name'] as $index => & $name) {
+			echo '<option value="'.$languages['folder'][$index].'">'.$name.'</option>';
+		}
+		echo '			</select>';
+		echo '		</div>
 				</div>';
-        echo '<input type="hidden" name="cidReq" value="'.api_get_course_id().'"/>';
-        echo '	<div class="control-group">
+		echo '<input type="hidden" name="cidReq" value="'.api_get_course_id().'"/>';
+		echo '	<div class="control-group">
 					<div class="controls">
 						<button class="search" type="submit" name="do_search">'.get_lang('Search').'</button>
 					</div>
 				</div>';
-        echo '</form>';
-        echo '<div style="clear: both;margin-bottom: 10px;"></div>';
-    }
-
-    /**
-     * This function displays the sortable table with all the surveys
-     *
-     * @return    void    (direct output)
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function display_survey_list()
+		echo '</form>';
+		echo '<div style="clear: both;margin-bottom: 10px;"></div>';
+	}
+
+	/**
+	 * This function displays the sortable table with all the surveys
+	 *
+	 * @return	void	(direct output)
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function display_survey_list()
     {
-        $parameters = array();
-        $parameters['cidReq'] = api_get_course_id();
-
-        if (isset($_GET['do_search']) && $_GET['do_search']) {
-            $message = get_lang('DisplaySearchResults').'<br />';
-            $message .= '<a href="'.api_get_self().'?'.api_get_cidreq().'">'.get_lang('DisplayAll').'</a>';
-            Display::display_normal_message($message, false);
-        }
-
-        // Create a sortable table with survey-data
-        $table = new SortableTable('surveys', 'get_number_of_surveys', 'get_survey_data', 2);
-        $table->set_additional_parameters($parameters);
-        $table->set_header(0, '', false);
-        $table->set_header(1, get_lang('SurveyName'));
-        $table->set_header(2, get_lang('SurveyCode'));
-        $table->set_header(3, get_lang('NumberOfQuestions'));
-        $table->set_header(4, get_lang('Author'));
-        $table->set_header(5, get_lang('AvailableFrom'));
-        $table->set_header(6, get_lang('AvailableUntil'));
-        $table->set_header(7, get_lang('Invite'));
-        $table->set_header(8, get_lang('Anonymous'));
-        $table->set_header(9, get_lang('Modify'), false, 'width="150"');
-        $table->set_column_filter(8, 'anonymous_filter');
-        $table->set_column_filter(9, 'modify_filter');
-        $table->set_form_actions(array('delete' => get_lang('DeleteSurvey')));
-        $table->display();
-    }
+		$parameters = array();
+		$parameters['cidReq'] = api_get_course_id();
+		if (isset($_GET['do_search']) && $_GET['do_search']) {
+			$message = get_lang('DisplaySearchResults').'<br />';
+			$message .= '<a href="'.api_get_self().'?'.api_get_cidreq().'">'.get_lang('DisplayAll').'</a>';
+			Display::display_normal_message($message, false);
+		}
 
-    function display_survey_list_for_coach()
+		// Create a sortable table with survey-data
+		$table = new SortableTable('surveys', 'get_number_of_surveys', 'get_survey_data', 2);
+		$table->set_additional_parameters($parameters);
+		$table->set_header(0, '', false);
+		$table->set_header(1, get_lang('SurveyName'));
+		$table->set_header(2, get_lang('SurveyCode'));
+		$table->set_header(3, get_lang('NumberOfQuestions'));
+		$table->set_header(4, get_lang('Author'));
+		//$table->set_header(5, get_lang('Language'));
+		//$table->set_header(6, get_lang('Shared'));
+		$table->set_header(5, get_lang('AvailableFrom'));
+		$table->set_header(6, get_lang('AvailableUntil'));
+		$table->set_header(7, get_lang('Invite'));
+		$table->set_header(8, get_lang('Anonymous'));
+		$table->set_header(9, get_lang('Modify'), false, 'width="150"');
+		$table->set_column_filter(8, 'anonymous_filter');
+		$table->set_column_filter(9, 'modify_filter');
+		$table->set_form_actions(array('delete' => get_lang('DeleteSurvey')));
+		$table->display();
+	}
+
+	function display_survey_list_for_coach()
     {
-        $parameters = array();
-        $parameters['cidReq'] = api_get_course_id();
-        if (isset($_GET['do_search'])) {
-            $message = get_lang('DisplaySearchResults').'<br />';
-            $message .= '<a href="'.api_get_self().'?'.api_get_cidreq().'">'.get_lang('DisplayAll').'</a>';
-            Display::display_normal_message($message, false);
-        }
-
-        // Create a sortable table with survey-data
-        $table = new SortableTable('surveys_coach', 'get_number_of_surveys_for_coach', 'get_survey_data_for_coach', 2);
-        $table->set_additional_parameters($parameters);
-        $table->set_header(0, '', false);
-        $table->set_header(1, get_lang('SurveyName'));
-        $table->set_header(2, get_lang('SurveyCode'));
-        $table->set_header(3, get_lang('NumberOfQuestions'));
-        $table->set_header(4, get_lang('Author'));
-        $table->set_header(5, get_lang('AvailableFrom'));
-        $table->set_header(6, get_lang('AvailableUntil'));
-        $table->set_header(7, get_lang('Invite'));
-        $table->set_header(8, get_lang('Anonymous'));
-        $table->set_header(9, get_lang('Modify'), false, 'width="130"');
-        $table->set_column_filter(8, 'anonymous_filter');
-        $table->set_column_filter(9, 'modify_filter_for_coach');
-        $table->display();
-    }
+		$parameters = array();
+		$parameters['cidReq']=api_get_course_id();
+		if (isset($_GET['do_search'])) {
+			$message = get_lang('DisplaySearchResults').'<br />';
+			$message .= '<a href="'.api_get_self().'?'.api_get_cidreq().'">'.get_lang('DisplayAll').'</a>';
+			Display::display_normal_message($message, false);
+		}
 
-    /**
-     * This function changes the modify column of the sortable table
-     *
-     * @param integer $survey_id the id of the survey
-     * @return html code that are the actions that can be performed on any survey
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function modify_filter($survey_id)
+		// Create a sortable table with survey-data
+		$table = new SortableTable('surveys_coach', 'get_number_of_surveys_for_coach', 'get_survey_data_for_coach', 2);
+		$table->set_additional_parameters($parameters);
+		$table->set_header(0, '', false);
+		$table->set_header(1, get_lang('SurveyName'));
+		$table->set_header(2, get_lang('SurveyCode'));
+		$table->set_header(3, get_lang('NumberOfQuestions'));
+		$table->set_header(4, get_lang('Author'));
+		//$table->set_header(5, get_lang('Language'));
+		//$table->set_header(6, get_lang('Shared'));
+		$table->set_header(5, get_lang('AvailableFrom'));
+		$table->set_header(6, get_lang('AvailableUntil'));
+		$table->set_header(7, get_lang('Invite'));
+		$table->set_header(8, get_lang('Anonymous'));
+		$table->set_header(9, get_lang('Modify'), false, 'width="130"');
+		$table->set_column_filter(8, 'anonymous_filter');
+		$table->set_column_filter(9, 'modify_filter_for_coach');
+		$table->display();
+	}
+
+	/**
+	 * This function changes the modify column of the sortable table
+	 *
+	 * @param integer $survey_id the id of the survey
+	 * @return html code that are the actions that can be performed on any survey
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function modify_filter($survey_id)
     {
-        $survey_id = Security::remove_XSS($survey_id);
-        $return = '';
-        // Coach can see that only if the survey is in his session
-        if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) {
-            $return .= '<a href="create_new_survey.php?'.api_get_cidreq(
-            ).'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon(
-                'edit.png',
-                get_lang('Edit'),
-                '',
-                ICON_SIZE_SMALL
-            ).'</a>';
+		$survey_id = Security::remove_XSS($survey_id);
+		$return = '';
+
+		// Coach can see that only if the survey is in his session
+		if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) {
+			$return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
             if (survey_manager::survey_generation_hash_available()) {
-                $return .= Display::url(
-                    Display::return_icon('new_link.png', get_lang('GenerateSurveyAccessLink'), '', ICON_SIZE_SMALL),
-                    'generate_link.php?survey_id='.$survey_id.'&'.api_get_cidreq()
+                $return .=  Display::url(
+                    Display::return_icon('new_link.png', get_lang('GenerateSurveyAccessLink'),'',ICON_SIZE_SMALL),
+                    api_get_path(WEB_CODE_PATH).'survey/generate_link.php?survey_id='.$survey_id.'&'.api_get_cidreq()
                 );
             }
-            $return .= Display::url(
-                Display::return_icon('copy.png', get_lang('DuplicateSurvey'), '', ICON_SIZE_SMALL),
-                'survey_list.php?action=copy_survey&survey_id='.$survey_id.'&'.api_get_cidreq()
-            );
-            $return .= ' <a href="survey_list.php?'.api_get_cidreq(
-            ).'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(
-                api_htmlentities(get_lang("EmptySurvey").'?')
-            ).'\')) return false;">'.Display::return_icon(
-                'clean.png',
-                get_lang('EmptySurvey'),
-                '',
-                ICON_SIZE_SMALL
-            ).'</a>&nbsp;';
-        }
-        $return .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon(
-            'preview_view.png',
-            get_lang('Preview'),
-            '',
-            ICON_SIZE_SMALL
-        ).'</a>&nbsp;';
-        $return .= '<a href="survey_invite.php?'.api_get_cidreq(
-        ).'&amp;survey_id='.$survey_id.'">'.Display::return_icon(
-            'mail_send.png',
-            get_lang('Publish'),
-            '',
-            ICON_SIZE_SMALL
-        ).'</a>&nbsp;';
-        $return .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon(
-            'stats.png',
-            get_lang('Reporting'),
-            '',
-            ICON_SIZE_SMALL
-        ).'</a>';
-        if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) {
-            $return .= '<a href="survey_list.php?'.api_get_cidreq(
-            ).'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(
-                api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)
-            ).'\')) return false;">'.Display::return_icon(
-                'delete.png',
-                get_lang('Delete'),
-                '',
-                ICON_SIZE_SMALL
-            ).'</a>&nbsp;';
-        }
-
-        return $return;
-    }
-
-    static function modify_filter_for_coach($survey_id)
-    {
-        $survey_id = Security::remove_XSS($survey_id);
-        $return = '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon(
-            'preview_view.png',
-            get_lang('Preview'),
-            '',
-            ICON_SIZE_SMALL
-        ).'</a>&nbsp;';
-        $return .= '<a href="survey_invite.php?'.api_get_cidreq(
-        ).'&amp;survey_id='.$survey_id.'">'.Display::return_icon(
-            'mail_send.png',
-            get_lang('Publish'),
-            '',
-            ICON_SIZE_SMALL
-        ).'</a>&nbsp;';
-        $return .= '<a href="survey_list.php?'.api_get_cidreq(
-        ).'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(
-            api_htmlentities(get_lang("EmptySurvey").'?', ENT_QUOTES)
-        ).'\')) return false;">'.Display::return_icon(
-            'clean.png',
-            get_lang('EmptySurvey'),
-            '',
-            ICON_SIZE_SMALL
-        ).'</a>&nbsp;';
-
-        return $return;
-    }
-
-    /**
-     * Returns "yes" when given parameter is one, "no" for any other value
-     * @param    integer    Whether anonymous or not
-     * @return    string    "Yes" or "No" in the current language
-     */
-    static function anonymous_filter($anonymous)
-    {
-        if ($anonymous == 1) {
-            return get_lang('Yes');
-        } else {
-            return get_lang('No');
-        }
-    }
+			$return .= ' <a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?')).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		}
+		$return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		$return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		$return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_SMALL).'</a>';
+		if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) {
+            $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		}
+		return $return;
+	}
 
-    /**
-     * This function handles the search restriction for the SQL statements
-     *
-     * @return    string    Part of a SQL statement or false on error
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function survey_search_restriction()
+	static function modify_filter_for_coach($survey_id)
     {
-        if (isset($_GET['do_search'])) {
-            if ($_GET['keyword_title'] != '') {
-                $search_term[] = 'title like "%" \''.Database::escape_string($_GET['keyword_title']).'\' "%"';
-            }
-            if ($_GET['keyword_code'] != '') {
-                $search_term[] = 'code =\''.Database::escape_string($_GET['keyword_code']).'\'';
-            }
-            if ($_GET['keyword_language'] != '%') {
-                $search_term[] = 'lang =\''.Database::escape_string($_GET['keyword_language']).'\'';
-            }
-            $my_search_term = ($search_term == null) ? array() : $search_term;
-            $search_restriction = implode(' AND ', $my_search_term);
-
-            return $search_restriction;
-        } else {
-            return false;
-        }
-    }
 
-    /**
-     * This function calculates the total number of surveys
-     *
-     * @return    integer    Total number of surveys
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version January 2007
-     */
-    static function get_number_of_surveys()
+		$survey_id = Security::remove_XSS($survey_id);
+		//$return = '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
+		//$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+		//$return .= '<a href="create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
+		//$return .= '<a href="survey.php?survey_id='.$survey_id.'">'.Display::return_icon('add.gif', get_lang('Add')).'</a>';
+		$return = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		$return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		$return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+		//$return .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>';
+		return $return;
+	}
+
+	/**
+	 * Returns "yes" when given parameter is one, "no" for any other value
+	 * @param	integer	Whether anonymous or not
+	 * @return	string	"Yes" or "No" in the current language
+	 */
+	static function anonymous_filter($anonymous) {
+		if ($anonymous == 1) {
+			return get_lang('Yes');
+		} else {
+			return get_lang('No');
+		}
+	}
+
+
+	/**
+	 * This function handles the search restriction for the SQL statements
+	 *
+	 * @return	string	Part of a SQL statement or false on error
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function survey_search_restriction() {
+		if (isset($_GET['do_search'])) {
+			if ($_GET['keyword_title'] != '') {
+				$search_term[] = 'title like "%" \''.Database::escape_string($_GET['keyword_title']).'\' "%"';
+			}
+			if ($_GET['keyword_code'] != '') {
+				$search_term[] = 'code =\''.Database::escape_string($_GET['keyword_code']).'\'';
+			}
+			if ($_GET['keyword_language'] != '%') {
+				$search_term[] = 'lang =\''.Database::escape_string($_GET['keyword_language']).'\'';
+			}
+			$my_search_term = ($search_term == null) ? array() : $search_term;
+			$search_restriction = implode(' AND ', $my_search_term);
+			return $search_restriction;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * This function calculates the total number of surveys
+	 *
+	 * @return	integer	Total number of surveys
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version January 2007
+	 */
+	static function get_number_of_surveys()
     {
-        global $table_survey;
+        $table_survey = Database :: get_course_table(TABLE_SURVEY);
         $course_id = api_get_course_int_id();
 
-        $search_restriction = SurveyUtil::survey_search_restriction();
-        if ($search_restriction) {
-            $search_restriction = 'WHERE c_id = '.$course_id.' AND '.$search_restriction;
-        } else {
-            $search_restriction = "WHERE c_id = $course_id";
-        }
-        $sql = "SELECT count(survey_id) AS total_number_of_items FROM ".$table_survey.' '.$search_restriction;
-        $res = Database::query($sql);
-        $obj = Database::fetch_object($res);
-
-        return $obj->total_number_of_items;
-    }
-
-    static function get_number_of_surveys_for_coach()
+		$search_restriction = SurveyUtil::survey_search_restriction();
+		if ($search_restriction) {
+			$search_restriction = 'WHERE c_id = '.$course_id.' AND '.$search_restriction;
+		} else {
+		    $search_restriction = "WHERE c_id = $course_id";
+		}
+		$sql = "SELECT count(survey_id) AS total_number_of_items
+		        FROM ".$table_survey.' '.$search_restriction;
+		$res = Database::query($sql);
+		$obj = Database::fetch_object($res);
+		return $obj->total_number_of_items;
+	}
+
+	static function get_number_of_surveys_for_coach()
     {
-        // Ugly fix
-        require_once(api_get_path(LIBRARY_PATH).'surveymanager.lib.php');
-        $survey_tree = new SurveyTree();
-
-        return count($survey_tree->get_last_children_from_branch($survey_tree->surveylist));
-    }
-
-    /**
-     * This function gets all the survey data that is to be displayed in the sortable table
-     *
-     * @param unknown_type $from
-     * @param unknown_type $number_of_items
-     * @param unknown_type $column
-     * @param unknown_type $direction
-     * @return unknown
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @author Julio Montoya <gugli100@gmail.com>, Beeznest - Adding intvals
-     * @version January 2007
-     */
-    static function get_survey_data($from, $number_of_items, $column, $direction)
+		// Ugly fix
+		require_once api_get_path(LIBRARY_PATH).'surveymanager.lib.php';
+		$survey_tree = new SurveyTree();
+		return count($survey_tree->get_last_children_from_branch($survey_tree->surveylist));
+	}
+
+	/**
+	 * This function gets all the survey data that is to be displayed in the sortable table
+	 *
+	 * @param int $from
+	 * @param int $number_of_items
+	 * @param int $column
+	 * @param string $direction
+	 * @return unknown
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @author Julio Montoya <gugli100@gmail.com>, Beeznest - Adding intvals
+	 * @version January 2007
+	 */
+	static function get_survey_data($from, $number_of_items, $column, $direction)
     {
         $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $_user = api_get_user_info();
 
-        global $_user;
-
-        // Searching
-        $search_restriction = SurveyUtil::survey_search_restriction();
-        if ($search_restriction) {
-            $search_restriction = ' AND '.$search_restriction;
-        }
-        $from = intval($from);
-        $number_of_items = intval($number_of_items);
-        $column = intval($column);
-        if (!in_array(strtolower($direction), array('asc', 'desc'))) {
-            $direction = 'asc';
-        }
-
-        // Condition for the session
-        $session_id = api_get_session_id();
-        $condition_session = api_get_session_condition($session_id);
-
-        $course_id = api_get_course_int_id();
-
+		// Searching
+		$search_restriction = SurveyUtil::survey_search_restriction();
+		if ($search_restriction) {
+			$search_restriction = ' AND '.$search_restriction;
+		}
+		$from = intval($from);
+		$number_of_items = intval($number_of_items);
+		$column = intval($column);
+		if (!in_array(strtolower($direction), array('asc', 'desc'))) {
+		    $direction = 'asc';
+		}
 
-        $sql = "SELECT
-					survey.survey_id							AS col0,
-					survey.title    AS col1,
-					survey.code									AS col2,
-					count(survey_question.question_id)			AS col3,
-					".(api_is_western_name_order(
-        ) ? "CONCAT(user.firstname, ' ', user.lastname)" : "CONCAT(user.lastname, ' ', user.firstname)")."	AS col4,
-					survey.avail_from							AS col5,
-					survey.avail_till							AS col6,
-					CONCAT('<a href=\"survey_invitation.php?view=answered&amp;survey_id=',survey.survey_id,'\">',survey.answered,'</a> / <a href=\"survey_invitation.php?view=invited&amp;survey_id=',survey.survey_id,'\">',survey.invited, '</a>')	AS col7,
-					survey.anonymous							AS col8,
-					survey.survey_id							AS col9,
-					survey.session_id							AS session_id
+		// Condition for the session
+		$session_id = api_get_session_id();
+		$condition_session = api_get_session_condition($session_id);
+		$course_id = api_get_course_int_id();
+
+		$sql = "SELECT
+					survey.survey_id AS col0,
+					survey.title AS col1,
+					survey.code AS col2,
+					count(survey_question.question_id) AS col3,
+					".(api_is_western_name_order() ? "CONCAT(user.firstname, ' ', user.lastname)" : "CONCAT(user.lastname, ' ', user.firstname)")."	AS col4,
+					survey.avail_from AS col5,
+					survey.avail_till AS col6,
+					survey.invited AS col7,
+					survey.anonymous AS col8,
+					survey.survey_id AS col9,
+					survey.session_id AS session_id,
+					survey.answered,
+					survey.invited
 				 FROM $table_survey survey
-                    LEFT JOIN $table_survey_question survey_question ON (survey.survey_id = survey_question.survey_id AND survey_question.c_id = $course_id)
-                    INNER JOIN $table_user user ON (survey.author = user.user_id)
+                    LEFT JOIN $table_survey_question survey_question
+                    ON (survey.survey_id = survey_question.survey_id AND survey_question.c_id = $course_id)
+                    LEFT JOIN $table_user user
+                    ON (survey.author = user.user_id)
 				 WHERE survey.c_id = $course_id
 				 $search_restriction
 				 $condition_session ";
-        $sql .= " GROUP BY survey.survey_id";
-        $sql .= " ORDER BY col$column $direction ";
-        $sql .= " LIMIT $from,$number_of_items";
-
-        $res = Database::query($sql);
-        $surveys = array();
-        $array = array();
-        while ($survey = Database::fetch_array($res)) {
-            $array[0] = $survey[0];
-            $array[1] = Display::url($survey[1], "survey.php?survey_id={$survey[0]}&".api_get_cidreq());
-
-            // Validation when belonging to a session
-            $session_img = api_get_session_image($survey['session_id'], $_user['status']);
-            $array[2] = $survey[2].$session_img;
-            $array[3] = $survey[3];
-            $array[4] = $survey[4];
-            $array[5] = $survey[5];
-            $array[6] = $survey[6];
-            $array[7] = $survey[7];
-            $array[8] = $survey[8];
-            $array[9] = $survey[9];
-            //$array[10] = $survey[10];
-            $surveys[] = $array;
-        }
+		$sql .= " GROUP BY survey.survey_id";
+		$sql .= " ORDER BY col$column $direction ";
+		$sql .= " LIMIT $from,$number_of_items";
+
+		$res = Database::query($sql);
+		$surveys = array();
+		$array = array();
+		while ($survey = Database::fetch_array($res)) {
+
+			$array[0] = $survey[0];
+			$array[1] = Display::url(
+                $survey[1],
+                api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey[0].'&'.api_get_cidreq()
+            );
 
-        return $surveys;
-    }
+			// Validation when belonging to a session
+			$session_img = api_get_session_image($survey['session_id'], $_user['status']);
+			$array[2] = $survey[2] . $session_img;
+			$array[3] = $survey[3];
+			$array[4] = $survey[4];
+			$array[5] = $survey[5];
+			$array[6] = $survey[6];
+			$array[7] =
+                Display::url(
+                    $survey['answered'],
+                    api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey[0].'&'.api_get_cidreq()
+                ).' / '.
+                Display::url(
+                    $survey['invited'],
+                    api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey[0].'&'.api_get_cidreq()
+                );
 
-    static function get_survey_data_for_coach($from, $number_of_items, $column, $direction)
+			$array[8] = $survey[8];
+			$array[9] = $survey[9];
+			//$array[10] = $survey[10];
+			$surveys[] = $array;
+		}
+		return $surveys;
+	}
+
+	static function get_survey_data_for_coach($from, $number_of_items, $column, $direction)
     {
-        require_once api_get_path(LIBRARY_PATH).'surveymanager.lib.php';
-        $survey_tree = new SurveyTree();
-        $last_version_surveys = $survey_tree->get_last_children_from_branch($survey_tree->surveylist);
-        $list = array();
-        foreach ($last_version_surveys as & $survey) {
-            $list[] = $survey['id'];
-        }
-        if (count($list) > 0) {
-            $list_condition = " AND survey.survey_id IN (".implode(',', $list).") ";
-        } else {
-            $list_condition = '';
-        }
+		require_once api_get_path(LIBRARY_PATH).'surveymanager.lib.php';
+		$survey_tree = new SurveyTree();
+		$last_version_surveys = $survey_tree->get_last_children_from_branch($survey_tree->surveylist);
+		$list = array();
+		foreach ($last_version_surveys as & $survey) {
+			$list[]=$survey['id'];
+		}
+		if (count($list) > 0) {
+			$list_condition = " AND survey.survey_id IN (".implode(',',$list).") ";
+		} else {
+			$list_condition = '';
+		}
 
-        $from = intval($from);
+	    $from = intval($from);
         $number_of_items = intval($number_of_items);
         $column = intval($column);
         if (!in_array(strtolower($direction), array('asc', 'desc'))) {
             $direction = 'asc';
         }
 
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
-
-        $course_id = api_get_course_int_id();
-
-        //IF(is_shared<>0,'V','-')	 					AS col6,
-        $sql = "SELECT ".
-            "survey.survey_id							AS col0, ".
-            "survey.title	                            AS col1, ".
-            "survey.code									AS col2, ".
-            "count(survey_question.question_id)			AS col3, ".
-            (api_is_western_name_order(
-            ) ? "CONCAT(user.firstname, ' ', user.lastname)" : "CONCAT(user.lastname, ' ', user.firstname)")."	AS col4, ".
-            "survey.avail_from							AS col5, ".
-            "survey.avail_till							AS col6, ".
-            "CONCAT('<a href=\"survey_invitation.php?view=answered&amp;survey_id=',survey.survey_id,'\">',survey.answered,'</a> / <a href=\"survey_invitation.php?view=invited&amp;survey_id=',survey.survey_id,'\">',survey.invited, '</a>')	AS col7, ".
-            "survey.anonymous							AS col8, ".
-            "survey.survey_id							AS col9  ".
-            "FROM $table_survey survey ".
-            "LEFT JOIN $table_survey_question survey_question ON (survey.survey_id = survey_question.survey_id AND survey.c_id = survey_question.c_id) ".
-            ", $table_user user ".
-            ",WHERE survey.author = user.user_id AND survey.c_id = $course_id $list_condition ";
-        $sql .= " GROUP BY survey.survey_id";
-        $sql .= " ORDER BY col$column $direction ";
-        $sql .= " LIMIT $from,$number_of_items";
-
-        $res = Database::query($sql);
-        $surveys = array();
-        while ($survey = Database::fetch_array($res)) {
-            $surveys[] = $survey;
-        }
-
-        return $surveys;
-    }
-
-    /**
-     * Display all the active surveys for the given course user
-     *
-     * @param unknown_type $user_id
-     *
-     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-     * @version April 2007
-     */
-    static function survey_list_user($user_id)
+		$table_survey 			= Database :: get_course_table(TABLE_SURVEY);
+		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_user 			= Database :: get_main_table(TABLE_MAIN_USER);
+
+		$course_id = api_get_course_int_id();
+
+		//IF(is_shared<>0,'V','-')	 					AS col6,
+		$sql = "SELECT ".
+                   "survey.survey_id							AS col0, ".
+                   "survey.title	                            AS col1, ".
+                   "survey.code									AS col2, ".
+                   "count(survey_question.question_id)			AS col3, ".
+                   (api_is_western_name_order() ? "CONCAT(user.firstname, ' ', user.lastname)" : "CONCAT(user.lastname, ' ', user.firstname)")."	AS col4, ".
+                   "survey.avail_from							AS col5, ".
+                   "survey.avail_till							AS col6, ".
+                   "CONCAT('<a href=\"survey_invitation.php?view=answered&amp;survey_id=',survey.survey_id,'\">',survey.answered,'</a> / <a href=\"survey_invitation.php?view=invited&amp;survey_id=',survey.survey_id,'\">',survey.invited, '</a>')	AS col7, ".
+                   "survey.anonymous							AS col8, ".
+                   "survey.survey_id							AS col9  ".
+                   "FROM $table_survey survey ".
+                   "LEFT JOIN $table_survey_question survey_question ON (survey.survey_id = survey_question.survey_id AND survey.c_id = survey_question.c_id) ".
+                   ", $table_user user
+               WHERE survey.author = user.user_id AND survey.c_id = $course_id $list_condition ";
+		$sql .= " GROUP BY survey.survey_id";
+		$sql .= " ORDER BY col$column $direction ";
+		$sql .= " LIMIT $from,$number_of_items";
+
+		$res = Database::query($sql);
+		$surveys = array();
+		while ($survey = Database::fetch_array($res)) {
+			$surveys[] = $survey;
+		}
+		return $surveys;
+	}
+
+	/**
+	 * Display all the active surveys for the given course user
+	 *
+	 * @param int $user_id
+	 *
+	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+	 * @version April 2007
+	 */
+	function survey_list_user($user_id)
     {
         $_course = api_get_course_info();
         $course_id = api_get_course_int_id();
 
-        // Database table definitions
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
-        $all_question_id = array();
+		// Database table definitions
+		$table_survey_question   = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		$table_survey_answer     = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$table_survey 			 = Database :: get_course_table(TABLE_SURVEY);
+		$all_question_id = array();
 
-        $sql = 'SELECT question_id from '.$table_survey_question." WHERE c_id = $course_id";
-        $result = Database::query($sql);
+		$sql = 'SELECT question_id FROM '.$table_survey_question." WHERE c_id = $course_id";
+		$result = Database::query($sql);
 
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            $all_question_id[] = $row;
-        }
+		while($row = Database::fetch_array($result, 'ASSOC')) {
+			$all_question_id[] = $row;
+		}
 
-        $count = 0;
-        for ($i = 0; $i < count($all_question_id); $i++) {
-            $sql = 'SELECT COUNT(*) as count FROM '.$table_survey_answer.'
-					WHERE c_id = '.$course_id.' AND question_id='.Database::escape_string(
-                $all_question_id[$i]['question_id']
-            ).' AND user='.api_get_user_id();
-            $result = Database::query($sql);
-            while ($row = Database::fetch_array($result, 'ASSOC')) {
-                if ($row['count'] == 0) {
-                    $count++;
-                    break;
-                }
-            }
-            if ($count > 0) {
-                $link_add = true;
-                break;
-            }
-        }
-        echo '<table class="data_table">';
-        echo '<tr>';
-        echo '	<th>'.get_lang('SurveyName').'</th>';
-        echo '	<th>'.get_lang('Anonymous').'</th>';
-        echo '</tr>';
-        $now = api_get_utc_datetime();
-        $sql = "SELECT * FROM $table_survey survey, $table_survey_invitation survey_invitation
+		$count = 0;
+		for ($i = 0; $i < count($all_question_id); $i++) {
+			$sql = 'SELECT COUNT(*) as count
+			        FROM '.$table_survey_answer.'
+					WHERE
+					    c_id = '.$course_id.' AND
+					    question_id='.Database::escape_string($all_question_id[$i]['question_id']).' AND
+					    user = '.api_get_user_id();
+			$result = Database::query($sql);
+			while ($row = Database::fetch_array($result, 'ASSOC')) {
+				if ($row['count'] == 0) {
+					$count++;
+					break;
+				}
+			}
+			if ($count > 0) {
+				$link_add = true;
+				break;
+			}
+		}
+		echo '<table class="data_table">';
+		echo '<tr>';
+		echo '	<th>'.get_lang('SurveyName').'</th>';
+		echo '	<th>'.get_lang('Anonymous').'</th>';
+		echo '</tr>';
+		$sql = "SELECT * FROM $table_survey survey, $table_survey_invitation survey_invitation
 				WHERE
 				survey_invitation.user 	= '".Database::escape_string($user_id)."' AND
 				survey.code 			= survey_invitation.survey_code AND
-				survey.avail_from 		<= '".$now."' AND
-				survey.avail_till 		>= '".$now."' AND
+				survey.avail_from 		<= '".date('Y-m-d H:i:s')."' AND
+				survey.avail_till 		>= '".date('Y-m-d H:i:s')."' AND
 				survey.c_id 			= $course_id AND
 				survey_invitation.c_id = $course_id
 				";
-        $result = Database::query($sql);
-        $counter = 0;
-        while ($row = Database::fetch_array($result, 'ASSOC')) {
-            // Get the user into survey answer table (user or anonymus)
-            $sql = "SELECT user FROM $table_survey_answer
-					WHERE c_id = $course_id AND survey_id = (SELECT survey_id from $table_survey WHERE code ='".Database::escape_string(
-                $row['code']
-            )." AND c_id = $course_id')";
-            $result_answer = Database::query($sql);
-            $row_answer = Database::fetch_array($result_answer, 'ASSOC');
-            echo '<tr>';
-            if ($row['answered'] == 0) {
-                echo '<td><a href="fillsurvey.php?course='.$_course['sysCode'].'&amp;invitationcode='.$row['invitation_code'].'&amp;cidReq='.$_course['sysCode'].'">'.$row['title'].'</a></td>';
-            } else {
-                echo '<td>'.$row['title'].'</td>';
-            }
-            echo '<td>';
-            echo ($row['anonymous'] == 1) ? get_lang('Yes') : get_lang('No');
-            echo '</td>';
-            echo '</tr>';
-            if ($row['anonymous'] == 1) {
-                $current_user_id = $_SESSION['surveyuser'];
-            } else {
-                $current_user_id = api_get_user_id();
-            }
-            $link_available = self::show_link_available(api_get_user_id(), $row['code'], $current_user_id);
-            //todo check this link
-            if ($link_add === true && $link_available === true) {
-                //echo '<tr><td><a href="fillsurvey.php?user_id='.api_get_user_id().'&amp;course='.$_course['sysCode'].'&amp;invitationcode='.$row['invitation_code'].'&amp;cidReq='.$_course['sysCode'].'">'.get_lang('CompleteTheSurveysQuestions').'</a></td><td></td></tr>';
-            }
-        }
-        echo '</table>';
-    }
-
-    /**
-     * Creates a multi array with the user fields that we can show. We look the visibility with the api_get_setting function
-     * The username is always NOT able to change it.
-     * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification
-     * @return array[value_name][name]
-     *            array[value_name][visibilty]
-     */
-    static function make_field_list()
-    {
-
-        //	LAST NAME and FIRST NAME
-        $field_list_array = array();
-        $field_list_array['lastname']['name'] = get_lang('Lastname');
-        $field_list_array['firstname']['name'] = get_lang('Firstname');
-
-        if (api_get_setting('profile', 'name') != 'true') {
-            $field_list_array['firstname']['visibility'] = 0;
-            $field_list_array['lastname']['visibility'] = 0;
-        } else {
-            $field_list_array['firstname']['visibility'] = 1;
-            $field_list_array['lastname']['visibility'] = 1;
-        }
-
-        $field_list_array['username']['name'] = get_lang('Username');
-        $field_list_array['username']['visibility'] = 0;
-
-        //	OFFICIAL CODE
-        $field_list_array['official_code']['name'] = get_lang('OfficialCode');
+		$result = Database::query($sql);
+		$counter = 0;
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
+			// Get the user into survey answer table (user or anonymus)
+			$sql = "SELECT user FROM $table_survey_answer
+					WHERE c_id = $course_id AND survey_id = (SELECT survey_id from $table_survey WHERE code ='".Database::escape_string($row['code'])." AND c_id = $course_id')";
+			$result_answer = Database::query($sql);
+			$row_answer = Database::fetch_array($result_answer,'ASSOC');
+			echo '<tr>';
+			if ($row['answered'] == 0) {
+				echo '<td><a href="'.api_get_path(WEB_CODE_PATH).'survey/fillsurvey.php?course='.$_course['sysCode'].'&amp;invitationcode='.$row['invitation_code'].'&amp;cidReq='.$_course['sysCode'].'">'.$row['title'].'</a></td>';
+			} else {
+				echo '<td>'.$row['title'].'</td>';
+			}
+			echo '<td>';
+			echo ($row['anonymous'] == 1) ? get_lang('Yes') : get_lang('No');
+			echo '</td>';
+			echo '</tr>';
+			if ($row['anonymous'] == 1) {
+				$current_user_id = $_SESSION['surveyuser'];
+			} else {
+				$current_user_id = api_get_user_id();
+			}
+			$link_available = self::show_link_available(api_get_user_id(),$row['code'],$current_user_id);
+			//todo check this link
+			if ($link_add === true && $link_available === true) {
+				//echo '<tr><td><a href="fillsurvey.php?user_id='.api_get_user_id().'&amp;course='.$_course['sysCode'].'&amp;invitationcode='.$row['invitation_code'].'&amp;cidReq='.$_course['sysCode'].'">'.get_lang('CompleteTheSurveysQuestions').'</a></td><td></td></tr>';
+			}
+		}
+		echo '</table>';
+	}
+
+	/**
+	 * Creates a multi array with the user fields that we can show. We look the visibility with the api_get_setting function
+	 * The username is always NOT able to change it.
+	 * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification
+	 * @return array[value_name][name]
+	 * 		   array[value_name][visibilty]
+	 */
+	static function make_field_list() {
+
+		//	LAST NAME and FIRST NAME
+		$field_list_array = array();
+		$field_list_array['lastname']['name'] = get_lang('Lastname');
+		$field_list_array['firstname']['name'] = get_lang('Firstname');
+
+		if (api_get_setting('profile', 'name') != 'true') {
+			$field_list_array['firstname']['visibility'] = 0;
+			$field_list_array['lastname']['visibility'] = 0;
+		} else {
+			$field_list_array['firstname']['visibility'] = 1;
+			$field_list_array['lastname']['visibility'] = 1;
+		}
 
-        if (api_get_setting('profile', 'officialcode') != 'true') {
-            $field_list_array['official_code']['visibility'] = 1;
-        } else {
-            $field_list_array['official_code']['visibility'] = 0;
-        }
+		$field_list_array['username']['name'] = get_lang('Username');
+		$field_list_array['username']['visibility'] = 0;
 
-        // EMAIL
-        $field_list_array['email']['name'] = get_lang('Email');
-        if (api_get_setting('profile', 'email') != 'true') {
-            $field_list_array['email']['visibility'] = 1;
-        } else {
-            $field_list_array['email']['visibility'] = 0;
-        }
+		//	OFFICIAL CODE
+		$field_list_array['official_code']['name'] = get_lang('OfficialCode');
 
-        // OPENID URL
-        //$field_list_array[] = 'openid_authentication';
-        /*
-          if (is_profile_editable() && api_get_setting('openid_authentication') == 'true') {
-          $form->addElement('text', 'openid', get_lang('OpenIDURL'), array('size' => 40));
-          if (api_get_setting('profile', 'openid') != 'true') {
-          $form->freeze('openid');
-          }
-          $form->applyFilter('openid', 'trim');
-          //if (api_get_setting('registration', 'openid') == 'true')
-          //	$form->addRule('openid', get_lang('ThisFieldIsRequired'), 'required');
-          } */
-
-        // PHONE
-        $field_list_array['phone']['name'] = get_lang('Phone');
-        if (api_get_setting('profile', 'phone') != 'true') {
-            $field_list_array['phone']['visibility'] = 0;
-        } else {
-            $field_list_array['phone']['visibility'] = 1;
-        }
-        //	LANGUAGE
-        $field_list_array['language']['name'] = get_lang('Language');
-        if (api_get_setting('profile', 'language') != 'true') {
-            $field_list_array['language']['visibility'] = 0;
-        } else {
-            $field_list_array['language']['visibility'] = 1;
-        }
+		if (api_get_setting('profile', 'officialcode') != 'true') {
+			$field_list_array['official_code']['visibility'] = 1;
+		} else {
+			$field_list_array['official_code']['visibility'] = 0;
+		}
 
-        // EXTRA FIELDS
-        $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
-        $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
-        foreach ($extra as $id => $field_details) {
-            if ($field_details[6] == 0) {
-                continue;
-            }
-            switch ($field_details[2]) {
-                case ExtraField::FIELD_TYPE_TEXT:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-                case ExtraField::FIELD_TYPE_TEXTAREA:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-                case ExtraField::FIELD_TYPE_RADIO:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-                case ExtraField::FIELD_TYPE_SELECT:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-
-                case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-
-                case ExtraField::FIELD_TYPE_DATE:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-
-                case ExtraField::FIELD_TYPE_DATETIME:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-
-                case ExtraField::FIELD_TYPE_DOUBLE_SELECT:
-                    $field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
-                    if ($field_details[7] == 0) {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
-                    } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
-                    }
-                    break;
-                case ExtraField::FIELD_TYPE_DIVIDER:
-                    //$form->addElement('static',$field_details[1], '<br /><strong>'.$field_details[3].'</strong>');
-                    break;
-            }
-        }
+		// EMAIL
+		$field_list_array['email']['name'] = get_lang('Email');
+		if (api_get_setting('profile', 'email') != 'true') {
+			$field_list_array['email']['visibility'] = 1;
+		} else {
+			$field_list_array['email']['visibility'] = 0;
+		}
 
-        return $field_list_array;
-    }
+		// OPENID URL
+		//$field_list_array[] = 'openid_authentication';
+		/*
+		if (is_profile_editable() && api_get_setting('openid_authentication') == 'true') {
+			$form->addElement('text', 'openid', get_lang('OpenIDURL'), array('size' => 40));
+			if (api_get_setting('profile', 'openid') != 'true') {
+				$form->freeze('openid');
+			}
+			$form->applyFilter('openid', 'trim');
+			//if (api_get_setting('registration', 'openid') == 'true')
+			//	$form->addRule('openid', get_lang('ThisFieldIsRequired'), 'required');
+		}*/
+
+		// PHONE
+		$field_list_array['phone']['name'] = get_lang('Phone');
+		if (api_get_setting('profile', 'phone') != 'true') {
+			$field_list_array['phone']['visibility'] = 0;
+		} else {
+			$field_list_array['phone']['visibility'] = 1;
+		}
+		//	LANGUAGE
+		$field_list_array['language']['name'] = get_lang('Language');
+		if (api_get_setting('profile', 'language') != 'true') {
+			$field_list_array['language']['visibility'] = 0;
+		} else {
+			$field_list_array['language']['visibility'] = 1;
+		}
 
-    /**
-     * @author Isaac Flores Paz <florespaz@bidsoftperu.com>
-     * @param int $user_id - User ID
-     * @param int $user_id_answer - User in survey answer table (user id or anonymus)
-     * @return boolean
-     */
-    static function show_link_available($user_id, $survey_code, $user_answer)
+		// EXTRA FIELDS
+		$extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
+		$extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
+		foreach ($extra as $id => $field_details) {
+			if ($field_details[6] == 0) {
+				continue;
+			}
+			switch ($field_details[2]) {
+				case UserManager::USER_FIELD_TYPE_TEXT:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+				case UserManager::USER_FIELD_TYPE_TEXTAREA:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+				case UserManager::USER_FIELD_TYPE_RADIO:
+
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+
+				case UserManager::USER_FIELD_TYPE_SELECT:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+
+				case UserManager::USER_FIELD_TYPE_SELECT_MULTIPLE:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+
+				case UserManager::USER_FIELD_TYPE_DATE:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+
+				case UserManager::USER_FIELD_TYPE_DATETIME:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
+					}
+					break;
+
+				case UserManager::USER_FIELD_TYPE_DOUBLE_SELECT:
+					$field_list_array['extra_'.$field_details[1]]['name'] = $field_details[3];
+					if ($field_details[7] == 0) {
+						$field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
+					} else {
+						$field_list_array['extra_'.$field_details[1]]['visibility']=1;
+					}
+					/*
+					foreach ($field_details[8] as $key => $element) {
+						if ($element[2][0] == '*') {
+							$values['*'][$element[0]] = str_replace('*','',$element[2]);
+						} else {
+							$values[0][$element[0]] = $element[2];
+						}
+					}
+
+					$group = '';
+					$group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1], '', $values[0], '');
+					$group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1].'*', '', $values['*'], '');
+					$form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], '&nbsp;');
+					if ($field_details[7] == 0)	$form->freeze('extra_'.$field_details[1]);
+
+					// Recoding the selected values for double : if the user has selected certain values, we have to assign them to the correct select form
+					if (key_exists('extra_'.$field_details[1], $extra_data)) {
+						// Exploding all the selected values (of both select forms)
+						$selected_values = explode(';',$extra_data['extra_'.$field_details[1]]);
+						$extra_data['extra_'.$field_details[1]] = array();
+
+						// Looping through the selected values and assigning the selected values to either the first or second select form
+						foreach ($selected_values as $key => $selected_value) {
+							if (key_exists($selected_value, $values[0])) {
+								$extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1]] = $selected_value;
+							} else {
+								$extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1].'*'] = $selected_value;
+							}
+						}
+					}*/
+					break;
+				case UserManager::USER_FIELD_TYPE_DIVIDER:
+					//$form->addElement('static',$field_details[1], '<br /><strong>'.$field_details[3].'</strong>');
+					break;
+			}
+		}
+		return $field_list_array;
+	}
+
+	/**
+	 * @author Isaac Flores Paz <florespaz@bidsoftperu.com>
+	 * @param int $user_id - User ID
+	 * @param int $user_id_answer - User in survey answer table (user id or anonymus)
+	 * @return boolean
+	 */
+	static function show_link_available($user_id, $survey_code, $user_answer)
     {
-        $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
-        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+		$table_survey             = Database :: get_course_table(TABLE_SURVEY);
+		$table_survey_invitation  = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+		$table_survey_answer      = Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$table_survey_question    = Database :: get_course_table(TABLE_SURVEY_QUESTION);
 
-        $survey_code = Database::escape_string($survey_code);
-        $user_id = Database::escape_string($user_id);
-        $user_answer = Database::escape_string($user_answer);
+		$survey_code = Database::escape_string($survey_code);
+		$user_id = Database::escape_string($user_id);
+		$user_answer = Database::escape_string($user_answer);
 
-        $course_id = api_get_course_int_id();
+		$course_id = api_get_course_int_id();
 
-        $sql = 'SELECT COUNT(*) as count FROM '.$table_survey_invitation.'
+
+		$sql  = 'SELECT COUNT(*) as count FROM '.$table_survey_invitation.'
 		          WHERE user='.$user_id.' AND survey_code="'.$survey_code.'" AND answered="1" AND c_id = '.$course_id.' ';
 
-        $sql2 = 'SELECT COUNT(*) as count FROM '.$table_survey.' s INNER JOIN '.$table_survey_question.' q ON s.survey_id=q.survey_id
+		$sql2 = 'SELECT COUNT(*) as count FROM '.$table_survey.' s INNER JOIN '.$table_survey_question.' q ON s.survey_id=q.survey_id
 				 WHERE s.code="'.$survey_code.'" AND q.type NOT IN("pagebreak","comment") AND s.c_id = '.$course_id.' AND q.c_id = '.$course_id.' ';
 
-        $sql3 = 'SELECT COUNT(DISTINCT question_id) as count FROM '.$table_survey_answer.'
+		$sql3 = 'SELECT COUNT(DISTINCT question_id) as count FROM '.$table_survey_answer.'
 				 WHERE survey_id=(SELECT survey_id FROM '.$table_survey.'
 				 WHERE code="'.$survey_code.'" AND c_id = '.$course_id.' ) AND user="'.$user_answer.'" AND c_id = '.$course_id.' ';
 
-        $result = Database::query($sql);
-        $result2 = Database::query($sql2);
-        $result3 = Database::query($sql3);
+		$result  = Database::query($sql);
+		$result2 = Database::query($sql2);
+		$result3 = Database::query($sql3);
 
-        $row = Database::fetch_array($result, 'ASSOC');
-        $row2 = Database::fetch_array($result2, 'ASSOC');
-        $row3 = Database::fetch_array($result3, 'ASSOC');
+		$row  = Database::fetch_array($result, 'ASSOC');
+		$row2 = Database::fetch_array($result2, 'ASSOC');
+		$row3 = Database::fetch_array($result3, 'ASSOC');
 
-        if ($row['count'] == 1 && $row3['count'] != $row2['count']) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+		if ($row['count'] == 1 && $row3['count'] != $row2['count']) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 }
diff --git a/main/survey/survey.php b/main/survey/survey.php
index 2597e79ef5..50b8ffc506 100644
--- a/main/survey/survey.php
+++ b/main/survey/survey.php
@@ -2,12 +2,13 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * 	@package chamilo.survey
- * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
+ *	@package chamilo.survey
+ *	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
  * 	@version $Id: survey.php 22573 2009-08-03 03:38:13Z yannoo $
  *
  * 	@todo use quickforms for the forms
  */
+
 // Language file that needs to be included
 $language_file = 'survey';
 
@@ -15,49 +16,49 @@ $language_file = 'survey';
 require_once '../inc/global.inc.php';
 
 $this_section = SECTION_COURSES;
-$current_course_tool = TOOL_SURVEY;
+$current_course_tool  = TOOL_SURVEY;
 
 api_protect_course_script(true);
 
 // Including additional libraries
 require_once 'survey.lib.php';
 
-/** @todo this has to be moved to a more appropriate place (after the display_header of the code) */
+/** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 // Coach can't view this page
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');
 if (!api_is_allowed_to_edit(false, true) || (api_is_course_coach() && $extend_rights_for_coachs == 'false')) {
-    Display :: display_header(get_lang('ToolSurvey'));
-    Display :: display_error_message(get_lang('NotAllowed'), false);
-    Display :: display_footer();
-    exit;
+	Display :: display_header(get_lang('ToolSurvey'));
+	Display :: display_error_message(get_lang('NotAllowed'), false);
+	Display :: display_footer();
+	exit;
 }
 
 // Database table definitions
-$table_survey = Database :: get_course_table(TABLE_SURVEY);
-$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-$table_survey_question_group = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
-$table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
-$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+$table_survey 					= Database :: get_course_table(TABLE_SURVEY);
+$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+$table_survey_question_group    = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
+$table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
+$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 
 $survey_id = intval($_GET['survey_id']);
+
 $course_id = api_get_course_int_id();
-$action = isset($_GET['action']) ? $_GET['action'] : null;
 
 // Breadcrumbs
-$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array ('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
 
 // Getting the survey information
 if (isset($_GET['survey_id'])) {
-    $course_code = api_get_course_id();
-    if ($course_code != -1) {
-        $survey_data = survey_manager::get_survey($survey_id);
-    } else {
-        Display :: display_header(get_lang('ToolSurvey'));
-        Display :: display_error_message(get_lang('NotAllowed'), false);
-        Display :: display_footer();
-        exit;
-    }
+	$course_code = api_get_course_id();
+	if ($course_code!=-1) {
+		$survey_data = survey_manager::get_survey($survey_id);
+	} else {
+		Display :: display_header(get_lang('ToolSurvey'));
+		Display :: display_error_message(get_lang('NotAllowed'), false);
+		Display :: display_footer();
+		exit;
+	}
 }
 
 $tool_name = strip_tags($survey_data['title']);
@@ -65,32 +66,33 @@ $tool_name = strip_tags($survey_data['title']);
 $is_survey_type_1 = $survey_data['survey_type'] == 1;
 
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-    $tool_name .= '...';
+	$tool_name .= '...';
 }
 
-
-if ($is_survey_type_1 && $action == 'addgroup' || $action == 'deletegroup') {
-    $_POST['name'] = trim($_POST['name']);
-
-    if ($action == 'addgroup') {
-        if (!empty($_POST['group_id'])) {
-            Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
+if ($is_survey_type_1 &&
+    isset($_GET['action']) &&
+    ($_GET['action'] == 'addgroup' || $_GET['action'] == 'deletegroup')
+) {
+	$_POST['name'] = trim($_POST['name']);
+	if ($_GET['action'] == 'addgroup') {
+		if (!empty($_POST['group_id'])) {
+			Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
 			                 WHERE c_id = '.$course_id.' AND id = \''.Database::escape_string($_POST['group_id']).'\'');
-            $sendmsg = 'GroupUpdatedSuccessfully';
-        } elseif (!empty($_POST['name'])) {
-            Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
-            $sendmsg = 'GroupCreatedSuccessfully';
-        } else {
-            $sendmsg = 'GroupNeedName';
-        }
-    }
-
-    if ($action == 'deletegroup') {
-        Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.Database::escape_string($_GET['gid']).' and survey_id = '.Database::escape_string($survey_id));
-        $sendmsg = 'GroupDeletedSuccessfully';
-    }
-    header('Location:survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
-    exit;
+			$sendmsg = 'GroupUpdatedSuccessfully';
+		} elseif(!empty($_POST['name'])) {
+			Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
+			$sendmsg = 'GroupCreatedSuccessfully';
+		} else {
+			$sendmsg = 'GroupNeedName';
+		}
+	}
+
+	if ($_GET['action'] == 'deletegroup'){
+		Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.Database::escape_string($_GET['gid']).' and survey_id = '.Database::escape_string($survey_id));
+		$sendmsg = 'GroupDeletedSuccessfully';
+	}
+	header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
+	exit;
 }
 
 // Displaying the header
@@ -98,69 +100,65 @@ if ($is_survey_type_1 && $action == 'addgroup' || $action == 'deletegroup') {
 Display::display_header($tool_name, 'Survey');
 
 // Action handling
-$my_action_survey = Security::remove_XSS($action);
-$my_question_id_survey = Security::remove_XSS($_GET['question_id']);
-$my_survey_id_survey = Security::remove_XSS($_GET['survey_id']);
-$message_information = Security::remove_XSS($_GET['message']);
-
-if (isset($action)) {
-    if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
-        survey_manager::move_survey_question($my_action_survey, $my_question_id_survey, $my_survey_id_survey);
-        Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
-    }
-    if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
-        survey_manager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
-    }
+$my_action_survey		= isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : null;
+$my_question_id_survey  = isset($_GET['question_id']) ? Security::remove_XSS($_GET['question_id']) : null;
+$my_survey_id_survey    = Security::remove_XSS($_GET['survey_id']);
+$message_information    = isset($_GET['message']) ? Security::remove_XSS($_GET['message']) : null;
+
+if (isset($_GET['action'])) {
+	if (($_GET['action'] == 'moveup' || $_GET['action'] == 'movedown') && isset($_GET['question_id'])) {
+		survey_manager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
+		Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
+	}
+	if ($_GET['action'] == 'delete' AND is_numeric($_GET['question_id'])) {
+		survey_manager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
+	}
 }
 if (isset($_GET['message'])) {
-    // We have created the survey or updated the survey
-    if (in_array($_GET['message'], array('SurveyUpdatedSuccesfully', 'SurveyCreatedSuccesfully'))) {
-        Display::display_confirmation_message(get_lang($message_information).', '.PHP_EOL.api_strtolower(get_lang('YouCanNowAddQuestionToYourSurvey')));
-    }
-    // We have added a question
-    if (in_array($_GET['message'], array('QuestionAdded', 'QuestionUpdated'))) {
-        Display::display_confirmation_message(get_lang($message_information));
-    }
-
-    if (in_array($_GET['message'], array('YouNeedToCreateGroups'))) {
-        Display::display_warning_message(get_lang($message_information), false);
-    }
+	// We have created the survey or updated the survey
+	if (in_array($_GET['message'], array('SurveyUpdatedSuccesfully','SurveyCreatedSuccesfully'))) {
+		Display::display_confirmation_message(get_lang($message_information).', '.PHP_EOL.api_strtolower(get_lang('YouCanNowAddQuestionToYourSurvey')));
+	}
+	// We have added a question
+	if (in_array($_GET['message'], array('QuestionAdded', 'QuestionUpdated'))) {
+		Display::display_confirmation_message(get_lang($message_information));
+	}
+
+	if (in_array($_GET['message'], array('YouNeedToCreateGroups'))) {
+		Display::display_warning_message(get_lang($message_information), false);
+	}
 }
 
-if (!empty($survey_data['survey_version']))
-    echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
+if (!empty($survey_data['survey_version'])) echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
 
 // We exit here is the first or last question is a pagebreak (which causes errors)
 SurveyUtil::check_first_last_question($_GET['survey_id']);
 
 // Action links
-$survey_actions = '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('EditSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('DeleteSurvey').'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('DeleteSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
-//$survey_actions .= '<a href="create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
-$survey_actions .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'), '', ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('EditSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('DeleteSurvey').'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('DeleteSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+//$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
-    echo '<div class="actionsbig">';
-    echo '<a style="padding-left:0px;" href="question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.gif', get_lang('YesNo')).'</a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.gif', get_lang('UniqueSelect')).'<br /></a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.gif', get_lang('MultipleResponse')).'</a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.gif', get_lang('Open')).'<br /></a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.gif', get_lang('Dropdown')).'<br /></a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.gif', get_lang('Percentage')).'<br /></a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.gif', get_lang('Score')).'</a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.gif', get_lang('Comment')).'</a>';
-    echo '<a href="question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.gif', get_lang('Pagebreak')).'</a>';
-    echo '</div>';
+	echo '<div class="actionsbig">';
+	echo '<a style="padding-left:0px;" href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.gif', get_lang('YesNo')).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.gif', get_lang('UniqueSelect')).'<br /></a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.gif', get_lang('MultipleResponse')).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.gif', get_lang('Open')).'<br /></a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.gif', get_lang('Dropdown')).'<br /></a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.gif', get_lang('Percentage')).'<br /></a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.gif', get_lang('Score')).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.gif', get_lang('Comment')).'</a>';
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.gif', get_lang('Pagebreak')).'</a>';
+	echo '</div>';
 } else {
-    echo '<div class="actionsbig">';
-    echo '<a style="padding-left:0px;" href="question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'">
-            '.Display::return_icon('yesno.gif').'
-            </a>
-    </div>';
-    echo '</div>';
+	echo '<div class="actionsbig">';
+	echo '<a style="padding-left:0px;" href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'"><img src="../img/yesno.gif" /></a></div>';
+	echo '</div>';
 }
 
 // Displaying the table header with all the questions
@@ -172,124 +170,124 @@ echo '		<th>'.get_lang('Type').'</th>';
 echo '		<th width="50" >'.get_lang('NumberOfOptions').'</th>';
 echo '		<th width="100">'.get_lang('Modify').'</th>';
 if ($is_survey_type_1) {
-    echo '<th width="100">'.get_lang('Condition').'</th>';
+	echo '<th width="100">'.get_lang('Condition').'</th>';
     echo '<th width="40">'.get_lang('Group').'</th>';
 }
 echo '	</tr>';
 
 // Displaying the table contents with all the questions
 $question_counter = 1;
-$sql = "SELECT * FROM $table_survey_question_group WHERE c_id = '.$course_id.' AND survey_id = '".Database::escape_string($survey_id)."' ORDER BY id";
+$sql = "SELECT * FROM $table_survey_question_group
+        WHERE c_id = '.$course_id.' AND survey_id = '".Database::escape_string($survey_id)."' ORDER BY id";
 $result = Database::query($sql);
 $groups = array();
 while ($row = Database::fetch_array($result)) {
     $groups[$row['id']] = $row['name'];
 }
 $sql = "SELECT survey_question.*, count(survey_question_option.question_option_id) as number_of_options
-			FROM $table_survey_question survey_question
-			LEFT JOIN $table_survey_question_option survey_question_option
-			ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
-			WHERE    survey_question.survey_id 	= '".Database::escape_string($survey_id)."' AND
-			         survey_question.c_id 		= $course_id
-			GROUP BY survey_question.question_id
-			ORDER BY survey_question.sort ASC";
+        FROM $table_survey_question survey_question
+        LEFT JOIN $table_survey_question_option survey_question_option
+        ON survey_question.question_id = survey_question_option.question_id AND survey_question_option.c_id = $course_id
+        WHERE
+            survey_question.survey_id 	= '".Database::escape_string($survey_id)."' AND
+             survey_question.c_id 		= $course_id
+        GROUP BY survey_question.question_id
+        ORDER BY survey_question.sort ASC";
 
 $result = Database::query($sql);
 $question_counter_max = Database::num_rows($result);
 while ($row = Database::fetch_array($result, 'ASSOC')) {
-    echo '<tr>';
-    echo '	<td>'.$question_counter.'</td>';
-    echo '	<td>';
-    if (api_strlen($row['survey_question']) > 100) {
-        echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
-    } else {
-        echo $row['survey_question'];
+	echo '<tr>';
+	echo '	<td>'.$question_counter.'</td>';
+	echo '	<td>';
+	if (api_strlen($row['survey_question']) > 100) {
+		echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
+	} else {
+		echo $row['survey_question'];
+	}
+
+	if ($row['type'] == 'yesno') {
+		$tool_name = get_lang('YesNo');
+	} else if ($row['type'] == 'multiplechoice') {
+		$tool_name = get_lang('UniqueSelect');
+	} else {
+		$tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
+	}
+
+	echo '</td>';
+	echo '	<td>'.$tool_name.'</td>';
+	echo '	<td>'.$row['number_of_options'].'</td>';
+	echo '	<td>';
+	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+	if ($question_counter > 1) {
+		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
+	} else {
+		Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+	}
+	if ($question_counter < $question_counter_max) {
+		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
+	} else {
+		Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+	}
+	echo '	</td>';
+	$question_counter++;
+
+	if ($is_survey_type_1) {
+    	echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
+        echo '<td>'.(($row['survey_group_pri']==0)?$groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']]:$groups[$row['survey_group_pri']]).'</td>';
     }
-
-    if ($row['type'] == 'yesno') {
-        $tool_name = get_lang('YesNo');
-    } else if ($row['type'] == 'multiplechoice') {
-        $tool_name = get_lang('UniqueSelect');
-    } else {
-        $tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
-    }
-
-    echo '</td>';
-    echo '	<td>'.$tool_name.'</td>';
-    echo '	<td>'.$row['number_of_options'].'</td>';
-    echo '	<td>';
-    echo '		<a href="question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
-    echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?', ENT_QUOTES, $charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
-    if ($question_counter > 1) {
-        echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'), '', ICON_SIZE_SMALL).'</a>';
-    } else {
-        Display::display_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
-    }
-    if ($question_counter < $question_counter_max) {
-        echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'), '', ICON_SIZE_SMALL).'</a>';
-    } else {
-        Display::display_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
-    }
-    echo '	</td>';
-    $question_counter++;
-
-    if ($is_survey_type_1) {
-        echo '<td>'.(($row['survey_group_pri'] == 0) ? get_lang('Secondary') : get_lang('Primary')).'</td>';
-        echo '<td>'.(($row['survey_group_pri'] == 0) ? $groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']] : $groups[$row['survey_group_pri']]).'</td>';
-    }
-    echo '</tr>';
+	echo '</tr>';
 }
 
 echo '</table>';
 
 if ($is_survey_type_1) {
-    echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
-
-    if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
-        echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
-    }
-
-    if (in_array($_GET['sendmsg'], array('GroupNeedName'))) {
-        echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
-    }
-
-    echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
-
-    echo '<form action="survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
-    if ($action == 'editgroup') {
-        $sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.Database::escape_string($_GET['gid']).' AND survey_id = '.Database::escape_string($survey_id).' limit 1';
-        $rs = Database::query($sql);
-        $editedrow = Database::fetch_array($rs, 'ASSOC');
-        echo '<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
-        echo '<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
-        echo '<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
-        echo '<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
-    } else {
-        echo '<input type="text" maxlength="20" name="name" value="" size="10">';
-        echo '<input type="text" maxlength="250" name="description" value="" size="80">';
-        echo '<input type="submit" value="'.get_lang('Create').'"';
-    }
-    echo '</form><br />';
-
-    echo '<table class="data_table">';
-    echo '	<tr class="row_odd">';
-    echo '		<th width="200">'.get_lang('Name').'</th>';
-    echo '		<th>'.get_lang('Description').'</th>';
-    echo '		<th width="100">'.get_lang('Modify').'</th>';
-    echo '	</tr>';
-
-    $sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.Database::escape_string($survey_id).' ORDER BY name';
-
-    $rs = Database::query($sql);
-    while ($row = Database::fetch_array($rs, ASSOC)) {
-        $grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
-            '<a href="survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
-            Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a> '.
-            '<a href="survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'), $row['name']).'?', ENT_QUOTES)).'\')) return false;">'.
-            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
-            '</td></tr>';
-    }
-    echo $grouplist.'</table>';
+	echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
+
+	if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
+		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
+	}
+
+	if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
+		echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
+	}
+	echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
+	echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
+	if ($_GET['action'] == 'editgroup') {
+		$sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.Database::escape_string($_GET['gid']).' AND survey_id = '.Database::escape_string($survey_id).' limit 1';
+		$rs = Database::query($sql);
+		$editedrow = Database::fetch_array($rs,'ASSOC');
+		echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
+		echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
+		echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
+		echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
+	} else {
+		echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
+		echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
+		echo	'<input type="submit" value="'.get_lang('Create').'"';
+	}
+	echo	'</form><br />';
+
+	echo '<table class="data_table">';
+	echo '	<tr class="row_odd">';
+	echo '		<th width="200">'.get_lang('Name').'</th>';
+	echo '		<th>'.get_lang('Description').'</th>';
+	echo '		<th width="100">'.get_lang('Modify').'</th>';
+	echo '	</tr>';
+
+	$sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.Database::escape_string($survey_id).' ORDER BY name';
+
+	$rs = Database::query($sql);
+	while($row = Database::fetch_array($rs,ASSOC)){
+		$grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
+		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
+		Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
+		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
+		Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+		'</td></tr>';
+	}
+	echo $grouplist.'</table>';
 }
 
 // Footer
diff --git a/main/survey/survey_invitation.php b/main/survey/survey_invitation.php
index d44a26aabb..4a92b9f66d 100644
--- a/main/survey/survey_invitation.php
+++ b/main/survey/survey_invitation.php
@@ -2,12 +2,13 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * 	@package chamilo.survey
+ *	@package chamilo.survey
  * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
  * 	@version $Id: survey_invite.php 10680 2007-01-11 21:26:23Z pcool $
  *
  * 	@todo the answered column
  */
+
 // Language file that needs to be included
 $language_file = 'survey';
 
@@ -16,13 +17,14 @@ require '../inc/global.inc.php';
 
 // Including additional libraries
 require_once 'survey.lib.php';
+require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 
-/** @todo this has to be moved to a more appropriate place (after the display_header of the code) */
+/** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
-    Display :: display_header(get_lang('ToolSurvey'));
-    Display :: display_error_message(get_lang('NotAllowed'), false);
-    Display :: display_footer();
-    exit;
+	Display :: display_header(get_lang('ToolSurvey'));
+	Display :: display_error_message(get_lang('NotAllowed'), false);
+	Display :: display_footer();
+	exit;
 }
 
 // Database table definitions
@@ -35,65 +37,67 @@ $table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATIO
 
 $tool_name = get_lang('SurveyInvitations');
 
+
 // Getting the survey information
 // We exit here if ther is no valid $_GET parameter
 if (!isset($_GET['survey_id']) OR !is_numeric($_GET['survey_id'])) {
-    Display :: display_header($tool_name);
-    Display :: display_error_message(get_lang('InvallidSurvey'), false);
-    Display :: display_footer();
-    exit;
+	Display :: display_header($tool_name);
+	Display :: display_error_message(get_lang('InvallidSurvey'), false);
+	Display :: display_footer();
+	exit;
 }
 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 
 if (empty($survey_data)) {
-    Display :: display_header($tool_name);
-    Display :: display_error_message(get_lang('InvallidSurvey'), false);
-    Display :: display_footer();
-    exit;
+	Display :: display_header($tool_name);
+	Display :: display_error_message(get_lang('InvallidSurvey'), false);
+	Display :: display_footer();
+	exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-    $urlname .= '...';
+	$urlname .= '...';
 }
 
 // Breadcrumbs
-$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => $urlname);
+
 
 // Displaying the header
 Display::display_header($tool_name);
 
 // Checking the parameters
 if (!is_numeric($survey_id)) {
-    Display::display_error_message(get_lang('Error'), false);
-    Display::display_footer();
-    exit;
+	Display::display_error_message(get_lang('Error'), false);
+	Display::display_footer();
+	exit;
 }
 
 // Getting all the people who have filled this survey
 $answered_data = survey_manager::get_people_who_filled_survey($survey_id);
 if ($survey_data['anonymous'] == 1) {
-    Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
-    $answered_data = array();
+	Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
+	$answered_data = array();
 }
 
 if (!isset($_GET['view']) OR $_GET['view'] == 'invited') {
-    echo get_lang('ViewInvited').' | ';
+	echo get_lang('ViewInvited'). ' | ';
 } else {
-    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
+	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
 }
 if ($_GET['view'] == 'answered') {
-    echo get_lang('ViewAnswered').' | ';
+	echo get_lang('ViewAnswered').' | ';
 } else {
-    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
+	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
 }
 if ($_GET['view'] == 'unanswered') {
-    echo get_lang('ViewUnanswered');
+	echo get_lang('ViewUnanswered');
 } else {
-    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
+	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
 }
 
 // Table header
@@ -109,31 +113,31 @@ $course_id = api_get_course_int_id();
 $sql = "SELECT survey_invitation.*, user.firstname, user.lastname, user.email
         FROM $table_survey_invitation survey_invitation
         LEFT JOIN $table_user user ON (survey_invitation.user = user.user_id AND survey_invitation.c_id = $course_id)
-        WHERE survey_invitation.survey_code = '".Database::escape_string($survey_data['code'])."' AND group_id = 0 ";
+        WHERE survey_invitation.survey_code = '".Database::escape_string($survey_data['code'])."' ";
 
 $res = Database::query($sql);
 while ($row = Database::fetch_assoc($res)) {
-    if (!$_GET['view'] || $_GET['view'] == 'invited' || ($_GET['view'] == 'answered' && in_array($row['user'], $answered_data)) || ($_GET['view'] == 'unanswered' && !in_array($row['user'], $answered_data))) {
-        echo '<tr>';
-        if (is_numeric($row['user'])) {
-            echo '			<td><a href="../user/userInfo.php?editMainUserInfo='.$row['user'].'">'.api_get_person_name($row['firstname'], $row['lastname']).'</a></td>';
-        } else {
-            echo '	<td>'.$row['user'].'</td>';
-        }
-        echo '	<td>'.$row['invitation_date'].'</td>';
-        echo '	<td>';
-        if (in_array($row['user'], $answered_data)) {
-            echo '<a href="reporting.php?action=userreport&amp;survey_id='.$survey_id.'&amp;user='.$row['user'].'">'.get_lang('ViewAnswers').'</a>';
-        } else {
-            echo '-';
-        }
-        echo '	</td>';
-        echo '</tr>';
-    }
+	if (!$_GET['view'] || $_GET['view'] == 'invited' || ($_GET['view'] == 'answered' && in_array($row['user'], $answered_data)) || ($_GET['view'] == 'unanswered' && !in_array($row['user'], $answered_data))) {
+		echo '<tr>';
+		if (is_numeric($row['user'])) {
+			echo '			<td><a href="'.api_get_path(WEB_CODE_PATH).'user/userInfo.php?editMainUserInfo='.$row['user'].'">'.api_get_person_name($row['firstname'], $row['lastname']).'</a></td>';
+		} else {
+				echo '	<td>'.$row['user'].'</td>';
+		}
+		echo '	<td>'.$row['invitation_date'].'</td>';
+		echo '	<td>';
+		if (in_array($row['user'], $answered_data)) {
+			echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$survey_id.'&amp;user='.$row['user'].'">'.get_lang('ViewAnswers').'</a>';
+		} else {
+			echo '-';
+		}
+		echo '	</td>';
+		echo '</tr>';
+	}
 }
 
 // Closing the table
 echo '</table>';
 
 // Footer
-Display :: display_footer();
\ No newline at end of file
+Display :: display_footer();
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index 9b546aa197..d834c8ab00 100644
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -2,15 +2,15 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.survey
- * @author unknown, the initial survey that did not make it in 1.8 because of bad code
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
- * @author Julio Montoya Chamilo: cleanup, refactoring, security improvements
- * @version $Id: survey_invite.php 10680 2007-01-11 21:26:23Z pcool $
+ *	@package chamilo.survey
+ * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
+ * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
+ *   @author Julio Montoya Chamilo: cleanup, refactoring, security improvements
+ * 	@version $Id: survey_invite.php 10680 2007-01-11 21:26:23Z pcool $
  *
- * @todo checking if the additional emails are valid (or add a rule for this)
- * @todo check if the mailtext contains the **link** part, if not, add the link to the end
- * @todo add rules: title and text cannot be empty
+ * 	@todo checking if the additional emails are valid (or add a rule for this)
+ * 	@todo check if the mailtext contains the **link** part, if not, add the link to the end
+ * 	@todo add rules: title and text cannot be empty
  */
 
 // Language file that needs to be included
@@ -21,22 +21,23 @@ require_once '../inc/global.inc.php';
 
 // Including additional libraries
 require_once 'survey.lib.php';
+require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(false, true)) {
-    Display :: display_header(get_lang('ToolSurvey'));
-    Display :: display_error_message(get_lang('NotAllowed'), false);
-    Display :: display_footer();
-    exit;
+	Display :: display_header(get_lang('ToolSurvey'));
+	Display :: display_error_message(get_lang('NotAllowed'), false);
+	Display :: display_footer();
+	exit;
 }
 
 // Database table definitions
-$table_survey = Database :: get_course_table(TABLE_SURVEY);
-$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-$table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
-$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+$table_survey 					= Database :: get_course_table(TABLE_SURVEY);
+$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+$table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
+$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 
 $course_id = api_get_course_int_id();
 
@@ -44,28 +45,28 @@ $course_id = api_get_course_int_id();
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 if (empty($survey_data)) {
-    Display :: display_header(get_lang('ToolSurvey'));
-    Display :: display_error_message(get_lang('InvallidSurvey'), false);
-    Display :: display_footer();
-    exit;
+	Display :: display_header(get_lang('ToolSurvey'));
+	Display :: display_error_message(get_lang('InvallidSurvey'), false);
+	Display :: display_footer();
+	exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-    $urlname .= '...';
+	$urlname .= '...';
 }
 
 // Breadcrumbs
-$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
 if (api_is_course_admin()) {
-    $interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
+	$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => $urlname);
 } else {
-    $interbreadcrumb[] = array('url' => 'survey_invite.php?survey_id='.$survey_id, 'name' => $urlname);
+	$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?survey_id='.$survey_id, 'name' => $urlname);
 }
 $tool_name = get_lang('SurveyPublication');
 
 // Displaying the header
-Display::display_header($tool_name, 'Survey');
+Display::display_header($tool_name,'Survey');
 
 echo '<script>
 $(function() {
@@ -77,26 +78,23 @@ $(function() {
 
 // Checking if there is another survey with this code.
 // If this is the case there will be a language choice
-$sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code='".Database::escape_string(
-    $survey_data['code']
-)."'";
+$sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code='".Database::escape_string($survey_data['code'])."'";
 $result = Database::query($sql);
 if (Database::num_rows($result) > 1) {
-    Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
+	Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
 }
 
 // Invited / answered message
 if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) {
-    $message = '<a href="survey_invitation.php?view=answered&amp;survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
-    $message .= get_lang('HaveAnswered').' ';
-    $message .= '<a href="survey_invitation.php?view=invited&amp;survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
-    $message .= get_lang('WereInvited');
-    Display::display_normal_message($message, false);
+	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&amp;survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
+	$message .= get_lang('HaveAnswered').' ';
+	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&amp;survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
+	$message .= get_lang('WereInvited');
+	Display::display_normal_message($message, false);
 }
 
 // Building the form for publishing the survey
 $form = new FormValidator('publish_form', 'post', api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidReq());
-
 $form->addElement('header', '', $tool_name);
 
 // Course users
@@ -108,24 +106,29 @@ $complete_user_list = CourseManager::get_user_list_from_course_code(
 );
 $possible_users = array();
 foreach ($complete_user_list as & $user) {
-    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 }
-
-$list = UserManager::generate_user_group_array(api_get_course_id(), api_get_session_id());
-$users = $form->addElement('advmultiselect', 'course_users', get_lang('CourseUsers'), $list);
-$users->setButtonAttributes('add');
-$users->setButtonAttributes('remove');
+$users = $form->addElement('advmultiselect', 'course_users', get_lang('CourseUsers'), $possible_users, 'style="width: 250px; height: 200px;"');
+$users->setElementTemplate('
+{javascript}
+<table{class}>
+<!-- BEGIN label_2 --><tr><th>{label_2}</th><!-- END label_2 -->
+<!-- BEGIN label_3 --><th>&nbsp;</th><th>{label_3}</th></tr><!-- END label_3 -->
+<tr>
+  <td valign="top">{unselected}</td>
+  <td align="center">{add}<br /><br />{remove}</td>
+  <td valign="top">{selected}</td>
+</tr>
+</table>
+');
+$users->setButtonAttributes('add', array('class' => 'btn arrowr'));
+$users->setButtonAttributes('remove', array('class' => 'btn arrowl'));
 
 // 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('class' => 'span6', 'rows' => 5));
 
 $form->addElement('html', '<div id="check_mail">');
-$form->addElement('checkbox', 'send_mail', '', get_lang('SendMail'));
+$form->addElement('checkbox', 'send_mail','', get_lang('SendMail'));
 $form->addElement('html', '</div>');
 
 $form->addElement('html', '<div id="mail_text">');
@@ -133,121 +136,103 @@ $form->addElement('html', '<div id="mail_text">');
 // 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', 'Width' => '100%', '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) {
-    $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
+	$form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
 }
 // Allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
 
 // Submit button
 $form->addElement('style_submit_button', 'submit', get_lang('PublishSurvey'), 'class="save"');
-
 // The rules (required fields)
+/*if ($survey_data['send_mail'] == 0) {
+    $form->addRule('mail_title', get_lang('ThisFieldIsRequired'), 'required');
+    $form->addRule('mail_text', get_lang('ThisFieldIsRequired'), 'required');
+}*/
 $portal_url = api_get_path(WEB_PATH);
-if (api_is_multiple_url_enabled()) {
-    $access_url_id = api_get_current_access_url_id();
-    if ($access_url_id != -1) {
-        $url = api_get_access_url($access_url_id);
-        $portal_url = $url['url'];
-    }
+if ($_configuration['multiple_access_urls']) {
+	$access_url_id = api_get_current_access_url_id();
+	if ($access_url_id != -1) {
+		$url = api_get_access_url($access_url_id);
+		$portal_url = $url['url'];
+	}
 }
 
 // Show the URL that can be used by users to fill a survey without invitation
 $auto_survey_link = $portal_url.'main/survey/fillsurvey.php?course='.$_course['sysCode'].'&invitationcode=auto&scode='.$survey_data['survey_code'];
 
 $form->addElement('label', null, get_lang('AutoInviteLink'));
-$form->addElement('label', null, "<pre>$auto_survey_link</pre>");
+$form->addElement('label', null, $auto_survey_link);
 
 if ($form->validate()) {
-    $values = $form->exportValues();
-
-    if (isset($values['send_mail']) && $values['send_mail'] == 1) {
+   	$values = $form->exportValues();
+    if ($values['send_mail'] == 1) {
         if (empty($values['mail_title']) || empty($values['mail_text'])) {
             Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete'));
             // Getting the invited users
-            $defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-            // Getting the survey mail text
-            if (!empty($survey_data['reminder_mail'])) {
-                $defaults['mail_text'] = $survey_data['reminder_mail'];
-            } else {
-                $defaults['mail_text'] = $survey_data['invite_mail'];
-            }
-            $defaults['mail_title'] = $survey_data['mail_subject'];
-            $defaults['send_mail'] = 1;
-            $form->setDefaults($defaults);
+        	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+        	// Getting the survey mail text
+        	if (!empty($survey_data['reminder_mail'])) {
+        		$defaults['mail_text'] = $survey_data['reminder_mail'];
+        	} else {
+        		$defaults['mail_text'] = $survey_data['invite_mail'];
+        	}
+        	$defaults['mail_title'] = $survey_data['mail_subject'];
+        	$defaults['send_mail'] = 1;
+        	$form->setDefaults($defaults);
             $form->display();
+            return;
         }
     }
-
     // Save the invitation 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']
-    );
-
-    // 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
-    $additional_users = explode(';', $temp);
-    for ($i = 0; $i < count($additional_users); $i++) {
-        $additional_users[$i] = trim($additional_users[$i]);
-    }
-    $counter_additional_users = SurveyUtil::save_invitations(
-        $additional_users,
-        $values['mail_title'],
-        $values['mail_text'],
-        $values['resend_to_all'],
-        $values['send_mail'],
-        $values['remindUnAnswered']
-    );
-    // Updating the invited field in the survey table
-    SurveyUtil::update_count_invited($survey_data['code']);
-    $total_count = $count_course_users + $counter_additional_users;
-
-    $total_invited = count(SurveyUtil::get_invitations($survey_data['code']));
-
+	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']);
+	// 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
+	$additional_users = explode(';', $temp);
+	for ($i = 0; $i < count($additional_users); $i++) {
+		$additional_users[$i] = trim($additional_users[$i]);
+	}
+	$counter_additional_users = SurveyUtil::save_invitations($additional_users, $values['mail_title'],
+    $values['mail_text'], $values['resend_to_all'], $values['send_mail'], $values['remindUnAnswered']);
+	// Updating the invited field in the survey table
+	SurveyUtil::update_count_invited($survey_data['code']);
+	$total_count = $count_course_users + $counter_additional_users;
+    $table_survey 				= Database :: get_course_table(TABLE_SURVEY);
+	// Counting the number of people that are invited
+	$sql = "SELECT * FROM $table_survey WHERE c_id = $course_id AND code = '".Database::escape_string($survey_data['code'])."'";
+	$result = Database::query($sql);
+	$row = Database::fetch_array($result);
+	$total_invited = $row['invited'];
     if ($total_invited > 0) {
-        $message = '<a href="survey_invitation.php?view=answered&amp;survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
-        $message .= get_lang('HaveAnswered').' ';
-        $message .= '<a href="survey_invitation.php?view=invited&amp;survey_id='.$survey_data['survey_id'].'">'.$total_invited.'</a> ';
-        $message .= get_lang('WereInvited');
-        Display::display_normal_message($message, false);
-        Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
+    	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&amp;survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
+    	$message .= get_lang('HaveAnswered').' ';
+    	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&amp;survey_id='.$survey_data['survey_id'].'">'.$total_invited.'</a> ';
+    	$message .= get_lang('WereInvited');
+    	Display::display_normal_message($message, false);
+    	Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
     }
 } else {
-    // Getting the invited users
-    $defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-    // Getting the survey mail text
-    if (!empty($survey_data['reminder_mail'])) {
-        $defaults['mail_text'] = $survey_data['reminder_mail'];
-    } else {
-        $defaults['mail_text'] = $survey_data['invite_mail'];
-    }
-    $defaults['mail_title'] = $survey_data['mail_subject'];
-    $defaults['send_mail'] = 1;
-
-    $defaults['course_users'] = array_keys(
-        UserManager::transform_user_group_array($defaults['course_users'], $defaults['course_groups'], true, true)
-    );
-
-    $form->setDefaults($defaults);
+	// Getting the invited users
+	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+	// Getting the survey mail text
+	if (!empty($survey_data['reminder_mail'])) {
+		$defaults['mail_text'] = $survey_data['reminder_mail'];
+	} else {
+		$defaults['mail_text'] = $survey_data['invite_mail'];
+	}
+	$defaults['mail_title'] = $survey_data['mail_subject'];
+	$defaults['send_mail'] = 1;
+
+	$form->setDefaults($defaults);
     $form->display();
 }
-Display :: display_footer();
\ No newline at end of file
+Display :: display_footer();
diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php
index 5f0366693c..1ef11d31d7 100644
--- a/main/survey/survey_list.php
+++ b/main/survey/survey_list.php
@@ -2,17 +2,18 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * @package chamilo.survey
- * @author unknown, the initial survey that did not make it in 1.8 because of bad code
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
- * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code
- * @version $Id: survey_list.php 21933 2009-07-09 06:08:22Z ivantcholakov $
+ *	@package chamilo.survey
+ * 	@author unknown, the initial survey that did not make it in 1.8 because of bad code
+ * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
+ *	@author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code
+ * 	@version $Id: survey_list.php 21933 2009-07-09 06:08:22Z ivantcholakov $
  *
- * @todo use quickforms for the forms
+ * 	@todo use quickforms for the forms
  */
+
 // Language file that needs to be included
 $language_file = 'survey';
-if (!isset($_GET['cidReq'])) {
+if (!isset ($_GET['cidReq'])){
     $_GET['cidReq'] = 'none'; // Prevent sql errors
     $cidReset = true;
 }
@@ -20,7 +21,7 @@ if (!isset($_GET['cidReq'])) {
 // Including the global initialization file
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$current_course_tool = TOOL_SURVEY;
+$current_course_tool  = TOOL_SURVEY;
 
 api_protect_course_script(true);
 
@@ -30,25 +31,25 @@ require_once 'survey.lib.php';
 // Tracking
 event_access_tool(TOOL_SURVEY);
 
-/** @todo This has to be moved to a more appropriate place (after the display_header of the code) */
+/** @todo This has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) { // Coach can see this
-    Display :: display_header(get_lang('SurveyList'));
+    Display::display_header(get_lang('SurveyList'));
     SurveyUtil::survey_list_user($_user['user_id']);
-    Display :: display_footer();
+    Display::display_footer();
     exit;
 }
 
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');
 
 // Database table definitions
-$table_survey = Database :: get_course_table(TABLE_SURVEY);
-$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-$table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
-$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+$table_survey 			= Database :: get_course_table(TABLE_SURVEY);
+$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+$table_course 			= Database :: get_main_table(TABLE_MAIN_COURSE);
+$table_user 			= Database :: get_main_table(TABLE_MAIN_USER);
 
 // Language variables
-if (isset($_GET['search']) && $_GET['action'] == 'search') {
-    $interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
     $tool_name = get_lang('SearchASurvey');
 } else {
     $tool_name = get_lang('SurveyList');
@@ -60,63 +61,53 @@ Display::display_header($tool_name, 'Survey');
 // Tool introduction
 Display::display_introduction_section('survey', 'left');
 
-// Action handling
-$action = isset($_GET['action']) ? $_GET['action'] : null;
-
-switch ($action) {
-    case 'search' :
-        SurveyUtil::display_survey_search_form();
-        break;
-    case 'delete':
-        if (isset($_GET['survey_id'])) {
-            // Getting the information of the survey (used for when the survey is shared)
-            $survey_data = survey_manager::get_survey($_GET['survey_id']);
-            if (api_is_course_coach() && intval($_SESSION['id_session']) != $survey_data['session_id']) {
-                // The coach can't delete a survey not belonging to his session
-                api_not_allowed();
-                exit;
-            }
-            // If the survey is shared => also delete the shared content
-            if (is_numeric($survey_data['survey_share'])) {
-                survey_manager::delete_survey($survey_data['survey_share'], true);
-            }
+// Action handling: searching
+if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
+    SurveyUtil::display_survey_search_form();
+}
+// Action handling: deleting a survey
+if (isset($_GET['action']) && $_GET['action'] == 'delete' && isset($_GET['survey_id'])) {
+    // Getting the information of the survey (used for when the survey is shared)
+    $survey_data = survey_manager::get_survey($_GET['survey_id']);
+    if (api_is_course_coach() && intval($_SESSION['id_session']) != $survey_data['session_id']) {
+        // The coach can't delete a survey not belonging to his session
+        api_not_allowed();
+        exit;
+    }
+    // If the survey is shared => also delete the shared content
+    if (is_numeric($survey_data['survey_share'])) {
+        survey_manager::delete_survey($survey_data['survey_share'], true);
+    }
 
-            $return = survey_manager :: delete_survey($_GET['survey_id']);
-            if ($return) {
-                Display :: display_confirmation_message(get_lang('SurveyDeleted'), false);
-            } else {
-                Display :: display_error_message(get_lang('ErrorOccurred'), false);
-            }
-        }
-        break;
-    case 'empty':
-        $mysession = api_get_session_id();
-        if ($mysession != 0) {
-            if (!((api_is_course_coach() || api_is_platform_admin()) && api_is_element_in_the_session(
-                TOOL_SURVEY,
-                intval($_GET['survey_id'])
-            ))
-            ) {
-                // The coach can't empty a survey not belonging to his session
-                api_not_allowed();
-                exit;
-            }
-        } else {
-            if (!(api_is_course_admin() || api_is_platform_admin())) {
-                api_not_allowed();
-                exit;
-            }
+    $return = survey_manager :: delete_survey($_GET['survey_id']);
+    if ($return) {
+        Display::display_confirmation_message(get_lang('SurveyDeleted'), false);
+    } else {
+        Display::display_error_message(get_lang('ErrorOccurred'), false);
+    }
+}
+
+if (isset($_GET['action']) && $_GET['action'] == 'empty') {
+    $mysession = api_get_session_id();
+    if ($mysession != 0) {
+        if (!((api_is_course_coach() || api_is_platform_admin()) &&
+            api_is_element_in_the_session(TOOL_SURVEY, $_GET['survey_id']))) {
+            // The coach can't empty a survey not belonging to his session
+            api_not_allowed();
+            exit;
         }
-        $return = survey_manager::empty_survey(intval($_GET['survey_id']));
-        if ($return) {
-            Display :: display_confirmation_message(get_lang('SurveyEmptied'), false);
-        } else {
-            Display :: display_error_message(get_lang('ErrorOccurred'), false);
+    } else {
+        if (!(api_is_course_admin() || api_is_platform_admin())) {
+            api_not_allowed();
+            exit;
         }
-        break;
-    case 'copy_survey':
-        survey_manager::copy_survey($_GET['survey_id']);
-        break;
+    }
+    $return = survey_manager::empty_survey(intval($_GET['survey_id']));
+    if ($return) {
+        Display :: display_confirmation_message(get_lang('SurveyEmptied'), false);
+    } else {
+        Display :: display_error_message(get_lang('ErrorOccurred'), false);
+    }
 }
 
 // Action handling: performing the same action on multiple surveys
@@ -138,23 +129,12 @@ if (isset($_POST['action']) && $_POST['action']) {
     }
 }
 
-
 echo '<div class="actions">';
 if (!api_is_course_coach() || $extend_rights_for_coachs == 'true') {
-    // Action links
-    echo '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.Display::return_icon(
-        'new_survey.png',
-        get_lang('CreateNewSurvey'),
-        '',
-        ICON_SIZE_MEDIUM
-    ).'</a> ';
-}
-echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=search">'.Display::return_icon(
-    'search.png',
-    get_lang('Search'),
-    '',
-    ICON_SIZE_MEDIUM
-).'</a>';
+	// Action links
+	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'),'',ICON_SIZE_MEDIUM).'</a> ';
+}
+echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.Display::return_icon('search.png', get_lang('Search'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 // Load main content
@@ -171,35 +151,34 @@ Display :: display_footer();
 
 function get_number_of_surveys()
 {
-    return SurveyUtil::get_number_of_surveys();
+	return SurveyUtil::get_number_of_surveys();
 }
 
 function get_survey_data($from, $number_of_items, $column, $direction)
 {
-    return SurveyUtil::get_survey_data($from, $number_of_items, $column, $direction);
+	return SurveyUtil::get_survey_data($from, $number_of_items, $column, $direction);
 }
 
 function modify_filter($survey_id)
 {
-    return SurveyUtil::modify_filter($survey_id);
+	return SurveyUtil::modify_filter($survey_id);
 }
 
 function get_number_of_surveys_for_coach()
 {
-    return SurveyUtil::get_number_of_surveys_for_coach();
+	return SurveyUtil::get_number_of_surveys_for_coach();
 }
-
 function get_survey_data_for_coach($from, $number_of_items, $column, $direction)
 {
-    return SurveyUtil::get_survey_data_for_coach($from, $number_of_items, $column, $direction);
+	return SurveyUtil::get_survey_data_for_coach($from, $number_of_items, $column, $direction);
 }
 
 function modify_filter_for_coach($survey_id)
 {
-    return SurveyUtil::modify_filter_for_coach($survey_id);
+	return SurveyUtil::modify_filter_for_coach($survey_id);
 }
 
 function anonymous_filter($anonymous)
 {
-    return SurveyUtil::anonymous_filter($anonymous);
+	return SurveyUtil::anonymous_filter($anonymous);
 }