chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix array index "field_value" and order name internationalization - refs BT#9092

Browse Source
1.10.x
Daniel Barreto 10 years ago
parent 806113a6cb
commit 98044ae556
2 changed files with 19 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      plugin/advancedsubscription/ajax/advsub.ajax.php
  2. 14
      plugin/advancedsubscription/src/admin_view.php

12
plugin/advancedsubscription/ajax/advsub.ajax.php
Unescape View File

@ -76,8 +76,12 @@ if ($verified) {
}
// Get admin data
$adminsArray = UserManager::get_all_administrators();
$isWesternNameOrder = api_is_western_name_order();
foreach ($adminsArray as &$admin) {
$admin['complete_name'] = $admin['lastname'] . ', ' . $admin['firstname'];
$admin['complete_name'] = $isWesternNameOrder ?
$admin['firstname'] . ', ' . $admin['lastname'] :
$admin['lastname'] . ', ' . $admin['firstname']
;
}
unset($admin);
// Set data
@ -182,8 +186,12 @@ if ($verified) {
}
// Prepare admin data
$adminsArray = UserManager::get_all_administrators();
$isWesternNameOrder = api_is_western_name_order();
foreach ($adminsArray as &$admin) {
$admin['complete_name'] = $admin['lastname'] . ', ' . $admin['firstname'];
$admin['complete_name'] = $isWesternNameOrder ?
$admin['firstname'] . ', ' . $admin['lastname'] :
$admin['lastname'] . ', ' . $admin['firstname']
;
}
unset($admin);
// Set data

14
plugin/advancedsubscription/src/admin_view.php
Unescape View File

@ -32,20 +32,21 @@ if (!empty($s)) {
$sessionArray = api_get_session_info($s);
$extraSession = new ExtraFieldValue('session');
$var = $extraSession->get_values_by_handler_and_field_variable($s, 'description');
$sessionArray['description'] = $var['field_valiue'];
$sessionArray['description'] = $var['field_value'];
$var = $extraSession->get_values_by_handler_and_field_variable($s, 'target');
$sessionArray['target'] = $var['field_valiue'];
$sessionArray['target'] = $var['field_value'];
$var = $extraSession->get_values_by_handler_and_field_variable($s, 'mode');
$sessionArray['mode'] = $var['field_valiue'];
$sessionArray['mode'] = $var['field_value'];
$var = $extraSession->get_values_by_handler_and_field_variable($s, 'publication_end_date');
$sessionArray['publication_end_date'] = $var['field_value'];
$var = $extraSession->get_values_by_handler_and_field_variable($s, 'recommended_number_of_participants');
$sessionArray['recommended_number_of_participants'] = $var['field_valiue'];
$sessionArray['recommended_number_of_participants'] = $var['field_value'];
$adminsArray = UserManager::get_all_administrators();
$data['a'] = 'confirm';
$data['s'] = $s;
$data['current_user_id'] = api_get_user_id();
$isWesternNameOrder = api_is_western_name_order();
foreach ($studentList['students'] as &$student) {
$data['u'] = intval($student['user_id']);
@ -54,7 +55,10 @@ if (!empty($s)) {
$student['acceptUrl'] = $plugin->getQueueUrl($data);
$data['e'] = ADV_SUB_QUEUE_STATUS_ADMIN_DISAPPROVED;
$student['rejectUrl'] = $plugin->getQueueUrl($data);
$student['complete_name'] = $student['lastname'] . ', ' . $student['firstname'];
$student['complete_name'] = $isWesternNameOrder ?
$student['firstname'] . ', ' . $student['lastname'] :
$student['lastname'] . ', ' . $student['firstname']
;
$student['picture'] = UserManager::get_user_picture_path_by_id($student['user_id'], 'web', false, true);
$student['picture'] = UserManager::get_picture_user($student['user_id'], $student['picture']['file'], 22, USER_IMAGE_SIZE_MEDIUM);
}

Write Preview
Loading…
Cancel
Save