Minor - format code

main/gradebook/gradebook.php

@@ -260,11 +260,11 @@ if (isset($_GET['deletelink'])) {
         $filter_confirm_msg = false;
     }
 }
-$course_to_crsind = isset ($course_to_crsind) ? $course_to_crsind : '';
+$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) &&
+if (empty($allcat) && empty($alleval) && empty($alllink) &&
-        (!isset($_GET['selectcat']))
+    !$is_platform_admin && $is_course_admin && !isset($_GET['selectcat']) && api_is_course_tutor()
-    ) &&
-    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();
@@ -33,7 +32,7 @@ if ($_in_course) {
 
 $catadd->set_course_code(api_get_course_id());
 $form = new CatForm(
-    CatForm :: TYPE_ADD,
+    CatForm::TYPE_ADD,
     $catadd,
     'add_cat_form',
     null,

main/gradebook/gradebook_add_eval.php

@@ -25,7 +25,7 @@ if (!empty($select_cat)) {
 }
 
 $form = new EvalForm(
-    EvalForm :: TYPE_ADD,
+    EvalForm::TYPE_ADD,
     $evaladd,
     null,
     'add_eval_form',

main/gradebook/gradebook_add_link.php

@@ -62,7 +62,7 @@ if (isset($typeSelected) && $typeSelected != '0') {
     $url = api_get_self().'?selectcat='.$selectCat.'&typeselected='.$typeSelected.'&course_code='.$courseCode.'&'.api_get_cidreq();
 
     $addform = new LinkAddEditForm(
-        LinkAddEditForm :: TYPE_ADD,
+        LinkAddEditForm::TYPE_ADD,
         $all_categories,
         $typeSelected,
         null,

main/gradebook/gradebook_add_user.php

@@ -14,15 +14,15 @@ $this_section = SECTION_MYGRADEBOOK;
 api_block_anonymous_users();
 GradebookUtils::block_students();
 
-$evaluation = Evaluation :: load($_GET['selecteval']);
+$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;
+    exit;
 }
 $add_user_form = new EvalForm(
-    EvalForm :: TYPE_ADD_USERS_TO_EVAL,
+    EvalForm::TYPE_ADD_USERS_TO_EVAL,
     $evaluation[0],
     null,
     'add_users_to_evaluation',

main/gradebook/gradebook_edit_eval.php

@@ -10,7 +10,7 @@ require_once __DIR__.'/../inc/global.inc.php';
 api_block_anonymous_users();
 GradebookUtils::block_students();
 
-$evaledit = Evaluation :: load($_GET['editeval']);
+$evaledit = Evaluation::load($_GET['editeval']);
 if ($evaledit[0]->is_locked() && !api_is_platform_admin()) {
     api_not_allowed();
 }

main/gradebook/gradebook_edit_link.php

@@ -43,7 +43,7 @@ if ($session_id == 0) {
 }
 
 $form = new LinkAddEditForm(
-    LinkAddEditForm :: TYPE_EDIT,
+    LinkAddEditForm::TYPE_EDIT,
     $cats,
     null,
     $link,

main/gradebook/gradebook_edit_result.php

@@ -8,17 +8,16 @@
 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,
+    EvalForm::TYPE_ALL_RESULTS_EDIT,
     $evaluation[0],
     $resultedit,
     'edit_result_form',

main/gradebook/gradebook_flatview.php

@@ -275,7 +275,7 @@ if (isset($_GET['exportpdf'])) {
 }
 
 if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') {
-    DisplayGradebook:: display_header_reduce_flatview(
+    DisplayGradebook::display_header_reduce_flatview(
         $cat[0],
         $showeval,
         $showlink,
@@ -283,7 +283,7 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') {
     );
     $flatViewTable->display();
 } elseif (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')) {
-    DisplayGradebook:: display_header_reduce_flatview(
+    DisplayGradebook::display_header_reduce_flatview(
         $cat[0],
         $showeval,
         $showlink,

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) {

main/gradebook/index.php

@@ -165,7 +165,7 @@ if (isset($_GET['movecat'])) {
     $cats = Category::load($_GET['movecat']);
     if (!isset($_GET['targetcat'])) {
         $move_form = new CatForm(
-            CatForm :: TYPE_MOVE,
+            CatForm::TYPE_MOVE,
             $cats[0],
             'move_cat_form',
             null,
@@ -197,7 +197,7 @@ if (isset($_GET['moveeval'])) {
     $evals = Evaluation :: load($_GET['moveeval']);
     if (!isset($_GET['targetcat'])) {
         $move_form = new EvalForm(
-            EvalForm :: TYPE_MOVE,
+            EvalForm::TYPE_MOVE,
             $evals[0],
             null,
             'move_eval_form',
@@ -230,7 +230,7 @@ if (isset($_GET['movelink'])) {
     GradebookUtils::block_students();
     $link = LinkFactory :: load($_GET['movelink']);
     $move_form = new LinkForm(
-        LinkForm :: TYPE_MOVE,
+        LinkForm::TYPE_MOVE,
         null,
         $link[0],
         'move_link_form',
@@ -239,7 +239,7 @@ if (isset($_GET['movelink'])) {
     );
 
     if ($move_form->validate()) {
-        $targetcat = Category :: load($move_form->exportValue('move_cat'));
+        $targetcat = Category::load($move_form->exportValue('move_cat'));
         $link[0]->move_to_cat($targetcat[0]);
         unset($link);
         header('Location: '.api_get_self().'?linkmoved=&selectcat='.$selectCat);