chamilo / chamilo-lms

main/survey/reporting.php

Indentation +3 added lines, -3 removed lines

@@ -83,15 +83,15 @@
 
 /** @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) || $isDrhOfCourse) {
-	Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_header(get_lang('ToolSurvey'));
     // Show error message if the survey can be seen only by tutors
     if ($survey_data['visible_results'] != SURVEY_VISIBLE_TUTOR) {
         SurveyUtil::handle_reporting_actions($survey_data, $people_filled);
     } else {
         Display :: display_error_message(get_lang('NotAllowed'), false);
     }
-	Display :: display_footer();
-	exit;
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions

main/survey/question.php

Indentation +38 added lines, -38 removed lines

@@ -19,10 +19,10 @@ 
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header();
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header();
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Is valid request
@@ -42,30 +42,30 @@ 
 $surveyData = SurveyManager::get_survey($_GET['survey_id']);
 
 if (empty($surveyData)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = api_substr(api_html_entity_decode($surveyData['title'], ENT_QUOTES), 0, 40);
 if (api_strlen(strip_tags($surveyData['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 if ($surveyData['survey_type'] == 1) {
-	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
+    $sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
 	        WHERE
                 c_id = '.$course_id.' AND
                 survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
-	$rs = Database::query($sql);
-	if (Database::num_rows($rs)===0) {
+    $rs = Database::query($sql);
+    if (Database::num_rows($rs)===0) {
         Display::addFlash(
             Display::return_message(get_lang('YouNeedToCreateGroups'))
         );
-		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id']);
-		exit;
-	}
+        header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id']);
+        exit;
+    }
 }
 
 // Breadcrumbs
@@ -80,10 +80,10 @@ 
 
 // Tool name
 if ($_GET['action'] == 'add') {
-	$tool_name = get_lang('AddQuestion');
+    $tool_name = get_lang('AddQuestion');
 }
 if ($_GET['action'] == 'edit') {
-	$tool_name = get_lang('EditQuestion');
+    $tool_name = get_lang('EditQuestion');
 }
 
 // The possible question types
@@ -103,14 +103,14 @@ 
 // Actions
 $actions = '<div class="actions">';
 $actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.intval($_GET['survey_id']).'">'.
-	Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
 $actions .= '</div>';
 // Checking if it is a valid type
 if (!in_array($_GET['type'], $possible_types)) {
-	Display :: display_header($tool_name, 'Survey');
-	echo $actions;
-	Display :: display_error_message(get_lang('TypeDoesNotExist'), false);
-	Display :: display_footer();
+    Display :: display_header($tool_name, 'Survey');
+    echo $actions;
+    Display :: display_error_message(get_lang('TypeDoesNotExist'), false);
+    Display :: display_footer();
 }
 
 $error_message = '';
@@ -126,27 +126,27 @@ 
 $formData['answers'] = array('', '');
 
 if ($_GET['type'] == 'yesno') {
-	$formData['answers'][0] = get_lang('Yes');
-	$formData['answers'][1] = get_lang('No');
+    $formData['answers'][0] = get_lang('Yes');
+    $formData['answers'][1] = get_lang('No');
 }
 
 if ($_GET['type'] == 'personality') {
-	$formData['answers'][0] = 1;
-	$formData['answers'][1] = 2;
-	$formData['answers'][2] = 3;
-	$formData['answers'][3] = 4;
-	$formData['answers'][4] = 5;
-
-	$formData['values'][0] = 0;
-	$formData['values'][1] = 0;
-	$formData['values'][2] = 1;
-	$formData['values'][3] = 2;
-	$formData['values'][4] = 3;
+    $formData['answers'][0] = 1;
+    $formData['answers'][1] = 2;
+    $formData['answers'][2] = 3;
+    $formData['answers'][3] = 4;
+    $formData['answers'][4] = 5;
+
+    $formData['values'][0] = 0;
+    $formData['values'][1] = 0;
+    $formData['values'][2] = 1;
+    $formData['values'][3] = 2;
+    $formData['values'][4] = 3;
 }
 
 // We are editing a question
 if (isset($_GET['question_id']) && !empty($_GET['question_id'])) {
-	$formData = SurveyManager::get_question($_GET['question_id']);
+    $formData = SurveyManager::get_question($_GET['question_id']);
 }
 
 $formData = $surveyQuestion->preSave($formData);
@@ -155,8 +155,8 @@ 
 $surveyQuestion->renderForm();
 
 if ($surveyQuestion->getForm()->validate()) {
-	$values = $surveyQuestion->getForm()->getSubmitValues();
-	$surveyQuestion->save($surveyData, $values);
+    $values = $surveyQuestion->getForm()->getSubmitValues();
+    $surveyQuestion->save($surveyData, $values);
 }
 
 Display::display_header($tool_name, 'Survey');

main/survey/survey.lib.php

Indentation +10 added lines, -10 removed lines

@@ -1207,16 +1207,16 @@
     }
 
     /**
-    * This function saves the question in the shared database
-    *
-    * @param array $form_content all the information of the form
-    * @param array $survey_data all the information of the survey
-    *
-    * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-    * @version February 2007
-    *
-    * @todo editing of a shared question
-    */
+     * This function saves the question in the shared database
+     *
+     * @param array $form_content all the information of the form
+     * @param array $survey_data all the information of the survey
+     *
+     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+     * @version February 2007
+     *
+     * @todo editing of a shared question
+     */
     public function save_shared_question($form_content, $survey_data)
     {
         $_course = api_get_course_info();

main/survey/survey_invitation.php

Indentation +43 added lines, -43 removed lines

@@ -13,10 +13,10 @@ 
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -33,25 +33,25 @@ 
 // Getting the survey information
 // We exit here if ther is no valid $_GET parameter
 if (!isset($_GET['survey_id']) OR !is_numeric($_GET['survey_id'])) {
-	Display :: display_header($tool_name);
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header($tool_name);
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = SurveyManager::get_survey($survey_id);
 
 if (empty($survey_data)) {
-	Display :: display_header($tool_name);
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header($tool_name);
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 // Breadcrumbs
@@ -64,32 +64,32 @@ 
 
 // Checking the parameters
 if (!is_numeric($survey_id)) {
-	Display::display_error_message(get_lang('Error'), false);
-	Display::display_footer();
-	exit;
+    Display::display_error_message(get_lang('Error'), false);
+    Display::display_footer();
+    exit;
 }
 
 // Getting all the people who have filled this survey
 $answered_data = SurveyManager::get_people_who_filled_survey($survey_id);
 if ($survey_data['anonymous'] == 1) {
-	Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
-	$answered_data = array();
+    Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
+    $answered_data = array();
 }
 
 if (!isset($_GET['view']) OR $_GET['view'] == 'invited') {
-	echo get_lang('ViewInvited'). ' | ';
+    echo get_lang('ViewInvited'). ' | ';
 } else {
-	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
+    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
 }
 if ($_GET['view'] == 'answered') {
-	echo get_lang('ViewAnswered').' | ';
+    echo get_lang('ViewAnswered').' | ';
 } else {
-	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
+    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
 }
 if ($_GET['view'] == 'unanswered') {
-	echo get_lang('ViewUnanswered');
+    echo get_lang('ViewUnanswered');
 } else {
-	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
+    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
 }
 
 // Table header
@@ -111,32 +111,32 @@ 
 
 $res = Database::query($sql);
 while ($row = Database::fetch_assoc($res)) {
-	if (!$_GET['view'] ||
-		$_GET['view'] == 'invited' ||
+    if (!$_GET['view'] ||
+        $_GET['view'] == 'invited' ||
         ($_GET['view'] == 'answered' && in_array($row['user'], $answered_data)) ||
         ($_GET['view'] == 'unanswered' && !in_array($row['user'], $answered_data))
     ) {
-		echo '<tr>';
-		if (is_numeric($row['user'])) {
+        echo '<tr>';
+        if (is_numeric($row['user'])) {
             $userInfo = api_get_user_info($row['user']);
-			echo '<td>';
+            echo '<td>';
             echo UserManager::getUserProfileLink($userInfo);
             echo '</td>';
-		} else {
+        } else {
             echo '<td>'.$row['user'].'</td>';
-		}
-		echo '	<td>'.$row['invitation_date'].'</td>';
-		echo '	<td>';
-
-		if (in_array($row['user'], $answered_data)) {
-			echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$survey_id.'&amp;user='.$row['user'].'">'.get_lang('ViewAnswers').'</a>';
-		} else {
-			echo '-';
-		}
-
-		echo '	</td>';
-		echo '</tr>';
-	}
+        }
+        echo '	<td>'.$row['invitation_date'].'</td>';
+        echo '	<td>';
+
+        if (in_array($row['user'], $answered_data)) {
+            echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$survey_id.'&amp;user='.$row['user'].'">'.get_lang('ViewAnswers').'</a>';
+        } else {
+            echo '-';
+        }
+
+        echo '	</td>';
+        echo '</tr>';
+    }
 }
 
 // Closing the table

main/survey/survey.php

Indentation +143 added lines, -143 removed lines

@@ -20,8 +20,8 @@ 
 // Coach can't view this page
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');
 $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
-	api_get_user_id(),
-	api_get_course_info()
+    api_get_user_id(),
+    api_get_course_info()
 );
 
 if ($isDrhOfCourse) {
@@ -31,10 +31,10 @@ 
 if (!api_is_allowed_to_edit(false, true) ||
     (api_is_course_coach() && $extend_rights_for_coachs == 'false')
 ) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -51,21 +51,21 @@ 
 
 // Breadcrumbs
 $interbreadcrumb[] = array(
-		'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php',
-		'name' => get_lang('SurveyList'),
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php',
+        'name' => get_lang('SurveyList'),
 );
 
 // Getting the survey information
 if (!empty($_GET['survey_id'])) {
-	$course_code = api_get_course_id();
-	if ($course_code!=-1) {
-		$survey_data = SurveyManager::get_survey($survey_id);
-	} else {
-		Display :: display_header(get_lang('ToolSurvey'));
-		Display :: display_error_message(get_lang('NotAllowed'), false);
-		Display :: display_footer();
-		exit;
-	}
+    $course_code = api_get_course_id();
+    if ($course_code!=-1) {
+        $survey_data = SurveyManager::get_survey($survey_id);
+    } else {
+        Display :: display_header(get_lang('ToolSurvey'));
+        Display :: display_error_message(get_lang('NotAllowed'), false);
+        Display :: display_footer();
+        exit;
+    }
 } else {
     Display :: display_header(get_lang('ToolSurvey'));
     Display :: display_error_message(get_lang('NotAllowed'), false);
@@ -78,30 +78,30 @@ 
 $is_survey_type_1 = $survey_data['survey_type'] == 1;
 
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$tool_name .= '...';
+    $tool_name .= '...';
 }
 
 if ($is_survey_type_1 && ($action == 'addgroup' || $action == 'deletegroup')) {
-	$_POST['name'] = trim($_POST['name']);
-	if ($action == 'addgroup') {
-		if (!empty($_POST['group_id'])) {
-			Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
+    $_POST['name'] = trim($_POST['name']);
+    if ($action == 'addgroup') {
+        if (!empty($_POST['group_id'])) {
+            Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
 			                 WHERE c_id = '.$course_id.' AND id = \''.Database::escape_string($_POST['group_id']).'\'');
-			$sendmsg = 'GroupUpdatedSuccessfully';
-		} elseif(!empty($_POST['name'])) {
-			Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
-			$sendmsg = 'GroupCreatedSuccessfully';
-		} else {
-			$sendmsg = 'GroupNeedName';
-		}
-	}
-
-	if ($action == 'deletegroup') {
-		Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.intval($_GET['gid']).' and survey_id = '.intval($survey_id));
-		$sendmsg = 'GroupDeletedSuccessfully';
-	}
-	header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
-	exit;
+            $sendmsg = 'GroupUpdatedSuccessfully';
+        } elseif(!empty($_POST['name'])) {
+            Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
+            $sendmsg = 'GroupCreatedSuccessfully';
+        } else {
+            $sendmsg = 'GroupNeedName';
+        }
+    }
+
+    if ($action == 'deletegroup') {
+        Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.intval($_GET['gid']).' and survey_id = '.intval($survey_id));
+        $sendmsg = 'GroupDeletedSuccessfully';
+    }
+    header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
+    exit;
 }
 
 // Displaying the header
