Browse Source

Commenting global.inc.

Julio Montoya 10 years ago
parent
commit
c7d8dea958
67 changed files with 143 additions and 324 deletions
  1. 1 1
      main/admin/access_url_add_courses_to_url.php
  2. 1 1
      main/admin/access_url_add_usergroup_to_url.php
  3. 2 2
      main/admin/access_url_add_users_to_url.php
  4. 1 1
      main/admin/access_url_check_user_session.php
  5. 2 2
      main/admin/access_url_edit.php
  6. 1 1
      main/admin/access_url_edit_course_category_to_url.php
  7. 1 1
      main/admin/access_url_edit_courses_to_url.php
  8. 2 2
      main/admin/access_url_edit_usergroup_to_url.php
  9. 1 1
      main/admin/access_url_edit_users_to_url.php
  10. 2 2
      main/admin/access_urls.php
  11. 1 1
      main/admin/add_courses_to_session.php
  12. 1 1
      main/admin/add_courses_to_usergroup.php
  13. 2 2
      main/admin/add_many_session_to_category.php
  14. 1 1
      main/admin/add_sessions_to_promotion.php
  15. 4 4
      main/admin/add_sessions_to_usergroup.php
  16. 1 1
      main/admin/add_students_to_session.php
  17. 1 1
      main/admin/add_teachers_to_session.php
  18. 2 2
      main/admin/add_users_to_group.php
  19. 1 1
      main/admin/add_users_to_session.php
  20. 1 1
      main/admin/archive_cleanup.php
  21. 1 1
      main/admin/calendar_view.php
  22. 1 1
      main/admin/calendar_view_print.php
  23. 2 2
      main/admin/career_dashboard.php
  24. 25 25
      main/admin/careers.php
  25. 4 4
      main/admin/cli.php
  26. 1 1
      main/admin/configure_extensions.php
  27. 1 1
      main/admin/configure_homepage.php
  28. 1 1
      main/admin/configure_inscription.php
  29. 1 1
      main/admin/configure_plugin.php
  30. 5 5
      main/admin/course_category.php
  31. 1 1
      main/admin/course_create_content.php
  32. 9 9
      main/admin/course_export.php
  33. 1 1
      main/admin/course_information.php
  34. 1 1
      main/admin/course_request_rejected.php
  35. 1 1
      main/admin/course_request_review.php
  36. 1 1
      main/admin/event_controller.php
  37. 1 1
      main/admin/event_type.php
  38. 1 1
      main/admin/extra_field_options.php
  39. 1 1
      main/admin/extra_field_workflow.php
  40. 1 1
      main/admin/extra_fields.php
  41. 1 1
      main/admin/filler.php
  42. 1 1
      main/admin/grade_models.php
  43. 1 1
      main/admin/inactive_user_list.php
  44. 1 1
      main/admin/languages.php
  45. 1 1
      main/admin/legal_add.php
  46. 1 1
      main/admin/legal_list.php
  47. 2 2
      main/admin/promotions.php
  48. 1 1
      main/admin/session_category_edit.php
  49. 1 1
      main/admin/session_course_list.php
  50. 2 2
      main/admin/skills.php
  51. 14 14
      main/admin/skills_gradebook.php
  52. 1 1
      main/admin/skills_profile.php
  53. 1 1
      main/admin/skills_wheel.php
  54. 2 2
      main/admin/specific_fields.php
  55. 2 2
      main/admin/statistics.php
  56. 1 1
      main/admin/sub_language.php
  57. 7 7
      main/admin/sub_language_add.php
  58. 2 2
      main/admin/sub_language_ajax.inc.php
  59. 1 1
      main/admin/subscribe_class2course.php
  60. 2 2
      main/admin/subscribe_user2class.php
  61. 1 1
      main/admin/subscribe_user2course.php
  62. 1 1
      main/admin/synchro.php
  63. 0 181
      main/admin/system_management.php
  64. 4 4
      main/admin/user_import.php
  65. 1 1
      main/admin/user_move_stats.php
  66. 1 1
      main/admin/usergroup_user_import.php
  67. 1 1
      main/admin/usergroups.php

+ 1 - 1
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();

+ 1 - 1
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;

+ 2 - 2
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);
 </form>
 <?php
 
-Display :: display_footer();
+Display :: display_footer();

+ 1 - 1
main/admin/access_url_check_user_session.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';
 
 //require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
 

+ 2 - 2
main/admin/access_url_edit.php

@@ -9,7 +9,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_global_admin_script();
@@ -169,4 +169,4 @@ $form->addElement('file','url_image_3','URL Image 3 (PNG)');
 
 // Submit button
 $form->addElement('style_submit_button', 'submit', $submit_name, 'class="add"');
-$form->display();
+$form->display();

+ 1 - 1
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';

+ 1 - 1
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'));

+ 2 - 2
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){
 }
 </script>
 <?php
