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

Scrutinizer Auto-Fixes

Browse Source 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
pull/2487/head
Scrutinizer Auto-Fixer 9 years ago
parent 47c11fc515
commit fa1d80fab2
49 changed files with 360 additions and 360 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. 16
      main/attendance/attendance_calendar.php
  2. 4
      main/course_description/index.php
  3. 22
      main/create_course/add_course.php
  4. 58
      main/document/create_document.php
  5. 22
      main/document/document_quota.php
  6. 6
      main/document/remote.php
  7. 18
      main/document/webcam_clip.php
  8. 34
      main/dropbox/dropbox_class.inc.php
  9. 6
      main/dropbox/dropbox_init.inc.php
  10. 16
      main/exercise/overview.php
  11. 12
      main/exercise/showinframes.php
  12. 14
      main/extrafield/translate.php
  13. 26
      main/group/group_category.php
  14. 16
      main/group/group_creation.php
  15. 18
      main/group/group_overview.php
  16. 6
      main/group/group_space.php
  17. 2
      main/group/member_settings.php
  18. 14
      main/group/settings.php
  19. 4
      main/group/tutor_settings.php
  20. 28
      main/inc/ajax/admin.ajax.php
  21. 10
      main/inc/ajax/forum.ajax.php
  22. 6
      main/inc/ajax/myspace.ajax.php
  23. 2
      main/inc/ajax/online.ajax.php
  24. 6
      main/inc/ajax/skill.ajax.php
  25. 14
      main/inc/lib/plugin.class.php
  26. 12
      main/inc/lib/search/get_terms.php
  27. 6
      main/inc/lib/search/tool_processors/document_processor.class.php
  28. 14
      main/inc/lib/search/tool_processors/learnpath_processor.class.php
  29. 8
      main/inc/lib/search/tool_processors/link_processor.class.php
  30. 6
      main/inc/lib/search/tool_processors/quiz_processor.class.php
  31. 4
      main/link/link.php
  32. 8
      main/mySpace/index.php
  33. 10
      main/mySpace/teachers.php
  34. 6
      main/reports/reports.lib.php
  35. 2
      main/survey/ch_dropdown.php
  36. 12
      main/survey/reporting.php
  37. 4
      main/ticket/projects.php
  38. 4
      main/ticket/status.php
  39. 2
      main/ticket/update_report.php
  40. 6
      main/timeline/view.php
  41. 2
      main/upload/upload.scorm.php
  42. 48
      main/user/subscribe_user.php
  43. 6
      main/wiki/index.php
  44. 8
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
  45. 30
      src/Chamilo/CourseBundle/Component/CourseCopy/CourseSelectForm.php

16
main/attendance/attendance_calendar.php
Unescape View File

@ -14,15 +14,15 @@ if (!$is_locked_attendance || api_is_platform_admin()) {
echo '<div class="actions">'; echo '<div class="actions">';
if ($action == 'calendar_add') { if ($action == 'calendar_add') {
echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.'">'. echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.'">'.
Display::return_icon('back.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).'</a>';
} else { } else {
echo '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance_id.'">'. echo '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendance_id.'">'.
Display::return_icon('back.png',get_lang('AttendanceSheet'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('AttendanceSheet'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_is_allowed_to_edit()) { if (api_is_allowed_to_edit()) {
echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_add&attendance_id='.$attendance_id.'">'. echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_add&attendance_id='.$attendance_id.'">'.
Display::return_icon('add.png',get_lang('AddDateAndTime'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('add.png', get_lang('AddDateAndTime'), '', ICON_SIZE_MEDIUM).'</a>';
echo '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDeleteAllDates').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=calendar_all_delete&attendance_id='.$attendance_id.'">'. echo '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDeleteAllDates').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=calendar_all_delete&attendance_id='.$attendance_id.'">'.
Display::return_icon('clean.png',get_lang('CleanCalendar'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('clean.png', get_lang('CleanCalendar'), '', ICON_SIZE_MEDIUM).'</a>';
} }
} }
echo '</div>'; echo '</div>';
@ -57,7 +57,7 @@ if (isset($action) && $action == 'calendar_add') {
$form = new FormValidator( $form = new FormValidator(
'attendance_calendar_add', 'attendance_calendar_add',
'POST', 'POST',
'index.php?action=calendar_add&attendance_id='.$attendance_id.'&' . api_get_cidreq(), 'index.php?action=calendar_add&attendance_id='.$attendance_id.'&'.api_get_cidreq(),
'' ''
); );
$form->addElement('header', get_lang('AddADateTime')); $form->addElement('header', get_lang('AddADateTime'));
@ -92,7 +92,7 @@ if (isset($action) && $action == 'calendar_add') {
'weekly' => get_lang('RepeatWeekly'), 'weekly' => get_lang('RepeatWeekly'),
'monthlyByDate' => get_lang('RepeatMonthlyByDate') 'monthlyByDate' => get_lang('RepeatMonthlyByDate')
); );
$form->addElement('select', 'repeat_type', get_lang('RepeatType') , $a_repeat_type); $form->addElement('select', 'repeat_type', get_lang('RepeatType'), $a_repeat_type);
$form->addElement( $form->addElement(
'date_picker', 'date_picker',
@ -133,7 +133,7 @@ if (isset($action) && $action == 'calendar_add') {
$form = new FormValidator( $form = new FormValidator(
'attendance_calendar_edit', 'attendance_calendar_edit',
'POST', 'POST',
'index.php?action=calendar_edit&attendance_id=' . $attendance_id . '&calendar_id=' . $calendar_id . '&' . api_get_cidreq(), 'index.php?action=calendar_edit&attendance_id='.$attendance_id.'&calendar_id='.$calendar_id.'&'.api_get_cidreq(),
'' ''
); );
$form->addDateTimePicker( $form->addDateTimePicker(
@ -154,7 +154,7 @@ if (isset($action) && $action == 'calendar_add') {
get_lang('DateTime'), get_lang('DateTime'),
null, null,
ICON_SIZE_MEDIUM ICON_SIZE_MEDIUM
).' '.substr($calendar['date_time'], 0, strlen($calendar['date_time'])- 3) .'&nbsp;'; ).' '.substr($calendar['date_time'], 0, strlen($calendar['date_time']) - 3).'&nbsp;';
if (isset($calendar['groups']) && !empty($calendar['groups'])) { if (isset($calendar['groups']) && !empty($calendar['groups'])) {
foreach ($calendar['groups'] as $group) { foreach ($calendar['groups'] as $group) {

4
main/course_description/index.php
Unescape View File

@ -23,7 +23,7 @@ api_protect_course_script(true);
// get actions // get actions
$actions = array('listing', 'add', 'edit', 'delete', 'history'); $actions = array('listing', 'add', 'edit', 'delete', 'history');
$action = 'listing'; $action = 'listing';
if (isset($_GET['action']) && in_array($_GET['action'],$actions)) { if (isset($_GET['action']) && in_array($_GET['action'], $actions)) {
$action = $_GET['action']; $action = $_GET['action'];
} }
@ -42,7 +42,7 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') {
} }
// interbreadcrumb // interbreadcrumb
$interbreadcrumb[] = array ("url" => "index.php?".api_get_cidreq(), "name" => get_lang('CourseProgram')); $interbreadcrumb[] = array("url" => "index.php?".api_get_cidreq(), "name" => get_lang('CourseProgram'));
if ($description_type == 1) { if ($description_type == 1) {
$interbreadcrumb[] = array("url" => "#", "name" => get_lang('GeneralDescription')); $interbreadcrumb[] = array("url" => "#", "name" => get_lang('GeneralDescription'));
} }

22
main/create_course/add_course.php
Unescape View File

@ -44,7 +44,7 @@ $htmlHeadXtra[] = '<script>
</script>'; </script>';
$interbreadcrumb[] = array( $interbreadcrumb[] = array(
'url' => api_get_path(WEB_PATH) . 'user_portal.php', 'url' => api_get_path(WEB_PATH).'user_portal.php',
'name' => get_lang('MyCourses') 'name' => get_lang('MyCourses')
); );
@ -81,7 +81,7 @@ $form->addElement(
); );
// Category category. // Category category.
$url = api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_category'; $url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_category';
$form->addElement( $form->addElement(
'select_ajax', 'select_ajax',
@ -224,7 +224,7 @@ if (api_get_setting('teacher_can_select_course_template') === 'true') {
get_lang('PickACourseAsATemplateForThisNewCourse'), get_lang('PickACourseAsATemplateForThisNewCourse'),
], ],
null, null,
['url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_course'] ['url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_course']
); );
} }
@ -285,8 +285,8 @@ if ($form->validate()) {
$params['gradebook_model_id'] = isset($course_values['gradebook_model_id']) ? $course_values['gradebook_model_id'] : null; $params['gradebook_model_id'] = isset($course_values['gradebook_model_id']) ? $course_values['gradebook_model_id'] : null;
$params['course_template'] = $course_values['course_template']; $params['course_template'] = $course_values['course_template'];
include_once api_get_path(SYS_CODE_PATH) . 'lang/english/trad4all.inc.php'; include_once api_get_path(SYS_CODE_PATH).'lang/english/trad4all.inc.php';
$file_to_include = api_get_path(SYS_CODE_PATH) . 'lang/' . $course_language . '/trad4all.inc.php'; $file_to_include = api_get_path(SYS_CODE_PATH).'lang/'.$course_language.'/trad4all.inc.php';
if (file_exists($file_to_include)) { if (file_exists($file_to_include)) {
include $file_to_include; include $file_to_include;
@ -311,13 +311,13 @@ if ($form->validate()) {
$splash = api_get_setting('course_creation_splash_screen'); $splash = api_get_setting('course_creation_splash_screen');
if ($splash === 'true') { if ($splash === 'true') {
$url = api_get_path(WEB_CODE_PATH); $url = api_get_path(WEB_CODE_PATH);
$url .= 'course_info/start.php?' . api_get_cidreq_params($course_info['code']); $url .= 'course_info/start.php?'.api_get_cidreq_params($course_info['code']);
$url .= '&first=1'; $url .= '&first=1';
header('Location: ' . $url); header('Location: '.$url);
exit; exit;
} else { } else {
$url = api_get_path(WEB_COURSE_PATH) . $course_info['directory'] . '/'; $url = api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/';
header('Location: ' . $url); header('Location: '.$url);
exit; exit;
} }
} else { } else {
@ -345,7 +345,7 @@ if ($form->validate()) {
if ($request_id) { if ($request_id) {
$course_request_info = CourseRequestManager::get_course_request_info($request_id); $course_request_info = CourseRequestManager::get_course_request_info($request_id);
$message = (is_array($course_request_info) ? '<strong>' . $course_request_info['code'] . '</strong> : ' : '') . get_lang('CourseRequestCreated'); $message = (is_array($course_request_info) ? '<strong>'.$course_request_info['code'].'</strong> : ' : '').get_lang('CourseRequestCreated');
$message = Display::return_message( $message = Display::return_message(
$message, $message,
'confirmation', 'confirmation',
@ -355,7 +355,7 @@ if ($form->validate()) {
'div', 'div',
Display::url( Display::url(
get_lang('Enter'), get_lang('Enter'),
api_get_path(WEB_PATH) . 'user_portal.php', api_get_path(WEB_PATH).'user_portal.php',
['class' => 'btn btn-default'] ['class' => 'btn btn-default']
), ),
['style' => 'float: left; margin:0px; padding: 0px;'] ['style' => 'float: left; margin:0px; padding: 0px;']

58
main/document/create_document.php
Unescape View File

@ -39,7 +39,7 @@ $(document).on("change", ".selectpicker", function () {
$.ajax({ $.ajax({
contentType: "application/x-www-form-urlencoded", contentType: "application/x-www-form-urlencoded",
data: "dirValue="+dirValue, data: "dirValue="+dirValue,
url: "' . api_get_path(WEB_AJAX_PATH) . 'document.ajax.php?a=document_destination", url: "' . api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_destination",
type: "POST", type: "POST",
success: function(response) { success: function(response) {
$("[name=\'dirValue\']").val(response) $("[name=\'dirValue\']").val(response)
@ -147,7 +147,7 @@ if ($is_certificate_mode) {
} }
$doc_tree = explode('/', $dir); $doc_tree = explode('/', $dir);
$count_dir = count($doc_tree) -2; // "2" because at the begin and end there are 2 "/" $count_dir = count($doc_tree) - 2; // "2" because at the begin and end there are 2 "/"
if (api_is_in_group()) { if (api_is_in_group()) {
$group_properties = GroupManager::get_group_properties(api_get_group_id()); $group_properties = GroupManager::get_group_properties(api_get_group_id());
@ -162,7 +162,7 @@ for ($i = 0; $i < ($count_dir); $i++) {
$relative_url .= '../'; $relative_url .= '../';
} }
if ($relative_url== '') { if ($relative_url == '') {
$relative_url = '/'; $relative_url = '/';
} }
@ -214,7 +214,7 @@ if (!$is_certificate_mode) {
"name" => get_lang('Documents'), "name" => get_lang('Documents'),
); );
} else { } else {
$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
} }
if (!api_is_allowed_in_course()) { if (!api_is_allowed_in_course()) {
@ -253,9 +253,9 @@ $form = new FormValidator(
$form->addElement('header', $nameTools); $form->addElement('header', $nameTools);
if ($is_certificate_mode) {//added condition for certicate in gradebook if ($is_certificate_mode) {//added condition for certicate in gradebook
$form->addElement('hidden','certificate','true',array('id'=>'certificate')); $form->addElement('hidden', 'certificate', 'true', array('id'=>'certificate'));
if (isset($_GET['selectcat'])) { if (isset($_GET['selectcat'])) {
$form->addElement('hidden','selectcat', $select_cat); $form->addElement('hidden', 'selectcat', $select_cat);
} }
} }
@ -334,19 +334,19 @@ if (!$is_certificate_mode &&
$escaped_folders = array(); $escaped_folders = array();
foreach ($folders as $key => & $val) { foreach ($folders as $key => & $val) {
// Hide some folders // Hide some folders
if ($val=='/HotPotatoes_files' || $val=='/certificates' || basename($val)=='css'){ if ($val == '/HotPotatoes_files' || $val == '/certificates' || basename($val) == 'css') {
continue; continue;
} }
// Admin setting for Hide/Show the folders of all users // Admin setting for Hide/Show the folders of all users
if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))){ if (api_get_setting('show_users_folders') == 'false' && (strstr($val, '/shared_folder') || strstr($val, 'shared_folder_session_'))) {
continue; continue;
} }
// Admin setting for Hide/Show Default folders to all users // Admin setting for Hide/Show Default folders to all users
if (api_get_setting('show_default_folders') == 'false' && ($val=='/images' || $val=='/flash' || $val=='/audio' || $val=='/video' || strstr($val, '/images/gallery') || $val=='/video/flv')){ if (api_get_setting('show_default_folders') == 'false' && ($val == '/images' || $val == '/flash' || $val == '/audio' || $val == '/video' || strstr($val, '/images/gallery') || $val == '/video/flv')) {
continue; continue;
} }
// Admin setting for Hide/Show chat history folder // Admin setting for Hide/Show chat history folder
if (api_get_setting('show_chat_folder') == 'false' && $val=='/chat_files'){ if (api_get_setting('show_chat_folder') == 'false' && $val == '/chat_files') {
continue; continue;
} }
@ -371,13 +371,13 @@ if (!$is_certificate_mode &&
if (is_array($folders)) { if (is_array($folders)) {
foreach ($folders as & $folder) { foreach ($folders as & $folder) {
//Hide some folders //Hide some folders
if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') { if ($folder == '/HotPotatoes_files' || $folder == '/certificates' || basename($folder) == 'css') {
continue; continue;
} }
//Admin setting for Hide/Show the folders of all users //Admin setting for Hide/Show the folders of all users
if (api_get_setting('show_users_folders') == 'false' && if (api_get_setting('show_users_folders') == 'false' &&
(strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_')) (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
){ ) {
continue; continue;
} }
//Admin setting for Hide/Show Default folders to all users //Admin setting for Hide/Show Default folders to all users
@ -390,20 +390,20 @@ if (!$is_certificate_mode &&
strstr($folder, '/images/gallery') || strstr($folder, '/images/gallery') ||
$folder == '/video/flv' $folder == '/video/flv'
) )
){ ) {
continue; continue;
} }
//Admin setting for Hide/Show chat history folder //Admin setting for Hide/Show chat history folder
if (api_get_setting('show_chat_folder') == 'false' && if (api_get_setting('show_chat_folder') == 'false' &&
$folder=='/chat_files' $folder == '/chat_files'
){ ) {
continue; continue;
} }
$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : ''; $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
$path_parts = explode('/', $folder); $path_parts = explode('/', $folder);
$folder_titles[$folder] = cut($folder_titles[$folder], 80); $folder_titles[$folder] = cut($folder_titles[$folder], 80);
$space_counter =count($path_parts) - 2; $space_counter = count($path_parts) - 2;
if ($space_counter > 0) { if ($space_counter > 0) {
$label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder]; $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
} else { } else {
@ -421,11 +421,11 @@ if (!$is_certificate_mode &&
$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : ''; $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
$label = $folder_titles[$folder]; $label = $folder_titles[$folder];
if ($folder == $group_dir) { if ($folder == $group_dir) {
$label = '/ (' . get_lang('HomeDirectory') . ')'; $label = '/ ('.get_lang('HomeDirectory').')';
} else { } else {
$path_parts = explode('/', str_replace($group_dir, '', $folder)); $path_parts = explode('/', str_replace($group_dir, '', $folder));
$label = cut($label, 80); $label = cut($label, 80);
$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2) . ' &mdash; ' . $label; $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
} }
$parent_select->addOption($label, $folder); $parent_select->addOption($label, $folder);
if ($selected != '') { if ($selected != '') {
@ -555,7 +555,7 @@ if ($form->validate()) {
); );
} }
} }
$dir= substr($dir,0,-1); $dir = substr($dir, 0, -1);
$selectcat = ''; $selectcat = '';
if (isset($_REQUEST['selectcat'])) { if (isset($_REQUEST['selectcat'])) {
$selectcat = "&selectcat=".intval($_REQUEST['selectcat']); $selectcat = "&selectcat=".intval($_REQUEST['selectcat']);
@ -564,7 +564,7 @@ if ($form->validate()) {
if ($is_certificate_mode) { if ($is_certificate_mode) {
$df = DocumentManager::get_default_certificate_id($_course['code']); $df = DocumentManager::get_default_certificate_id($_course['code']);
if (!isset($df)) { if (!isset($df)) {
DocumentManager::attach_gradebook_certificate($_course['code'],$document_id); DocumentManager::attach_gradebook_certificate($_course['code'], $document_id);
} }
$certificate_condition = '&certificate=true&curdirpath=/certificates'; $certificate_condition = '&certificate=true&curdirpath=/certificates';
} }
@ -608,16 +608,16 @@ if ($form->validate()) {
// link back to the documents overview // link back to the documents overview
if ($is_certificate_mode) { if ($is_certificate_mode) {
$actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. $actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat='.Security::remove_XSS($_GET['selectcat']).'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'. $actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.
Display::return_icon('expand.png',get_lang('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('expand.png', get_lang('Back'), array('id'=>'expand'), ICON_SIZE_MEDIUM).Display::return_icon('contract.png', get_lang('Back'), array('id'=>'contract', 'class'=>'hide'), ICON_SIZE_MEDIUM).'</a>';
} else { } else {
$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'. $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
$actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'. $actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.
Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM). Display::return_icon('expand.png', get_lang('Expand'), array('id'=>'expand'), ICON_SIZE_MEDIUM).
Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('contract.png', get_lang('Collapse'), array('id'=>'contract', 'class'=>'hide'), ICON_SIZE_MEDIUM).'</a>';
} }
echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft)); echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft));
@ -630,10 +630,10 @@ if ($form->validate()) {
$str_info = ''; $str_info = '';
foreach ($all_information_by_create_certificate[0] as $info_value) { foreach ($all_information_by_create_certificate[0] as $info_value) {
$str_info.=$info_value.'<br/>'; $str_info .= $info_value.'<br/>';
} }
$create_certificate = get_lang('CreateCertificateWithTags'); $create_certificate = get_lang('CreateCertificateWithTags');
Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false); Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info, false);
} }
// HTML-editor // HTML-editor

22
main/document/document_quota.php
Unescape View File

@ -32,11 +32,11 @@ $user_info = api_get_user_info($user_id);
$session = array(); $session = array();
$user_name = $user_info['complete_name']; $user_name = $user_info['complete_name'];
$course_list = SessionManager::get_course_list_by_session_id ($session_id); $course_list = SessionManager::get_course_list_by_session_id($session_id);
$session_list = SessionManager::get_session_by_course($course_id); $session_list = SessionManager::get_session_by_course($course_id);
$total_quota_bytes = DocumentManager::get_course_quota(); $total_quota_bytes = DocumentManager::get_course_quota();
$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0); $quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0);
$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
$session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage); $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage);
@ -47,10 +47,10 @@ if (!empty($session_list)) {
$quota_percentage = 0; $quota_percentage = 0;
$quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id'])); $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id']));
if (!empty($quota_bytes)) { if (!empty($quota_bytes)) {
$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
} }
if ($session_id == $session_data['id']) { if ($session_id == $session_data['id']) {
$session_data['name'] = $session_data['name'] . ' * '; $session_data['name'] = $session_data['name'].' * ';
} }
$used_quota_bytes += $quota_bytes; $used_quota_bytes += $quota_bytes;
$session[] = array( $session[] = array(
@ -67,10 +67,10 @@ if (!empty($group_list)) {
$my_group_id = $group_data['id']; $my_group_id = $group_data['id'];
$quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0)); $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0));
if (!empty($quota_bytes)) { if (!empty($quota_bytes)) {
$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
} }
if ($group_id == $my_group_id) { if ($group_id == $my_group_id) {
$group_data['name'] = $group_data['name'] . ' * '; $group_data['name'] = $group_data['name'].' * ';
} }
$used_quota_bytes += $quota_bytes; $used_quota_bytes += $quota_bytes;
$session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage); $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@ -85,7 +85,7 @@ if (is_array($document_list)) {
} }
} }
if ($quota_bytes != 0) { if ($quota_bytes != 0) {
$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
} }
$session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage); $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@ -100,15 +100,15 @@ if (is_array($document_list)) {
} }
} }
if ($quota_bytes != 0) { if ($quota_bytes != 0) {
$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
} }
} }
$session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage); $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage);
} }
} }
$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100; $quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100;
$session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage); $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage);
$quota_data = json_encode($session); $quota_data = json_encode($session);

