diff --git a/index.php b/index.php index 6aa9e13050..c7708887c1 100755 --- a/index.php +++ b/index.php @@ -194,5 +194,8 @@ if (isset($_GET['firstpage'])) { } else { api_delete_firstpage_parameter(); } + +var_dump(api_get_user_info()); + $controller->setGradeBookDependencyBar(api_get_user_id()); $controller->tpl->display_two_col_template(); diff --git a/load_search.php b/load_search.php index 523e877baa..107a6adc56 100644 --- a/load_search.php +++ b/load_search.php @@ -209,7 +209,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields, //$forceShowFields = false [], @@ -241,7 +240,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields, //$forceShowFields = false [], @@ -269,7 +267,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, $defaults, - [], false, $forceShowFields,//$forceShowFields = false [], @@ -298,7 +295,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields, //$forceShowFields = false [], @@ -328,7 +324,6 @@ $extra = $extraField->addElements( $showOnlyThisFields, $showOnlyThisFields, $defaults, - [], false, //$orderDependingDefaults true, // force [], // $separateExtraMultipleSelect @@ -350,7 +345,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -377,7 +371,6 @@ $extra = $extraField->addElements( $showOnlyThisFields, $showOnlyThisFields, $defaults, - [], false, //$orderDependingDefaults true, // force ['domaine' => 3, $theme => 5], // $separateExtraMultipleSelect @@ -413,7 +406,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -444,7 +436,6 @@ $extra = $extraField->addElements( $showOnlyThisFields, $showOnlyThisFields, $defaults, - [], false, //$orderDependingDefaults true, // force ['domaine' => 3, $theme => 5], // $separateExtraMultipleSelect @@ -495,7 +486,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields ); @@ -518,7 +508,6 @@ $extra = $extraFieldUser->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields, //$forceShowFields = false [], diff --git a/main/admin/course_edit.php b/main/admin/course_edit.php index 7bc651016a..f6cadf4bb2 100755 --- a/main/admin/course_edit.php +++ b/main/admin/course_edit.php @@ -290,7 +290,10 @@ $extra = $extra_field->addElements( false, false, [], - [] + [], + [], + false, + true ); $htmlHeadXtra[] = ' diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php index f94e7e3c9e..a73e18b223 100755 --- a/main/admin/legal_add.php +++ b/main/admin/legal_add.php @@ -151,6 +151,8 @@ if (isset($_POST['language'])) { false, [], [], + [], + false, true ); diff --git a/main/admin/user_add.php b/main/admin/user_add.php index 406ee3afb5..3e1c930ab9 100755 --- a/main/admin/user_add.php +++ b/main/admin/user_add.php @@ -303,6 +303,8 @@ $returnParams = $extraField->addElements( false, [], [], + [], + false, true ); $jquery_ready_content = $returnParams['jquery_ready_content']; diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php index b80c260f24..b5a2fa3ded 100755 --- a/main/admin/user_edit.php +++ b/main/admin/user_edit.php @@ -326,7 +326,10 @@ $returnParams = $extraField->addElements( false, // tag as select [], //show only fields [], // order fields - [] // extra data + [], // extra data + [], + false, + true ); $jqueryReadyContent = $returnParams['jquery_ready_content']; diff --git a/main/auth/inscription.php b/main/auth/inscription.php index 3a72e72392..cd706367e3 100755 --- a/main/auth/inscription.php +++ b/main/auth/inscription.php @@ -484,7 +484,6 @@ if ($user_already_registered_show_terms === false) { [], [], false, - false, [], [], [], @@ -493,7 +492,6 @@ if ($user_already_registered_show_terms === false) { [], $requiredFields, true - ); $extraFieldsLoaded = true; } diff --git a/main/auth/profile.php b/main/auth/profile.php index c980ba5ba6..f55d5c68e8 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -334,7 +334,6 @@ $return = $extraField->addElements( false, [], [], - [], false, false, [], diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php index 8d90b89430..e2fa42d73e 100755 --- a/main/course_info/infocours.php +++ b/main/course_info/infocours.php @@ -136,9 +136,7 @@ $extra = $extra_field->addElements( [], false, false, - $showOnlyTheseFields, - [], - false + $showOnlyTheseFields ); //Tags ExtraField diff --git a/main/forum/index.php b/main/forum/index.php index 81235d12a9..2a1df8b4f1 100755 --- a/main/forum/index.php +++ b/main/forum/index.php @@ -242,7 +242,6 @@ $returnParams = $extraField->addElements( ['language'], //show only fields [], // order fields [], // extra data - [], false, false, [], diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index 3743f4a726..aa58343207 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -514,7 +514,7 @@ class Category implements GradebookItem $sql .= ' '.$order_by; } } - +//var_dump($sql); $result = Database::query($sql); $categories = []; if (Database::num_rows($result) > 0) { diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php index 0302c27199..4344a9346a 100755 --- a/main/inc/lib/extra_field.lib.php +++ b/main/inc/lib/extra_field.lib.php @@ -501,7 +501,6 @@ class ExtraField extends Model $showOnlyTheseFields = [], $orderFields = [], $extraData = [], - $specialUrlList = [], $orderDependingDefaults = false, $forceShowFields = false, $separateExtraMultipleSelect = [], @@ -1789,10 +1788,6 @@ class ExtraField extends Model ] ); - if (isset($specialUrlList[$field_details['variable']])) { - //$url = $specialUrlList[$field_details['variable']]."&field_id=$field_id&type={$this->type}"; - } - if ($useTagAsSelect == false) { $jquery_ready_content .= " $('#extra_$variable').select2({ diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index caa9598fa8..7bd2c8e203 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -2751,12 +2751,8 @@ class SocialManager extends UserManager } else { switch ($extraFieldInfo['field_type']) { case ExtraField::FIELD_TYPE_RADIO: - $objEfOption = new ExtraFieldOption('user'); $optionInfo = $objEfOption->get_field_option_by_field_and_option($extraFieldInfo['id'], $extraFieldInfo['value']); - var_dump($extraFieldInfo, $optionInfo); - - break; case ExtraField::FIELD_TYPE_GEOLOCALIZATION: $data = explode('::', $data); diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index f0a788489a..f9bac1cdcf 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3170,7 +3170,7 @@ class Tracking WHERE c_id = $course_id $condition_lp"; $result = Database::query($sql); $session_condition = api_get_session_condition($session_id); - +echo $sql; // calculates time if (Database::num_rows($result) > 0) { while ($row = Database::fetch_array($result)) { diff --git a/search.php b/search.php index f0c0132c98..cbb95f75b3 100644 --- a/search.php +++ b/search.php @@ -385,7 +385,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -405,7 +404,6 @@ $extra = $extraFieldSession->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -432,7 +430,6 @@ $extra = $extraFieldSession->addElements( ['access_start_date', 'access_end_date'], [], [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -466,7 +463,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -500,7 +496,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -540,7 +535,6 @@ $extra = $extraFieldSession->addElements( $fieldsToShow, $fieldsToShow, $defaults, - null, true, $forceShowFields, // $forceShowFields ['domaine' => 3, $theme => 5], // $separateExtraMultipleSelect @@ -591,7 +585,6 @@ $extra = $extraFieldSession->addElements( $fieldsToShow, $fieldsToShow, $defaults, - [], false, //$orderDependingDefaults = false, $forceShowFields //$forceShowFields = false ); @@ -619,7 +612,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -648,7 +640,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -687,7 +678,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false ); @@ -713,7 +703,6 @@ $extra = $extraField->addElements( $fieldsToShow, $fieldsToShow, [], - [], false, $forceShowFields //$forceShowFields = false );