@@ -115,13 +115,13 @@ 
 $message_information    = isset($_GET['message']) ? Security::remove_XSS($_GET['message']) : null;
 
 if (isset($action)) {
-	if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
-		SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
-		Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
-	}
-	if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
-		SurveyManager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
-	}
+    if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
+        SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
+        Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
+    }
+    if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
+        SurveyManager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
+    }
 }
 
 if (!empty($survey_data['survey_version'])) echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
@@ -139,24 +139,24 @@ 
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
-	echo '<div class="panel panel-default">';
+    echo '<div class="panel panel-default">';
         echo '<div class="panel-body">';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
-	echo '</div>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
+    echo '</div>';
         echo '</div>';
 } else {
-	echo '<div class="panel panel-default">';
+    echo '<div class="panel panel-default">';
         echo '<div class="panel-body">';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'"><img src="../img/icons/22/yesno.png" /></a></div>';
-	echo '</div>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'"><img src="../img/icons/22/yesno.png" /></a></div>';
+    echo '</div>';
         echo '</div>';
 }
 
@@ -169,7 +169,7 @@ 
 echo '		<th width="50" >'.get_lang('NumberOfOptions').'</th>';
 echo '		<th width="100">'.get_lang('Modify').'</th>';
 if ($is_survey_type_1) {
-	echo '<th width="100">'.get_lang('Condition').'</th>';
+    echo '<th width="100">'.get_lang('Condition').'</th>';
     echo '<th width="40">'.get_lang('Group').'</th>';
 }
 echo '	</tr>';
