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

Removing useless content maker and proximity when uploading scorm packages see #3687 addin lang var SupportedScormContentMakers

Browse Source
skala
Julio Montoya 14 years ago
parent 089ee2ba08
commit 9cbb8e3d1f
5 changed files with 26 additions and 36 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. 7
      main/newscorm/lp_list.php
  2. 20
      main/newscorm/lp_upload.php
  3. 30
      main/upload/form.scorm.php
  4. 3
      main/upload/upload.php
  5. 2
      main/upload/upload.scorm.php

7
main/newscorm/lp_list.php
Unescape View File

@ -9,9 +9,6 @@
* @package chamilo.learnpath
* @author Yannick Warnier <ywarnier@beeznest.org>
*/
/**
* Code
*/
$this_section = SECTION_COURSES;
if (empty($lp_controller_touched) || $lp_controller_touched != 1) {
header('location: lp_controller.php?action=list');
@ -92,7 +89,6 @@ if ($is_allowed_to_edit) {
Display::display_normal_message(api_failure::get_last_failure());
}
//include 'content_makers.inc.php';
echo '<div class="actions">';
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_lp">'.Display::return_icon('new_learnpath.png', get_lang('_add_learnpath'),'','32').'</a>' .
str_repeat('&nbsp;', 3).
@ -214,7 +210,8 @@ if (is_array($flat_list)) {
$url_start_lp = 'lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$id;
$name = Security::remove_XSS($details['lp_name']);
if ($is_allowed_to_edit) {
$dsp_desc = '<em>'.$details['lp_maker'].'</em> &nbsp;'.$details['lp_proximity'].' '.(learnpath::is_lp_visible_for_student($id, api_get_user_id())?'':' - ('.get_lang('LPNotVisibleToStudent').')');
//&nbsp;'.$details['lp_proximity'].'
$dsp_desc = '<em>'.$details['lp_maker'].'</em> '.(learnpath::is_lp_visible_for_student($id, api_get_user_id())?'':' - ('.get_lang('LPNotVisibleToStudent').')');
$extra = '<br /><font color="#999"><i>'.$dsp_desc .'</i></font>';
}

20
main/newscorm/lp_upload.php
Unescape View File

@ -47,6 +47,15 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && count($_FILES) > 0 && !empty($_FILES
require_once 'learnpath.class.php';
$type = learnpath::get_package_type($_FILES['user_file']['tmp_name'], $_FILES['user_file']['name']);
$proximity = 'local';
if (!empty($_REQUEST['content_proximity'])) {
$proximity = Database::escape_string($_REQUEST['content_proximity']);
}
$maker = 'Scorm';
if (!empty($_REQUEST['content_maker'])) {
$maker = Database::escape_string($_REQUEST['content_maker']);
}
switch ($type) {
case 'scorm':
require_once 'scorm.class.php';
@ -61,11 +70,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && count($_FILES) > 0 && !empty($_FILES
} else {
// Show error message stored in $oScrom->error_msg.
}
$proximity = '';
if (!empty($_REQUEST['content_proximity'])) { $proximity = Database::escape_string($_REQUEST['content_proximity']); }
$maker = '';
if (!empty($_REQUEST['content_maker'])) { $maker = Database::escape_string($_REQUEST['content_maker']); }
$oScorm->set_proximity($proximity);
$oScorm->set_maker($maker);
$oScorm->set_jslib('scorm_api.php');
@ -78,10 +82,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && count($_FILES) > 0 && !empty($_FILES
$oAICC->parse_config_files($config_dir);
$oAICC->import_aicc(api_get_course_id());
}
$proximity = '';
if (!empty($_REQUEST['content_proximity'])) { $proximity = Database::escape_string($_REQUEST['content_proximity']); }
$maker = '';
if (!empty($_REQUEST['content_maker'])) { $maker = Database::escape_string($_REQUEST['content_maker']); }
$oAICC->set_proximity($proximity);
$oAICC->set_maker($maker);
$oAICC->set_jslib('aicc_api.php');
@ -165,4 +165,4 @@ elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
default:
return api_failure::set_failure('not_a_learning_path');
}
}
}

30
main/upload/form.scorm.php
Unescape View File

@ -54,24 +54,21 @@ $form->addElement('hidden', 'tool', $my_tool);
$form->addElement('file','user_file',get_lang('FileToUpload'));
$select_content_marker = &$form->addElement('select','content_maker',get_lang('ContentMaker'));
/*$select_content_marker = &$form->addElement('select','content_maker',get_lang('ContentMaker'));
foreach($content_origins as $index => $origin){
$select_content_marker->addOption($origin,$origin);
}
}*/
unset($content_origins[0]);
unset($content_origins[1]);
/*
$select_content_proximity = &$form->addElement('select','content_proximity',get_lang('ContentProximity'));
$select_content_proximity->addOption(get_lang('Local'),"local");
$select_content_proximity->addOption(get_lang('Remote'),"remote");
$select_content_proximity -> setSelected("local");
if(api_get_setting('search_enabled')=='true')
{
$select_content_proximity->addOption(get_lang('Local'),"local");
$select_content_proximity->addOption(get_lang('Remote'),"remote");
$select_content_proximity -> setSelected("local");
*/
if (api_get_setting('search_enabled')=='true') {
$form -> addElement ('checkbox', 'index_document','', get_lang('SearchFeatureDoIndexDocument'));
$specific_fields = get_specific_field_list();
foreach ($specific_fields as $specific_field) {
$form -> addElement ('text', $specific_field['code'], $specific_field['name'].' : ');
@ -111,15 +108,12 @@ if(is_dir(api_get_path(PLUGIN_PATH)."/pens")) {
}
$form->add_real_progress_bar('uploadScorm','user_file');
// the rules for the form
$form->addRule('user_file', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
// the default values for the form
$defaults = array('index_document'=>'checked="checked"','use_max_score'=>1);
$form->setDefaults($defaults);
$form->display();
$form->display();Display::display_normal_message(Display::tag('strong', get_lang('SupportedScormContentMakers')).': '.implode(', ', $content_origins), false);
// footer
Display::display_footer();
?>
Display::display_footer();

3
main/upload/upload.php
Unescape View File

@ -42,5 +42,4 @@ switch($_SESSION['my_tool']){
default:
require 'upload.document.php';
break;
}
?>
}

2
main/upload/upload.scorm.php
Unescape View File

@ -27,7 +27,7 @@ if ($error=='not_a_learning_path') {
$dialogtype = 'error';
} else {
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) . 'specific_fields_manager.lib.php';
$specific_fields = get_specific_field_list();
foreach ($specific_fields as $specific_field) {

Write Preview
Loading…
Cancel
Save