Removing add_course.lib.inc.php files functions moved to course.lib.php

skala
Julio Montoya 13 years ago
parent c8c18b216d
commit 7dbb273294
  1. 2
      main/admin/access_url_add_courses_to_url.php
  2. 3
      main/admin/access_url_add_users_to_url.php
  3. 2
      main/admin/access_url_check_user_session.php
  4. 2
      main/admin/access_url_edit.php
  5. 2
      main/admin/access_url_edit_courses_to_url.php
  6. 6
      main/admin/access_url_edit_users_to_url.php
  7. 2
      main/admin/access_urls.php
  8. 2
      main/admin/add_courses_to_session.php
  9. 2
      main/admin/add_courses_to_usergroup.php
  10. 2
      main/admin/add_many_session_to_category.php
  11. 4
      main/admin/add_sessions_to_promotion.php
  12. 2
      main/admin/add_sessions_to_usergroup.php
  13. 1
      main/admin/add_users_to_group.php
  14. 1
      main/admin/add_users_to_session.php
  15. 1
      main/admin/add_users_to_usergroup.php
  16. 2
      main/admin/career_dashboard.php
  17. 1
      main/admin/careers.php
  18. 1
      main/admin/class_user_import.php
  19. 1
      main/admin/configure_inscription.php
  20. 2
      main/admin/course_add.php
  21. 4
      main/admin/course_category.php
  22. 4
      main/admin/course_edit.php
  23. 3
      main/admin/course_import.php
  24. 12
      main/admin/course_request_accepted.php
  25. 11
      main/admin/course_request_edit.php
  26. 17
      main/admin/course_request_rejected.php
  27. 13
      main/admin/course_request_review.php
  28. 5
      main/admin/course_user_import.php
  29. 3
      main/admin/dashboard_add_courses_to_user.php
  30. 1
      main/admin/dashboard_add_sessions_to_user.php
  31. 1
      main/admin/dashboard_add_users_to_user.php
  32. 1
      main/admin/grade_models.php
  33. 1
      main/admin/group_add.php
  34. 3
      main/admin/group_edit.php
  35. 2
      main/admin/group_list.php
  36. 4
      main/admin/inactive_user_list.php
  37. 1
      main/admin/languages.php
  38. 2
      main/admin/session_category_add.php
  39. 3
      main/admin/session_export.php
  40. 5
      main/admin/session_import.php
  41. 3
      main/admin/session_user_import.php
  42. 3
      main/admin/settings.lib.php
  43. 1
      main/admin/settings.php
  44. 3
      main/admin/skills_import.php
  45. 2
      main/admin/statistics.php
  46. 1
      main/admin/statistics/index.php
  47. 2
      main/admin/user_add.php
  48. 2
      main/admin/user_edit.php
  49. 8
      main/admin/user_import.php
  50. 1
      main/admin/usergroup_export.php
  51. 6
      main/admin/usergroup_import.php
  52. 3
      main/admin/usergroup_user_import.php
  53. 1
      main/course_info/infocours.php
  54. 2
      main/course_progress/index.php
  55. 2
      main/create_course/add_course.php
  56. 1
      main/document/create_audio.php
  57. 9
      main/exercice/exercise.lib.php
  58. 3
      main/exercice/exercise_history.php
  59. 1
      main/exercice/exercise_reminder.php
  60. 2
      main/exercice/exercise_report.php
  61. 1
      main/exercice/exercise_result.php
  62. 2
      main/exercice/exercise_show.php
  63. 1
      main/glossary/glossary_ajax_request.php
  64. 2
      main/glossary/index.php
  65. 2893
      main/inc/lib/add_course.lib.inc.php
  66. 5
      main/inc/lib/autoload.class.php
  67. 1176
      main/inc/lib/course.lib.php
  68. 4
      main/inc/lib/course_request.lib.php
  69. 1
      main/inc/lib/template.lib.php
  70. 23
      main/inc/lib/text.lib.php
  71. 1708
      main/install/install.lib.php
  72. 2
      main/install/install_db.inc.php
  73. 1
      main/install/update-db-1.8.8-1.9.0.inc.php
  74. 2
      main/survey/survey.lib.php
  75. 4
      main/webservices/cm_webservice_course.php
  76. 7
      main/webservices/registration.soap.php
  77. 4
      main/webservices/webservice_course.php
  78. 1
      tests/main/announcements/announcements.inc.test.php
  79. 1
      tests/main/inc/lib/add_course.lib.inc.test.php