-Display::display_footer();
+Display::display_footer();

+ 1 - 1
main/admin/access_url_edit_users_to_url.php

@@ -10,7 +10,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) . 'access_url_edit_users_to_url_functions.lib.php';
 require_once '../inc/lib/xajax/xajax.inc.php';

+ 2 - 2
main/admin/access_urls.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();
@@ -186,4 +186,4 @@ $table->set_header(5, get_lang('Active'));
 $table->set_header(6, get_lang('Modify'), false);
 $table->display();
 
-Display :: display_footer();
+Display :: display_footer();

+ 1 - 1
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;

+ 1 - 1
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';
 

+ 2 - 2
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);
 ?>

+ 1 - 1
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');

+ 4 - 4
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 '<div class="actions">';
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>'; 
+echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="javascript://" class="advanced_parameters" style="margin-top: 8px" onclick="display_advanced_search();"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'</span></a>';
 echo '</div>';
 
@@ -250,8 +250,8 @@ if(!empty($errorMsg)) {
 <tr>
   <td align="center">
   <div id="content_source">
-      <?php           
-      if (!($add_type=='multiple')) {        
+      <?php
+      if (!($add_type=='multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>

+ 1 - 1
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';
 

+ 1 - 1
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';
 

+ 2 - 2
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){
 }
 </script>
 <?php
-Display::display_footer();
+Display::display_footer();

+ 1 - 1
main/admin/add_users_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';
 $xajax = new xajax();
 

+ 1 - 1
main/admin/archive_cleanup.php

@@ -10,7 +10,7 @@ $language_file = array('admin');
 $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;

+ 1 - 1
main/admin/calendar_view.php

@@ -8,7 +8,7 @@
 // name of the language file that needs to be included
 $language_file = 'agenda';
 // including the claroline global
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 //session
 if (isset($_GET['id_session'])) {

+ 1 - 1
main/admin/calendar_view_print.php

@@ -21,7 +21,7 @@ else
 }
 
 // setting the global file that gets the general configuration, the databases, the languages, ...
-require('../inc/global.inc.php');
+//require('../inc/global.inc.php');
 
 
 

+ 2 - 2
main/admin/career_dashboard.php

@@ -11,7 +11,7 @@
 // Language files that should be included.
 $language_file = array('courses', 'index', 'admin');
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
 
 require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php';
@@ -143,4 +143,4 @@ foreach($career_array as $career_id => $data) {
     }
 }
 echo '</table>';
-Display::display_footer();
+Display::display_footer();

+ 25 - 25
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
 ).'</a>'.
-                         '\'; 
+                         '\';
                  }';
 ?>
 <script>
 $(function() {
-<?php 
+<?php
     // grid definition see the $career->display() function
-    echo Display::grid_js('careers',  $url,$columns,$column_model,$extra_params, array(), $action_links,true);       
-?> 
+    echo Display::grid_js('careers',  $url,$columns,$column_model,$extra_params, array(), $action_links,true);
+?>
 });
 </script>
 <?php
