Skip to content

Commit f2f7262

Browse files
AngelFQCAngelFQC
committed
Merge remote-tracking branch 'origin/1.11.x' into 1.11.x
2 parents 3093621 + a454244 commit f2f7262

File tree

6 files changed

+244
-33
lines changed

6 files changed

+244
-33
lines changed

‎main/admin/add_users_to_usergroup.php

Lines changed: 79 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,44 @@ function change_select(reset) {
112112
});
113113
}
114114
115+
</script>';
116+
$htmlHeadXtra[] = '
117+
<script>
118+
$(document).ready(function() {
119+
function showLastTenUsers() {
120+
var selectedUsers = [];
121+
$("#elements_in option").each(function() {
122+
selectedUsers.push($(this).val());
123+
});
124+
125+
var groupId = "'.$id.'";
126+
$.ajax({
127+
type: "POST",
128+
url: "'.api_get_self().'",
129+
data: {
130+
action: "get_last_ten_users",
131+
excludedUsers: selectedUsers,
132+
id: groupId
133+
},
134+
dataType: "json",
135+
success: function(data) {
136+
var select = document.getElementById("elements_not_in");
137+
select.innerHTML = "";
138+
139+
$.each(data, function(index, user) {
140+
select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
141+
});
142+
},
143+
error: function(xhr, status, error) {
144+
console.error("Error en la solicitud AJAX: " + status + " - " + error);
145+
}
146+
});
147+
}
148+
149+
$("#show_last_ten_users_button").click(function() {
150+
showLastTenUsers();
151+
});
152+
});
115153
</script>';
116154

117155
$form_sent = 0;
@@ -133,6 +171,35 @@ function change_select(reset) {
133171
api_not_allowed(true);
134172
}
135173

174+
if (ChamiloApi::isAjaxRequest() && $_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'get_last_ten_users') {
175+
$excludedUsers = isset($_POST['excludedUsers']) ? $_POST['excludedUsers'] : [];
176+
$id = isset($_POST['id']) ? intval($_POST['id']) : 0;
177+
178+
$excludedIds = !empty($excludedUsers) ? implode(",", array_map('intval', $excludedUsers)) : '0';
179+
$sql = 'SELECT id, username, firstname, lastname
180+
FROM user
181+
WHERE status != '.ANONYMOUS.'
182+
AND id NOT IN ('.$excludedIds.')
183+
ORDER BY id DESC
184+
LIMIT 10';
185+
186+
$result = Database::query($sql);
187+
$users = [];
188+
189+
while ($user = Database::fetch_array($result)) {
190+
$users[] = [
191+
'id' => $user['id'],
192+
'username' => $user['username'],
193+
'firstname' => $user['firstname'],
194+
'lastname' => $user['lastname']
195+
];
196+
}
197+
198+
header('Content-Type: application/json');
199+
echo json_encode($users);
200+
die();
201+
}
202+
136203
$first_letter_user = '';
137204

