Minor - merge with 1.11.x

main/inc/lib/course.lib.php

@@ -2129,7 +2129,7 @@ class CourseManager
                         'li',
                         Display::return_icon(
                             'teacher.png',
-                            $coachs,
+                            get_lang('Coach'),
                             null,
                             ICON_SIZE_TINY
                         ).' '.$coachs
@@ -6642,7 +6642,7 @@ class CourseManager
             $title = $course['title'];
             $url = api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&code='.$course['code'];
             $html = Display::url(
-                Display::returnFontAwesomeIcon('info-circle', 2),
+                Display::returnFontAwesomeIcon('info-circle', 'lg'),
                 $url,
                 [
                     'class' => 'ajax btn btn-default btn-sm',

main/inc/lib/document.lib.php

@@ -327,7 +327,7 @@ class DocumentManager
             header('Content-Description: '.$filename);
             header('Content-Transfer-Encoding: binary');
 
-            if (function_exists('ob_end_clean')) {
+            if (function_exists('ob_end_clean') && ob_get_length()) {
                 // Use ob_end_clean() to avoid weird buffering situations
                 // where file is sent broken/incomplete for download
                 ob_end_clean();
@@ -393,7 +393,7 @@ class DocumentManager
                 );
                 echo $content;
             } else {
-                if (function_exists('ob_end_clean')) {
+                if (function_exists('ob_end_clean') && ob_get_length()) {
                     // Use ob_end_clean() to avoid weird buffering situations
                     // where file is sent broken/incomplete for download
                     ob_end_clean();

main/inc/lib/extra_field.lib.php

@@ -897,7 +897,7 @@ class ExtraField extends Model
      * @param array $params
      * @param bool  $show_query
      *
-     * @return int
+     * @return int|bool
      */
     public function save($params, $show_query = false)
     {
@@ -909,15 +909,12 @@ class ExtraField extends Model
             return $fieldInfo['id'];
         } else {
             $id = parent::save($params, $show_query);
-
-            if (!$id) {
-                return 0;
+            if ($id) {
+                $fieldOption = new ExtraFieldOption($this->type);
+                $params['field_id'] = $id;
+                $fieldOption->save($params);
             }
 
-            $session_field_option = new ExtraFieldOption($this->type);
-            $params['field_id'] = $id;
-            $session_field_option->save($params);
-
             return $id;
         }
     }
@@ -929,12 +926,12 @@ class ExtraField extends Model
     {
         $params = $this->clean_parameters($params);
         if (isset($params['id'])) {
-            $field_option = new ExtraFieldOption($this->type);
+            $fieldOption = new ExtraFieldOption($this->type);
             $params['field_id'] = $params['id'];
             if (empty($params['field_type'])) {
                 $params['field_type'] = $this->type;
             }
-            $field_option->save($params, $showQuery);
+            $fieldOption->save($params, $showQuery);
         }
 
         return parent::update($params, $showQuery);
@@ -943,7 +940,7 @@ class ExtraField extends Model
     /**
      * @param $id
      *
-     * @return bool|void
+     * @return bool
      */
     public function delete($id)
     {
@@ -961,7 +958,7 @@ class ExtraField extends Model
         $session_field_values = new ExtraFieldValue($this->type);
         $session_field_values->delete_all_values_by_field_id($id);
 
-        parent::delete($id);
+        return parent::delete($id);
     }
 
     /**

main/inc/lib/extra_field_option.lib.php

@@ -136,18 +136,18 @@ class ExtraFieldOption extends Model
      * @param array $params
      * @param bool  $showQuery
      *
-     * @return int
+     * @return int|bool
      */
     public function saveOptions($params, $showQuery = false)
     {
-        $optionInfo = self::get_field_option_by_field_and_option(
+        $optionInfo = $this->get_field_option_by_field_and_option(
             $params['field_id'],
             $params['option_value']
         );
 
         if ($optionInfo == false) {
             $optionValue = api_replace_dangerous_char($params['option_value']);
-            $order = self::get_max_order($params['field_id']);
+            $order = $this->get_max_order($params['field_id']);
             $newParams = [
                 'field_id' => $params['field_id'],
                 'value' => trim($optionValue),
@@ -339,7 +339,7 @@ class ExtraFieldOption extends Model
                 $list = explode(';', $params['field_options']);
 
                 foreach ($list as $option) {
-                    $option_info = self::get_field_option_by_field_and_option($field_id, $option);
+                    $option_info = $this->get_field_option_by_field_and_option($field_id, $option);
 
                     // Use URLify only for new items
                     $optionValue = api_replace_dangerous_char($option);
@@ -349,7 +349,7 @@ class ExtraFieldOption extends Model
                         continue;
                     }
 
-                    $order = self::get_max_order($field_id);
+                    $order = $this->get_max_order($field_id);
 
                     $new_params = [
                         'field_id' => $field_id,
@@ -392,13 +392,13 @@ class ExtraFieldOption extends Model
         }
 
         if (empty($params['option_order'])) {
-            $order = self::get_max_order($field_id);
+            $order = $this->get_max_order($field_id);
             $params['option_order'] = $order;
         }
         if ($insert_repeated) {
             parent::save($params, $show_query);
         } else {
-            $check = self::get_field_option_by_field_and_option(
+            $check = $this->get_field_option_by_field_and_option(
                 $field_id,
                 $params['option_value']
             );

main/inc/lib/extra_field_value.lib.php

@@ -1085,9 +1085,7 @@ class ExtraFieldValue extends Model
         $valueList = [];
         /** @var ExtraFieldValues $fieldValue */
         foreach ($fieldValues as $fieldValue) {
-            $item = [
-                'value' => $fieldValue,
-            ];
+            $item = ['value' => $fieldValue];
             switch ($fieldValue->getField()->getFieldType()) {
                 case ExtraField::FIELD_TYPE_SELECT:
                     $item['option'] = $fieldOptionsRepo->findOneBy([
@@ -1096,7 +1094,6 @@ class ExtraFieldValue extends Model
                     ]);
                     break;
             }
-
             $valueList[] = $item;
         }
 

main/inc/lib/fileManage.lib.php

@@ -64,6 +64,7 @@ function my_delete($file)
             return true;
         }
     }
+
     return false; // no file or directory to delete
 }
 
@@ -258,6 +259,7 @@ function move($source, $target, $forceMove = true, $moveContent = false)
             return true;
         }
     }
+
     return false;
 }
 
@@ -345,9 +347,11 @@ function getextension($filename)
 }
 
 /**
- * Get a list of all PHP (.php) files in a given directory. Includes .tpl files
- * @param string $base_path The base path in which to find the corresponding files
- * @param bool $includeStatic Include static .html, .htm and .css files
+ * Get a list of all PHP (.php) files in a given directory. Includes .tpl files.
+ *
+ * @param string $base_path     The base path in which to find the corresponding files
+ * @param bool   $includeStatic Include static .html, .htm and .css files
+ *
  * @return array
  */
 function getAllPhpFiles($base_path, $includeStatic = false)
@@ -381,4 +385,4 @@ function getAllPhpFiles($base_path, $includeStatic = false)
     $list = null;
 
     return $files;
-}
+}