Minor - format code

main/gradebook/gradebook.php

@@ -264,7 +264,7 @@ $course_to_crsind = isset ($course_to_crsind) ? $course_to_crsind : '';
 if ($course_to_crsind && !isset($_GET['confirm'])) {
     GradebookUtils::block_students();
     if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
-        die ('Error: movecat or moveeval not defined');
+        api_not_allowed(true);
     }
     $button = '<form name="confirm"
                  method="post"
@@ -608,11 +608,9 @@ $gradebooktable = new GradebookTable(
     $alllink,
     $addparams
 );
-if (((empty($allcat)) && (empty($alleval)) && (empty ($alllink)) && (!$is_platform_admin) &&
-        ($is_course_admin) &&
-        (!isset($_GET['selectcat']))
-    ) &&
-    api_is_course_tutor()
+
+if (empty($allcat) && empty($alleval) && empty($alllink) &&
+    !$is_platform_admin && $is_course_admin && !isset($_GET['selectcat']) && api_is_course_tutor()
 ) {
     echo Display::return_message(
         get_lang('GradebookWelcomeMessage').

main/gradebook/gradebook_add_cat.php

@@ -16,7 +16,6 @@ api_block_anonymous_users();
 GradebookUtils::block_students();
 
 $edit_cat = isset($_REQUEST['editcat']) ? intval($_REQUEST['editcat']) : '';
-
 $get_select_cat = intval($_GET['selectcat']);
 
 $catadd = new Category();

main/gradebook/gradebook_add_user.php

@@ -18,7 +18,7 @@ $evaluation = Evaluation :: load($_GET['selecteval']);
 $newstudents = $evaluation[0]->get_not_subscribed_students();
 
 if (count($newstudents) == '0') {
-	header('Location: gradebook_view_result.php?nouser=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+    header('Location: gradebook_view_result.php?nouser=&selecteval='.intval($_GET['selecteval']).'&'.api_get_cidreq());
     exit;
 }
 $add_user_form = new EvalForm(

main/gradebook/gradebook_edit_result.php

@@ -8,15 +8,14 @@
 require_once __DIR__.'/../inc/global.inc.php';
 api_block_anonymous_users();
 GradebookUtils::block_students();
-$select_eval = Security::remove_XSS($_GET['selecteval']);
+
+$select_eval = (int) $_GET['selecteval'];
 if (empty($select_eval)) {
     api_not_allowed();
 }
 $resultedit = Result::load(null, null, $select_eval);
 $evaluation = Evaluation::load($select_eval);
-
 $evaluation[0]->check_lock_permissions();
-
 $edit_result_form = new EvalForm(
     EvalForm::TYPE_ALL_RESULTS_EDIT,
     $evaluation[0],

main/gradebook/gradebook_scoring_system.php

@@ -56,14 +56,12 @@ $scoreform = new ScoreDisplayForm(
 );
 
 if ($scoreform->validate()) {
-    $value_export = '';
     $value_export = $scoreform->exportValues();
     $value_export = isset($value_export) ? $scoreform->exportValues() : '';
     $values = $value_export;
 
     // create new array of custom display settings
     // this loop also checks if all score ranges are unique
-
     $scoringDisplay = array();
     $ranges_ok = true;
     $endscore = isset($values['endscore']) ? $values['endscore'] : null;

main/gradebook/gradebook_statistics.php

@@ -29,7 +29,7 @@ if (api_is_allowed_to_edit()) {
         'name' => get_lang('ViewResult')
     );
 }
-$displayscore = ScoreDisplay::instance();
+$displayScore = ScoreDisplay::instance();
 
 Display::display_header(get_lang('EvaluationStatistics'));
 DisplayGradebook::display_header_result(
@@ -40,9 +40,9 @@ DisplayGradebook::display_header_result(
 );
 
 //Bad, Regular, Good  - User definitions
-$displays = $displayscore->get_custom_score_display_settings();
+$displays = $displayScore->get_custom_score_display_settings();
 
-if (!$displayscore->is_custom() || empty($displays)) {
+if (!$displayScore->is_custom() || empty($displays)) {
     if (api_is_platform_admin() || api_is_course_admin()) {
         echo Display::return_message(get_lang('PleaseEnableScoringSystem'), 'error', false);
     }
@@ -57,7 +57,7 @@ if (!$displayscore->is_custom() || empty($displays)) {
     foreach ($allresults as $result) {
         $score = $result->get_score();
         if (isset($score)) {
-            $display = $displayscore->display_score(
+            $display = $displayScore->display_score(
                 array($score, $eval[0]->get_max()),
                 SCORE_CUSTOM,
                 SCORE_ONLY_CUSTOM,
@@ -69,9 +69,7 @@ if (!$displayscore->is_custom() || empty($displays)) {
     }
 
     $keys = array_keys($nr_items);
-
     // find the region with the most scores, this is 100% of the bar
-
     $highest_ratio = 0;
     foreach ($keys as $key) {
         if ($nr_items[$key] > $highest_ratio) {