@@ -196,97 +196,97 @@ 
 $result = Database::query($sql);
 $question_counter_max = Database::num_rows($result);
 while ($row = Database::fetch_array($result, 'ASSOC')) {
-	echo '<tr>';
-	echo '	<td>'.$question_counter.'</td>';
-	echo '	<td>';
-	if (api_strlen($row['survey_question']) > 100) {
-		echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
-	} else {
-		echo $row['survey_question'];
-	}
-
-	if ($row['type'] == 'yesno') {
-		$tool_name = get_lang('YesNo');
-	} else if ($row['type'] == 'multiplechoice') {
-		$tool_name = get_lang('UniqueSelect');
-	} else {
-		$tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
-	}
-
-	echo '</td>';
-	echo '	<td>'.$tool_name.'</td>';
-	echo '	<td>'.$row['number_of_options'].'</td>';
-	echo '	<td>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-	if ($question_counter > 1) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
-	} else {
-		Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
-	}
-	if ($question_counter < $question_counter_max) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
-	} else {
-		Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
-	}
-	echo '	</td>';
-	$question_counter++;
-
-	if ($is_survey_type_1) {
-    	echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
+    echo '<tr>';
+    echo '	<td>'.$question_counter.'</td>';
+    echo '	<td>';
+    if (api_strlen($row['survey_question']) > 100) {
+        echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
+    } else {
+        echo $row['survey_question'];
+    }
+
+    if ($row['type'] == 'yesno') {
+        $tool_name = get_lang('YesNo');
+    } else if ($row['type'] == 'multiplechoice') {
+        $tool_name = get_lang('UniqueSelect');
+    } else {
+        $tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
+    }
+
+    echo '</td>';
+    echo '	<td>'.$tool_name.'</td>';
+    echo '	<td>'.$row['number_of_options'].'</td>';
+    echo '	<td>';
+    echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+    echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+    if ($question_counter > 1) {
+        echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
+    } else {
+        Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+    }
+    if ($question_counter < $question_counter_max) {
+        echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
+    } else {
+        Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+    }
+    echo '	</td>';
+    $question_counter++;
+
+    if ($is_survey_type_1) {
+        echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
         echo '<td>'.(($row['survey_group_pri']==0)?$groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']]:$groups[$row['survey_group_pri']]).'</td>';
     }
-	echo '</tr>';
+    echo '</tr>';
 }
 
 echo '</table>';
 
 if ($is_survey_type_1) {
-	echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
-
-	if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
-		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
-	}
-
-	if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
-		echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
-	}
-	echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
-	echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
-	if ($_GET['action'] == 'editgroup') {
-		$sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
-		$rs = Database::query($sql);
-		$editedrow = Database::fetch_array($rs,'ASSOC');
-		echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
-		echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
-		echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
-		echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
-	} else {
-		echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
-		echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
-		echo	'<input type="submit" value="'.get_lang('Create').'"';
-	}
-	echo	'</form><br />';
-
-	echo '<table class="data_table">';
-	echo '	<tr class="row_odd">';
-	echo '		<th width="200">'.get_lang('Name').'</th>';
-	echo '		<th>'.get_lang('Description').'</th>';
-	echo '		<th width="100">'.get_lang('Modify').'</th>';
-	echo '	</tr>';
-
-	$sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
-
-	$rs = Database::query($sql);
-	while($row = Database::fetch_array($rs,ASSOC)){
-		$grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
-		Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
-		Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
-		'</td></tr>';
-	}
-	echo $grouplist.'</table>';
+    echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
+
+    if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
+        echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
+    }
+
+    if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
+        echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
+    }
+    echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
+    echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
+    if ($_GET['action'] == 'editgroup') {
+        $sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
+        $rs = Database::query($sql);
+        $editedrow = Database::fetch_array($rs,'ASSOC');
+        echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
+        echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
+        echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
+        echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
+    } else {
+        echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
+        echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
+        echo	'<input type="submit" value="'.get_lang('Create').'"';
+    }
+    echo	'</form><br />';
+
+    echo '<table class="data_table">';
+    echo '	<tr class="row_odd">';
+    echo '		<th width="200">'.get_lang('Name').'</th>';
+    echo '		<th>'.get_lang('Description').'</th>';
+    echo '		<th width="100">'.get_lang('Modify').'</th>';
+    echo '	</tr>';
+
+    $sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
+
+    $rs = Database::query($sql);
+    while($row = Database::fetch_array($rs,ASSOC)){
+        $grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
+        '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
+        Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
+        '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
+        Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+        '</td></tr>';
+    }
+    echo $grouplist.'</table>';
 }
 
 Session::erase('answer_count');

