Renaming main_api.lib.php to api.lib.php

main/inc/global.inc.php

@@ -67,7 +67,7 @@ $_configuration['dokeos_stable']    = $_configuration['system_stable'];
 $userPasswordCrypted                = $_configuration['password_encryption'];
 
 // Include the main Chamilo platform library file.
-require_once $includePath.'/lib/main_api.lib.php';
+require_once $includePath.'/lib/api.lib.php';
 
 //Check the PHP version
 api_check_php_version($includePath.'/');
@@ -104,6 +104,9 @@ require_once $lib_path.'array.lib.php';
 require_once $lib_path.'events.lib.inc.php';
 require_once $lib_path.'course.lib.php';
 require_once $lib_path.'online.inc.php';
+require_once $lib_path.'banner.lib.php';
+require_once $lib_path.'fileManage.lib.php';
+require_once $lib_path.'fileUpload.lib.php';
 
 define('_MPDF_TEMP_PATH', api_get_path(SYS_ARCHIVE_PATH).'mpdf/');
 if (!is_dir(_MPDF_TEMP_PATH)) {
@@ -196,7 +199,7 @@ if (!Database::select_db($_configuration['main_database'], $database_connection)
 // The platform's character set must be retrieved at this early moment.
 $sql = "SELECT selected_value FROM settings_current WHERE variable = 'platform_charset';";
 $result = Database::query($sql);
-while ($row = @Database::fetch_array($result)) {
+while ($row = Database::fetch_array($result)) {
     $charset = $row[0];
 }
 if (empty($charset)) {
@@ -306,8 +309,6 @@ foreach ($result as & $row) {
 
 // Load allowed tag definitions for kses and/or HTMLPurifier.
 require_once $lib_path.'formvalidator/Rule/allowed_tags.inc.php';
-// Load HTMLPurifier.
-//require_once $lib_path.'htmlpurifier/library/HTMLPurifier.auto.php'; // It will be loaded later, in a lazy manner.
 
 // Before we call local.inc.php, let's define a global $this_section variable
 // which will then be usable from the banner and header scripts

main/inc/lib/api.lib.php

@@ -286,6 +286,7 @@ define('INCLUDE_PATH', 'INCLUDE_PATH');
 define('LIBRARY_PATH', 'LIBRARY_PATH');
 define('CONFIGURATION_PATH', 'CONFIGURATION_PATH');
 define('WEB_LIBRARY_PATH', 'WEB_LIBRARY_PATH');
+define('WEB_LIBRARY_JS_PATH', 'WEB_LIBRARY_JS_PATH');
 define('WEB_AJAX_PATH', 'WEB_AJAX_PATH');
 define('SYS_TEST_PATH', 'SYS_TEST_PATH');
 define('WEB_TEMPLATE_PATH', 'WEB_TEMPLATE_PATH');
@@ -293,6 +294,10 @@ define('SYS_TEMPLATE_PATH', 'SYS_TEMPLATE_PATH');
 define('WEB_FONTS_PATH', 'WEB_FONTS_PATH');
 define('SYS_FONTS_PATH', 'SYS_FONTS_PATH');
 
+define('SYS_DEFAULT_COURSE_DOCUMENT_PATH', 'SYS_DEFAULT_COURSE_DOCUMENT_PATH');
+define('REL_DEFAULT_COURSE_DOCUMENT_PATH', 'REL_DEFAULT_COURSE_DOCUMENT_PATH');
+define('WEB_DEFAULT_COURSE_DOCUMENT_PATH', 'WEB_DEFAULT_COURSE_DOCUMENT_PATH');
+
 // Constants for requesting path conversion.
 define('TO_WEB', 'TO_WEB');
 define('TO_SYS', 'TO_SYS');
@@ -369,6 +374,12 @@ define('HOOK_EVENT_TYPE_PRE', 0);
 define('HOOK_EVENT_TYPE_POST', 1);
 define('HOOK_EVENT_TYPE_ALL', 10);
 
+define('CAREER_STATUS_ACTIVE', 1);
+define('CAREER_STATUS_INACTIVE', 0);
+
+define('PROMOTION_STATUS_ACTIVE',  1);
+define('PROMOTION_STATUS_INACTIVE', 0);
+
 /**
  * Inclusion of internationalization libraries
  */
@@ -442,6 +453,7 @@ require_once __DIR__.'/internationalization.lib.php';
  * api_get_path(WEB_IMG_PATH)                   http://www.mychamilo.org/chamilo/main/img/
  * api_get_path(WEB_CSS_PATH)                   http://www.mychamilo.org/chamilo/main/css/
  * api_get_path(WEB_LIBRARY_PATH)               http://www.mychamilo.org/chamilo/main/inc/lib/
+ * api_get_path(WEB_LIBRARY_JS_PATH)            http://www.mychamilo.org/chamilo/web/Chamilo/javascript
  * api_get_path(WEB_TEMPLATE_PATH)              http://www.mychamilo.org/chamilo/main/template/
  *
  *
@@ -486,6 +498,7 @@ function api_get_path($path_type, $path = null)
         LIBRARY_PATH            => 'inc/lib/',
         CONFIGURATION_PATH      => 'inc/conf/',
         WEB_LIBRARY_PATH        => 'inc/lib/',
+        WEB_LIBRARY_JS_PATH     => 'inc/lib/javascript/',
         WEB_AJAX_PATH           => 'inc/ajax/',
         SYS_TEST_PATH           => 'tests/',
         WEB_TEMPLATE_PATH       => 'template/',
@@ -589,6 +602,10 @@ function api_get_path($path_type, $path = null)
         $paths[WEB_CODE_PATH]           = $root_web.$code_folder;
         $paths[SYS_CODE_PATH]           = $root_sys.$code_folder;
 
+        $paths[WEB_DEFAULT_COURSE_DOCUMENT_PATH] = $paths[WEB_CODE_PATH].'default_course_document/';
+        $paths[REL_DEFAULT_COURSE_DOCUMENT_PATH] = $paths[REL_PATH].'main/default_course_document/';
+
+
         // Now we can switch into api_get_path() "terminology".
         $paths[SYS_LANG_PATH]           = $paths[SYS_CODE_PATH].$paths[SYS_LANG_PATH];
         $paths[SYS_PLUGIN_PATH]         = $paths[SYS_PATH].$paths[SYS_PLUGIN_PATH];
@@ -601,6 +618,8 @@ function api_get_path($path_type, $path = null)
         $paths[WEB_CSS_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_CSS_PATH];
         $paths[WEB_IMG_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_IMG_PATH];
         $paths[WEB_LIBRARY_PATH]        = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_PATH];
+        $paths[WEB_LIBRARY_JS_PATH]     = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_JS_PATH];
+
         $paths[WEB_AJAX_PATH]           = $paths[WEB_CODE_PATH].$paths[WEB_AJAX_PATH];
         $paths[WEB_FONTS_PATH]          = $paths[WEB_CODE_PATH].$paths[WEB_FONTS_PATH];