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

Remove unused "require_once"

Browse Source 
- ChamiloIndexer.class.php and IndexableChunk.class.php
are already loaded using composer. No need to use require_once.
- Adding @todo to rework file specific_fields_manager.lib.php
pull/2487/head
jmontoyaa 9 years ago
parent 7db6d244b8
commit 1a4124cf54
21 changed files with 7 additions and 76 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. 2
      main/dashboard/dashboard_controller.php
  2. 5
      main/exercise/exercise.class.php
  3. 3
      main/exercise/question.class.php
  4. 5
      main/inc/lib/document.lib.php
  5. 7
      main/inc/lib/link.lib.php
  6. 1
      main/inc/lib/search/ChamiloIndexer.class.php
  7. 2
      main/inc/lib/search/search_widget.php
  8. 9
      main/inc/lib/search/tool_processors/document_processor.class.php
  9. 8
      main/inc/lib/search/tool_processors/learnpath_processor.class.php
  10. 9
      main/inc/lib/search/tool_processors/link_processor.class.php
  11. 10
      main/inc/lib/search/tool_processors/quiz_processor.class.php
  12. 1
      main/inc/lib/search/xapian/XapianIndexer.class.php
  13. 6
      main/inc/lib/search/xapian/XapianQuery.php
  14. 1
      main/inc/lib/specific_fields_manager.lib.php
  15. 3
      main/lp/learnpath.class.php
  16. 2
      main/lp/learnpathItem.class.php
  17. 1
      main/lp/lp_list_search.php
  18. 2
      main/lp/openoffice_presentation.class.php
  19. 2
      main/lp/openoffice_text.class.php
  20. 2
      main/lp/openoffice_text_document.class.php
  21. 2
      main/lp/scorm.class.php

2
main/dashboard/dashboard_controller.php
Unescape View File

@ -8,7 +8,7 @@
* This file contains class used like controller,
* it should be included inside a dispatcher file (e.g: index.php)
* @author Christian Fasanando <christian1827@gmail.com>
*
* @todo move to main/inc/lib
* @package chamilo.dashboard
*/
class DashboardController

5
main/exercise/exercise.class.php
Unescape View File

@ -2704,8 +2704,6 @@ class Exercise
}
$course_id = api_get_course_id();
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$specific_fields = get_specific_field_list();
@ -2772,8 +2770,6 @@ class Exercise
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$se_ref = Database::fetch_array($res);
@ -2845,7 +2841,6 @@ class Exercise
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
$row = Database::fetch_array($res);
require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
$di = new ChamiloIndexer();
$di->remove_document((int) $row['search_did']);
unset($di);

3
main/exercise/question.class.php
Unescape View File