main/survey/preview.php

Indentation +105 added lines, -105 removed lines

@@ -43,10 +43,10 @@ 
 
 // We exit here if there is no valid $_GET parameter
 if (!isset($_GET['survey_id']) || !is_numeric($_GET['survey_id'])){
-	Display::display_header(get_lang('SurveyPreview'));
-	Display::display_error_message(get_lang('InvallidSurvey'), false);
-	Display::display_footer();
-	exit;
+    Display::display_header(get_lang('SurveyPreview'));
+    Display::display_error_message(get_lang('InvallidSurvey'), false);
+    Display::display_footer();
+    exit;
 }
 
 // Getting the survey information
@@ -54,17 +54,17 @@ 
 $survey_data = SurveyManager::get_survey($survey_id);
 
 if (empty($survey_data)) {
-	Display::display_header(get_lang('SurveyPreview'));
-	Display::display_error_message(get_lang('InvallidSurvey'), false);
-	Display::display_footer();
-	exit;
+    Display::display_header(get_lang('SurveyPreview'));
+    Display::display_error_message(get_lang('InvallidSurvey'), false);
+    Display::display_footer();
+    exit;
 }
 
 $urlname = strip_tags($survey_data['title']);
 if (api_is_allowed_to_edit()) {
-	// Breadcrumbs
-	$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
-	$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => $urlname);
+    // Breadcrumbs
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php', 'name' => get_lang('SurveyList'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id, 'name' => $urlname);
 }
 $courseCode = isset($_GET['cidReq']) ? $_GET['cidReq'] : null;
 $surveyAnonymous = SurveyManager::get_survey($survey_id, 0, $courseCode);