@@ -120,14 +120,14 @@ switch ($action) {
         $form = $career->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 '<div class="actions">';
@@ -137,22 +137,22 @@ switch ($action) {
                 '',
                 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 = $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 '<div class="actions">';
@@ -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();
+Display :: display_footer();

+ 4 - 4
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();

+ 1 - 1
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'));

+ 1 - 1
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;

+ 1 - 1
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();
 

+ 1 - 1
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();

+ 5 - 5
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'));
-        
+
     }?>
     </ul>
 

+ 1 - 1
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();

+ 9 - 9
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)) {
 
 <form method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
     <input type="hidden" name="formSent" value="1">
-    <legend><?php echo $tool_name; ?></legend>    
+    <legend><?php echo $tool_name; ?></legend>
 <?php if (!empty($course_list)) { ?>
-<div class="control-group">    
-    
+<div class="control-group">
+
     <div class="controls">
-        <label class="radio" for="all-courses">            
+        <label class="radio" for="all-courses">
         <input id="all-courses" class="checkbox" type="radio" value="1" name="select_type" <?php if(!$formSent || ($formSent && $select_type == 1)) echo 'checked="checked"'; ?> onclick="javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"/>
             <?php echo get_lang('ExportAllCoursesList')?>
-        </label>        
-        
+        </label>
+
         <label class="radio" for="select-courses">
             <input id="select-courses" class="checkbox" type="radio" value="2" name="select_type" <?php if($formSent && $select_type == 2) echo 'checked="checked"'; ?> onclick="javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"/>
             <?php echo get_lang('ExportSelectedCoursesFromCoursesList')?>
-        </label>        
+        </label>
     </div>
 </div>
 <div id="div-course-list" style="<?php echo (!$formSent || ($formSent && $select_type == 1))?'display:none':'display:block';?>">
@@ -134,4 +134,4 @@ if (!empty($msg)) {
 <?php } else { echo get_lang('ThereAreNotCreatedCourses'); }?>
 </form>
 <?php
-Display :: display_footer();
+Display :: display_footer();

+ 1 - 1
main/admin/course_information.php

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

+ 1 - 1
main/admin/course_request_rejected.php

@@ -18,7 +18,7 @@ $language_file = array('admin', 'create_course');
 
 $cidReset = true;
 
-require '../inc/global.inc.php';
+//require '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 

+ 1 - 1
main/admin/course_request_review.php

@@ -16,7 +16,7 @@
 $language_file = array('admin', 'create_course');
 
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();

+ 1 - 1
main/admin/event_controller.php

@@ -11,7 +11,7 @@
 $language_file = array('admin');
 $cidReset = true;
 
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 if (api_get_setting('activate_email_template') != 'true') {
     api_not_allowed();

+ 1 - 1
main/admin/event_type.php

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

+ 1 - 1
main/admin/extra_field_options.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;
 

+ 1 - 1
main/admin/extra_field_workflow.php

@@ -9,7 +9,7 @@ use \ChamiloSession as Session;
 $language_file = array('admin');
 
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 

+ 1 - 1
main/admin/extra_fields.php

@@ -11,7 +11,7 @@ $language_file = array('admin');
 $cidReset = true;
 
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 $extraFieldType =  isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
 

+ 1 - 1
main/admin/filler.php

@@ -12,7 +12,7 @@ $language_file = array('admin', 'tracking', 'create_course');
 $cidReset = true;
 
 // including some necessary chamilo files
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;

+ 1 - 1
main/admin/grade_models.php

@@ -9,7 +9,7 @@
 $language_file = array('admin', 'gradebook');
 
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 

+ 1 - 1
main/admin/inactive_user_list.php

@@ -12,7 +12,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';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);

+ 1 - 1
main/admin/languages.php

@@ -23,7 +23,7 @@ $language_file = 'admin';
 $cidReset = true;
 
 // include global script
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 require_once 'sub_language.class.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 

+ 1 - 1
main/admin/legal_add.php

@@ -9,7 +9,7 @@
  */
 $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();

+ 1 - 1
main/admin/legal_list.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();
 $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));

+ 2 - 2
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();
+Display::display_footer();

+ 1 - 1
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;

+ 1 - 1
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;

+ 2 - 2
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();
+$tpl->display_no_layout_template();

+ 14 - 14
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 \'<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 +73,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 +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;

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 2 - 2
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 '<div class="actions">';
 $form->display();
 echo '</div>';
-if (!empty($extra_fields)) { 
+if (!empty($extra_fields)) {
     $table->display();
 }
 

+ 2 - 2
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();
+Display::display_footer();

+ 1 - 1
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;
 

+ 7 - 7
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='<br/>'.get_lang('OriginalName').' : '.$original_name.'<br/>'.get_lang('EnglishName').' : '.$english_name.'<br/>'.get_lang('PlatformCharsetTitle').' : '.$isocode;
 

+ 2 - 2
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').'<br /> '.api_ucwords(get_lang('ErrorsFound')).': <br />'.$variables_with_problems;
     } else {
         echo get_lang('Saved');
-    } 
+    }
 }
 

+ 1 - 1
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();

+ 2 - 2
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);
     </table>
 </form>
 <?php
-Display :: display_footer();
+Display :: display_footer();

+ 1 - 1
main/admin/subscribe_user2course.php

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

+ 1 - 1
main/admin/synchro.php

@@ -12,7 +12,7 @@
  */
 $language_file = 'admin';
 $cidReset = true;
-require_once '../main/inc/global.inc.php';
+//require_once '../main/inc/global.inc.php';
 $this_section = SECTION_GLOBAL;
 
 //api_protect_admin_script();

+ 0 - 181
main/admin/system_management.php

@@ -1,181 +0,0 @@
-<?php
-
-/**
- * 
- * 
- * @package chamilo.admin
- * @author Laurent Opprecht <laurent@opprecht.info>
- * @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 .= "<br />".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 = '<li>' . $message2 . '</li>';
-        }
-        echo <<<EOT
-        <ul>
-        <li>
-            <div>$message</div>        
-            <a class="btn" href=$url>$go</a>
-        </li>
-        <li>
-            <div>$message_table</div>        
-            <a class="btn" href=$url_table>$go</a>
-        </li>
-        $message2
-        </ul>
-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.'<br />';
-                $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();

+ 4 - 4
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) {
 
 <blockquote>
 <pre>
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;<?php echo api_refine_encoding_id(api_get_system_encoding()); ?>&quot;?&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;<?php echo api_get_system_encoding(); ?>&quot;?&gt;
 &lt;Contacts&gt;
     &lt;Contact&gt;
         <b>&lt;LastName&gt;xxx&lt;/LastName&gt;</b>

+ 1 - 1
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();

+ 1 - 1
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);

+ 1 - 1
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);