diff --git a/main/admin/user_export.php b/main/admin/user_export.php
index a8a8df7c1b..ef143db499 100755
--- a/main/admin/user_export.php
+++ b/main/admin/user_export.php
@@ -146,7 +146,7 @@ if ($form->validate()) {
'OfficialCode',
'PhoneNumber',
'RegistrationDate',
- 'Active',
+ 'Active',
'ExpirationDate',
];
} else {
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 5a9fa095b3..62cda90cd3 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -9628,6 +9628,46 @@ class SessionManager
}
}
+ public static function getCareerDiagramPerSession($sessionId, $userId): string
+ {
+ $extraFieldValueSession = new ExtraFieldValue('session');
+ $extraFieldValueCareer = new ExtraFieldValue('career');
+
+ $visibility = api_get_session_visibility($sessionId, null, false, $userId);
+
+ $content = '';
+ if (SESSION_AVAILABLE === $visibility) {
+ $value = $extraFieldValueSession->get_values_by_handler_and_field_variable($sessionId, 'careerid');
+ if (isset($value['value']) && !empty($value['value'])) {
+ $careerList = str_replace(['[', ']'], '', $value['value']);
+ $careerList = explode(',', $careerList);
+
+ foreach ($careerList as $career) {
+ $careerIdValue = $extraFieldValueCareer->get_item_id_from_field_variable_and_field_value(
+ 'external_career_id',
+ $career
+ );
+ if (isset($careerIdValue['item_id']) && !empty($careerIdValue['item_id'])) {
+ $finalCareerId = $careerIdValue['item_id'];
+ $career = new Career();
+ $careerInfo = $career->get($finalCareerId);
+ if (!empty($careerInfo)) {
+ $careerUrl = api_get_path(WEB_CODE_PATH).
+ 'user/career_diagram.php?iframe=1&career_id='.$finalCareerId;
+ $content .= '';
+ }
+ }
+ }
+ }
+ }
+
+ return $content;
+ }
+
/**
* @param int $id
*
@@ -9765,44 +9805,4 @@ class SessionManager
return -1;
}
}
-
- public static function getCareerDiagramPerSession($sessionId, $userId): string
- {
- $extraFieldValueSession = new ExtraFieldValue('session');
- $extraFieldValueCareer = new ExtraFieldValue('career');
-
- $visibility = api_get_session_visibility($sessionId, null, false, $userId);
-
- $content = '';
- if (SESSION_AVAILABLE === $visibility) {
- $value = $extraFieldValueSession->get_values_by_handler_and_field_variable($sessionId, 'careerid');
- if (isset($value['value']) && !empty($value['value'])) {
- $careerList = str_replace(['[', ']'], '', $value['value']);
- $careerList = explode(',', $careerList);
-
- foreach ($careerList as $career) {
- $careerIdValue = $extraFieldValueCareer->get_item_id_from_field_variable_and_field_value(
- 'external_career_id',
- $career
- );
- if (isset($careerIdValue['item_id']) && !empty($careerIdValue['item_id'])) {
- $finalCareerId = $careerIdValue['item_id'];
- $career = new Career();
- $careerInfo = $career->get($finalCareerId);
- if (!empty($careerInfo)) {
- $careerUrl = api_get_path(WEB_CODE_PATH).
- 'user/career_diagram.php?iframe=1&career_id='.$finalCareerId;
- $content .= '';
- }
- }
- }
- }
- }
-
- return $content;
- }
}