6
main/document/remote.php
Unescape View File

@ -40,8 +40,8 @@ $cwd = $_REQUEST['cwd'];
$nParent = 0; // the number of /.. into the url $nParent = 0; // the number of /.. into the url
while (substr($cwd, -3, 3) == '/..') { while (substr($cwd, -3, 3) == '/..') {
// go to parent directory // go to parent directory
$cwd= substr($cwd, 0, -3); $cwd = substr($cwd, 0, -3);
if (strlen($cwd) == 0) { $cwd='/'; } if (strlen($cwd) == 0) { $cwd = '/'; }
$nParent++; $nParent++;
} }
for (; $nParent > 0; $nParent--) { for (; $nParent > 0; $nParent--) {
@ -55,7 +55,7 @@ if (Security::check_abs_path($cwd, api_get_path(SYS_PATH))) {
} }
if ($action == 'list') { if ($action == 'list') {
/*==== List files ====*/ /*==== List files ====*/
if ($debug>0) { error_log("sending file list",0); } if ($debug > 0) { error_log("sending file list", 0); }
// get files list // get files list
$files = DocumentManager::get_all_document_data($_course, $cwd, 0, null, false); $files = DocumentManager::get_all_document_data($_course, $cwd, 0, null, false);

18
main/document/webcam_clip.php
Unescape View File

@ -35,9 +35,9 @@ $document_id = $document_data['id'];
$dir = $document_data['path']; $dir = $document_data['path'];
//make some vars //make some vars
$webcamdir=$dir; $webcamdir = $dir;
if($webcamdir=="/"){ if ($webcamdir == "/") {
$webcamdir=""; $webcamdir = "";
} }
@ -71,7 +71,7 @@ if (!is_dir($filepath)) {
$groupId = api_get_group_id(); $groupId = api_get_group_id();
if (!empty($groupId)) { if (!empty($groupId)) {
$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); $interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
$noPHP_SELF = true; $noPHP_SELF = true;
$group = GroupManager :: get_group_properties($groupId); $group = GroupManager :: get_group_properties($groupId);
$path = explode('/', $dir); $path = explode('/', $dir);
@ -80,14 +80,14 @@ if (!empty($groupId)) {
} }
} }
$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
if (!api_is_allowed_in_course()) { if (!api_is_allowed_in_course()) {
api_not_allowed(true); api_not_allowed(true);
} }
if (!($is_allowed_to_edit || $groupRights || if (!($is_allowed_to_edit || $groupRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
api_not_allowed(true); api_not_allowed(true);
} }
@ -105,7 +105,7 @@ if (isset ($group)) {
// Interbreadcrumb for the current directory root path // Interbreadcrumb for the current directory root path
$counter = 0; $counter = 0;
if (isset($document_data['parents'])) { if (isset($document_data['parents'])) {
foreach($document_data['parents'] as $document_sub_data) { foreach ($document_data['parents'] as $document_sub_data) {
//fixing double group folder in breadcrumb //fixing double group folder in breadcrumb
if (api_get_group_id()) { if (api_get_group_id()) {
if ($counter == 0) { if ($counter == 0) {
@ -119,12 +119,12 @@ if (isset($document_data['parents'])) {
} }
//make some vars //make some vars
$webcamuserid=api_get_user_id(); $webcamuserid = api_get_user_id();
Display :: display_header($nameTools, 'Doc'); Display :: display_header($nameTools, 'Doc');
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="document.php?id='.$document_id.'">'. echo '<a href="document.php?id='.$document_id.'">'.
Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
?> ?>

34
main/dropbox/dropbox_class.inc.php
Unescape View File

@ -104,7 +104,7 @@ class Dropbox_Work
// Check if object exists already. If it does, the old object is used // Check if object exists already. If it does, the old object is used
// with updated information (authors, description, upload_date) // with updated information (authors, description, upload_date)
$this->isOldWork = false; $this->isOldWork = false;
$sql = "SELECT id, upload_date FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." $sql = "SELECT id, upload_date FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'"; WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
$result = Database::query($sql); $result = Database::query($sql);
$res = Database::fetch_array($result); $res = Database::fetch_array($result);
@ -148,20 +148,20 @@ class Dropbox_Work
$this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params); $this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params);
if ($this->id) { if ($this->id) {
$sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ." SET id = iid WHERE iid = {$this->id}"; $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)." SET id = iid WHERE iid = {$this->id}";
Database::query($sql); Database::query($sql);
} }
} }
$sql = "SELECT count(file_id) as count $sql = "SELECT count(file_id) as count
FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON)."
WHERE c_id = $course_id AND file_id = ".intval($this->id)." AND user_id = ".$this->uploader_id; WHERE c_id = $course_id AND file_id = ".intval($this->id)." AND user_id = ".$this->uploader_id;
$result = Database::query($sql); $result = Database::query($sql);
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
if ($row['count'] == 0) { if ($row['count'] == 0) {
// Insert entries into person table // Insert entries into person table
$sql = "INSERT INTO ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." (c_id, file_id, user_id) $sql = "INSERT INTO ".Database::get_course_table(TABLE_DROPBOX_PERSON)." (c_id, file_id, user_id)
VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")"; VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
Database::query($sql); Database::query($sql);
} }
@ -183,7 +183,7 @@ class Dropbox_Work
// Get the data from DB // Get the data from DB
$sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id $sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id
FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)."
WHERE c_id = $course_id AND id = ".$id.""; WHERE c_id = $course_id AND id = ".$id."";
$result = Database::query($sql); $result = Database::query($sql);
$res = Database::fetch_array($result, 'ASSOC'); $res = Database::fetch_array($result, 'ASSOC');
@ -212,7 +212,7 @@ class Dropbox_Work
// Getting the feedback on the work. // Getting the feedback on the work.
if ($action == 'viewfeedback' AND $this->id == $_GET['id']) { if ($action == 'viewfeedback' AND $this->id == $_GET['id']) {
$feedback2 = array(); $feedback2 = array();
$sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK) ." $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_FEEDBACK)."
WHERE c_id = $course_id AND file_id='".$id."' WHERE c_id = $course_id AND file_id='".$id."'
ORDER BY feedback_id ASC"; ORDER BY feedback_id ASC";
$result = Database::query($sql); $result = Database::query($sql);
@ -220,7 +220,7 @@ class Dropbox_Work
$row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']); $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
$feedback2[] = $row_feedback; $feedback2[] = $row_feedback;
} }
$this->feedback2= $feedback2; $this->feedback2 = $feedback2;
} }
} }
} }
@ -292,7 +292,7 @@ class Dropbox_SentWork extends Dropbox_Work
$recipient_ids = array($uploader_id); $recipient_ids = array($uploader_id);
} }
if (! is_array($recipient_ids) || count($recipient_ids) == 0) { if (!is_array($recipient_ids) || count($recipient_ids) == 0) {
die(get_lang('GeneralError').' (code 209)'); die(get_lang('GeneralError').' (code 209)');
} }
@ -314,8 +314,8 @@ class Dropbox_SentWork extends Dropbox_Work
// Insert data in dropbox_post and dropbox_person table for each recipient // Insert data in dropbox_post and dropbox_person table for each recipient
foreach ($this->recipients as $rec) { foreach ($this->recipients as $rec) {
$file_id = (int)$this->id; $file_id = (int) $this->id;
$user_id = (int)$rec['id']; $user_id = (int) $rec['id'];
$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id) $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)"; VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
Database::query($sql); Database::query($sql);
@ -472,7 +472,7 @@ class Dropbox_Person
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
// Delete entries in person table concerning received works // Delete entries in person table concerning received works
foreach ($this->receivedWork as $w) { foreach ($this->receivedWork as $w) {
$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"; WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
Database::query($sql); Database::query($sql);
} }
@ -489,10 +489,10 @@ class Dropbox_Person
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
$id = intval($id); $id = intval($id);
$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
WHERE c_id = $course_id AND cat_id = '".$id."' "; WHERE c_id = $course_id AND cat_id = '".$id."' ";
if (!Database::query($sql)) return false; if (!Database::query($sql)) return false;
$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
WHERE c_id = $course_id AND cat_id = '".$id."' "; WHERE c_id = $course_id AND cat_id = '".$id."' ";
if (!Database::query($sql)) return false; if (!Database::query($sql)) return false;
$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
@ -526,7 +526,7 @@ class Dropbox_Person
} }
} }
// Delete entries in person table concerning received works // Delete entries in person table concerning received works
$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'"; WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
Database::query($sql); Database::query($sql);
removeUnusedFiles(); // Check for unused files removeUnusedFiles(); // Check for unused files
@ -540,7 +540,7 @@ class Dropbox_Person
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
//delete entries in person table concerning sent works //delete entries in person table concerning sent works
foreach ($this->sentWork as $w) { foreach ($this->sentWork as $w) {
$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"; WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
Database::query($sql); Database::query($sql);
removeMoreIfMailing($w->id); removeMoreIfMailing($w->id);
@ -574,7 +574,7 @@ class Dropbox_Person
} }
//$file_id = $this->sentWork[$index]->id; //$file_id = $this->sentWork[$index]->id;
// Delete entries in person table concerning sent works // Delete entries in person table concerning sent works
$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'"; WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
Database::query($sql); Database::query($sql);
removeMoreIfMailing($id); removeMoreIfMailing($id);
@ -600,7 +600,7 @@ class Dropbox_Person
$wi = -1; $wi = -1;
foreach ($this->receivedWork as $w) { foreach ($this->receivedWork as $w) {
$wi++; $wi++;
if ($w->id == $id){ if ($w->id == $id) {
$found = true; $found = true;
break; break;
} // foreach (... as $wi -> $w) gives error 221! (no idea why...) } // foreach (... as $wi -> $w) gives error 221! (no idea why...)

6
main/dropbox/dropbox_init.inc.php
Unescape View File

@ -263,10 +263,10 @@ if ($allowOverwrite == 'true') {
$javascript .= " $javascript .= "
</script>"; </script>";
$htmlHeadXtra[] = $javascript; $htmlHeadXtra[] = $javascript;
$htmlHeadXtra[] ="<script> $htmlHeadXtra[] = "<script>
function confirmation (name) function confirmation (name)
{ {
if (confirm(\" ". get_lang("AreYouSureToDeleteJS") ." \"+ name + \" ?\")) if (confirm(\" ". get_lang("AreYouSureToDeleteJS")." \"+ name + \" ?\"))
{return true;} {return true;}
else else
{return false;} {return false;}
@ -313,7 +313,7 @@ if (($postAction == 'download_received' || $postAction == 'download_sent') and !
if ((!$is_allowed_in_course || !$is_course_member) && !api_is_allowed_to_edit(null, true)) { if ((!$is_allowed_in_course || !$is_course_member) && !api_is_allowed_to_edit(null, true)) {
if ($origin != 'learnpath') { if ($origin != 'learnpath') {
api_not_allowed(true);//print headers/footers api_not_allowed(true); //print headers/footers
} else { } else {
api_not_allowed(); api_not_allowed();
} }

16
main/exercise/overview.php
Unescape View File

@ -70,7 +70,7 @@ if ($origin != 'learnpath') {
$html = ''; $html = '';
$message = ''; $message = '';
$html.= '<div class="exercise">'; $html .= '<div class="exercise">';
$is_allowed_to_edit = api_is_allowed_to_edit(null, true); $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$edit_link = ''; $edit_link = '';
if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) { if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) {
@ -116,7 +116,7 @@ if (isset($exercise_stat_info['exe_id'])) {
// 2. Exercise button // 2. Exercise button
// Notice we not add there the lp_item_view_id because is not already generated // Notice we not add there the lp_item_view_id because is not already generated
$exercise_url = api_get_path(WEB_CODE_PATH) . 'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_item_view_id='.$learnpathItemViewId.$extra_params; $exercise_url = api_get_path(WEB_CODE_PATH).'exercise/exercise_submit.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&origin='.$origin.'&learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_item_view_id='.$learnpathItemViewId.$extra_params;
$exercise_url_button = Display::url( $exercise_url_button = Display::url(
$label, $label,
$exercise_url, $exercise_url,
@ -181,8 +181,8 @@ if (!empty($attempts)) {
$attempt_result['exe_result'], $attempt_result['exe_result'],
$attempt_result['exe_weighting'] $attempt_result['exe_weighting']
); );
$attempt_url = api_get_path(WEB_CODE_PATH) . 'exercise/result.php?'; $attempt_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?';
$attempt_url .= api_get_cidreq() . '&show_headers=1&'; $attempt_url .= api_get_cidreq().'&show_headers=1&';
$attempt_url .= http_build_query([ $attempt_url .= http_build_query([
'id' => $attempt_result['exe_id'] 'id' => $attempt_result['exe_id']
]); ]);
@ -192,7 +192,7 @@ if (!empty($attempts)) {
get_lang('Show'), get_lang('Show'),
$attempt_url, $attempt_url,
[ [
'class' => $btn_class . 'btn btn-default', 'class' => $btn_class.'btn btn-default',
'data-title' => get_lang('Show'), 'data-title' => get_lang('Show'),
'data-size' => 'lg' 'data-size' => 'lg'
] ]
@ -210,7 +210,7 @@ if (!empty($attempts)) {
), ),
'userIp' => $attempt_result['user_ip'] 'userIp' => $attempt_result['user_ip']
); );
$attempt_link .= "&nbsp;&nbsp;&nbsp;" . $teacher_revised; $attempt_link .= "&nbsp;&nbsp;&nbsp;".$teacher_revised;
if (in_array( if (in_array(
$objExercise->results_disabled, $objExercise->results_disabled,
@ -305,7 +305,7 @@ if ($objExercise->selectAttempts()) {
} }
if ($time_control) { if ($time_control) {
$html.= $objExercise->return_time_left_div(); $html .= $objExercise->return_time_left_div();
} }
$html .= $message; $html .= $message;
@ -325,7 +325,7 @@ $html .= Display::tag(
$table_content, $table_content,
['class' => 'table-responsive'] ['class' => 'table-responsive']
); );
$html.= '</div>'; $html .= '</div>';
echo $html; echo $html;
Display::display_footer(); Display::display_footer();

12
main/exercise/showinframes.php
Unescape View File

@ -14,8 +14,8 @@ $_course = api_get_course_info();
$time = time(); $time = time();
$doc_url = str_replace(array('../', '\\', '\\0', '..'), array('', '', '', ''), urldecode($_GET['file'])); $doc_url = str_replace(array('../', '\\', '\\0', '..'), array('', '', '', ''), urldecode($_GET['file']));
$cid = api_get_course_id(); $cid = api_get_course_id();
$document_path = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document'; $document_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$document_web_path = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document'; $document_web_path = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document';
$origin = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null; $origin = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null;
$learnpath_id = isset($_REQUEST['learnpath_id']) ? $_REQUEST['learnpath_id'] : null; $learnpath_id = isset($_REQUEST['learnpath_id']) ? $_REQUEST['learnpath_id'] : null;
$learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? $_REQUEST['learnpath_item_id'] : null; $learnpath_item_id = isset($_REQUEST['learnpath_item_id']) ? $_REQUEST['learnpath_item_id'] : null;
@ -38,9 +38,9 @@ if ($content == '') {
if (SaveScoreVariable==0) { if (SaveScoreVariable==0) {
SaveScoreVariable = 1; SaveScoreVariable = 1;
if (C.ie) { if (C.ie) {
document.location.href = '" . api_get_path(WEB_CODE_PATH) . "exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score; document.location.href = '" . api_get_path(WEB_CODE_PATH)."exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score;
} else { } else {
window.location.href = '" . api_get_path(WEB_CODE_PATH) . "exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score; window.location.href = '" . api_get_path(WEB_CODE_PATH)."exercise/savescores.php?lp_view_id=$lpViewId&origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id&time=".Security::remove_XSS($time)."&test=".$doc_url."&uid=".$user_id."&cid=".$cid."&score='+Score;
} }
} }
} }
@ -69,7 +69,7 @@ $my_file = Security::remove_XSS($_GET['file']);
$my_file = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($my_file)); $my_file = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($my_file));
$title = GetQuizName($my_file, $documentPath); $title = GetQuizName($my_file, $documentPath);
if ($title =='') { if ($title == '') {
$title = basename($my_file); $title = basename($my_file);
} }
$nameTools = $title; $nameTools = $title;
@ -87,7 +87,7 @@ $htmlHeadXtra[] = /** @lang HTML */<<<HTML
</script> </script>
HTML; HTML;
$interbreadcrumb[]= array ("url"=>"./exercise.php", "name"=> get_lang('Exercises')); $interbreadcrumb[] = array("url"=>"./exercise.php", "name"=> get_lang('Exercises'));
if ($origin == 'learnpath') { if ($origin == 'learnpath') {
Display::display_reduced_header($nameTools, "Exercise"); Display::display_reduced_header($nameTools, "Exercise");
} else { } else {

14
main/extrafield/translate.php
Unescape View File

@ -18,12 +18,12 @@ $originalName = null;
if (isset($_GET['extra_field'])) { if (isset($_GET['extra_field'])) {
$extraField = $em->find('ChamiloCoreBundle:ExtraField', intval($_GET['extra_field'])); $extraField = $em->find('ChamiloCoreBundle:ExtraField', intval($_GET['extra_field']));
$variableLanguage = '$' . api_underscore_to_camel_case($extraField->getVariable()); $variableLanguage = '$'.api_underscore_to_camel_case($extraField->getVariable());
$originalName = $extraField->getDisplayText(false); $originalName = $extraField->getDisplayText(false);
} elseif (isset($_GET['extra_field_option'])) { } elseif (isset($_GET['extra_field_option'])) {
$extraFieldOption = $em->find('ChamiloCoreBundle:ExtraFieldOptions', intval($_GET['extra_field_option'])); $extraFieldOption = $em->find('ChamiloCoreBundle:ExtraFieldOptions', intval($_GET['extra_field_option']));
$extraField = $extraFieldOption->getField(); $extraField = $extraFieldOption->getField();
$variableLanguage = '$' . ExtraFieldOption::getLanguageVariable($extraFieldOption->getDisplayText()); $variableLanguage = '$'.ExtraFieldOption::getLanguageVariable($extraFieldOption->getDisplayText());
$originalName = $extraFieldOption->getDisplayText(false); $originalName = $extraFieldOption->getDisplayText(false);
} }
@ -43,7 +43,7 @@ foreach ($languages as $language) {
$languagesOptions[$language->getId()] = $language->getOriginalName(); $languagesOptions[$language->getId()] = $language->getOriginalName();
} }
$translateUrl = api_get_path(WEB_CODE_PATH) . 'admin/sub_language_ajax.inc.php'; $translateUrl = api_get_path(WEB_CODE_PATH).'admin/sub_language_ajax.inc.php';
$form = new FormValidator('new_lang_variable', 'POST', $translateUrl); $form = new FormValidator('new_lang_variable', 'POST', $translateUrl);
$form->addHeader(get_lang('AddWordForTheSubLanguage')); $form->addHeader(get_lang('AddWordForTheSubLanguage'));
@ -72,24 +72,24 @@ $form->setDefaults([
$form->addRule('sub_language', get_lang('Required'), 'required'); $form->addRule('sub_language', get_lang('Required'), 'required');
$form->freeze(['variable_language', 'original_name']); $form->freeze(['variable_language', 'original_name']);
$interbreadcrumb[] = ['url' => api_get_path(WEB_CODE_PATH) . 'admin', 'name' => get_lang('Administration')]; $interbreadcrumb[] = ['url' => api_get_path(WEB_CODE_PATH).'admin', 'name' => get_lang('Administration')];
switch ($extraField->getExtraFieldType()) { switch ($extraField->getExtraFieldType()) {
case ExtraField::USER_FIELD_TYPE: case ExtraField::USER_FIELD_TYPE:
$interbreadcrumb[] = [ $interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=user', 'url' => api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=user',
'name' => get_lang('UserFields') 'name' => get_lang('UserFields')
]; ];
break; break;
case ExtraField::COURSE_FIELD_TYPE: case ExtraField::COURSE_FIELD_TYPE:
$interbreadcrumb[] = [ $interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=course', 'url' => api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=course',
'name' => get_lang('CourseFields') 'name' => get_lang('CourseFields')
]; ];
break; break;
case ExtraField::SESSION_FIELD_TYPE: case ExtraField::SESSION_FIELD_TYPE:
$interbreadcrumb[] = [ $interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=session', 'url' => api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=session',
'name' => get_lang('SessionFields') 'name' => get_lang('SessionFields')
]; ];
break; break;

26
main/group/group_category.php
Unescape View File

@ -12,7 +12,7 @@ $current_course_tool = TOOL_GROUP;
// Notice for unauthorized people. // Notice for unauthorized people.
api_protect_course_script(true); api_protect_course_script(true);
if (!api_is_allowed_to_edit(false,true) || if (!api_is_allowed_to_edit(false, true) ||
!(isset ($_GET['id']) || !(isset ($_GET['id']) ||
isset ($_POST['id']) || isset ($_POST['id']) ||
isset ($_GET['action']) || isset ($_GET['action']) ||
@ -59,7 +59,7 @@ if (api_get_setting('allow_group_categories') === 'true') {
'groups_per_user' => 1, 'groups_per_user' => 1,
'doc_state' => GroupManager::TOOL_PRIVATE, 'doc_state' => GroupManager::TOOL_PRIVATE,
'work_state' => GroupManager::TOOL_PRIVATE, 'work_state' => GroupManager::TOOL_PRIVATE,
'wiki_state' => GroupManager::TOOL_PRIVATE , 'wiki_state' => GroupManager::TOOL_PRIVATE,
'chat_state' => GroupManager::TOOL_PRIVATE, 'chat_state' => GroupManager::TOOL_PRIVATE,
'calendar_state' => GroupManager::TOOL_PRIVATE, 'calendar_state' => GroupManager::TOOL_PRIVATE,
'announcements_state'=> GroupManager::TOOL_PRIVATE, 'announcements_state'=> GroupManager::TOOL_PRIVATE,
@ -113,7 +113,7 @@ if (api_get_setting('allow_group_categories') == 'true') {
// Groups per user // Groups per user
$possible_values = array(); $possible_values = array();
for ($i = 1; $i <= 10; $i ++) { for ($i = 1; $i <= 10; $i++) {
$possible_values[$i] = $i; $possible_values[$i] = $i;
} }
$possible_values[GroupManager::GROUP_PER_MEMBER_NO_LIMIT] = get_lang('All'); $possible_values[GroupManager::GROUP_PER_MEMBER_NO_LIMIT] = get_lang('All');
@ -138,7 +138,7 @@ if (api_get_setting('allow_group_categories') == 'true') {
$form->addElement('html', '<div class="col-md-6">'); $form->addElement('html', '<div class="col-md-6">');
// Description // Description
$form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => 6)); $form->addElement('textarea', 'description', get_lang('Description'), array('rows' => 6));
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');
} else { } else {
@ -158,7 +158,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . ' ' . get_lang('GroupSelfRegistration'), Display::return_icon('user.png', get_lang('GroupSelfRegistration')).' '.get_lang('GroupSelfRegistration'),
null, null,
false false
); );
@ -172,7 +172,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('folder.png', get_lang('GroupDocument')) . ' ' . get_lang('GroupDocument'), Display::return_icon('folder.png', get_lang('GroupDocument')).' '.get_lang('GroupDocument'),
null, null,
false false
); );
@ -186,7 +186,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL) . ' ' . get_lang('GroupWork'), Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'),
'', '',
false false
); );
@ -200,7 +200,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('agenda.png', get_lang('GroupCalendar')) . ' ' . get_lang('GroupCalendar'), Display::return_icon('agenda.png', get_lang('GroupCalendar')).' '.get_lang('GroupCalendar'),
null, null,
false false
); );
@ -217,7 +217,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . ' ' . get_lang('GroupAnnouncements'), Display::return_icon('announce.png', get_lang('GroupAnnouncements')).' '.get_lang('GroupAnnouncements'),
null, null,
false false
); );
@ -231,7 +231,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('forum.png', get_lang('GroupForum')) . ' ' . get_lang('GroupForum'), Display::return_icon('forum.png', get_lang('GroupForum')).' '.get_lang('GroupForum'),
null, null,
false false
); );
@ -245,7 +245,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('wiki.png', get_lang('GroupWiki')) . ' ' . get_lang('GroupWiki'), Display::return_icon('wiki.png', get_lang('GroupWiki')).' '.get_lang('GroupWiki'),
null, null,
false false
); );
@ -259,7 +259,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('chat.png', get_lang('Chat')) . ' ' . get_lang('Chat'), Display::return_icon('chat.png', get_lang('Chat')).' '.get_lang('Chat'),
null, null,
false false
); );
@ -334,7 +334,7 @@ Display :: display_header($nameTools, 'Group');
// actions bar // actions bar
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="group.php">'. echo '<a href="group.php">'.
Display::return_icon('back.png', get_lang('BackToGroupList'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('BackToGroupList'), '', ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
$defaults = $category; $defaults = $category;

16
main/group/group_creation.php
Unescape View File

@ -24,7 +24,7 @@ if (isset($_POST['action'])) {
case 'create_groups': case 'create_groups':
$groups = array(); $groups = array();
for ($i = 0; $i < $_POST['number_of_groups']; $i ++) { for ($i = 0; $i < $_POST['number_of_groups']; $i++) {
$group1['name'] = empty($_POST['group_'.$i.'_name']) ? get_lang('Group').' '.$i : $_POST['group_'.$i.'_name']; $group1['name'] = empty($_POST['group_'.$i.'_name']) ? get_lang('Group').' '.$i : $_POST['group_'.$i.'_name'];
$group1['category'] = isset($_POST['group_'.$i.'_category']) ? $_POST['group_'.$i.'_category'] : null; $group1['category'] = isset($_POST['group_'.$i.'_category']) ? $_POST['group_'.$i.'_category'] : null;
$group1['tutor'] = isset($_POST['group_'.$i.'_tutor']) ? $_POST['group_'.$i.'_tutor'] : null; $group1['tutor'] = isset($_POST['group_'.$i.'_tutor']) ? $_POST['group_'.$i.'_tutor'] : null;
@ -162,7 +162,7 @@ EOT;
$form->addGroup($group_el, 'groups', null, "</td><td>", false); $form->addGroup($group_el, 'groups', null, "</td><td>", false);
// Checkboxes // Checkboxes
if ($_POST['number_of_groups'] > 1) { if ($_POST['number_of_groups'] > 1) {
$group_el = array (); $group_el = array();
$group_el[] = $form->createElement('static', null, null, ' '); $group_el[] = $form->createElement('static', null, null, ' ');
if (api_get_setting('allow_group_categories') === 'true') { if (api_get_setting('allow_group_categories') === 'true') {
$group_el[] = $form->createElement( $group_el[] = $form->createElement(
@ -183,7 +183,7 @@ EOT;
$form->addGroup($group_el, 'groups', null, '</td><td>', false); $form->addGroup($group_el, 'groups', null, '</td><td>', false);
} }
// Properties for all groups // Properties for all groups
for ($group_number = 0; $group_number < $_POST['number_of_groups']; $group_number ++) { for ($group_number = 0; $group_number < $_POST['number_of_groups']; $group_number++) {
$group_el = array(); $group_el = array();
$group_el[] = $form->createElement('text', 'group_'.$group_number.'_name'); $group_el[] = $form->createElement('text', 'group_'.$group_number.'_name');
if (api_get_setting('allow_group_categories') === 'true') { if (api_get_setting('allow_group_categories') === 'true') {
@ -210,14 +210,14 @@ EOT;
$prev = '000'; $prev = '000';
} elseif ($group_id < 100) { } elseif ($group_id < 100) {
$prev = '00'; $prev = '00';
} elseif ($group_id<1000) { } elseif ($group_id < 1000) {
$prev = '0'; $prev = '0';
} else { } else {
$prev = ''; $prev = '';
} }
} }
$defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++; $defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id++;
$form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false); $form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
} }
$defaults['action'] = 'create_groups'; $defaults['action'] = 'create_groups';
@ -232,8 +232,8 @@ EOT;
*/ */
$create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq()); $create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
$create_groups_form->addElement('header', $nameTools); $create_groups_form->addElement('header', $nameTools);
$create_groups_form->addText('number_of_groups',get_lang('NumberOfGroupsToCreate'),null,array('value'=>'1')); $create_groups_form->addText('number_of_groups', get_lang('NumberOfGroupsToCreate'), null, array('value'=>'1'));
$create_groups_form->addButton('submit', get_lang('ProceedToCreateGroup'),'plus','primary'); $create_groups_form->addButton('submit', get_lang('ProceedToCreateGroup'), 'plus', 'primary');
$defaults = array(); $defaults = array();
$defaults['number_of_groups'] = 1; $defaults['number_of_groups'] = 1;
$create_groups_form->setDefaults($defaults); $create_groups_form->setDefaults($defaults);
@ -243,7 +243,7 @@ EOT;
* Show form to generate subgroups * Show form to generate subgroups
*/ */
if (api_get_setting('allow_group_categories') === 'true' && count(GroupManager :: get_group_list()) > 0) { if (api_get_setting('allow_group_categories') === 'true' && count(GroupManager :: get_group_list()) > 0) {
$base_group_options = array (); $base_group_options = array();
$groups = GroupManager :: get_group_list(); $groups = GroupManager :: get_group_list();
foreach ($groups as $index => $group) { foreach ($groups as $index => $group) {
$number_of_students = GroupManager :: number_of_students($group['iid']); $number_of_students = GroupManager :: number_of_students($group['iid']);

18
main/group/group_overview.php
Unescape View File

@ -86,29 +86,29 @@ $actions = '<a href="group_creation.php?'.api_get_cidreq().'">'.
Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_get_setting('allow_group_categories') === 'true') { if (api_get_setting('allow_group_categories') === 'true') {
$actions.= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'. $actions .= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
} else { } else {
$actions.= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'. $actions .= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
Display::return_icon('settings.png', get_lang('PropModify'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('settings.png', get_lang('PropModify'), '', ICON_SIZE_MEDIUM).'</a>';
} }
$actions.= '<a href="import.php?'.api_get_cidreq().'&action=import">'. $actions .= '<a href="import.php?'.api_get_cidreq().'&action=import">'.
Display::return_icon('import_csv.png', get_lang('Import'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('import_csv.png', get_lang('Import'), '', ICON_SIZE_MEDIUM).'</a>';
$actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'. $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
Display::return_icon('export_csv.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('export_csv.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
$actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'. $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
$actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'. $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
$actions.= '<a href="group.php?'.api_get_cidreq().'">'. $actions .= '<a href="group.php?'.api_get_cidreq().'">'.
Display::return_icon('group.png', get_lang('Groups'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('group.png', get_lang('Groups'), '', ICON_SIZE_MEDIUM).'</a>';
$actions.= '<a href="../user/user.php?'.api_get_cidreq().'">'. $actions .= '<a href="../user/user.php?'.api_get_cidreq().'">'.
Display::return_icon('user.png', get_lang('GoTo').' '.get_lang('Users'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('user.png', get_lang('GoTo').' '.get_lang('Users'), '', ICON_SIZE_MEDIUM).'</a>';
// Action links // Action links

6
main/group/group_space.php
Unescape View File

@ -68,7 +68,7 @@ if (!empty($_GET['selfUnReg']) &&
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="group.php">'. echo '<a href="group.php">'.
Display::return_icon('back.png',get_lang('BackToGroupList'),'',ICON_SIZE_MEDIUM). Display::return_icon('back.png', get_lang('BackToGroupList'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
/* /*
@ -85,7 +85,7 @@ if (GroupManager :: is_self_registration_allowed($user_id, $current_group['iid']
*/ */
$unsubscribe_group = ''; $unsubscribe_group = '';
if (GroupManager :: is_self_unregistration_allowed($user_id, $current_group['iid'])) { if (GroupManager :: is_self_unregistration_allowed($user_id, $current_group['iid'])) {
$unsubscribe_group = '<a class="btn btn-default" href="'.api_get_self().'?selfUnReg=1" onclick="javascript: if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."'".')) return false;">'. $unsubscribe_group = '<a class="btn btn-default" href="'.api_get_self().'?selfUnReg=1" onclick="javascript: if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."'".')) return false;">'.
get_lang("StudentUnsubscribe").'</a>'; get_lang("StudentUnsubscribe").'</a>';
} }
echo '&nbsp;</div>'; echo '&nbsp;</div>';
@ -97,7 +97,7 @@ if (api_is_allowed_to_edit(false, true) ||
GroupManager::is_tutor_of_group(api_get_user_id(), $current_group['iid']) GroupManager::is_tutor_of_group(api_get_user_id(), $current_group['iid'])
) { ) {
$edit_url = '<a href="'.api_get_path(WEB_CODE_PATH).'group/settings.php?'.api_get_cidreq().'">'. $edit_url = '<a href="'.api_get_path(WEB_CODE_PATH).'group/settings.php?'.api_get_cidreq().'">'.
Display::return_icon('edit.png', get_lang('EditGroup'),'',ICON_SIZE_SMALL).'</a>'; Display::return_icon('edit.png', get_lang('EditGroup'), '', ICON_SIZE_SMALL).'</a>';
} }
echo Display::page_header( echo Display::page_header(

2
main/group/member_settings.php
Unescape View File

@ -167,7 +167,7 @@ if (!empty($complete_user_list)) {
// Group members // Group members
$group_member_list = GroupManager::get_subscribed_users($current_group['iid']); $group_member_list = GroupManager::get_subscribed_users($current_group['iid']);
$selected_users = array (); $selected_users = array();
if (!empty($group_member_list)) { if (!empty($group_member_list)) {
foreach ($group_member_list as $index => $user) { foreach ($group_member_list as $index => $user) {
$selected_users[] = $user['user_id']; $selected_users[] = $user['user_id'];

14
main/group/settings.php
Unescape View File

@ -83,7 +83,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . '<span>' . get_lang('GroupSelfRegistration') . '</span>', Display::return_icon('user.png', get_lang('GroupSelfRegistration')).'<span>'.get_lang('GroupSelfRegistration').'</span>',
null, null,
false false
); );
@ -97,7 +97,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('folder.png', get_lang('GroupDocument')) . '<span>' . get_lang('GroupDocument') . '</span>', Display::return_icon('folder.png', get_lang('GroupDocument')).'<span>'.get_lang('GroupDocument').'</span>',
null, null,
false false
); );
@ -111,7 +111,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('works.png', get_lang('GroupWork')) . '<span>' . get_lang('GroupWork') . '</span>', Display::return_icon('works.png', get_lang('GroupWork')).'<span>'.get_lang('GroupWork').'</span>',
null, null,
false false
); );
@ -125,7 +125,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('agenda.png', get_lang('GroupCalendar')) . '<span>' . get_lang('GroupCalendar') . '</span>', Display::return_icon('agenda.png', get_lang('GroupCalendar')).'<span>'.get_lang('GroupCalendar').'</span>',
null, null,
false false
); );
@ -142,7 +142,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . '<span>' . get_lang('GroupAnnouncements') . '</span>', Display::return_icon('announce.png', get_lang('GroupAnnouncements')).'<span>'.get_lang('GroupAnnouncements').'</span>',
null, null,
false false
); );
@ -156,7 +156,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('forum.png', get_lang('GroupForum')) . '<span>' . get_lang('GroupForum') . '</span>', Display::return_icon('forum.png', get_lang('GroupForum')).'<span>'.get_lang('GroupForum').'</span>',
null, null,
false false
); );
@ -183,7 +183,7 @@ $group = array(
$form->addGroup( $form->addGroup(
$group, $group,
'', '',
Display::return_icon('chat.png', get_lang('Chat')) . '<span>' . get_lang('Chat') . '</span>', Display::return_icon('chat.png', get_lang('Chat')).'<span>'.get_lang('Chat').'</span>',
null, null,
false false
); );

4
main/group/tutor_settings.php
Unescape View File

@ -22,8 +22,8 @@ $group_id = api_get_group_id();
$current_group = GroupManager::get_group_properties($group_id); $current_group = GroupManager::get_group_properties($group_id);
$nameTools = get_lang('EditGroup'); $nameTools = get_lang('EditGroup');
$interbreadcrumb[] = array ('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups')); $interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
$interbreadcrumb[] = array ('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']); $interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']);
$is_group_member = GroupManager::is_tutor_of_group(api_get_user_id(), $current_group['iid']); $is_group_member = GroupManager::is_tutor_of_group(api_get_user_id(), $current_group['iid']);

28
main/inc/ajax/admin.ajax.php
Unescape View File

@ -48,9 +48,9 @@ switch ($action) {
$urlInfo = api_get_access_url($accessUrlId); $urlInfo = api_get_access_url($accessUrlId);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url'])); $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
$cleanUrl = str_replace('/', '-', $url); $cleanUrl = str_replace('/', '-', $url);
$newUrlDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/"; $newUrlDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
} else { } else {
$newUrlDir = api_get_path(SYS_APP_PATH) . "home/admin/"; $newUrlDir = api_get_path(SYS_APP_PATH)."home/admin/";
} }
if (!file_exists($newUrlDir)) { if (!file_exists($newUrlDir)) {
@ -173,17 +173,17 @@ function check_system_version()
} }
if (version_compare($system_version, $version_info, '<')) { if (version_compare($system_version, $version_info, '<')) {
$output = '<span style="color:red">' . get_lang('YourVersionNotUpToDate') .'<br /> $output = '<span style="color:red">'.get_lang('YourVersionNotUpToDate').'<br />
'.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. <br /> '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. <br />
'.get_lang('YourVersionIs').' <b>Chamilo '.$system_version. '</b>. <br />'.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>'; '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version.'</b>. <br />'.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
} else { } else {
$output = '<span style="color:green">'.get_lang('VersionUpToDate').': Chamilo '.$version_info.'</span>'; $output = '<span style="color:green">'.get_lang('VersionUpToDate').': Chamilo '.$version_info.'</span>';
} }
} else { } else {
$output = '<span style="color:red">' . get_lang('ImpossibleToContactVersionServerPleaseTryAgain') . '</span>'; $output = '<span style="color:red">'.get_lang('ImpossibleToContactVersionServerPleaseTryAgain').'</span>';
} }
} else { } else {
$output = '<span style="color:red">' . get_lang('AllowurlfopenIsSetToOff') . '</span>'; $output = '<span style="color:red">'.get_lang('AllowurlfopenIsSetToOff').'</span>';
} }
return $output; return $output;
} }
@ -207,17 +207,17 @@ function _http_request($ip, $port = 80, $uri = '/', $getdata = array(), $timeout
$getdata_str = count($getdata) ? '?' : ''; $getdata_str = count($getdata) ? '?' : '';
foreach ($getdata as $k => $v) { foreach ($getdata as $k => $v) {
$getdata_str .= urlencode($k) .'='. urlencode($v) . '&'; $getdata_str .= urlencode($k).'='.urlencode($v).'&';
} }
$crlf = "\r\n"; $crlf = "\r\n";
$req = $verb .' '. $uri . $getdata_str .' HTTP/1.1' . $crlf; $req = $verb.' '.$uri.$getdata_str.' HTTP/1.1'.$crlf;
$req .= 'Host: '. $ip . $crlf; $req .= 'Host: '.$ip.$crlf;
$req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12' . $crlf; $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12'.$crlf;
$req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' . $crlf; $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'.$crlf;
$req .= 'Accept-Language: en-us,en;q=0.5' . $crlf; $req .= 'Accept-Language: en-us,en;q=0.5'.$crlf;
$req .= 'Accept-Encoding: deflate' . $crlf; $req .= 'Accept-Encoding: deflate'.$crlf;
$req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7' . $crlf; $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7'.$crlf;
$req .= $crlf; $req .= $crlf;

10
main/inc/ajax/forum.ajax.php
Unescape View File

@ -10,7 +10,7 @@ use Chamilo\CourseBundle\Entity\CForumPost;
*/ */
require_once __DIR__.'/../global.inc.php'; require_once __DIR__.'/../global.inc.php';
require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php'; require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
// First, protect this script // First, protect this script
api_protect_course_script(false); api_protect_course_script(false);
@ -60,13 +60,13 @@ if (!empty($action)) {
break; break;
} }
// If pass all previous control, user can edit post // If pass all previous control, user can edit post
$courseId = isset($_REQUEST['c_id'])? intval($_REQUEST['c_id']) : api_get_course_int_id(); $courseId = isset($_REQUEST['c_id']) ? intval($_REQUEST['c_id']) : api_get_course_int_id();
$json['courseId'] = $courseId; $json['courseId'] = $courseId;
$forumId = isset($_REQUEST['forum'])? intval($_REQUEST['forum']) : null; $forumId = isset($_REQUEST['forum']) ? intval($_REQUEST['forum']) : null;
$json['forum'] = $forumId; $json['forum'] = $forumId;
$threadId = isset($_REQUEST['thread'])? intval($_REQUEST['thread']) : null; $threadId = isset($_REQUEST['thread']) ? intval($_REQUEST['thread']) : null;
$json['thread'] = $threadId; $json['thread'] = $threadId;
$postId = isset($_REQUEST['postId'])? intval($_REQUEST['postId']) : null; $postId = isset($_REQUEST['postId']) ? intval($_REQUEST['postId']) : null;
$json['postId'] = $postId; $json['postId'] = $postId;
if (!empty($courseId) && if (!empty($courseId) &&

6
main/inc/ajax/myspace.ajax.php
Unescape View File

@ -58,9 +58,9 @@ switch ($action) {
$db['is_empty'] = false; $db['is_empty'] = false;
$db['result'] = convert_to_string($sql_result); $db['result'] = convert_to_string($sql_result);
$rst = get_stats($user_id, $courseId, $start_date, $end_date); $rst = get_stats($user_id, $courseId, $start_date, $end_date);
$foo_stats = '<strong>' . get_lang('Total') . ': </strong>' . $rst['total'] . '<br />'; $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
$foo_stats .= '<strong>' . get_lang('Average') . ': </strong>' . $rst['avg'] . '<br />'; $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
$foo_stats .= '<strong>' . get_lang('Quantity') . ' : </strong>' . $rst['times'] . '<br />'; $foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';
$db['stats'] = $foo_stats; $db['stats'] = $foo_stats;
$db['graph_result'] = grapher($sql_result, $start_date, $end_date, $type); $db['graph_result'] = grapher($sql_result, $start_date, $end_date, $type);
} else { } else {

2
main/inc/ajax/online.ajax.php
Unescape View File

@ -12,7 +12,7 @@ switch ($action) {
case 'load_online_user': case 'load_online_user':
$images_to_show = MAX_ONLINE_USERS; $images_to_show = MAX_ONLINE_USERS;
$page = intval($_REQUEST['online_page_nr']); $page = intval($_REQUEST['online_page_nr']);
$max_page = ceil(who_is_online_count()/$images_to_show); $max_page = ceil(who_is_online_count() / $images_to_show);
$page_rows = ($page - 1) * MAX_ONLINE_USERS; $page_rows = ($page - 1) * MAX_ONLINE_USERS;

6
main/inc/ajax/skill.ajax.php
Unescape View File

@ -190,7 +190,7 @@ switch ($action) {
$success = false; $success = false;
} }
$result = array ( $result = array(
'success' => $success, 'success' => $success,
'data' => $return 'data' => $return
); );
@ -201,7 +201,7 @@ switch ($action) {
$skills = $skill->get_direct_parents($id); $skills = $skill->get_direct_parents($id);
$return = array(); $return = array();
foreach ($skills as $skill) { foreach ($skills as $skill) {
$return [$skill['data']['id']] = array ( $return [$skill['data']['id']] = array(
'id' => $skill['data']['id'], 'id' => $skill['data']['id'],
'parent_id' => $skill['data']['parent_id'], 'parent_id' => $skill['data']['parent_id'],
'name' => $skill['data']['name'] 'name' => $skill['data']['name']
@ -211,7 +211,7 @@ switch ($action) {
break; break;
case 'profile_matches': case 'profile_matches':
$skill_rel_user = new SkillRelUser(); $skill_rel_user = new SkillRelUser();
$skills = (!empty($_REQUEST['skill_id'])?$_REQUEST['skill_id']:array()); $skills = (!empty($_REQUEST['skill_id']) ? $_REQUEST['skill_id'] : array());
$total_skills_to_search = $skills; $total_skills_to_search = $skills;
$users = $skill_rel_user->get_user_by_skills($skills); $users = $skill_rel_user->get_user_by_skills($skills);

14
main/inc/lib/plugin.class.php
Unescape View File

@ -63,7 +63,7 @@ class Plugin
$this->fields = $settings; $this->fields = $settings;
global $language_files; global $language_files;
$language_files[] = 'plugin_' . $this->get_name(); $language_files[] = 'plugin_'.$this->get_name();
} }
/** /**
@ -272,7 +272,7 @@ class Plugin
{ {
$settings = $this->get_settings(); $settings = $this->get_settings();
foreach ($settings as $setting) { foreach ($settings as $setting) {
if ($setting['variable'] == $this->get_name() . '_' . $name) { if ($setting['variable'] == $this->get_name().'_'.$name) {
return $setting['selected_value']; return $setting['selected_value'];
} }
} }
@ -406,7 +406,7 @@ class Plugin
if (!empty($this->course_settings)) { if (!empty($this->course_settings)) {
foreach ($this->course_settings as $setting) { foreach ($this->course_settings as $setting) {
$variable = $setting['name']; $variable = $setting['name'];
$value =''; $value = '';
if (isset($setting['init_value'])) { if (isset($setting['init_value'])) {
$value = $setting['init_value']; $value = $setting['init_value'];
} }
@ -622,7 +622,7 @@ class Plugin
// Avoid Tab Name Spaces // Avoid Tab Name Spaces
$tabNameNoSpaces = preg_replace('/\s+/', '', $tabName); $tabNameNoSpaces = preg_replace('/\s+/', '', $tabName);
$subkeytext = "Tabs" . $tabNameNoSpaces; $subkeytext = "Tabs".$tabNameNoSpaces;
// Check if it is already added // Check if it is already added
$checkCondition = array( $checkCondition = array(
@ -640,7 +640,7 @@ class Plugin
} }
// End Check // End Check
$subkey = 'custom_tab_' . $tabNum; $subkey = 'custom_tab_'.$tabNum;
$attributes = array( $attributes = array(
'variable' => 'show_tabs', 'variable' => 'show_tabs',
'subkey' => $subkey, 'subkey' => $subkey,
@ -658,7 +658,7 @@ class Plugin
// Save the id // Save the id
$settings = $this->get_settings(); $settings = $this->get_settings();
$setData = array ( $setData = array(
'comment' => $subkey 'comment' => $subkey
); );
$whereCondition = array( $whereCondition = array(
@ -699,7 +699,7 @@ class Plugin
$i = 1; $i = 1;
foreach ($tabs as $row) { foreach ($tabs as $row) {
$attributes = array( $attributes = array(
'subkey' => 'custom_tab_' . $i 'subkey' => 'custom_tab_'.$i
); );
$this->updateTab($row['subkey'], $attributes); $this->updateTab($row['subkey'], $attributes);
$i++; $i++;

12
main/inc/lib/search/get_terms.php
Unescape View File

@ -17,8 +17,8 @@ if (empty($_GET['term']) || empty($_GET['prefix']) || !in_array($_GET['operator'
return; return;
} }
require_once dirname(__FILE__) . '../../../global.inc.php'; require_once dirname(__FILE__).'../../../global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloQuery.php'; require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
/** /**
* Search with filter and build base array avoiding repeated terms * Search with filter and build base array avoiding repeated terms
@ -33,7 +33,7 @@ function get_usual_sf_terms($filter, $specific_fields) {
if (is_array($dkterms) && is_array($dkterms[1])) { if (is_array($dkterms) && is_array($dkterms[1])) {
foreach ($specific_fields as $specific_field) { foreach ($specific_fields as $specific_field) {
foreach ($dkterms[1] as $obj) { foreach ($dkterms[1] as $obj) {
foreach ($obj['sf-' . $specific_field['code']] as $raw_term) { foreach ($obj['sf-'.$specific_field['code']] as $raw_term) {
if (count($raw_term['name']) > 1) { if (count($raw_term['name']) > 1) {
$normal_term = substr($raw_term['name'], 1); $normal_term = substr($raw_term['name'], 1);
$sf_terms[$specific_field['code']][$normal_term] = $normal_term; $sf_terms[$specific_field['code']][$normal_term] = $normal_term;
@ -54,10 +54,10 @@ $sf_terms = array();
if (($cid = api_get_course_id()) != -1) { // with cid if (($cid = api_get_course_id()) != -1) { // with cid
// course filter // course filter
$filter[] = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid); $filter[] = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
// term filter // term filter
if ($term != '__all__') { if ($term != '__all__') {
$filter[] = chamilo_get_boolean_query($prefix . $term); $filter[] = chamilo_get_boolean_query($prefix.$term);
// always and between term and courseid // always and between term and courseid
$filter = chamilo_join_queries($filter, null, 'and'); $filter = chamilo_join_queries($filter, null, 'and');
} }
@ -65,7 +65,7 @@ if (($cid = api_get_course_id()) != -1) { // with cid
$sf_terms = get_usual_sf_terms($filter, $specific_fields); $sf_terms = get_usual_sf_terms($filter, $specific_fields);
} else { // without cid } else { // without cid
if ($term != '__all__') { if ($term != '__all__') {
$filter[] = chamilo_get_boolean_query($prefix . $term); $filter[] = chamilo_get_boolean_query($prefix.$term);
$sf_terms = get_usual_sf_terms($filter, $specific_fields); $sf_terms = get_usual_sf_terms($filter, $specific_fields);
} else { // no cid and all/any terms } else { // no cid and all/any terms

6
main/inc/lib/search/tool_processors/document_processor.class.php
Unescape View File

@ -5,8 +5,8 @@
* *
* @package chamilo.include.search * @package chamilo.include.search
*/ */
include_once dirname(__FILE__) . '/../../../global.inc.php'; include_once dirname(__FILE__).'/../../../global.inc.php';
require_once dirname(__FILE__) . '/search_processor.class.php'; require_once dirname(__FILE__).'/search_processor.class.php';
/** /**
* Process documents before pass it to search listing scripts * Process documents before pass it to search listing scripts
@ -82,7 +82,7 @@ class document_processor extends search_processor
$dk_result = Database::query($sql); $dk_result = Database::query($sql);
$sql = "SELECT insert_user_id FROM $item_property_table $sql = "SELECT insert_user_id FROM $item_property_table
WHERE ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id WHERE ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
LIMIT 1"; LIMIT 1";
$name = ''; $name = '';
if ($row = Database::fetch_array($dk_result)) { if ($row = Database::fetch_array($dk_result)) {

14
main/inc/lib/search/tool_processors/learnpath_processor.class.php
Unescape View File

@ -5,9 +5,9 @@
* *
* @package chamilo.include.search * @package chamilo.include.search
*/ */
include_once dirname(__FILE__) . '/../../../global.inc.php'; include_once dirname(__FILE__).'/../../../global.inc.php';
require_once dirname(__FILE__) . '/search_processor.class.php'; require_once dirname(__FILE__).'/search_processor.class.php';
require_once dirname(__FILE__) . '/../IndexableChunk.class.php'; require_once dirname(__FILE__).'/../IndexableChunk.class.php';
/** /**
* Process learning paths before pass it to search listing scripts * Process learning paths before pass it to search listing scripts
@ -58,7 +58,7 @@ class learnpath_processor extends search_processor
); );
if ($visibility) { if ($visibility) {
list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $lp_id, $lp['has_document_id']); list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $lp_id, $lp['has_document_id']);
$url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?cidReq=%s&action=view&lp_id=%s'; $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
$url = sprintf($url, $courseid, $lp_id); $url = sprintf($url, $courseid, $lp_id);
$result = array( $result = array(
'toolid' => TOOL_LEARNPATH, 'toolid' => TOOL_LEARNPATH,
@ -135,16 +135,16 @@ class learnpath_processor extends search_processor
$name = ''; $name = '';
if ($row = Database::fetch_array($dk_result)) { if ($row = Database::fetch_array($dk_result)) {
// Get the image path // Get the image path
$img_location = api_get_path(WEB_COURSE_PATH) . $course_path . "/document/"; $img_location = api_get_path(WEB_COURSE_PATH).$course_path."/document/";
$thumbnail_path = str_replace('.png.html', '_thumb.png', $row['path']); $thumbnail_path = str_replace('.png.html', '_thumb.png', $row['path']);
$big_img_path = str_replace('.png.html', '.png', $row['path']); $big_img_path = str_replace('.png.html', '.png', $row['path']);
$thumbnail = ''; $thumbnail = '';
if (!empty($thumbnail_path)) { if (!empty($thumbnail_path)) {
$thumbnail = $img_location . $thumbnail_path; $thumbnail = $img_location.$thumbnail_path;
} }
$image = ''; $image = '';
if (!empty($big_img_path)) { if (!empty($big_img_path)) {
$image = $img_location . $big_img_path; $image = $img_location.$big_img_path;
} }
$name = $row['name']; $name = $row['name'];
} }

8
main/inc/lib/search/tool_processors/link_processor.class.php
Unescape View File

@ -5,8 +5,8 @@
* *
* @package chamilo.include.search * @package chamilo.include.search
*/ */
include_once dirname(__FILE__) . '/../../../global.inc.php'; include_once dirname(__FILE__).'/../../../global.inc.php';
require_once dirname(__FILE__) . '/search_processor.class.php'; require_once dirname(__FILE__).'/search_processor.class.php';
/** /**
* Process links before pass it to search listing scripts * Process links before pass it to search listing scripts
@ -103,11 +103,11 @@ class link_processor extends search_processor
$link_id = intval($link_id); $link_id = intval($link_id);
$sql = "SELECT insert_user_id FROM $item_property_table $sql = "SELECT insert_user_id FROM $item_property_table
WHERE ref = $link_id AND tool = '" . TOOL_LINK . "' AND c_id = $course_id WHERE ref = $link_id AND tool = '".TOOL_LINK."' AND c_id = $course_id
LIMIT 1"; LIMIT 1";
$name = get_lang('Links'); $name = get_lang('Links');
$url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s'; $url = api_get_path(WEB_PATH).'main/link/link.php?cidReq=%s';
$url = sprintf($url, $course_id_alpha); $url = sprintf($url, $course_id_alpha);
// Get the image path // Get the image path
$thumbnail = Display::returnIconPath('link.png'); $thumbnail = Display::returnIconPath('link.png');

6
main/inc/lib/search/tool_processors/quiz_processor.class.php
Unescape View File

@ -5,8 +5,8 @@
* *
* @package chamilo.include.search * @package chamilo.include.search
*/ */
include_once dirname(__FILE__) . '/../../../global.inc.php'; include_once dirname(__FILE__).'/../../../global.inc.php';
require_once dirname(__FILE__) . '/search_processor.class.php'; require_once dirname(__FILE__).'/search_processor.class.php';
/** /**
* Process exercises before pass it to search listing scripts * Process exercises before pass it to search listing scripts
@ -68,7 +68,7 @@ class quiz_processor extends search_processor
$visibility = api_get_item_visibility(api_get_course_info($courseid), TOOL_QUIZ, $exercise_id); $visibility = api_get_item_visibility(api_get_course_info($courseid), TOOL_QUIZ, $exercise_id);
if ($visibility) { if ($visibility) {
list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $exercise_id); list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $exercise_id);
$url = api_get_path(WEB_CODE_PATH) . 'exercise/exercise_submit.php?cidReq=%s&exerciseId=%s'; $url = api_get_path(WEB_CODE_PATH).'exercise/exercise_submit.php?cidReq=%s&exerciseId=%s';
$url = sprintf($url, $courseid, $exercise_id); $url = sprintf($url, $courseid, $exercise_id);
$result = array( $result = array(
'toolid' => TOOL_QUIZ, 'toolid' => TOOL_QUIZ,

4
main/link/link.php
Unescape View File

@ -187,12 +187,12 @@ switch ($action) {
break; break;
case 'move_link_up': case 'move_link_up':
Link::moveLinkUp($id); Link::moveLinkUp($id);
header('Location: ' . $linkListUrl); header('Location: '.$linkListUrl);
exit; exit;
break; break;
case 'move_link_down': case 'move_link_down':
Link::moveLinkDown($id); Link::moveLinkDown($id);
header('Location: ' . $linkListUrl); header('Location: '.$linkListUrl);
exit; exit;
break; break;
case 'list': case 'list':

8
main/mySpace/index.php
Unescape View File

@ -142,7 +142,7 @@ echo '<a href="javascript: void(0);" onclick="javascript: window.print()">'.
echo '</span>'; echo '</span>';
if (!empty($session_id) && if (!empty($session_id) &&
!in_array($display, array('accessoverview','lpprogressoverview','progressoverview','exerciseprogress', 'surveyoverview')) !in_array($display, array('accessoverview', 'lpprogressoverview', 'progressoverview', 'exerciseprogress', 'surveyoverview'))
) { ) {
echo '<a href="index.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; echo '<a href="index.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
if (!api_is_platform_admin()) { if (!api_is_platform_admin()) {
@ -162,19 +162,19 @@ if (!empty($session_id) &&
} }
} else { } else {
echo Display::url( echo Display::url(
Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM), Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH)."auth/my_progress.php" api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
); );
echo Display::url( echo Display::url(
Display::return_icon("certificate_list.png", get_lang("GradebookSeeListOfStudentsCertificates"), array(), ICON_SIZE_MEDIUM), Display::return_icon("certificate_list.png", get_lang("GradebookSeeListOfStudentsCertificates"), array(), ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php" api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
); );
} }
// Actions menu // Actions menu
$nb_menu_items = count($menu_items); $nb_menu_items = count($menu_items);
if (empty($session_id) || if (empty($session_id) ||
in_array($display, array('accessoverview','lpprogressoverview', 'progressoverview', 'exerciseprogress', 'surveyoverview')) in_array($display, array('accessoverview', 'lpprogressoverview', 'progressoverview', 'exerciseprogress', 'surveyoverview'))
) { ) {
if ($nb_menu_items > 1) { if ($nb_menu_items > 1) {
foreach ($menu_items as $key => $item) { foreach ($menu_items as $key => $item) {

10
main/mySpace/teachers.php
Unescape View File

@ -20,14 +20,14 @@ api_block_anonymous_users();
$this_section = SECTION_TRACKING; $this_section = SECTION_TRACKING;
$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace')); $interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) { if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
$interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers')); $interbreadcrumb[] = array("url" => "teachers.php", "name" => get_lang('Teachers'));
} }
if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") { if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
$interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors')); $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
} }
function get_count_users() function get_count_users()
@ -182,7 +182,7 @@ $sort_by_first_name = api_sort_by_first_name();
$actionsLeft = ''; $actionsLeft = '';
if (api_is_drh()) { if (api_is_drh()) {
$menu_items = array( $menu_items = array(
Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ), Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"),
Display::url(Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), 'student.php'), Display::url(Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), 'student.php'),
Display::url(Display::return_icon('teacher_na.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'), Display::url(Display::return_icon('teacher_na.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'), Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),

6
main/reports/reports.lib.php
Unescape View File

@ -3,11 +3,11 @@
require_once __DIR__.'/../inc/global.inc.php'; require_once __DIR__.'/../inc/global.inc.php';
define ('REPORTS_PROGRESS_COMPLETED', 1); define('REPORTS_PROGRESS_COMPLETED', 1);
$reports_modules = array(); $reports_modules = array();
$reports_enabled_modules = array('quiz','course','scorm'); $reports_enabled_modules = array('quiz', 'course', 'scorm');
$reports_enabled_templates = array('exercicesMultiCourses', 'courseTime', 'courseArticulate'); $reports_enabled_templates = array('exercicesMultiCourses', 'courseTime', 'courseArticulate');
@ -158,7 +158,7 @@ function reports_getToolId($tool) {
// return a sql clause returning triplet of (course, $session, $uid) the // return a sql clause returning triplet of (course, $session, $uid) the
// current user is authorized to reed // current user is authorized to reed
function reports_getVisibilitySQL () { function reports_getVisibilitySQL() {
return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
// fixme sessions // fixme sessions
} }

2
main/survey/ch_dropdown.php
Unescape View File

@ -33,7 +33,7 @@ class ch_dropdown extends survey_question
*/ */
public function render(FormValidator $form, $questionData = array(), $answers = '') public function render(FormValidator $form, $questionData = array(), $answers = '')
{ {
$name = 'question' . $questionData['question_id']; $name = 'question'.$questionData['question_id'];
$data = array(0 => '--') + $questionData['options']; $data = array(0 => '--') + $questionData['options'];
$form->addSelect($name, null, $data); $form->addSelect($name, null, $data);
if (!empty($answers)) { if (!empty($answers)) {

12
main/survey/reporting.php
Unescape View File

@ -144,7 +144,7 @@ SurveyUtil::handle_reporting_actions($survey_data, $people_filled);
// Actions bar // Actions bar
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'">'. echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'">'.
Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('BackToSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
// Content // Content
@ -154,15 +154,15 @@ if (!isset($_GET['action']) ||
) { ) {
$myweb_survey_id = $survey_id; $myweb_survey_id = $survey_id;
echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&survey_id='.$myweb_survey_id.'&'.$cidReq.'&single_page=1">'. echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&survey_id='.$myweb_survey_id.'&'.$cidReq.'&single_page=1">'.
Display::return_icon('survey_reporting_overall.png',get_lang('QuestionsOverallReport')).' '.get_lang('QuestionsOverallReport').'</a></div><div class="sectioncomment">'.get_lang('QuestionsOverallReportDetail').' </div>'; Display::return_icon('survey_reporting_overall.png', get_lang('QuestionsOverallReport')).' '.get_lang('QuestionsOverallReport').'</a></div><div class="sectioncomment">'.get_lang('QuestionsOverallReportDetail').' </div>';
echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'. echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
Display::return_icon('survey_reporting_question.gif',get_lang('DetailedReportByQuestion')).' '.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>'; Display::return_icon('survey_reporting_question.gif', get_lang('DetailedReportByQuestion')).' '.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>';
echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'. echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
Display::return_icon('survey_reporting_user.gif',get_lang('DetailedReportByUser')).' '.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>'; Display::return_icon('survey_reporting_user.gif', get_lang('DetailedReportByUser')).' '.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>';
echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=comparativereport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'. echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=comparativereport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
Display::return_icon('survey_reporting_comparative.gif',get_lang('ComparativeReport')).' '.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>'; Display::return_icon('survey_reporting_comparative.gif', get_lang('ComparativeReport')).' '.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>';
echo '<div class="sectiontitle"><a href="reporting.php?action=completereport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'. echo '<div class="sectiontitle"><a href="reporting.php?action=completereport&survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
Display::return_icon('survey_reporting_complete.gif',get_lang('CompleteReport')).' '.get_lang('CompleteReport').'</a></div><div class="sectioncomment">'.get_lang('CompleteReportDetail').'</div>'; Display::return_icon('survey_reporting_complete.gif', get_lang('CompleteReport')).' '.get_lang('CompleteReport').'</a></div><div class="sectioncomment">'.get_lang('CompleteReportDetail').'</div>';
} }
Display :: display_footer(); Display :: display_footer();

4
main/ticket/projects.php
Unescape View File

@ -65,7 +65,7 @@ switch ($action) {
$form = TicketManager::getProjectForm($url); $form = TicketManager::getProjectForm($url);
$formToString = $form->returnForm(); $formToString = $form->returnForm();
if ($form->validate()) { if ($form->validate()) {
$values =$form->getSubmitValues(); $values = $form->getSubmitValues();
$params = [ $params = [
'name' => $values['name'], 'name' => $values['name'],
@ -95,7 +95,7 @@ switch ($action) {
$formToString = $form->returnForm(); $formToString = $form->returnForm();
if ($form->validate()) { if ($form->validate()) {
$values =$form->getSubmitValues(); $values = $form->getSubmitValues();
$params = [ $params = [
'name' => $values['name'], 'name' => $values['name'],

4
main/ticket/status.php
Unescape View File

@ -65,7 +65,7 @@ switch ($action) {
$form = TicketManager::getStatusForm($url); $form = TicketManager::getStatusForm($url);
$formToString = $form->returnForm(); $formToString = $form->returnForm();
if ($form->validate()) { if ($form->validate()) {
$values =$form->getSubmitValues(); $values = $form->getSubmitValues();
$params = [ $params = [
'name' => $values['name'], 'name' => $values['name'],
@ -94,7 +94,7 @@ switch ($action) {
]); ]);
$formToString = $form->returnForm(); $formToString = $form->returnForm();
if ($form->validate()) { if ($form->validate()) {
$values =$form->getSubmitValues(); $values = $form->getSubmitValues();
$params = [ $params = [
'name' => $values['name'], 'name' => $values['name'],

2
main/ticket/update_report.php
Unescape View File

@ -15,7 +15,7 @@ api_protect_course_script();
if (!api_is_allowed_to_edit()) { if (!api_is_allowed_to_edit()) {
Display::display_error_message(get_lang("DeniedAccess")); Display::display_error_message(get_lang("DeniedAccess"));
} else { } else {
$sql = "UPDATE " . Database::get_main_table('rp_reporte_semanas') . " $sql = "UPDATE ".Database::get_main_table('rp_reporte_semanas')."
SET work_id = '$work_id', forum_id = '$forum_id' SET work_id = '$work_id', forum_id = '$forum_id'
WHERE id ='$rs_id'"; WHERE id ='$rs_id'";
Database::query($sql); Database::query($sql);

6
main/timeline/view.php
Unescape View File

@ -6,8 +6,8 @@
*/ */
require_once __DIR__.'/../inc/global.inc.php'; require_once __DIR__.'/../inc/global.inc.php';
$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Timeline')); $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Timeline'));
$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('Listing')); $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('Listing'));
$timeline = new Timeline(); $timeline = new Timeline();
if (empty($_GET['id'])) { if (empty($_GET['id'])) {
@ -15,7 +15,7 @@ if (empty($_GET['id'])) {
} }
$url = $timeline->get_url($_GET['id']); $url = $timeline->get_url($_GET['id']);
$item = $timeline->get($_GET['id']); $item = $timeline->get($_GET['id']);
$interbreadcrumb[]=array('url' => '#','name' => $item['headline']); $interbreadcrumb[] = array('url' => '#', 'name' => $item['headline']);
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/timeline/timeline.css'); $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/timeline/timeline.css');
$htmlHeadXtra[] = api_get_js('timeline/timeline-min.js'); $htmlHeadXtra[] = api_get_js('timeline/timeline-min.js');

2
main/upload/upload.scorm.php
Unescape View File

@ -15,7 +15,7 @@ require_once '../lp/lp_upload.php';
chdir($cwdir); chdir($cwdir);
if (api_get_setting('search_enabled') === 'true') { if (api_get_setting('search_enabled') === 'true') {
require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'; require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$specific_fields = get_specific_field_list(); $specific_fields = get_specific_field_list();
foreach ($specific_fields as $specific_field) { foreach ($specific_fields as $specific_field) {

48
main/user/subscribe_user.php
Unescape View File

@ -54,8 +54,8 @@ if ($keyword) {
} }
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
$list_register_user=''; $list_register_user = '';
$list_not_register_user=''; $list_not_register_user = '';
if (isset($_REQUEST['register'])) { if (isset($_REQUEST['register'])) {
$userInfo = api_get_user_info($_REQUEST['user_id']); $userInfo = api_get_user_info($_REQUEST['user_id']);
@ -154,10 +154,10 @@ if (api_get_setting('show_email_addresses') == 'true') {
$table->set_column_filter($col - 1, 'email_filter'); $table->set_column_filter($col - 1, 'email_filter');
} }
$table->set_header($col++, get_lang('Active'), false); $table->set_header($col++, get_lang('Active'), false);
$table->set_column_filter($col -1, 'active_filter'); $table->set_column_filter($col - 1, 'active_filter');
$table->set_header($col++, get_lang('Actions'), false); $table->set_header($col++, get_lang('Actions'), false);
$table->set_column_filter($col -1, 'reg_filter'); $table->set_column_filter($col - 1, 'reg_filter');
$table->set_form_actions(array ('subscribe' => get_lang('reg')), 'user'); $table->set_form_actions(array('subscribe' => get_lang('reg')), 'user');
if (!empty($_POST['keyword'])) { if (!empty($_POST['keyword'])) {
$keyword_name = Security::remove_XSS($_POST['keyword']); $keyword_name = Security::remove_XSS($_POST['keyword']);
@ -245,7 +245,7 @@ function get_number_of_users()
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$url_access_id = api_get_current_access_url_id(); $url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) { if ($url_access_id != -1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
FROM $user_table u FROM $user_table u
@ -272,7 +272,7 @@ function get_number_of_users()
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$url_access_id = api_get_current_access_url_id(); $url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) { if ($url_access_id != -1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
@ -302,7 +302,7 @@ function get_number_of_users()
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$url_access_id = api_get_current_access_url_id(); $url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) { if ($url_access_id != -1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
FROM $user_table u FROM $user_table u
@ -330,8 +330,8 @@ function get_number_of_users()
if (isset($_GET['subscribe_user_filter_value']) && if (isset($_GET['subscribe_user_filter_value']) &&
!empty($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value']) &&
api_get_setting('ProfilingFilterAddingUsers') === 'true' api_get_setting('ProfilingFilterAddingUsers') === 'true'
){ ) {
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
ON field_values.item_id = u.user_id ON field_values.item_id = u.user_id
@ -348,7 +348,7 @@ function get_number_of_users()
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$url_access_id = api_get_current_access_url_id(); $url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) { if ($url_access_id != -1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT COUNT(u.id) $sql = "SELECT COUNT(u.id)
FROM $user_table u FROM $user_table u
@ -394,7 +394,7 @@ function get_number_of_users()
$users_of_course[] = $course_user['user_id']; $users_of_course[] = $course_user['user_id'];
} }
} }
$sql .=" AND u.status <> ".ANONYMOUS." "; $sql .= " AND u.status <> ".ANONYMOUS." ";
$res = Database::query($sql); $res = Database::query($sql);
$count_user = 0; $count_user = 0;
@ -465,7 +465,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
!empty($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value']) &&
api_get_setting('ProfilingFilterAddingUsers') == 'true' api_get_setting('ProfilingFilterAddingUsers') == 'true'
) { ) {
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
ON field_values.item_id = u.user_id ON field_values.item_id = u.user_id
@ -492,7 +492,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
!empty($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value']) &&
api_get_setting('ProfilingFilterAddingUsers') == 'true' api_get_setting('ProfilingFilterAddingUsers') == 'true'
) { ) {
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
ON field_values.item_id = u.user_id ON field_values.item_id = u.user_id
@ -506,7 +506,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
// adding a teacher NOT trough a session on a portal with multiple URLs // adding a teacher NOT trough a session on a portal with multiple URLs
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
if ($url_access_id !=-1) { if ($url_access_id != -1) {
$sql = "SELECT $select_fields $sql = "SELECT $select_fields
FROM $user_table u FROM $user_table u
LEFT JOIN $course_user_table cu LEFT JOIN $course_user_table cu
@ -518,7 +518,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
if (isset($_GET['subscribe_user_filter_value']) && if (isset($_GET['subscribe_user_filter_value']) &&
!empty($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value']) &&
api_get_setting('ProfilingFilterAddingUsers') == 'true' api_get_setting('ProfilingFilterAddingUsers') == 'true'
){ ) {
$field_identification = explode('*', $_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -550,8 +550,8 @@ function get_user_data($from, $number_of_items, $column, $direction)
} }
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){ if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])) {
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
ON field_values.item_id = u.user_id ON field_values.item_id = u.user_id
@ -582,7 +582,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
// applying the filter of the additional user profile fields // applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) { if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
$field_identification = explode('*',$_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
ON field_values.item_id = u.user_id ON field_values.item_id = u.user_id
@ -598,7 +598,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
//showing only the courses of the current Chamilo access_url_id //showing only the courses of the current Chamilo access_url_id
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
if ($url_access_id !=-1) { if ($url_access_id != -1) {
$sql = "SELECT $select_fields $sql = "SELECT $select_fields
FROM $user_table u FROM $user_table u
LEFT JOIN $course_user_table cu LEFT JOIN $course_user_table cu
@ -610,7 +610,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
if (isset($_GET['subscribe_user_filter_value']) && if (isset($_GET['subscribe_user_filter_value']) &&
!empty($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value']) &&
api_get_setting('ProfilingFilterAddingUsers') == 'true' api_get_setting('ProfilingFilterAddingUsers') == 'true'
){ ) {
$field_identification = explode('*', $_GET['subscribe_user_filter_value']); $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
$sql .= " $sql .= "
LEFT JOIN $table_user_field_values field_values LEFT JOIN $table_user_field_values field_values
@ -660,7 +660,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
} }
} }
$sql .=" AND u.status != ".ANONYMOUS." "; $sql .= " AND u.status != ".ANONYMOUS." ";
// Sorting and pagination (used by the sortable table) // Sorting and pagination (used by the sortable table)
$sql .= " ORDER BY col$column $direction "; $sql .= " ORDER BY col$column $direction ";
@ -669,7 +669,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
$sql .= " LIMIT $from, $number_of_items"; $sql .= " LIMIT $from, $number_of_items";
$res = Database::query($sql); $res = Database::query($sql);
$users = array (); $users = array();
while ($user = Database::fetch_row($res)) { while ($user = Database::fetch_row($res)) {
$users[] = $user; $users[] = $user;
} }
@ -729,7 +729,7 @@ function active_filter($active, $url_params, $row)
if ($row['0'] <> $_user['user_id']) { if ($row['0'] <> $_user['user_id']) {
// you cannot lock yourself out otherwise you could disable all the accounts // you cannot lock yourself out otherwise you could disable all the accounts
// including your own => everybody is locked out and nobody can change it anymore. // including your own => everybody is locked out and nobody can change it anymore.
$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array() , ICON_SIZE_TINY); $result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array(), ICON_SIZE_TINY);
} }
return $result; return $result;

6
main/wiki/index.php
Unescape View File

@ -27,7 +27,7 @@ $course_id = api_get_course_int_id();
$groupId = api_get_group_id(); $groupId = api_get_group_id();
// additional style information // additional style information
$htmlHeadXtra[] ='<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'wiki/css/default.css"/>'; $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'wiki/css/default.css"/>';
// javascript for advanced parameters menu // javascript for advanced parameters menu
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
@ -72,7 +72,7 @@ if ($groupId) {
//ensure this tool in groups whe it's private or deactivated //ensure this tool in groups whe it's private or deactivated
if ($group_properties['wiki_state'] == 0) { if ($group_properties['wiki_state'] == 0) {
api_not_allowed(); api_not_allowed();
} elseif ($group_properties['wiki_state']==2) { } elseif ($group_properties['wiki_state'] == 2) {
if (!api_is_allowed_to_edit(false, true) and if (!api_is_allowed_to_edit(false, true) and
!GroupManager :: is_user_in_group(api_get_user_id(), $group_properties['iid']) !GroupManager :: is_user_in_group(api_get_user_id(), $group_properties['iid'])
) { ) {
@ -84,7 +84,7 @@ if ($groupId) {
$is_allowed_to_edit = api_is_allowed_to_edit(false, true); $is_allowed_to_edit = api_is_allowed_to_edit(false, true);
// The page we are dealing with // The page we are dealing with
$page = isset($_GET['title']) ? $_GET['title']: 'index'; $page = isset($_GET['title']) ? $_GET['title'] : 'index';
$action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'showpage'; $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'showpage';
$view = isset($_GET['view']) ? Security::remove_XSS($_GET['view']) : null; $view = isset($_GET['view']) ? Security::remove_XSS($_GET['view']) : null;

8
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
Unescape View File

@ -147,8 +147,8 @@ class Basic extends Toolbar
$config['toolbar_maxToolbar'] = $this->getMaximizedToolbar(); $config['toolbar_maxToolbar'] = $this->getMaximizedToolbar();
} }
$config['customConfig'] = api_get_path(WEB_LIBRARY_JS_PATH) . 'ckeditor/config_js.php'; $config['customConfig'] = api_get_path(WEB_LIBRARY_JS_PATH).'ckeditor/config_js.php';
$config['flash_flvPlayer'] = api_get_path(WEB_LIBRARY_JS_PATH) . 'ckeditor/plugins/flash/swf/player.swf'; $config['flash_flvPlayer'] = api_get_path(WEB_LIBRARY_JS_PATH).'ckeditor/plugins/flash/swf/player.swf';
/*filebrowserFlashBrowseUrl /*filebrowserFlashBrowseUrl
filebrowserFlashUploadUrl filebrowserFlashUploadUrl
@ -173,7 +173,7 @@ class Basic extends Toolbar
'wordLimit' => 'unlimited' 'wordLimit' => 'unlimited'
);*/ );*/
$config['skin'] = 'bootstrapck,' . api_get_path(WEB_LIBRARY_JS_PATH) . 'ckeditor/skins/bootstrapck/'; $config['skin'] = 'bootstrapck,'.api_get_path(WEB_LIBRARY_JS_PATH).'ckeditor/skins/bootstrapck/';
//$config['skin'] = 'moono'; //$config['skin'] = 'moono';
if (isset($this->config)) { if (isset($this->config)) {
@ -205,7 +205,7 @@ class Basic extends Toolbar
return [ return [
$this->getNewPageBlock(), $this->getNewPageBlock(),
['Undo', 'Redo'], ['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Oembed','Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'], ['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'], ['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'], ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
['Styles', 'Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'], ['Styles', 'Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],

30
src/Chamilo/CourseBundle/Component/CourseCopy/CourseSelectForm.php
Unescape View File

@ -143,10 +143,10 @@ class CourseSelectForm
<?php <?php
// get destination course title // get destination course title
if (!empty($hidden_fields['destination_course'])) { if (!empty($hidden_fields['destination_course'])) {
$sessionTitle = !empty($hidden_fields['destination_session']) ? ' (' . api_get_session_name($hidden_fields['destination_session']) . ')' : null; $sessionTitle = !empty($hidden_fields['destination_session']) ? ' ('.api_get_session_name($hidden_fields['destination_session']).')' : null;
$course_infos = CourseManager::get_course_information($hidden_fields['destination_course']); $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
echo '<h3>'; echo '<h3>';
echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle; echo get_lang('DestinationCourse').' : '.$course_infos['title'].' ('.$course_infos['code'].') '.$sessionTitle;
echo '</h3>'; echo '</h3>';
} }
echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>'; echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
@ -305,7 +305,7 @@ class CourseSelectForm
/*Documents are avoided due the huge amount of memory that the serialize php function "eats" /*Documents are avoided due the huge amount of memory that the serialize php function "eats"
(when there are directories with hundred/thousand of files) */ (when there are directories with hundred/thousand of files) */
// this is a known issue of serialize // this is a known issue of serialize
$course->resources['document']= null; $course->resources['document'] = null;
} }
echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>'; echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
@ -322,7 +322,7 @@ class CourseSelectForm
Display::display_warning_message(get_lang('NoDataAvailable')); Display::display_warning_message(get_lang('NoDataAvailable'));
} else { } else {
if (!empty($hidden_fields['destination_session'])) { if (!empty($hidden_fields['destination_session'])) {
echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'. echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;" >'.
get_lang('Ok').'</button>'; get_lang('Ok').'</button>';
} else { } else {
if ($recycleOption) { if ($recycleOption) {
@ -347,7 +347,7 @@ class CourseSelectForm
*/ */
public static function display_hidden_quiz_questions($course) public static function display_hidden_quiz_questions($course)
{ {
if(is_array($course->resources)){ if (is_array($course->resources)) {
foreach ($course->resources as $type => $resources) { foreach ($course->resources as $type => $resources) {
if (count($resources) > 0) { if (count($resources) > 0) {
switch ($type) { switch ($type) {
@ -367,10 +367,10 @@ class CourseSelectForm
*/ */
public static function display_hidden_scorm_directories($course) public static function display_hidden_scorm_directories($course)
{ {
if (is_array($course->resources)){ if (is_array($course->resources)) {
foreach ($course->resources as $type => $resources) { foreach ($course->resources as $type => $resources) {
if (count($resources) > 0) { if (count($resources) > 0) {
switch($type) { switch ($type) {
case RESOURCE_SCORM: case RESOURCE_SCORM:
foreach ($resources as $id => $resource) { foreach ($resources as $id => $resource) {
echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />'; echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
@ -452,8 +452,8 @@ class CourseSelectForm
tool = '".RESOURCE_DOCUMENT."' AND tool = '".RESOURCE_DOCUMENT."' AND
ref = $resource_item "; ref = $resource_item ";
$res = Database::query($sql); $res = Database::query($sql);
$all_properties = array (); $all_properties = array();
while ($item_property = Database::fetch_array($res,'ASSOC')) { while ($item_property = Database::fetch_array($res, 'ASSOC')) {
$all_properties[] = $item_property; $all_properties[] = $item_property;
} }
$course->resources[RESOURCE_DOCUMENT][$resource_item]->item_properties = $all_properties; $course->resources[RESOURCE_DOCUMENT][$resource_item]->item_properties = $all_properties;
@ -468,7 +468,7 @@ class CourseSelectForm
switch ($type) { switch ($type) {
case RESOURCE_SURVEYQUESTION: case RESOURCE_SURVEYQUESTION:
foreach($resources as $id => $obj) { foreach ($resources as $id => $obj) {
if (isset($_POST['resource'][RESOURCE_SURVEY]) && if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
is_array($_POST['resource'][RESOURCE_SURVEY]) && is_array($_POST['resource'][RESOURCE_SURVEY]) &&
!in_array($obj->survey_id, array_keys($_POST['resource'][RESOURCE_SURVEY])) !in_array($obj->survey_id, array_keys($_POST['resource'][RESOURCE_SURVEY]))
@ -567,7 +567,7 @@ class CourseSelectForm
$resource_is_used_elsewhere = $course->is_linked_resource($obj); $resource_is_used_elsewhere = $course->is_linked_resource($obj);
// check if document is in a quiz (audio/video) // check if document is in a quiz (audio/video)
if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) { if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
foreach($course->resources[RESOURCE_QUIZ] as $quiz) { foreach ($course->resources[RESOURCE_QUIZ] as $quiz) {
$quiz = $quiz->obj; $quiz = $quiz->obj;
if (isset($quiz->media) && $quiz->media == $id) { if (isset($quiz->media) && $quiz->media == $id) {
$resource_is_used_elsewhere = true; $resource_is_used_elsewhere = true;
@ -639,15 +639,15 @@ class CourseSelectForm
<?php <?php
//get destination course title //get destination course title
if(!empty($hidden_fields['destination_course'])) { if (!empty($hidden_fields['destination_course'])) {
if (!empty($hidden_fields['destination_session'])) { if (!empty($hidden_fields['destination_session'])) {
$sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')'; $sessionTitle = ' ('.api_get_session_name($hidden_fields['destination_session']).')';
} else { } else {
$sessionTitle = null; $sessionTitle = null;
} }
$course_infos = CourseManager::get_course_information($hidden_fields['destination_course']); $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
echo '<h3>'; echo '<h3>';
echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle; echo get_lang('DestinationCourse').' : '.$course_infos['title'].$sessionTitle;
echo '</h3>'; echo '</h3>';
} }
@ -685,7 +685,7 @@ class CourseSelectForm
if ($avoid_serialize) { if ($avoid_serialize) {
//Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files) //Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
// this is a known issue of serialize // this is a known issue of serialize
$course->resources['document']= null; $course->resources['document'] = null;
} }
echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>'; echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
if (is_array($hidden_fields)) { if (is_array($hidden_fields)) {

Write Preview
Loading…
Cancel
Save