@@ -92,57 +92,57 @@ 
 $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)
+    (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>';
+    // 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'])) {
         if (!empty($survey_data['survey_introduction'])) {
             echo '<div id="survey_content" class="survey_content">'.$survey_data['survey_introduction'].'</div>';
         }
-		$limit = 0;
-	}
+        $limit = 0;
+    }
 
-	// Displaying the survey thanks message
-	if (isset($_POST['finish_survey'])) {
-		Display::display_confirmation_message(get_lang('SurveyFinished'));
+    // Displaying the survey thanks message
+    if (isset($_POST['finish_survey'])) {
+        Display::display_confirmation_message(get_lang('SurveyFinished'));
         echo $survey_data['survey_thanks'];
-		Display :: display_footer();
-		exit;
-	}
+        Display :: display_footer();
+        exit;
+    }
 
     $questions = array();
 
-	if (isset($_GET['show'])) {
-		// Getting all the questions for this page and add them to a
-		// multidimensional array where the first index is the page.
-		// as long as there is no pagebreak fount we keep adding questions to the page
-		$questions_displayed = array();
-		$paged_questions = array();
-		$counter = 0;
-		$sql = "SELECT * FROM $table_survey_question
+    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();
+        $paged_questions = array();
+        $counter = 0;
+        $sql = "SELECT * FROM $table_survey_question
 		        WHERE c_id = $course_id AND survey_id = '".intval($survey_id)."'
 				ORDER BY sort ASC";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
         $questions_exists = true;
         if (Database::num_rows($result)) {
-    		while ($row = Database::fetch_array($result)) {
-    			if ($row['type'] == 'pagebreak') {
-    				$counter++;
-    			} else {
-    				$paged_questions[$counter][] = $row['question_id'];
-    			}
-    		}
+            while ($row = Database::fetch_array($result)) {
+                if ($row['type'] == 'pagebreak') {
+                    $counter++;
+                } else {
+                    $paged_questions[$counter][] = $row['question_id'];
+                }
+            }
         } else {
             $questions_exists = false;
         }
 
-		if (array_key_exists($_GET['show'], $paged_questions)) {
-			$sql = "SELECT
+        if (array_key_exists($_GET['show'], $paged_questions)) {
+            $sql = "SELECT
                         survey_question.question_id,
                         survey_question.survey_id,
                         survey_question.survey_question,
@@ -164,75 +164,75 @@ 
 						survey_question.c_id =  $course_id
 					ORDER BY survey_question.sort, survey_question_option.sort ASC";
 
-			$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') {
-					$questions[$row['sort']]['question_id'] = $row['question_id'];
-					$questions[$row['sort']]['survey_id'] = $row['survey_id'];
-					$questions[$row['sort']]['survey_question'] = $row['survey_question'];
-					$questions[$row['sort']]['display'] = $row['display'];
-					$questions[$row['sort']]['type'] = $row['type'];
-					$questions[$row['sort']]['options'][intval($row['option_sort'])] = $row['option_text'];
-					$questions[$row['sort']]['maximum_score'] = $row['max_value'];
-				} else {
-					// If the type is a pagebreak we are finished loading the questions for this page
-					break;
-				}
-				$counter_question++;
-			}
-		}
-	}
-
-	// Selecting the maximum number of pages
-	$sql = "SELECT * FROM $table_survey_question
+            $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') {
+                    $questions[$row['sort']]['question_id'] = $row['question_id'];
+                    $questions[$row['sort']]['survey_id'] = $row['survey_id'];
+                    $questions[$row['sort']]['survey_question'] = $row['survey_question'];
+                    $questions[$row['sort']]['display'] = $row['display'];
+                    $questions[$row['sort']]['type'] = $row['type'];
+                    $questions[$row['sort']]['options'][intval($row['option_sort'])] = $row['option_text'];
+                    $questions[$row['sort']]['maximum_score'] = $row['max_value'];
+                } else {
+                    // If the type is a pagebreak we are finished loading the questions for this page
+                    break;
+                }
+                $counter_question++;
+            }
+        }
+    }
+
+    // Selecting the maximum number of pages
+    $sql = "SELECT * FROM $table_survey_question
 	        WHERE
 	            c_id = $course_id AND
 	            type='".Database::escape_string('pagebreak')."' AND
 	            survey_id='".intval($survey_id)."'";
