From c7d8dea95871ad30310ff0693cddf7fd27aae5bf Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 31 Jul 2014 18:43:54 +0200 Subject: [PATCH] Commenting global.inc. --- main/admin/access_url_add_courses_to_url.php | 2 +- .../admin/access_url_add_usergroup_to_url.php | 2 +- main/admin/access_url_add_users_to_url.php | 4 +- main/admin/access_url_check_user_session.php | 2 +- main/admin/access_url_edit.php | 4 +- ...access_url_edit_course_category_to_url.php | 2 +- main/admin/access_url_edit_courses_to_url.php | 2 +- .../access_url_edit_usergroup_to_url.php | 4 +- main/admin/access_url_edit_users_to_url.php | 2 +- main/admin/access_urls.php | 4 +- main/admin/add_courses_to_session.php | 2 +- main/admin/add_courses_to_usergroup.php | 2 +- main/admin/add_many_session_to_category.php | 4 +- main/admin/add_sessions_to_promotion.php | 2 +- main/admin/add_sessions_to_usergroup.php | 8 +- main/admin/add_students_to_session.php | 2 +- main/admin/add_teachers_to_session.php | 2 +- main/admin/add_users_to_group.php | 4 +- main/admin/add_users_to_session.php | 2 +- main/admin/archive_cleanup.php | 2 +- main/admin/calendar_view.php | 2 +- main/admin/calendar_view_print.php | 2 +- main/admin/career_dashboard.php | 4 +- main/admin/careers.php | 50 ++--- main/admin/cli.php | 8 +- main/admin/configure_extensions.php | 2 +- main/admin/configure_homepage.php | 2 +- main/admin/configure_inscription.php | 2 +- main/admin/configure_plugin.php | 2 +- main/admin/course_category.php | 10 +- main/admin/course_create_content.php | 2 +- main/admin/course_export.php | 18 +- main/admin/course_information.php | 2 +- main/admin/course_request_rejected.php | 2 +- main/admin/course_request_review.php | 2 +- main/admin/event_controller.php | 2 +- main/admin/event_type.php | 2 +- main/admin/extra_field_options.php | 2 +- main/admin/extra_field_workflow.php | 2 +- main/admin/extra_fields.php | 2 +- main/admin/filler.php | 2 +- main/admin/grade_models.php | 2 +- main/admin/inactive_user_list.php | 2 +- main/admin/languages.php | 2 +- main/admin/legal_add.php | 2 +- main/admin/legal_list.php | 2 +- main/admin/promotions.php | 4 +- main/admin/session_category_edit.php | 2 +- main/admin/session_course_list.php | 2 +- main/admin/skills.php | 4 +- main/admin/skills_gradebook.php | 28 +-- main/admin/skills_profile.php | 2 +- main/admin/skills_wheel.php | 2 +- main/admin/specific_fields.php | 4 +- main/admin/statistics.php | 4 +- main/admin/sub_language.php | 2 +- main/admin/sub_language_add.php | 14 +- main/admin/sub_language_ajax.inc.php | 4 +- main/admin/subscribe_class2course.php | 2 +- main/admin/subscribe_user2class.php | 4 +- main/admin/subscribe_user2course.php | 2 +- main/admin/synchro.php | 2 +- main/admin/system_management.php | 181 ------------------ main/admin/user_import.php | 8 +- main/admin/user_move_stats.php | 2 +- main/admin/usergroup_user_import.php | 2 +- main/admin/usergroups.php | 2 +- 67 files changed, 143 insertions(+), 324 deletions(-) delete mode 100644 main/admin/system_management.php diff --git a/main/admin/access_url_add_courses_to_url.php b/main/admin/access_url_add_courses_to_url.php index 46d644b102..6a1e2b74a4 100644 --- a/main/admin/access_url_add_courses_to_url.php +++ b/main/admin/access_url_add_courses_to_url.php @@ -11,7 +11,7 @@ // name of the language file that needs to be included $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section=SECTION_PLATFORM_ADMIN; api_protect_global_admin_script(); diff --git a/main/admin/access_url_add_usergroup_to_url.php b/main/admin/access_url_add_usergroup_to_url.php index fb70ddfc7c..ca588c8168 100644 --- a/main/admin/access_url_add_usergroup_to_url.php +++ b/main/admin/access_url_add_usergroup_to_url.php @@ -11,7 +11,7 @@ // name of the language file that needs to be included $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//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'; $this_section = SECTION_PLATFORM_ADMIN; diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php index d4fcee4e2d..ea2a289ac8 100644 --- a/main/admin/access_url_add_users_to_url.php +++ b/main/admin/access_url_add_users_to_url.php @@ -11,7 +11,7 @@ // name of the language file that needs to be included $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; api_protect_global_admin_script(); @@ -150,4 +150,4 @@ unset($result); addElement('file','url_image_3','URL Image 3 (PNG)'); // Submit button $form->addElement('style_submit_button', 'submit', $submit_name, 'class="add"'); -$form->display(); \ No newline at end of file +$form->display(); diff --git a/main/admin/access_url_edit_course_category_to_url.php b/main/admin/access_url_edit_course_category_to_url.php index e9e3b81067..a84cafb0b6 100644 --- a/main/admin/access_url_edit_course_category_to_url.php +++ b/main/admin/access_url_edit_course_category_to_url.php @@ -11,7 +11,7 @@ $language_file = 'admin'; // resetting the course id $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'course_category.lib.php'; require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php'; diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php index 7956c90153..d682652c23 100644 --- a/main/admin/access_url_edit_courses_to_url.php +++ b/main/admin/access_url_edit_courses_to_url.php @@ -12,7 +12,7 @@ $language_file = 'admin'; // resetting the course id $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $xajax = new xajax(); $xajax -> registerFunction (array('search_courses', 'Accessurleditcoursestourl', 'search_courses')); diff --git a/main/admin/access_url_edit_usergroup_to_url.php b/main/admin/access_url_edit_usergroup_to_url.php index ac8d0e2429..431de12be6 100644 --- a/main/admin/access_url_edit_usergroup_to_url.php +++ b/main/admin/access_url_edit_usergroup_to_url.php @@ -11,7 +11,7 @@ $language_file = 'admin'; // resetting the course id $cidReset = true; -require_once '../inc/global.inc.php'; +//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'; @@ -343,4 +343,4 @@ function makepost(select){ } set_header(5, get_lang('Active')); $table->set_header(6, get_lang('Modify'), false); $table->display(); -Display :: display_footer(); \ No newline at end of file +Display :: display_footer(); diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php index 80bd9eb1e8..89cc86589c 100644 --- a/main/admin/add_courses_to_session.php +++ b/main/admin/add_courses_to_session.php @@ -11,7 +11,7 @@ $language_file = 'admin'; // resetting the course id. $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php'; $id_session = isset($_GET['id_session']) ? intval($_GET['id_session']) : null; diff --git a/main/admin/add_courses_to_usergroup.php b/main/admin/add_courses_to_usergroup.php index 1e9160c68c..0d43a51bcd 100644 --- a/main/admin/add_courses_to_usergroup.php +++ b/main/admin/add_courses_to_usergroup.php @@ -11,7 +11,7 @@ $language_file = array('admin', 'registration'); $cidReset = true; // Including some necessary files. -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once '../inc/lib/xajax/xajax.inc.php'; require_once api_get_path(LIBRARY_PATH).'usergroup.lib.php'; diff --git a/main/admin/add_many_session_to_category.php b/main/admin/add_many_session_to_category.php index a1a2168531..65db7d918c 100644 --- a/main/admin/add_many_session_to_category.php +++ b/main/admin/add_many_session_to_category.php @@ -5,7 +5,7 @@ * @todo use formvalidator */ -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $xajax = new xajax(); $xajax->registerFunction('search_courses'); @@ -134,7 +134,7 @@ if (api_get_multiple_access_url()) { $sql = "SELECT s.id, s.name FROM $tbl_session s INNER JOIN $table_access_url_rel_session u ON s.id = u.session_id $where AND u.access_url_id = $access_url_id ORDER BY name"; } else { $sql = "SELECT id, name FROM $tbl_session $where ORDER BY name"; -} +} $result=Database::query($sql); $rows_session = Database::store_result($result); ?> diff --git a/main/admin/add_sessions_to_promotion.php b/main/admin/add_sessions_to_promotion.php index b78979625e..2047f892cb 100644 --- a/main/admin/add_sessions_to_promotion.php +++ b/main/admin/add_sessions_to_promotion.php @@ -11,7 +11,7 @@ $language_file = array('admin','registration'); $cidReset = true; // including some necessary files -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $xajax = new xajax(); $xajax->registerFunction ('search_sessions'); diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php index dd88724a71..286b7c1735 100644 --- a/main/admin/add_sessions_to_usergroup.php +++ b/main/admin/add_sessions_to_usergroup.php @@ -11,7 +11,7 @@ $language_file=array('admin','registration'); $cidReset=true; // including some necessary files -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $xajax = new xajax(); @@ -177,7 +177,7 @@ if ($add_type == 'multiple') { } echo '
'; -echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; +echo ''.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).''; echo ' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').''; echo '
'; @@ -250,8 +250,8 @@ if(!empty($errorMsg)) {
-
diff --git a/main/admin/add_students_to_session.php b/main/admin/add_students_to_session.php index f572d7eadc..7a78f78847 100644 --- a/main/admin/add_students_to_session.php +++ b/main/admin/add_students_to_session.php @@ -11,7 +11,7 @@ $language_file = array('admin','registration'); $cidReset = true; // including some necessary files -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once '../inc/lib/xajax/xajax.inc.php'; require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php'; diff --git a/main/admin/add_teachers_to_session.php b/main/admin/add_teachers_to_session.php index 762640b3cd..6a0f9164af 100644 --- a/main/admin/add_teachers_to_session.php +++ b/main/admin/add_teachers_to_session.php @@ -11,7 +11,7 @@ $language_file = array('admin','registration'); $cidReset = true; // including some necessary files -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once '../inc/lib/xajax/xajax.inc.php'; require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php'; diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php index 54f6146659..839a472833 100644 --- a/main/admin/add_users_to_group.php +++ b/main/admin/add_users_to_group.php @@ -11,7 +11,7 @@ $language_file = array('admin','registration','userInfo'); $cidReset = true; // including some necessary files -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; // setting the section (for the tabs) $this_section = SECTION_PLATFORM_ADMIN; @@ -589,4 +589,4 @@ function makepost(select){ } $data) { } } echo ''; -Display::display_footer(); \ No newline at end of file +Display::display_footer(); diff --git a/main/admin/careers.php b/main/admin/careers.php index adc8e7650d..7f6a5cfc94 100644 --- a/main/admin/careers.php +++ b/main/admin/careers.php @@ -9,7 +9,7 @@ $language_file = array('admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; @@ -26,13 +26,13 @@ $interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('Car $action = isset($_GET['action']) ? $_GET['action'] : null; $check = Security::check_token('request'); -$token = Security::get_token(); +$token = Security::get_token(); if ($action == 'add') { $interbreadcrumb[]=array('url' => 'careers.php','name' => get_lang('Careers')); $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add')); } elseif ($action == 'edit') { - $interbreadcrumb[]=array('url' => 'careers.php','name' => get_lang('Careers')); + $interbreadcrumb[]=array('url' => 'careers.php','name' => get_lang('Careers')); $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit')); } else { $interbreadcrumb[]=array('url' => '#','name' => get_lang('Careers')); @@ -43,7 +43,7 @@ Display::display_header(); //jqgrid will use this URL to do the selects $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_careers'; -//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 @@ -64,11 +64,11 @@ $column_model = array( '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) { @@ -94,15 +94,15 @@ $action_links = 'function action_formatter(cellvalue, options, rowObject) { '', ICON_SIZE_SMALL ).''. - '\'; + '\'; }'; ?> return_form($url, 'add'); // The validation or display - if ($form->validate()) { + if ($form->validate()) { if ($check) { - $values = $form->exportValues(); - $res = $career->save($values); + $values = $form->exportValues(); + $res = $career->save($values); if ($res) { Display::display_confirmation_message(get_lang('ItemAdded')); } - } + } $career->display(); } else { echo '
'; @@ -137,22 +137,22 @@ switch ($action) { '', ICON_SIZE_MEDIUM ).''; - echo '
'; + echo '
'; $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 = $career->return_form($url, 'edit'); + $form = $career->return_form($url, 'edit'); // The validation or display - if ($form->validate()) { + if ($form->validate()) { if ($check) { $values = $form->exportValues(); - $career->update_all_promotion_status_by_career_id($values['id'],$values['status']); + $career->update_all_promotion_status_by_career_id($values['id'],$values['status']); $res = $career->update($values); if ($values['status']) { Display::display_confirmation_message( @@ -162,7 +162,7 @@ switch ($action) { } else { Display::display_confirmation_message(sprintf(get_lang('CareerXArchived'), $values['name']), false); } - } + } $career->display(); } else { echo '
'; @@ -188,7 +188,7 @@ switch ($action) { } $career->display(); break; - case 'copy': + case 'copy': if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) { api_not_allowed(); } @@ -201,7 +201,7 @@ switch ($action) { $career->display(); break; default: - $career->display(); + $career->display(); break; } -Display :: display_footer(); \ No newline at end of file +Display :: display_footer(); diff --git a/main/admin/cli.php b/main/admin/cli.php index 5960bbe88c..b79d80a66c 100644 --- a/main/admin/cli.php +++ b/main/admin/cli.php @@ -7,19 +7,19 @@ * @package chamilo.admin.cli */ /** - * Init section + * Init section */ // name of the language file that needs to be included $language_file = 'admin'; // we are in the admin area so we do not need a course id $cidReset = true; // include global script -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; // make sure only logged-in admins can execute this api_protect_admin_script(); /** - * Main code + * Main code */ // setting the name of the tool $tool_name = get_lang('CommandLineInterpreter'); @@ -41,6 +41,6 @@ switch ($_GET["cmd"]) { break; } /** - * Footer + * Footer */ Display :: display_footer(); diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php index 41d40fc2ea..ea4d9aaf2b 100644 --- a/main/admin/configure_extensions.php +++ b/main/admin/configure_extensions.php @@ -10,7 +10,7 @@ // name of the language file that needs to be included $language_file='admin'; $cidReset=true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section=SECTION_PLATFORM_ADMIN; api_protect_admin_script(); $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index 2a801ce7fb..823d5c829a 100644 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -9,7 +9,7 @@ */ $language_file = array('index', 'admin', 'accessibility'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; $_SESSION['this_section'] = $this_section; diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php index 8e33647533..9a68f76481 100644 --- a/main/admin/configure_inscription.php +++ b/main/admin/configure_inscription.php @@ -8,7 +8,7 @@ $language_file = array('registration', 'admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; api_protect_admin_script(); diff --git a/main/admin/configure_plugin.php b/main/admin/configure_plugin.php index 052508e6ee..fda0117191 100644 --- a/main/admin/configure_plugin.php +++ b/main/admin/configure_plugin.php @@ -8,7 +8,7 @@ // name of the language file that needs to be included $language_file = array ('registration','admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; // Access restrictions api_protect_admin_script(); diff --git a/main/admin/course_category.php b/main/admin/course_category.php index 86243884b1..1d5a5cce59 100644 --- a/main/admin/course_category.php +++ b/main/admin/course_category.php @@ -12,7 +12,7 @@ $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(); @@ -100,9 +100,9 @@ if (!empty($category)) { } if (empty($action)) { - $myquery = "SELECT t1.name,t1.code,t1.parent_id,t1.tree_pos,t1.children_count,COUNT(DISTINCT t3.code) AS nbr_courses - FROM $tbl_category t1 LEFT JOIN $tbl_category t2 ON t1.code=t2.parent_id LEFT JOIN $tbl_course t3 ON t3.category_code=t1.code - WHERE t1.parent_id " . (empty($category) ? "IS NULL" : "='$category'") . " + $myquery = "SELECT t1.name,t1.code,t1.parent_id,t1.tree_pos,t1.children_count,COUNT(DISTINCT t3.code) AS nbr_courses + FROM $tbl_category t1 LEFT JOIN $tbl_category t2 ON t1.code=t2.parent_id LEFT JOIN $tbl_course t3 ON t3.category_code=t1.code + WHERE t1.parent_id " . (empty($category) ? "IS NULL" : "='$category'") . " GROUP BY t1.name,t1.code,t1.parent_id,t1.tree_pos,t1.children_count ORDER BY t1.tree_pos"; $result = Database::query($myquery); $Categories = Database::store_result($result); @@ -230,7 +230,7 @@ if ($action == 'add' || $action == 'edit') { } } else { Display :: display_error_message(get_lang('CourseCategoriesAreGlobal')); - + }?> diff --git a/main/admin/course_create_content.php b/main/admin/course_create_content.php index 5aae8943a0..fc1d16137a 100755 --- a/main/admin/course_create_content.php +++ b/main/admin/course_create_content.php @@ -12,7 +12,7 @@ // name of the language file that needs to be included $language_file = 'admin'; -include ('../inc/global.inc.php'); +//include ('../inc/global.inc.php'); $this_section=SECTION_PLATFORM_ADMIN; api_protect_admin_script(); diff --git a/main/admin/course_export.php b/main/admin/course_export.php index 1c25ba68b3..d37f497c8b 100644 --- a/main/admin/course_export.php +++ b/main/admin/course_export.php @@ -10,7 +10,7 @@ $language_file = array ('admin', 'registration','create_course', 'document'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(); @@ -93,20 +93,20 @@ if (!empty($msg)) {
- + -
- +
+
- + +
@@ -134,4 +134,4 @@ if (!empty($msg)) { 'index.php', "name" => get_lang('PlatformAdmin')); diff --git a/main/admin/promotions.php b/main/admin/promotions.php index a1b1079af4..4dd3905092 100644 --- a/main/admin/promotions.php +++ b/main/admin/promotions.php @@ -9,7 +9,7 @@ $language_file = array('admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; @@ -173,4 +173,4 @@ switch ($action) { $promotion->display(); break; } -Display::display_footer(); \ No newline at end of file +Display::display_footer(); diff --git a/main/admin/session_category_edit.php b/main/admin/session_category_edit.php index 13b82bd8e4..8ee6562ffd 100644 --- a/main/admin/session_category_edit.php +++ b/main/admin/session_category_edit.php @@ -11,7 +11,7 @@ // name of the language file that needs to be included $language_file ='admin'; $cidReset=true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; // setting the section (for the tabs) $this_section=SECTION_PLATFORM_ADMIN; diff --git a/main/admin/session_course_list.php b/main/admin/session_course_list.php index 779b1c17f3..bbc29f2492 100644 --- a/main/admin/session_course_list.php +++ b/main/admin/session_course_list.php @@ -9,7 +9,7 @@ $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; // setting the section (for the tabs) $this_section=SECTION_PLATFORM_ADMIN; diff --git a/main/admin/skills.php b/main/admin/skills.php index e3d80ba81b..ea8e559431 100644 --- a/main/admin/skills.php +++ b/main/admin/skills.php @@ -9,7 +9,7 @@ $language_file = array('admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//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'; @@ -43,4 +43,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(); \ No newline at end of file +$tpl->display_no_layout_template(); diff --git a/main/admin/skills_gradebook.php b/main/admin/skills_gradebook.php index f3fd9e905b..dd34a32e76 100644 --- a/main/admin/skills_gradebook.php +++ b/main/admin/skills_gradebook.php @@ -9,7 +9,7 @@ $language_file = array('admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//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'; @@ -33,7 +33,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 +46,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 +55,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 \''.Display::return_icon('add.png', get_lang('AddSkill'),'',ICON_SIZE_SMALL).''.'\'; } else { return \''.Display::return_icon('add_na.png', get_lang('YourGradebookFirstNeedsACertificateInOrderToBeLinkedToASkill'),'',ICON_SIZE_SMALL).''.'\'; @@ -73,15 +73,15 @@ $action_links = 'function action_formatter(cellvalue, options, rowObject) { ?> display(); @@ -93,11 +93,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; diff --git a/main/admin/skills_profile.php b/main/admin/skills_profile.php index 848fa72aec..0bd3bc2cd4 100644 --- a/main/admin/skills_profile.php +++ b/main/admin/skills_profile.php @@ -9,7 +9,7 @@ $language_file = array('admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'skill.lib.php'; $this_section = SECTION_PLATFORM_ADMIN; diff --git a/main/admin/skills_wheel.php b/main/admin/skills_wheel.php index 3bab6256be..67ec16ecfe 100644 --- a/main/admin/skills_wheel.php +++ b/main/admin/skills_wheel.php @@ -9,7 +9,7 @@ $language_file = array('admin'); $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; diff --git a/main/admin/specific_fields.php b/main/admin/specific_fields.php index 4f542a24f6..50ffa1cb2a 100644 --- a/main/admin/specific_fields.php +++ b/main/admin/specific_fields.php @@ -10,7 +10,7 @@ $language_file[] = 'admin'; $cidReset = true; // Including some necessary chamilo files -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; // User permissions api_protect_admin_script(); @@ -69,7 +69,7 @@ if(!empty($_GET['message'])) { echo '
'; $form->display(); echo '
'; -if (!empty($extra_fields)) { +if (!empty($extra_fields)) { $table->display(); } diff --git a/main/admin/statistics.php b/main/admin/statistics.php index 921ffaf629..83c1f48984 100644 --- a/main/admin/statistics.php +++ b/main/admin/statistics.php @@ -9,7 +9,7 @@ // name of the language file that needs to be included $language_file='admin'; $cidReset=true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section=SECTION_PLATFORM_ADMIN; api_protect_admin_script(); @@ -17,4 +17,4 @@ api_protect_admin_script(); $interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); $tool_name = get_lang('Statistics'); Display::display_header($tool_name); -Display::display_footer(); \ No newline at end of file +Display::display_footer(); diff --git a/main/admin/sub_language.php b/main/admin/sub_language.php index fc9884524b..4482a09d46 100644 --- a/main/admin/sub_language.php +++ b/main/admin/sub_language.php @@ -11,7 +11,7 @@ $language_file = 'admin'; $cidReset = true; $this_script = 'sub_language'; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once 'sub_language.class.php'; $this_section = SECTION_PLATFORM_ADMIN; diff --git a/main/admin/sub_language_add.php b/main/admin/sub_language_add.php index badfaba394..89b3bab6f5 100644 --- a/main/admin/sub_language_add.php +++ b/main/admin/sub_language_add.php @@ -10,7 +10,7 @@ // name of the language file that needs to be included $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once 'sub_language.class.php'; $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(); @@ -41,7 +41,7 @@ function add_sub_language ($original_name,$english_name,$isocode,$sublanguage_av $isocode = Database::escape_string($isocode); $sublanguage_available = Database::escape_string($sublanguage_available); $parent_id = Database::escape_string($parent_id); - + $sql='INSERT INTO '.$tbl_admin_languages.'(original_name,english_name,isocode,dokeos_folder,available,parent_id) VALUES ("'.$original_name.'","'.$english_name.'","'.$isocode.'","'.$english_name.'","'.$sublanguage_available.'","'.$parent_id.'")'; $res = Database::query($sql); if ($res === false) { @@ -86,14 +86,14 @@ function check_if_language_exist ($original_name, $english_name, $isocode, $subl $has_error=true; $message_information['english_name']=true; } - - $iso_list = api_get_platform_isocodes(); + + $iso_list = api_get_platform_isocodes(); $iso_list = array_values($iso_list); - + if (!in_array($isocode, $iso_list)) { $has_error=true; $message_information['isocode']=true; - } + } if ($has_error===true) { $message_information['execute_add']=false; } @@ -217,7 +217,7 @@ if (isset($_POST['SubmitAddNewLanguage'])) { $english_name=str_replace(' ','_',$english_name); //Fixes BT#1636 $english_name=api_strtolower($english_name); - + $isocode=str_replace(' ','_',$isocode); $str_info='
'.get_lang('OriginalName').' : '.$original_name.'
'.get_lang('EnglishName').' : '.$english_name.'
'.get_lang('PlatformCharsetTitle').' : '.$isocode; diff --git a/main/admin/sub_language_ajax.inc.php b/main/admin/sub_language_ajax.inc.php index 9fc9082baf..a0cd723651 100644 --- a/main/admin/sub_language_ajax.inc.php +++ b/main/admin/sub_language_ajax.inc.php @@ -9,7 +9,7 @@ */ $language_file = 'admin'; $this_script = 'sub_language'; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; require_once 'sub_language.class.php'; api_protect_admin_script(); @@ -50,6 +50,6 @@ if (isset($new_language) && isset($language_variable) && isset($file_id)) { echo $path_folder.' '.get_lang('IsNotWritable').'
'.api_ucwords(get_lang('ErrorsFound')).':
'.$variables_with_problems; } else { echo get_lang('Saved'); - } + } } diff --git a/main/admin/subscribe_class2course.php b/main/admin/subscribe_class2course.php index a346ba4902..df65edf117 100644 --- a/main/admin/subscribe_class2course.php +++ b/main/admin/subscribe_class2course.php @@ -11,7 +11,7 @@ $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section=SECTION_PLATFORM_ADMIN; api_protect_admin_script(); diff --git a/main/admin/subscribe_user2class.php b/main/admin/subscribe_user2class.php index 12cbd293a4..c916561715 100644 --- a/main/admin/subscribe_user2class.php +++ b/main/admin/subscribe_user2class.php @@ -11,7 +11,7 @@ $language_file = 'admin'; $cidReset = true; -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(); @@ -150,4 +150,4 @@ echo Display :: get_alphabet_options($first_letter_left); - * @license see /license.txt - */ -$language_file = array('admin'); -$cidReset = true; -require_once '../inc/global.inc.php'; -require_once __DIR__ . '/admin_page.class.php'; - -class SystemManagementPage extends AdminPage -{ - - const PARAM_ACTION = 'action'; - const PARAM_SECURITY_TOKEN = 'sec_token'; - const ACTION_DEFAULT = 'list'; - const ACTION_SECURITY_FAILED = 'security_failed'; - - function get_action() - { - $result = Request::get(self::PARAM_ACTION, self::ACTION_DEFAULT); - if ($result != self::ACTION_DEFAULT) { - $passed = Security::check_token('get'); - Security::clear_token(); - $result = $passed ? $result : self::ACTION_SECURITY_FAILED; - } - return $result; - } - - function url($params) - { - return Uri::here($params); - } - - function display_default() - { - $message = get_lang('RemoveOldDatabaseMessage'); - $message_table = get_lang('RemoveOldTables'); - - $message_table .= "
".implode(' , ', self::get_tables_to_delete()); - $token = Security::get_token(); - $url = $this->url(array(self::PARAM_ACTION => 'drop_old_databases', self::PARAM_SECURITY_TOKEN => $token)); - $url_table = $this->url(array(self::PARAM_ACTION => 'drop_old_tables', self::PARAM_SECURITY_TOKEN => $token)); - - $go = get_lang('Go'); - $access_url_id = api_get_current_access_url_id(); - $message2 = ''; - - if ($access_url_id === 1) { - if (api_is_windows_os()) { - $message2 .= get_lang('SpaceUsedOnSystemCannotBeMeasuredOnWindows'); - } else { - $dir = api_get_path(SYS_PATH); - $du = exec('du -sh ' . $dir, $err); - list($size, $none) = explode("\t", $du); - $limit = $_configuration[$url]['hosting_limit_disk_space']; - $message2 .= sprintf(get_lang('TotalSpaceUsedByPortalXLimitIsYMB'), $size, $limit); - } - } - if (!empty($message2)) { - $message2 = '
  • ' . $message2 . '
    • '; - } - echo << -
  • -
    $message
    - $go -
    • -
  • -
    $message_table
    - $go -
    • - $message2 - -EOT; - } - - function display_security_failed() - { - Display::display_error_message(get_lang('NotAuthorized')); - } - - function display_content() - { - $action = $this->get_action(); - switch ($action) { - case self::ACTION_DEFAULT: - $this->display_default(); - return; - - case self::ACTION_SECURITY_FAILED: - $this->display_security_failed(); - return; - - default: - $f = array($this, $action); - if (is_callable($f)) { - call_user_func($f); - return; - } else { - Display::display_error_message(get_lang('UnknownAction')); - } - return; - } - } - - /** - * - * @return ResultSet - */ - function get_old_databases() - { - $course_db = Database::get_main_table(TABLE_MAIN_COURSE); - $sql = "SELECT id, code, db_name, directory, course_language FROM $course_db WHERE target_course_code IS NULL AND db_name IS NOT NULL ORDER BY code"; - return new ResultSet($sql); - } - - function drop_old_tables() - { - $tables_to_remove = self::get_tables_to_delete(); - - $number_tables_deleted = 0; - $tables_deleted = ''; - foreach ($tables_to_remove as $table) { - //Deleting tables - $drop_table = "DROP TABLE $table"; - $success = Database::query($drop_table); - $success =true; - if ($success) { - $tables_deleted .= $table.'
    '; - $number_tables_deleted++; - } - } - - Display::display_confirmation_message(sprintf(get_lang('XOldTablesDeleted'),$number_tables_deleted)); - Display::display_confirmation_message($tables_deleted, false); - } - - function get_tables_to_delete() { - $tables_to_remove = array( - Database::get_main_table(TABLE_MAIN_CLASS), - Database::get_main_table(TABLE_MAIN_CLASS_USER), - Database::get_main_table(TABLE_MAIN_COURSE_CLASS), - ); - return $tables_to_remove; - } - - function drop_old_databases() - { - $result = array(); - $courses = $this->get_old_databases(); - $course_db = Database::get_main_table(TABLE_MAIN_COURSE); - foreach ($courses as $course) { - $drop_statement = 'DROP DATABASE ' . $course['db_name']; - $success = Database::query($drop_statement); - if ($success) { - /* - * Note that Database::update do not supports null statements so - * we do it by hand here. - */ - $id = $course['id']; - $update_statement = "UPDATE $course_db SET db_name = NULL WHERE id = $id"; - Database::query($update_statement); - $result[] = $course['db_name']; - } - } - - Display::display_confirmation_message(sprintf(get_lang('XOldDatabasesDeleted'),count($result))); - - - return $result; - } - -} - -$page = new SystemManagementPage(get_lang('SystemManagement')); -$page->display(); diff --git a/main/admin/user_import.php b/main/admin/user_import.php index a77f498dd8..b144a66707 100644 --- a/main/admin/user_import.php +++ b/main/admin/user_import.php @@ -262,9 +262,9 @@ api_protect_admin_script(true); $defined_auth_sources[] = PLATFORM_AUTH_SOURCE; -if (is_array($extAuthSource)) { +/*if (is_array($extAuthSource)) { $defined_auth_sources = array_merge($defined_auth_sources, array_keys($extAuthSource)); -} +}*/ $tool_name = get_lang('ImportUserListXMLCSV'); $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); @@ -274,7 +274,7 @@ $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', true); $user_id_error = array(); $error_message = ''; -if ($_POST['formSent'] AND $_FILES['import_file']['size'] !== 0) { +if (isset($_POST['formSent']) && $_POST['formSent'] AND $_FILES['import_file']['size'] !== 0) { $file_type = $_POST['file_type']; Security::clear_token(); $tok = Security::get_token(); @@ -424,7 +424,7 @@ if ($count_fields > 0) { 
    -<?xml version="1.0" encoding=""?>
+<?xml version="1.0" encoding=""?>
 <Contacts>
     <Contact>
         <LastName>xxx</LastName>
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
index d6a3040e4b..0f192fdb28 100644
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@@ -10,7 +10,7 @@
 
 $language_file = 'admin';
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 $this_section=SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
diff --git a/main/admin/usergroup_user_import.php b/main/admin/usergroup_user_import.php
index 0d9af58871..9a1a4dab64 100644
--- a/main/admin/usergroup_user_import.php
+++ b/main/admin/usergroup_user_import.php
@@ -125,7 +125,7 @@ function parse_csv_data($file) {
 $language_file = array('admin', 'registration');
 $cidReset = true;
 
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php
index 93117cff42..f45222e583 100755
--- a/main/admin/usergroups.php
+++ b/main/admin/usergroups.php
@@ -10,7 +10,7 @@
 $language_file = array('admin');
 
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);