@ -14,8 +14,8 @@ $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');
exit;

@ -12,9 +12,8 @@
$language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
$this_section=SECTION_PLATFORM_ADMIN;
$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;

@ -18,8 +18,6 @@ if (!api_get_multiple_access_url()) {
exit;
}
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
// Create the form
$form = new FormValidator('add_url');

@ -13,8 +13,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'));

@ -13,19 +13,17 @@ $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'));
$xajax -> registerFunction (array('search_users', 'Accessurledituserstourl', 'search_users'));
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
// Access restrictions
api_protect_global_admin_script();
if (!api_get_multiple_access_url()) {
header('Location: index.php');
exit;

@ -23,8 +23,6 @@ $interbreadcrumb[] = array ("url" => 'index.php', 'name' => get_lang('PlatformAd
$tool_name = get_lang('MultipleAccessURLs');
Display :: display_header($tool_name);
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
$my_user_url_list = api_get_access_url_from_user(api_get_user_id());
$current_access_url_id = api_get_current_access_url_id();
$url_list = UrlManager::get_url_data();

@ -15,8 +15,6 @@ require_once '../inc/global.inc.php';
// including additonal libraries
require_once api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php';
$id_session = intval($_GET['id_session']);
SessionManager::protect_session_edit($id_session);

@ -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();

@ -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();

@ -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,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;

@ -12,7 +12,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;

@ -6,8 +6,6 @@ $language_file = array('courses', 'index', 'admin');
$cidReset = true;
require_once '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'career.lib.php';
require_once $libpath.'promotion.lib.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';

@ -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;

@ -139,7 +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';

@ -13,7 +13,6 @@ require_once '../inc/global.inc.php';
api_protect_admin_script();
require_once api_get_path(CONFIGURATION_PATH).'profile.conf.php';
require_once api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php';
// Load terms & conditions from the current lang
if (get_setting('allow_terms_conditions') == 'true') {

@ -16,8 +16,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$tool_name = get_lang('AddCourse');
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'course_list.php', 'name' => get_lang('CourseList'));

@ -290,7 +290,7 @@ function addNode($code,$name,$canHaveCourses,$parent_id)
$tree_pos=$row['maxTreePos']+1;
$code = generate_course_code($code);
$code = CourseManager::generate_course_code($code);
Database::query("INSERT INTO $tbl_category(name,code,parent_id,tree_pos,children_count,auth_course_child) VALUES('$name','$code',".(empty($parent_id)?"NULL":"'$parent_id'").",'$tree_pos','0','$canHaveCourses')");
updateFils($parent_id);
@ -313,7 +313,7 @@ function editNode($code,$name,$canHaveCourses,$old_code)
return false;
}
}
$code = generate_course_code($code);
$code = CourseManager::generate_course_code($code);
Database::query("UPDATE $tbl_category SET name='$name', code='$code',auth_course_child='$canHaveCourses' WHERE code='$old_code'");
$sql = "UPDATE $tbl_course SET category_code = '$code' WHERE category_code = '$old_code' ";
Database::query($sql);

@ -12,8 +12,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
@ -198,7 +196,7 @@ if ($form->validate()) {
$dbName = $_POST['dbName'];
$course_code = $course['code'];
$visual_code = $course['visual_code'];
$visual_code = generate_course_code($visual_code);
$visual_code = CourseManager::generate_course_code($visual_code);
// Check if the visual code is already used by *another* course
$visual_code_is_used = false;

@ -153,12 +153,11 @@ $language_file = array('admin', 'registration','create_course', 'document');
$cidReset = true;
require '../inc/global.inc.php';
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).'import.lib.php';
$defined_auth_sources[] = PLATFORM_AUTH_SOURCE;

@ -18,22 +18,12 @@ $language_file = array('admin', 'create_course');
$cidReset = true;
require '../inc/global.inc.php';
require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
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';

@ -19,17 +19,6 @@ $tool_name = get_lang('CourseRequestEdit');
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';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// Including a configuration file.
require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// Including 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';

@ -24,17 +24,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
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';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// Including a configuration file.
require api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// Including 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';
@ -48,9 +37,9 @@ $keyword = Database::escape_string(trim($_GET['keyword']));
if ($course_validation_feature) {
/**
* Acceptance and creation of the requested course.
*/
/**
* Acceptance and creation of the requested course.
*/
if (!empty($accept_course_request)) {
$course_request_code = CourseRequestManager::get_course_request_code($accept_course_request);
$course_id = CourseRequestManager::accept_course_request($accept_course_request);

@ -16,22 +16,11 @@
$language_file = array('admin', 'create_course');
$cidReset = true;
require '../inc/global.inc.php';
require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
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';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// Including a configuration file.
require_once api_get_path(CONFIGURATION_PATH).'add_course.conf.php';
// Including additional libraries.
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
// The delete action should be deactivated in this page.
// Better reject the target request, after that you can delete it.
define(DELETE_ACTION_ENABLED, false);

@ -155,12 +155,7 @@ $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'));
set_time_limit(0);

@ -13,11 +13,8 @@ $cidReset=true;
// including some necessary dokeos files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
global $_configuration;
// create an ajax object
$xajax = new xajax();
$xajax -> registerFunction ('search_courses');

@ -13,7 +13,6 @@ $cidReset=true;
// including some necessary dokeos files
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
global $_configuration;
// create an ajax object

@ -13,7 +13,6 @@ $cidReset=true;
// including some necessary dokeos files
require_once '../inc/global.inc.php';
require_once '../inc/lib/xajax/xajax.inc.php';
global $_configuration;

@ -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;

@ -12,7 +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

@ -12,10 +12,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'fileManage.lib.php';
require_once $libpath.'fileUpload.lib.php';
require_once $libpath.'group_portal_manager.lib.php';
require_once $libpath.'mail.lib.inc.php';
$group_id = isset($_GET['id']) ? intval($_GET['id']) : intval($_POST['id']);
$tool_name = get_lang('GroupEdit');

@ -10,8 +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';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.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;

@ -23,7 +23,6 @@ $cidReset = true;
// include global script
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
require_once 'sub_language.class.php';
$this_section = SECTION_PLATFORM_ADMIN;

@ -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');

@ -8,13 +8,12 @@ $language_file = 'admin';
$cidReset = true;
include '../inc/global.inc.php';
require_once '../inc/global.inc.php';
// setting the section (for the tabs)
$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;

@ -8,14 +8,11 @@
$language_file = array('admin', 'registration');
$cidReset = true;
require '../inc/global.inc.php';
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).'mail.lib.inc.php';
$form_sent = 0;
$error_message = ''; // Avoid conflict with the global variable $error_msg (array type) in add_course.conf.php.
if (isset($_GET['action']) && $_GET['action'] == 'show_message') {

@ -13,9 +13,6 @@ require '../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).'mail.lib.inc.php';
$form_sent = 0;
$error_message = ''; // Avoid conflict with the global variable $error_msg (array type) in add_course.conf.php.
if (isset($_GET['action']) && $_GET['action'] == 'show_message') {

@ -600,8 +600,7 @@ function handle_search() {
$form->display();
echo '</div>';
if ($search_enabled == 'true') {
require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
if ($search_enabled == 'true') {
$xapian_path = api_get_path(SYS_PATH).'searchdb';
/*

@ -27,7 +27,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';

@ -12,9 +12,6 @@ $language_file = array ('admin', 'registration');
$cidReset = true;
require '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
function validate_data($skills) {
$errors = array();

@ -14,8 +14,6 @@ $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);

@ -133,5 +133,4 @@ switch ($_GET['report']) {
Statistics::print_stats(get_lang('CountFriends'), $friends);
break;
}
Display::display_footer();

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

@ -68,9 +68,7 @@ function show_image(image,width,height) {
</script>';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'fileManage.lib.php';
require_once $libpath.'fileUpload.lib.php';
require_once $libpath.'mail.lib.inc.php';
$noPHP_SELF = true;
$tool_name = get_lang('ModifyUserInfo');

@ -10,14 +10,10 @@
* Validate the imported data.
*/
$language_file = array ('admin', 'registration');
$language_file = array('admin', 'registration');
$cidReset = true;
require '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.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';
require_once '../inc/global.inc.php';
// Set this option to true to enforce strict purification for usenames.
$purification_option_for_usernames = false;

@ -15,7 +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';
$tool_name = get_lang('Export');

@ -55,10 +55,8 @@ $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';
// Including some necessary dokeos files
require_once '../inc/global.inc.php';
// Setting the section (for the tabs).
$this_section = SECTION_PLATFORM_ADMIN;

@ -166,9 +166,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'));

@ -25,7 +25,6 @@ $this_section = SECTION_COURSES;
$nameTools = get_lang('ModifInfo');
/* Libraries */
require_once api_get_path(INCLUDE_PATH).'conf/course_info.conf.php';
require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';

@ -14,13 +14,11 @@ $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).'thematic.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;

@ -202,7 +202,7 @@ if ($form->validate()) {
}
if ($wanted_code == '') {
$wanted_code = generate_course_code(api_substr($title, 0, CourseManager::MAX_COURSE_LENGTH_CODE));
$wanted_code = CourseManager::generate_course_code(api_substr($title, 0, CourseManager::MAX_COURSE_LENGTH_CODE));
}
// Check whether the requested course code has already been occupied.

@ -22,7 +22,6 @@ $_SESSION['whereami'] = 'document/createaudio';
$this_section = SECTION_COURSES;
require_once 'document.inc.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
$nameTools = get_lang('CreateAudio');

@ -136,10 +136,8 @@ function showQuestion($questionId, $only_questions = false, $origin = false, $cu
$s .= '</td></tr>';
} elseif ($answerType == ORAL_EXPRESSION) {
//Add nanog
if (api_get_setting('enable_nanogong') == 'true') {
require_once api_get_path(LIBRARY_PATH).'nanogong.lib.php';
if (api_get_setting('enable_nanogong') == 'true') {
//@todo pass this as a parameter
global $exercise_stat_info, $exerciseId, $exe_id;
@ -507,8 +505,7 @@ function showQuestion($questionId, $only_questions = false, $origin = false, $cu
} elseif ($answerType == HOT_SPOT || $answerType == HOT_SPOT_DELINEATION) {
// Question is a HOT_SPOT
//checking document/images visibility
if (api_is_platform_admin() || api_is_course_admin()) {
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
if (api_is_platform_admin() || api_is_course_admin()) {
$course = api_get_course_info();
$doc_id = DocumentManager::get_document_id($course, '/images/'.$pictureName);
if (is_numeric($doc_id)) {

@ -25,9 +25,6 @@ $show=(isset($_GET['show']) && $_GET['show'] == 'result')?'result':'test'; // mo
* Libraries
*/
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
//include(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
/* Constants and variables */
$is_allowedToEdit = api_is_allowed_to_edit(null,true);
$is_tutor = api_is_allowed_to_edit(true);

@ -27,7 +27,6 @@ if ($_GET['origin']=='learnpath') {
require_once '../newscorm/aiccItem.class.php';
}
require_once api_get_path(LIBRARY_PATH).'exercise_show_functions.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
$this_section = SECTION_COURSES;

@ -33,10 +33,8 @@ require_once 'exercise.class.php';
require_once 'exercise.lib.php';
require_once 'question.class.php';
require_once 'answer.class.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once 'hotpotatoes.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// need functions of statsutils lib to display previous exercices scores
require_once api_get_path(LIBRARY_PATH) . 'statsUtils.lib.inc.php';

@ -38,7 +38,6 @@ if ($_GET['origin']=='learnpath') {
require_once '../newscorm/aiccItem.class.php';
}
require_once api_get_path(LIBRARY_PATH).'exercise_show_functions.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
$this_section = SECTION_COURSES;

@ -26,8 +26,6 @@ require_once 'answer.class.php';
require_once '../inc/global.inc.php';
require_once 'exercise.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
if (empty($origin) ) {
$origin = $_REQUEST['origin'];
}

@ -7,7 +7,6 @@
require_once '../inc/global.inc.php';
// Including additional libraries.
require_once api_get_path(LIBRARY_PATH).'glossary.lib.php';
/*
* Search a term and return description from a glossary.

@ -11,9 +11,7 @@ $language_file = array('glossary', 'admin');
// Including the global initialization file.
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'glossary.lib.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
$current_course_tool = TOOL_GLOSSARY;

File diff suppressed because it is too large Load Diff

@ -979,8 +979,9 @@ class Autoload
$result['vtimezone'] = '/main/inc/lib/icalcreator/iCalcreator.class.php';
$result['vtodo'] = '/main/inc/lib/icalcreator/iCalcreator.class.php';
$result['xhtdoc'] = '/main/inc/lib/xht.lib.php';
$result['xajax'] = '/main/inc/lib/xajax/xajax.inc.php';
$result['xajaxResponse'] = '/main/inc/lib/xajax/xajaxResponse.inc.php';
return $result;
}

File diff suppressed because it is too large Load Diff

@ -83,7 +83,7 @@ class CourseRequestManager {
$request_date = api_get_utc_datetime();
$status = COURSE_REQUEST_PENDING;
$info = 0;
$keys = define_course_keys($wanted_code, '');
$keys = CourseManager::define_course_keys($wanted_code, '');
if (!count($keys)) {
return false;
}
@ -218,7 +218,7 @@ class CourseRequestManager {
if (self::course_code_exists($wanted_code)) {
return false;
}
$keys = define_course_keys($wanted_code, '');
$keys = CourseManager::define_course_keys($wanted_code, '');
if (count($keys)) {
$visual_code = $keys['currentCourseCode'];
$code = $keys['currentCourseId'];

@ -8,7 +8,6 @@
* */
require_once api_get_path(LIBRARY_PATH) . 'banner.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'symfony/Twig/Autoloader.php';
class Template {

@ -705,4 +705,27 @@ function implode_with_key($glue, $array) {
return $string;
}
return '';
}
function lang2db($string) {
$string = str_replace("\\'", "'", $string);
$string = Database::escape_string($string);
return $string;
}
/**
* function string2binary converts the string "true" or "false" to the boolean true false (0 or 1)
* This is used for the Chamilo Config Settings as these store true or false as string
* and the api_get_setting('course_create_active_tools') should be 0 or 1 (used for
* the visibility of the tool)
* @param string $variable
* @author Patrick Cool, patrick.cool@ugent.be
*/
function string2binary($variable) {
if ($variable == 'true') {
return true;
}
if ($variable == 'false') {
return false;
}
}

File diff suppressed because it is too large Load Diff

@ -116,8 +116,6 @@ $installation_settings['{HASHFUNCTIONMODE}'] = $encryptPassForm;
load_main_database($installation_settings);
//Adds the c_XXX courses tables see #3910
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
drop_course_tables();

@ -295,7 +295,6 @@ if (defined('SYSTEM_INSTALLATION')) {
}
//Adds the c_XXX courses tables see #3910
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
global $_configuration;
drop_course_tables();

@ -227,7 +227,7 @@ class survey_manager {
$course_id = api_get_course_int_id();
$sql = "INSERT INTO $table_survey (c_id, code, title, subtitle, author, lang, avail_from, avail_till, is_shared, template, intro, surveythanks, creation_date, anonymous".$additional['columns'].", session_id) VALUES (
$course_id,
'".Database::escape_string(strtolower(generate_course_code(api_substr($values['survey_code'],0))))."',
'".Database::escape_string(strtolower(CourseManager::generate_course_code(api_substr($values['survey_code'],0))))."',
'".Database::escape_string($values['survey_title'])."',
'".Database::escape_string($values['survey_subtitle'])."',
'".Database::escape_string($_user['user_id'])."',

@ -2,8 +2,6 @@
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'course.lib.php';
require_once $libpath.'add_course.lib.inc.php';
require_once $libpath.'course_description.lib.php';
require_once(dirname(__FILE__).'/cm_webservice.php');
@ -107,7 +105,7 @@ class WSCMCourse extends WSCM {
return $course_admin_id;
}
if($wanted_code == '') {
$wanted_code = generate_course_code($title);
$wanted_code = CourseManager::generate_course_code($title);
}
$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
if (!$result) {

@ -9,7 +9,6 @@ require_once $libpath.'nusoap/nusoap.php';
require_once $libpath.'fileManage.lib.php';
require_once $libpath.'fileUpload.lib.php';
require_once api_get_path(INCLUDE_PATH).'lib/mail.lib.inc.php';
require_once $libpath.'add_course.lib.inc.php';
$debug = false;
@ -2284,7 +2283,7 @@ function WSCreateCourseByTitle($params) {
$maxlength = 40 - $dbnamelength;
if (empty($wanted_code)) {
$wanted_code = generate_course_code(substr($title, 0, $maxlength));
$wanted_code = CourseManager::generate_course_code(substr($title, 0, $maxlength));
}
// Check if exits $x_course_code into user_field_values table.
@ -2323,7 +2322,7 @@ function WSCreateCourseByTitle($params) {
$values['tutor_name'] = api_get_person_name($_user['firstName'], $_user['lastName'], null, null, $values['course_language']);
$keys = define_course_keys($wanted_code, '', $_configuration['db_prefix']);
$keys = CourseManager::define_course_keys($wanted_code, '', $_configuration['db_prefix']);
$sql_check = sprintf('SELECT * FROM '.$table_course.' WHERE visual_code = "%s"', Database :: escape_string($wanted_code));
$result_check = Database::query($sql_check); // I don't know why this api function doesn't work...
@ -2520,7 +2519,7 @@ function WSEditCourse($params){
$maxlength = 40 - $dbnamelength;
if (empty($visual_code)) {
$visual_code = generate_course_code(substr($title, 0, $maxlength));
$visual_code = CourseManager::generate_course_code(substr($title, 0, $maxlength));
}
$disk_quota = '50000'; // TODO: A hard-coded value.

@ -5,8 +5,6 @@
*/
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'course.lib.php';
require_once $libpath.'add_course.lib.inc.php';
require_once $libpath.'course_description.lib.php';
require_once(dirname(__FILE__).'/webservice.php');
@ -110,7 +108,7 @@ class WSCourse extends WS {
return $course_admin_id;
}
if($wanted_code == '') {
$wanted_code = generate_course_code($title);
$wanted_code = CourseManager::generate_course_code($title);
}
$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
if (!$result) {

@ -3,7 +3,6 @@
require_once api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
class TestAnnouncements extends UnitTestCase {

@ -1,7 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
class TestAddCourse extends UnitTestCase {

Loading…
Cancel
Save