-	$result = Database::query($sql);
-	$numberofpages = Database::num_rows($result) + 1;
-
-	// Displaying the form with the questions
-	if (isset($_GET['show'])) {
-		$show = (int)$_GET['show'] + 1;
-	} else {
-		$show = 0;
-	}
-
-	$url = api_get_self().'?survey_id='.Security::remove_XSS($survey_id).'&show='.$show;
-	$form = new FormValidator('question', 'post', $url);
-
-	if (is_array($questions) && count($questions) > 0) {
-		foreach ($questions as $key => & $question) {
-			$ch_type = 'ch_'.$question['type'];
-			/** @var survey_question $display */
-			$display = new $ch_type;
-			$form->addHtml('<div class="survey_question_wrapper"><div class="survey_question">');
-			$form->addHtml($question['survey_question']);
-			$display->render($form, $question);
-			$form->addHtml('</div></div>');
-		}
-	}
-
-	if (($show < $numberofpages) || (!$_GET['show'] && count($questions) > 0)) {
+    $result = Database::query($sql);
+    $numberofpages = Database::num_rows($result) + 1;
+
+    // Displaying the form with the questions
+    if (isset($_GET['show'])) {
+        $show = (int)$_GET['show'] + 1;
+    } else {
+        $show = 0;
+    }
+
+    $url = api_get_self().'?survey_id='.Security::remove_XSS($survey_id).'&show='.$show;
+    $form = new FormValidator('question', 'post', $url);
+
+    if (is_array($questions) && count($questions) > 0) {
+        foreach ($questions as $key => & $question) {
+            $ch_type = 'ch_'.$question['type'];
+            /** @var survey_question $display */
+            $display = new $ch_type;
+            $form->addHtml('<div class="survey_question_wrapper"><div class="survey_question">');
+            $form->addHtml($question['survey_question']);
+            $display->render($form, $question);
+            $form->addHtml('</div></div>');
+        }
+    }
+
+    if (($show < $numberofpages) || (!$_GET['show'] && count($questions) > 0)) {
         if ($show == 0) {
-			$form->addButton('next_survey_page', get_lang('StartSurvey'), 'arrow-right', 'success', 'large');
+            $form->addButton('next_survey_page', get_lang('StartSurvey'), 'arrow-right', 'success', 'large');
         } else {
-			$form->addButton('next_survey_page', get_lang('NextQuestion'), 'arrow-right');
+            $form->addButton('next_survey_page', get_lang('NextQuestion'), 'arrow-right');
         }
-	}
-	if ($show >= $numberofpages && $_GET['show'] || (isset($_GET['show']) && count($questions) == 0)) {
-		if ($questions_exists == false) {
-			echo '<p>'.get_lang('ThereAreNotQuestionsForthisSurvey').'</p>';
-		}
-		$form->addButton('finish_survey', get_lang('FinishSurvey'), 'arrow-right');
-	}
-	$form->display();
+    }
+    if ($show >= $numberofpages && $_GET['show'] || (isset($_GET['show']) && count($questions) == 0)) {
+        if ($questions_exists == false) {
+            echo '<p>'.get_lang('ThereAreNotQuestionsForthisSurvey').'</p>';
+        }
+        $form->addButton('finish_survey', get_lang('FinishSurvey'), 'arrow-right');
+    }
+    $form->display();
 } else {
-	Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_error_message(get_lang('NotAllowed'), false);
 }
 
 // Footer

