Removes require_once for libs already added with composer

1.10.x
Julio Montoya 11 years ago
parent 1ede08ef43
commit 5728167447
  1. 1
      main/admin/access_url_add_courses_to_url.php
  2. 1
      main/admin/access_url_add_users_to_url.php
  3. 2
      main/admin/access_url_check_user_session.php
  4. 3
      main/admin/access_url_edit_courses_to_url.php
  5. 5
      main/admin/access_url_edit_usergroup_to_url.php
  6. 3
      main/admin/access_url_edit_users_to_url.php
  7. 1
      main/admin/add_courses_to_session.php
  8. 2
      main/admin/add_courses_to_usergroup.php
  9. 2
      main/admin/add_many_session_to_category.php
  10. 4
      main/admin/add_sessions_to_promotion.php
  11. 2
      main/admin/add_sessions_to_usergroup.php
  12. 2
      main/admin/add_users_to_group.php
  13. 1
      main/admin/add_users_to_session.php
  14. 2
      main/admin/add_users_to_usergroup.php
  15. 1
      main/admin/calendar.lib.php
  16. 1
      main/admin/careers.php
  17. 1
      main/admin/class_edit.php
  18. 5
      main/admin/class_import.php
  19. 2
      main/admin/class_information.php
  20. 5
      main/admin/class_list.php
  21. 28
      main/admin/class_user_import.php
  22. 2
      main/admin/course_import.php
  23. 8
      main/admin/course_intro_pdf_import.php
  24. 4
      main/admin/course_request_accepted.php
  25. 4
      main/admin/course_user_import.php
  26. 4
      main/admin/course_user_import_by_email.php
  27. 2
      main/admin/dashboard_add_courses_to_user.php
  28. 1
      main/admin/dashboard_add_sessions_to_user.php
  29. 1
      main/admin/dashboard_add_users_to_user.php
  30. 34
      main/admin/event_controller.php
  31. 49
      main/admin/grade_models.php
  32. 2
      main/admin/group_add.php
  33. 1
      main/admin/group_list.php
  34. 4
      main/admin/inactive_user_list.php
  35. 2
      main/admin/ldap_synchro.php
  36. 9
      main/admin/ldap_users_list.php
  37. 2
      main/admin/ldap_users_synchro.php
  38. 9
      main/admin/session_add.php
  39. 2
      main/admin/session_category_add.php
  40. 5
      main/admin/session_export.php
  41. 2
      main/admin/session_import_drh.php
  42. 2
      main/admin/settings.lib.php
  43. 2
      main/admin/settings.php
  44. 4
      main/admin/skills.php
  45. 28
      main/admin/skills_gradebook.php
  46. 39
      main/admin/skills_profile.php
  47. 35
      main/admin/special_exports.php
  48. 3
      main/admin/specific_fields.php
  49. 4
      main/admin/statistics.php
  50. 3
      main/admin/system_status.php
  51. 11
      main/admin/teacher_time_report.php
  52. 4
      main/admin/user_export.php
  53. 1
      main/admin/user_information.php
  54. 2
      main/admin/usergroup_export.php
  55. 4
      main/admin/usergroup_import.php
  56. 3
      main/admin/usergroup_user_import.php
  57. 1
      main/announcements/download.php
  58. 2
      main/auth/profile.php
  59. 3
      main/blog/blog_admin.php
  60. 8
      main/blog/download.php
  61. 2
      main/chat/chat_chat.php
  62. 4
      main/chat/chat_message.php
  63. 2
      main/chat/header_frame.inc.php
  64. 2
      main/course_info/delete_course.php
  65. 2
      main/course_info/download.php
  66. 7
      main/course_notice/index.php
  67. 8
      main/course_notice/index2.php
  68. 5
      main/course_progress/index.php
  69. 4
      main/coursecopy/classes/CourseRestorer.class.php
  70. 1
      main/coursecopy/copy_course.php
  71. 3
      main/coursecopy/copy_course_session.php
  72. 3
      main/coursecopy/copy_course_session_selected.php
  73. 1
      main/coursecopy/create_backup.php
  74. 1
      main/coursecopy/import_backup.php
  75. 1
      main/cron/hosting_total_size_limit.php
  76. 1
      main/document/document.php
  77. 2
      main/document/document_lite.php
  78. 2
      main/document/edit_document.php
  79. 5
      main/document/file.php
  80. 1
      main/exercice/GC.php
  81. 4
      main/exercice/addlimits.php
  82. 1
      main/exercice/calculated_answer.class.php
  83. 1
      main/exercice/exercise.class.php
  84. 2
      main/exercice/hotpotatoes.php
  85. 4
      main/exercice/qti2.php
  86. 1
      main/exercice/showinframes.php
  87. 3
      main/exercice/tests_category.php
  88. 3
      main/forum/index.php
  89. 3
      main/gradebook/gradebook_view_result.php
  90. 9
      main/gradebook/lib/be.inc.php
  91. 4
      main/gradebook/lib/be/category.class.php
  92. 11
      main/gradebook/lib/be/linkfactory.class.php
  93. 3
      main/gradebook/user_info.php
  94. 1
      main/inc/ajax/chat.ajax.php
  95. 1
      main/inc/ajax/course.ajax.php
  96. 1
      main/inc/ajax/document.ajax.php
  97. 2
      main/inc/ajax/lp.ajax.php
  98. 4
      main/inc/ajax/model.ajax.php
  99. 43
      main/inc/ajax/nanogong.ajax.php
  100. 31
      main/inc/ajax/skill.ajax.php
  101. Some files were not shown because too many files have changed in this diff Show More

@ -12,7 +12,6 @@
$language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
$this_section=SECTION_PLATFORM_ADMIN;

