From 9df7781e78b3e3ea43ca13279097b39bfba315b2 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Sat, 28 Nov 2020 17:53:16 +0100 Subject: [PATCH] Minor - format code --- main/dashboard/index.php | 2 - main/exercise/export/qti2/qti2_export.php | 2 +- main/exercise/export/scorm/ScormQuestion.php | 1 + main/inc/lib/extra_field.lib.php | 54 ++++++++++---------- main/inc/lib/extra_field_option.lib.php | 2 +- main/inc/lib/extra_field_value.lib.php | 2 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/main/dashboard/index.php b/main/dashboard/index.php index a7ff14771c..581948d928 100755 --- a/main/dashboard/index.php +++ b/main/dashboard/index.php @@ -8,8 +8,6 @@ use ChamiloSession as Session; * the controllers depend on the current action. * * @author Christian Fasanando - * - * @package chamilo.dashboard */ $cidReset = true; diff --git a/main/exercise/export/qti2/qti2_export.php b/main/exercise/export/qti2/qti2_export.php index 4d7b7b07dd..15a968970e 100755 --- a/main/exercise/export/qti2/qti2_export.php +++ b/main/exercise/export/qti2/qti2_export.php @@ -67,7 +67,6 @@ class ImsAssessmentItem title = "'.htmlspecialchars(formatExerciseQtiText($this->question->selectTitle())).'" category = "'.$categoryTitle.'" >'."\n"; - } /** @@ -263,6 +262,7 @@ class ImsSection ."\n"; $foot = "\n"; } + return $head .$this->start_section() .$this->export_duration() diff --git a/main/exercise/export/scorm/ScormQuestion.php b/main/exercise/export/scorm/ScormQuestion.php index 87bdafa8e6..1d590bf549 100644 --- a/main/exercise/export/scorm/ScormQuestion.php +++ b/main/exercise/export/scorm/ScormQuestion.php @@ -171,6 +171,7 @@ class ScormQuestion extends Question $title = $this->selectTitle(); $description = $this->selectDescription(); $cols = 2; + return ' '.$title.' diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php index 3ee375a1ae..a07ad38cfd 100755 --- a/main/inc/lib/extra_field.lib.php +++ b/main/inc/lib/extra_field.lib.php @@ -11,33 +11,33 @@ use Chamilo\CoreBundle\Entity\Tag; */ class ExtraField extends Model { - const FIELD_TYPE_TEXT = 1; - const FIELD_TYPE_TEXTAREA = 2; - const FIELD_TYPE_RADIO = 3; - const FIELD_TYPE_SELECT = 4; - const FIELD_TYPE_SELECT_MULTIPLE = 5; - const FIELD_TYPE_DATE = 6; - const FIELD_TYPE_DATETIME = 7; - const FIELD_TYPE_DOUBLE_SELECT = 8; - const FIELD_TYPE_DIVIDER = 9; - const FIELD_TYPE_TAG = 10; - const FIELD_TYPE_TIMEZONE = 11; - const FIELD_TYPE_SOCIAL_PROFILE = 12; - const FIELD_TYPE_CHECKBOX = 13; - const FIELD_TYPE_MOBILE_PHONE_NUMBER = 14; - const FIELD_TYPE_INTEGER = 15; - const FIELD_TYPE_FILE_IMAGE = 16; - const FIELD_TYPE_FLOAT = 17; - const FIELD_TYPE_FILE = 18; - const FIELD_TYPE_VIDEO_URL = 19; - const FIELD_TYPE_LETTERS_ONLY = 20; - const FIELD_TYPE_ALPHANUMERIC = 21; - const FIELD_TYPE_LETTERS_SPACE = 22; - const FIELD_TYPE_ALPHANUMERIC_SPACE = 23; - const FIELD_TYPE_GEOLOCALIZATION = 24; - const FIELD_TYPE_GEOLOCALIZATION_COORDINATES = 25; - const FIELD_TYPE_SELECT_WITH_TEXT_FIELD = 26; - const FIELD_TYPE_TRIPLE_SELECT = 27; + public const FIELD_TYPE_TEXT = 1; + public const FIELD_TYPE_TEXTAREA = 2; + public const FIELD_TYPE_RADIO = 3; + public const FIELD_TYPE_SELECT = 4; + public const FIELD_TYPE_SELECT_MULTIPLE = 5; + public const FIELD_TYPE_DATE = 6; + public const FIELD_TYPE_DATETIME = 7; + public const FIELD_TYPE_DOUBLE_SELECT = 8; + public const FIELD_TYPE_DIVIDER = 9; + public const FIELD_TYPE_TAG = 10; + public const FIELD_TYPE_TIMEZONE = 11; + public const FIELD_TYPE_SOCIAL_PROFILE = 12; + public const FIELD_TYPE_CHECKBOX = 13; + public const FIELD_TYPE_MOBILE_PHONE_NUMBER = 14; + public const FIELD_TYPE_INTEGER = 15; + public const FIELD_TYPE_FILE_IMAGE = 16; + public const FIELD_TYPE_FLOAT = 17; + public const FIELD_TYPE_FILE = 18; + public const FIELD_TYPE_VIDEO_URL = 19; + public const FIELD_TYPE_LETTERS_ONLY = 20; + public const FIELD_TYPE_ALPHANUMERIC = 21; + public const FIELD_TYPE_LETTERS_SPACE = 22; + public const FIELD_TYPE_ALPHANUMERIC_SPACE = 23; + public const FIELD_TYPE_GEOLOCALIZATION = 24; + public const FIELD_TYPE_GEOLOCALIZATION_COORDINATES = 25; + public const FIELD_TYPE_SELECT_WITH_TEXT_FIELD = 26; + public const FIELD_TYPE_TRIPLE_SELECT = 27; public $columns = [ 'id', 'field_type', diff --git a/main/inc/lib/extra_field_option.lib.php b/main/inc/lib/extra_field_option.lib.php index f5ab3bbfa1..fa0ba94585 100755 --- a/main/inc/lib/extra_field_option.lib.php +++ b/main/inc/lib/extra_field_option.lib.php @@ -816,7 +816,7 @@ class ExtraFieldOption extends Model $defaults = []; - if ($action === 'edit') { + if ('edit' == $action) { // Setting the defaults $defaults = $this->get($id, false); $form->freeze('option_value'); diff --git a/main/inc/lib/extra_field_value.lib.php b/main/inc/lib/extra_field_value.lib.php index bb7d8d2969..138221d0f2 100755 --- a/main/inc/lib/extra_field_value.lib.php +++ b/main/inc/lib/extra_field_value.lib.php @@ -119,7 +119,7 @@ class ExtraFieldValue extends Model // Parse params. foreach ($extraFields as $fieldDetails) { - if ($forceSave === false) { + if (false === $forceSave) { // if the field is not visible to the user in the end, we need to apply special rules. if (1 != $fieldDetails['visible_to_self']) { //only admins should be able to add those values