main/session/session_course_user_list.php

Indentation +7 added lines, -7 removed lines

@@ -50,8 +50,8 @@ 
 
 $result = Database::query($sql);
 if (!list($session_name,$course_title) = Database::fetch_row($result)) {
-	header('Location: session_course_list.php?id_session='.$id_session);
-	exit();
+    header('Location: session_course_list.php?id_session='.$id_session);
+    exit();
 }
 
 switch ($action) {
@@ -122,7 +122,7 @@ 
 <a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo $page-1; ?>&sort=<?php echo $sort; ?>"><?php echo get_lang('Previous');?></a>
 <?php
 } else {
-	echo get_lang('Previous');
+    echo get_lang('Previous');
 }
 ?>
 |
@@ -132,7 +132,7 @@ 
 <a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo $page+1; ?>&sort=<?php echo $sort; ?>"><?php echo get_lang('Next');?></a>
 <?php
 } else {
-	echo get_lang('Next');
+    echo get_lang('Next');
 }
 ?>
 </div>
@@ -154,9 +154,9 @@ 
 $i=0;
 foreach ($users as $key => $enreg) {
 
-	if ($key == $limit) {
-		break;
-	}
+    if ($key == $limit) {
+        break;
+    }
     ?>
     <tr class="<?php echo $i?'row_odd':'row_even'; ?>">
         <td><input type="checkbox" name="idChecked[]" value="<?php echo $enreg['user_id']; ?>"></td>

main/session/session_add.php

Indentation +26 added lines, -26 removed lines

@@ -36,27 +36,27 @@ 
 function search_coachs($needle)
 {
     $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-	$xajax_response = new xajaxResponse();
-	$return = '';
+    $xajax_response = new xajaxResponse();
+    $return = '';
 
-	if (!empty($needle)) {
-		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+    if (!empty($needle)) {
+        $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
 
-		// search users where username or firstname or lastname begins likes $needle
-		$sql = 'SELECT username, lastname, firstname
+        // search users where username or firstname or lastname begins likes $needle
+        $sql = 'SELECT username, lastname, firstname
 		        FROM '.$tbl_user.' user
 				WHERE (username LIKE "'.$needle.'%"
 				OR firstname LIKE "'.$needle.'%"
 				OR lastname LIKE "'.$needle.'%")
 				AND status=1'.
-				$order_clause.
-				' LIMIT 10';
-
-		if (api_is_multiple_url_enabled()) {
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-			$access_url_id = api_get_current_access_url_id();
-			if ($access_url_id != -1) {
-				$sql = 'SELECT username, lastname, firstname
+                $order_clause.
+                ' LIMIT 10';
+
+        if (api_is_multiple_url_enabled()) {
+            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $access_url_id = api_get_current_access_url_id();
+            if ($access_url_id != -1) {
+                $sql = 'SELECT username, lastname, firstname
                         FROM '.$tbl_user.' user
                         INNER JOIN '.$tbl_user_rel_access_url.' url_user
                         ON (url_user.user_id=user.user_id)
@@ -70,16 +70,16 @@ 
                             AND status=1'.
                         $order_clause.'
                         LIMIT 10';
-			}
-		}
-
-		$rs = Database::query($sql);
-		while ($user = Database :: fetch_array($rs)) {
-			$return .= '<a href="javascript: void(0);" onclick="javascript: fill_coach_field(\''.$user['username'].'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
-		}
-	}
-	$xajax_response -> addAssign('ajax_list_coachs','innerHTML', api_utf8_encode($return));
-	return $xajax_response;
+            }
+        }
+
+        $rs = Database::query($sql);
+        while ($user = Database :: fetch_array($rs)) {
+            $return .= '<a href="javascript: void(0);" onclick="javascript: fill_coach_field(\''.$user['username'].'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
+        }
+    }
+    $xajax_response -> addAssign('ajax_list_coachs','innerHTML', api_utf8_encode($return));
+    return $xajax_response;
 }
 $xajax -> processRequests();
 
@@ -122,7 +122,7 @@ 
 </script>";
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
-	$formSent = 1;
+    $formSent = 1;
 }
 
 $tool_name = get_lang('AddSession');