138205
if ((isset($_POST['form_sent']) && $_POST['form_sent']) || isset($_REQUEST['firstLetterUser'])) {
@@ -453,13 +520,18 @@ function formatCompleteName(array $userInfo, bool $orderListByOfficialCode): str
453520
placeholder="<?php echo get_lang('Search'); ?>"
454521
onkeydown="return 13 !== event.keyCode;">
455522
<span class="input-group-btn">
456-
<button class="btn btn-default" type="button" onclick="change_select();">
457-
<?php echo get_lang('Filter'); ?>
458-
</button>
459-
<button class="btn btn-default" type="button" onclick="change_select(true);">
460-
<?php echo get_lang('Reset'); ?>
461-
</button>
462-
</span>
523+
<button class="btn btn-default" type="button" onclick="change_select();">
524+
<?php echo get_lang('Filter'); ?>
525+
</button>
526+
<button class="btn btn-default" type="button" onclick="change_select(true);">
527+
<?php echo get_lang('Reset'); ?>
528+
</button>
529+
</span>
530+
<span class="input-group-btn">
531+
<button class="btn btn-default" type="button" id="show_last_ten_users_button" title="<?php echo get_lang('ShowLastTenUsers') ?>">
532+
<i class="fa fa-clock-o"></i>
533+
</button>
534+
</span>
463535
</div>
464536
</div>
465537
<?php

‎main/auth/sort_my_courses.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,19 @@
1212
$user_course_categories = CourseManager::get_user_course_categories(api_get_user_id());
1313
$courses_in_category = $auth->getCoursesInCategory(false);
1414

15-
$action = isset($_REQUEST['action']) ? Security::remove_XSS($_REQUEST['action']) : '';
15+
// Only authorized actions
16+
$authorizedActions = [
17+
'edit_category',
18+
'edit_course_category',
19+
'deletecoursecategory',
20+
'createcoursecategory',
21+
'set_collapsable',
22+
'unsubscribe'
23+
];
24+
if (in_array(trim($_REQUEST['action']), $authorizedActions)) {
25+
$action = trim($_REQUEST['action']);
26+
}
27+
1628
$currentUrl = api_get_self();
1729

1830
$interbreadcrumb[] = [

‎main/document/document.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,10 +1785,12 @@ function convertModal (id, format) {
17851785
.'&id='.$current_folder_id.'&certificate=true'
17861786
);
17871787
} else {
1788-
$actionsLeft .= Display::url(
1789-
Display::return_icon('upload_file.png', get_lang('UplUploadDocument'), '', ICON_SIZE_MEDIUM),
1790-
api_get_path(WEB_CODE_PATH).'document/upload.php?'.api_get_cidreq().'&id='.$current_folder_id
1791-
);
1788+
if (!(api_get_configuration_value('session_hide_document_upload') === true && (isset($sessionId) && $sessionId != 0))) {
1789+
$actionsLeft .= Display::url(
1790+
Display::return_icon('upload_file.png', get_lang('UplUploadDocument'), '', ICON_SIZE_MEDIUM),
1791+
api_get_path(WEB_CODE_PATH).'document/upload.php?'.api_get_cidreq().'&id='.$current_folder_id
1792+
);
1793+
}
17921794
}
17931795

17941796
// Create directory

‎main/install/configuration.dist.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,13 @@
25652565
// Define the default time in seconds to be registered if the user does logout from a course and there is no recent entry in track_e_course_access.
25662566
//$_configuration['tracking_default_course_extra_time_on_logout'] = 600;
25672567

2568+
// Set to true to hide lp creation icon on lp list if in a session
2569+
//$_configuration['session_hide_lp_creation'] = false;
2570+
// Set to true to hide lp copy icon on lp list if in a session
2571+
//$_configuration['session_hide_lp_copy'] = false;
2572+
// Set to true to hide document upload icon on document list if in a session
2573+
//$_configuration['session_hide_document_upload'] = false;
2574+
25682575
// Define a special path token for the Common Cartridge export content.
25692576
// Due to changes in naming by the responsible organization, the Chamilo default
25702577
// is '$1EdTech-CC-FILEBASE$' (the latest), but previous versions of the standard

‎main/lp/lp_list.php

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,26 @@ function confirmation(name) {
8080

8181
if ($is_allowed_to_edit) {
8282
$actionLeft = '';
83-
$actionLeft .= Display::url(
84-
Display::return_icon(
85-
'new_learnpath.png',
86-
get_lang('LearnpathAddLearnpath'),
87-
'',
88-
ICON_SIZE_MEDIUM
89-
),
90-
api_get_self().'?'.api_get_cidreq().'&action=add_lp'
91-
);
92-
$actionLeft .= Display::url(
93-
Display::return_icon(
94-
'import_scorm.png',
95-
get_lang('UploadScorm'),
96-
'',
97-
ICON_SIZE_MEDIUM
98-
),
99-
'../upload/index.php?'.api_get_cidreq().'&curdirpath=/&tool='.TOOL_LEARNPATH
100-
);
83+
if (!(api_get_configuration_value('session_hide_lp_creation') === true && (isset($sessionId) && $sessionId != 0))) {
84+
$actionLeft .= Display::url(
85+
Display::return_icon(
86+
'new_learnpath.png',
87+
get_lang('LearnpathAddLearnpath'),
88+
'',
89+
ICON_SIZE_MEDIUM
90+
),
91+
api_get_self().'?'.api_get_cidreq().'&action=add_lp'
92+
);
93+
$actionLeft .= Display::url(
94+
Display::return_icon(
95+
'import_scorm.png',
96+
get_lang('UploadScorm'),
97+
'',
98+
ICON_SIZE_MEDIUM
99+
),
100+
'../upload/index.php?'.api_get_cidreq().'&curdirpath=/&tool='.TOOL_LEARNPATH
101+
);
102+
}
101103

102104
if (api_get_setting('service_ppt2lp', 'active') === 'true') {
103105
$actionLeft .= Display::url(
@@ -200,6 +202,7 @@ function confirmation(name) {
200202
$hideScormExportLink = api_get_setting('hide_scorm_export_link');
201203
$hideScormCopyLink = api_get_setting('hide_scorm_copy_link');
202204
$hideScormPdfLink = api_get_setting('hide_scorm_pdf_link');
205+
$hideLpCopyInSession = (api_get_configuration_value('session_hide_lp_copy') === true && (isset($sessionId) && $sessionId != 0));
203206
$options = learnpath::getIconSelect();
204207
$cidReq = api_get_cidreq();
205208

@@ -925,7 +928,7 @@ function confirmation(name) {
925928
$dsp_disk = null;
926929
}
927930

928-
if ($hideScormCopyLink === 'true') {
931+
if ($hideScormCopyLink === 'true' || $hideLpCopyInSession) {
929932
$copy = null;
930933
}
931934

‎main/session/add_users_to_session.php

Lines changed: 117 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* @package chamilo.admin
66
*/
77
// resetting the course id
8+
use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
9+
810
$cidReset = true;
911

1012
require_once __DIR__.'/../inc/global.inc.php';
@@ -14,8 +16,8 @@
1416
// setting the section (for the tabs)
1517
$this_section = SECTION_PLATFORM_ADMIN;
1618

17-
$id_session = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
18-
$addProcess = isset($_GET['add']) && 'true' === $_GET['add'] ? 'true' : null;
19+
$id_session = isset($_REQUEST['id_session']) ? (int) $_REQUEST['id_session'] : 0;
20+
$addProcess = isset($_REQUEST['add']) && 'true' === $_REQUEST['add'] ? 'true' : null;
1921

2022
SessionManager::protectSession($id_session);
2123

@@ -65,6 +67,40 @@
6567
}
6668
}
6769

70+
if (ChamiloApi::isAjaxRequest() && isset($_POST['action'])) {
71+
$id_session = isset($_POST['id_session']) ? (int) $_POST['id_session'] : 0;
72+
$excludedUsers = isset($_POST['excludedUsers']) ? $_POST['excludedUsers'] : [];
73+
74+
$excludedUsersList = count($excludedUsers) > 0 ? implode(",", array_map('intval', $excludedUsers)) : '0';
75+
76+
if ($_POST['action'] == 'get_last_ten_users') {
77+
$sql = "SELECT u.id, u.username, u.firstname, u.lastname
78+
FROM $tbl_user u
79+
LEFT JOIN $tbl_session_rel_user sru ON (u.id = sru.user_id AND sru.session_id = $id_session)
80+
WHERE sru.user_id IS NULL
81+
AND u.id NOT IN ($excludedUsersList)
82+
ORDER BY u.id DESC
83+
LIMIT 10";
84+
} elseif ($_POST['action'] == 'get_all_users') {
85+
$sql = "SELECT u.id, u.username, u.firstname, u.lastname
86+
FROM $tbl_user u
87+
LEFT JOIN $tbl_session_rel_user sru ON (u.id = sru.user_id AND sru.session_id = $id_session)
88+
WHERE sru.user_id IS NULL
89+
AND u.id NOT IN ($excludedUsersList)
90+
ORDER BY u.lastname ASC, u.firstname ASC";
91+
}
92+
93+
$result = Database::query($sql);
94+
$users = [];
95+
while ($row = Database::fetch_assoc($result)) {
96+
$users[] = $row;
97+
}
98+
99+
header('Content-Type: application/json');
100+
echo json_encode($users);
101+
die();
102+
}
103+
68104
function search_users($needle, $type)
69105
{
70106
global $id_session;
@@ -304,6 +340,77 @@ function change_select(val) {
304340
xajax_search_users(val,"multiple");
305341
}
306342
</script>';
343+
$htmlHeadXtra[] = '
344+
<script>
345+
function showLastTenUsers() {
346+
var selectedUsers = [];
347+
$("#destination_users option").each(function() {
348+
selectedUsers.push($(this).val());
349+
});
350+
351+
if (selectedUsers.length === 0) {
352+
selectedUsers.push(0);
353+
}
354+
355+
var idSession = "'.(int) $id_session.'";
356+
$.post("'.api_get_self().'",
357+
{
358+
action: "get_last_ten_users",
359+
excludedUsers: selectedUsers,
360+
id_session: idSession,
361+
add: "",
362+
add_type: "multiple"
363+
}, function(data) {
364+
console.log(data);
365+
var select = document.getElementById("origin_users");
366+
select.innerHTML = "";
367+
$.each(data, function(index, user) {
368+
select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
369+
});
370+
}, "json").fail(function(xhr, status, error) {
371+
console.error("Error en la solicitud AJAX: " + error);
372+
console.log(xhr.responseText);
373+
});
374+
}
375+
376+
function loadAllUsers() {
377+
var selectedUsers = [];
378+
379+
$("#destination_users option").each(function() {
380+
selectedUsers.push($(this).val());
381+
});
382+
383+
if (selectedUsers.length === 0) {
384+
selectedUsers.push(0);
385+
}
386+
387+
var idSession = "'.(int) $id_session.'";
388+
$.post("'.api_get_self().'",
389+
{
390+
action: "get_all_users",
391+
excludedUsers: selectedUsers,
392+
id_session: idSession,
393+
add: "",
394+
add_type: "multiple"
395+
}, function(data) {
396+
var select = document.getElementById("origin_users");
397+
select.innerHTML = "";
398+
399+
$.each(data, function(index, user) {
400+
select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
401+
});
402+
}, "json").fail(function(xhr, status, error) {
403+
console.error("Error en la solicitud AJAX: " + error);
404+
});
405+
}
406+
407+
$(document).ready(function() {
408+
loadAllUsers();
409+
$("#show_last_ten_users_button").on("click", showLastTenUsers);
410+
$("#reset_users_button").on("click", loadAllUsers);
411+
});
412+
</script>
413+
';
307414

308415
$form_sent = 0;
309416
$errorMsg = $firstLetterUser = $firstLetterSession = '';
@@ -691,6 +798,14 @@ class="form-control">
691798
<?php
692799
echo Display::get_alphabet_options(); ?>
693800
</select>
801+
<span class="input-group-btn">
802+
<button class="btn btn-default" type="button" id="show_last_ten_users_button" title="<?php echo get_lang('ShowLastTenUsers') ?>">
803+
<i class="fa fa-clock-o"></i>
804+
</button>
805+
<button class="btn btn-default" type="button" id="reset_users_button" title="<?php echo get_lang('Reset') ?>">
806+
<i class="fa fa-refresh"></i>
807+
</button>
808+
</span>
694809
<br/>
695810
<br/>
696811
<?php

0 commit comments

Comments
 (0)