From 8dd0f882dc0982225c27ca3046faac9eddc1e7c7 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 25 Mar 2010 13:17:13 +0200
Subject: [PATCH] Feature #272 - "Surveys" tool: Revision and cleaning, part 2.

---
 main/survey/fillsurvey.php          | 1002 ++++-----
 main/survey/preview.php             |  131 +-
 main/survey/question.php            |  124 +-
 main/survey/reporting.php           |  114 +-
 main/survey/survey.download.inc.php |   72 +-
 main/survey/survey.lib.php          | 3092 +++++++++++----------------
 main/survey/survey.php              |  144 +-
 main/survey/survey_invitation.php   |  106 +-
 main/survey/survey_invite.php       |  174 +-
 main/survey/survey_list.php         |  166 +-
 10 files changed, 2033 insertions(+), 3092 deletions(-)

diff --git a/main/survey/fillsurvey.php b/main/survey/fillsurvey.php
index a0b758a5f2..c7b13b728c 100755
--- a/main/survey/fillsurvey.php
+++ b/main/survey/fillsurvey.php
@@ -1,62 +1,39 @@
 <?php
-
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 
 /**
-*	@package dokeos.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>, Dokeos: 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
-*/
-
-// name of the language file that needs to be included
+ *	@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';
-// unsetting the course id (because it is in the URL)
-if (!isset($_GET['cidReq']))
-{
+// Unsetting the course id (because it is in the URL)
+if (!isset($_GET['cidReq'])) {
 	$cidReset = true;
-}
-else
-{
+} else {
 	$_cid = $_GET['cidReq'];
 }
 
-// including the global dokeos file
-require ('../inc/global.inc.php');
+// Including the global initialization file
+require '../inc/global.inc.php';
 
-// including additional libraries
-//require_once (api_get_path(LIBRARY_PATH)."survey.lib.php");
-require_once('survey.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
+// Including additional libraries
+//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
+require_once 'survey.lib.php';
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 
-// breadcrumbs
-if (!empty($_user))
-{
-	$interbreadcrumb[] = array ("url" => 'survey_list.php?cidReq='.$_GET['course'],'name' => get_lang('SurveyList'));
+// Breadcrumbs
+if (!empty($_user)) {
+	$interbreadcrumb[] = array('url' => 'survey_list.php?cidReq='.$_GET['course'], 'name' => get_lang('SurveyList'));
 }
 
 // Header
@@ -74,82 +51,74 @@ $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['db_name']);
 
-// first we check if the needed parameters are present
-if ((!isset ($_GET['course']) || !isset ($_GET['invitationcode']))&& !isset($_GET['user_id']))
-{
+// 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);
 	Display :: display_footer();
 	exit;
 }
 $invitationcode = $_GET['invitationcode'];
-// start auto-invitation feature FS#3403 (all-users-can-do-the-survey-URL handling)
-if ($invitationcode == "auto" && isset($_GET['scode'])){
-    // not intended for anonymous users
-    if (!(isset ($_user['user_id']) && $_user['user_id']) || api_is_anonymous($_user['user_id'],true)) {
+
+// Start auto-invitation feature FS#3403 (all-users-can-do-the-survey-URL handling)
+if ($invitationcode == 'auto' && isset($_GET['scode'])){
+    // Not intended for anonymous users
+    if (!(isset($_user['user_id']) && $_user['user_id']) || api_is_anonymous($_user['user_id'],true)) {
 		api_not_allowed();
     }
     $userid = $_user['user_id'];
-    $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
+    $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 code='" . $scode . "'";
     $result = Database::query($sql);
-    if (Database :: num_rows($result) > 0){  // ok
-        // check availability
-        $row = Database :: fetch_array($result, 'ASSOC'); //
+    if (Database :: num_rows($result) > 0) { // Ok
+        // Check availability
+        $row = Database :: fetch_array($result, 'ASSOC');
         $tempdata  = survey_manager :: get_survey($row['survey_id']);
         check_time_availability($tempdata); //exit if survey not available anymore
-        // check for double invitation records (insert should be done once)
+        // Check for double invitation records (insert should be done once)
         $sql = "SELECT user from $table_survey_invitation where invitation_code = '".Database::escape_string($autoInvitationcode)."'";
         $result = Database::query($sql);
-        if (Database :: num_rows($result) == 0){ // ok
+        if (Database :: num_rows($result) == 0) { // Ok
             $sql = "insert into $table_survey_invitation (survey_code,user, invitation_code, invitation_date) ";
             $sql .= " values (\"$scode\", \"$userid\", \"$autoInvitationcode\", now())";
             Database::query($sql);
         }
-        // from here we use the new invitationcode auto-userid-surveycode string
+        // From here we use the new invitationcode auto-userid-surveycode string
         $_GET['invitationcode'] = $autoInvitationcode;
         $invitationcode = $autoInvitationcode;
     }
 }
-// end auto-invitation feature
 
-// now we check if the invitationcode is valid
+// Now we check if the invitationcode is valid
 $sql = "SELECT * FROM $table_survey_invitation WHERE invitation_code = '" . Database :: escape_string($invitationcode) . "'";
-$result = Database::query($sql, __FILE__, false); // false=suppress errors
-if (Database::num_rows($result) < 1)
-{
+$result = Database::query($sql, __FILE__, false); // false = suppress errors
+if (Database::num_rows($result) < 1) {
 	Display :: display_error_message(get_lang('WrongInvitationCode'), false);
 	Display :: display_footer();
 	exit;
 }
-$survey_invitation = Database::fetch_array($result,'ASSOC');
+$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']))
-{
+// Now we check if the user already filled the survey
+if ($survey_invitation['answered'] == 1 && !isset($_GET['user_id'])) {
 	Display :: display_error_message(get_lang('YouAlreadyFilledThisSurvey'), false);
 	Display :: display_footer();
 	exit();
 }
 
-// checking if there is another survey with this code.
+// 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 code='".Database::escape_string($survey_invitation['survey_code'])."'";
 $result = Database::query($sql);
 
-if (Database::num_rows($result) > 1)
-{
-	if ($_POST['language'])
-	{
+if (Database::num_rows($result) > 1) {
+	if ($_POST['language']) {
 		$survey_invitation['survey_id'] = $_POST['language'];
-	}
-	else
-	{
+	} else {
 		echo '<form id="language" name="language" method="POST" action="'.api_get_self().'?course='.$_GET['course'].'&invitationcode='.$_GET['invitationcode'].'&cidReq='.$_GET['cidReq'].'">';
 		echo '  <select name="language">';
-		while ($row=Database::fetch_array($result,'ASSOC'))
-		{
+		while ($row=Database::fetch_array($result, 'ASSOC')) {
 			echo '<option value="'.$row['survey_id'].'">'.$row['lang'].'</option>';
 		}
 		echo '</select>';
@@ -159,71 +128,57 @@ if (Database::num_rows($result) > 1)
 		display::display_footer();
 		exit();
 	}
-}
-else
-{
-	$row=Database::fetch_array($result,'ASSOC');
+} else {
+	$row=Database::fetch_array($result, 'ASSOC');
 	$survey_invitation['survey_id'] = $row['survey_id'];
 }
 
-// getting the survey information
+// Getting the survey information
 $survey_data = survey_manager::get_survey($survey_invitation['survey_id']);
 //echo '<pre>';print_r($survey_data);echo '</pre>';
 //echo $survey_data['form_fields'];echo '-<br>-';echo $survey_data['show_form_profile'];
 $survey_data['survey_id'] = $survey_invitation['survey_id'];
 //print_r($survey_data);
-// storing the answers
-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
+// Storing the answers
+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 survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'";
 		$result = Database::query($sql);
 
-		while ($row = Database::fetch_array($result,'ASSOC'))
-		{
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
 			$types[$row['question_id']] = $row['type'];
 		}
 
-		// 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
-			if (strstr($key, 'question'))
-			{
-				// finding the question id by removing 'question'
-				$survey_question_id = str_replace('question', '',$key);
+		// 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
+			if (strpos($key, 'question') !== false) {
+				// Finding the question id by removing 'question'
+				$survey_question_id = str_replace('question', '', $key);
 
-				// if the post value is an array then we have a multiple response question or a scoring question type
+				// If the post value is an array then we have a multiple response question or a scoring question type
 				// remark: when it is a multiple response then the value of the array is the option_id
 				// 		   when it is a scoring question then the key of the array is the option_id and the value is the value
-				if (is_array($value))
-				{
+				if (is_array($value)) {
 					SurveyUtil::remove_answer($survey_invitation['user'], $survey_invitation['survey_id'], $survey_question_id);
-					foreach ($value as $answer_key => $answer_value)
-					{
-						if ($types[$survey_question_id] == 'score')
-						{
+					foreach ($value as $answer_key => & $answer_value) {
+						if ($types[$survey_question_id] == 'score') {
 							$option_id = $answer_key;
 							$option_value = $answer_value;
-						}
-						else
-						{
+						} else {
 							$option_id = $answer_value;
 							$option_value = '';
 						}
 						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
-				{
-					if ($types[$survey_question_id] == 'percentage')
-					{
+				// All the other question types (open question, multiple choice, percentage, ...)
+				else {
+					if ($types[$survey_question_id] == 'percentage') {
 						$sql = "SELECT * FROM $table_survey_question_option WHERE question_option_id='".Database::escape_string($value)."'";
 						$result = Database::query($sql);
-						$row = Database::fetch_array($result,'ASSOC');
+						$row = Database::fetch_array($result, 'ASSOC');
 						$option_value = $row['option_text'];
 					} else {
 						$option_value = 0;
@@ -240,66 +195,57 @@ if (count($_POST)>0)
 				}
 			}
 		}
-	}
-	elseif ($survey_data['survey_type']==='1')	//conditional/personality-test type surveys
-    {
-		// getting all the types of the question (because of the special treatment of the score question type
+	} elseif ($survey_data['survey_type'] === '1') { //conditional/personality-test type surveys
+		// Getting all the types of the question (because of the special treatment of the score question type
 		$shuffle='';
-		if ($survey_data['shuffle']=='1')
-		{
-			$shuffle= ' ORDER BY RAND() '	;
+		if ($survey_data['shuffle'] == '1') {
+			$shuffle= ' ORDER BY RAND() ';
 		}
 		$sql = "SELECT * FROM $table_survey_question
 				WHERE 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'))
-		{
+        // There is only one question type for conditional surveys
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
 			$types[$row['question_id']] = $row['type'];
 		}
 
-		// 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
-			if (strstr($key,'question'))
-			{
-				// finding the question id by removing 'question'
-				$survey_question_id = str_replace('question', '',$key);
-				// we select the correct answer and the puntuacion
+		// 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
+			if (strpos($key, 'question') !== false) {
+				// Finding the question id by removing 'question'
+				$survey_question_id = str_replace('question', '', $key);
+				// We select the correct answer and the puntuacion
 				$sql = "SELECT value FROM $table_survey_question_option " .
                         " WHERE question_option_id='".Database::escape_string($value)."'";
 				$result = Database::query($sql);
-				$row = Database::fetch_array($result,'ASSOC');
+				$row = Database::fetch_array($result, 'ASSOC');
 				$option_value = $row['value'];
 				//$option_value = 0;
 				$survey_question_answer = $value;
-                //we save the answer after making sure that a possible previous attempt is deleted
+                // We save the answer after making sure that a possible previous attempt is deleted
 				SurveyUtil::remove_answer($survey_invitation['user'], $survey_invitation['survey_id'], $survey_question_id);
 				SurveyUtil::store_answer($survey_invitation['user'], $survey_invitation['survey_id'], $survey_question_id, $value, $option_value, $survey_data);
 				//SurveyUtil::store_answer($user,$survey_id,$question_id, $option_id, $option_value, $survey_data);
 			}
 		}
-	}
-    else //in case it's another type than 0 or 1
-    {
+	} else { // In case it's another type than 0 or 1
     	die(get_lang('ErrorSurveyTypeUnknown'));
     }
 }
 
-// displaying the survey title and subtitle (appears on every page)
+// Displaying the survey title and subtitle (appears on every page)
 echo '<div id="survey_title">'.$survey_data['survey_title'].'</div>';
 echo '<div id="survey_subtitle">'.$survey_data['survey_subtitle'].'</div>';
 
-// checking time availability
+// Checking time availability
 check_time_availability($survey_data);
 
-// displaying the survey introduction
-if (!isset($_GET['show']))
-{
-	// the first thing we do is delete the session
+// Displaying the survey introduction
+if (!isset($_GET['show'])) {
+	// The first thing we do is delete the session
 	unset($_SESSION['paged_questions']);
 	unset($_SESSION['page_questions_sec']);
 	$paged_questions_sec=array();
@@ -310,17 +256,15 @@ if (!isset($_GET['show']))
 
 $user_id = api_get_user_id();
 
-if ($user_id == 0)
-{
+if ($user_id == 0) {
 	$user_id = $survey_invitation['user'];
 }
 $user_data = UserManager :: get_user_info_by_id($user_id);
 
-if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_array($user_data))
-{
-	//echo "<pre>"; print_r($survey_invitation);
+if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_array($user_data)) {
+	//echo '<pre>'; print_r($survey_invitation);
 	$form_fields = explode('@', $survey_data['form_fields']);
-	$list = array ();
+	$list = array();
 	foreach ($form_fields as $field) {
 		$field_value = explode(':', $field);
 		if ($field_value[1] == 1) {
@@ -331,52 +275,52 @@ if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_arra
 		}
 	}
 
-	// we use the same form as in auth/profile.php
-	require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.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;')
-	));
+	// We use the same form as in auth/profile.php
+	require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.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;'))
+	);
 
 	if (api_is_western_name_order()) {
 		if ($list['firstname'] == 1 ) {
 			//FIRST NAME
-			$form->addElement('text', 'firstname', get_lang('FirstName'), array ('size' => 40));
+			$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
 			if (api_get_setting('profile', 'name') !== 'true') {
-				$form->freeze(array ('firstname'));
+				$form->freeze(array('firstname'));
 			}
-			$form->applyFilter(array ('firstname'), 'stripslashes');
-			$form->applyFilter(array ('firstname'), 'trim');
+			$form->applyFilter(array('firstname'), 'stripslashes');
+			$form->applyFilter(array('firstname'), 'trim');
 			$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 		}
 		if ($list['lastname'] == 1) {
 			//	LAST NAME
-			$form->addElement('text', 'lastname', get_lang('LastName'), array ('size' => 40));
+			$form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
 			if (api_get_setting('profile', 'name') !== 'true') {
-				$form->freeze(array ('lastname'));
+				$form->freeze(array('lastname'));
 			}
-			$form->applyFilter(array ('lastname'), 'stripslashes');
-			$form->applyFilter(array ('lastname'), 'trim');
+			$form->applyFilter(array('lastname'), 'stripslashes');
+			$form->applyFilter(array('lastname'), 'trim');
 			$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 		}
 	} else {
 		if ($list['lastname'] == 1) {
 			//	LAST NAME
-			$form->addElement('text', 'lastname', get_lang('LastName'), array ('size' => 40));
+			$form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
 			if (api_get_setting('profile', 'name') !== 'true') {
-				$form->freeze(array ('lastname'));
+				$form->freeze(array('lastname'));
 			}
-			$form->applyFilter(array ('lastname'), 'stripslashes');
-			$form->applyFilter(array ('lastname'), 'trim');
+			$form->applyFilter(array('lastname'), 'stripslashes');
+			$form->applyFilter(array('lastname'), 'trim');
 			$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 		}
 		if ($list['firstname'] == 1 ) {
 			//FIRST NAME
-			$form->addElement('text', 'firstname', get_lang('FirstName'), array ('size' => 40));
+			$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
 			if (api_get_setting('profile', 'name') !== 'true') {
-				$form->freeze(array ('firstname'));
+				$form->freeze(array('firstname'));
 			}
-			$form->applyFilter(array ('firstname'), 'stripslashes');
-			$form->applyFilter(array ('firstname'), 'trim');
+			$form->applyFilter(array('firstname'), 'stripslashes');
+			$form->applyFilter(array('firstname'), 'trim');
 			$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 		}
 	}
@@ -384,51 +328,53 @@ if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_arra
 	if ($list['official_code'] == 1) {
 		//	OFFICIAL CODE
 		if (CONFVAL_ASK_FOR_OFFICIAL_CODE) {
-			$form->addElement('text', 'official_code', get_lang('OfficialCode'), array (
-				'size' => 40
-			));
-			if (api_get_setting('profile', 'officialcode') !== 'true')
+			$form->addElement('text', 'official_code', get_lang('OfficialCode'), array('size' => 40));
+			if (api_get_setting('profile', 'officialcode') !== 'true') {
 				$form->freeze('official_code');
+			}
 			$form->applyFilter('official_code', 'stripslashes');
 			$form->applyFilter('official_code', 'trim');
-			if (api_get_setting('registration', 'officialcode') == 'true' && api_get_setting('profile', 'officialcode') == 'true')
+			if (api_get_setting('registration', 'officialcode') == 'true' && api_get_setting('profile', 'officialcode') == 'true') {
 				$form->addRule('official_code', get_lang('ThisFieldIsRequired'), 'required');
+			}
 		}
 	}
 	if ($list['email'] == 1) {
 		//	EMAIL
-		$form->addElement('text', 'email', get_lang('Email'), array (
-			'size' => 40
-		));
-		if (api_get_setting('profile', 'email') !== 'true')
+		$form->addElement('text', 'email', get_lang('Email'), array('size' => 40));
+		if (api_get_setting('profile', 'email') !== 'true') {
 			$form->freeze('email');
+		}
 		$form->applyFilter('email', 'stripslashes');
 		$form->applyFilter('email', 'trim');
-		if (api_get_setting('registration', 'email') == 'true')
+		if (api_get_setting('registration', 'email') == 'true') {
 			$form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
+		}
 		$form->addRule('email', get_lang('EmailWrong'), 'email');
 	}
 
 	if ($list['phone'] == 1) {
 		//	PHONE
-		$form->addElement('text', 'phone', get_lang('phone'), array (
-			'size' => 20
-		));
-		if (api_get_setting('profile', 'phone') !== 'true')
+		$form->addElement('text', 'phone', get_lang('phone'), array('size' => 20));
+		if (api_get_setting('profile', 'phone') !== 'true') {
 			$form->freeze('phone');
+		}
 		$form->applyFilter('phone', 'stripslashes');
 		$form->applyFilter('phone', 'trim');
-		if (api_get_setting('profile', 'phone') == 'true')
+		if (api_get_setting('profile', 'phone') == 'true') {
 			$form->addRule('phone', get_lang('ThisFieldIsRequired'), 'required');
+		}
 	}
 
 	if ($list['language'] == 1) {
 		//	LANGUAGE
 		$form->addElement('select_language', 'language', get_lang('Language'));
-		if (api_get_setting('profile', 'language') !== 'true')
+		if (api_get_setting('profile', 'language') !== 'true') {
 			$form->freeze('language');
-		if (api_get_setting('profile', 'language') == 'true')
+		}
+		if (api_get_setting('profile', 'language') == 'true') {
 			$form->addRule('language', get_lang('ThisFieldIsRequired'), 'required');
+		}
 	}
 
 	// EXTRA FIELDS
@@ -442,70 +388,73 @@ if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_arra
 		if ($list['extra_' . $field_details[1]] == 1) {
 			switch ($field_details[2]) {
 				case USER_FIELD_TYPE_TEXT :
-					$form->addElement('text', 'extra_' . $field_details[1], $field_details[3], array (
-						'size' => 40
-					));
+					$form->addElement('text', 'extra_' . $field_details[1], $field_details[3], array('size' => 40));
 					$form->applyFilter('extra_' . $field_details[1], 'stripslashes');
 					$form->applyFilter('extra_' . $field_details[1], 'trim');
 
-					if ($field_details[7] == 0)
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					break;
 				case USER_FIELD_TYPE_TEXTAREA :
 					$form->add_html_editor('extra_' . $field_details[1], $field_details[3], false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
 					$form->applyFilter('extra_' . $field_details[1], 'stripslashes');
 					$form->applyFilter('extra_' . $field_details[1], 'trim');
 
-					if ($field_details[7] == 0)
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					break;
 				case USER_FIELD_TYPE_RADIO :
-					$group = array ();
+					$group = array();
 					foreach ($field_details[9] as $option_id => $option_details) {
 						$options[$option_details[1]] = $option_details[2];
 						$group[] = & HTML_QuickForm :: createElement('radio', 'extra_' . $field_details[1], $option_details[1], $option_details[2] . '<br />', $option_details[1]);
 					}
 					$form->addGroup($group, 'extra_' . $field_details[1], $field_details[3], '');
 
-					if ($field_details[7] == 0)
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					break;
 				case USER_FIELD_TYPE_SELECT :
-					$options = array ();
+					$options = array();
 					foreach ($field_details[9] as $option_id => $option_details) {
 						$options[$option_details[1]] = $option_details[2];
 					}
 					$form->addElement('select', 'extra_' . $field_details[1], $field_details[3], $options, '');
-					if ($field_details[7] == 0)
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					break;
 				case USER_FIELD_TYPE_SELECT_MULTIPLE :
-					$options = array ();
+					$options = array();
 					foreach ($field_details[9] as $option_id => $option_details) {
 						$options[$option_details[1]] = $option_details[2];
 					}
-					$form->addElement('select', 'extra_' . $field_details[1], $field_details[3], $options, array (
-						'multiple' => 'multiple'
-					));
-					if ($field_details[7] == 0)
+					$form->addElement('select', 'extra_' . $field_details[1], $field_details[3], $options, array('multiple' => 'multiple'));
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					break;
 				case USER_FIELD_TYPE_DATE :
-					$form->addElement('datepickerdate', 'extra_' . $field_details[1], $field_details[3],array('form_name'=>'profile'));
+					$form->addElement('datepickerdate', 'extra_' . $field_details[1], $field_details[3], array('form_name' => 'profile'));
 					$form->_elements[$form->_elementIndex['extra_' . $field_details[1]]]->setLocalOption('minYear', 1900);
 					$defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
 					$form -> setDefaults($defaults);
-					if ($field_details[7] == 0)
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					$form->applyFilter('theme', 'trim');
 					break;
 				case USER_FIELD_TYPE_DATETIME :
-					$form->addElement('datepicker', 'extra_' . $field_details[1], $field_details[3],array('form_name'=>'profile'));
-					$form->_elements[$form->_elementIndex['extra_'.$field_details[1]]]->setLocalOption('minYear',1900);
+					$form->addElement('datepicker', 'extra_' . $field_details[1], $field_details[3], array('form_name' => 'profile'));
+					$form->_elements[$form->_elementIndex['extra_'.$field_details[1]]]->setLocalOption('minYear', 1900);
 					$defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
 					$form -> setDefaults($defaults);
-					if ($field_details[7] == 0)
+					if ($field_details[7] == 0) {
 						$form->freeze('extra_' . $field_details[1]);
+					}
 					$form->applyFilter('theme', 'trim');
 					break;
 				case USER_FIELD_TYPE_DOUBLE_SELECT :
@@ -520,16 +469,17 @@ if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_arra
 					$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)
+					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
+					// 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)
+						// 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 ();
+						$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
+						// 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;
@@ -546,18 +496,18 @@ if ($survey_data['form_fields']!='' && $survey_data['anonymous'] == 0 && is_arra
 			$form->addRule('extra_' . $field_details[1], get_lang('ThisFieldIsRequired'), 'required');
 		}
 	}
-	$form->addElement('style_submit_button', '', get_lang('Next'),array('class'=>'next'));
+	$form->addElement('style_submit_button', '', get_lang('Next'), array('class' => 'next'));
 	$user_data = array_merge($user_data, $extra_data);
 	$form->setDefaults($user_data);
 }
 
-if ($survey_data['form_fields'] && $survey_data['anonymous'] == 0 && is_array($user_data) && !isset ($_GET['show'])) {
+if ($survey_data['form_fields'] && $survey_data['anonymous'] == 0 && is_array($user_data) && !isset($_GET['show'])) {
 	if ($form->validate()) {
 		$user_data = $form->exportValues();
 		if (is_array($user_data)) {
-			if (count($user_data)>0) {
-				$extras = array ();
-				// build SQL query
+			if (count($user_data) > 0) {
+				$extras = array();
+				// Build SQL query
 				$sql = "UPDATE $table_user SET";
 				foreach ($user_data as $key => $value) {
 					if (substr($key, 0, 6) == 'extra_') { //an extra field
@@ -566,11 +516,11 @@ if ($survey_data['form_fields'] && $survey_data['anonymous'] == 0 && is_array($u
 						$sql .= " $key = '" . Database :: escape_string($value) . "',";
 					}
 				}
-				// remove trailing , from the query we have so far
+				// Remove trailing , from the query we have so far
 				$sql = rtrim($sql, ',');
 				$sql .= " WHERE user_id  = '" . $user_id . "'";
 				Database::query($sql);
-				//update the extra fields
+				// Update the extra fields
 				if (is_array($extras)) {
 					foreach ($extras as $key => $value) {
 						$myres = UserManager :: update_extra_field_value($user_id, $key, $value);
@@ -579,30 +529,29 @@ if ($survey_data['form_fields'] && $survey_data['anonymous'] == 0 && is_array($u
 				echo '<div id="survey_content" class="survey_content">' . get_lang('InformationUpdated') . ' ' . get_lang('PleaseFillSurvey') . '</div>';
 			}
 		}
-		//$_GET['show_form']=0;
-		//$show_form=0;
-		$_GET['show']=0;
-		$show=0;
-		//we unset the sessions
+		//$_GET['show_form'] = 0;
+		//$show_form = 0;
+		$_GET['show'] = 0;
+		$show = 0;
+		// We unset the sessions
 		unset($_SESSION['paged_questions']);
 		unset($_SESSION['page_questions_sec']);
-		$paged_questions_sec=array();
+		$paged_questions_sec = array();
 
 	}
-	//elseif ($_GET['show_form']==1) //	// displaying the field
+	//elseif ($_GET['show_form'] == 1) { // Displaying the field
 	else {
 		echo '<div id="survey_content" class="survey_content">' . get_lang('UpdateInformation') . '</div>';
-		//we unset the sessions
+		// We unset the sessions
 		unset($_SESSION['paged_questions']);
 		unset($_SESSION['page_questions_sec']);
-		$paged_questions_sec=array();
+		$paged_questions_sec = array();
 		$form->display();
 	}
 }
 
-// displaying the survey thanks message
-if (isset($_POST['finish_survey']))
-{
+// Displaying the survey thanks message
+if (isset($_POST['finish_survey'])) {
 	echo '<div id="survey_content" class="survey_content"><strong>'.get_lang('SurveyFinished').'</strong> <br />'.$survey_data['survey_thanks'].'</div>';
 	survey_manager::update_survey_answered($survey_data['survey_id'], $survey_invitation['user'], $survey_invitation['survey_code']);
 	unset($_SESSION['paged_questions']);
@@ -611,56 +560,46 @@ if (isset($_POST['finish_survey']))
 	exit();
 }
 
-// sets the random questions
-$shuffle='';
-if ($survey_data['shuffle']==1)
-{
-	$shuffle= ' BY RAND() ';
+// Sets the random questions
+$shuffle = '';
+if ($survey_data['shuffle'] == 1) {
+	$shuffle = ' BY RAND() ';
 }
 
-if ( isset($_GET['show']) || isset($_POST['personality']))
-{
+if (isset($_GET['show']) || isset($_POST['personality'])) {
 	// 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
+	// As long as there is no pagebreak fount we keep adding questions to the page
 	$questions_displayed = array();
 	$counter = 0;
     $paged_questions = array();
 
-	// if non-conditional survey
-	if ($survey_data['survey_type']==='0')
-	{
-		if(empty($_SESSION['paged_questions']))
-        {
+	// If non-conditional survey
+	if ($survey_data['survey_type'] === '0') {
+		if (empty($_SESSION['paged_questions'])) {
     		$sql = "SELECT * FROM $table_survey_question
     				WHERE survey_id = '".Database::escape_string($survey_invitation['survey_id'])."'
     				ORDER BY sort ASC";
     		$result = Database::query($sql);
-    		while ($row = Database::fetch_array($result,'ASSOC'))
-    		{
-    			if($row['type'] == 'pagebreak')
-    			{
+    		while ($row = Database::fetch_array($result, 'ASSOC')) {
+    			if ($row['type'] == 'pagebreak') {
     				$counter++;
-    			}
-    			else
-    			{
+    			} else {
     				// ids from question of the current survey
     				$paged_questions[$counter][] = $row['question_id'];
     			}
     		}
             $_SESSION['paged_questions'] = $paged_questions;
-        }
-        else
-        {
+        } else {
         	$paged_questions = $_SESSION['paged_questions'];
         }
 
 		if (key_exists($_GET['show'], $paged_questions)) {
 			if (isset($_GET['user_id'])) {
 
-			// get the user into survey answer table (user or anonymus)
-			$my_user_id=($survey_data['anonymous']==1) ? $_SESSION['surveyuser'] :api_get_user_id();
+				// 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,
+				$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
@@ -671,7 +610,7 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 					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,
+				$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
@@ -685,13 +624,13 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 			$result = Database::query($sql);
 			$question_counter_max = Database::num_rows($result);
 			$counter = 0;
-			$limit=0;
+			$limit = 0;
 			$questions = array();
 
 			while ($row = Database :: fetch_array($result, 'ASSOC')) {
 
-				// if the type is not a pagebreak we store it in the $questions array
-				if ($row['type'] <> 'pagebreak') {
+				// If the type is not a pagebreak we store it in the $questions array
+				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'];
@@ -700,31 +639,29 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 					$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
+				// If the type is a pagebreak we are finished loading the questions for this page
 				else {
 					break;
 				}
 				$counter++;
 			}
 		}
-	}
-	elseif ($survey_data['survey_type']==='1')
-	{
+	} elseif ($survey_data['survey_type'] === '1') {
 		$my_survey_id=Database::escape_string($survey_invitation['survey_id']);
 		$current_user = Database::escape_string($survey_invitation['user']);
 
-		if (isset($_POST['personality']))
-		{
+		if (isset($_POST['personality'])) {
 			// Compute the results to get the 3 groups nearest to the user's personality
-			if ($shuffle=='')
+			if ($shuffle == '') {
 				$order = 'BY sort ASC ';
-			else
+			} else {
 				$order = $shuffle;
+			}
 
-			$answer_list=array();
+			$answer_list = array();
 
-			// get current user results
-			$results=array();
+			// 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)
@@ -736,15 +673,15 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 
 			$result = Database::query($sql);
 			while ($row = Database :: fetch_array($result)) {
-				$answer_list['value']=$row['value'];
-				$answer_list['group']=$row['survey_group_pri'];
-				$results[]=$answer_list;
+				$answer_list['value'] = $row['value'];
+				$answer_list['group'] = $row['survey_group_pri'];
+				$results[] = $answer_list;
 			}
 
-			//echo "<br>";print_r($results);	echo "<br>";
+			//echo '<br />'; print_r($results); echo '<br />';
 
-			// get the total score for each group of questions
-			$totals=array();
+			// Get the total score for each group of questions
+			$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
@@ -756,245 +693,205 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 					ORDER BY temp.survey_group_pri";
 
 			$result = Database::query($sql);
-			while ($row = Database::fetch_array($result))
-			{
-				$list['value']=$row['value'];
-				$list['group']=$row['survey_group_pri'];
-				$totals[]=$list;
+			while ($row = Database::fetch_array($result)) {
+				$list['value'] = $row['value'];
+				$list['group'] = $row['survey_group_pri'];
+				$totals[] = $list;
 			}
 			//echo '<pre>'; print_r($totals);
 
-			$final_results=array();
+			$final_results = array();
 
-            //get a percentage score for each group
+            // Get a percentage score for each group
 			for ($i = 0; $i < count($totals); $i++) {
 				for ($j = 0; $j < count($results); $j++) {
 					if ($totals[$i]['group'] == $results[$j]['group']) {
-						$group=$totals[$i]['group'];
-						$porcen=($results[$j]['value'] / $totals[$i]['value'] );
-						$final_results[$group]=$porcen;
+						$group = $totals[$i]['group'];
+						$porcen = ($results[$j]['value'] / $totals[$i]['value']);
+						$final_results[$group] = $porcen;
 					}
 				}
 			}
 
-			// sort the results by score (getting a list of group IDs by score into $groups)
+			// Sort the results by score (getting a list of group IDs by score into $groups)
 			arsort($final_results);
 			$groups=array_keys($final_results);
 			/*
             echo '<pre>';
 			echo 'Group id =>  %';
-			echo "<br>";
+			echo '<br />';
 			print_r($final_results);
             echo '</pre>';
 		    */
-			$result=array();
-			$count_result=0;
-			foreach ($final_results as $key => $sub_result) {
-				$result[] = array (
-					'group' => $key,
-					'value' => $sub_result
-				);
+			$result = array();
+			$count_result = 0;
+			foreach ($final_results as $key => & $sub_result) {
+				$result[] = array('group' => $key, 'value' => $sub_result);
 				$count_result++;
 			}
 
-
 			/*
 			//i.e 70% - 70% -70% 70%  $equal_count =3
-			while(1)
-			{
-				if ($result[$i]['value']  == $result[$i+1]['value'])
-				{
+			while (1) {
+				if ($result[$i]['value']  == $result[$i+1]['value']) {
 					$equal_count++;
-				}
-				else
-				{
+				} else {
 					break;
 				}
 				$i++;
 			}
 			echo 'eq'. $equal_count;
-			echo "<br>";
-			if 	($equal_count==0)
-			{
+			echo '<br />';
+			if 	($equal_count == 0) {
 				//i.e 70% 70% -60% 60%  $equal_count = 1 only we get the first 2 options
-				if ( ($result[0]['value']  == $result[1]['value'])  &&  ($result[2]['value']==$result[3]['value']) )
-				{
-					$group_cant=1;
-				}
-				else
-				{	// by default we chose the highest 3
+				if (($result[0]['value'] == $result[1]['value'])  &&  ($result[2]['value'] == $result[3]['value'])) {
+					$group_cant = 1;
+				} else {
+					// By default we chose the highest 3
 					$group_cant=2;
 				}
-			}
-			elseif ($equal_count==2)
-			{
-				$group_cant=2;
-			}
-			else
-			{
-				$group_cant=-1;
+			} elseif ($equal_count == 2) {
+				$group_cant = 2;
+			} else {
+				$group_cant = -1;
 			}
 			*/
 
-			//i.e 70% - 70% -70% 70%  $equal_count =3
+			// i.e 70% - 70% -70% 70%  $equal_count =3
 
 			$i = 0;
 			$group_cant = 0;
 			$equal_count = 0;
-			// this is the case if the user does not select any question
-			if ($count_result>0)
-			{
+			// This is the case if the user does not select any question
+			if ($count_result > 0) {
 				// Count the number of scores equal to the first
-				while (1)
-				{
-					if ($result[$i]['value'] == $result[$i +1]['value'])
-					{
+				while (1) {
+					if ($result[$i]['value'] == $result[$i + 1]['value']) {
 						$equal_count++;
-					}
-					else
-					{
+					} else {
 						break;
 					}
 					$i++;
 				}
-			}
-			else
-			{
-				//we force the exit of the survey undeterminated
+			} else {
+				// We force the exit of the survey undeterminated
 				$equal_count=10;
 			}
 			//echo '<pre>';
 			//print_r($result);
 
-            // if we have only 3 or less equal scores (i.e. 0,1 or 2 equalities), then we can use the three first groups
-			if ($equal_count<4)
-			{
-				//if there is one or less score equalities
-				if ($equal_count === 0 || $equal_count === 1)
-					{
-					//i.e 70% - 70% -60% - 60%  $equal_count = 1 we only get the first 2 options
-					if (($result[0]['value'] == $result[1]['value']) && ($result[2]['value'] == $result[3]['value']))
-					{
+            // If we have only 3 or less equal scores (i.e. 0,1 or 2 equalities), then we can use the three first groups
+			if ($equal_count < 4) {
+				// If there is one or less score equalities
+				if ($equal_count === 0 || $equal_count === 1) {
+					// i.e 70% - 70% -60% - 60%  $equal_count = 1 we only get the first 2 options
+					if (($result[0]['value'] == $result[1]['value']) && ($result[2]['value'] == $result[3]['value'])) {
 						$group_cant = 1;
 					}
-					//i.e 70% - 70% -0% - 0% 	-	$equal_count = 0 we only get the first 2 options
-					/*elseif (($result[0]['value'] == $result[1]['value']) && ($result[1]['value'] != $result[2]['value']) ) {
-						$group_cant=0;
+					// i.e 70% - 70% -0% - 0% 	-	$equal_count = 0 we only get the first 2 options
+					/*elseif (($result[0]['value'] == $result[1]['value']) && ($result[1]['value'] != $result[2]['value'])) {
+						$group_cant = 0;
 					}*/
 					/*
-					//i.e 70% - 70% -60% - 60%  $equal_count = 0 we only get the first 2 options
-					elseif ( ($result[0]['value']  == $result[1]['value'])  &&  ($result[2]['value'] == $result[3]['value']) )
-					{
-						$group_cant=0;
+					// i.e 70% - 70% -60% - 60%  $equal_count = 0 we only get the first 2 options
+					elseif (($result[0]['value'] == $result[1]['value'])  &&  ($result[2]['value'] == $result[3]['value'])) {
+						$group_cant = 0;
 					}*/
-					//i.e. 80% - 70% - 70% - 70%
+					// i.e. 80% - 70% - 70% - 70%
 					elseif (($result[0]['value'] != $result[1]['value']) && ($result[1]['value'] == $result[2]['value']) && ($result[2]['value'] == $result[3]['value'])) {
 						$group_cant = 0;
-					}
-					else
-					{
-					//i.e. 80% - 70% - 70% - 50
-					//i.e. 80% - 80% - 70% - 50
+					} else {
+						// i.e. 80% - 70% - 70% - 50
+						// i.e. 80% - 80% - 70% - 50
 
-						// by default we choose the highest 3
-						$group_cant=2;
+						// By default we choose the highest 3
+						$group_cant = 2;
 					}
-				}
-				else
-				{
-					//if there are two score equalities
-					$group_cant=$equal_count;
+				} else {
+					// If there are two score equalities
+					$group_cant = $equal_count;
 				}
 
-				//@todo
+				//@todo Translate these comments.
 				// conditional_status
 				// 0 no determinado
 				// 1 determinado
 				// 2 un solo valor
 				// 3 valores iguales
 
-				if ($group_cant>0)
-				{
+				if ($group_cant > 0) {
 					//echo '$equal_count'.$group_cant;
-					// we only get highest 3
-					$secondary ='';
-					$combi='';
+					// We only get highest 3
+					$secondary = '';
+					$combi = '';
 
 					for ($i = 0; $i <= $group_cant; $i++) {
-						$group1=$groups[$i];
-						$group2=$groups[$i+1];
-						// here we made all the posibilities with the 3 groups
+						$group1 = $groups[$i];
+						$group2 = $groups[$i + 1];
+						// Here we made all the posibilities with the 3 groups
 						if ($group_cant == 2 && $i == $group_cant) {
-							$group2=$groups[0];
+							$group2 = $groups[0];
 							$secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
 							$secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-							$combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1."<br>";
+							$combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
 						} else {
 							if ($i != 0) {
 								$secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
 								$secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-								$combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1."<br>";
+								$combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
 							} else {
 								$secondary .= " ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
 								$secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-								$combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1."<br>";
+								$combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
 							}
 						}
 					}
 					/*
                     echo '<pre>';
-                    echo "Pair of Groups <br /><br />";
+                    echo 'Pair of Groups <br /><br />';
 					echo $combi;
 					echo '</pre>';
 					*/
-					// create the new select with the questions from the secondary phase
-					if (empty($_SESSION['page_questions_sec']) && !is_array($_SESSION['page_questions_sec']) && count($_SESSION['page_questions_sec']==0))
-					{
+					// Create the new select with the questions from the secondary phase
+					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 survey_id = '".$my_survey_id."'
     							  	 AND ($secondary )
     								 ORDER BY sort ASC";
     					$result = Database::query($sql);
-    					$counter=0;
-    					while ($row = Database::fetch_array($result,'ASSOC'))
-    					{
-    						if ($survey_data['one_question_per_page']==1)
-    						{
+    					$counter = 0;
+    					while ($row = Database::fetch_array($result, 'ASSOC')) {
+    						if ($survey_data['one_question_per_page'] == 1) {
     							$paged_questions_sec[$counter][] = $row['question_id'];
     							$counter++;
+    						} elseif ($row['type'] == 'pagebreak') {
+    							$counter++;
+							} else {
+    							// ids from question of the current survey
+    							$paged_questions_sec[$counter][] = $row['question_id'];
     						}
-    						else
-    							if($row['type'] == 'pagebreak')
-    							{
-    								$counter++;
-								} else {
-    								// ids from question of the current survey
-    								$paged_questions_sec[$counter][] = $row['question_id'];
-    							}
     					}
                         $_SESSION['paged_questions_sec'] = $paged_questions_sec;
-                    }
-                    else
-                    {
+                    } else {
                     	$paged_questions_sec = $_SESSION['paged_questions_sec'];
                     }
 					//print_r($paged_questions_sec);
 
-                    $paged_questions = $_SESSION['paged_questions']; //for the sake of pages counting
-                    //$paged_questions = $paged_questions_sec; //for the sake of pages counting coming up at display time...
+                    $paged_questions = $_SESSION['paged_questions']; // For the sake of pages counting
+                    //$paged_questions = $paged_questions_sec; // For the sake of pages counting coming up at display time...
 
-					if ($shuffle=='')
-						$shuffle=' BY survey_question.sort, survey_question_option.sort ASC ';
+					if ($shuffle == '') {
+						$shuffle = ' BY survey_question.sort, survey_question_option.sort ASC ';
+					}
 
-					//$val=0;
-					//if ($survey_data['one_question_per_page']==0)
-					//{
-						$val=(int)$_POST['personality'];
+					//$val = 0;
+					//if ($survey_data['one_question_per_page'] == 0) {
+						$val = (int)$_POST['personality'];
 					//}
-					//echo '<pre>';print_r($paged_questions_sec);echo '</pre>';
-					if (is_array($paged_questions_sec))
-					{
+					//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
@@ -1008,12 +905,11 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 						$result = Database::query($sql);
 						$question_counter_max = Database::num_rows($result);
 						$counter = 0;
-						$limit=0;
+						$limit = 0;
 						$questions = array();
-						while ($row = Database::fetch_array($result,'ASSOC'))
-						{
-							// if the type is not a pagebreak we store it in the $questions array
-							if ($row['type'] <> 'pagebreak') {
+						while ($row = Database::fetch_array($result, 'ASSOC')) {
+							// If the type is not a pagebreak we store it in the $questions array
+							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'];
@@ -1021,60 +917,48 @@ 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'];
-								// personality params
+								// Personality params
 								$questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
 								$questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
 								$questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
 							}
-							// if the type is a pagebreak we are finished loading the questions for this page
-							else
-							{
+							// If the type is a pagebreak we are finished loading the questions for this page
+							else {
 								break;
 							}
 							$counter++;
 						}
-					}
-					else
-					{
+					} else {
 						echo get_lang('SurveyUndetermined');
 					}
-
-				}
-				else
-				{
+				} else {
 					echo get_lang('SurveyUndetermined');
 				}
-			}
-			else
-			{
+			} else {
 				echo get_lang('SurveyUndetermined');
 			}
-		}
-		else
-		{
-			//We need this variable only in the 2nd set of questions when personality is set.
+		} else {
+			// We need this variable only in the 2nd set of questions when personality is set.
 			unset($_SESSION['page_questions_sec']);
 			$paged_questions_sec=array();
 
 			// Only the questions from the basic group
-			//the 50 questions A B C D E F G
-			$order_sql= $shuffle;
-			if ($shuffle=='')
+			// the 50 questions A B C D E F G
+			$order_sql = $shuffle;
+			if ($shuffle == '') {
 				$order_sql=' BY question_id ';
+			}
 
-            if(empty($_SESSION['paged_questions']))
-            {
+            if (empty($_SESSION['paged_questions'])) {
     			$sql = "SELECT * FROM $table_survey_question
     						 WHERE 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>";
+    			//echo '<br />'; echo '<br />';
     			$result = Database::query($sql);
-    			$counter=0;
-    			while ($row = Database::fetch_array($result,'ASSOC'))
-    			{
-    				if ($survey_data['one_question_per_page']==1)
-    				{
+    			$counter = 0;
+    			while ($row = Database::fetch_array($result, 'ASSOC')) {
+    				if ($survey_data['one_question_per_page'] == 1) {
     					$paged_questions[$counter][] = $row['question_id'];
     					$counter++;
 					} else {
@@ -1087,33 +971,29 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
     				}
     			}
                 $_SESSION['paged_questions'] = $paged_questions;
-            }
-            else
-            {
+            } else {
             	$paged_questions = $_SESSION['paged_questions'];
             }
 
 			//print_r($paged_questions);
             //print_r($paged_questions);
-			//if (key_exists($_GET['show'],$paged_questions))
-			//{
-			$order_sql= $shuffle;
-			if ($shuffle=='')
+			//if (key_exists($_GET['show'], $paged_questions)) {
+			$order_sql = $shuffle;
+			if ($shuffle == '') {
 				$order_sql=' BY survey_question.sort, survey_question_option.sort ASC ';
+			}
 
-			//$val=0;
-			//if ($survey_data['one_question_per_page']==0)
-			//{
-				$val=$_GET['show'];
+			//$val = 0;
+			//if ($survey_data['one_question_per_page'] == 0) {
+				$val = $_GET['show'];
 			//}
-			//echo '<pre>';print_r($paged_questions);echo $val;
-
-			$result=null;
-			if ($val!='')
-			{
-				$imploded= implode(',', $paged_questions[$val]);
-				if ($imploded!=''){
-					// the answers are always in the same order NO shuffle
+			//echo '<pre>'; print_r($paged_questions); echo $val;
+
+			$result = null;
+			if ($val != '') {
+				$imploded = implode(',', $paged_questions[$val]);
+				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,
@@ -1128,16 +1008,13 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 					$question_counter_max = Database :: num_rows($result);
 				}
 			}
-			if (!is_null($result))
-			{
+			if (!is_null($result)) {
 				$counter = 0;
 				$limit = 0;
-				$questions = array ();
-				while ($row = Database :: fetch_array($result, 'ASSOC'))
-				{
-					// if the type is not a pagebreak we store it in the $questions array
-					if ($row['type'] <> 'pagebreak')
-					{
+				$questions = array();
+				while ($row = Database :: fetch_array($result, 'ASSOC')) {
+					// If the type is not a pagebreak we store it in the $questions array
+					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'];
@@ -1145,12 +1022,12 @@ 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'];
-						// personality params
+						// Personality params
 						$questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
 						$questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
 						$questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
 					}
-					// if the type is a pagebreak we are finished loading the questions for this page
+					// If the type is a pagebreak we are finished loading the questions for this page
 					else {
 						break;
 					}
@@ -1158,66 +1035,53 @@ if ( isset($_GET['show']) || isset($_POST['personality']))
 				}
 			}
 		}
-	}
-	else //in case it's another type than 0 or 1
-    {
+	} else { // In case it's another type than 0 or 1
         echo get_lang('ErrorSurveyTypeUnknown');
     }
 }
 
-// selecting the maximum number of pages
+// Selecting the maximum number of pages
 $sql = "SELECT * FROM $table_survey_question WHERE 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;
 
 // Displaying the form with the questions
-if (isset($_GET['show']))
-{
+if (isset($_GET['show'])) {
 	$show = (int)$_GET['show'] + 1;
-}
-else
-{
+} else {
 	$show = 0;
 }
 
 // Displaying the form with the questions
-if (isset($_POST['personality']))
-{
+if (isset($_POST['personality'])) {
 	$personality = (int)$_POST['personality'] + 1;
-}
-else
-{
-	$personality= 0;
+} else {
+	$personality = 0;
 }
 
 // Displaying the form with the questions
-$g_c = (isset($_GET['course'])?Security::remove_XSS($_GET['course']):'');
-$g_ic = (isset($_GET['invitationcode'])?Security::remove_XSS($_GET['invitationcode']):'');
-$g_cr = (isset($_GET['cidReq'])?Security::remove_XSS($_GET['cidReq']):'');
-$p_l = (isset($_POST['language'])?Security::remove_XSS($_POST['language']):'');
+$g_c = isset($_GET['course']) ? Security::remove_XSS($_GET['course']) : '';
+$g_ic = isset($_GET['invitationcode']) ? Security::remove_XSS($_GET['invitationcode']) : '';
+$g_cr = isset($_GET['cidReq']) ? Security::remove_XSS($_GET['cidReq']) : '';
+$p_l = isset($_POST['language']) ? Security::remove_XSS($_POST['language']) : '';
 
-$add_parameters=isset($_GET['user_id']) ? 'user_id='.$_GET['user_id'].'&amp;': '';
+$add_parameters = isset($_GET['user_id']) ? 'user_id='.$_GET['user_id'].'&amp;' : '';
 
 echo '<form id="question" name="question" method="post" action="' . api_get_self() .'?'.$add_parameters. 'course=' . $g_c . '&invitationcode=' . $g_ic . '&show=' . $show . '&cidReq=' . $g_cr . '">';
 echo '<input type="hidden" name="language" value="'.$p_l.'" />';
 
-if(isset($questions) && is_array($questions))
-{
-	foreach ($questions as $key=>$question)
-	{
+if (isset($questions) && is_array($questions)) {
+	foreach ($questions as $key => & $question) {
 		$ch_type = 'ch_'.$question['type'];
 		$display = new $ch_type;
 		$display->render_question($question);
 	}
 }
 
-if ($survey_data['survey_type']==='0')
-{
-	if ($survey_data['show_form_profile']==0)
-	{
-		// the normal survey as always
-		if (($show < $numberofpages) || !$_GET['show']) //$show = $_GET['show']+1
-		{
+if ($survey_data['survey_type'] === '0') {
+	if ($survey_data['show_form_profile'] == 0) {
+		// The normal survey as always
+		if (($show < $numberofpages) || !$_GET['show']) { //$show = $_GET['show'] + 1
 			//echo '<input type="submit" name="next_survey_page" value="' . get_lang('Next') . ' " class="next" />';
 			echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('NextQuestion').'</button>';
 		}
@@ -1226,125 +1090,96 @@ if ($survey_data['survey_type']==='0')
 			//echo '<input type="submit" name="finish_survey" value="' . get_lang('FinishSurvey') . '" class="next" />';
 			echo '<button type="submit" name="finish_survey" class="next">'.get_lang('FinishSurvey').'</button>';
 		}
-	}
-	else
-	{
-		// the normal survey as always but with the form profile
-		if (isset ($_GET['show']))
-		{
-			$numberofpages=count($paged_questions);
-			if (($show < $numberofpages) || !$_GET['show']) //$show = $_GET['show']+1
-			{
+	} else {
+		// The normal survey as always but with the form profile
+		if (isset($_GET['show'])) {
+			$numberofpages = count($paged_questions);
+			if (($show < $numberofpages) || !$_GET['show']) { //$show = $_GET['show'] + 1
 				//echo '<input type="submit" name="next_survey_page" value="' . get_lang('Next') . '" class="next" />';
 				echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('Next').'</button>';
 			}
 
-			if ($show >= $numberofpages && $_GET['show'] )
-			{
+			if ($show >= $numberofpages && $_GET['show'] ) {
 				//echo '<input type="submit" name="finish_survey" value="' . get_lang('FinishSurvey') . '" class="next" />';
 				echo '<button type="submit" name="finish_survey" class="next">'.get_lang('FinishSurvey').'</button>';
 			}
 		}
 	}
-
-}
-elseif ($survey_data['survey_type'] === '1') //conditional/personality-test type survey
-{
-	if (isset ($_GET['show']) || isset ($_POST['personality']))
-	{
+} elseif ($survey_data['survey_type'] === '1') { //conditional/personality-test type survey
+	if (isset($_GET['show']) || isset($_POST['personality'])) {
 		$numberofpages = count($paged_questions);
-		//echo "<br>"; echo 'num pages norma:'.$numberofpages;echo "<br>";
-		//echo '<pre>';print_r($paged_questions_sec);
-		if (!empty ($paged_questions_sec) && count($paged_questions_sec) > 0)
-		{
-			//in case we're in the second phase, also sum the second group questions
+		//echo '<br />'; echo 'num pages norma:'.$numberofpages; echo '<br />';
+		//echo '<pre>'; print_r($paged_questions_sec);
+		if (!empty ($paged_questions_sec) && count($paged_questions_sec) > 0) {
+			// In case we're in the second phase, also sum the second group questions
 			//echo 'pagesec :'.count($paged_questions_sec);
 			$numberofpages += count($paged_questions_sec);
 			//echo 'pagesec :';
-		}
-		else
-		{
-			// we need this variable only if personality ==1
+		} else {
+			// We need this variable only if personality == 1
 			unset($_SESSION['page_questions_sec']);
-			$paged_questions_sec=array();
+			$paged_questions_sec = array();
 		}
 
-		/*echo "<br>";
-		echo 'num pages:'.$numberofpages;echo "<br>";
-		echo 'show :'.$show;echo "<br>";
+		/*echo '<br />';
+		echo 'num pages:'.$numberofpages; echo '<br />';
+		echo 'show :'.$show;echo '<br />';
 		echo 'personality :'.$personality;
-		echo "<br>";
+		echo '<br />';
 		*/
-		//echo $show.' / '.$numberofpages."<br />";
-		if ($personality ==0)
-		if ( ($show <= $numberofpages) || !$_GET['show'] ) //$show = $_GET['show']+1
-		{
+		//echo $show.' / '.$numberofpages.'<br />';
+		if ($personality == 0)
+		if (($show <= $numberofpages) || !$_GET['show']) { //$show = $_GET['show'] + 1
 			//echo '<input type="submit" name="next_survey_page" value="' . get_lang('Next') . ' " class="next" />';
 			echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('Next').'</button>';
-			if ($survey_data['one_question_per_page']==0)
-			{
-				if ($personality >= 0 )
-				{
+			if ($survey_data['one_question_per_page'] == 0) {
+				if ($personality >= 0) {
 					echo '<input type="hidden" name="personality" value="' . $personality . '">';
 				}
-			}
-			else
-			{
-				if ($personality > 0 )
-				{
+			} else {
+				if ($personality > 0) {
 					echo '<input type="hidden" name="personality" value="' . $personality . '">';
 				}
 			}
 
-			if ($numberofpages == $show)
+			if ($numberofpages == $show) {
 				echo '<input type="hidden" name="personality" value="' . $personality . '">';
+			}
 		}
 
-		if ($show > $numberofpages && $_GET['show']  && $personality==0)
-		{
+		if ($show > $numberofpages && $_GET['show']  && $personality == 0) {
 			echo '<input type="hidden" name="personality" value="' . $personality . '">';
 			//$numberofpages = count($paged_questions);
 			//echo $numberofpages = count($paged_questions_sec);
 			//echo $personality.' / '.$numberofpages;
-			//echo "<br />";
+			//echo '<br />';
 			//if ($personality > count($paged_questions_sec) - 1)
 			//|| $numberofpages == $show  +$personality +1
 			//echo $show + $personality;
 			//echo $numberofpages;
-		}
-		elseif ($personality >0 )
-		{
-			if ($survey_data['one_question_per_page']==1)
-			{
-
-				if ($show >= $numberofpages)
-				{
+		} elseif ($personality > 0) {
+			if ($survey_data['one_question_per_page'] == 1) {
+				if ($show >= $numberofpages) {
 					//echo '<input type="submit" name="finish_survey" value="' . get_lang('FinishSurvey') . ' " class="next" />';
 					echo '<button type="submit" name="finish_survey" class="next">'.get_lang('FinishSurvey').'</button>';
-				}
-				else
-				{
+				} else {
 					echo '<input type="hidden" name="personality" value="' . $personality . '">';
 					//echo '<input type="submit" name="next_survey_page" value="' . get_lang('Next') . '" class="next" />';
 					echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('Next').'</button>';
 				}
-			}
-			else
-			{
+			} else {
 				// if the personality test hidden input was set.
 				//echo '<input type="submit" name="finish_survey" value="' . get_lang('FinishSurvey') . ' " class="next" />';
 				echo '<button type="submit" name="finish_survey" class="next">'.get_lang('FinishSurvey').'</button>';
 			}
 		}
 	}
-	// this is the case when the show_profile_form is true but there are not form_fields
-	elseif ($survey_data['form_fields'] == '')
-	{
+	// This is the case when the show_profile_form is true but there are not form_fields
+	elseif ($survey_data['form_fields'] == '') {
 		//echo '<input type="submit" name="next_survey_page" value="' . get_lang('Next') . ' " class="next" />';
 		echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('Next').'</button>';
-	}
-	elseif(!is_array($user_data))
-	{	// if the user is not registered in the platform we do not show the form to update his information
+	} elseif(!is_array($user_data)) {
+		// If the user is not registered in the platform we do not show the form to update his information
 		//echo '<input type="submit" name="next_survey_page" value="' . get_lang('Next') . ' " class="next" />';
 		echo '<button type="submit" name="next_survey_page" class="next">'.get_lang('Next').'</button>';
 	}
@@ -1355,9 +1190,9 @@ echo '</form>';
 Display :: display_footer();
 
 /**
- * Check if this survey has ended. If so, display message and exit rhis script
+ * Check whether this survey has ended. If so, display message and exit rhis script
  */
-function check_time_availability($surv_data){
+function check_time_availability($surv_data) {
     $start_date = mktime(0, 0, 0, substr($surv_data['start_date'], 5, 2), substr($surv_data['start_date'], 8, 2), substr($surv_data['start_date'], 0, 4));
     $end_date = mktime(0, 0, 0, substr($surv_data['end_date'], 5, 2), substr($surv_data['end_date'], 8, 2), substr($surv_data['end_date'], 0, 4));
     $cur_date = time();
@@ -1367,12 +1202,9 @@ function check_time_availability($surv_data){
         Display :: display_footer();
         exit;
     }
-    if ($cur_date > $end_date)
-    {
+    if ($cur_date > $end_date) {
         Display :: display_warning_message(get_lang('SurveyNotAvailableAnymore'), false);
         Display :: display_footer();
         exit;
     }
 }
-
-?>
diff --git a/main/survey/preview.php b/main/survey/preview.php
index e77aee34b7..b7c8f979ea 100755
--- a/main/survey/preview.php
+++ b/main/survey/preview.php
@@ -1,42 +1,24 @@
 <?php
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2004-2008 Dokeos SPRL
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 
 /**
-*	@package dokeos.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>, Dokeos: Personality Test modifications
-* 	@version $Id: survey_list.php 10680 2007-01-11 21:26:23Z pcool $
-*
-* 	@todo use quickforms for the forms
-*/
-
-// name of the language file that needs to be included
+ *	@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 modifications
+ * 	@version $Id: survey_list.php 10680 2007-01-11 21:26:23Z pcool $
+ *
+ * 	@todo use quickforms for the forms
+ */
+
+// Language file that needs to be included
 $language_file = 'survey';
 
-// including the global dokeos file
-require ('../inc/global.inc.php');
-require_once('survey.lib.php');
+// Including the global initialization file
+require '../inc/global.inc.php';
+require_once 'survey.lib.php';
 
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 // Database table definitions
 $table_survey 					= Database :: get_course_table(TABLE_SURVEY);
@@ -46,15 +28,14 @@ $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 
 // We exit here if ther is no valid $_GET parameter
-if (!isset($_GET['survey_id']) OR !is_numeric($_GET['survey_id'])){
+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();
 	exit;
 }
 
-
-// getting the survey information
+// Getting the survey information
 $survey_id = intval($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 
@@ -65,14 +46,14 @@ if (empty($survey_data)) {
 	exit;
 }
 
-$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'],ENT_QUOTES,$charset), 0, 40));
+$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 .= '...';
 }
 
-// breadcrumbs
-$interbreadcrumb[] = array ("url" => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array ("url" => "survey.php?survey_id=".$survey_id, "name" => $urlname);
+// Breadcrumbs
+$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
 
 // Header
 Display :: display_header(get_lang('SurveyPreview'));
@@ -80,38 +61,34 @@ 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);
 
-// only a course admin is allowed to preview a survey: you are NOT a course admin => error message
+// 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))
-{
+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
+// 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
 	echo '<div id="survey_title">'.$survey_data['survey_title'].'</div>';
 	echo '<div id="survey_subtitle">'.$survey_data['survey_subtitle'].'</div>';
 
-	// displaying the survey introduction
-	if (!isset($_GET['show']))
-	{
+	// Displaying the survey introduction
+	if (!isset($_GET['show'])) {
 		echo '<div id="survey_content" class="survey_content">'.$survey_data['survey_introduction'].'</div>';
 		$limit = 0;
 	}
 
-	// displaying the survey thanks message
-	if(isset($_POST['finish_survey']))
-	{
+	// Displaying the survey thanks message
+	if (isset($_POST['finish_survey'])) {
 		echo '<div id="survey_content" class="survey_content"><strong>'.get_lang('SurveyFinished').' </strong>'.$survey_data['survey_thanks'].'</div>';
 		Display :: display_footer();
 		exit;
 	}
 
-	if (isset($_GET['show']))
-	{
+	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
 		$questions_displayed = array();
@@ -122,17 +99,15 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView']=='
 				ORDER BY sort ASC";
 		$result = Database::query($sql);
 
-		while ($row = Database::fetch_array($result))
-		{
-			if($row['type'] == 'pagebreak') {
+		while ($row = Database::fetch_array($result)) {
+			if ($row['type'] == 'pagebreak') {
 				$counter++;
 			} else {
 				$paged_questions[$counter][] = $row['question_id'];
-					}
+			}
 		}
 
-		if (array_key_exists($_GET['show'], $paged_questions))
-		{
+		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
@@ -144,12 +119,10 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView']=='
 
 			$result = Database::query($sql);
 			$question_counter_max = Database::num_rows($result);
-			$limit=0;
-			while ($row = Database::fetch_array($result))
-			{
-				// if the type is not a pagebreak we store it in the $questions array
-				if($row['type'] <> 'pagebreak')
-				{
+			$limit = 0;
+			while ($row = Database::fetch_array($result)) {
+				// If the type is not a pagebreak we store it in the $questions array
+				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'];
@@ -158,46 +131,38 @@ if (api_is_course_admin() || (api_is_course_admin() && $_GET['isStudentView']=='
 					$questions[$row['sort']]['options'][intval($row['option_sort'])] = $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
-				{
+				// If the type is a pagebreak we are finished loading the questions for this page
+				else {
 					break;
 				}
 				$counter_question++;
 			}
 		}
 	}
-	// selecting the maximum number of pages
+	// Selecting the maximum number of pages
 	$sql = "SELECT * FROM $table_survey_question WHERE 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
-	if (isset($_GET['show']))
-	{
+	if (isset($_GET['show'])) {
 		$show = (int)$_GET['show'] + 1;
-	}
-	else
-	{
+	} 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(is_array($questions) && count($questions)>0)
-	{
-		foreach ($questions as $key=>$question)
-		{
+	if (is_array($questions) && count($questions) > 0) {
+		foreach ($questions as $key => & $question) {
 			$ch_type = 'ch_'.$question['type'];
 			$display = new $ch_type;
 			$display->render_question($question);
 		}
 	}
 
-	if (($show < $numberofpages) || (!$_GET['show'] && count($questions) > 0))
-	{
+	if (($show < $numberofpages) || (!$_GET['show'] && count($questions) > 0)) {
 		echo '<br /><button type="submit" name="next_survey_page" class="next">'.get_lang('NextQuestion').'   </button>';
 	}
-	if ($show >= $numberofpages && $_GET['show'] || ( isset($_GET['show']) && count($questions) == 0))
-	{
+	if ($show >= $numberofpages && $_GET['show'] || (isset($_GET['show']) && count($questions) == 0)) {
 		if (count($questions) == 0) {
 			echo '<p>'.get_lang('ThereAreNotQuestionsForthisSurvey').'</p>';
 		}
diff --git a/main/survey/question.php b/main/survey/question.php
index 883aff3aa4..7fd367f20f 100755
--- a/main/survey/question.php
+++ b/main/survey/question.php
@@ -1,66 +1,47 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
+/* For licensing terms, see /license.txt */
 
-	Copyright (c) 2008 Dokeos SPRL
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
 /**
-*	@package dokeos.survey
+*	@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
 * 	@version $Id: question.php 21734 2009-07-02 17:12:41Z cvargas1 $
 */
 
-// name of the language file that needs to be included
+// Language file that needs to be included
 $language_file = 'survey';
 
-// including the global dokeos file
-require ('../inc/global.inc.php');
+// Including the global initialization file
+require '../inc/global.inc.php';
 
-// including additional libraries
-//require_once (api_get_path(LIBRARY_PATH)."/survey.lib.php");
-require_once('survey.lib.php');
+// Including additional libraries
+//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
+require_once 'survey.lib.php';
 
 $htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 						$(document).ready( function() {
-							//Allow dokeos install in IE
 							$("button").click(function() {
 								$("#is_executable").attr("value",$(this).attr("name"));
 							});
 		 				} ); </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)) {
+if (!api_is_allowed_to_edit(false, true)) {
 	Display :: display_header();
 	Display :: display_error_message(get_lang('NotAllowed'), false);
 	Display :: display_footer();
 	exit;
 }
 
-//Is valid request
-$is_valid_request=$_REQUEST['is_executable'];
-if ($request_index<>$is_valid_request) {
-	if ($request_index=='save_question') {
+// Is valid request
+$is_valid_request = $_REQUEST['is_executable'];
+if ($request_index != $is_valid_request) {
+	if ($request_index == 'save_question') {
 		unset($_POST[$request_index]);
-	} elseif ($request_index=='add_answer') {
+	} elseif ($request_index == 'add_answer') {
 		unset($_POST[$request_index]);
-	} elseif($request_index=='remove_answer') {
+	} elseif($request_index == 'remove_answer') {
 		unset($_POST[$request_index]);
 	}
 }
@@ -72,7 +53,7 @@ $table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUEST
 $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 
-// getting the survey information
+// Getting the survey information
 $survey_data = survey_manager::get_survey($_GET['survey_id']);
 if (empty($survey_data)) {
 	Display :: display_header(get_lang('ToolSurvey'));
@@ -82,12 +63,12 @@ if (empty($survey_data)) {
 }
 
 
-$urlname = api_substr(api_html_entity_decode($survey_data['title'],ENT_QUOTES,$charset), 0, 40);
+$urlname = api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40);
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
 	$urlname .= '...';
 }
 
-if($survey_data['survey_type']==1) {
+if ($survey_data['survey_type'] == 1) {
 	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).' WHERE survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
 	$rs = Database::query($sql);
 	if(Database::num_rows($rs)===0) {
@@ -96,9 +77,9 @@ if($survey_data['survey_type']==1) {
 	}
 }
 
-// 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));
+// 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));
 
 // Tool name
 if ($_GET['action'] == 'add') {
@@ -108,34 +89,33 @@ if ($_GET['action'] == 'edit') {
 	$tool_name = get_lang('EditQuestion');
 }
 
-// the possible question types
-$possible_types = array('personality','yesno', 'multiplechoice', 'multipleresponse', 'open', 'dropdown', 'comment', 'pagebreak', 'percentage', 'score');
+// The possible question types
+$possible_types = array('personality', 'yesno', 'multiplechoice', 'multipleresponse', 'open', 'dropdown', 'comment', 'pagebreak', 'percentage', 'score');
 
-// actions
+// 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')).get_lang('BackToSurvey').'</a>';
+$actions .= '<a href="survey.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png', get_lang('BackToSurvey')).get_lang('BackToSurvey').'</a>';
 $actions .= '</div>';
-// checking if it is a valid type
-if (!in_array($_GET['type'], $possible_types))
-{
+// Checking if it is a valid type
+if (!in_array($_GET['type'], $possible_types)) {
 	Display :: display_header($tool_name,'Survey');
 	echo $actions;
 	Display :: display_error_message(get_lang('TypeDoesNotExist'), false);
 	Display :: display_footer();
 }
 
-// displaying the form for adding or editing the question
-if (empty($_POST['save_question']) && in_array($_GET['type'],$possible_types)) {
+// Displaying the form for adding or editing the question
+if (empty($_POST['save_question']) && in_array($_GET['type'], $possible_types)) {
 	if (!isset($_POST['save_question'])) {
 		// Displaying the header
-		Display::display_header($tool_name,'Survey');
+		Display::display_header($tool_name, 'Survey');
 		echo $actions;
-		$error_message='';
+		$error_message = '';
 		// Displys message if exists
 		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);
 			}
 		}
@@ -147,42 +127,41 @@ if (empty($_POST['save_question']) && in_array($_GET['type'],$possible_types)) {
 	$form_content['answers'] = array('', '');
 
 	if ($_GET['type'] == 'yesno') {
-		$form_content['answers'][0]=get_lang('Yes');
-		$form_content['answers'][1]=get_lang('No');
+		$form_content['answers'][0] = get_lang('Yes');
+		$form_content['answers'][1] = get_lang('No');
 	}
 
 	if ($_GET['type'] == 'personality') {
-		$form_content['answers'][0]=get_lang('1');
-		$form_content['answers'][1]=get_lang('2');
-		$form_content['answers'][2]=get_lang('3');
-		$form_content['answers'][3]=get_lang('4');
-		$form_content['answers'][4]=get_lang('5');
-
-		$form_content['values'][0]=0;
-		$form_content['values'][1]=0;
-		$form_content['values'][2]=1;
-		$form_content['values'][3]=2;
-		$form_content['values'][4]=3;
+		$form_content['answers'][0] = get_lang('1');
+		$form_content['answers'][1] = get_lang('2');
+		$form_content['answers'][2] = get_lang('3');
+		$form_content['answers'][3] = get_lang('4');
+		$form_content['answers'][4] = get_lang('5');
+
+		$form_content['values'][0] = 0;
+		$form_content['values'][1] = 0;
+		$form_content['values'][2] = 1;
+		$form_content['values'][3] = 2;
+		$form_content['values'][4] = 3;
 	}
 
 	// We are editing a question
-	if (isset($_GET['question_id']) AND !empty($_GET['question_id'])) {
+	if (isset($_GET['question_id']) && !empty($_GET['question_id'])) {
 		$form_content = survey_manager::get_question($_GET['question_id']);
 	}
 
-	// an action has been performed (for instance adding a possible answer, moving an answer, ...)
+	// 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);
 	}
 
-	if ($error_message!='') {
-		$form_content['question']=$_SESSION['temp_user_message'];
-		$form_content['answers']=$_SESSION['temp_answers'];
-		$form_content['values']=$_SESSION['temp_values'];
+	if ($error_message != '') {
+		$form_content['question'] = $_SESSION['temp_user_message'];
+		$form_content['answers'] = $_SESSION['temp_answers'];
+		$form_content['values'] = $_SESSION['temp_values'];
 		$form_content['horizontalvertical'] = $_SESSION['temp_horizontalvertical'];
 
-
 		unset($_SESSION['temp_user_message']);
 		unset($_SESSION['temp_answers']);
 		unset($_SESSION['temp_values']);
@@ -199,4 +178,3 @@ if (empty($_POST['save_question']) && in_array($_GET['type'],$possible_types)) {
 
 // Footer
 Display :: display_footer();
-?>
diff --git a/main/survey/reporting.php b/main/survey/reporting.php
index be823b0a23..bd664ee7ea 100755
--- a/main/survey/reporting.php
+++ b/main/survey/reporting.php
@@ -1,55 +1,31 @@
-<?php // $Id: reporting.php 21652 2009-06-27 17:07:35Z herodoto $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003 Ghent University (UGent)
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
-==============================================================================
-*/
-
-
+<?php
+/* For licensing terms, see /license.txt */
 
 /**
-*	@package dokeos.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
-* 	@version $Id: reporting.php 21652 2009-06-27 17:07:35Z herodoto $
-*
-* 	@todo The question has to be more clearly indicated (same style as when filling the survey)
-*/
-
-// name of the language file that needs to be included
+ *	@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
+ * 	@version $Id: reporting.php 21652 2009-06-27 17:07:35Z herodoto $
+ *
+ * 	@todo The question has to be more clearly indicated (same style as when filling the survey)
+ */
+
+// Language file that needs to be included
 $language_file = 'survey';
 
-// including the global dokeos file
-require ('../inc/global.inc.php');
-require_once('survey.lib.php');
-$this_section=SECTION_COURSES;
+// Including the global initialization file
+require '../inc/global.inc.php';
+require_once 'survey.lib.php';
+$this_section = SECTION_COURSES;
 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 
-
-// export
+// Export
 /**
  * @todo use export_table_csv($data, $filename = 'export')
  */
-if ($_POST['export_report'])
-{
-	switch($_POST['export_format'])
-	{
+if ($_POST['export_report']) {
+	switch($_POST['export_format']) {
 		case 'xls':
 			$survey_data = survey_manager::get_survey($survey_id);
 			$filename = 'survey_results_'.$survey_id.'.xls';
@@ -66,16 +42,12 @@ if ($_POST['export_report'])
 			header('Content-type: application/octet-stream');
 			header('Content-Type: application/force-download');
 
-			if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT']))
-			{
+			if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
 				header('Content-Disposition: filename= '.$filename);
-			}
-			else
-			{
+			} else {
 				header('Content-Disposition: attachment; filename= '.$filename);
 			}
-			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE'))
-			{
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
 				header('Pragma: ');
 				header('Cache-Control: ');
 				header('Cache-Control: public'); // IE cannot download from sessions without a cache
@@ -88,16 +60,15 @@ if ($_POST['export_report'])
 	}
 }
 
-// including additional libraries
-//require_once (api_get_path(LIBRARY_PATH)."/survey.lib.php");
-require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
+// Including additional libraries
+//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 
 // Checking the parameters
 SurveyUtil::check_parameters();
 
 /** @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))
-{
+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();
@@ -112,7 +83,7 @@ $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 $user_info 						= Database :: get_main_table(TABLE_MAIN_SURVEY_REMINDER); // TODO: To be checked. TABLE_MAIN_SURVEY_REMINDER has not been defined.
 
-// getting the survey information
+// Getting the survey information
 
 $survey_data = survey_manager::get_survey($survey_id);
 if (empty($survey_data)) {
@@ -121,24 +92,20 @@ if (empty($survey_data)) {
 	Display :: display_footer();
 	exit;
 }
-$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'],ENT_QUOTES,$charset), 0, 40));
-if (api_strlen(strip_tags($survey_data['title'])) > 40)
-{
+
+$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 .= '...';
 }
 
-// breadcrumbs
-$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
-$interbreadcrumb[] = array ('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
-if (!$_GET['action'] OR $_GET['action'] == 'overview')
-{
+// Breadcrumbs
+$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => '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'));
-	switch ($_GET['action'])
-	{
+} else {
+	$interbreadcrumb[] = array('url' => 'reporting.php?survey_id='.$survey_id, 'name' => get_lang('Reporting'));
+	switch ($_GET['action']) {
 		case 'questionreport':
 			$tool_name = get_lang('DetailedReportByQuestion');
 			break;
@@ -155,18 +122,18 @@ else
 }
 
 // Displaying the header
-Display::display_header($tool_name,'Survey');
+Display::display_header($tool_name, 'Survey');
 
 // Action handling
 SurveyUtil::handle_reporting_actions();
 
-// actions bar
+// Actions bar
 echo '<div class="actions">';
 echo '<a href="survey.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.strtolower(get_lang('Survey'))).' '.get_lang('BackTo').' '.strtolower(get_lang('Survey')).'</a>';
 echo '</div>';
 
-// content
-if (!$_GET['action'] OR $_GET['action'] == 'overview') {
+// 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>';
@@ -174,6 +141,5 @@ if (!$_GET['action'] OR $_GET['action'] == 'overview') {
 	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>';
 }
 
-
 // Footer
 Display :: display_footer();
diff --git a/main/survey/survey.download.inc.php b/main/survey/survey.download.inc.php
index 80cf894f39..7cf6553851 100755
--- a/main/survey/survey.download.inc.php
+++ b/main/survey/survey.download.inc.php
@@ -1,38 +1,22 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
-
+/* For licensing terms, see /license.txt */
 
 /**
- *	@package dokeos.survey
+ *	@package chamilo.survey
  *	@author Arnaud Ligot <arnaud@cblue.be>
  *	@version $Id: $
  *
- *	small peace code to enable user to access images included into survey
+ *	A small peace of code to enable user to access images included into survey
  *	which are accessible by non authenticated users. This file is included
  *	by document/download.php
  */
+
 function check_download_survey($course, $invitation, $doc_url) {
 
-	require_once('survey.lib.php');
-	require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
+	require_once 'survey.lib.php';
+	require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 
-	// getting all the course information
+	// Getting all the course information
 	$_course = CourseManager::get_course_information($course);
 
 	// Database table definitions
@@ -43,48 +27,37 @@ function check_download_survey($course, $invitation, $doc_url) {
 	$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 	$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION, $_course['db_name']);
 
-
-	// now we check if the invitationcode is valid
+	// Now we check if the invitationcode is valid
 	$sql = "SELECT * FROM $table_survey_invitation WHERE invitation_code = '".Database::escape_string($invitation)."'";
 	$result = Database::query($sql);
-	if (Database::num_rows($result) < 1)
-	{
+	if (Database::num_rows($result) < 1) {
 		Display :: display_error_message(get_lang('WrongInvitationCode'), false);
 		Display :: display_footer();
 		exit;
 	}
 	$survey_invitation = Database::fetch_assoc($result);
 
-	// now we check if the user already filled the survey
-	if ($survey_invitation['answered'] == 1)
-	{
+	// Now we check if the user already filled the survey
+	if ($survey_invitation['answered'] == 1) {
 		Display :: display_error_message(get_lang('YouAlreadyFilledThisSurvey'), false);
 		Display :: display_footer();
 		exit;
 	}
 
-	// very basic security check: check if a text field from a survey/answer/option contains the name of the document requested
+	// Very basic security check: check if a text field from a survey/answer/option contains the name of the document requested
 
-
-	//////////////
-	// fetch survey ID
-	//////////////
+	// Fetch survey ID
 
 	// If this is the case there will be a language choice
 	$sql = "SELECT * FROM $table_survey WHERE code='".Database::escape_string($survey_invitation['survey_code'])."'";
 	$result = Database::query($sql);
-	if (Database::num_rows($result) > 1)
-	{
-		if ($_POST['language'])
-		{
+	if (Database::num_rows($result) > 1) {
+		if ($_POST['language']) {
 			$survey_invitation['survey_id'] = $_POST['language'];
-		}
-		else
-		{
+		} else {
 			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))
-			{
+			while ($row = Database::fetch_assoc($result)) {
 				echo '<option value="'.$row['survey_id'].'">'.$row['lang'].'</option>';
 			}
 			echo '</select>';
@@ -93,12 +66,11 @@ function check_download_survey($course, $invitation, $doc_url) {
 			display::display_footer();
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		$row = Database::fetch_assoc($result);
 		$survey_invitation['survey_id'] = $row['survey_id'];
 	}
+
 	$sql = "select count(*) from $table_survey where survey_id = ".$survey_invitation['survey_id']."
 								and (
 									title LIKE '%$doc_url%'
@@ -117,15 +89,11 @@ function check_download_survey($course, $invitation, $doc_url) {
 								)";
 	$result = Database::query($sql);
 
-	if (Database::num_rows($result) == 0)
-	{
+	if (Database::num_rows($result) == 0) {
 		Display :: display_error_message(get_lang('WrongInvitationCode'), false);
 		Display :: display_footer();
 		exit;
 	}
 
-
 	return $_course;
 }
-
-?>
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 7f1730b60f..9a44beed08 100755
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -1,34 +1,16 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
+/* For licensing terms, see /license.txt */
 
-	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2006-2008	Patrick Cool
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
 /**
-*	@package dokeos.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>, Dokeos: 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)
-*/
+ *	@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)
+ */
+
 $config['survey']['debug'] = false;
 //require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
@@ -45,11 +27,11 @@ $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 	</script>';
 
 
-class survey_manager
-{
-	/******************************************************************************************************
-											SURVEY FUNCTIONS
-	 *****************************************************************************************************/
+class survey_manager {
+
+	/***
+	 * SYRVEY FUNCTIONS
+	 */
 
 	/**
 	 * This function retrieves all the survey information
@@ -65,22 +47,20 @@ class survey_manager
 	 *
 	 * @todo this is the same function as in create_new_survey.php
 	 */
-	function get_survey($survey_id,$shared=0,$course_code='')
-	{
+	function get_survey($survey_id, $shared = 0, $course_code = '') {
 		global $_course;
 
-		// table definition
-
+		// Table definition
 		if (!empty($course_code)) {
 			$my_course_id = $course_code;
 		} else if (isset($_GET['course'])) {
-			$my_course_id=Security::remove_XSS($_GET['course']);
+			$my_course_id = Security::remove_XSS($_GET['course']);
 		} else {
-			$my_course_id=api_get_course_id();
+			$my_course_id = api_get_course_id();
 		}
-		$my_course_info=api_get_course_info($my_course_id);
+		$my_course_info = api_get_course_info($my_course_id);
 		$table_survey = Database :: get_course_table(TABLE_SURVEY, $my_course_info['dbName']);
-		if ($shared<>0) {
+		if ($shared != 0) {
 			$table_survey	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
 		}
 
@@ -90,7 +70,7 @@ class survey_manager
 
 		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
+			// 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'];
@@ -107,9 +87,9 @@ class survey_manager
 			$return['show_form_profile']	= $return['show_form_profile'];
 			$return['input_name_list']		= $return['input_name_list'];
 
-			$return['shuffle'] 		= $return['shuffle'];
-			$return['parent_id'] 		= $return['parent_id'];
-			$return['survey_version'] 		= $return['survey_version'];
+			$return['shuffle']				= $return['shuffle'];
+			$return['parent_id']			= $return['parent_id'];
+			$return['survey_version']		= $return['survey_version'];
 			return $return;
 		} else {
 			return $return;
@@ -125,72 +105,60 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function store_survey($values)
-	{
+	function store_survey($values) {
 		global $_user;
 
-		// table defnitions
+		// Table defnitions
 		$table_survey 	= Database :: get_course_table(TABLE_SURVEY);
 
-		/*if ($values['survey_share']['survey_share'] !== '0')
-		{
+		/*if ($values['survey_share']['survey_share'] !== '0') {
 			$shared_survey_id = survey_manager::store_shared_survey($values);
 		}*/
-		$shared_survey_id=0;
+		$shared_survey_id = 0;
 
-		if (!$values['survey_id'] OR !is_numeric($values['survey_id']))
-		{
-			// check if the code doesn't soon exists in this language
+		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 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)
-			{
+			if (Database::num_rows($rs) > 0) {
 				$return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
 				$return['type'] = 'error';
-				$return['id']	= isset($values['survey_id']) ? $values['survey_id'] : 0;
+				$return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
 				return $return;
 			}
 
-			if ($values['anonymous']=='')
-			{
-				$values['anonymous']=0;
+			if ($values['anonymous'] == '') {
+				$values['anonymous'] = 0;
 			}
 
 			$additional['columns'] = '';
 			$additional['values'] = '';
 
-			if ($values['anonymous']==0)
-			{
-				// input_name_list
+			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;
+				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
-				{
+				} else {
 					$additional['columns'] .= ', form_fields';
 					$additional['values'] .= ",''";
 				}
-			}
-			else
-			{
-				// input_name_list
+			} else {
+				// Input_name_list
 				$additional['columns'] .= ', show_form_profile';
 				$additional['values'] .= ",'0'";
 
@@ -198,8 +166,7 @@ class survey_manager
 				$additional['values'] .= ",''";
 			}
 
-			if($values['survey_type']==1)
-			{
+			if ($values['survey_type'] == 1) {
 				$additional['columns'] .= ', survey_type';
 				$additional['values'] .= ",'1'";
 
@@ -212,45 +179,37 @@ class survey_manager
 				$additional['columns'] .= ', parent_id';
 				$additional['values'] .= ",'".Database::escape_string($values['parent_id'])."'";
 
-				// logic for versioning surveys
-				if(!empty($values['parent_id']))
-				{
+				// Logic for versioning surveys
+				if (!empty($values['parent_id'])) {
 					$additional['columns'] .= ', survey_version';
 					$sql = 'SELECT survey_version FROM '.$table_survey.' WHERE 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) {
+					if (Database::num_rows($rs) === 0) {
 						$sql = 'SELECT survey_version FROM '.$table_survey.' WHERE survey_id = '.Database::escape_string($values['parent_id']);
 						$rs = Database::query($sql);
-						$getversion = Database::fetch_array($rs,ASSOC);
-						if(empty($getversion['survey_version']))
-						{
+						$getversion = Database::fetch_array($rs, 'ASSOC');
+						if (empty($getversion['survey_version'])) {
 							$additional['values'] .= ",'".++$getversion['survey_version']."'";
-						}
-						else
-						{
+						} else {
 							$additional['values'] .= ",'".$getversion['survey_version'].".1'";
 						}
-					}
-					else
-					{
-						$row = Database::fetch_array($rs,ASSOC);
+					} else {
+						$row = Database::fetch_array($rs, 'ASSOC');
 						$pos = api_strpos($row['survey_version']);
-						if($pos===false)
-						{
-							//$new_version= substr($row['survey_version'],$pos, count())
+						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']);
+						} else {
+							$getlast = api_split('\.', $row['survey_version']);
 							$lastversion = array_pop($getlast);
 							$lastversion = $lastversion + 1;
-							$add=implode('.',$getlast);
-							if ($add!='')
+							$add = implode('.', $getlast);
+							if ($add != '') {
 								$insertnewversion = $add.'.'.$lastversion;
-							else
+							} else {
 								$insertnewversion = $lastversion;
+							}
 							$additional['values'] .= ",'".$insertnewversion."'";
 						}
 					}
@@ -258,16 +217,16 @@ class survey_manager
 			}
 			$sql = "INSERT INTO $table_survey (code, title, subtitle, author, lang, avail_from, avail_till, is_shared, template, intro, surveythanks, creation_date, anonymous".$additional['columns'].", session_id) VALUES (
 						'".Database::escape_string(strtolower(generate_course_code(api_substr($values['survey_code'],0))))."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_title'])),COURSEMANAGERLOWSECURITY))."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_subtitle'])),COURSEMANAGERLOWSECURITY))."',
+						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_title'])), COURSEMANAGERLOWSECURITY))."',
+						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_subtitle'])), COURSEMANAGERLOWSECURITY))."',
 						'".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)."',
 						'".Database::escape_string('template')."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_introduction'])),COURSEMANAGERLOWSECURITY))."',
-						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_thanks'])),COURSEMANAGERLOWSECURITY))."',
+						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_introduction'])), COURSEMANAGERLOWSECURITY))."',
+						'".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['survey_thanks'])), COURSEMANAGERLOWSECURITY))."',
 						'".date('Y-m-d H:i:s')."',
 						'".Database::escape_string($values['anonymous'])."'".$additional['values'].",
 						".intval($_SESSION['id_session'])."
@@ -275,11 +234,11 @@ class survey_manager
 			$result = Database::query($sql);
 			$survey_id = Database::insert_id();
 			if ($survey_id > 0) {
-				//insert into item_property
+				// 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'])){
+			if ($values['survey_type'] == 1 && !empty($values['parent_id'])) {
 				survey_manager::copy_survey($values['parent_id'],$survey_id);
 			}
 
@@ -287,61 +246,49 @@ class survey_manager
 			//$return['message'] .= '<a href="survey.php?survey_id='.$survey_id.'">'.get_lang('ClickHere').'</a>';
 			$return['message'] = 'SurveyCreatedSuccesfully';
 			$return['type'] = 'confirmation';
-			$return['id']	= $survey_id;
-		}
-		else
-		{
+			$return['id'] = $survey_id;
 
-			// check if the code doesn't soon exists in this language
+		} else {
+
+			// Check whether the code doesn't soon exists in this language
 			$sql = 'SELECT 1 FROM '.$table_survey.' WHERE 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)
-			{
+			if (Database::num_rows($rs) > 0) {
 				$return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
 				$return['type'] = 'error';
-				$return['id']	= isset($values['survey_id']) ? $values['survey_id'] : 0;
+				$return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
 				return $return;
 			}
 
-			if ($values['anonymous']=='')
-			{
-				$values['anonymous']=0;
+			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)
-			{
-
+			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;
+				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
-				{
+				} else {
 					$additionalsets .= ", form_fields = '' ";
 				}
-			}
-			else
-			{
+			} else {
 				$additionalsets .= ", show_form_profile = '0'";
 				$additionalsets .= ", form_fields = '' ";
 			}
 
-
 			$sql = "UPDATE $table_survey SET
 							title 			= '".Database::escape_string($values['survey_title'])."',
 							subtitle 		= '".Database::escape_string($values['survey_subtitle'])."',
@@ -357,7 +304,7 @@ class survey_manager
 					WHERE survey_id = '".Database::escape_string($values['survey_id'])."'";
 			$result = Database::query($sql);
 
-			//update into item_property (update)
+			// Update into item_property (update)
 			api_item_property_update(api_get_course_info(), TOOL_SURVEY, Database::escape_string($values['survey_id']), 'SurveyUpdated', api_get_user_id());
 
 			//$return['message'] = get_lang('SurveyUpdatedSuccesfully').'<br />'.get_lang('YouCanNowAddQuestionToYourSurvey').': ';
@@ -368,7 +315,7 @@ class survey_manager
 			$return['id']	= $values['survey_id'];
 		}
 
-	return $return;
+		return $return;
 	}
 
 	/**
@@ -380,16 +327,13 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function store_shared_survey($values)
-	{
-		global $_user;
-		global $_course;
+	function store_shared_survey($values) {
+		global $_user, $_course;
 
-		// table defnitions
+		// Table defnitions
 		$table_survey	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
 
-		if (!$values['survey_id'] OR !is_numeric($values['survey_id']) OR $values['survey_share']['survey_share'] == 'true')
-		{
+		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'])."',
@@ -403,9 +347,7 @@ class survey_manager
 						'".$_course['id']."')";
 			$result = Database::query($sql);
 			$return	= Database::insert_id();
-		}
-		else
-		{
+		} else {
 			$sql = "UPDATE $table_survey SET
 							code 			= '".Database::escape_string($values['survey_code'])."',
 							title 			= '".Database::escape_string($values['survey_title'])."',
@@ -431,56 +373,55 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function delete_survey($survey_id, $shared=false, $course_code = '')
-	{
+	function delete_survey($survey_id, $shared=false, $course_code = '') {
 		// Database table definitions
-		$table_survey 		= Database :: get_course_table(TABLE_SURVEY,$course_code);
-		$table_survey_question_group = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP,$course_code);
-		if ($shared)
-		{
-			$table_survey 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
+		$table_survey = Database :: get_course_table(TABLE_SURVEY,$course_code);
+		$table_survey_question_group = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP, $course_code);
+		if ($shared) {
+			$table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
 		}
 
-		// deleting the survey
+		// Deleting the survey
 		$sql = "DELETE from $table_survey WHERE survey_id='".Database::escape_string($survey_id)."'";
 		$res = Database::query($sql);
 
-		// deleting groups of this survey
+		// Deleting groups of this survey
 		$sql = "DELETE from $table_survey_question_group WHERE survey_id='".Database::escape_string($survey_id)."'";
 		$res = Database::query($sql);
 
-		// deleting the questions of the survey
+		// Deleting the questions of the survey
 		survey_manager::delete_all_survey_questions($survey_id, $shared);
 
-		//update into item_property (delete)
+		// Update into item_property (delete)
 		api_item_property_update(api_get_course_info(), TOOL_SURVEY, Database::escape_string($survey_id), 'delete', api_get_user_id());
 
 		return true;
 	}
 
-	function copy_survey($parent_survey, $new_survey_id)
-	{
+	function copy_survey($parent_survey, $new_survey_id) {
 		// Database table definitions
-		$table_survey 		= Database :: get_course_table(TABLE_SURVEY);
+		$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
+		// Get groups
 		$sql = "SELECT * from $table_survey_question_group WHERE survey_id='".$parent_survey."'";
 		$res = Database::query($sql);
-		if(Database::num_rows($res)===0) return true;
+		if (Database::num_rows($res) === 0) {
+			return true;
+		}
 
-		while($row = Database::fetch_array($res,ASSOC)){
+		while($row = Database::fetch_array($res, 'ASSOC')){
 			$sql1 = 'INSERT INTO '.$table_survey_question_group.' (name,description,survey_id) VALUES (\''.Database::escape_string($row['name']).'\',\''.Database::escape_string($row['description']).'\',\''.$new_survey_id.'\')';
 			$res1 = Database::query($sql1);
 			$group_id[$row['id']] = Database::insert_id();
 		}
 
-		//get questions
+		// Get questions
 		$sql = "SELECT * FROM $table_survey_question WHERE survey_id='".$parent_survey."'";
 		$res = Database::query($sql);
-		while($row = Database::fetch_array($res,ASSOC)){
+		while($row = Database::fetch_array($res, 'ASSOC')){
 			$sql2 = 'INSERT INTO '.$table_survey_question.' (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 '.
 			'(\''.$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']].'\')';
@@ -488,10 +429,10 @@ class survey_manager
 			$question_id[$row['question_id']] = Database::insert_id();
 		}
 
-		//get questions options
+		// Get questions options
 		$sql = "SELECT * FROM $table_survey_options WHERE  survey_id='".$parent_survey."'";
 		$res = Database::query($sql);
-		while($row = Database::fetch_array($res,ASSOC)){
+		while($row = Database::fetch_array($res ,'ASSOC')){
 			$sql3 = 'INSERT INTO '.$table_survey_options.' (question_id,survey_id,option_text,sort,value) VALUES ('.
 			"'".$question_id[$row['question_id']]."','".$new_survey_id."','".Database::escape_string($row['option_text'])."','".$row['sort']."','".$row['value']."')";
 			$res3 = Database::query($sql3);
@@ -508,17 +449,15 @@ class survey_manager
 	 * @author Eric Marguin <e.marguin@elixir-interactive.com>, Elixir Interactive
 	 * @version October 2007
 	 */
-	function empty_survey($survey_id)
-	{
+	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);
 
 		$datas = survey_manager::get_survey($survey_id);
-		$session_where='';
-		if (api_get_session_id()!=0)
-		{
+		$session_where = '';
+		if (api_get_session_id() != 0) {
 			$session_where = ' AND session_id = "'.api_get_session_id().'" ';
 		}
 
@@ -543,23 +482,22 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function update_survey_answered($survey_id, $user, $survey_code)
-	{
+	function update_survey_answered($survey_id, $user, $survey_code) {
 		global $_course;
 
 		// Database table definitions
 		$table_survey 				= Database :: get_course_table(TABLE_SURVEY, $_course['db_name']);
 		$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION, $_course['db_name']);
 
-		// getting a list with all the people who have filled the survey
+		// Getting a list with all the people who have filled the survey
 		$people_filled = survey_manager::get_people_who_filled_survey($survey_id);
 		$number = count($people_filled);
 
-		// storing this value in the survey table
+		// Storing this value in the survey table
 		$sql = "UPDATE $table_survey SET answered = '".Database::escape_string($number)."' WHERE survey_id = '".Database::escape_string($survey_id)."'";
 		$res = Database::query($sql);
 
-		// storing that the user has finished the survey.
+		// Storing that the user has finished the survey.
 		$sql = "UPDATE $table_survey_invitation SET answered='1' WHERE session_id='".api_get_session_id()."' AND user='".Database::escape_string($user)."' AND survey_code='".Database::escape_string($survey_code)."'";
 		$res = Database::query($sql);
 	}
@@ -575,28 +513,25 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function get_complete_survey_structure($survey_id, $shared=0)
-	{
+	function get_complete_survey_structure($survey_id, $shared = 0) {
 		// 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);
 
-		if ($shared<>0)
-		{
+		if ($shared != 0) {
 			$table_survey 					= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
 			$table_survey_question 			= Database :: get_course_table(TABLE_SHARED_SURVEY_QUESTION);
 			$table_survey_question_option 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
 		}
 
 		$structure = survey_manager::get_survey($survey_id, $shared);
-
 		$structure['questions'] = survey_manager::get_questions($survey_id);
 	}
 
-	/******************************************************************************************************
-										SURVEY QUESTION FUNCTIONS
-	 *****************************************************************************************************/
+	/***
+	 * SYRVEY QUESTION FUNCTIONS
+	 */
 
 	/**
 	 * This function return the "icon" of the question type
@@ -604,32 +539,27 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function icon_question($type)
-	{
+	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))
-		{
+		$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
-		{
+		} else {
 			return false;
 		}
 	}
@@ -645,49 +575,42 @@ class survey_manager
 	 *
 	 * @todo one sql call should do the trick
 	 */
-	function get_question($question_id, $shared=false)
-	{
-		// table definitions
+	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);
-		if ($shared)
-		{
+		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);
 		}
 
-		// getting the information of the question
+		// Getting the information of the question
 		$sql = "SELECT * FROM $tbl_survey_question WHERE question_id='".Database::escape_string($question_id)."' ORDER BY `sort`";
 		$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['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
-   		{
+   		} else {
  	 		$return['assigned1'] = $row['survey_group_sec1'];
   			$return['assigned2'] = $row['survey_group_sec2'];
 	 		$return['choose'] = 2;
   		}
 
-	    // getting the information of the question options
+		// Getting the information of the question options
 		$sql = "SELECT * FROM $table_survey_question_option WHERE question_id='".Database::escape_string($question_id)."' ORDER BY `sort` ";
 		$result = Database::query($sql);
-		while ($row = Database::fetch_array($result,'ASSOC'))
-		{
+		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) */
@@ -696,7 +619,6 @@ class survey_manager
 		return $return;
 	}
 
-
 	/**
 	 * This function gets all the question of any given survey
 	 *
@@ -708,32 +630,29 @@ class survey_manager
 	 *
 	 * @todo one sql call should do the trick
 	 */
-	function get_questions($survey_id)
-	{
-		// table definitions
+	function get_questions($survey_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
+		// Getting the information of the question
 		$sql = "SELECT * FROM $tbl_survey_question WHERE survey_id='".Database::escape_string($survey_id)."'";
 		$result = Database::query($sql);
-		while ($row = Database::fetch_array($result,'ASSOC'))
-		{
+		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[$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'];
 
 		}
 
-	    // getting the information of the question options
+		// Getting the information of the question options
 		$sql = "SELECT * FROM $table_survey_question_option WHERE survey_id='".Database::escape_string($survey_id)."'";
 		$result = Database::query($sql);
-		while ($row = Database::fetch_array($result,'ASSOC'))
-		{
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
 			$return[$row['question_id']]['answers'][] = $row['option_text'];
 		}
 
@@ -750,91 +669,75 @@ class survey_manager
 	 * @version January 2007
 	 */
 
-	function save_question($form_content)
-	{
+	function save_question($form_content) {
 		global $survey_data;
 
-		if (strlen($form_content['question'])>1)
-		{		//checks lenght of the question
-			$empty_answer=false;
+		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']))
-				{
+			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']))
-				{
+				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;
+			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;
+			if ($form_content['type'] == 'score') {
+				if (strlen($form_content['maximum_score']) < 1) {
+					$empty_answer = true;
 				}
 			}
 			$additional = array();
-			if (!$empty_answer)
-			{
+			if (!$empty_answer) {
 				global $_course;
-				// table definitions
+				// Table definitions
 				$table_survey 			= Database :: get_course_table(TABLE_SURVEY, $_course['db_name']);
 				$tbl_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION, $_course['db_name']);
 
-				// getting all the information of the survey
+				// 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']) AND $survey_data['survey_share'] <> 0)
-				{
+				// 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'] == '' OR !is_numeric($form_content['question_id']))
-				{
-					// finding the max sort order of the questions in the given survey
+				// 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 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
+					// Some variables defined for survey-test type
 					$additional['column'] = '';
 					$additional['value'] = '';
 
-					if($_POST['choose']==1)
-					{
+					if ($_POST['choose'] == 1) {
 						$additional['column'] = ',survey_group_pri';
 						$additional['value'] = ",'".Database::escape_string($_POST['assigned'])."'";
-					}
-					elseif($_POST['choose']==2)
-					{
+					} 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
+					// Adding the question to the survey_question table
 					$sql = "INSERT INTO $tbl_survey_question (survey_id,survey_question,survey_question_comment,type,display, sort, shared_question_id, max_value".$additional['column'].") VALUES (
 								'".Database::escape_string($form_content['survey_id'])."',
 								'".Database::escape_string($form_content['question'])."',
@@ -851,23 +754,20 @@ class survey_manager
 					$form_content['question_id'] = $question_id;
 					$return_message = 'QuestionAdded';
 				}
-				// updating an existing question
-				else
-				{
+				// Updating an existing question
+				else {
 					$additionalsets = '';
 
-					if($_POST['choose']==1)
-					{
+					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)
-					{
+					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
+					// 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'])."',
@@ -878,17 +778,13 @@ class survey_manager
 					$result = Database::query($sql);
 					$return_message = 'QuestionUpdated';
 				}
-				// storing the options of the question
+				// Storing the options of the question
 				$message_options=survey_manager::save_question_options($form_content, $survey_data);
+			} else {
+				$return_message = 'PleasFillAllAnswer';
 			}
-			else
-			{
-				$return_message='PleasFillAllAnswer';
-			}
-		}
-		else
-		{
-			$return_message='PleaseEnterAQuestion';
+		} else {
+			$return_message = 'PleaseEnterAQuestion';
 		}
 		return $return_message;
 	}
@@ -904,17 +800,15 @@ class survey_manager
 	 *
 	 * @todo editing of a shared question
 	 */
-	function save_shared_question($form_content, $survey_data)
-	{
+	function save_shared_question($form_content, $survey_data) {
 		global $_course;
 
-			// table definitions
+			// Table definitions
 			$tbl_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
 
-			// storing a new question
-			if ($form_content['shared_question_id'] == '' OR !is_numeric($form_content['shared_question_id']))
-			{
-				// finding the max sort order of the questions in the given survey
+			// 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'])."'";
@@ -922,7 +816,7 @@ class survey_manager
 				$row = Database::fetch_array($result,'ASSOC');
 				$max_sort = $row['max_sort'];
 
-				// adding the question to the survey_question table
+				// 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'])."',
@@ -934,9 +828,8 @@ class survey_manager
 				$result = Database::query($sql);
 				$shared_question_id = Database::insert_id();
 			}
-			// updating an existing question
-			else
-			{
+			// Updating an existing question
+			else {
 				// adding the question to the survey_question table
 				$sql = "UPDATE $tbl_survey_question SET
 							survey_question = '".Database::escape_string($form_content['question'])."',
@@ -961,34 +854,28 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function move_survey_question($direction, $survey_question_id, $survey_id)
-	{
-		// table definition
+	function move_survey_question($direction, $survey_question_id, $survey_id) {
+		// Table definition
 		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
 
-		if ($direction == 'moveup')
-		{
+		if ($direction == 'moveup') {
 			$sort = 'DESC';
 		}
-		if ($direction == 'movedown')
-		{
+		if ($direction == 'movedown') {
 			$sort = 'ASC';
 		}
 
-		// finding the two questions that needs to be swapped
+		// Finding the two questions that needs to be swapped
 		$sql = "SELECT * FROM $table_survey_question WHERE 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 == true)
-			{
+		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)
-			{
+			if ($row['question_id'] == $survey_question_id) {
 				$found = true;
 				$question_id_one = $row['question_id'];
 				$question_sort_one = $row['sort'];
@@ -1012,27 +899,24 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function delete_all_survey_questions($survey_id, $shared=false)
-	{
-		// table definitions
+	function delete_all_survey_questions($survey_id, $shared = false) {
+		// Table definitions
 		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
-		if ($shared)
-		{
+		if ($shared) {
 			$table_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
 		}
 
-		// deleting the survey questions
+		// Deleting the survey questions
 		$sql = "DELETE from $table_survey_question WHERE survey_id='".Database::escape_string($survey_id)."'";
 		$res = Database::query($sql);
 
-		// deleting all the options of the questions of the survey
+		// 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
+		// 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
 	 *
@@ -1045,21 +929,18 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version March 2007
 	 */
-	function delete_survey_question($survey_id, $question_id, $shared=false)
-	{
-		// table definitions
+	function delete_survey_question($survey_id, $question_id, $shared = false) {
+		// Table definitions
 		$table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
-		if ($shared)
-		{
+		if ($shared) {
 			survey_manager::delete_shared_survey_question($survey_id, $question_id);
 		}
 
-		// deleting the survey questions
+		// Deleting the survey questions
 		$sql = "DELETE from $table_survey_question WHERE 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
+		// Deleting the options of the question of the survey
 		survey_manager::delete_survey_question_option($survey_id, $question_id, $shared);
 	}
 
@@ -1074,27 +955,26 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version March 2007
 	 */
-	function delete_shared_survey_question($survey_id, $question_id)
-	{
-		// table definitions
+	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
+		// First we have to get the shared_question_id
 		$question_data = survey_manager::get_question($question_id);
 
-		// deleting the survey questions
+		// 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
+		// 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
-	 *****************************************************************************************************/
+	/**
+	 * SURVEY QUESTION OPTIONS FUNCTIONS
+	 */
 
 	/**
 	 * This function stores the options of the questions in the table
@@ -1106,38 +986,31 @@ class survey_manager
 	 *
 	 * @todo writing the update statement when editing a question
 	 */
-	function save_question_options($form_content, $survey_data)
-	{
-		// a percentage question type has options 1 -> 100
-		if ($form_content['type'] == 'percentage')
-		{
-			for($i=1;$i<101;$i++)
-			{
+	function save_question_options($form_content, $survey_data) {
+		// 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']) AND $survey_data['survey_share'] <> 0)
-		{
+		if (is_numeric($survey_data['survey_share']) && $survey_data['survey_share'] != 0) {
 			survey_manager::save_shared_question_options($form_content, $survey_data);
 		}
 
-		// table defintion
+		// Table defintion
 		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
-		// 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']))
-		{
+		// 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 question_id = '".Database::escape_string($form_content['question_id'])."'";
 			$result = Database::query($sql);
 		}
 
-		$counter=1;
-		if(is_array($form_content['answers']))
-		{
-			//foreach ($form_content['answers'] as $key=>$answer)			{
-			for ($i=0;$i<count($form_content['answers']);$i++)
-			{
+		$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 (question_id, survey_id, option_text, value,sort) VALUES (
 								'".Database::escape_string($form_content['question_id'])."',
 								'".Database::escape_string($form_content['survey_id'])."',
@@ -1147,7 +1020,6 @@ class survey_manager
 				$result = Database::query($sql);
 				$counter++;
 			}
-
 		}
 	}
 
@@ -1162,21 +1034,18 @@ class survey_manager
 	 *
 	 * @todo writing the update statement when editing a question
 	 */
-	function save_shared_question_options($form_content, $survey_data)
-	{
-		if (is_array($form_content) && is_array($form_content['answers']))
-		{
-			// table defintion
+	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
+			// 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)
-			{
+			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'])."',
@@ -1189,8 +1058,7 @@ class survey_manager
 	}
 
 	/*
-		if (is_numeric($survey_data['survey_share']) AND $survey_data['survey_share'] <> 0)
-		{
+		if (is_numeric($survey_data['survey_share']) AND $survey_data['survey_share'] != 0) {
 			$form_content = survey_manager::save_shared_question($form_content, $survey_data);
 		}
 	*/
@@ -1206,22 +1074,19 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function delete_all_survey_questions_options($survey_id, $shared=false)
-	{
-		// table definitions
+	function delete_all_survey_questions_options($survey_id, $shared = false) {
+		// Table definitions
 		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-		if ($shared)
-		{
+		if ($shared) {
 			$table_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
 		}
 
-		// deleting the options of the survey questions
+		// Deleting the options of the survey questions
 		$sql = "DELETE from $table_survey_question_option WHERE survey_id='".Database::escape_string($survey_id)."'";
 		$res = Database::query($sql);
 		return true;
 	}
 
-
 	/**
 	 * This function deletes the options of a given question
 	 *
@@ -1233,27 +1098,22 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version March 2007
 	 */
-	function delete_survey_question_option($survey_id, $question_id, $shared=false)
-	{
-		// table definitions
+	function delete_survey_question_option($survey_id, $question_id, $shared = false) {
+		// Table definitions
 		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-		if ($shared)
-		{
+		if ($shared) {
 			$table_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
 		}
 
-		// deleting the options of the survey questions
+		// Deleting the options of the survey questions
 		$sql = "DELETE from $table_survey_question_option WHERE survey_id='".Database::escape_string($survey_id)."' AND question_id='".Database::escape_string($question_id)."'";
 		$res = Database::query($sql);
 		return true;
 	}
 
-
-
-	/******************************************************************************************************
-									SURVEY ANSWERS FUNCTIONS
-	 *****************************************************************************************************/
-
+	/**
+	 * SURVEY ANSWERS FUNCTIONS
+	 */
 
 	/**
 	 * This function deletes all the answers anyone has given on this survey
@@ -1268,7 +1128,7 @@ class survey_manager
 	 * @version January 2007,december 2008
 	 */
 	function delete_all_survey_answers($survey_id) {
-		$table_survey_answer 	= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+		$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
 		Database::query('DELETE FROM '.$table_survey_answer.' WHERE survey_id='.$survey_id);
 		return true;
 	}
@@ -1282,22 +1142,20 @@ class survey_manager
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function get_people_who_filled_survey($survey_id, $all_user_info = false)
-	{
+	function get_people_who_filled_survey($survey_id, $all_user_info = false) {
 		global $_course;
 
 		// Database table definition
 		$table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER, $_course['db_name']);
 		$table_user					= Database :: get_main_table('user');
 
-		// variable initialisation
+		// Variable initialisation
 		$return = array();
 
-		// getting the survey information
+		// Getting the survey information
 		$survey_data = survey_manager::get_survey($survey_id);
 
-		if ($all_user_info)
-		{
+		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
@@ -1305,20 +1163,14 @@ class survey_manager
 							ON answered_user.user = user.user_id
 						WHERE survey_id= '".Database::escape_string($survey_data['survey_id'])."'".
                         $order_clause;
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT DISTINCT user FROM $table_survey_answer WHERE survey_id= '".Database::escape_string($survey_data['survey_id'])."'";
 		}
 		$res = Database::query($sql);
-		while ($row = Database::fetch_array($res,'ASSOC'))
-		{
-			if ($all_user_info)
-			{
+		while ($row = Database::fetch_array($res, 'ASSOC')) {
+			if ($all_user_info) {
 				$return[] = $row;
-			}
-			else
-			{
+			} else {
 				$return[] = $row['user'];
 			}
 		}
@@ -1328,16 +1180,11 @@ class survey_manager
 }
 
 
-class survey_question
-{
-	// the html code of the form
+class survey_question {
+
+	// The html code of the form
 	public $html;
 
-	/**
-	 * This function does the generic part of any survey question: the question field
-	 *
-	 * @return unknown
-	 */
 	/**
 	 * This function does the generic part of any survey question: the question field
 	 *
@@ -1347,13 +1194,12 @@ class survey_question
 	 * @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)
-	{
-		global $charset;
+	function create_form($form_content) {
+
 		global $survey_data;
 
 		//$tool_name = '<img src="../img/'.survey_manager::icon_question($_GET['type']).'" alt="'.get_lang(ucfirst($_GET['type'])).'" title="'.get_lang(ucfirst($_GET['type'])).'" />';
-		$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')).' ';
+		$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');
 		}
@@ -1382,12 +1228,10 @@ class survey_question
 		$this->html .= '			<span class="form_required">*</span> '.get_lang('Question');
 		$this->html .= '		</div>';
 		$this->html .= '		<div class="formw">';
-		$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 .= 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>';
 
-
-
 		/*
 		$this->html .= '	<tr>';
 		$this->html .= '		<td><label for="question_comment">'.get_lang('QuestionComment').'</label></td>';
@@ -1400,34 +1244,37 @@ class survey_question
 
 		//$this->html .='	<tr><td colspan="">&nbsp;</td></tr>';
 
-		if($survey_data['survey_type']==1) {
+		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)) {
+			while($row = Database::fetch_array($rs, 'NUM')) {
 				$glist .= '<option value="'.$row[0].'" >'.$row[1].'</option>';
 			}
 
 			$grouplist = $grouplist1 = $grouplist2 = $glist;
 
-			if(!empty($form_content['assigned']))
+			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']))
+			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']))
+			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="">
+			$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':'').
+			'.'<input type="radio" name="choose" value="1" '.(($form_content['choose'] == 1) ? 'checked' : '').
 			'><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> '.
@@ -1446,17 +1293,16 @@ class survey_question
 	 * @version January 2007
 	 *
 	 */
-	function render_form()
-	{
-		if(isset($_GET['question_id']) and !empty($_GET['question_id'])) {
-			$class="save";
-			$text=get_lang('ModifyQuestionSurvey');
+	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');
+			$class = 'add';
+			$text = get_lang('CreateQuestionSurvey');
 		}
 
-		if ($_GET['type']=='yesno' || $_GET['type']=='open'|| $_GET['type']=='percentage' || $_GET['type']=='comment' || $_GET['type']=='pagebreak') {
+		if ($_GET['type'] == 'yesno' || $_GET['type'] == 'open'|| $_GET['type'] == 'percentage' || $_GET['type'] == 'comment' || $_GET['type'] == 'pagebreak') {
 			$this->html .= '	<div class="row">';
 			$this->html .= '		<div class="label">';
 			$this->html .= '		</div>';
@@ -1466,7 +1312,7 @@ class survey_question
 		$this->html .= '		</div>';
 		$this->html .= '	</div>';
 
-		//$this->html .='	</table>';
+		//$this->html .= '	</table>';
 
 		$this->html .= '</form>';
 		echo $this->html;
@@ -1480,52 +1326,45 @@ class survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function handle_action($form_content)
-	{
+	function handle_action($form_content) {
 		global $config;
 
-		// moving an answer up
-		if ($_POST['move_up'])
-		{
-			foreach ($_POST['move_up'] as $key=>$value)
-			{
+		// 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;
+				$id2		= $key - 1;
 				$content2	= $form_content['answers'][$id2];
 				$form_content['answers'][$id1] = $content2;
 				$form_content['answers'][$id2] = $content1;
 			}
 		}
 
-		// moving an answer down
-		if ($_POST['move_down'])
-		{
-			foreach ($_POST['move_down'] as $key=>$value)
-			{
+		// 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;
+				$id2		= $key + 1;
 				$content2	= $form_content['answers'][$id2];
 				$form_content['answers'][$id1] = $content2;
 				$form_content['answers'][$id2] = $content1;
 			}
 		}
 
-		// adding an answer
-		if(isset($_POST['add_answer']))
-		{
-			$form_content['answers'][]='';
+		// Adding an answer
+		if (isset($_POST['add_answer'])) {
+			$form_content['answers'][] = '';
 		}
 
-		// removing an answer
-		if(isset($_POST['remove_answer']))
-		{
+		// Removing an answer
+		if (isset($_POST['remove_answer'])) {
 			$max_answer = count($form_content['answers']);
-			unset($form_content['answers'][$max_answer-1]);
+			unset($form_content['answers'][$max_answer - 1]);
 		}
 
-		// saving a question
+		// Saving a question
 		if (isset($_POST['save_question'])) {
 			$message = survey_manager::save_question($form_content);
 
@@ -1541,12 +1380,12 @@ class survey_question
 					exit();
 				}
 			} else {
-				if ($message == 'PleaseEnterAQuestion' || $message=='PleasFillAllAnswer'|| $message=='PleaseChooseACondition'|| $message=='ChooseDifferentCategories') {
-					$_SESSION['temp_user_message']=$form_content['question'];
+				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'];
+					$_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='.Security::remove_XSS($_GET['question_id']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&action='.Security::remove_XSS($_GET['action']).'&type='.Security::remove_XSS($_GET['type']).'');
 				}
 			}
@@ -1555,24 +1394,19 @@ class survey_question
 		/**
 		 * 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)
-			{
+		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];
+			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;
-
 	}
 
 	/**
@@ -1584,10 +1418,8 @@ class survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function add_remove_buttons($form_content)
-	{
-		if (count($form_content['answers'])<=2)
-		{
+	function add_remove_buttons($form_content) {
+		if (count($form_content['answers']) <= 2) {
 			$remove_answer_attribute = 'disabled="disabled"';
 		}
 
@@ -1604,30 +1436,28 @@ class survey_question
 
 
 	/**
-	 * render the question. In this case this starts with the form tag
+	 * 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)
-	{
+	function render_question($form_content) {
 		$this->html = '<form id="question" name="question" method="post" action="'.api_get_self().'?survey_id='.Security::remove_XSS($_GET['survey_id']).'">';
 		echo $this->html;
 	}
 }
 
-class ch_yesno extends survey_question
-{
+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)
-	{
+	function create_form($form_content) {
 		$this->html = parent::create_form($form_content);
 		// Horizontal or vertical
 		$this->html .= '	<div class="row">';
@@ -1636,16 +1466,15 @@ class ch_yesno extends survey_question
 		$this->html .= '		</div>';
 		$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"';
-						}
+		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 .= '		  <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>';
 
@@ -1673,8 +1502,6 @@ class ch_yesno extends survey_question
 		$this->html .= '			</table>';
 		$this->html .= '		</div>';
 		$this->html .= '	</div>';
-
-
 	}
 
 	/**
@@ -1685,22 +1512,18 @@ class ch_yesno extends survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function render_question($form_content, $answers=array())
-	{
+	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) {
 				$this->html .= '<label><input name="question'.$form_content['question_id'].'" type="radio" value="'.$key.'"';
-				if (is_array($answers))
-				{
-					if (in_array($key,$answers))
-					{
+				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 (substr_count($value, '<p>') == 1) {
+					$this->html .= '/>'.substr($value, 3, (strlen($value) - 7)).'</label>';
 					if ($form_content['display'] == 'vertical') {
 						$this->html .= '<br />';
 					}
@@ -1719,17 +1542,15 @@ class ch_yesno extends survey_question
 
 }
 
-class ch_multiplechoice extends survey_question
-{
+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)
-	{
-		global $charset;
+	function create_form($form_content) {
 
 		$this->html = parent::create_form($form_content);
 		// Horizontal or vertical
@@ -1739,16 +1560,15 @@ class ch_multiplechoice extends survey_question
 		$this->html .= '		</div>';
 		$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"';
-						}
+		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 .= '		  <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>';
 
@@ -1760,12 +1580,12 @@ class ch_multiplechoice extends survey_question
 		$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) {
+		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, $charset), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</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" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
@@ -1786,8 +1606,6 @@ class ch_multiplechoice extends survey_question
 		$this->html .= '	</div>';
 
 		$this->html .= parent :: add_remove_buttons($form_content);
-
-
 	}
 
 	/**
@@ -1800,24 +1618,21 @@ class ch_multiplechoice extends survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function render_question($form_content, $answers=array())
-	{
+	function render_question($form_content, $answers = array()) {
 		$question = new ch_yesno();
 		$question->render_question($form_content, $answers);
 	}
 }
 
+class ch_personality extends survey_question {
 
-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)
-	{
+	function create_form($form_content) {
 		$this->html = parent::create_form($form_content);
 		$this->html .= '	<tr>';
 		$this->html .= '		<td colspan="2"><strong>'.get_lang('DisplayAnswersHorVert').'</strong></td>';
@@ -1827,21 +1642,21 @@ class ch_personality extends survey_question
 		$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']) or $form_content['horizontalvertical'] == 'horizontal') {
-							$this->html .= 'checked="checked"';
-						}
+		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 .= '		  <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 .= ' />'.get_lang('Vertical').'</label>';
+		$this->html .= '		</td>';
 		$this->html .= '		<td>&nbsp;</td>';
 		$this->html .= '	</tr>';
-		$this->html .='		<tr>
+		$this->html .= '		<tr>
 								<td colspan="">&nbsp;</td>
 							</tr>';
 
@@ -1851,39 +1666,34 @@ class ch_personality extends survey_question
 		$this->html .= '	</tr>';
 		$total_number_of_answers = count($form_content['answers']);
 
+		$question_values = array();
 
-		$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) {
+		// 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) {
+		$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 ($total_number_of_answers > 2) {
+					$this->html .= $question_values[$count];
 				}
 
-				if ($key<$total_number_of_answers-1)
-				{
+				if ($key < $total_number_of_answers - 1) {
 					$this->html .= '		<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 				}
-				if ($key>0)
-				{
+				if ($key > 0) {
 					$this->html .= '		<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 				}
-				if ($total_number_of_answers> 2)
-				{
+				if ($total_number_of_answers > 2) {
 					$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 				}
 				$this->html .= ' 		</td>';
@@ -1903,26 +1713,21 @@ class ch_personality extends survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function render_question($form_content, $answers=array())
-	{
+	function render_question($form_content, $answers = array()) {
 		$question = new ch_yesno();
 		$question->render_question($form_content, $answers);
 	}
 }
 
+class ch_multipleresponse extends survey_question {
 
-
-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)
-	{
-		global $charset;
+	function create_form($form_content) {
 
 		$this->html = parent::create_form($form_content);
 		// Horizontal or vertical
@@ -1932,20 +1737,18 @@ class ch_multipleresponse extends survey_question
 		$this->html .= '		</div>';
 		$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"';
-						}
+		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 .= '		  <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 .= '		<div class="label">';
@@ -1954,22 +1757,22 @@ class ch_multipleresponse extends survey_question
 		$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) {
+		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 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, $charset), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</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) {
+				if ($key<$total_number_of_answers - 1) {
 					$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 				}
 
-				if ($key>0) {
+				if ($key > 0) {
 					$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 				}
 
-				if ($total_number_of_answers> 2) {
+				if ($total_number_of_answers > 2) {
 					$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 				}
 				$this->html .= ' 		</td>';
@@ -1991,20 +1794,16 @@ class ch_multipleresponse extends survey_question
 	 * @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)
-		{
+	function render_question($form_content, $answers = array()) {
+		foreach ($form_content['options'] as $key => & $value) {
 			$this->html .= '<label><input name="question'.$form_content['question_id'].'[]" type="checkbox" value="'.$key.'"';
-			if (is_array($answers))
-			{
-				if (in_array($key,$answers))
-				{
+			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 (substr_count($value, '<p>') == 1) {
+				$this->html .= '/>'.substr($value, 3, (strlen($value) - 7)).'</label>';
 				if ($form_content['display'] == 'vertical') {
 					$this->html .= '<br />';
 				}
@@ -2021,17 +1820,15 @@ class ch_multipleresponse extends survey_question
 	}
 }
 
-class ch_dropdown extends survey_question
-{
+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)
-	{
-		global $charset;
+	function create_form($form_content) {
 
 		$this->html = parent::create_form($form_content);
 		// The answers
@@ -2042,22 +1839,18 @@ class ch_dropdown extends survey_question
 		$this->html .= '		<div class="formw">';
 		$total_number_of_answers = count($form_content['answers']);
 		$this->html .= ' 			<table>';
-		foreach ($form_content['answers'] as $key=>$value)
-		{
+		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(api_htmlentities($form_content['answers'][$key], ENT_QUOTES, $charset)).'" /></td>';
+			$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)
-			{
+			if ($key < $total_number_of_answers - 1) {
 				$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 			}
-			if ($key>0)
-			{
+			if ($key > 0) {
 				$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 			}
-			if ($total_number_of_answers> 2)
-			{
+			if ($total_number_of_answers> 2) {
 				$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 			}
 			$this->html .= ' 		</td>';
@@ -2078,16 +1871,11 @@ class ch_dropdown extends survey_question
 	 * @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)
-		{
+	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))
-				{
+			if (is_array($answers)) {
+				if (in_array($key, $answers)) {
 					$this->html .= 'selected="selected"';
 				}
 			}
@@ -2103,14 +1891,14 @@ class ch_dropdown extends survey_question
 		echo '</div>';
 		echo '</div>';
 		/*
-    		<option value="test">test</option>
+			<option value="test">test</option>
 		*/
 	}
 }
 
 
-class ch_open extends survey_question
-{
+class ch_open extends survey_question {
+
 	/**
 	 * This function creates the form elements for the open questions
 	 *
@@ -2120,8 +1908,7 @@ class ch_open extends survey_question
 	 * @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)
-	{
+	function create_form($form_content) {
 		$this->html = parent::create_form($form_content);
 	}
 
@@ -2133,17 +1920,13 @@ class ch_open extends survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function render_question($form_content, $answers=array())
-	{
+	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
-		{
+		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>';
@@ -2153,8 +1936,8 @@ class ch_open extends survey_question
 }
 
 
-class ch_comment extends survey_question
-{
+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
@@ -2164,12 +1947,10 @@ class ch_comment extends survey_question
 	 *
 	 * @param array $form_content
 	 */
-	function create_form($form_content)
-	{
+	function create_form($form_content) {
 		$this->html = parent::create_form($form_content);
 	}
 
-
 	/**
 	 * Render the comment "question" type
 	 *
@@ -2178,8 +1959,7 @@ class ch_comment extends survey_question
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function render_question($form_content)
-	{
+	function render_question($form_content) {
 		echo '<div class="survey_question_wrapper">';
 		echo '<div class="survey_question">'.$form_content['survey_question'].'</div>';
 		echo '</div>';
@@ -2187,8 +1967,9 @@ class ch_comment extends survey_question
 	}
 }
 
-class ch_pagebreak extends survey_question
-{
+
+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
@@ -2198,29 +1979,24 @@ class ch_pagebreak extends survey_question
 	 *
 	 * @param array $form_content
 	 */
-	function create_form($form_content)
-	{
+	function create_form($form_content) {
 		$this->html = parent::create_form($form_content);
 	}
 }
 
-class ch_percentage extends survey_question
-{
-	function create_form($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 render_question($form_content, $answers = array()) {
 		$this->html .= '<option value="--">--</option>';
-		foreach ($form_content['options'] as $key=>$value)
-		{
+		foreach ($form_content['options'] as $key => & $value) {
 			$this->html .= '<option value="'.$key.'" ';
-			if (is_array($answers))
-			{
-				if (in_array($key,$answers))
-				{
+			if (is_array($answers)) {
+				if (in_array($key, $answers)) {
 					$this->html .= 'selected="selected"';
 				}
 			}
@@ -2238,12 +2014,11 @@ class ch_percentage extends survey_question
 }
 
 
-class ch_score extends survey_question
-{
-	function create_form($form_content)
-	{
+class ch_score extends survey_question {
+
+	function create_form($form_content) {
 		$this->html = parent::create_form($form_content);
-		// the maximum score that can be given
+		// The maximum score that can be given
 		$this->html .= '	<div class="row">';
 		$this->html .= '		<div class="label">';
 		$this->html .= '			<span class="form_required">*</span>'.get_lang('MaximumScore');
@@ -2253,7 +2028,6 @@ class ch_score extends survey_question
 		$this->html .= '		</div>';
 		$this->html .= '	</div>';
 
-
 		// The answers
 		$this->html .= '	<div class="row">';
 		$this->html .= '		<div class="label">';
@@ -2262,23 +2036,19 @@ class ch_score extends survey_question
 		$this->html .= '		<div class="formw">';
 		$total_number_of_answers = count($form_content['answers']);
 		$this->html .= ' 			<table>';
-		foreach ($form_content['answers'] as $key=>$value)
-		{
+		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)
-			{
+			if ($key<$total_number_of_answers - 1) {
 				$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 			}
-			if ($key>0)
-			{
+			if ($key > 0) {
 				$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 			}
-			if ($total_number_of_answers> 2)
-			{
+			if ($total_number_of_answers > 2) {
 				$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 			}
 			$this->html .= ' 		</td>';
@@ -2291,8 +2061,7 @@ class ch_score extends survey_question
 		$this->html .= parent :: add_remove_buttons($form_content);
 	}
 
-	function render_question($form_content, $answers=array())
-	{
+	function render_question($form_content, $answers = array()) {
 		/*
 		echo '<div style="border: 1px solid red;">';
 		echo '<pre>';
@@ -2300,18 +2069,15 @@ class ch_score extends survey_question
 		echo '</pre></div>';
 		*/
 		$this->html = '<table>';
-		foreach ($form_content['options'] as $key=>$value)
-		{
+		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++)
-			{
+			for ($i=1; $i <= $form_content['maximum_score']; $i++) {
 				$this->html .= '<option value="'.$i.'"';
-				if ($answers[$key] == $i)
-				{
+				if ($answers[$key] == $i) {
 					$this->html .= 'selected="selected" ';
 				}
 				$this->html .= '>'.$i.'</option>';
@@ -2332,11 +2098,13 @@ class ch_score extends survey_question
 	}
 }
 
+
 /**
  * This class offers a series of general utility functions for survey querying and display
- * @package dokeos.survey
+ * @package chamilo.survey
  */
 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
@@ -2344,39 +2112,35 @@ class SurveyUtil {
 	 * @param	boolean	Optional. Whether to continue the current process or exit when breaking condition found. Defaults to true (do not break).
 	 * @return	void
 	 */
-	function check_first_last_question($survey_id, $continue=true)
-	{
-		// table definitions
+	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);
 
-		// getting the information of the question
+		// Getting the information of the question
 		$sql = "SELECT * FROM $tbl_survey_question WHERE survey_id='".Database::escape_string($survey_id)."' ORDER BY sort ASC";
 		$result = Database::query($sql);
 		$total = Database::num_rows($result);
-		$counter=1;
+		$counter = 1;
 		$error = false;
-		while ($row = Database::fetch_array($result,'ASSOC'))
-		{
-			if ($counter == 1 AND $row['type'] == 'pagebreak')
-			{
+		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 AND $row['type'] == 'pagebreak')
-			{
+			if ($counter == $total && $row['type'] == 'pagebreak') {
 				Display::display_error_message(get_lang('PagebreakNotLast'), false);
 				$error = true;
 			}
 			$counter++;
 		}
 
-		if (!$continue AND $error)
-		{
+		if (!$continue && $error) {
 			Display::display_footer();
 			exit;
 		}
 	}
+
 	/**
 	 * This function removes an (or multiple) answer(s) of a user on a question of a survey
 	 *
@@ -2388,8 +2152,7 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function remove_answer($user, $survey_id, $question_id)
-	{
+	function remove_answer($user, $survey_id, $question_id) {
 		global $_course;
 		// table definition
 		$table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER, $_course['db_name']);
@@ -2399,6 +2162,7 @@ class SurveyUtil {
 				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
 	 *
@@ -2412,23 +2176,18 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function store_answer($user, $survey_id, $question_id, $option_id, $option_value, $survey_data)
-	{
-		global $_course;
-		global $types;
-		// table definition
-		$table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER, $_course['db_name']);
+	function store_answer($user, $survey_id, $question_id, $option_id, $option_value, $survey_data) {
+		global $_course, $types;
 
-		// make the survey anonymous
-		if ($survey_data['anonymous'] == 1)
-		{
-			if (!$_SESSION['surveyuser'])
-			{
+		// Table definition
+		$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER, $_course['db_name']);
+
+		// Make the survey anonymous
+		if ($survey_data['anonymous'] == 1) {
+			if (!$_SESSION['surveyuser']) {
 				$user = md5($user.time());
 				$_SESSION['surveyuser'] = $user;
-			}
-			else
-			{
+			} else {
 				$user = $_SESSION['surveyuser'];
 			}
 		}
@@ -2441,6 +2200,7 @@ class SurveyUtil {
 				)";
 		$result = Database::query($sql);
 	}
+
 	/**
 	 * This function checks the parameters that are used in this page
 	 *
@@ -2448,76 +2208,59 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function check_parameters()
-	{
+	function check_parameters() {
 		$error = false;
 
-		// getting the survey data
+		// Getting the survey data
 		$survey_data = survey_manager::get_survey($_GET['survey_id']);
 
 		// $_GET['survey_id'] has to be numeric
-		if (!is_numeric($_GET['survey_id']))
-		{
+		if (!is_numeric($_GET['survey_id'])) {
 			$error = get_lang('IllegalSurveyId');
 		}
 
 		// $_GET['action']
 		$allowed_actions = array('overview', 'questionreport', 'userreport', 'comparativereport', 'completereport','deleteuserreport');
-		if (isset($_GET['action']) AND !in_array($_GET['action'], $allowed_actions))
-		{
+		if (isset($_GET['action']) && !in_array($_GET['action'], $allowed_actions)) {
 			$error = get_lang('ActionNotAllowed');
 		}
 
-		// user report
-		if ($_GET['action'] == 'userreport')
-		{
+		// User report
+		if ($_GET['action'] == 'userreport') {
 			global $people_filled;
-			if ($survey_data['anonymous'] == 0)
-			{
+			if ($survey_data['anonymous'] == 0) {
 				$people_filled_full_data = true;
-			}
-			else
-			{
+			} 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'];
+			if ($survey_data['anonymous'] == 0) {
+				foreach ($people_filled as $key => & $value) {
+					$people_filled_userids[] = $value['invited_user'];
 				}
-			}
-			else
-			{
+			} else {
 				$people_filled_userids = $people_filled;
 			}
 
-			if (isset($_GET['user']) AND !in_array($_GET['user'], $people_filled_userids))
-			{
+			if (isset($_GET['user']) && !in_array($_GET['user'], $people_filled_userids)) {
 				$error = get_lang('UnknowUser');
 			}
 		}
 
-		// question report
-		if ($_GET['action'] == 'questionreport')
-		{
-			if (isset($_GET['question'])AND !is_numeric($_GET['question']))
-			{
+		// Question report
+		if ($_GET['action'] == 'questionreport') {
+			if (isset($_GET['question']) && !is_numeric($_GET['question'])) {
 				$error = get_lang('UnknowQuestion');
 			}
 		}
 
-		if ($error)
-		{
+		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
-		{
+		} else {
 			return true;
 		}
 	}
@@ -2528,43 +2271,35 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function handle_reporting_actions()
-	{
-		// getting the number of question
+	function handle_reporting_actions() {
+		// 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)
+		// 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' AND $value['type']<>'pagebreak')
-			{
-				$questions_data[$value['sort']]=$value;
+		foreach ($my_temp_questions_data as $key => & $value) {
+			if ($value['type'] != 'comment' && $value['type'] != 'pagebreak') {
+				$questions_data[$value['sort']] = $value;
 			}
 		}
 
-		// counting the number of questions that are relevant for the reporting
+		// Counting the number of questions that are relevant for the reporting
 		$survey_data['number_of_questions'] = count($questions_data);
 
-		if ($_GET['action'] == 'questionreport')
-		{
+		if ($_GET['action'] == 'questionreport') {
 			SurveyUtil::display_question_report($survey_data);
 		}
-		if ($_GET['action'] == 'userreport')
-		{
+		if ($_GET['action'] == 'userreport') {
 			SurveyUtil::display_user_report();
 		}
-		if ($_GET['action'] == 'comparativereport')
-		{
+		if ($_GET['action'] == 'comparativereport') {
 			SurveyUtil::display_comparative_report();
 		}
-		if ($_GET['action'] == 'completereport')
-		{
+		if ($_GET['action'] == 'completereport') {
 			SurveyUtil::display_complete_report();
 		}
-		if ($_GET['action'] == 'deleteuserreport')
-		{
-			SurveyUtil::delete_user_report($_GET['survey_id'],$_GET['user']);
+		if ($_GET['action'] == 'deleteuserreport') {
+			SurveyUtil::delete_user_report($_GET['survey_id'], $_GET['user']);
 			//SurveyUtil::display_user_report(); //Could work but looks a bit clunky
 		}
 	}
@@ -2577,7 +2312,7 @@ class SurveyUtil {
 	 * @author Christian Fasanando Flores <christian.fasanando@dokeos.com>
 	 * @version November 2008
 	 */
-	function delete_user_report($survey_id,$user_id) {
+	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);
@@ -2590,14 +2325,13 @@ class SurveyUtil {
 			$sql = "UPDATE $table_survey_invitation SET answered = '0' WHERE survey_code = (SELECT code FROM $table_survey WHERE survey_id = '".(int)$survey_id."') AND user = '".(int)$user_id."'";
 			$result = Database::query($sql);
 		}
-		if($result !== false) {
+		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);
 		}
 	}
 
-
 	/**
 	 * 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.
@@ -2606,8 +2340,7 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007 - Updated March 2008
 	 */
-	function display_user_report()
-	{
+	function display_user_report() {
 		global $people_filled, $survey_data;
 
 		// Database table definitions
@@ -2615,15 +2348,15 @@ class SurveyUtil {
 		$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 		$table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
 
-		// actions bar
+		// 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')).' '.get_lang('BackTo').' '.get_lang('ReportingOverview').'</a>';
-		if (isset($_GET['user']))
-		{
-			// the delete link
+		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.gif', get_lang('Delete')).' '.get_lang('DeleteSurveyByUser').'</a>';
 
-			// export the user report
+			// Export the user report
 			echo '<a href="javascript: void(0);" onclick="document.form1a.submit();">'.Display::return_icon('csv.gif', get_lang('ExportAsCSV')).' '.get_lang('ExportAsCSV').'</a> ';
 			echo '<a href="javascript: void(0);" onclick="document.form1b.submit();">'.Display::return_icon('excel.gif', get_lang('ExportAsXLS')).' '.get_lang('ExportAsXLS').'</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']).'">';
@@ -2638,8 +2371,8 @@ class SurveyUtil {
 		}
 		echo '</div>';
 
-		// step 1: selection of the user
-		echo "<script language=\"JavaScript\" type=\"text/JavaScript\">
+		// Step 1: selection of the user
+		echo "<script language=\"JavaScript\" type=\"text/javascript\">
 		<!--
 		function jumpMenu(targ,selObj,restore)
 		{
@@ -2652,37 +2385,32 @@ class SurveyUtil {
 		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)
-		{
+		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 == ''){
+				if ($id == '') {
 					$id = $person['invited_user'];
 					$name = $person['invited_user'];
 				}
-			}
-			else
-			{
-				$name  = $key+1;
-				$id = $person;
+			} 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 ($_GET['user'] == $id)
-			{
+			if ($_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']))
-		{
+		// 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
+			// 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
@@ -2691,10 +2419,8 @@ class SurveyUtil {
 					WHERE survey_question.survey_id = '".Database::escape_string($_GET['survey_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')
-				{
+			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'];
@@ -2705,35 +2431,27 @@ class SurveyUtil {
 				}
 			}
 
-			// getting all the answers of the user
+			// Getting all the answers of the user
 			$sql = "SELECT * FROM $table_survey_answer WHERE 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'))
-			{
+			while ($row = Database::fetch_array($result, 'ASSOC')) {
 				$answers[$row['question_id']][] = $row['option_id'];
 				$all_answers[$row['question_id']][] = $row;
 			}
-			// displaying all the questions
+			// 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)
-						{
+			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
-				{
+				} else {
 					$second_parameter = $answers[$question['question_id']];
-					if ($question['type'] == 'open')
-					{
+					if ($question['type'] == 'open') {
 						$second_parameter = array();
 						$second_parameter[] = $all_answers[$question['question_id']][0]['option_id'];
 					}
@@ -2764,20 +2482,16 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007 - Updated March 2008
 	 */
-	function display_question_report($survey_data)
-	{
+	function display_question_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);
 
-		// determining the offset of the sql statement (the n-th question of the survey)
-		if (!isset($_GET['question']))
-		{
+		// Determining the offset of the sql statement (the n-th question of the survey)
+		if (!isset($_GET['question'])) {
 			$offset = 0;
-		}
-		else
-		{
+		} else {
 			$offset = Database::escape_string($_GET['question']);
 		}
 
@@ -2786,18 +2500,13 @@ class SurveyUtil {
 
 		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)
-				{
+			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
-				{
+				} else {
 					echo $i;
 				}
-				if ($i < $survey_data['number_of_questions'])
-				{
+				if ($i < $survey_data['number_of_questions']) {
 					echo ' | ';
 				}
 			}
@@ -2809,70 +2518,51 @@ class SurveyUtil {
 			$question = Database::fetch_array($result);
 
 			// Navigate through the questions (next and previous)
-			if ($_GET['question'] != 0)
-			{
+			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
-			{
+			} 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))
-			{
+			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
-			{
+			} else {
 				echo get_lang('NextQuestion').' '.Display::return_icon('action_next.png', get_lang('NextQuestion'), array('align' => 'middle'));
 			}
 		}
 		echo '</div>';
 
 		echo $question['survey_question'];
-
 		echo '<br />';
 
-
-
-
-		if ($question['type'] == 'score')
-		{
-			/** @todo this function should return the options as this is needed further in the code */
+		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 */
+		} elseif ($question['type'] == 'open') {
+			/** @todo Also get the user who has answered this */
 			$sql = "SELECT * FROM $table_survey_answer WHERE 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))
-			{
+			while ($row = Database::fetch_array($result)) {
 				echo $row['option_id'].'<hr noshade="noshade" size="1" />';
 			}
-
-		}
-		else
-		{
-			// getting the options
+		} else {
+			// Getting the options
 			$sql = "SELECT * FROM $table_survey_question_option
 						WHERE 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))
-			{
+			while ($row = Database::fetch_array($result)) {
 				$options[$row['question_option_id']] = $row;
 			}
-			// getting the answers
+			// Getting the answers
 			$sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
 						WHERE 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))
-			{
+			while ($row = Database::fetch_array($result)) {
 				$number_of_answers += $row['total'];
 				$data[$row['option_id']] = $row;
 			}
@@ -2889,18 +2579,13 @@ class SurveyUtil {
 			echo '		<th>'.get_lang('VisualRepresentation').'</th>';
 			echo '	<tr>';
 
-
-			// displaying the table: the content
-			if(is_array($options)){
-				foreach ($options as $key=>$value)
-				{
+			// Displaying the table: the content
+			if (is_array($options)) {
+				foreach ($options as $key => & $value) {
 					$absolute_number = $data[$value['question_option_id']]['total'];
-					if($number_of_answers == 0)
-					{
+					if ($number_of_answers == 0) {
 						$answers_number = 0;
-					}
-					else
-					{
+					} else {
 						$answers_number = $absolute_number/$number_of_answers*100;
 					}
 					echo '	<tr>';
@@ -2909,8 +2594,7 @@ class SurveyUtil {
 					echo '		<td align="right">'.round($answers_number, 2).' %</td>';
 					echo '		<td align="right">';
 					$size = $answers_number*2;
-					if ($size > 0)
-					{
+					if ($size > 0) {
 						echo '<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
 					}
 					echo '		</td>';
@@ -2928,59 +2612,54 @@ class SurveyUtil {
 			echo '</table>';
 		}
 
-		if (isset($_GET['viewoption']))
-		{
+		if (isset($_GET['viewoption'])) {
 			echo get_lang('PeopleWhoAnswered').': '.$options[Security::remove_XSS($_GET['viewoption'])]['option_text'].'<br />';
 
-			if (is_numeric($_GET['value']))
-			{
+			if (is_numeric($_GET['value'])) {
 				$sql_restriction = "AND value='".Database::escape_string($_GET['value'])."'";
 			}
 
 			$sql = "SELECT user FROM $table_survey_answer WHERE option_id = '".Database::escape_string($_GET['viewoption'])."' $sql_restriction";
 			$result = Database::query($sql);
-			while ($row = Database::fetch_array($result))
-			{
+			while ($row = Database::fetch_array($result)) {
 				echo '<a href="reporting.php?action=userreport&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user='.$row['user'].'">'.$row['user'].'</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)
-	{
+	function display_question_report_score($survey_data, $question, $offset) {
 		// 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 the options
+		// Getting the options
 		$sql = "SELECT * FROM $table_survey_question_option
 					WHERE 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))
-		{
+		while ($row = Database::fetch_array($result)) {
 			$options[$row['question_option_id']] = $row;
 		}
 
-		// getting the answers
+		// Getting the answers
 		$sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
 					WHERE 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))
-		{
+		while ($row = Database::fetch_array($result)) {
 			$number_of_answers += $row['total'];
 			$data[$row['option_id']][$row['value']] = $row;
 		}
-		// displaying the table: headers
+		// Displaying the table: headers
 		echo '<table>';
 		echo '	<tr>';
 		echo '		<th>&nbsp;</th>';
@@ -2989,13 +2668,10 @@ class SurveyUtil {
 		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++)
-			{
+		// 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>';
@@ -3003,24 +2679,23 @@ class SurveyUtil {
 				echo '		<td>'.round($absolute_number/$number_of_answers*100, 2).' %</td>';
 				echo '		<td>';
 				$size = ($absolute_number/$number_of_answers*100*2);
-				if ($size > 0)
-				{
+				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>';
+		// 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>';
+		echo '</table>';
 	}
 
 	/**
@@ -3030,23 +2705,20 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function display_complete_report()
-	{
+	function display_complete_report() {
 		// 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
+		// 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')).' '.get_lang('BackTo').' '.get_lang('ReportingOverview').'</a>';
 		echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1a.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
 		echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1b.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif">&nbsp;'.get_lang('ExportAsXLS').'</a>';
 		echo '</div>';
 
-
-
-		// the form
+		// 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">';
@@ -3057,27 +2729,23 @@ class SurveyUtil {
 		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
+		// The table
 		echo '<br /><table class="data_table" border="1">';
-		// getting the number of options per question
+		// Getting the number of options per question
 		echo '	<tr>';
 		echo '		<th>';
-		if ($_POST['submit_question_filter'] OR $_POST['export_report'])
-		{
+		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'] OR $_POST['export_report']) OR !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);
+		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);
 			$num = count($extra_user_fields);
-			if($num > 0)
-			{
+			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');
@@ -3096,19 +2764,16 @@ class SurveyUtil {
 				GROUP BY q.question_id
 				ORDER BY q.sort ASC";
 		$result = Database::query($sql);
-		while ($row = Database::fetch_array($result))
-		{
-			// we show the questions if
+		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']  OR $_POST['export_report']) OR in_array($row['question_id'], $_POST['questions_filter']))
-			if (!($_POST['submit_question_filter']) OR (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' AND $row['type'] <> 'pagebreak')
-				{
+			//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';
-					if ($row['number_of_options'] >0)
-					{
+					if ($row['number_of_options'] > 0) {
 						echo ' colspan="'.$row['number_of_options'].'"';
 					}
 					echo '>';
@@ -3118,20 +2783,18 @@ class SurveyUtil {
 					echo '</label>';
 					echo '</th>';
 				}
-				//no column at all if it's not a question
+				// No column at all if it's not a question
 			}
 			$questions[$row['question_id']] = $row;
 		}
 		echo '	</tr>';
-		// getting all the questions and options
+		// Getting all the questions and options
 		echo '	<tr>';
 		echo '		<th>&nbsp;</th>'; // the user column
 
-		if (!($_POST['submit_question_filter'] OR $_POST['export_report']) OR !empty($_POST['fields_filter']))
-		{
+		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)
-			{
+			foreach($extra_user_fields as & $field) {
 				echo '<th>'.$field[3].'</th>';
 			}
 		}
@@ -3147,56 +2810,49 @@ class SurveyUtil {
 				ORDER BY sq.sort ASC, sqo.sort ASC";
 		$result = Database::query($sql);
 
-			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'] OR $_POST['export_report']) OR in_array($row['question_id'], $_POST['questions_filter']))
-				if (!($_POST['submit_question_filter']) OR (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' AND $row['type'] <> 'pagebreak' AND $row['type'] <> 'open')
-					{
-						echo '			<th>';
-						echo $row['option_text'];
-						echo '</th>';
-						$possible_answers[$row['question_id']][$row['question_option_id']] =$row['question_option_id'];
-					}
-					//no column at all if the question was not a question
+		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']))) {
+				// We do not show comment and pagebreak question types
+				if ($row['type'] != 'comment' && $row['type'] != 'pagebreak' && $row['type'] != 'open') {
+					echo '			<th>';
+					echo $row['option_text'];
+					echo '</th>';
+					$possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
 				}
+				// No column at all if the question was not a question
 			}
+		}
 
 		echo '	</tr>';
 
-		// getting all the answers of the users
-		$old_user='';
+		// Getting all the answers of the users
+		$old_user = '';
 		$answers_of_user = array();
 		$sql = "SELECT * FROM $table_survey_answer WHERE 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'] AND $old_user<>'')
-			{
+		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')
-			{
+			if ($questions[$row['question_id']]['type'] != 'open') {
 				$answers_of_user[$row['question_id']][$row['option_id']] = $row;
-			}
-			else
-			{
+			} 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
+		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>';
 	}
 
-
 	/**
 	 * This function displays a row (= a user and his/her answers) in the table of the complete report.
 	 *
@@ -3207,69 +2863,48 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007 - Updated March 2008
 	 */
-	function display_complete_report_row($possible_options, $answers_of_user, $user, $questions, $display_extra_user_fields=false)
-	{
+	function display_complete_report_row($possible_options, $answers_of_user, $user, $questions, $display_extra_user_fields = false) {
 		global $survey_data;
 
 		$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
 		echo '<tr>';
-		if ($survey_data['anonymous'] == 0)
-		{
-			if(intval($user)!==0)
-			{
+		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))
-				{
+				if ($row = Database::fetch_array($rs)) {
 					$user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
-				}
-				else
-				{
+				} 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
-			{
+			} else {
 				echo '		<th>'.$user.'</th>'; // the user column
 			}
-		}
-		else
-		{
+		} 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);
-			foreach($user_fields_values as $value)
-			{
+		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);
+			foreach ($user_fields_values as & $value) {
 				echo '<td align="center">'.$value.'</td>';
 			}
 		}
-		if(is_array($possible_options)) {
-			foreach ($possible_options as $question_id=>$possible_option)
-			{
-				if ($questions[$question_id]['type'] == 'open')
-				{
+		if (is_array($possible_options)) {
+			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)
-					{
+				} else {
+					foreach ($possible_option as $option_id => & $value) {
 						echo '<td align="center">';
-						if (!empty($answers_of_user[$question_id][$option_id]))
-						{
-							if ($answers_of_user[$question_id][$option_id]['value']<>0)
-							{
+						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
-							{
+							} else {
 								echo 'v';
 							}
 						}
@@ -3281,7 +2916,6 @@ class SurveyUtil {
 		echo '</tr>';
 	}
 
-
 	/**
 	 * Quite similar to display_complete_report(), returns an HTML string
 	 * that can be used in a csv file
@@ -3290,26 +2924,23 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function export_complete_report($user_id=0)
-	{
-		global $charset;
+	function export_complete_report($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);
 
-		// the first column
+		// 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)
 		$display_extra_user_fields = false;
-		if (!($_POST['submit_question_filter'] OR $_POST['export_report']) OR !empty($_POST['fields_filter']))
-		{
+		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);
+			$extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false);
 			$num = count($extra_user_fields);
-			$return .= str_repeat(';',$num);
+			$return .= str_repeat(';', $num);
 			$display_extra_user_fields = true;
 		}
 
@@ -3321,25 +2952,18 @@ class SurveyUtil {
 				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
+		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']) OR (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' AND $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, $charset)).';';
-					}
-					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, $charset)).';';
+			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)).';';
 						}
 					}
 				}
@@ -3347,16 +2971,14 @@ class SurveyUtil {
 		}
 		$return .= "\n";
 
-		// getting all the questions and options
+		// Getting all the questions and options
 		$return .= ';';
 
-		//show extra field values
-		if (!($_POST['submit_question_filter'] OR $_POST['export_report']) OR !empty($_POST['fields_filter']))
-		{
-			//show the fields names for user fields
-			foreach($extra_user_fields as $field)
-			{
-				$return .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
+		// Show extra field values
+		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) {
+				$return .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES)).'";';
 			}
 		}
 
@@ -3370,61 +2992,51 @@ class SurveyUtil {
 		$result = Database::query($sql);
 		$possible_answers = array();
 		$possible_answers_type = array();
-		while ($row = Database::fetch_array($result))
-		{
-			// we show the options if
+		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']) OR (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' AND $row['type'] <> 'pagebreak')
-				{
+			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, $charset).';';
-					$possible_answers[$row['question_id']][$row['question_option_id']] =$row['question_option_id'];
+					$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='';
+		// Getting all the answers of the users
+		$old_user = '';
 		$answers_of_user = array();
 		$sql = "SELECT * FROM $table_survey_answer WHERE survey_id='".Database::escape_string($_GET['survey_id'])."'";
-		if ($user_id<>0)
-		{
+		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'] AND $old_user <> '')
-			{
+		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, $display_extra_user_fields);
 				$answers_of_user=array();
 			}
-			if($possible_answers_type[$row['question_id']] == 'open')
-			{
+			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
-			{
+			} 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, $display_extra_user_fields); // this is to display the last user
+		$return .= SurveyUtil::export_complete_report_row($possible_answers, $answers_of_user, $old_user, $display_extra_user_fields); // This is to display the last user
 		return $return;
 	}
 
-
 	/**
 	 * Add a line to the csv file
 	 *
@@ -3436,74 +3048,50 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function export_complete_report_row($possible_options, $answers_of_user, $user, $display_extra_user_fields=false)
-	{
-		global $charset;
+	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)
-			{
+		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))
-				{
+				if ($row = Database::fetch_array($rs)) {
 					$user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
-				}
-				else
-				{
+				} 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
+			} else {
+				//echo '		<th>'.$user.'</th>'; // The user column
 				$return .= $user.';';
 			}
-		}
-		else
-		{
-			$return .= '-;'; // the user column
+		} else {
+			$return .= '-;'; // The user column
 		}
 
-		if($display_extra_user_fields)
-		{
-			//show user fields data, if any, for this user
+		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);
-			foreach($user_fields_values as $value)
-			{
-				$return .= '"'.str_replace('"','""', api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
+			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];
+		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, $charset)).'"';
-						}
-						elseif (!empty($answers_of_user[$question_id][$option_id]))
-						{
+						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)
-							{
+							if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
 								$return .= $answers_of_user[$question_id][$option_id]['value'];
-							}
-							else
-							{
+							} else {
 								$return .= 'v';
 							}
 						}
@@ -3515,6 +3103,7 @@ class SurveyUtil {
 		$return .= "\n";
 		return $return;
 	}
+
 	/**
 	 * Quite similar to display_complete_report(), returns an HTML string
 	 * that can be used in a csv file
@@ -3523,29 +3112,25 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function export_complete_report_xls($filename, $user_id=0)
-	{
-		global $charset;
+	function export_complete_report_xls($filename, $user_id = 0) {
 
-		require_once(api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php');
+		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);
 		$worksheet =& $workbook->addWorksheet('Report 1');
 		$line = 0;
-		$column = 1; //skip the first column (row titles)
+		$column = 1; // Skip the first column (row titles)
 
-		//show extra fields blank space (enough for extra fields on next line)
+		// Show extra fields blank space (enough for extra fields on next line)
 		$display_extra_user_fields = false;
-		if (!($_POST['submit_question_filter'] OR $_POST['export_report']) OR !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);
+		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);
 			$num = count($extra_user_fields);
-			for($i=0;$i<$num;$i++)
-			{
-				$worksheet->write($line,$column,'');
-				$column ++;
+			for ($i = 0; $i < $num; $i++) {
+				$worksheet->write($line, $column, '');
+				$column++;
 			}
 			$display_extra_user_fields = true;
 		}
@@ -3563,26 +3148,19 @@ class SurveyUtil {
 				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
+		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']) OR (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' AND $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, $charset));
+			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, $charset));
+					} 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 ++;
 						}
 					}
@@ -3592,18 +3170,16 @@ class SurveyUtil {
 		$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, $charset));
+		// 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)
+		// 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
@@ -3614,77 +3190,64 @@ class SurveyUtil {
 		$result = Database::query($sql);
 		$possible_answers = array();
 		$possible_answers_type = array();
-		while ($row = Database::fetch_array($result))
-		{
-			// we show the options if
+		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']) OR (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' AND $row['type'] <> 'pagebreak')
-				{
-					$worksheet->write($line,$column,api_html_entity_decode(strip_tags($row['option_text']), ENT_QUOTES, $charset));
-					$possible_answers[$row['question_id']][$row['question_option_id']] =$row['question_option_id'];
+			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
+		// Getting all the answers of the users
 		$line ++;
 		$column = 0;
-		$old_user='';
+		$old_user = '';
 		$answers_of_user = array();
 		$sql = "SELECT * FROM $table_survey_answer " .
 				"WHERE survey_id='".Database::escape_string($_GET['survey_id'])."' ";
-		if ($user_id<>0)
-		{
+		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'] AND $old_user <> '')
-			{
+		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, $display_extra_user_fields);
-				foreach($return as $elem)
-				{
-					$worksheet->write($line,$column,$elem);
+				foreach ($return as $elem) {
+					$worksheet->write($line, $column, $elem);
 					$column++;
 				}
-				$answers_of_user=array();
+				$answers_of_user = array();
 				$line++;
-				$column=0;
+				$column = 0;
 			}
-			if($possible_answers_type[$row['question_id']] == 'open')
-			{
+			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
-			{
+			} 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); // this is to display the last user
-		foreach($return as $elem)
-		{
-			$worksheet->write($line,$column,$elem);
+		foreach ($return as $elem) {
+			$worksheet->write($line, $column, $elem);
 			$column++;
 		}
 		$workbook->close();
 		return null;
 	}
 
-
 	/**
 	 * Add a line to the csv file
 	 *
@@ -3694,78 +3257,55 @@ class SurveyUtil {
 	 * @param	boolean	Whether to display user fields or not
 	 * @return	string	One line of the csv file
 	 */
-	function export_complete_report_row_xls($possible_options, $answers_of_user, $user, $display_extra_user_fields=false)
-	{
-		global $charset;
+	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)
-			{
+		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))
-				{
+				if($row = Database::fetch_array($rs)) {
 					$user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
-				}
-				else
-				{
+				} 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
+			} else {
+				//echo '		<th>'.$user.'</th>'; // The user column
 				$return[] = $user;
 			}
-		}
-		else
-		{
-			$return[] = '-'; // the user column
+		} else {
+			$return[] = '-'; // The user column
 		}
 
-		if($display_extra_user_fields)
+		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);
 			foreach($user_fields_values as $value)
 			{
-				$return[] = api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset);
+				$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];
+		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, $charset);
-						}
-						elseif (!empty($answers_of_user[$question_id][$option_id]))
-						{
+						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)
-							{
+							if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
 								$return[] = $answers_of_user[$question_id][$option_id]['value'];
-							}
-							else
-							{
+							} else {
 								$return[] = 'v';
 							}
-						}
-						else
-						{
+						} else {
 							$return[] = '';
 						}
 					}
@@ -3785,40 +3325,35 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function display_comparative_report()
-	{
-		// allowed question types for comparative report
+	function display_comparative_report() {
+		// Allowed question types for comparative report
 		$allowed_question_types = array('yesno', 'multiplechoice', 'multipleresponse', 'dropdown', 'percentage', 'score');
 
-		// getting all the questions
+		// Getting all the questions
 		$questions = survey_manager::get_questions($_GET['survey_id']);
 
-		// actions bar
+		// 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')).' '.get_lang('BackTo').' '.get_lang('ReportingOverview').'</a>';
+		echo '<a href="reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview')).' '.get_lang('BackTo').' '.get_lang('ReportingOverview').'</a>';
 		echo '</div>';
 
-		// displaying an information message that only the questions with predefined answers can be used in a comparative report
+		// 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
+		// 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))
-				{
+		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'])
-					{
+					if ($_GET['xaxis'] == $question['question_id']) {
 						echo ' selected="selected"';
 					}
 					echo '">'.api_substr(strip_tags($question['question']), 0, 50).'</option>';
@@ -3831,13 +3366,10 @@ class SurveyUtil {
 		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))
-			{
+		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'])
-				{
+				if ($_GET['yaxis'] == $question['question_id']) {
 					echo ' selected="selected"';
 				}
 				echo '">'.api_substr(strip_tags($question['question']), 0, 50).'</option>';
@@ -3847,89 +3379,64 @@ class SurveyUtil {
 		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']) AND is_numeric($_GET['xaxis']))
-		{
+		// 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']) AND is_numeric($_GET['yaxis']))
-		{
+		// 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 (isset($_GET['xaxis']) AND is_numeric($_GET['xaxis']) AND isset($_GET['yaxis']) AND is_numeric($_GET['yaxis']))
-		{
-			// getting the answers of the two questions
+		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
+			// Displaying the table
 			echo '<table border="1" class="data_table">';
 
-			// the header
+			// The header
 			echo '	<tr>';
-			for ($ii=0; $ii<=count($question_x['answers']); $ii++)
-			{
-				if ($ii == 0)
-				{
+			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++)
-						{
+				} 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
-					{
+						$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 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++)
-					{
+				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)
-									{
+						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
-									{
+									} 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)
-								{
+							} else {
+								if ($ii == 0) {
 									echo '		<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
-								}
-								else
-								{
+								} 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>';
@@ -3940,36 +3447,24 @@ class SurveyUtil {
 					}
 				}
 				// The Y axis is NOT a score question type so the number of rows = the number of options
-				else
-				{
+				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)
-									{
+					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
-									{
+									} 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)
-								{
+							} else {
+								if ($ii == 0) {
 									echo '		<th>'.$question_y['answers'][($ij)].'</th>';
-								}
-								else
-								{
+								} else {
 									echo '		<td align="center">';
 									echo SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii-1)], $question_y['answersid'][($ij)]);
 									echo '</td>';
@@ -3993,8 +3488,7 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007 - Updated March 2008
 	 */
-	function get_answers_of_question_by_user($survey_id, $question_id)
-	{
+	function get_answers_of_question_by_user($survey_id, $question_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);
@@ -4005,22 +3499,16 @@ class SurveyUtil {
 					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)
-			{
+		while ($row = Database::fetch_array($result)) {
+			if ($row['value'] == 0) {
 				$return[$row['user']][] = $row['option_id'];
-			}
-			else
-			{
+			} else {
 				$return[$row['user']][] = $row['option_id'].'*'.$row['value'];
 			}
-
 		}
 		return $return;
 	}
 
-
 	/**
 	 * Count the number of users who answer positively on both options
 	 *
@@ -4033,35 +3521,25 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function comparative_check($answers_x, $answers_y, $option_x, $option_y, $value_x=0, $value_y=0)
-	{
-		if ($value_x==0)
-		{
+	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
-		{
+		} else {
 			$check_x = $option_x.'*'.$value_x;
 		}
-		if ($value_y==0)
-		{
+		if ($value_y == 0) {
 			$check_y = $option_y;
-		}
-		else
-		{
+		} 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]))
-					{
+		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++;
 					}
 				}
@@ -4069,6 +3547,7 @@ class SurveyUtil {
 		}
 		return $counter;
 	}
+
 	/**
 	 * Get all the information about the invitations of a certain survey
 	 *
@@ -4079,8 +3558,7 @@ class SurveyUtil {
 	 *
 	 * @todo use survey_id parameter instead of $_GET
 	 */
-	function get_survey_invitations_data()
-	{
+	function get_survey_invitations_data() {
 		// Database table definition
 		$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
 		$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
@@ -4094,8 +3572,7 @@ class SurveyUtil {
 			LEFT JOIN $table_user user ON  survey_invitation.user = user.user_id
 			WHERE 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))
-		{
+		while ($row = Database::fetch_array($res)) {
 			$survey_invitation_data[] = $row;
 		}
 		return $survey_invitation_data;
@@ -4111,8 +3588,7 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function get_number_of_survey_invitations()
-	{
+	function get_number_of_survey_invitations() {
 		// Database table definition
 		$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
@@ -4121,6 +3597,7 @@ class SurveyUtil {
 		$row = Database::fetch_array($res,'ASSOC');
 		return $row['total'];
 	}
+
 	/**
 	 * Save the invitation mail
 	 *
@@ -4130,15 +3607,14 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-        function save_invite_mail($mailtext, $mail_subject, $reminder=0) {
+	function save_invite_mail($mailtext, $mail_subject, $reminder = 0) {
 		// Database table definition
-		$table_survey 					= Database :: get_course_table(TABLE_SURVEY);
+		$table_survey = Database :: get_course_table(TABLE_SURVEY);
 
-		// reminder or not
-            if ($reminder == 0) {
+		// Reminder or not
+		if ($reminder == 0) {
 			$mail_field = 'invite_mail';
-		}
-            else {
+		} else {
 			$mail_field = 'reminder_mail';
 		}
 
@@ -4147,10 +3623,10 @@ class SurveyUtil {
 	}
 
 	/**
-         * This function saves all the invitations of course users and additional users in the database
-         * and sends the invitations by email
+	 * 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	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
@@ -4159,133 +3635,120 @@ class SurveyUtil {
 	 * @version January 2007
 	 *
 	 */
-        function save_invitations($users_array, $invitation_title, $invitation_text,
-            $reminder=0, $sendmail=0, $remindUnAnswered=0) {
-
-			global $charset;
-
-            if (!is_array($users_array)) return 0; // should not happen
-            // getting the survey information
-            $survey_data = survey_manager::get_survey($_GET['survey_id']);
-            // Database table to store the invitations data
-            $table_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-
-            $survey_invitations = array();
-            $survey_invitations = SurveyUtil::get_invitations($survey_data['survey_code']);
-            $already_invited = array();
-            $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)
-            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 AND array_key_exists($value,$survey_invitations)) {
-                    $invitation_code = $survey_invitations[$value]['invitation_code'];
-                }
-                else {
-                    $invitation_code = md5($value.microtime());
-                }
-                $newUser = 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 = explode(';',$already_invited['additional_users']);
-                $my_alredy_invited=($already_invited['course_users']==null) ? array() : $already_invited['course_users'];
-                if ((is_numeric($value) AND !in_array($value,$my_alredy_invited)) OR
-                    (!is_numeric($value) AND !in_array($value,$addit_users_array))) {
-                    $newUser = true;
-                    if (!array_key_exists($value,$survey_invitations)) {
-                        $sql = "INSERT INTO $table_survey_invitation (user, survey_code, invitation_code, invitation_date) VALUES
-                                 ('".Database::escape_string($value)."','".Database::escape_string($survey_data['code'])."','".Database::escape_string($invitation_code)."','".Database::escape_string(date('Y-m-d H:i:s'))."')";
-                        $result = Database::query($sql);
-                    }
-                }
-                // send the email if checkboxed
-                if (($newUser==true || $reminder==1) && $sendmail<>0) {
-                	// make a change for absolute url
-                	if (isset($invitation_text)) {
-                		$invitation_text = api_html_entity_decode(api_convert_encoding($invitation_text, $charset, $_SESSION['oLP']->encoding), ENT_QUOTES, $charset);
-                		$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
-        }
-
-        /**
-         *
+	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']);
+		// Database table to store the invitations data
+		$table_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+
+		$survey_invitations = array();
+		$survey_invitations = SurveyUtil::get_invitations($survey_data['survey_code']);
+		$already_invited = array();
+		$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)
+		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 = explode(';', $already_invited['additional_users']);
+			$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)) {
+					$sql = "INSERT INTO $table_survey_invitation (user, survey_code, invitation_code, invitation_date) VALUES
+							 ('".Database::escape_string($value)."','".Database::escape_string($survey_data['code'])."','".Database::escape_string($invitation_code)."','".Database::escape_string(date('Y-m-d H:i:s'))."')";
+					$result = Database::query($sql);
+				}
+			}
+			// 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(api_convert_encoding($invitation_text, api_get_system_encoding(), $_SESSION['oLP']->encoding), 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
+	}
+
+	/**
 	 * 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
+	 * $param	   $invitation_code - the unique invitation code for the URL
 	 * @return	void
-	 *
 	 */
-        function send_invitation_mail($invitedUser, $invitation_code, $invitation_title, $invitation_text) {
-            global $_user;
-            global $_course;
-            global $_configuration;
-
-            $portal_url = $_configuration['root_web'];
-            if ($_configuration['multiple_access_urls']==true) {
-                $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'];
-                }
-            }
-            // replacing the **link** part with a valid link for the user
-            $survey_link = $portal_url.$_configuration['code_append'].'survey/'.'fillsurvey.php?course='.$_course['sysCode'].'&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;
-            }
-
-            // 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);
-            }
-            else {
-                    /** @todo check if the address is a valid email	 */
-                $recipient_email = $invitedUser;
-            }
-
-			// sending the mail
-			$sender_name  = api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
-            $sender_email = $_user['mail'];
-
-            $replyto = array();
-            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;
-                }
-            }
-
-            @api_mail_html($recipient_name, $recipient_email, $invitation_title, $full_invitation_text, $sender_name, $sender_email, $replyto);
-
-        }
+	function send_invitation_mail($invitedUser, $invitation_code, $invitation_title, $invitation_text) {
+		global $_user, $_course, $_configuration;
+
+		$portal_url = $_configuration['root_web'];
+		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'];
+			}
+		}
+		// Replacing the **link** part with a valid link for the user
+		$survey_link = $portal_url.$_configuration['code_append'].'survey/'.'fillsurvey.php?course='.$_course['sysCode'].'&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;
+		}
+
+		// 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);
+		} else {
+			/** @todo check if the address is a valid email	 */
+			$recipient_email = $invitedUser;
+		}
+
+		// Sending the mail
+		$sender_name  = api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS);
+		$sender_email = $_user['mail'];
+
+		$replyto = array();
+		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;
+			}
+		}
+		@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.
@@ -4295,19 +3758,18 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function update_count_invited($survey_code)
-	{
+	function update_count_invited($survey_code) {
 		// 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
+		// Counting the number of people that are invited
 		$sql = "SELECT count(user) as total FROM $table_survey_invitation WHERE 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
+		// Updating the field in the survey table
 		$sql = "UPDATE $table_survey SET invited = '".Database::escape_string($total_invited)."' WHERE code = '".Database::escape_string($survey_code)."'";
 		$result = Database::query($sql);
 	}
@@ -4324,49 +3786,41 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function get_invited_users($survey_code,$course_db='')
-	{
+	function get_invited_users($survey_code, $course_db = '') {
 		// Database table definition
 		if (!empty($course_db)) {
-			$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION,$course_db);
+			$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION,$course_db);
 		} else {
-			$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
-                FROM $table_survey_invitation as table_invitation
-                LEFT JOIN $table_user as table_user
-                        ON table_invitation.user = table_user.user_id
-                WHERE survey_code='".Database::escape_string($survey_code)."'".$order_clause;
+		$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
+				LEFT JOIN $table_user as table_user
+						ON table_invitation.user = table_user.user_id
+				WHERE survey_code='".Database::escape_string($survey_code)."'".$order_clause;
 
 		$defaults = array();
 		$defaults['course_users'] = array();
 		$defaults['additional_users'] = '';
 		$result = Database::query($sql);
-		while ($row = Database::fetch_array($result))
-		{
-			if (is_numeric($row['user']))
-			{
+		while ($row = Database::fetch_array($result)) {
+			if (is_numeric($row['user'])) {
 				$defaults['course_users'][] = $row['user'];
-			}
-			else
-			{
-				if (empty($defaults['additional_users']))
-				{
+			} else {
+				if (empty($defaults['additional_users'])) {
 					$defaults['additional_users'] = $row['user'];
-				}
-				else
-				{
+				} else {
 					$defaults['additional_users'] .= ';'.$row['user'];
 				}
 			}
 		}
 		return $defaults;
 	}
+
 	/**
 	 * Get all the invitations
 	 *
@@ -4376,20 +3830,19 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version September 2007
 	 */
-	function get_invitations($survey_code)
-	{
+	function get_invitations($survey_code) {
 		// Database table definition
 		$table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
 		$sql = "SELECT * FROM $table_survey_invitation WHERE survey_code = '".Database::escape_string($survey_code)."'";
 		$result = Database::query($sql);
 		$return = array();
-		while ($row = Database::fetch_array($result))
-		{
+		while ($row = Database::fetch_array($result)) {
 			$return[$row['user']] = $row;
 		}
 		return $return;
 	}
+
 	/**
 	 * This function displays the form for searching a survey
 	 *
@@ -4401,8 +3854,8 @@ class SurveyUtil {
 	 * @todo use quickforms
 	 * @todo consider moving this to surveymanager.inc.lib.php
 	 */
-	function display_survey_search_form()
-	{
+	function display_survey_search_form() {
+
 		echo '<form method="get" action="survey_list.php?search=advanced">';
 		echo '<div class="row"><div class="form_header">'.get_lang('SearchASurvey').'</div></div>';
 		echo '	<div class="row">
@@ -4428,8 +3881,7 @@ class SurveyUtil {
 					<div class="formw">';
 		echo '			<select name="keyword_language"><option value="%">'.get_lang('All').'</option>';
 		$languages = api_get_languages();
-		foreach ($languages['name'] as $index => $name)
-		{
+		foreach ($languages['name'] as $index => & $name) {
 			echo '<option value="'.$languages['folder'][$index].'">'.$name.'</option>';
 		}
 		echo '			</select>';
@@ -4455,19 +3907,17 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function display_survey_list()
-	{
+	function display_survey_list() {
 		$parameters = array();
-		$parameters['cidReq']=api_get_course_id();
-		if ($_GET['do_search'])
-		{
+		$parameters['cidReq'] = api_get_course_id();
+		if ($_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 = 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'));
@@ -4480,27 +3930,24 @@ class SurveyUtil {
 		$table->set_header(7, get_lang('AvailableUntil'));
 		$table->set_header(8, get_lang('Invite'));
 		$table->set_header(9, get_lang('Anonymous'));
-		$table->set_header(10, get_lang('Modify'), false,'width="150"');
+		$table->set_header(10, get_lang('Modify'), false, 'width="150"');
 		$table->set_column_filter(9, 'anonymous_filter');
 		$table->set_column_filter(10, 'modify_filter');
-		$table->set_form_actions(array ('delete' => get_lang('DeleteSurvey')));
+		$table->set_form_actions(array('delete' => get_lang('DeleteSurvey')));
 		$table->display();
 	}
 
-
-	function display_survey_list_for_coach()
-	{
+	function display_survey_list_for_coach() {
 		$parameters = array();
 		$parameters['cidReq']=api_get_course_id();
-		if(isset($_GET['do_search']))
-		{
+		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 = 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'));
@@ -4513,14 +3960,12 @@ class SurveyUtil {
 		$table->set_header(7, get_lang('AvailableUntil'));
 		$table->set_header(8, get_lang('Invite'));
 		$table->set_header(9, get_lang('Anonymous'));
-		$table->set_header(10, get_lang('Modify'), false,'width="130"');
+		$table->set_header(10, get_lang('Modify'), false, 'width="130"');
 		$table->set_column_filter(9, 'anonymous_filter');
 		$table->set_column_filter(10, 'modify_filter_for_coach');
 		$table->display();
 	}
 
-
-
 	/**
 	 * This function changes the modify column of the sortable table
 	 *
@@ -4530,18 +3975,16 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function modify_filter($survey_id)
-	{
-		global $charset;
+	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))
-		{
+		// 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.gif', get_lang('Edit')).'</a>&nbsp;';
-			$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,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</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").'?')).'\')) return false;">'.Display::return_icon('clean_group.gif', get_lang('EmptySurvey')).'</a>&nbsp;';
+			$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>&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").'?')).'\')) return false;">'.Display::return_icon('clean_group.gif', get_lang('EmptySurvey')).'</a>&nbsp;';
 		}
 		//$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>';
@@ -4551,37 +3994,29 @@ class SurveyUtil {
 		return $return;
 	}
 
+	function modify_filter_for_coach($survey_id) {
 
-	function modify_filter_for_coach($survey_id)
-	{
-		global $charset;
 		$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,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+		//$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="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview.gif', get_lang('Preview')).'</a>&nbsp;';
 		$return .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('survey_publish.gif', get_lang('Publish')).'</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, $charset)).'\')) return false;">'.Display::return_icon('clean_group.gif', get_lang('EmptySurvey')).'</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_group.gif', get_lang('EmptySurvey')).'</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
 	 */
-	function anonymous_filter($anonymous)
-	{
-		if ($anonymous == 1)
-		{
+	function anonymous_filter($anonymous) {
+		if ($anonymous == 1) {
 			return get_lang('Yes');
-		}
-		else
-		{
+		} else {
 			return get_lang('No');
 		}
 	}
@@ -4595,31 +4030,25 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function survey_search_restriction()
-	{
-		if(isset($_GET['do_search']))
-		{
-			if ($_GET['keyword_title']<>'')
-			{
+	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']<>'')
-			{
+			if ($_GET['keyword_code'] != '') {
 				$search_term[] = 'code =\''.Database::escape_string($_GET['keyword_code']).'\'';
 			}
-			if ($_GET['keyword_language']<>'%')
-			{
+			if ($_GET['keyword_language'] != '%') {
 				$search_term[] = 'lang =\''.Database::escape_string($_GET['keyword_language']).'\'';
 			}
-			$my_search_term=($search_term==null) ? array() : $search_term;
+			$my_search_term = ($search_term == null) ? array() : $search_term;
 			$search_restriction = implode(' AND ', $my_search_term);
 			return $search_restriction;
-		}
-		else
-		{
+		} else {
 			return false;
 		}
 	}
+
 	/**
 	 * This function calculates the total number of surveys
 	 *
@@ -4628,13 +4057,10 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function get_number_of_surveys()
-	{
+	function get_number_of_surveys() {
 		global $table_survey;
-
 		$search_restriction = SurveyUtil::survey_search_restriction();
-		if ($search_restriction)
-		{
+		if ($search_restriction) {
 			$search_restriction = 'WHERE '.$search_restriction;
 		}
 		$sql = "SELECT count(survey_id) AS total_number_of_items FROM ".$table_survey.' '.$search_restriction;
@@ -4643,12 +4069,10 @@ class SurveyUtil {
 		return $obj->total_number_of_items;
 	}
 
-	function get_number_of_surveys_for_coach()
-	{
+	function get_number_of_surveys_for_coach() {
 		/*global $table_survey;
 		$search_restriction = SurveyUtil::survey_search_restriction();
-		if ($search_restriction)
-		{
+		if ($search_restriction) {
 			$search_restriction = 'WHERE '.$search_restriction;
 		}
 		$sql = "SELECT count(survey_id) AS total_number_of_items FROM ".$table_survey.' '.$search_restriction;
@@ -4657,15 +4081,12 @@ class SurveyUtil {
 		return $obj->total_number_of_items;
 		*/
 
-		//ugly fix
+		// 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
 	 *
@@ -4678,44 +4099,42 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function get_survey_data($from, $number_of_items, $column, $direction)
-	{
+	function get_survey_data($from, $number_of_items, $column, $direction) {
 		global $table_survey;
 		global $table_user;
 		global $table_survey_question;
 
-		// searching
+		// Searching
 		$search_restriction = SurveyUtil::survey_search_restriction();
-		if ($search_restriction)
-		{
+		if ($search_restriction) {
 			$search_restriction = ' AND '.$search_restriction;
 		}
 
-		//condition for the session
+		// Condition for the session
 		$session_id = api_get_session_id();
 		$condition_session = api_get_session_condition($session_id);
 
 		//IF(is_shared<>0,'V','-')	 					AS col6,
 		$sql = "SELECT
 					survey.survey_id							AS col0,
-	                CONCAT('<a href=\"survey.php?survey_id=',survey.survey_id,'\">',survey.title,'</a>')		AS col1,
+					CONCAT('<a href=\"survey.php?survey_id=',survey.survey_id,'\">',survey.title,'</a>')		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.lang									AS col5,
+					".(api_is_western_name_order() ? "CONCAT(user.firstname, ' ', user.lastname)" : "CONCAT(user.lastname, ' ', user.firstname)")."	AS col4,
+					survey.lang									AS col5,
 					survey.avail_from							AS col6,
-	                survey.avail_till							AS col7,
-	                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 col8,
-	                survey.anonymous							AS col9,
-	                survey.survey_id							AS col10,
-	                survey.session_id							AS session_id
-	             FROM $table_survey survey
+					survey.avail_till							AS col7,
+					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 col8,
+					survey.anonymous							AS col9,
+					survey.survey_id							AS col10,
+					survey.session_id							AS session_id
+				 FROM $table_survey survey
 				 LEFT JOIN $table_survey_question survey_question ON survey.survey_id = survey_question.survey_id
-	             , $table_user user
-	             WHERE survey.author = user.user_id
-	             $search_restriction
-	             $condition_session
-	             ";
+				 , $table_user user
+				 WHERE survey.author = user.user_id
+				 $search_restriction
+				 $condition_session
+				 ";
 		$sql .= " GROUP BY survey.survey_id";
 		$sql .= " ORDER BY col$column $direction ";
 		$sql .= " LIMIT $from,$number_of_items";
@@ -4726,7 +4145,7 @@ class SurveyUtil {
 			$array[0] = $survey[0];
 			$array[1] = $survey[1];
 
-			//validacion when belongs to a session
+			// Validacion when belongs to a session
 			$session_img = api_get_session_image($survey['session_id'], $_user['status']);
 			$array[2] = $survey[2] . $session_img;
 
@@ -4744,27 +4163,22 @@ class SurveyUtil {
 		return $surveys;
 	}
 
-	function get_survey_data_for_coach($from, $number_of_items, $column, $direction)
-	{
+	function get_survey_data_for_coach($from, $number_of_items, $column, $direction) {
 		//echo '<pre>';
 		//echo '----------------';
-		require_once(api_get_path(LIBRARY_PATH).'surveymanager.lib.php');
+		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);
 		//echo '----------------';
 		//print_r($last_version_surveys);
-		$list=array();
-		foreach($last_version_surveys as $survey)
-		{
+		$list = array();
+		foreach ($last_version_surveys as & $survey) {
 			$list[]=$survey['id'];
 		}
-		if (count($list)>0)
-		{
+		if (count($list) > 0) {
 			$list_condition = " AND survey.survey_id IN (".implode(',',$list).") ";
-		}
-		else
-		{
-			$list_condition ='';
+		} else {
+			$list_condition = '';
 		}
 
 		$table_survey 			= Database :: get_course_table(TABLE_SURVEY);
@@ -4776,37 +4190,34 @@ class SurveyUtil {
 		//IF(is_shared<>0,'V','-')	 					AS col6,
 		$sql = "SELECT
 					survey.survey_id							AS col0,
-	                survey.title	AS col1,
+					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.lang									AS col5,
+					".(api_is_western_name_order() ? "CONCAT(user.firstname, ' ', user.lastname)" : "CONCAT(user.lastname, ' ', user.firstname)")."	AS col4,
+					survey.lang									AS col5,
 					survey.avail_from							AS col6,
-	                survey.avail_till							AS col7,
-	                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 col8,
-	                survey.anonymous							AS col9,
-	                survey.survey_id							AS col10
-	             FROM $table_survey survey
+					survey.avail_till							AS col7,
+					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 col8,
+					survey.anonymous							AS col9,
+					survey.survey_id							AS col10
+				 FROM $table_survey survey
 				 LEFT JOIN $table_survey_question survey_question ON survey.survey_id = survey_question.survey_id
-	             , $table_user user
-	             WHERE survey.author = user.user_id $list_condition
-	             $search_restriction
-	             ";
+				 , $table_user user
+				 WHERE survey.author = user.user_id $list_condition
+				 $search_restriction
+				 ";
 		$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 = array();
+		while ($survey = Database::fetch_array($res)) {
 			$surveys[] = $survey;
 		}
 		return $surveys;
 	}
 
-
-
 	/**
 	 * Display all the active surveys for the given course user
 	 *
@@ -4815,8 +4226,7 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version April 2007
 	 */
-	function survey_list_user($user_id)
-	{
+	function survey_list_user($user_id) {
 		global $_course;
 
 		// Database table definitions
@@ -4825,27 +4235,27 @@ class SurveyUtil {
 		$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();
+		$all_question_id = array();
 
-		$sql='SELECT question_id from '.$table_survey_question;
-		$result=Database::query($sql);
+		$sql = 'SELECT question_id from '.$table_survey_question;
+		$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 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')) {
+		$count = 0;
+		for ($i = 0; $i < count($all_question_id); $i++) {
+			$sql = 'SELECT COUNT(*) as count FROM '.$table_survey_answer.' WHERE 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;
+			if ($count > 0) {
+				$link_add = true;
 				break;
 			}
 		}
@@ -4863,267 +4273,211 @@ class SurveyUtil {
 				";
 		$result = Database::query($sql);
 		$counter = 0;
-		while ($row = Database::fetch_array($result,'ASSOC')) {
-			// get the user into survey answer table (user or anonymus)
+		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 survey_id = (SELECT survey_id from $table_survey WHERE code ='".Database::escape_string($row['code'])."')";
+					WHERE survey_id = (SELECT survey_id from $table_survey WHERE code ='".Database::escape_string($row['code'])."')";
 			$result_answer = Database::query($sql);
 			$row_answer = Database::fetch_array($result_answer,'ASSOC');
 			echo '<tr>';
-			if ($row['answered'] == 0)
-			{
+			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
-			{
+			} else {
 				echo '<td>'.$row['title'].'</td>';
 			}
 			echo '<td>';
-			echo ($row['anonymous'] == 1)?get_lang('Yes'):get_lang('No');
+			echo ($row['anonymous'] == 1) ? get_lang('Yes') : get_lang('No');
 			echo '</td>';
 			echo '</tr>';
 			if ($row['anonymous'] == 1) {
-				$current_user_id=$_SESSION['surveyuser'];
+				$current_user_id = $_SESSION['surveyuser'];
 			} else {
-				$current_user_id=api_get_user_id();
+				$current_user_id = api_get_user_id();
 			}
-			$link_available=self::show_link_available(api_get_user_id(),$row['code'],$current_user_id);
-			if ($link_add===true && $link_available===true) {
+			$link_available = self::show_link_available(api_get_user_id(),$row['code'],$current_user_id);
+			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>, Dokeos: Personality Test modification
+	 * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification
 	 * @return array[value_name][name]
 	 * 		   array[value_name][visibilty]
-	 *
 	 */
-	function make_field_list()
-	{
+	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');
+		$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', '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;
-
+		$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');
+		$field_list_array['official_code']['name'] = get_lang('OfficialCode');
 
-		if (api_get_setting('profile', 'officialcode') !== 'true')
-		{
-			$field_list_array['official_code']['visibility']=1;
-		}
-		else
-		{
-			$field_list_array['official_code']['visibility']=0;
+		if (api_get_setting('profile', 'officialcode') != 'true') {
+			$field_list_array['official_code']['visibility'] = 1;
+		} else {
+			$field_list_array['official_code']['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;
+		$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;
 		}
 
 		// OPENID URL
-		//$field_list_array[]='openid_authentication';
+		//$field_list_array[] = 'openid_authentication';
 		/*
-		if(is_profile_editable() && api_get_setting('openid_authentication')=='true')
-		{
+		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')
+			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;
+		$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;
+		$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;
 		}
 
-
 		// 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)
-			{
+		$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 USER_FIELD_TYPE_TEXT:
+			switch ($field_details[2]) {
 
-
-					$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;
+				case 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 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;
+				case 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 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;
+					$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 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;
+					$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 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;
+				case 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 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;
+				case 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 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;
+				case 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 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
-					{
+				case 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] == '*')
-						{
+					foreach ($field_details[8] as $key => $element) {
+						if ($element[2][0] == '*') {
 							$values['*'][$element[0]] = str_replace('*','',$element[2]);
-						}
-						else
-						{
+						} 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['*'],'');
+					$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)
+					// 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();
+						$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]))
-							{
+						// 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
-							{
+							} else {
 								$extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1].'*'] = $selected_value;
 							}
 						}
@@ -5136,15 +4490,14 @@ class SurveyUtil {
 		}
 		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
-	 *
 	 */
-	function show_link_available($user_id,$survey_code,$user_answer)
-	{
+	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);
@@ -5154,19 +4507,19 @@ class SurveyUtil {
 		$user_id = Database::escape_string($user_id);
 		$user_answer = Database::escape_string($user_answer);
 
-		$sql='SELECT COUNT(*) as count FROM '.$table_survey_invitation.' WHERE user='.$user_id.' AND survey_code="'.$survey_code.'" AND answered="1"';
-		$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")';
-		$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 user="'.$user_answer.'" ';
+		$sql = 'SELECT COUNT(*) as count FROM '.$table_survey_invitation.' WHERE user='.$user_id.' AND survey_code="'.$survey_code.'" AND answered="1"';
+		$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")';
+		$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 user="'.$user_answer.'" ';
 
-		$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']) {
+		if ($row['count'] == 1 && $row3['count'] != $row2['count']) {
 			return true;
 		} else {
 			return false;
@@ -5174,4 +4527,3 @@ class SurveyUtil {
 	}
 }
 
-?>
diff --git a/main/survey/survey.php b/main/survey/survey.php
index 20ea81fbd4..63ec924a36 100755
--- a/main/survey/survey.php
+++ b/main/survey/survey.php
@@ -1,31 +1,32 @@
-<?php // $Id: survey.php 22573 2009-08-03 03:38:13Z yannoo $
-/* For licensing terms, see /dokeos_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
+
 /**
-*	@package dokeos.survey
-* 	@author unknown
-* 	@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
-*/
-
-// name of the language file that needs to be included
+ *	@package chamilo.survey
+ * 	@author unknown
+ * 	@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';
 
-// including the global dokeos file
-require ('../inc/global.inc.php');
-$this_section=SECTION_COURSES;
+// Including the global initialization file
+require '../inc/global.inc.php';
+
+$this_section = SECTION_COURSES;
 
-// including additional libraries
-//require_once (api_get_path(LIBRARY_PATH)."/survey.lib.php");
-require_once('survey.lib.php');
-require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
+// Including additional libraries
+//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
+require_once 'survey.lib.php';
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
-// coach can't view this page
+// 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'))
-{
+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();
@@ -40,12 +41,13 @@ $table_survey_question_group    = Database :: get_course_table(TABLE_SURVEY_QUES
 $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 $user_info 						= Database :: get_main_table(TABLE_MAIN_SURVEY_REMINDER); // TODO: To be checked. TABLE_MAIN_SURVEY_REMINDER has not been defined.
+
 $survey_id = intval($_GET['survey_id']);
 
-// breadcrumbs
-$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
+// Breadcrumbs
+$interbreadcrumb[] = array ('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
 
-// getting the survey information
+// Getting the survey information
 if (isset($_GET['survey_id'])) {
 	$course_code = api_get_course_id();
 	if ($course_code!=-1) {
@@ -58,30 +60,26 @@ if (isset($_GET['survey_id'])) {
 	}
 }
 
-if (api_substr($survey_data['title'],0,3)!='<p>'){
-	$tool_name = strip_tags(api_substr(api_html_entity_decode($survey_data['title'],ENT_QUOTES,$charset), 0, 40));
-}else{
-	$tool_name = strip_tags(api_substr(api_html_entity_decode(api_substr($survey_data['title'],3,-4),ENT_QUOTES,$charset), 0, 40));
+if (api_substr($survey_data['title'], 0, 3) != '<p>') {
+	$tool_name = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
+} else {
+	$tool_name = strip_tags(api_substr(api_html_entity_decode(api_substr($survey_data['title'], 3, -4), ENT_QUOTES), 0, 40));
 }
-$is_survey_type_1 = ($survey_data['survey_type']==1)?true:false;
-if (api_strlen(strip_tags($survey_data['title'])) > 40)
-{
+
+$is_survey_type_1 = $survey_data['survey_type'] == 1;
+
+if (api_strlen(strip_tags($survey_data['title'])) > 40) {
 	$tool_name .= '...';
 }
 
-if($is_survey_type_1 && ($_GET['action']=='addgroup')||($_GET['action']=='deletegroup'))
-{
+if ($is_survey_type_1 && $_GET['action'] == 'addgroup' || $_GET['action'] == 'deletegroup') {
 	$_POST['name'] = trim($_POST['name']);
 
-	if(($_GET['action']=='addgroup'))
-	{
-		if(!empty($_POST['group_id']))
-		{
+	if (($_GET['action'] == 'addgroup')) {
+		if (!empty($_POST['group_id'])) {
 			Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\' WHERE id = \''.Database::escape_string($_POST['group_id']).'\'');
 			$sendmsg = 'GroupUpdatedSuccessfully';
-		}
-		elseif(!empty($_POST['name']))
-		{
+		} elseif(!empty($_POST['name'])) {
 			Database::query('INSERT INTO '.$table_survey_question_group.' (name,description,survey_id) values (\''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
 			$sendmsg = 'GroupCreatedSuccessfully';
 		} else {
@@ -89,7 +87,7 @@ if($is_survey_type_1 && ($_GET['action']=='addgroup')||($_GET['action']=='delete
 		}
 	}
 
-	if($_GET['action']=='deletegroup'){
+	if ($_GET['action'] == 'deletegroup'){
 		Database::query('DELETE FROM '.$table_survey_question_group.' WHERE id = '.Database::escape_string($_GET['gid']).' and survey_id = '.Database::escape_string($survey_id));
 		$sendmsg = 'GroupDeletedSuccessfully';
 	}
@@ -107,7 +105,7 @@ $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($_GET['action'])) {
-	if (($_GET['action'] == 'moveup' OR $_GET['action'] == 'movedown') AND isset($_GET['question_id'])) {
+	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'));
 	}
@@ -116,12 +114,12 @@ if (isset($_GET['action'])) {
 	}
 }
 if (isset($_GET['message'])) {
-	// we have created the survey or updated the survey
+	// 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'))) {
+	// We have added a question
+	if (in_array($_GET['message'], array('QuestionAdded', 'QuestionUpdated'))) {
 		Display::display_confirmation_message(get_lang($message_information));
 	}
 
@@ -129,30 +127,32 @@ if (isset($_GET['message'])) {
 		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.gif', get_lang('Edit')).' '.get_lang('EditSurvey').'</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,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).' '.get_lang('DeleteSurvey').'</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.gif', get_lang('Delete')).' '.get_lang('DeleteSurvey').'</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.gif', get_lang('Preview')).' '.get_lang('Preview').'</a>';
 $survey_actions .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('survey_publish.gif', get_lang('Publish')).' '.get_lang('Publish').'</a>';
 $survey_actions .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).' '.get_lang('Reporting').'</a>';
 echo '<div class="actions">'.$survey_actions.'</div>';
 
-if ($survey_data['survey_type']==0) {
+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')).'<br/>'.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 />'.get_lang('UniqueSelect').'</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')).'<br />'.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 />'.get_lang('Open').'</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 />'.get_lang('Dropdown').'</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 />'.get_lang('Percentage').'</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')).'<br />'.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')).'<br />'.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')).'<br />'.get_lang('Pagebreak').'</a>';
+	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')).'<br/>'.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 />'.get_lang('UniqueSelect').'</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')).'<br />'.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 />'.get_lang('Open').'</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 />'.get_lang('Dropdown').'</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 />'.get_lang('Percentage').'</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')).'<br />'.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')).'<br />'.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')).'<br />'.get_lang('Pagebreak').'</a>';
 	echo '</div>';
 } else {
 	echo '<div class="actionsbig">';
@@ -169,17 +169,18 @@ echo '		<th>'.get_lang('Title').'</th>';
 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) {
+if ($is_survey_type_1) {
 	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 survey_id = '".Database::escape_string($survey_id)."' ORDER BY id";
 $result = Database::query($sql);
 $groups = array();
-while($row = Database::fetch_array($result)) {
+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
@@ -191,12 +192,12 @@ $sql = "SELECT survey_question.*, count(survey_question_option.question_option_i
 			ORDER BY survey_question.sort ASC";
 $result = Database::query($sql);
 $question_counter_max = Database::num_rows($result);
-while ($row = Database::fetch_array($result,'ASSOC')) {
+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).' ... ';
+		echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
 	} else {
 		echo $row['survey_question'];
 	}
@@ -209,21 +210,18 @@ while ($row = Database::fetch_array($result,'ASSOC')) {
 		$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.gif', get_lang('Edit')).'</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.gif', get_lang('Delete')).'</a>';
-	if ($question_counter > 1)
-	{
+	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.gif', get_lang('MoveUp')).'</a>';
 	} else {
 		Display::display_icon('up_na.gif');
 	}
-	if ($question_counter < $question_counter_max)
-	{
+	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.gif', get_lang('MoveDown')).'</a>';
 	} else {
 		Display::display_icon('down_na.gif');
@@ -231,8 +229,7 @@ while ($row = Database::fetch_array($result,'ASSOC')) {
 	echo '	</td>';
 	$question_counter++;
 
-	if($is_survey_type_1)
-    {
+	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>';
     }
@@ -240,11 +237,10 @@ while ($row = Database::fetch_array($result,'ASSOC')) {
 }
 echo '</table>';
 
-if($is_survey_type_1)
-{
+if ($is_survey_type_1) {
 	echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
 
-	if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully','GroupDeletedSuccessfully','GroupCreatedSuccessfully'))){
+	if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
 		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
 	}
 
@@ -255,11 +251,10 @@ if($is_survey_type_1)
 	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($_GET['action']=='editgroup') {
+	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']).'">';
@@ -285,7 +280,7 @@ if($is_survey_type_1)
 		$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.gif', get_lang('Edit')).'</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,$charset)).'\')) return false;">'.
+		'<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.gif', get_lang('Delete')).'</a>'.
 		'</td></tr>';
 	}
@@ -294,4 +289,3 @@ if($is_survey_type_1)
 
 // Footer
 Display :: display_footer();
-?>
diff --git a/main/survey/survey_invitation.php b/main/survey/survey_invitation.php
index 5259645e2c..705edcd1f0 100755
--- a/main/survey/survey_invitation.php
+++ b/main/survey/survey_invitation.php
@@ -1,38 +1,22 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
+/* For licensing terms, see /license.txt */
 
 /**
-*	@package dokeos.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
-*/
+ *	@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
+ */
 
-// name of the language file that needs to be included
+// Language file that needs to be included
 $language_file = 'survey';
 
 // Including the global initialization file
 require '../inc/global.inc.php';
 
 // Including additional libraries
-//require_once (api_get_path(LIBRARY_PATH).'survey.lib.php');
+//require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
 require_once 'survey.lib.php';
 require_once api_get_path(LIBRARY_PATH).'course.lib.php';
@@ -40,8 +24,7 @@ require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.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)*/
-if (!api_is_allowed_to_edit(false,true))
-{
+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();
@@ -59,15 +42,15 @@ $table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATIO
 $tool_name = get_lang('SurveyInvitations');
 
 
-// getting the survey information
+// 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']))
-{
+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;
 }
+
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 if (empty($survey_data)) {
@@ -76,22 +59,22 @@ if (empty($survey_data)) {
 	Display :: display_footer();
 	exit;
 }
-$urlname =strip_tags(api_substr(api_html_entity_decode($survey_data['title'],ENT_QUOTES,$charset), 0, 40));
+
+$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 .= '...';
 }
 
-//breadcrumbs
-$interbreadcrumb[] = array ('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
-$interbreadcrumb[] = array ('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
+// Breadcrumbs
+$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+$interbreadcrumb[] = array('url' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
 
 
 // Displaying the header
 Display::display_header($tool_name);
 
 // Checking the parameters
-if (!is_numeric($survey_id))
-{
+if (!is_numeric($survey_id)) {
 	Display::display_error_message(get_lang('Error'), false);
 	Display::display_footer();
 	exit;
@@ -99,39 +82,28 @@ if (!is_numeric($survey_id))
 
 // 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)
-{
+if ($survey_data['anonymous'] == 1) {
 	Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
 	$answered_data = array();
 }
 
-//
-if (!isset($_GET['view']) OR $_GET['view'] == 'invited')
-{
+if (!isset($_GET['view']) OR $_GET['view'] == 'invited') {
 	echo get_lang('ViewInvited'). ' | ';
-}
-else
-{
+} else {
 	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
 }
-if ($_GET['view'] == 'answered')
-{
+if ($_GET['view'] == 'answered') {
 	echo get_lang('ViewAnswered').' | ';
-}
-else
-{
+} else {
 	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
 }
-if ($_GET['view'] == 'unanswered')
-{
+if ($_GET['view'] == 'unanswered') {
 	echo get_lang('ViewUnanswered');
-}
-else
-{
+} else {
 	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
 }
 
-// table header
+// Table header
 echo '<table class="data_table">';
 echo '	<tr>';
 echo '		<th>'.get_lang('User').'</th>';
@@ -143,38 +115,32 @@ $sql = "SELECT survey_invitation.*, user.firstname, user.lastname, user.email FR
 			LEFT JOIN $table_user user ON  survey_invitation.user = user.user_id
 			WHERE survey_invitation.survey_code = '".Database::escape_string($survey_data['code'])."'";
 $res = Database::query($sql);
-while ($row = Database::fetch_assoc($res))
-{
-	if (!$_GET['view'] OR $_GET['view'] == 'invited' OR ($_GET['view'] == 'answered' AND in_array($row['user'], $answered_data)) OR ($_GET['view'] == 'unanswered' AND !in_array($row['user'], $answered_data)))
-	{
+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']))
-		{
+		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
-		{
+		} else {
 				echo '	<td>'.$row['user'].'</td>';
 		}
 		echo '	<td>'.$row['invitation_date'].'</td>';
 		echo '	<td>';
-		if (in_array($row['user'], $answered_data))
-		{
+		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
-		{
+		} else {
 			echo '-';
 		}
 		echo '	</td>';
 		echo '</tr>';
 	}
 }
-// closing the table
+
+// Closing the table
 echo '</table>';
 
 // Footer
 Display :: display_footer();
+
 /**
  * @todo add the additional parameters
  */
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index 6014681165..9eb283bdb8 100755
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -1,53 +1,33 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2009 Dokeos SPRL
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 
 /**
-*	@package dokeos.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 Dokeos: 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
-*/
-
-// name of the language file that needs to be included
+ *	@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
+ */
+
+// Language file that needs to be included
 $language_file = 'survey';
 
-// including the global dokeos file
-require ('../inc/global.inc.php');
+// Including the global initialization file
+require '../inc/global.inc.php';
 
-// including additional libraries
-require_once('survey.lib.php');
-require_once (api_get_path(LIBRARY_PATH)."course.lib.php");
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-require_once (api_get_path(LIBRARY_PATH)."mail.lib.inc.php");
+// Including additional libraries
+require_once 'survey.lib.php';
+require_once api_get_path(LIBRARY_PATH).'course.lib.php';
+require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
+require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
 
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
-if (!api_is_allowed_to_edit(false,true))
-{
+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();
@@ -62,7 +42,7 @@ $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 $user_info 			= Database::get_main_table(TABLE_MAIN_SURVEY_REMINDER); // TODO: To be checked. TABLE_MAIN_SURVEY_REMINDER has not been defined.
 
-// getting the survey information
+// Getting the survey information
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 if (empty($survey_data)) {
@@ -73,36 +53,33 @@ if (empty($survey_data)) {
 }
 
 
-$urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'],ENT_QUOTES,$charset), 0, 40));
-if (api_strlen(strip_tags($survey_data['title'])) > 40)
-{
+$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 .= '...';
 }
 
-// breadcrumbs
-$interbreadcrumb[] = array ('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+// Breadcrumbs
+$interbreadcrumb[] = array('url' => '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' => 'survey.php?survey_id='.$survey_id, 'name' => $urlname);
 } else {
-    $interbreadcrumb[] = array ('url' => 'survey_invite.php?survey_id='.$survey_id, 'name' => $urlname);
+	$interbreadcrumb[] = array('url' => 'survey_invite.php?survey_id='.$survey_id, 'name' => $urlname);
 }
 $tool_name = get_lang('SurveyPublication');
 
 // Displaying the header
 Display::display_header($tool_name,'Survey');
 
-// checking if there is another survey with this code.
+// 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 code='".Database::escape_string($survey_data['code'])."'";
 $result = Database::query($sql);
-if (Database::num_rows($result) > 1)
-{
+if (Database::num_rows($result) > 1) {
 	Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
 }
 
-// invited / answered message
-if ($survey_data['invited'] > 0)
-{
+// Invited / answered message
+if ($survey_data['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'].'">'.$survey_data['invited'].'</a> ';
@@ -110,16 +87,15 @@ if ($survey_data['invited'] > 0)
 	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);
+// Building the form for publishing the survey
+$form = new FormValidator('publish_form', 'post', api_get_self().'?survey_id='.$survey_id);
 
 $form->addElement('header', '', $tool_name);
 
 // Course users
 $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], true, $_SESSION['id_session'], '', api_sort_by_first_name() ? 'ORDER BY firstname' : 'ORDER BY lastname');
-$possible_users = array ();
-foreach ($complete_user_list as $index => $user)
-{
+$possible_users = array();
+foreach ($complete_user_list as $index => & $user) {
 	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 }
 $users = $form->addElement('advmultiselect', 'course_users', get_lang('CourseUsers'), $possible_users, 'style="width: 250px; height: 200px;"');
@@ -135,80 +111,73 @@ $users->setElementTemplate('
 </tr>
 </table>
 ');
-$users->setButtonAttributes('add',array('class'=>'arrowr'));
-$users->setButtonAttributes('remove',array('class'=>'arrowl'));
-// additional users
-$form->addElement('textarea', 'additional_users', get_lang('AdditonalUsers'), array ('cols' => 50, 'rows' => 2));
-// additional users comment
+$users->setButtonAttributes('add', array('class' => 'arrowr'));
+$users->setButtonAttributes('remove', array('class' => 'arrowl'));
+// Additional users
+$form->addElement('textarea', 'additional_users', get_lang('AdditonalUsers'), array('cols' => 50, 'rows' => 2));
+// Additional users comment
 $form->addElement('static', null, null, get_lang('AdditonalUsersComment'));
-// the title of the mail
-$form->addElement('text', 'mail_title', get_lang('MailTitle'),array('size' => '80'));
-// the text of the mail
+// The title of the mail
+$form->addElement('text', 'mail_title', get_lang('MailTitle'), array('size' => '80'));
+// The text of the mail
 $form->addElement('html_editor', 'mail_text', get_lang('MailText'), null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '150'));
-// some explanation of the mail
+// Some explanation of the mail
 $form->addElement('static', null, null, get_lang('UseLinkSyntax'));
 $form->addElement('checkbox', 'send_mail', '', get_lang('SendMail'));
-// you cab send a reminder to unanswered people if the survey is not anonymous
+// 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
+// Allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
-// submit button
+// Submit button
 $form->addElement('style_submit_button', 'submit', get_lang('PublishSurvey'), 'class="save"');
 // The rules (required fields)
 $form->addRule('mail_title', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('mail_text', get_lang('ThisFieldIsRequired'), 'required');
 
 $portal_url = $_configuration['root_web'];
-if ($_configuration['multiple_access_urls']==true) {
+if ($_configuration['multiple_access_urls']) {
 	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1 ){
+	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
+// Show the URL that can be used by users to fill a survey without invitation
 $auto_survey_link = $portal_url.$_configuration['code_append'].
-            'survey/'.'fillsurvey.php?course='.$_course['sysCode'].
-            '&invitationcode=auto&scode='.$survey_data['survey_code'];
+	'survey/'.'fillsurvey.php?course='.$_course['sysCode'].
+	'&invitationcode=auto&scode='.$survey_data['survey_code'];
 $form->addElement('static',null, null, '<br \><br \>' . get_lang('AutoInviteLink'));
 $form->addElement('static',null, null, $auto_survey_link);
-if ($form->validate())
-{
+if ($form->validate()) {
 	$values = $form->exportValues();
-	// save the invitation mail
+	// 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
+	// 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++)
-	{
+		$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
+		$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;
 	Display :: display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
-}
-else
-{
-	// getting the invited users
+} else {
+	// Getting the invited users
 	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-	// getting the survey mail text
-	if (!empty($survey_data['reminder_mail']))
-	{
+	// Getting the survey mail text
+	if (!empty($survey_data['reminder_mail'])) {
 		$defaults['mail_text'] = $survey_data['reminder_mail'];
-	}
-	else
-	{
+	} else {
 		$defaults['mail_text'] = $survey_data['invite_mail'];
 	}
 	$defaults['mail_title'] = $survey_data['mail_subject'];
@@ -219,4 +188,3 @@ else
 
 // Footer
 Display :: display_footer();
-?>
diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php
index 4126778dc2..65eec3d407 100755
--- a/main/survey/survey_list.php
+++ b/main/survey/survey_list.php
@@ -1,59 +1,38 @@
-<?php // $Id: survey_list.php 21933 2009-07-09 06:08:22Z ivantcholakov $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003 Ghent University (UGent)
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact: Dokeos, rue Notre Dame, 152, B-1140 Evere, Belgium, info@dokeos.com
-==============================================================================
-*/
-
-
+<?php
+/* For licensing terms, see /license.txt */
 
 /**
-*	@package dokeos.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>, Dokeos: 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
-*/
-
-// name of the language file that needs to be included
+ *	@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
+ */
+
+// Language file that needs to be included
 $language_file = 'survey';
 if (!isset ($_GET['cidReq'])){
-    $_GET['cidReq']='none'; // prevent sql errors
+    $_GET['cidReq'] = 'none'; // Prevent sql errors
     $cidReset = true;
 }
-// including the global dokeos file
+
+// Including the global initialization file
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
 
-// including additional libraries
+// Including additional libraries
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
 //require_once api_get_path(LIBRARY_PATH).'survey.lib.php';
 require_once 'survey.lib.php';
 require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 
-//Tracking
+// Tracking
 event_access_tool(TOOL_SURVEY);
 
-/** @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
-{
+/** @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'));
 	SurveyUtil::survey_list_user($_user['user_id']);
 	Display :: display_footer();
@@ -68,62 +47,51 @@ $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['search'] == 'advanced')
-{
-	$interbreadcrumb[] = array ('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
+// Language variables
+if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
+	$interbreadcrumb[] = array('url' => 'survey_list.php', 'name' => get_lang('SurveyList'));
 	$tool_name = get_lang('SearchASurvey');
-}
-else
-{
+} else {
 	$tool_name = get_lang('SurveyList');
 }
 
-
 // Header
-Display :: display_header($tool_name,'Survey');
+Display :: display_header($tool_name, 'Survey');
 //api_display_tool_title($tool_name);
 
 // Tool introduction
 Display::display_introduction_section('survey', 'left');
 
 // Action handling: searching
-if (isset ($_GET['search']) AND $_GET['search'] == 'advanced')
-{
+if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
 	SurveyUtil::display_survey_search_form();
 }
 // Action handling: deleting a survey
-if (isset($_GET['action']) AND $_GET['action'] == 'delete' AND isset($_GET['survey_id']) AND is_numeric($_GET['survey_id']))
-{
-	// getting the information of the survey (used for when the survey is shared)
+if (isset($_GET['action']) && $_GET['action'] == 'delete' && isset($_GET['survey_id']) && is_numeric($_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
+	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']))
-	{
+	// 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)
-	{
+	if ($return) {
 		Display :: display_confirmation_message(get_lang('SurveyDeleted'), false);
-	}
-	else
-	{
+	} else {
 		Display :: display_error_message(get_lang('ErrorOccurred'), false);
 	}
 }
 
-if(isset($_GET['action']) && $_GET['action'] == 'empty')
-{
+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,intval($_GET['survey_id'])))) {
-			// the coach can't empty a survey not belonging to his session
+		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;
 		}
@@ -134,44 +102,36 @@ if(isset($_GET['action']) && $_GET['action'] == 'empty')
 		}
 	}
 	$return = survey_manager::empty_survey(intval($_GET['survey_id']));
-	if ($return)
-	{
+	if ($return) {
 		Display :: display_confirmation_message(get_lang('SurveyEmptied'), false);
-	}
-	else
-	{
+	} else {
 		Display :: display_error_message(get_lang('ErrorOccurred'), false);
 	}
 }
 
 // Action handling: performing the same action on multiple surveys
-if ($_POST['action'])
-{
-	if (is_array($_POST['id']))
-	{
-		foreach ($_POST['id'] as $key=>$value)
+if ($_POST['action']) {
+	if (is_array($_POST['id'])) {
+		foreach ($_POST['id'] as $key => & $value)
 		{
 			// getting the information of the survey (used for when the survey is shared)
 			$survey_data = survey_manager::get_survey($value);
 			// if the survey is shared => also delete the shared content
-			if (is_numeric($survey_data['survey_share']))
-			{
+			if (is_numeric($survey_data['survey_share'])) {
 				survey_manager::delete_survey($survey_data['survey_share'], true);
 			}
 			// delete the actual survey
 			survey_manager::delete_survey($value);
 		}
 		Display :: display_confirmation_message(get_lang('SurveysDeleted'), false);
-	}
-	else
-	{
+	} else {
 		Display :: display_error_message(get_lang('NoSurveysSelected'), false);
 	}
 }
 echo $extended_rights_for_coachs;
+
 echo '<div class="actions">';
-if (!api_is_course_coach() || $extend_rights_for_coachs=='true')
-{
+if (!api_is_course_coach() || $extend_rights_for_coachs == 'true') {
 	// Action links
 	echo Display::return_icon('surveyadd.gif', get_lang('CreateNewSurvey')) . '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.get_lang('CreateNewSurvey').'</a> ';
 }
@@ -179,49 +139,41 @@ if (!api_is_course_coach() || $extend_rights_for_coachs=='true')
 echo Display::return_icon('search.gif', get_lang('Search')) . '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.get_lang('Search').'</a>';
 echo '</div>';
 
-//Load main content
-if (api_is_course_coach() && $extend_rights_for_coachs=='false')
+// Load main content
+if (api_is_course_coach() && $extend_rights_for_coachs == 'false') {
 	SurveyUtil::display_survey_list_for_coach();
-else
+} else {
 	SurveyUtil::display_survey_list();
+}
 
 // Footer
 Display :: display_footer();
 
 /* Bypass functions to make direct use from SortableTable possible */
-function get_number_of_surveys()
-{
+
+function get_number_of_surveys() {
 	return SurveyUtil::get_number_of_surveys();
 }
-function get_survey_data($from, $number_of_items, $column, $direction)
-{
+
+function 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)
-{
+
+function modify_filter($survey_id) {
 	return SurveyUtil::modify_filter($survey_id);
 }
 
-function get_number_of_surveys_for_coach()
-{
+function 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)
-{
+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);
 }
 
-
-function modify_filter_for_coach($survey_id)
-{
+function modify_filter_for_coach($survey_id) {
 	return SurveyUtil::modify_filter_for_coach($survey_id);
 }
 
-function anonymous_filter($anonymous)
-{
+function anonymous_filter($anonymous) {
 	return SurveyUtil::anonymous_filter($anonymous);
 }
-
-
-
-