@ -14,7 +14,6 @@ $cidReset = true;
require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
api_protect_global_admin_script();
if (!api_get_multiple_access_url()) {
header('Location: index.php');

@ -11,8 +11,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;

@ -5,7 +5,6 @@
* @author Julio Montoya <gugli100@gmail.com>
*/
// name of the language file that needs to be included
$language_file = 'admin';
@ -13,8 +12,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'access_url_edit_courses_to_url_functions.lib.php';
$xajax = new xajax();
$xajax -> registerFunction (array('search_courses', 'Accessurleditcoursestourl', 'search_courses'));

@ -12,9 +12,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
$xajax = new xajax();
$xajax->registerFunction(array('searchUserGroupAjax', 'UserGroup', 'searchUserGroupAjax'));
@ -343,4 +340,4 @@ function makepost(select){
}
</script>
<?php
Display::display_footer();
Display::display_footer();

@ -11,9 +11,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'urlmanager.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'access_url_edit_users_to_url_functions.lib.php';
require_once '../inc/lib/xajax/xajax.inc.php';
$xajax = new xajax();
//$xajax->debugOn();
$xajax->registerFunction(array('search_users', 'Accessurledituserstourl', 'search_users'));

@ -13,7 +13,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php';
$sessionId = isset($_GET['id_session']) ? intval($_GET['id_session']) : null;
$add = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;

@ -12,8 +12,6 @@ $cidReset = true;
// Including some necessary files.
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
$xajax = new xajax();
$xajax->registerFunction('search');

@ -11,8 +11,6 @@ $language_file='admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'add_many_session_to_category_functions.lib.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
$xajax = new xajax();
$xajax->registerFunction('search_courses');

@ -12,10 +12,6 @@ $cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'promotion.lib.php';
require_once api_get_path(LIBRARY_PATH).'career.lib.php';
require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
$xajax = new xajax();
$xajax->registerFunction ('search_sessions');

@ -12,8 +12,6 @@ $cidReset=true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php';
$xajax = new xajax();

@ -12,8 +12,6 @@ $cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
require_once '../inc/lib/group_portal_manager.lib.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;

@ -13,7 +13,6 @@ $cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
$xajax = new xajax();
$xajax->registerFunction('search_users');

@ -12,7 +12,6 @@ $cidReset = true;
// including some necessary files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
@ -129,7 +128,6 @@ if (isset($_GET['action']) && $_GET['action'] == 'export') {
$groupInfo = $usergroup->get($id);
$users = $usergroup->getUserListByUserGroup($id);
if (!empty($users)) {
require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
$data = array(
array('UserName', 'ClassName')

@ -2488,7 +2488,6 @@ function agenda_add_repeat_item($course_info,$orig_id,$type,$end,$orig_dest)
function agenda_import_ical($course_info,$file) {
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$charset = api_get_system_encoding();
$filepath = api_get_path(SYS_ARCHIVE_PATH).$file['name'];
if(!@move_uploaded_file($file['tmp_name'],$filepath))

@ -10,7 +10,6 @@ $language_file = array('admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'career.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;

@ -14,7 +14,6 @@ $cidReset = true;
// Including some necessary dokeos files.
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
// Setting the section (for the tabs).
$this_section = SECTION_PLATFORM_ADMIN;

@ -54,9 +54,6 @@ $cidReset = true;
// Including some necessary dokeos files.
include '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
// Setting the section (for the tabs).
$this_section = SECTION_PLATFORM_ADMIN;
@ -116,4 +113,4 @@ $form->display();
<?php
// Displaying the footer.
Display :: display_footer();
Display :: display_footer();

@ -18,8 +18,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
if (!isset($_GET['id'])) {
api_not_allowed();
}

@ -69,9 +69,6 @@ function modify_filter($class_id) {
return $result;
}
require api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require api_get_path(LIBRARY_PATH).'classmanager.lib.php';
$tool_name = get_lang('ClassList');
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
@ -130,4 +127,4 @@ $tpl = new Template($tool_name);
$tpl->assign('content', $content);
$tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->display_one_col_template();
$tpl->display_one_col_template();

@ -16,7 +16,7 @@ function validate_data($user_classes) {
global $purification_option_for_usernames;
$errors = array ();
$classcodes = array ();
if (!isset($_POST['subscribe']) && !isset($_POST['subscribe'])) {
$user_class['error'] = get_lang('SelectAnAction');
$errors[] = $user_class;
@ -26,20 +26,20 @@ function validate_data($user_classes) {
$user_class['line'] = $index + 1;
// 1. Check whether mandatory fields are set.
$mandatory_fields = array ('UserName', 'ClassName');
foreach ($mandatory_fields as $key => $field) {
if (!isset ($user_class[$field]) || strlen($user_class[$field]) == 0) {
foreach ($mandatory_fields as $key => $field) {
if (!isset ($user_class[$field]) || strlen($user_class[$field]) == 0) {
$user_class['error'] = get_lang($field.'Mandatory');
$errors[] = $user_class;
}
}
// 2. Check whether classcode exists.
if (isset ($user_class['ClassName']) && strlen($user_class['ClassName']) != 0) {
// 2.1 Check whether code has been allready used in this CVS-file.
if (!isset ($classcodes[$user_class['ClassName']])) {
// 2.1.1 Check whether code exists in DB.
$class_table = Database :: get_main_table(TABLE_MAIN_CLASS);
$class_table = Database :: get_main_table(TABLE_MAIN_CLASS);
$sql = "SELECT * FROM $class_table WHERE name = '".Database::escape_string($user_class['ClassName'])."'";
$res = Database::query($sql);
if (Database::num_rows($res) == 0) {
@ -57,7 +57,7 @@ function validate_data($user_classes) {
$user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName'];
$errors[] = $user_class;
}
$username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
$username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
// 3.2. Check whether username exists.
if (UserManager::is_username_available($username)) {
$user_class['error'] = get_lang('UnknownUser').': '.$username;
@ -83,7 +83,7 @@ function save_data($users_classes) {
// Data parsing: purification + conversion (UserName, ClassName) --> (user_is, class_id)
$csv_data = array ();
foreach ($users_classes as $index => $user_class) {
$sql1 = "SELECT user_id FROM $user_table WHERE username = '".Database::escape_string(UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames))."'";
$res1 = Database::query($sql1);
$obj1 = Database::fetch_object($res1);
@ -94,7 +94,7 @@ function save_data($users_classes) {
$csv_data[$obj1->user_id][$obj2->id] = 1;
}
}
// Logic for processing the request (data + UI options).
$db_subscriptions = array();
foreach ($csv_data as $user_id => $csv_subscriptions) {
@ -105,7 +105,7 @@ function save_data($users_classes) {
}
$to_subscribe = array_diff(array_keys($csv_subscriptions), array_keys($db_subscriptions));
$to_unsubscribe = array_diff(array_keys($db_subscriptions), array_keys($csv_subscriptions));
// Subscriptions for new classes.
if ($_POST['subscribe']) {
foreach ($to_subscribe as $class_id) {
@ -139,10 +139,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
$tool_name = get_lang('AddUsersToAClass').' CSV';
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
@ -161,9 +157,9 @@ $form->addElement('style_submit_button', 'submit', get_lang('Import'), 'class="s
if ($form->validate()) {
$users_classes = parse_csv_data($_FILES['import_file']['tmp_name']);
$errors = validate_data($users_classes);
if (count($errors) == 0) {
if (count($errors) == 0) {
save_data($users_classes);
header('Location: class_list.php?action=show_message&message='.urlencode(get_lang('FileImported')));
exit();

@ -164,8 +164,6 @@ require '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
$defined_auth_sources[] = PLATFORM_AUTH_SOURCE;
if (isset($extAuthSource) && is_array($extAuthSource)) {

@ -14,11 +14,6 @@ api_protect_admin_script();
// temporary configuration of in which folder to upload the file in each course.
// Should default to '', and start with a '/' and end without it, if defined
$subDir = '';
//require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
//require_once api_get_path(LIBRARY_PATH).'import.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$tool_name = get_lang('ImportPDFIntroToCourses');
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
@ -105,9 +100,6 @@ function import_pdfs($file, $subDir = '/') {
error_log('Could not unzip uploaded file in '.__FILE__.', line '.__LINE__);
return $errors;
}
require_once api_get_path(LIBRARY_PATH).'course_description.lib.php';
require_once api_get_path(LIBRARY_PATH).'app_view.php';
require_once '../course_description/course_description_controller.php';
$list = scandir($baseDir.$uploadPath);
$i = 0;
foreach ($list as $file) {

@ -24,14 +24,10 @@ api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
// Including a configuration file.
require api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// Include additional libraries
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
// A check whether the course validation feature is enabled.
$course_validation_feature = api_get_setting('course_validation') == 'true';

@ -145,10 +145,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
// Protecting the admin section.
api_protect_admin_script();
// Including additional libraries.
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
$tool_name = get_lang('AddUsersToACourse').' CSV';
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));

@ -150,10 +150,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
// Protecting the admin section.
api_protect_admin_script();
// Including additional libraries.
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
$tool_name = get_lang('AddUsersToACourse').' CSV';
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));

@ -11,9 +11,7 @@ $language_file = 'admin';
// resetting the course id
$cidReset = true;
// including some necessary dokeos files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
global $_configuration;

@ -12,7 +12,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
global $_configuration;
// create an ajax object

@ -12,7 +12,6 @@ $language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
global $_configuration;
$ajax_search = false;

@ -4,9 +4,7 @@
* Global events controller class
* @package chamilo.admin
*/
/**
* Code
*/
// name of the language file that needs to be included
$language_file = array('admin');
$cidReset = true;
@ -19,26 +17,26 @@ if (api_get_setting('activate_email_template') != 'true') {
class eventController { // extends Controller {
public function showAction() {
}
public function newAction() {
}
public function addAction() {
}
public function listingAction() {
$event_email_template = new EventEmailTemplate();
return $event_email_template->display();
return $event_email_template->display();
}
public function deleteAction($id) {
$event_email_template = new EventEmailTemplate();
return $event_email_template->delete($id);
}
return $event_email_template->delete($id);
}
}
$event_controller = new eventController();
@ -67,7 +65,7 @@ switch ($action) {
//jqgrid will use this URL to do the selects
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_event_email_template';
//The order is important you need to check the the $column variable in the model.ajax.php file
//The order is important you need to check the the $column variable in the model.ajax.php file
$columns = array(get_lang('Subject'), get_lang('EventTypeName'), get_lang('Language'), get_lang('Status'), get_lang('Actions'));
//Column config
@ -78,16 +76,16 @@ $column_model = array(
array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'),
array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'100')
);
//Autowidth
);
//Autowidth
$extra_params['autowidth'] = 'true';
//height auto
//height auto
$extra_params['height'] = 'auto';
$htmlHeadXtra[] = api_get_jqgrid_js();
$htmlHeadXtra[] = '<script>
$(function() {
'.Display::grid_js('event_email_template', $url,$columns,$column_model,$extra_params, array(), $action_links,true).'
'.Display::grid_js('event_email_template', $url,$columns,$column_model,$extra_params, array(), $action_links,true).'
});
</script>';

@ -10,7 +10,6 @@ $language_file = array('admin', 'gradebook');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'grade_model.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;
@ -29,9 +28,9 @@ $interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'
$action = isset($_GET['action']) ? $_GET['action'] : null;
$check = Security::check_token('request');
$token = Security::get_token();
$token = Security::get_token();
if ($action == 'add') {
if ($action == 'add') {
$interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel'));
$interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
} elseif ($action == 'edit') {
@ -42,7 +41,7 @@ if ($action == 'add') {
}
$htmlHeadXtra[]= '<script>
function plusItem(item) {
if (item != 1) {
document.getElementById(item).style.display = "inline";
@ -54,7 +53,7 @@ function plusItem(item) {
//document.getElementById("txta-"+(item-1)).value = "";
}
}
function minItem(item) {
if (item != 1) {
document.getElementById(item).style.display = "none";
@ -76,7 +75,7 @@ Display::display_header($tool_name);
//jqgrid will use this URL to do the selects
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_grade_models';
//The order is important you need to check the the $column variable in the model.ajax.php file
//The order is important you need to check the the $column variable in the model.ajax.php file
$columns = array(get_lang('Name'), get_lang('Description'), get_lang('Actions'));
//Column config
@ -84,25 +83,25 @@ $column_model = array(
array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'),
array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left','sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
);
//Autowidth
);
//Autowidth
$extra_params['autowidth'] = 'true';
//height auto
$extra_params['height'] = 'auto';
//height auto
$extra_params['height'] = 'auto';
//With this function we can add actions to the jgrid (edit, delete, etc)
$action_links = 'function action_formatter(cellvalue, options, rowObject) {
return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
'&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;" href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
'\';
'\';
}';
?>
<script>
$(function() {
<?php
<?php
// grid definition see the $obj->display() function
echo Display::grid_js('grade_model', $url, $columns, $column_model, $extra_params, array(), $action_links,true);
?>
echo Display::grid_js('grade_model', $url, $columns, $column_model, $extra_params, array(), $action_links,true);
?>
});
</script>
<?php
@ -113,7 +112,7 @@ switch ($action) {
case 'add':
if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
api_not_allowed();
}
}
$url = api_get_self().'?action='.Security::remove_XSS($_GET['action']);
$form = $obj->return_form($url, 'add');
@ -125,29 +124,29 @@ switch ($action) {
if ($res) {
Display::display_confirmation_message(get_lang('ItemAdded'));
}
}
}
$obj->display();
} else {
echo '<div class="actions">';
echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
echo '</div>';
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$form->display();
}
break;
case 'edit':
// Action handling: Editing
// Action handling: Editing
$url = api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']);
$form = $obj->return_form($url, 'edit');
$form = $obj->return_form($url, 'edit');
// The validation or display
if ($form->validate()) {
if ($form->validate()) {
if ($check) {
$values = $form->exportValues();
$res = $obj->update($values);
Display::display_confirmation_message(get_lang('ItemUpdated'), false);
}
Display::display_confirmation_message(get_lang('ItemUpdated'), false);
}
$obj->display();
} else {
echo '<div class="actions">';
@ -167,9 +166,9 @@ switch ($action) {
}
}
$obj->display();
break;
break;
default:
$obj->display();
$obj->display();
break;
}
Display :: display_footer();

@ -12,8 +12,6 @@ $cidReset = true;
// Including necessary libraries.
require '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'fileManage.lib.php';
require_once $libpath.'fileUpload.lib.php';
// Section for the tabs
$this_section = SECTION_PLATFORM_ADMIN;

@ -10,7 +10,6 @@
$language_file = array('registration', 'admin', 'userInfo');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);

@ -13,10 +13,6 @@
$language_file = array ('registration','admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'security.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
$tbl_stats_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS);
$this_section = SECTION_PLATFORM_ADMIN;

@ -14,8 +14,6 @@ $cidReset=true;
require('../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once($libpath.'formvalidator/FormValidator.class.php');
require_once($libpath.'usermanager.lib.php');
require_once('../auth/ldap/authldap.php');
$annee_base=date('Y');
// setting the section (for the tabs)

@ -12,20 +12,11 @@ $language_file[] = 'registration';
$language_file[] = 'admin';
$cidReset = true;
require('../inc/global.inc.php');
require_once(api_get_path(LIBRARY_PATH).'sortable_table.class.php');
require_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
require_once(api_get_path(LIBRARY_PATH).'security.lib.php');
require('../auth/ldap/authldap.php');
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
/**
==============================================================================
INIT SECTION
==============================================================================
*/
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
$action = $_GET["action"];
$login_as_user_id = $_GET["user_id"];

@ -14,8 +14,6 @@ $cidReset=true;
require('../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once($libpath.'formvalidator/FormValidator.class.php');
require_once($libpath.'usermanager.lib.php');
require("../auth/ldap/authldap.php");
$annee_base=date('Y');
// setting the section (for the tabs)

@ -13,9 +13,6 @@ $cidReset=true;
// including the global Chamilo file
require_once '../inc/global.inc.php';
// including additional libraries
require_once '../inc/lib/xajax/xajax.inc.php';
$xajax = new xajax();
//$xajax->debugOn();
$xajax -> registerFunction ('search_coachs');
@ -178,7 +175,7 @@ $monthList = array();
for ($i = 1; $i <= 12; $i++) {
$month = sprintf("%02d", $i);
$monthList[$month] = $month;
}
@ -237,7 +234,7 @@ if (intval($countUsers) < 50) {
if (api_is_multiple_url_enabled()) {
$userRelAccessUrlTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$accessUrlId = api_get_current_access_url_id();
if ($accessUrlId != -1) {
$sql = "SELECT user.user_id, username, lastname, firstname FROM $tbl_user user "
. "INNER JOIN $userRelAccessUrlTable url_user ON (url_user.user_id = user.user_id) "
@ -376,7 +373,7 @@ $form->setDefaults($formDefaults);
if ($form->validate()) {
$params = $form->getSubmitValues();
$name = $params['name'];
$startDate = $params['date_start'];
$endDate = $params['date_end'];

@ -13,8 +13,6 @@ $cidReset=true;
// including the global Dokeos file
require_once '../inc/global.inc.php';
// including additional libraries
require_once '../inc/lib/xajax/xajax.inc.php';
$xajax = new xajax();
$xajax -> registerFunction ('search_coachs');

@ -13,7 +13,6 @@ include '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
include api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$session_id = intval($_GET['session_id']);
$formSent = 0;
@ -49,7 +48,7 @@ if ($_POST['formSent']) {
$sql = "SELECT id,name,id_coach,username,date_start,date_end,visibility,session_category_id FROM $tbl_session INNER JOIN $tbl_user
ON $tbl_user.user_id = $tbl_session.id_coach ORDER BY id";
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
@ -292,4 +291,4 @@ $defaults['file_type'] = 'csv';
$form->setDefaults($defaults);
$form->display();
unset($Courses);
Display::display_footer();
Display::display_footer();

@ -13,8 +13,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$form_sent = 0;
$tool_name = get_lang('ImportSessionDrhList');

@ -646,7 +646,6 @@ function handle_search()
echo '</div>';
if ($search_enabled == 'true') {
require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
$xapian_path = api_get_path(SYS_PATH).'searchdb';
/*
@ -949,7 +948,6 @@ function add_edit_template() {
$values = $form->exportValues();
// Upload the file.
if (!empty($_FILES['template_image']['name'])) {
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$upload_ok = process_uploaded_file($_FILES['template_image']);
if ($upload_ok) {

@ -25,8 +25,6 @@ $cidReset = true;
// Including some necessary library files.
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once 'settings.lib.php';
// Setting the section (for the tabs).

@ -10,8 +10,6 @@ $language_file = array('admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
require_once api_get_path(LIBRARY_PATH).'skill.visualizer.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;
@ -43,4 +41,4 @@ $tpl->assign('js', $skill_visualizer->return_js());
//
$content = $tpl->fetch('default/skill/skill_tree.tpl');
$tpl->assign('content', $content);
$tpl->display_no_layout_template();
$tpl->display_no_layout_template();

@ -10,8 +10,6 @@ $language_file = array('admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
require_once api_get_path(LIBRARY_PATH).'gradebook.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;
@ -33,7 +31,7 @@ $tool_name = get_lang('SkillsAndGradebooks');
$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
if ($action == 'add_skill') {
$interbreadcrumb[]=array('url' => 'skills_gradebook.php','name' => get_lang('SkillsAndGradebooks'));
$tool_name = get_lang('Add');
$tool_name = get_lang('Add');
}
@ -46,7 +44,7 @@ Display::display_header($tool_name);
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_gradebooks';
//The order is important you need to check the the $column variable in the model.ajax.php file
//The order is important you need to check the the $column variable in the model.ajax.php file
$columns = array(get_lang('Name'), get_lang('CertificatesFiles'), get_lang('Skills'), get_lang('Actions'));
//Column config
@ -55,16 +53,16 @@ $column_model = array(
array('name'=>'certificate', 'index'=>'certificate', 'width'=>'25', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'skills', 'index'=>'skills', 'width'=>'300', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'30', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
);
//Autowidth
);
//Autowidth
$extra_params['autowidth'] = 'true';
//height auto
$extra_params['height'] = 'auto';
//height auto
$extra_params['height'] = 'auto';
//With this function we can add actions to the jgrid (edit, delete, etc)
$action_links = 'function action_formatter(cellvalue, options, rowObject) {
//certificates
if (rowObject[4] == 1) {
if (rowObject[4] == 1) {
return \'<a href="?action=add_skill&id=\'+options.rowId+\'">'.Display::return_icon('add.png', get_lang('AddSkill'),'',ICON_SIZE_SMALL).'</a>'.'\';
} else {
return \''.Display::return_icon('add_na.png', get_lang('YourGradebookFirstNeedsACertificateInOrderToBeLinkedToASkill'),'',ICON_SIZE_SMALL).''.'\';
@ -73,15 +71,15 @@ $action_links = 'function action_formatter(cellvalue, options, rowObject) {
?>
<script>
$(function() {
<?php
<?php
// grid definition see the $career->display() function
echo Display::grid_js('gradebooks', $url, $columns, $column_model, $extra_params, array(), $action_links,true);
?>
echo Display::grid_js('gradebooks', $url, $columns, $column_model, $extra_params, array(), $action_links,true);
?>
});
</script>
<?php
$gradebook = new Gradebook();
switch($action) {
case 'display':
$gradebook->display();
@ -93,11 +91,11 @@ switch($action) {
$form = $gradebook->show_skill_form($id, $url, $gradebook_info['name']);
if ($form->validate()) {
$values = $form->exportValues();
$res = $gradebook->update_skills_to_gradebook($values['id'], $values['skill']);
$res = $gradebook->update_skills_to_gradebook($values['id'], $values['skill']);
if ($res) {
Display::display_confirmation_message(get_lang('ItemAdded'));
}
}
}
$form->display();
//echo Display::tag('h2',$gradebook_info['name']);
break;

@ -10,7 +10,6 @@ $language_file = array('admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
@ -46,18 +45,18 @@ $total_skills_to_search = array();
if ($form->validate()) {
$values = $form->getSubmitValues();
$skills = $values['skills'];
if (!empty($skills)) {
$hidden_skills = isset($values['hidden_skills']) ? $values['hidden_skills'] : array();
$hidden_skills = isset($values['hidden_skills']) ? $values['hidden_skills'] : array();
$skills = array_merge($skills, $hidden_skills);
$skills = array_filter($skills);
$skills = array_unique($skills);
$_SESSION['skills'] = $skills;
} else {
$skills = isset($_SESSION['skills']) ? $_SESSION['skills']: array();
}
@ -71,21 +70,21 @@ $count_skills = count($skills);
$users = $skill_rel_user->get_user_by_skills($skills);
if (!empty($users)) {
foreach ($users as $user) {
foreach ($users as $user) {
$user_info = api_get_user_info($user['user_id']);
$user_list[$user['user_id']]['user'] = $user_info;
$my_user_skills = $skill_rel_user->get_user_skills($user['user_id']);
$user_skills = array();
$found_counts = 0 ;
foreach($my_user_skills as $my_skill) {
$found = false;
if (in_array($my_skill['skill_id'], $skills)) {
$found = true;
$found_counts++;
}
$user_skills[] = array('skill_id' => $my_skill['skill_id'], 'found' => $found);
$total_skills_to_search[$my_skill['skill_id']] = $my_skill['skill_id'];
$total_skills_to_search[$my_skill['skill_id']] = $my_skill['skill_id'];
}
$user_list[$user['user_id']]['skills'] = $user_skills;
$user_list[$user['user_id']]['total_found_skills'] = $found_counts;
@ -105,7 +104,7 @@ $tpl->assign('total_search_skills', $count_skills);
if (!empty($skills)) {
$counter = 0;
foreach($skills as $hidden_skill_id) {
foreach($skills as $hidden_skill_id) {
$form->addElement('hidden', 'hidden_skills[]', $hidden_skill_id);
$counter++;
}
@ -125,27 +124,27 @@ $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
switch ($action) {
case 'remove_skill':
$new_skill = array();
$new_skill = array();
foreach ($skills as $skill_id) {
if ($id != $skill_id) {
$new_skill[] = $skill_id;
}
}
}
}
$skills = $_SESSION['skills'] = $new_skill;
break;
break;
case 'load_profile':
$skill_profile = new SkillRelProfile();
$skills = $skill_profile->get_skills_by_profile($id);
$total_skills_to_search = $skill->get_skills_info($skills);
$skills = $skill_profile->get_skills_by_profile($id);
$total_skills_to_search = $skill->get_skills_info($skills);
break;
}
$skill_list = array();
foreach ($total_skills_to_search as $skill_info) {
$skill_list[$skill_info['id']] = $skill_info;
$skill_list[$skill_info['id']] = $skill_info;
}
$tpl->assign('skill_list', $skill_list);
$tpl->assign('skill_list', $skill_list);
$tpl->assign('search_skill_list', $skills);
$form_to_html = $form->return_form();
@ -157,4 +156,4 @@ $tpl->assign('url', $url);
$content = $tpl->fetch('default/skill/profile.tpl');
$tpl->assign('content', $content);
$tpl->display_one_col_template();
$tpl->display_one_col_template();

@ -3,7 +3,7 @@
/**
* Special exports
*
* @author Jhon Hinojosa
* @author Jhon Hinojosa
* @author Julio Montoya Fixing pclzip folder + some clean <gugli100@gmail.com>
* @package chamilo.include.export
*/
@ -24,7 +24,6 @@ $nameTools = get_lang('SpecialExports');
// include additional libraries
require_once '../document/document.inc.php';
// include additional libraries
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once '../coursecopy/classes/CourseBuilder.class.php';
require_once '../coursecopy/classes/CourseArchiver.class.php';
require_once '../coursecopy/classes/CourseRestorer.class.php';
@ -50,30 +49,30 @@ $error =0;
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'full_backup')) {
if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'full_backup')) {
$export = false;
if (isset ($_POST['action']) && $_POST['action'] == 'course_select_form') {
$FileZip = create_zip();
$to_group_id = 0;
$to_group_id = 0;
$sql_session = "SELECT id, name FROM $tbl_session ";
$query_session = Database::query($sql_session);
$ListSession = array();
while ($rows_session = Database::fetch_assoc($query_session)) {
$ListSession[$rows_session['id']] = $rows_session['name'];
}
$zip_folder=new PclZip($FileZip['TEMP_FILE_ZIP']);
if(!isset($_POST['resource']) || count($_POST['resource']) == 0 ) {
Display::display_error_message(get_lang('ErrorMsgSpecialExport'));
} else {
$Resource = $_POST['resource'];
foreach ($Resource as $Code_course => $Sessions) {
$_course = Database::get_course_info($Code_course);
$_course = Database::get_course_info($Code_course);
$tbl_document = Database::get_course_table(TABLE_DOCUMENT);
$tbl_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$course_id = $_course['real_id'];
//Add item to the zip file course
$sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
WHERE props.tool='".TOOL_DOCUMENT."'
@ -82,7 +81,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
AND docs.filetype='file'
AND docs.session_id = '0'
AND props.visibility<>'2'
AND props.to_group_id= $to_group_id AND docs.c_id = $course_id AND props.c_id = $course_id";
AND props.to_group_id= $to_group_id AND docs.c_id = $course_id AND props.c_id = $course_id";
$query = Database::query($sql );
while ($rows_course_file = Database::fetch_assoc($query)) {
$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'],
@ -90,7 +89,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory']."/document".$FileZip['PATH_REMOVE']
);
}
foreach ($Sessions as $IdSession => $value){
$session_id = Security::remove_XSS($IdSession);
//Add tem to the zip file session course
@ -129,8 +128,8 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
}
if ($export && $name) {
Display::display_confirmation_message(get_lang('BackupCreated'));
echo '<br /><a class="btn" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.urlencode($name).'&session=true">'.get_lang('Download').'</a>';
Display::display_confirmation_message(get_lang('BackupCreated'));
echo '<br /><a class="btn" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.urlencode($name).'&session=true">'.get_lang('Download').'</a>';
} else {
// Display forms especial export
if (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
@ -168,7 +167,7 @@ function form_special_export() {
function create_zip(){
$path = '';
if(empty($path)) { $path='/'; }
$remove_dir = ($path!='/') ? substr($path,0,strlen($path) - strlen(basename($path))) : '/';
$remove_dir = ($path!='/') ? substr($path,0,strlen($path) - strlen(basename($path))) : '/';
$sys_archive_path = api_get_path(SYS_ARCHIVE_PATH);
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$temp_zip_dir = $sys_archive_path."temp";
@ -211,11 +210,11 @@ function fullexportspecial(){
$list_course = array();
$zip_folder = new PclZip($FileZip['TEMP_FILE_ZIP']);
$list_course = Database::get_course_list();
$tbl_document = Database::get_course_table(TABLE_DOCUMENT);
$tbl_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
if (count($list_course) >0 ) {
foreach($list_course as $_course) {
if($FileZip['PATH'] == '/') {
@ -223,8 +222,8 @@ function fullexportspecial(){
} else {
$querypath = $FileZip['PATH'];
}
$course_id = $_course['real_id'];
$course_id = $_course['real_id'];
//Add tem to the zip file course
$sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
WHERE props.tool='".TOOL_DOCUMENT."'

@ -22,7 +22,6 @@ $interbreadcrumb[] = array ('url' => 'specific_fields.php', 'name' => get_lang('
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'sortable_table.class.php';
include_once $libpath.'specific_fields_manager.lib.php';
// Create an add-field box
@ -69,7 +68,7 @@ if(!empty($_GET['message'])) {
echo '<div class="actions">';
$form->display();
echo '</div>';
if (!empty($extra_fields)) {
if (!empty($extra_fields)) {
$table->display();
}

@ -14,9 +14,7 @@ $this_section=SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
$tool_name = get_lang('Statistics');
Display::display_header($tool_name);
Display::display_footer();
Display::display_footer();

@ -10,7 +10,6 @@ $language_file = array('admin', 'registration');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'diagnoser.lib.php';
$this_section = SECTION_PLATFORM_ADMIN;
// User permissions
@ -19,4 +18,4 @@ $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAd
Display :: display_header(get_lang('SystemStatus'));
$diag = new Diagnoser();
$diag->show_html();
Display :: display_footer();
Display :: display_footer();

@ -24,7 +24,6 @@ $cidReset = true;
// Including some necessary library files.
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'TeacherTimeReport.php';
// Setting the section (for the tabs).
$this_section = SECTION_PLATFORM_ADMIN;
@ -70,9 +69,9 @@ if (!empty($selectedCourse)) {
$course = api_get_course_info($selectedCourse);
$reportTitle = sprintf(get_lang('TimeReportForCourseX'), $course['title']);
$teachers = CourseManager::get_teacher_list_from_course_code($selectedCourse);
foreach ($teachers as $teacher) {
$totalTime = UserManager::getExpendedTimeInCourses(
$teacher['user_id'],
@ -192,7 +191,7 @@ if (!empty($selectedTeacher)) {
$withFilter = true;
$teacher = api_get_user_info();
$teacherData = array(
'userId' => $teacher['user_id'],
'lastname' => $teacher['lastname'],
@ -277,8 +276,6 @@ if (empty($selectedCourse) && empty($selectedSession) && empty($selectedTeacher)
$timeReport->sortData($withFilter);
if (isset($_GET['export'])) {
require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
$dataToExport = $timeReport->prepareDataToExport($withFilter);
$fileName = get_lang('TeacherTimeReport') . ' ' . api_get_local_time();
@ -304,7 +301,7 @@ if (isset($_GET['export'])) {
), array(
$reportSubTitle
), array());
Export::export_table_xls_html($dataToExport, $fileName);
break;
}

@ -15,8 +15,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
// Database table definitions
$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
@ -136,4 +134,4 @@ if ($form->validate()) {
}
Display :: display_header($tool_name);
$form->display();
Display :: display_footer();
Display :: display_footer();

@ -11,7 +11,6 @@ $language_file = array('registration', 'index', 'tracking', 'exercice', 'admin',
$cidReset = true;
require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';

@ -13,8 +13,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$tool_name = get_lang('Export');

@ -64,7 +64,6 @@ function save_data($classes)
);
}
}
$count++;
}
}
@ -78,10 +77,7 @@ $language_file = array('admin', 'registration');
// Resetting the course id.
$cidReset = true;
// Including some necessary dokeos files.
include '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
// Setting the section (for the tabs).
$this_section = SECTION_PLATFORM_ADMIN;

@ -130,9 +130,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
$tool_name = get_lang('AddUsersToAClass') . ' CSV';
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));

@ -12,7 +12,6 @@
session_cache_limiter('nocache');
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
// IMPORTANT to avoid caching of documents
header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');

@ -14,8 +14,6 @@ $language_file = array('registration', 'messages', 'userInfo');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
if (api_get_setting('allow_social_tool') == 'true') {
$this_section = SECTION_SOCIAL;
} else {

@ -27,8 +27,7 @@ if((!$is_allowed_in_course || !$is_courseMember) && !api_is_allowed_to_edit()) {
api_not_allowed(true);//print headers/footers
}
if (api_is_allowed_to_edit()) {
require_once api_get_path(LIBRARY_PATH) . "blog.lib.php";
if (api_is_allowed_to_edit()) {
$nameTools = get_lang("blog_management");
// showing the header if we are not in the learning path, if we are in

@ -17,8 +17,6 @@ session_cache_limiter('public');
require_once '../inc/global.inc.php';
$this_section=SECTION_COURSES;
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
// IMPORTANT to avoid caching of documents
header('Expires: Wed, 01 Jan 1990 00:00:00 GMT');
header('Cache-Control: public');
@ -46,7 +44,7 @@ if (is_dir($full_file_name)) {
//create the path
$document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
//redirect
header('Location: '.$document_explorer);
header('Location: '.$document_explorer);
}
$tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
@ -55,12 +53,12 @@ $course_id = api_get_course_int_id();
// launch event
event_download($doc_url);
$sql = 'SELECT filename FROM '.$tbl_blogs_attachment.'
$sql = 'SELECT filename FROM '.$tbl_blogs_attachment.'
WHERE c_id = '.$course_id.' AND path LIKE BINARY "'.Database::escape_string($doc_url).'"';
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$row = Database::fetch_array($result);
if (Security::check_abs_path($full_file_name, api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/')) {
if (Security::check_abs_path($full_file_name, api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/')) {
DocumentManager::file_send_for_download($full_file_name, TRUE, $row['filename']);
}
}

@ -12,8 +12,6 @@ define('FRAME', 'chat');
$language_file = array('chat');
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$course = $_GET['cidReq'];
$session_id = api_get_session_id();

@ -12,7 +12,6 @@ define('FRAME', 'message');
$language_file = array('chat');
require_once '../inc/global.inc.php';
require_once api_get_path(SYS_PATH).'vendor/autoload.php';
require_once api_get_path(SYS_CODE_PATH).'chat/chat_functions.lib.php';
$userId = api_get_user_id();
@ -44,9 +43,6 @@ if (empty($course) || empty($userId)) {
exit;
}
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
/* Constants and variables */
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$sent = isset($_REQUEST['sent']) ? $_REQUEST['sent'] : null;

@ -9,7 +9,7 @@
* @package chamilo.chat
*/
require_once api_get_path(SYS_PATH).'vendor/autoload.php';
require_once '../inc/global.inc.php';
if (!defined('FRAME')) {
exit();

@ -16,8 +16,6 @@ use \ChamiloSession as Session;
$language_file = array('admin', 'course_info');
require_once '../inc/global.inc.php';
require_once '../gradebook/lib/be/gradebookitem.class.php';
require_once '../gradebook/lib/be/category.class.php';
$this_section = SECTION_COURSES;
$current_course_tool = TOOL_COURSE_MAINTENANCE;
api_protect_course_script(true);

@ -11,8 +11,6 @@
require_once '../inc/global.inc.php';
$this_section = SECTION_COURSES;
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
if (isset($_GET['session']) && $_GET['session']) {
$archive_path = api_get_path(SYS_ARCHIVE_PATH).'temp/';
$_cid = true;

@ -6,12 +6,11 @@
* @license see /license.txt
* @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
*/
require_once dirname(__FILE__) . '/../../vendor/autoload.php';
$controller = CourseNoticeController::instance();
KeyAuth::enable_services($controller);
$language_file = array('announcements', 'document', 'link', 'agenda', 'admin');
require_once dirname(__FILE__) . '/../inc/global.inc.php';
$controller = CourseNoticeController::instance();
KeyAuth::enable_services($controller);
$controller->run();

@ -1,8 +0,0 @@
<?php
/*
* Blank age used to test the performance impact of global. So that we can
* compare other pages against a benchmark.
*/
require_once dirname(__FILE__) . '/../../main/inc/global.inc.php';

@ -12,13 +12,8 @@ $language_file = array('course_description', 'userInfo', 'admin');
// including files
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
require_once api_get_path(LIBRARY_PATH).'app_view.php';
require_once 'thematic_controller.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
// current section
$this_section = SECTION_COURSES;

@ -20,10 +20,6 @@ require_once 'wiki.class.php';
require_once 'Thematic.class.php';
require_once 'Work.class.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
define('FILE_SKIP', 1);
define('FILE_RENAME', 2);
define('FILE_OVERWRITE', 3);

@ -15,7 +15,6 @@ $current_course_tool = TOOL_COURSE_MAINTENANCE;
api_protect_course_script(true);
// Including additional libraries
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once 'classes/CourseBuilder.class.php';
require_once 'classes/CourseRestorer.class.php';
require_once 'classes/CourseSelectForm.class.php';

@ -18,9 +18,6 @@ $current_course_tool = TOOL_COURSE_MAINTENANCE;
api_protect_global_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
require_once 'classes/CourseBuilder.class.php';
require_once 'classes/CourseRestorer.class.php';
require_once 'classes/CourseSelectForm.class.php';

@ -17,9 +17,6 @@ $current_course_tool = TOOL_COURSE_MAINTENANCE;
api_protect_course_script(true, true);
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'xajax/xajax.inc.php';
require_once 'classes/CourseBuilder.class.php';
require_once 'classes/CourseRestorer.class.php';
require_once 'classes/CourseSelectForm.class.php';

@ -45,7 +45,6 @@ $nameTools = get_lang('CreateBackup');
Display::display_header($nameTools);
// Include additional libraries
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once 'classes/CourseBuilder.class.php';
require_once 'classes/CourseArchiver.class.php';
require_once 'classes/CourseRestorer.class.php';

@ -40,7 +40,6 @@ $nameTools = get_lang('ImportBackup');
Display::display_header($nameTools);
// Include additional libraries
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once 'classes/CourseBuilder.class.php';
require_once 'classes/CourseArchiver.class.php';
require_once 'classes/CourseRestorer.class.php';

@ -2,7 +2,6 @@
/* For licensing terms, see /license.txt */
require_once __DIR__.'/../inc/global.inc.php';
require_once __DIR__.'/../../vendor/autoload.php';
/**
* Checks total platform size

@ -1380,7 +1380,6 @@ if ($is_allowed_to_edit ||
// Upload the file
if (!empty($_FILES['template_image']['name'])) {
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$upload_ok = process_uploaded_file($_FILES['template_image']);
if ($upload_ok) {

@ -407,7 +407,6 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
}
}
$document_to_move = DocumentManager::get_document_data_by_id($_POST['move_file'], api_get_course_id());
require_once $lib_path.'fileManage.lib.php';
// Security fix: make sure they can't move files that are not in the document table
if (!empty($document_to_move)) {
@ -473,7 +472,6 @@ if($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folde
api_not_allowed();
}
}
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
if (DocumentManager::delete_document($_course, $_GET['delete'], $base_work_dir)) {
if ( isset($_GET['delete_certificate_id']) && $_GET['delete_certificate_id'] == strval(intval($_GET['delete_certificate_id']))) {
$default_certificate_id = $_GET['delete_certificate_id'];

@ -69,8 +69,6 @@ $_SESSION['whereami'] = 'document/create';
$this_section = SECTION_COURSES;
$lib_path = api_get_path(LIBRARY_PATH);
require_once $lib_path.'fileManage.lib.php';
require_once $lib_path.'fileUpload.lib.php';
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
$course_info = api_get_course_info();

@ -29,11 +29,10 @@ Use Model\Course;
* @license see /license.txt
* @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
*/
require_once __DIR__ . '/../../vendor/autoload.php';
KeyAuth::enable();
require_once __DIR__ . '/../inc/global.inc.php';
KeyAuth::enable();
$has_access = api_protect_course_script();
if (!$has_access) {
exit;

@ -20,7 +20,6 @@ HotPotGC($_configuration['root_sys'],1,1);
function HotPotGC($root_sys,$flag,$userID) {
// flag[0,1] - print or delete the HotPotatoes temp files (.t.html)
$documentPath = $root_sys."courses";
require_once(api_get_path(LIBRARY_PATH)."fileManage.lib.php");
HotPotGCt($documentPath,$flag,$userID);
}
/**

@ -86,10 +86,6 @@ $nameTools=get_lang('Exercice');
$interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
Display::display_header($nameTools,"Exercise");
/*
Action handling
*/
require_once '../inc/global.inc.php';
if (isset($_POST['ok'])) {
$message = get_lang('TestLimitsAdded');
Display::display_normal_message($message);

@ -219,7 +219,6 @@ class CalculatedAnswer extends Question
$auxAnswer = str_replace($blankItem, $randomValue, $auxAnswer);
$auxFormula = str_replace($blankItem, $randomValue, $auxFormula);
}
require_once(api_get_path(LIBRARY_PATH).'evalmath.class.php');
$math = new EvalMath();
$result = $math->evaluate($auxFormula);
$result = number_format($result, 2, ".", "");

@ -2192,7 +2192,6 @@ class Exercise
$nano = null;
if ($answerType == ORAL_EXPRESSION) {
require_once api_get_path(LIBRARY_PATH).'nanogong.lib.php';
$exe_info = get_exercise_results_by_attempt($exeId);
$exe_info = isset($exe_info[$exeId]) ? $exe_info[$exeId] : null;

@ -15,8 +15,6 @@ $language_file ='exercice';
require_once '../inc/global.inc.php';
// Including additional libraries.
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php';
require_once 'hotpotatoes.lib.php';

@ -61,10 +61,6 @@ function ch_qti2_display_form()
function ch_qti2_import_file($array_file)
{
$unzip = 0;
$lib_path = api_get_path(LIBRARY_PATH);
require_once $lib_path.'fileUpload.lib.php';
require_once $lib_path.'fileManage.lib.php';
$process = process_uploaded_file($array_file, false);
if (preg_match('/\.zip$/i', $array_file['name'])) {

@ -6,7 +6,6 @@
* @author Istvan Mandak
*/
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php';
$_course = api_get_course_info();

@ -24,9 +24,6 @@ $language_file = 'exercice';
$nameTools = "";
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
require_once 'question.class.php';
require_once 'testcategory.class.php';
$this_section = SECTION_COURSES;

@ -56,9 +56,6 @@ $this_section = SECTION_COURSES;
// Notification for unauthorized people.
api_protect_course_script(true);
// Including additional library scripts.
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
$nameTools = get_lang('Forums');
$_course = api_get_course_info();
$sessionId = api_get_session_id();

@ -14,9 +14,6 @@ require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/fe/displaygradebook.php';
require_once 'lib/fe/evalform.class.php';
require_once 'lib/fe/dataform.class.php';
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
require_once 'lib/results_data_generator.class.php';
require_once 'lib/fe/resulttable.class.php';
require_once 'lib/fe/exportgradebook.php';

@ -5,12 +5,5 @@
* @author Bert Steppé
* @package chamilo.gradebook
*/
/**
* Code
*/
define ('LIMIT', 1000);
require_once 'be/gradebookitem.class.php';
require_once 'be/category.class.php';
require_once 'be/evaluation.class.php';
require_once 'be/result.class.php';
require_once 'be/linkfactory.class.php';

@ -1,10 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
require_once api_get_path(LIBRARY_PATH).'gradebook.lib.php';
require_once api_get_path(LIBRARY_PATH).'grade_model.lib.php';
/**
* Class Category
* Defines a gradebook Category object

@ -1,17 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
require_once 'gradebookitem.class.php';
require_once 'abstractlink.class.php';
require_once 'exerciselink.class.php';
require_once 'evallink.class.php';
require_once 'dropboxlink.class.php';
require_once 'studentpublicationlink.class.php';
require_once 'learnpathlink.class.php';
require_once 'forumthreadlink.class.php';
require_once 'attendancelink.class.php';
require_once 'surveylink.class.php';
/**
* Class LinkFactory
* Factory for link objects

@ -11,9 +11,6 @@ $language_file = 'gradebook';
//$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
api_block_anonymous_users();
if (isset($_GET['userid'])) {

@ -17,7 +17,6 @@ if (api_is_anonymous()) {
// Course Chat
if ($action == 'preview') {
require_once api_get_path(SYS_PATH).'vendor/autoload.php';
require_once api_get_path(SYS_CODE_PATH).'chat/chat_functions.lib.php';
echo saveMessage(

@ -179,7 +179,6 @@ switch ($action) {
case 'search_exercise_by_course':
if (api_is_platform_admin()) {
$course = api_get_course_info_by_id($_GET['course_id']);
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
$session_id = (!empty($_GET['session_id'])) ? intval($_GET['session_id']) : 0 ;
$exercises = get_all_exercises($course, $session_id, false, $_GET['q'], true, 3);

@ -4,7 +4,6 @@
* Responses to AJAX calls for the document upload
*/
require_once '../global.inc.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
$action = $_REQUEST['a'];

@ -114,8 +114,6 @@ switch ($action) {
exit;
}
require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
foreach (array('video', 'audio') as $type) {
if (isset($_FILES["${type}-blob"])) {
$fileName = $_POST["${type}-filename"];

@ -274,7 +274,6 @@ switch ($action) {
);
break;
case 'get_exercise_results':
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
$exercise_id = $_REQUEST['exerciseId'];
if (isset($_GET['filter_by_user']) && !empty($_GET['filter_by_user'])) {
@ -284,7 +283,6 @@ switch ($action) {
$count = get_count_exam_results($exercise_id, $whereCondition);
break;
case 'get_hotpotatoes_exercise_results':
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
$hotpot_path = $_REQUEST['path'];
$count = get_count_exam_hotpotatoes_results($hotpot_path);
break;
@ -1327,7 +1325,6 @@ if (in_array($action, $allowed_actions)) {
if ($operation && $operation == 'excel') {
$j = 1;
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$array = array();
if (empty($column_names)) {
@ -1348,7 +1345,6 @@ if (in_array($action, $allowed_actions)) {
case 'xls':
//TODO add date if exists
$file_name = (!empty($action)) ? $action : 'company_report';
require_once api_get_path(LIBRARY_PATH).'browser/Browser.php';
$browser = new Browser();
if ($browser->getPlatform() == Browser::PLATFORM_WINDOWS) {
Export::export_table_xls_html($array, $file_name, 'ISO-8859-15');

@ -8,22 +8,21 @@ $language_file = array('exercice','document');
require_once '../global.inc.php';
//@todo for some reason nanogong doesn't like this variables
//@todo for some reason nanogong doesn't like this variables
//api_protect_course_script(true);
$action = $_REQUEST['a'];
require_once api_get_path(LIBRARY_PATH).'nanogong.lib.php';
unset($_REQUEST['a']);
$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
//Fix in order to add the exe_id
//Fix in order to add the exe_id
if (isset($_REQUEST['from_htaccess'])) {
if (isset($_REQUEST['file'])) {
$fileinfo = pathinfo($_REQUEST['file']);
$items = explode('-', $fileinfo['filename']);
$_REQUEST['exe_id'] = $items[5];
$_REQUEST['exe_id'] = $items[5];
}
}
$nano = new Nanogong($_REQUEST);
@ -33,29 +32,29 @@ if (isset($_REQUEST['is_nano'])) {
$is_nano = true;
}
switch ($action) {
case 'get_file':
switch ($action) {
case 'get_file':
if ($nano->get_param_value('user_id') == api_get_user_id() || api_is_allowed_to_edit()) {
$file_path = $nano->load_filename_if_exists();
//$file_path = '/var/www/rocio/courses/GREAT123/exercises/0/2/5/1/1-0-1-2-5-38.mp3';
if ($file_path) {
$info = pathinfo($file_path);
//$file_path = '/var/www/rocio/courses/GREAT123/exercises/0/2/5/1/1-0-1-2-5-38.mp3';
if ($file_path) {
$info = pathinfo($file_path);
$user_info = api_get_user_info($nano->params['user_id']);
$name = get_lang('Quiz').'-'.$user_info['firstname'].'-'.$user_info['lastname'].'.'.$info['extension'];
$download = true;
if (isset($_REQUEST['download']) && $_REQUEST['download'] == 0) {
$download = false;
}
}
DocumentManager::file_send_for_download($file_path, $download);
exit;
}
}
}
break;
case 'show_audio':
case 'show_audio':
if (!$is_nano) {
echo $nano->return_js($_REQUEST);
}
echo $nano->show_audio_file($is_nano);
echo $nano->show_audio_file($is_nano);
break;
case 'delete':
$return = $nano->delete_files();
@ -68,15 +67,15 @@ switch ($action) {
break;
case 'show_form':
api_protect_course_script(true);
Display::display_reduced_header();
echo $nano->return_js($_REQUEST);
Display::display_reduced_header();
echo $nano->return_js($_REQUEST);
echo $nano->return_form();
break;
case 'save_file':
break;
case 'save_file':
//User access same as upload.php
$return = $nano->upload_file($is_nano);
if ($is_nano) {
//nano looks for numbers
if ($return == 1) {
@ -87,7 +86,7 @@ switch ($action) {
//Display::display_warning_message(get_lang('UplUnableToSaveFileFilteredExtension'));
}
} else {
Display::display_reduced_header();
Display::display_reduced_header();
echo $nano->return_js($_REQUEST);
//normal form
if ($return == 1) {
@ -95,11 +94,11 @@ switch ($action) {
$message = Display::return_message(get_lang('UplUploadSucceeded'), 'confirm');
} else {
$message = Display::return_message(get_lang('UplUnableToSaveFileFilteredExtension'), 'warning');
}
}
echo $nano->return_form($message);
}
break;
default:
echo '';
}
exit;
exit;

@ -6,9 +6,6 @@
require_once '../global.inc.php';
require_once api_get_path(LIBRARY_PATH).'skill.lib.php';
require_once api_get_path(LIBRARY_PATH).'gradebook.lib.php';
$action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
if (api_get_setting('allow_skills_tool') != 'true') {
@ -174,7 +171,7 @@ switch ($action) {
$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
$load_user_data = isset($_REQUEST['load_user_data']) ? $_REQUEST['load_user_data'] : null;
$skills = $skill->get_children($id, $load_user_data);
$return = array();
foreach ($skills as $skill) {
if (isset($skill['data']) && !empty($skill['data'])) {
@ -189,7 +186,7 @@ switch ($action) {
if (empty($return)) {
$success = false;
}
$result = array (
'success' => $success,
'data' => $return
@ -212,21 +209,21 @@ switch ($action) {
case 'profile_matches':
$skill_rel_user = new SkillRelUser();
$skills = $_REQUEST['skill_id'];
$total_skills_to_search = $skills;
$users = $skill_rel_user->get_user_by_skills($skills);
$user_list = array();
$count_skills = count($skills);
if (!empty($users)) {
foreach ($users as $user) {
$user_info = api_get_user_info($user['user_id']);
$user_list[$user['user_id']]['user'] = $user_info;
$my_user_skills = $skill_rel_user->get_user_skills($user['user_id']);
$user_skill_list = array();
foreach ($my_user_skills as $skill_item) {
$user_skill_list[] = $skill_item['skill_id'];
@ -234,7 +231,7 @@ switch ($action) {
$user_skills = array();
$found_counts = 0;
foreach ($skills as $skill_id) {
$found = false;
if (in_array($skill_id, $user_skill_list)) {
@ -243,7 +240,7 @@ switch ($action) {
$user_skills[$skill_id] = array('skill_id' => $skill_id, 'found' => $found);
}
}
foreach ($my_user_skills as $my_skill) {
if (!isset($user_skills[$my_skill['skill_id']])) {
$user_skills[$my_skill['skill_id']] = array(
@ -256,7 +253,7 @@ switch ($action) {
$user_list[$user['user_id']]['skills'] = $user_skills;
$user_list[$user['user_id']]['total_found_skills'] = $found_counts;
}
$ordered_user_list = array();
foreach ($user_list as $user_id => $user_data) {
$ordered_user_list[$user_data['total_found_skills']][] = $user_data;
@ -266,11 +263,11 @@ switch ($action) {
krsort($ordered_user_list);
}
}
Display::display_no_header();
Display::$global_template->assign('order_user_list', $ordered_user_list);
Display::$global_template->assign('total_search_skills', $count_skills);
$skill_list = array();
if (!empty($total_skills_to_search)) {
@ -308,7 +305,7 @@ switch ($action) {
$profileId = isset($_REQUEST['profile_id']) ? intval($_REQUEST['profile_id']) : null;
$profile = $skillRelProfile->getProfileInfo($profileId);
echo json_encode($profile);
break;
break;
case 'save_profile':
if (api_is_platform_admin() || api_is_drh()) {
$skill_profile = new SkillProfile();

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save