chamilo / chamilo-lms

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

Spacing +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@ 
 
 // Database table definitions
 $table_survey 					= Database :: get_course_table(TABLE_SURVEY);
-$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
-$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
-$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
-$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
 $tool_name = get_lang('SurveyInvitations');
 
@@ -77,7 +77,7 @@ 
 }
 
 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> |';
 }

main/survey/survey.php

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,9 @@
 	}
 }
 
-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']);

Indentation +142 added lines, -142 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) {
@@ -32,7 +32,7 @@ 
     (api_is_course_coach() && $extend_rights_for_coachs == 'false')
 ) {
     api_not_allowed(true);
-	exit;
+    exit;
 }
 
 // Database table definitions
@@ -49,21 +49,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);
@@ -76,30 +76,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
@@ -113,13 +113,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>';
@@ -137,26 +137,26 @@ 
 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.'">';
-	echo Display::return_icon("yesno.png");
-	echo '</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.'">';
+    echo Display::return_icon("yesno.png");
+    echo '</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');

Spacing +23 added lines, -23 removed lines

@@ -12,7 +12,7 @@ 
 require_once __DIR__.'/../inc/global.inc.php';
 
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_SURVEY;
+$current_course_tool = TOOL_SURVEY;
 
 api_protect_course_script(true);
 
@@ -56,7 +56,7 @@ 
 // Getting the survey information
 if (!empty($_GET['survey_id'])) {
 	$course_code = api_get_course_id();
-	if ($course_code!=-1) {
+	if ($course_code != -1) {
 		$survey_data = SurveyManager::get_survey($survey_id);
 	} else {
 		Display :: display_header(get_lang('ToolSurvey'));
@@ -86,7 +86,7 @@ 
 			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'])) {
+		} 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 {
@@ -114,7 +114,7 @@ 
 
 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);
+		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'])) {
@@ -128,12 +128,12 @@ 
 SurveyUtil::check_first_last_question($_GET['survey_id']);
 
 // Action links
-$survey_actions = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('EditSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('DeleteSurvey').'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('DeleteSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('EditSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('DeleteSurvey').'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('DeleteSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
 //$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
@@ -217,24 +217,24 @@ 
 	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>';
+	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>';
+		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);
+		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>';
+		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);
+		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 '<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>';
 }
@@ -248,7 +248,7 @@ 
 		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
 	}
 
-	if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
+	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>';
@@ -256,7 +256,7 @@ 
 	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');
