Browse Source

Fix Scrutinizer issues

Angel Fernando Quiroz Campos 7 years ago
parent
commit
8467c4f8cd

+ 9 - 9
main/inc/lib/course.lib.php

@@ -2958,12 +2958,12 @@ class CourseManager
     /**
      * Creates a new extra field for a given course.
      *
-     * @param    string    Field's internal variable name
-     * @param    int        Field's type
-     * @param    string    Field's language var name
-     * @param string $default
+     * @param string $variable    Field's internal variable name
+     * @param int    $fieldType   Field's type
+     * @param string $displayText Field's language var name
+     * @param string $default     Optional. The default value
      *
-     * @return bool new extra field id
+     * @return int New extra field ID
      */
     public static function create_course_extra_field($variable, $fieldType, $displayText, $default = '')
     {
@@ -3031,11 +3031,11 @@ class CourseManager
     /**
      * Update an extra field value for a given course.
      *
-     * @param    int    Course ID
-     * @param    string    Field variable name
-     * @param    string    Field value
+     * @param string $course_code Course code
+     * @param string $variable    Field variable name
+     * @param string $value       Optional. Default field value
      *
-     * @return bool|null true if field updated, false otherwise
+     * @return bool|int An integer when register a new extra field. And boolean when update the extrafield
      */
     public static function update_course_extra_field_value($course_code, $variable, $value = '')
     {

+ 10 - 7
main/inc/lib/extra_field.lib.php

@@ -902,19 +902,22 @@ class ExtraField extends Model
     public function save($params, $show_query = false)
     {
         $fieldInfo = self::get_handler_field_info_by_field_variable($params['variable']);
-        $params = self::clean_parameters($params);
+        $params = $this->clean_parameters($params);
         $params['extra_field_type'] = $this->extraFieldType;
 
         if ($fieldInfo) {
             return $fieldInfo['id'];
         } else {
             $id = parent::save($params, $show_query);
-            if ($id) {
-                $session_field_option = new ExtraFieldOption($this->type);
-                $params['field_id'] = $id;
-                $session_field_option->save($params);
+
+            if (!$id) {
+                return 0;
             }
 
+            $session_field_option = new ExtraFieldOption($this->type);
+            $params['field_id'] = $id;
+            $session_field_option->save($params);
+
             return $id;
         }
     }
@@ -924,7 +927,7 @@ class ExtraField extends Model
      */
     public function update($params, $showQuery = false)
     {
-        $params = self::clean_parameters($params);
+        $params = $this->clean_parameters($params);
         if (isset($params['id'])) {
             $field_option = new ExtraFieldOption($this->type);
             $params['field_id'] = $params['id'];
@@ -934,7 +937,7 @@ class ExtraField extends Model
             $field_option->save($params, $showQuery);
         }
 
-        parent::update($params, $showQuery);
+        return parent::update($params, $showQuery);
     }
 
     /**

+ 4 - 4
main/inc/lib/extra_field_value.lib.php

@@ -260,7 +260,7 @@ class ExtraFieldValue extends Model
                             'value' => $fileDirStored.$fileName,
                             'comment' => $comment,
                         ];
-                        self::save($newParams);
+                        $this->save($newParams);
                     }
                     break;
                 case ExtraField::FIELD_TYPE_FILE:
@@ -306,7 +306,7 @@ class ExtraFieldValue extends Model
                             $new_params['comment'] = $comment;
                         }
 
-                        self::save($new_params);
+                        $this->save($new_params);
                     }
                     break;
                 case ExtraField::FIELD_TYPE_CHECKBOX:
@@ -324,7 +324,7 @@ class ExtraFieldValue extends Model
                         'comment' => $comment,
                     ];
 
-                    self::save($newParams);
+                    $this->save($newParams);
 
                     break;
                 default:
@@ -334,7 +334,7 @@ class ExtraFieldValue extends Model
                         'value' => $value,
                         'comment' => $comment,
                     ];
-                    self::save($newParams, $showQuery);
+                    $this->save($newParams, $showQuery);
             }
         }
     }

+ 4 - 4
main/inc/lib/sessionmanager.lib.php

@@ -2795,11 +2795,11 @@ class SessionManager
     /**
      * Update an extra field value for a given session.
      *
-     * @param int    Course ID
-     * @param string    Field variable name
-     * @param string    Field value
+     * @param int $sessionId Session ID
+     * @param string $variable    Field variable name
+     * @param string $value       Optional. Default field value
      *
-     * @return bool true if field updated, false otherwise
+     * @return bool|int An integer when register a new extra field. And boolean when update the extrafield
      */
     public static function update_session_extra_field_value($sessionId, $variable, $value = '')
     {