From 4913af936f273d64273da69eee85526572706343 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon.wiese@netspot.com.au>
Date: Tue, 5 Jun 2012 14:58:13 +0800
Subject: [PATCH] MDL-33498: Correct use of unformat_float for mod_assign
 decimal grades

This was affecting locales that use , instead of . in floating point numbers.
---
 mod/assign/gradeform.php |  6 +++---
 mod/assign/locallib.php  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mod/assign/gradeform.php b/mod/assign/gradeform.php
index f307a12daf9..8f73ac1bf0b 100644
--- a/mod/assign/gradeform.php
+++ b/mod/assign/gradeform.php
@@ -73,11 +73,11 @@ class mod_assign_grade_form extends moodleform {
         }
 
         if ($this->assignment->get_instance()->grade > 0) {
-            if (!is_numeric($data['grade']) and (!empty($data['grade']))) {
+            if (unformat_float($data['grade']) === null && (!empty($data['grade']))) {
                 $errors['grade'] = get_string('invalidfloatforgrade', 'assign', $data['grade']);
-            } else if ($data['grade'] > $this->assignment->get_instance()->grade) {
+            } else if (unformat_float($data['grade']) > $this->assignment->get_instance()->grade) {
                 $errors['grade'] = get_string('gradeabovemaximum', 'assign', $this->assignment->get_instance()->grade);
-            } else if ($data['grade'] < 0) {
+            } else if (unformat_float($data['grade']) < 0) {
                 $errors['grade'] = get_string('gradebelowzero', 'assign');
             }
         } else {
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index bb203f0b4e0..aa53202b2b9 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -895,7 +895,7 @@ class assign {
         if ($this->get_instance()->grade >= 0) {
             // Normal number
             if ($editing) {
-                $o = '<input type="text" name="quickgrade_' . $userid . '" value="' . $grade . '" size="6" maxlength="10" class="quickgrade"/>';
+                $o = '<input type="text" name="quickgrade_' . $userid . '" value="' . format_float($grade) . '" size="6" maxlength="10" class="quickgrade"/>';
                 $o .= '&nbsp;/&nbsp;' . format_float($this->get_instance()->grade,2);
                 $o .= '<input type="hidden" name="grademodified_' . $userid . '" value="' . $modified . '"/>';
                 return $o;
@@ -2531,7 +2531,7 @@ class assign {
                 // gather the userid, updated grade and last modified value
                 $record = new stdClass();
                 $record->userid = $userid;
-                $record->grade = required_param('quickgrade_' . $userid, PARAM_INT);
+                $record->grade = unformat_float(required_param('quickgrade_' . $record->userid, PARAM_TEXT));
                 $record->lastmodified = $modified;
                 $record->gradinginfo = grade_get_grades($this->get_course()->id, 'mod', 'assign', $this->get_instance()->id, array($userid));
                 $users[$userid] = $record;
@@ -2560,7 +2560,7 @@ class assign {
             if ($CFG->enableoutcomes) {
                 foreach ($modified->gradinginfo->outcomes as $outcomeid => $outcome) {
                     $oldoutcome = $outcome->grades[$modified->userid]->grade;
-                    $newoutcome = optional_param('outcome_' . $outcomeid . '_' . $modified->userid, -1, PARAM_INT);
+                    $newoutcome = optional_param('outcome_' . $outcomeid . '_' . $modified->userid, -1, PARAM_FLOAT);
                     if ($oldoutcome != $newoutcome) {
                         // can't check modified time for outcomes because it is not reported
                         $modifiedusers[$modified->userid] = $modified;
@@ -2605,7 +2605,7 @@ class assign {
         // ok - ready to process the updates
         foreach ($modifiedusers as $userid => $modified) {
             $grade = $this->get_user_grade($userid, true);
-            $grade->grade= grade_floatval($modified->grade);
+            $grade->grade= grade_floatval(unformat_float($modified->grade));
             $grade->grader= $USER->id;
 
             $this->update_grade($grade);
@@ -3180,7 +3180,7 @@ class assign {
             } else {
                 // handle the case when grade is set to No Grade
                 if (isset($formdata->grade)) {
-                    $grade->grade= grade_floatval($formdata->grade);
+                    $grade->grade= grade_floatval(unformat_float($formdata->grade));
                 }
             }
             $grade->grader= $USER->id;