+		$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']).'">';
@@ -278,12 +278,12 @@ 
 	$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)){
+	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>'.
+		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>';

main/survey/link.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 if (!SurveyManager::survey_generation_hash_available()) {
     api_not_allowed(true);
 }
-$course_info  = api_get_course_info_by_id($_REQUEST['c']);
+$course_info = api_get_course_info_by_id($_REQUEST['c']);
 
 $hash_is_valid = SurveyManager::validate_survey_hash(
     $survey_id,

main/survey/ch_percentage.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
             $options[$key] = $value;
         }
 
-        $name = 'question' . $questionData['question_id'];
+        $name = 'question'.$questionData['question_id'];
 
         $form->addSelect(
             $name, null, $options

main/survey/ch_score.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             $options = array(
                 '--' => '--'
             );
-            for ($i=1; $i <= $questionData['maximum_score']; $i++) {
+            for ($i = 1; $i <= $questionData['maximum_score']; $i++) {
                 $options[$i] = $i;
             }
 

main/survey/survey_list.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
     if (api_is_allowed_to_edit()) {
         SurveyManager::copy_survey($_GET['survey_id']);
         $message = get_lang('SurveyCopied');
-        header('Location: ' . api_get_path(WEB_CODE_PATH) . 'survey/survey_list.php?' . api_get_cidreq());
+        header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq());
         exit;
     }
 }
@@ -162,10 +162,10 @@ 
 if (!api_is_course_coach() || $extend_rights_for_coachs == 'true') {
     // Action links
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.
-        Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'), '', ICON_SIZE_MEDIUM).'</a> ';
 }
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.
-    Display::return_icon('search.png', get_lang('Search'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('search.png', get_lang('Search'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 // Load main content

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>

Spacing +35 added lines, -35 removed lines

@@ -18,7 +18,7 @@ 
 $id_session = intval($_GET['id_session']);
 SessionManager::protectSession($id_session);
 
-if (empty($id_session )) {
+if (empty($id_session)) {
     api_not_allowed();
 }
 
@@ -28,16 +28,16 @@ 
 
 $page           = isset($_GET['page']) ? intval($_GET['page']) : null;
 $action         = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
-$default_sort   = api_sort_by_first_name() ? 'firstname':'lastname';
-$sort           = isset($_GET['sort']) && in_array($_GET['sort'], array('lastname','firstname','username')) ? $_GET['sort'] : $default_sort;
+$default_sort   = api_sort_by_first_name() ? 'firstname' : 'lastname';
+$sort           = isset($_GET['sort']) && in_array($_GET['sort'], array('lastname', 'firstname', 'username')) ? $_GET['sort'] : $default_sort;
 $idChecked      = isset($_GET['idChecked']) && is_array($_GET['idChecked']) ? $_GET['idChecked'] : (isset($_POST['idChecked']) && is_array($_POST['idChecked']) ? $_POST['idChecked'] : null);
-$direction      = isset($_GET['direction']) && in_array($_GET['direction'], array('desc','asc')) ? $_GET['direction'] : 'desc';
+$direction      = isset($_GET['direction']) && in_array($_GET['direction'], array('desc', 'asc')) ? $_GET['direction'] : 'desc';
 
 if (is_array($idChecked)) {
     $my_temp = array();
     foreach ($idChecked as $id) {
         // forcing the intval
-        $my_temp[]= intval($id);
+        $my_temp[] = intval($id);
     }
     $idChecked = $my_temp;
 }
@@ -49,14 +49,14 @@ 
 		WHERE src.session_id='$id_session' AND src.c_id='$courseId' ";
 
 $result = Database::query($sql);
-if (!list($session_name,$course_title) = Database::fetch_row($result)) {
+if (!list($session_name, $course_title) = Database::fetch_row($result)) {
 	header('Location: session_course_list.php?id_session='.$id_session);
 	exit();
 }
 
 switch ($action) {
     case 'delete':
-        if (is_array($idChecked) && count($idChecked)>0) {
+        if (is_array($idChecked) && count($idChecked) > 0) {
             array_map('intval', $idChecked);
             $idChecked = implode(',', $idChecked);
         }
@@ -91,7 +91,7 @@ 
          ON (s.session_id = scru.session_id AND s.user_id = scru.user_id AND scru.c_id = '".$courseId."' )
          WHERE s.session_id='$id_session'
          ORDER BY $sort $direction
-         LIMIT $from,".($limit+1);
+         LIMIT $from,".($limit + 1);
 
 if ($direction == 'desc') {
     $direction = 'asc';
@@ -107,8 +107,8 @@ 
 $tool_name = get_lang('Session').': '.$session_name.' - '.get_lang('Course').': '.$course_title;
 
 //$interbreadcrumb[] = array("url" => "index.php","name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array("url" => "session_list.php","name" => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
+$interbreadcrumb[] = array("url" => "session_list.php", "name" => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
 
 Display::display_header($tool_name);
 
@@ -117,9 +117,9 @@ 
 <form method="post" action="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=<?php echo $sort; ?>" onsubmit="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
 <div align="right">
 <?php
-if($page) {
+if ($page) {
 ?>
-<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>
+<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');
@@ -127,9 +127,9 @@ 
 ?>
 |
 <?php
-if($nbr_results > $limit) {
+if ($nbr_results > $limit) {
 ?>
-<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>
+<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');
@@ -141,39 +141,39 @@ 
 <tr>
   <th>&nbsp;</th>
   <?php if ($is_western_name_order) { ?>
-  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=firstname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('FirstName');?></a></th>
-  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=lastname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('LastName');?></a></th>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=firstname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('FirstName'); ?></a></th>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=lastname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('LastName'); ?></a></th>
   <?php } else { ?>
-  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=lastname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('LastName');?></a></th>
-  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=firstname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('FirstName');?></a></th>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=lastname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('LastName'); ?></a></th>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=firstname&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('FirstName'); ?></a></th>
   <?php } ?>
-  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=username&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('Login');?></a></th>
-  <th><?php echo get_lang('Actions');?></th>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=username&direction=<?php echo urlencode($direction); ?>"><?php echo get_lang('Login'); ?></a></th>
+  <th><?php echo get_lang('Actions'); ?></th>
 </tr>
 <?php
-$i=0;
+$i = 0;
 foreach ($users as $key => $enreg) {
 
 	if ($key == $limit) {
 		break;
 	}
     ?>
-    <tr class="<?php echo $i?'row_odd':'row_even'; ?>">
+    <tr class="<?php echo $i ? 'row_odd' : 'row_even'; ?>">
         <td><input type="checkbox" name="idChecked[]" value="<?php echo $enreg['user_id']; ?>"></td>
         <?php if ($is_western_name_order) { ?>
-        <td><?php echo api_htmlentities($enreg['firstname'],ENT_QUOTES,$charset); ?></td>
-        <td><?php echo api_htmlentities($enreg['lastname'],ENT_QUOTES,$charset); ?></td>
+        <td><?php echo api_htmlentities($enreg['firstname'], ENT_QUOTES, $charset); ?></td>
+        <td><?php echo api_htmlentities($enreg['lastname'], ENT_QUOTES, $charset); ?></td>
         <?php } else { ?>
-        <td><?php echo api_htmlentities($enreg['lastname'],ENT_QUOTES,$charset); ?></td>
-        <td><?php echo api_htmlentities($enreg['firstname'],ENT_QUOTES,$charset); ?></td>
+        <td><?php echo api_htmlentities($enreg['lastname'], ENT_QUOTES, $charset); ?></td>
+        <td><?php echo api_htmlentities($enreg['firstname'], ENT_QUOTES, $charset); ?></td>
         <?php } ?>
-        <td><?php echo api_htmlentities($enreg['username'],ENT_QUOTES,$charset); ?></td>
+        <td><?php echo api_htmlentities($enreg['username'], ENT_QUOTES, $charset); ?></td>
         <td>
         <?php if ($enreg['is_subscribed']) { ?>
             <a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=<?php echo $sort; ?>&action=delete&idChecked[]=<?php echo $enreg['user_id']; ?>" onclick="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
                 <?php Display::display_icon('delete.png', get_lang('Delete')); ?>
             </a>
-        <?php } else  { ?>
+        <?php } else { ?>
             <a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=<?php echo $sort; ?>&action=add&idChecked[]=<?php echo $enreg['user_id']; ?>" onclick="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
                 <?php Display::display_icon('add.png', get_lang('Add'), array(), ICON_SIZE_SMALL); ?>
             </a>
@@ -182,7 +182,7 @@ 
         </td>
     </tr>
     <?php
-        $i=$i ? 0 : 1;
+        $i = $i ? 0 : 1;
 }
 unset($users);
 ?>
@@ -190,9 +190,9 @@ 
 <br />
 <div align="left">
     <?php
-    if($page) {
+    if ($page) {
     ?>
-    <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>
+    <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');
@@ -200,9 +200,9 @@ 
     ?>
     |
     <?php
-    if($nbr_results > $limit) {
+    if ($nbr_results > $limit) {
     ?>
-    <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>
+    <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');
@@ -211,8 +211,8 @@ 
 </div>
 <br />
 <select name="action">
-<option value="delete"><?php echo get_lang('UnsubscribeSelectedUsersFromSession');?></option>
-<option value="add"><?php echo get_lang('AddUsers');?></option>
+<option value="delete"><?php echo get_lang('UnsubscribeSelectedUsersFromSession'); ?></option>
+<option value="add"><?php echo get_lang('AddUsers'); ?></option>
 </select>
 <button class="save" type="submit"> <?php echo get_lang('Ok'); ?></button>
 </form>

main/session/session_course_user.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 SessionManager::protectSession($id_session);
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 $interbreadcrumb[] = array(
     'url' => 'resume_session.php?id_session='.$id_session,
     'name' => get_lang('SessionOverview'),
@@ -43,7 +43,7 @@ 
             FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).'
             WHERE id='.$id_session;
     $rs = Database::query($sql);
-    if (Database::result($rs,0,0)!=$_user['user_id']) {
+    if (Database::result($rs, 0, 0) != $_user['user_id']) {
         api_not_allowed(true);
     }
 }
@@ -88,9 +88,9 @@ 
 
     foreach ($CourseList as $enreg_course) {
         $exists = false;
-        foreach($existingCourses as $existingCourse) {
+        foreach ($existingCourses as $existingCourse) {
             if ($enreg_course == $existingCourse['id']) {
-                $exists=true;
+                $exists = true;
             }
         }
 
@@ -110,7 +110,7 @@ 
     }
 
     foreach ($existingCourses as $existingCourse) {
-        if (!in_array($existingCourse['id'], $CourseList)){
+        if (!in_array($existingCourse['id'], $CourseList)) {
             $existingCourse = Database::escape_string($existingCourse['id']);
             $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (session_id,c_id,user_id)
                     VALUES ('$id_session','$existingCourse','$id_user')";
@@ -146,7 +146,7 @@ 
         WHERE srcru.user_id = $id_user AND session_id = $id_session";
 
 //all
-$sql_all="SELECT course.id, code, title, visual_code, src.session_id
+$sql_all = "SELECT course.id, code, title, visual_code, src.session_id
         FROM $tbl_course course
         INNER JOIN $tbl_session_rel_course  as src
         ON course.id = src.c_id AND session_id = $id_session";
@@ -163,9 +163,9 @@ 
 
 foreach ($CoursesAll as $course) {
     if (in_array($course['id'], $course_temp)) {
-        $nosessionCourses[$course['id']] = $course ;
+        $nosessionCourses[$course['id']] = $course;
     } else {
-        $sessionCourses[$course['id']] = $course ;
+        $sessionCourses[$course['id']] = $course;
     }
 }
 unset($Courses);
@@ -184,9 +184,9 @@ 
             <td width="45%" align="center">
                 <div id="ajax_list_courses_multiple">
                     <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
-                        foreach($nosessionCourses as $enreg) {
+                        foreach ($nosessionCourses as $enreg) {
                             ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')', ENT_QUOTES).'"'; if (in_array($enreg['code'], $CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
                         <?php
                         }
                         ?> </select></div> <?php
@@ -211,9 +211,9 @@ 
             <td width="45%" align="center">
                 <select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:320px;">
             <?php
-            foreach($sessionCourses as $enreg) {
+            foreach ($sessionCourses as $enreg) {
                 ?>
-                <option value="<?php echo $enreg['id']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
+                <option value="<?php echo $enreg['id']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')', ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
             <?php
             }
             unset($sessionCourses);

Braces +4 added lines, -1 removed lines

@@ -186,7 +186,10 @@
                     <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
                         foreach($nosessionCourses as $enreg) {
                             ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
                         <?php
                         }
                         ?> </select></div> <?php

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 ());

Spacing +19 added lines, -19 removed lines

@@ -8,7 +8,7 @@ 
 require_once __DIR__.'/../inc/global.inc.php';
 
 // setting the section (for the tabs)
-$this_section=SECTION_PLATFORM_ADMIN;
+$this_section = SECTION_PLATFORM_ADMIN;
 
 $id_session = intval($_GET['id_session']);
 SessionManager::protectSession($id_session);
@@ -16,8 +16,8 @@ 
 // Database Table Definitions
 $tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
 $tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
 if (empty($id_session)) {
     api_not_allowed();
@@ -25,26 +25,26 @@ 
 
 $page   = intval($_GET['page']);
 $action = $_REQUEST['action'];
-$sort   = in_array($_GET['sort'],array('title','nbr_users'))?$_GET['sort']:'title';
+$sort   = in_array($_GET['sort'], array('title', 'nbr_users')) ? $_GET['sort'] : 'title';
 
 $result = Database::query("SELECT name FROM $tbl_session WHERE id='$id_session'");
 
-if (!list($session_name)=Database::fetch_row($result)) {
+if (!list($session_name) = Database::fetch_row($result)) {
 	header('Location: session_list.php');
 	exit;
 }
 
 if ($action == 'delete') {
 	$idChecked = $_REQUEST['idChecked'];
-	if (is_array($idChecked) && count($idChecked)>0) {
+	if (is_array($idChecked) && count($idChecked) > 0) {
 		$my_temp = array();
-		foreach ($idChecked as $id){
-			$my_temp[]= Database::escape_string($id);// forcing the escape_string
+		foreach ($idChecked as $id) {
+			$my_temp[] = Database::escape_string($id); // forcing the escape_string
 		}
 		$idChecked = $my_temp;
-		$idChecked="'".implode("','", $idChecked)."'";
+		$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);
+		$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'");
 	}
@@ -59,14 +59,14 @@ 
 		FROM $tbl_session_rel_course, $tbl_course c
 		WHERE c_id = c.id AND session_id='$id_session'
 		ORDER BY $sort
-		LIMIT $from,".($limit+1);
-$result=Database::query($sql);
-$Courses=Database::store_result($result);
-$tool_name = api_htmlentities($session_name,ENT_QUOTES,$charset).' : '.get_lang('CourseListInSession');
+		LIMIT $from,".($limit + 1);
+$result = Database::query($sql);
+$Courses = Database::store_result($result);
+$tool_name = api_htmlentities($session_name, ENT_QUOTES, $charset).' : '.get_lang('CourseListInSession');
 
 //$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => "session_list.php","name" => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".Security::remove_XSS($_REQUEST['id_session']),"name" => get_lang('SessionOverview'));
+$interbreadcrumb[] = array('url' => "session_list.php", "name" => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".Security::remove_XSS($_REQUEST['id_session']), "name" => get_lang('SessionOverview'));
 
 Display::display_header($tool_name);
 echo Display::page_header($tool_name);
@@ -84,18 +84,18 @@ 
 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[] = 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>
-			<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;">'.
+			<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;
 }
 echo '<form method="post" action="'.api_get_self().'">';
-Display :: display_sortable_table($tableHeader, $tableCourses, array (), array ());
+Display :: display_sortable_table($tableHeader, $tableCourses, array(), array());
 echo '<select name="action">
 	<option value="delete">'.get_lang('UnsubscribeCoursesFromSession').'</option>
 	</select>