@@ -212,7 +212,7 @@ 
 Display::display_header($tool_name);
 
 if (!empty($return)) {
-	Display::display_error_message($return,false);
+    Display::display_error_message($return,false);
 }
 
 echo '<div class="actions">';

main/session/session_course_list.php

Indentation +26 added lines, -26 removed lines

@@ -30,26 +30,26 @@ 
 $result = Database::query("SELECT name FROM $tbl_session WHERE id='$id_session'");
 
 if (!list($session_name)=Database::fetch_row($result)) {
-	header('Location: session_list.php');
-	exit;
+    header('Location: session_list.php');
+    exit;
 }
 
 if ($action == 'delete') {
-	$idChecked = $_REQUEST['idChecked'];
-	if (is_array($idChecked) && count($idChecked)>0) {
-		$my_temp = array();
-		foreach ($idChecked as $id){
-			$my_temp[]= Database::escape_string($id);// forcing the escape_string
-		}
-		$idChecked = $my_temp;
-		$idChecked="'".implode("','", $idChecked)."'";
-		$result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
-		$nbr_affected_rows=Database::affected_rows($result);
-		Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
-		Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
-	}
-	header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort);
-	exit();
+    $idChecked = $_REQUEST['idChecked'];
+    if (is_array($idChecked) && count($idChecked)>0) {
+        $my_temp = array();
+        foreach ($idChecked as $id){
+            $my_temp[]= Database::escape_string($id);// forcing the escape_string
+        }
+        $idChecked = $my_temp;
+        $idChecked="'".implode("','", $idChecked)."'";
+        $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
+        $nbr_affected_rows=Database::affected_rows($result);
+        Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
+        Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
+    }
+    header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort);
+    exit();
 }
 
 $limit  = 20;
@@ -82,17 +82,17 @@ 
 $tableCourses = array();
 
 foreach ($Courses as $key=>$enreg) {
-	$course = array();
-	$course[] = '<input type="checkbox" name="idChecked[]" value="'.$enreg['id'].'">';
-	$course[] = api_htmlentities($enreg['title'],ENT_QUOTES,$charset);
-	$course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
-	$course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
-		Display::return_icon('course_home.gif', get_lang('Course')).'</a>
+    $course = array();
+    $course[] = '<input type="checkbox" name="idChecked[]" value="'.$enreg['id'].'">';
+    $course[] = api_htmlentities($enreg['title'],ENT_QUOTES,$charset);
+    $course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
+    $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
+        Display::return_icon('course_home.gif', get_lang('Course')).'</a>
 			<a href="session_course_edit.php?id_session='.$id_session.'&page=session_course_list.php&course_code='.$enreg['code'].'">'.
-		Display::return_icon('edit.png', get_lang('Edit')).'</a>
+        Display::return_icon('edit.png', get_lang('Edit')).'</a>
 			<a href="'.api_get_self().'?id_session='.$id_session.'&sort='.$sort.'&action=delete&idChecked[]='.$enreg['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.
-		Display::return_icon('delete.png', get_lang('Delete')).'</a>';
-	$tableCourses[] = $course;
+        Display::return_icon('delete.png', get_lang('Delete')).'</a>';
+    $tableCourses[] = $course;
 }
 echo '<form method="post" action="'.api_get_self().'">';
 Display :: display_sortable_table($tableHeader, $tableCourses, array (), array ());