chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removes require_once

Browse Source
1.10.x
Julio Montoya 11 years ago
parent befe408629
commit bd8ea4f8b2
19 changed files with 71 additions and 78 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      main/inc/ajax/document.ajax.php
  2. 2
      main/inc/ajax/lp.ajax.php
  3. 4
      main/inc/course_document.inc.php
  4. 1
      main/inc/global.inc.php
  5. 20
      main/inc/lib/api.lib.php
  6. 25
      main/inc/lib/document.lib.php
  7. 3
      main/inc/lib/fileDisplay.lib.php
  8. 20
      main/inc/lib/group_portal_manager.lib.php
  9. 2
      main/inc/lib/message.lib.php
  10. 2
      main/inc/lib/nanogong.lib.php
  11. 2
      main/install/index.php
  12. 1
      main/resourcelinker/resourcelinker.inc.php
  13. 3
      main/work/edit.php
  14. 3
      main/work/upload.php
  15. 3
      main/work/upload_from_template.php
  16. 3
      main/work/work.lib.php
  17. 3
      main/work/work.php
  18. 1
      tests/main/inc/lib/fileDisplay.lib.test.php

1
main/inc/ajax/document.ajax.php
Unescape View File

@ -35,7 +35,6 @@ switch ($action) {
//$ifExists = isset($_POST['if_exists']) ? $_POST['if_exists'] : $defaultFileExistsOption;
if (!empty($_FILES)) {
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$file = $_FILES['file'];
$result = DocumentManager::upload_document(
$_FILES,

2
main/inc/ajax/lp.ajax.php
Unescape View File

@ -114,8 +114,6 @@ switch ($action) {
exit;
}
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
foreach (array('video', 'audio') as $type) {

4
main/inc/course_document.inc.php
Unescape View File

@ -9,11 +9,7 @@ require 'global.inc.php';
/* Libraries */
require_once api_get_path(LIBRARY_PATH).'course_document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fckeditor/repository.php';
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
//require_once api_get_path(LIBRARY_PATH).'tablesort.lib.php'; moved to autoload
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
//if(!$is_in_admin){

1
main/inc/global.inc.php
Unescape View File

@ -107,6 +107,7 @@ 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';
require_once $lib_path.'fileDisplay.lib.php';
define('_MPDF_TEMP_PATH', api_get_path(SYS_ARCHIVE_PATH).'mpdf/');
if (!is_dir(_MPDF_TEMP_PATH)) {

20
main/inc/lib/api.lib.php
Unescape View File

@ -380,6 +380,26 @@ define('CAREER_STATUS_INACTIVE', 0);
define('PROMOTION_STATUS_ACTIVE', 1);
define('PROMOTION_STATUS_INACTIVE', 0);
// Group permissions
define('GROUP_PERMISSION_OPEN', '1');
define('GROUP_PERMISSION_CLOSED', '2');
// Group user permissions
define('GROUP_USER_PERMISSION_ADMIN', '1'); // the admin of a group
define('GROUP_USER_PERMISSION_READER', '2'); // a normal user
define('GROUP_USER_PERMISSION_PENDING_INVITATION', '3'); // When an admin/moderator invites a user
define('GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER', '4'); // an user joins a group
define('GROUP_USER_PERMISSION_MODERATOR', '5'); // a moderator
define('GROUP_USER_PERMISSION_ANONYMOUS', '6'); // an anonymous user
define('GROUP_USER_PERMISSION_HRM', '7'); // a human resources manager
define('GROUP_IMAGE_SIZE_ORIGINAL', 1);
define('GROUP_IMAGE_SIZE_BIG', 2);
define('GROUP_IMAGE_SIZE_MEDIUM', 3);
define('GROUP_IMAGE_SIZE_SMALL', 4);
define('GROUP_TITLE_LENGTH', 50);
/**
* Inclusion of internationalization libraries
*/

25
main/inc/lib/document.lib.php
Unescape View File

@ -1332,6 +1332,7 @@ class DocumentManager
path LIKE BINARY '$path' AND
session_id = $sessionId
LIMIT 1";
$result = Database::query($sql);
if (Database::num_rows($result)) {
$row = Database::fetch_array($result);
@ -3665,7 +3666,6 @@ class DocumentManager
$overwrite_url = null,
$folderId = false
) {
require_once api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php';
$return = '';
if (!empty($documents)) {
@ -4612,6 +4612,29 @@ class DocumentManager
}
}
/**
* Update the document name
* @param int $documentId The document id
* @param string $newName The new name
*/
public static function renameDocument($documentId, $newName)
{
$documentId = intval($documentId);
$newName = Database::escape_string($newName);
$docuentTable = Database::get_course_table(TABLE_DOCUMENT);
$values = array(
'title' => $newName
);
$whereConditions = array(
'id = ?' => $documentId
);
Database::update($docuentTable, $values, $whereConditions);
}
/**
* Get folder/file suffix
*

3
main/inc/lib/fileDisplay.lib.php
Unescape View File

@ -6,9 +6,6 @@
*
* @package chamilo.library
*/
/**
* Code
*/
/* FILE DISPLAY FUNCTIONS */
/**

20
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -1,26 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
// Group permissions
define('GROUP_PERMISSION_OPEN', '1');
define('GROUP_PERMISSION_CLOSED', '2');
// Group user permissions
define('GROUP_USER_PERMISSION_ADMIN', '1'); // the admin of a group
define('GROUP_USER_PERMISSION_READER', '2'); // a normal user
define('GROUP_USER_PERMISSION_PENDING_INVITATION', '3'); // When an admin/moderator invites a user
define('GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER', '4'); // an user joins a group
define('GROUP_USER_PERMISSION_MODERATOR', '5'); // a moderator
define('GROUP_USER_PERMISSION_ANONYMOUS', '6'); // an anonymous user
define('GROUP_USER_PERMISSION_HRM', '7'); // a human resources manager
define('GROUP_IMAGE_SIZE_ORIGINAL', 1);
define('GROUP_IMAGE_SIZE_BIG', 2);
define('GROUP_IMAGE_SIZE_MEDIUM', 3);
define('GROUP_IMAGE_SIZE_SMALL', 4);
define('GROUP_TITLE_LENGTH', 50);
/**
* Class GroupPortalManager
* This library provides functions for the group management.

2
main/inc/lib/message.lib.php
Unescape View File

@ -3,8 +3,6 @@
require_once api_get_path(LIBRARY_PATH).'online.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
define('MESSAGE_STATUS_NEW', '0');
define('MESSAGE_STATUS_UNREAD', '1');

2
main/inc/lib/nanogong.lib.php
Unescape View File

@ -286,8 +286,6 @@ class Nanogong
*/
public function upload_file($is_nano = false)
{
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
if (!empty($_FILES)) {

2
main/install/index.php
Unescape View File

@ -30,7 +30,7 @@ define('MAX_FORM_FIELD_LENGTH', 80);
/* PHP VERSION CHECK */
// Including necessary libraries.
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/api.lib.php';
api_check_php_version('../inc/');

1
main/resourcelinker/resourcelinker.inc.php
Unescape View File

@ -22,7 +22,6 @@ use \ChamiloSession as Session;
//include(api_get_path(SYS_CODE_PATH).'lang/english/resourcelinker.inc.php'); // TODO: Repeated deleting and moving the rest of this lang file to trad4all
//include(api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php'); // TODO: Repeated deleting and moving the rest of this lang file to trad4all
include_once(api_get_path(LIBRARY_PATH).'fileDisplay.lib.php');
include(api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php');
/**

3
main/work/edit.php
Unescape View File

@ -12,9 +12,6 @@ api_protect_course_script(true);
// Including files
require_once 'work.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$this_section = SECTION_COURSES;

3
main/work/upload.php
Unescape View File

@ -12,9 +12,6 @@ api_protect_course_script(true);
// Including necessary files
require_once 'work.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$this_section = SECTION_COURSES;

3
main/work/upload_from_template.php
Unescape View File

@ -12,9 +12,6 @@ api_protect_course_script(true);
// Including necessary files
require_once 'work.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$this_section = SECTION_COURSES;

3
main/work/work.lib.php
Unescape View File

@ -15,9 +15,6 @@ use ChamiloSession as Session;
*/
require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
$addDocumentToWork = api_get_configuration_value('add_document_to_work');

3
main/work/work.php
Unescape View File

@ -17,9 +17,6 @@ api_protect_course_script(true);
require_once 'work.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
$course_id = api_get_course_int_id();
$course_info = api_get_course_info();

1
tests/main/inc/lib/fileDisplay.lib.test.php
Unescape View File

@ -1,5 +1,4 @@
<?php
require_once(api_get_path(LIBRARY_PATH).'fileDisplay.lib.php');
class TestFileDisplay extends UnitTestCase {
public function TestFileDisplay(){

Write Preview
Loading…
Cancel
Save