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

Minor - removing require_once libs already added in global.inc.php

Browse Source
skala
Julio Montoya 12 years ago
parent 482a9832c9
commit a4ce9f2ea3
11 changed files with 42 additions and 71 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/exercice/admin.php
  2. 1
      main/exercice/exercise.lib.php
  3. 1
      main/exercice/qti2.php
  4. 1
      main/glossary/index.php
  5. 45
      main/inc/lib/export.lib.inc.php
  6. 16
      main/inc/lib/fileUpload.lib.php
  7. 2
      main/inc/lib/online.inc.php
  8. 6
      main/newscorm/lp_ajax_save_item.php
  9. 25
      main/newscorm/lp_build.php
  10. 11
      main/tracking/courseLogCSV.php
  11. 3
      tests/main/admin/calendar.lib.test.php

2
main/exercice/admin.php
Unescape View File

@ -72,8 +72,6 @@ if (!$is_allowedToEdit) {
api_not_allowed(true);
}
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
/* stripslashes POST data */
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
foreach ($_POST as $key => $val) {

1
main/exercice/exercise.lib.php
Unescape View File

@ -662,7 +662,6 @@ function showQuestion($questionId, $only_questions = false, $origin = false, $cu
// Question is a HOT_SPOT
//checking document/images visibility
if (api_is_platform_admin() || api_is_course_admin()) {
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
$course = api_get_course_info();
$doc_id = DocumentManager::get_document_id($course, '/images/'.$pictureName);
if (is_numeric($doc_id)) {

1
main/exercice/qti2.php
Unescape View File

@ -14,7 +14,6 @@ $language_file = 'exercice';
// including the global Chamilo file
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
// including additional libraries
require_once 'exercise.class.php';

1
main/glossary/index.php
Unescape View File

@ -11,7 +11,6 @@ $language_file = array('glossary', 'admin');
// Including the global initialization file.
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$current_course_tool = TOOL_GLOSSARY;

45
main/inc/lib/export.lib.inc.php
Unescape View File

@ -12,7 +12,6 @@
* Code
*/
require_once 'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'pdf.lib.php';
/**
*
@ -24,7 +23,7 @@ class Export {
}
/**
*
*
* @deprecated use export_table_csv_utf8 instead
*/
public static function export_table_csv ($data, $filename = 'export') {
@ -46,7 +45,7 @@ class Export {
DocumentManager :: file_send_for_download($file, true, $filename.'.csv');
return false;
}
/**
* Export tabular data to CSV-file
* @param array $data
@ -167,33 +166,33 @@ class Export {
}
return $string;
}
/**
*
* @param array table in array format to be read with the HTML_table class
/**
*
* @param array table in array format to be read with the HTML_table class
*/
public static function export_table_pdf($data, $params = array()) {
$table_html = self::convert_array_to_html($data, $params);
public static function export_table_pdf($data, $params = array()) {
$table_html = self::convert_array_to_html($data, $params);
$params['format'] = isset($params['format']) ? $params['format'] : 'A4';
$params['orientation'] = isset($params['orientation']) ? $params['orientation'] : 'P';
$pdf = new PDF($params['format'], $params['orientation'], $params);
$pdf = new PDF($params['format'], $params['orientation'], $params);
$pdf->html_to_pdf_with_template($table_html);
}
public static function export_html_to_pdf($html, $params = array()) {
public static function export_html_to_pdf($html, $params = array()) {
$params['format'] = isset($params['format']) ? $params['format'] : 'A4';
$params['orientation'] = isset($params['orientation']) ? $params['orientation'] : 'P';
$pdf = new PDF($params['format'], $params['orientation'], $params);
$pdf->html_to_pdf_with_template($html);
$pdf = new PDF($params['format'], $params['orientation'], $params);
$pdf->html_to_pdf_with_template($html);
}
public static function convert_array_to_html($data, $params = array()) {
public static function convert_array_to_html($data, $params = array()) {
$headers = $data[0];
unset($data[0]);
$header_attributes = isset($params['header_attributes']) ? $params['header_attributes'] : array();
unset($data[0]);
$header_attributes = isset($params['header_attributes']) ? $params['header_attributes'] : array();
$table = new HTML_Table(array('class' => 'data_table', 'repeat_header' => '1'));
$row = 0;
$column = 0;
@ -201,14 +200,14 @@ class Export {
$table->setHeaderContents($row, $column, $header);
$attributes = array();
if (isset($header_attributes) && isset($header_attributes[$column])) {
$attributes = $header_attributes[$column];
$attributes = $header_attributes[$column];
}
if (!empty($attributes)) {
$table->updateCellAttributes($row, $column, $attributes);
}
$column++;
}
$row++;
$row++;
foreach ($data as &$printable_data_row) {
$column = 0;
foreach ($printable_data_row as &$printable_data_cell) {

16
main/inc/lib/fileUpload.lib.php
Unescape View File

@ -1,16 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
/**
* FILE UPLOAD LIBRARY
*
* This is the file upload library for Chamilo.
* Include/require it in your code to use its functionality.
*
* @package chamilo.library
* @todo test and reorganise
*/
/**
* Code
*/
require_once api_get_path(LIBRARY_PATH).'document.lib.php';

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

@ -130,7 +130,7 @@ class Online {
return true;
}
function user_is_online($user_id) {
static function user_is_online($user_id) {
$track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLINE);
$table_user = Database::get_main_table(TABLE_MAIN_USER);

6
main/newscorm/lp_ajax_save_item.php
Unescape View File

@ -20,7 +20,9 @@ $use_anonymous = true;
// Name of the language file that needs to be included.
$language_file[] = 'learnpath';
require_once 'back_compat.inc.php';
// Including the global initialization file.
require_once '../inc/global.inc.php';
require_once 'learnpath.class.php';
require_once 'scorm.class.php';
require_once 'aicc.class.php';
@ -84,7 +86,7 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
$prereq_check = $mylp->prerequisites_match($item_id);
$check_attempts = $mylp->check_item_attempts($item_id);
if (!$check_attempts) {
return false;
}

25
main/newscorm/lp_build.php
Unescape View File

@ -12,7 +12,7 @@
*/
/**
* INIT SECTION
* INIT SECTION
*/
$_SESSION['whereami'] = 'lp/build';
@ -20,11 +20,6 @@ $this_section = SECTION_COURSES;
api_protect_course_script();
/* Libraries */
// The main_api.lib.php, database.lib.php and display.lib.php
// libraries are included by default.
include 'learnpath_functions.inc.php';
//include '../resourcelinker/resourcelinker.inc.php';
include 'resourcelinker.inc.php';
@ -128,8 +123,8 @@ echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span4">';
// Build the tree with the menu items in it.
echo $_SESSION['oLP']->return_new_tree();
echo '</div>';
echo $_SESSION['oLP']->return_new_tree();
echo '</div>';
echo '<div class="span8">';
if (isset($is_success) && $is_success === true) {
@ -142,18 +137,18 @@ if (isset($is_success) && $is_success === true) {
$gradebook = isset($_GET['gradebook']) ? Security::remove_XSS($_GET['gradebook']) : null;
echo Display::page_subheader(get_lang('LearnPathAddedTitle'));
echo '<ul id="lp_overview" class="thumbnails">';
echo show_block('lp_controller.php?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add_item&amp;type=step&amp;lp_id=' . $_SESSION['oLP']->lp_id, get_lang("NewStep"), get_lang('NewStepComment'), 'tools.png');
// echo show_block('lp_controller.php?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=admin_view&amp;updateaudio=true&amp;lp_id=' . $_SESSION['oLP']->lp_id, get_lang("BasicOverview"), get_lang('BasicOverviewComment'), 'audio.png');
echo show_block('lp_controller.php?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=view&amp;lp_id=' . $_SESSION['oLP']->lp_id, get_lang("Display"), get_lang('DisplayComment'), 'view.png');
//echo show_block('lp_controller.php?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=edit&amp;lp_id=' . $_SESSION['oLP']->lp_id, get_lang("Settings"), null, 'reference.png');
echo '</ul>';
echo '</ul>';
}
echo '</div>';
echo '</div>';

11
main/tracking/courseLogCSV.php
Unescape View File

@ -118,11 +118,11 @@ if ($is_allowedToTrack) {
// BEGIN % visited
// sum of all items (= multiple learningpaths + SCORM imported paths)
$sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv " .
"INNER JOIN $tbl_learnpath_view v
"INNER JOIN $tbl_learnpath_view v
ON iv.lp_view_id = v.id " .
"WHERE
v.c_id = $course_id AND
iv.c_id = $course_id AND
iv.c_id = $course_id AND
v.user_id = " . $results[$j][0];
$total_lpath_items = getOneResult($sql);
@ -130,7 +130,7 @@ if ($is_allowedToTrack) {
$sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) " .
"FROM $tbl_learnpath_item_view iv " .
"INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id " .
"WHERE
"WHERE
v.c_id = $course_id AND
iv.c_id = $course_id AND
v.user_id = " . $results[$j][0] . " " .
@ -272,7 +272,7 @@ if ($is_allowedToTrack) {
FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
WHERE
cl.c_id = $course_id AND
sl.links_link_id = cl.id AND
sl.links_link_id = cl.id AND
sl.links_cours_id = '$_cid'
GROUP BY cl.title, cl.url";
@ -371,7 +371,7 @@ if ($is_allowedToTrack) {
"FROM $tbl_learnpath_item i " .
"INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
"INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
"WHERE i.c_id = $course_id AND
"WHERE i.c_id = $course_id AND
iv.c_id = $course_id AND
v.c_id = $course_id AND
v.user_id=$studentId and v.lp_id=$contentId ORDER BY v.id, i.id";
@ -379,7 +379,6 @@ if ($is_allowedToTrack) {
$ar3 = Database::fetch_array($result3);
$title_line .= get_lang('ScormTitleColumn') . ";" . get_lang('ScormStatusColumn') . ";" . get_lang('ScormScoreColumn') . ";" . get_lang('ScormTimeColumn');
while ($ar3['status'] != '') {
require_once '../newscorm/learnpathItem.class.php';
$time = learnpathItem::get_scorm_time('php', $ar3['total_time']);
$line .= $title . ";" . $ar3['status'] . ";" . $ar3['score'] . ";" . $time;
$ar3 = Database::fetch_array($result3);

3
tests/main/admin/calendar.lib.test.php
Unescape View File

@ -1,9 +1,6 @@
<?php
require_once(api_get_path(LIBRARY_PATH) . "/fckeditor/fckeditor.php");
//require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
require_once(api_get_path(LIBRARY_PATH).'icalcreator/iCalcreator.class.php');
//require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
class TestCalendar extends UnitTestCase {

Write Preview
Loading…
Cancel
Save