@ -1122,9 +1122,6 @@ abstract class Question
$res = Database::query($sql);
if (Database::num_rows($res) > 0 || $addQs) {
require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php');
$di = new ChamiloIndexer();
if ($addQs) {
$question_exercises = array((int) $exerciseId);

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

@ -1349,7 +1349,6 @@ class DocumentManager
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
$row2 = Database::fetch_array($res);
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
$di = new ChamiloIndexer();
$di->remove_document((int) $row2['search_did']);
}
@ -4116,10 +4115,6 @@ class DocumentManager
$file_title = $row['title'];
$file_content = self::get_text_content($doc_path, $doc_mime);
$course_code = Database::escape_string($course_code);
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
$ic_slide = new IndexableChunk();
$ic_slide->addValue('title', $file_title);
$ic_slide->addCourseId($course_code);

7
main/inc/lib/link.lib.php
Unescape View File

@ -218,8 +218,6 @@ class Link extends Model
if ((api_get_setting('search_enabled') == 'true') &&
$link_id && extension_loaded('xapian')
) {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$course_int_id = $_course['real_id'];
@ -459,8 +457,7 @@ class Link extends Model
$sql = sprintf($sql, $tbl_se_ref, $course_id, TOOL_LINK, $link_id);
$res = Database:: query($sql);
if (Database:: num_rows($res) > 0) {
$row = Database:: fetch_array($res);
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
$row = Database::fetch_array($res);
$di = new ChamiloIndexer();
$di->remove_document((int) $row['search_did']);
}
@ -603,8 +600,6 @@ class Link extends Model
$res = Database:: query($sql);
if (Database:: num_rows($res) > 0) {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$se_ref = Database:: fetch_array($res);

1
main/inc/lib/search/ChamiloIndexer.class.php
Unescape View File

@ -5,7 +5,6 @@
* @package chamilo.include.search
*/
require_once __DIR__.'/../../global.inc.php';
include_once 'xapian/XapianIndexer.class.php';
/**
* Class wrapper

2
main/inc/lib/search/search_widget.php
Unescape View File

@ -4,8 +4,6 @@
* Search widget. Shows the search screen contents.
* @package chamilo.include.search
*/
require_once __DIR__.'/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
/**

9
main/inc/lib/search/tool_processors/document_processor.class.php
Unescape View File

@ -1,13 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* @package chamilo.include.search
*/
include_once __DIR__.'/../../../global.inc.php';
require_once __DIR__.'/search_processor.class.php';
/**
* Process documents before pass it to search listing scripts
* @package chamilo.include.search
@ -24,7 +17,7 @@ class document_processor extends search_processor
$results = array();
foreach ($this->rows as $row_val) {
$search_show_unlinked_results = (api_get_setting('search_show_unlinked_results') == 'true');
$course_visible_for_user = api_is_course_visible_for_user(NULL, $row_val['courseid']);
$course_visible_for_user = api_is_course_visible_for_user(null, $row_val['courseid']);
// can view course?
if ($course_visible_for_user || $search_show_unlinked_results) {
// is visible?

8
main/inc/lib/search/tool_processors/learnpath_processor.class.php
Unescape View File

@ -1,14 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* @package chamilo.include.search
*/
include_once __DIR__.'/../../../global.inc.php';
require_once __DIR__.'/search_processor.class.php';
require_once __DIR__.'/../IndexableChunk.class.php';
/**
* Process learning paths before pass it to search listing scripts
* @package chamilo.include.search

9
main/inc/lib/search/tool_processors/link_processor.class.php
Unescape View File

@ -1,13 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* @package chamilo.include.search
*/
include_once __DIR__.'/../../../global.inc.php';
require_once __DIR__.'/search_processor.class.php';
/**
* Process links before pass it to search listing scripts
* @package chamilo.include.search
@ -41,7 +34,7 @@ class link_processor extends search_processor
foreach ($this->links as $courseCode => $one_course_links) {
$course_info = api_get_course_info($courseCode);
$search_show_unlinked_results = (api_get_setting('search_show_unlinked_results') == 'true');
$course_visible_for_user = api_is_course_visible_for_user(NULL, $courseCode);
$course_visible_for_user = api_is_course_visible_for_user(null, $courseCode);
// can view course?
if ($course_visible_for_user || $search_show_unlinked_results) {
$result = NULL;

10
main/inc/lib/search/tool_processors/quiz_processor.class.php
Unescape View File

@ -1,13 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* @package chamilo.include.search
*/
include_once __DIR__.'/../../../global.inc.php';
require_once __DIR__.'/search_processor.class.php';
/**
* Process exercises before pass it to search listing scripts
* @package chamilo.include.search
@ -15,7 +8,6 @@ require_once __DIR__.'/search_processor.class.php';
class quiz_processor extends search_processor
{
public $exercices = array();
public function __construct($rows)
{
$this->rows = $rows;
@ -26,7 +18,7 @@ class quiz_processor extends search_processor
switch ($row_val['xapian_data'][SE_DATA]['type']) {
case SE_DOCTYPE_EXERCISE_EXERCISE:
$exercise_id = $se_data['exercise_id'];
$question = NULL;
$question = null;
$item = array(
'courseid' => $courseid,
'question' => $question,

1
main/inc/lib/search/xapian/XapianIndexer.class.php
Unescape View File

@ -6,7 +6,6 @@
*/
require_once 'xapian.php';
require_once __DIR__.'/../IndexableChunk.class.php';
/**
* Abstract helper class

6
main/inc/lib/search/xapian/XapianQuery.php
Unescape View File

@ -4,14 +4,10 @@
/**
* @package chamilo.include.search
*/
/**
* Code
*/
require_once 'xapian.php';
require_once __DIR__.'/../IndexableChunk.class.php';
//TODO: think another way without including specific fields here
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/');
/**

1
main/inc/lib/specific_fields_manager.lib.php
Unescape View File

@ -1,6 +1,7 @@
<?php
/**
* Manage specific tools
* @todo convert into a class
* @package chamilo.library
*/

3
main/lp/learnpath.class.php
Unescape View File

@ -1265,7 +1265,6 @@ class learnpath
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
$row2 = Database::fetch_array($res);
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
$di = new ChamiloIndexer();
$di->remove_document((int) $row2['search_did']);
}
@ -4890,9 +4889,7 @@ class learnpath
return false;
require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/xapian/XapianQuery.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
$items_table = Database::get_course_table(TABLE_LP_ITEM);
// TODO: Make query secure agains XSS : use member attr instead of post var.

2
main/lp/learnpathItem.class.php
Unescape View File

@ -331,7 +331,6 @@ class learnpathItem
if (api_get_setting('search_enabled') == 'true') {
if (!is_null($this->search_did)) {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
$di = new ChamiloIndexer();
$di->remove_document($this->search_did);
}
@ -3230,7 +3229,6 @@ class learnpathItem
global $charset;
$course_id = api_get_course_int_id();
$lp_item = Database::get_course_table(TABLE_LP_ITEM);
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
$a_terms = preg_split('/,/', $terms);
$i_terms = preg_split('/,/', $this->get_terms());
foreach ($i_terms as $term) {

1
main/lp/lp_list_search.php
Unescape View File

@ -12,7 +12,6 @@
require api_get_path(LIBRARY_PATH).'search/search_widget.php';
require api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
Event::event_access_tool(TOOL_SEARCH);

2
main/lp/openoffice_presentation.class.php
Unescape View File

@ -16,8 +16,6 @@
require_once 'openoffice_document.class.php';
if (api_get_setting('search_enabled') == 'true') {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
}

2
main/lp/openoffice_text.class.php
Unescape View File

@ -16,8 +16,6 @@
require_once 'openoffice_document.class.php';
if (api_get_setting('search_enabled') == 'true') {
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
}
/**

2
main/lp/openoffice_text_document.class.php
Unescape View File

@ -14,8 +14,6 @@
*/
require_once 'openoffice_document.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
/**
* @package chamilo.learnpath.openofficedocument

2
main/lp/scorm.class.php
Unescape View File

@ -462,8 +462,6 @@ class scorm extends learnpath
// Code for indexing, now only index specific fields like terms and the title.
if (!empty($_POST['index_document'])) {
require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$di = new ChamiloIndexer();

Write Preview
Loading…
Cancel
Save