Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x

1.9.x
Yannick Warnier 11 years ago
commit bbfa1f1351
  1. 7
      main/install/configuration.dist.php
  2. 4
      main/newscorm/lp_controller.php
  3. 5
      main/newscorm/lp_list.php

@ -3,7 +3,7 @@
// File generated by /install/index.php script - {DATE_GENERATED}
/* For licensing terms, see /license.txt */
/**
* Virtual campus configuration
* Campus configuration
*
* This file contains a list of variables that can be modified by the campus
* site's server administrator. Pay attention when changing these variables,
@ -81,7 +81,6 @@ $_configuration['course_folder'] = "courses/";
$_configuration['db_admin_path'] = '';
/**
*
* Login modules settings
*/
// CAS IMPLEMENTATION
@ -195,4 +194,6 @@ $_configuration['system_stable'] = NEW_VERSION_STABLE;
// Allow course tutors in sessions to add existing students to their session
//$_configuration['allow_tutors_to_assign_students_to_session'] = 'false';
// Allow select the return link in the LP view
//$_configuration['allow_lp_return_link'] = 'false';
//$_configuration['allow_lp_return_link'] = false;
// If true the export link is blocked.
//$_configuration['hide_scorm_export_link'] = false;

@ -694,6 +694,10 @@ switch ($action) {
if (!$is_allowed_to_edit) {
api_not_allowed(true);
}
global $_configuration;
if (isset($_configuration['hide_scorm_export_link']) && $_configuration['hide_scorm_export_link']) {
api_not_allowed(true);
}
if ($debug > 0) error_log('New LP - export action triggered', 0);
if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; }
else {

@ -434,6 +434,11 @@ if (!empty($flat_list)) {
$export_icon = ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&lp_id='.$id.'">'.Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL).'</a>';
}
global $_configuration;
if (isset($_configuration['hide_scorm_export_link']) && $_configuration['hide_scorm_export_link']) {
$dsp_disk = null;
}
echo $dsp_line.$start_time.$end_time.$dsp_progress.$dsp_desc.$dsp_export.$dsp_edit.$dsp_build.$dsp_edit_lp.$dsp_visible.$dsp_publish.$dsp_reinit.
$dsp_default_view.$dsp_debug.$dsp_disk.$copy.$lp_auto_lunch_icon.$export_icon.$dsp_delete.$dsp_order.$dsp_edit_close;

Loading…
Cancel
Save