diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index ad4fcb0aa3..5e210bf428 100755
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -2184,11 +2184,18 @@ class DocumentManager {
if (!empty($docid)) {
$table_document = Database::get_course_table(TABLE_DOCUMENT);
$params = array();
+
if (!empty($title)) {
$params['title'] = get_document_title($title);
} else {
- $params['title'] = get_document_title($files['file']['name']);
+ if (isset($if_exists) && $if_exists == 'rename') {
+ $new_path = basename($new_path);
+ $params['title'] = get_document_title($new_path);
+ } else {
+ $params['title'] = get_document_title($files['file']['name']);
+ }
}
+
if (!empty($comment)) {
$params['comment'] = trim($comment);
}
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 77d975a3b4..b350fe27e7 100644
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -161,12 +161,15 @@ function process_uploaded_file($uploaded_file, $show_output = true) {
*/
function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upload_path, $user_id, $to_group_id = 0, $to_user_id = null, $maxFilledSpace = '', $unzip = 0, $what_if_file_exists = '', $output = true) {
if (!$user_id) die('Not a valid user.');
-
// Strip slashes
$uploaded_file['name'] = stripslashes($uploaded_file['name']);
// Add extension to files without one (if possible)
- $uploaded_file['name'] = add_ext_on_mime($uploaded_file['name'], $uploaded_file['type']);
+ $uploaded_file['name'] = add_ext_on_mime($uploaded_file['name'], $uploaded_file['type']);
$current_session_id = api_get_session_id();
+
+ if (empty($maxFilledSpace)) {
+ $maxFilledSpace = DocumentManager::get_course_quota();
+ }
// Check if there is enough space to save the file
if (!DocumentManager::enough_space($uploaded_file['size'], $maxFilledSpace)) {
@@ -174,7 +177,7 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
Display::display_error_message(get_lang('UplNotEnoughSpace'));
}
return false;
- }
+ }
// If the want to unzip, check if the file has a .zip (or ZIP,Zip,ZiP,...) extension
if ($unzip == 1 && preg_match('/.zip$/', strtolower($uploaded_file['name']))) {
@@ -185,14 +188,15 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
Display::display_error_message(get_lang('UplNotAZip')." ".get_lang('PleaseTryAgain'));
}
return false;
- } else {
+ } else {
// Clean up the name, only ASCII characters should stay. (and strict)
$clean_name = replace_dangerous_char($uploaded_file['name'], 'strict');
+
// No "dangerous" files
- $clean_name = disable_dangerous_file($clean_name);
+ $clean_name = disable_dangerous_file($clean_name);
if (!filter_extension($clean_name)) {
- if ($output){
+ if ($output) {
Display::display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
}
return false;
@@ -226,7 +230,7 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
$file_size = $uploaded_file['size'];
$files_perm = api_get_permissions_for_new_files();
-
+
// What to do if the target file exists
switch ($what_if_file_exists) {
// Overwrite the file if it exists
@@ -268,7 +272,7 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
return $file_path;
}
} else {
- if ($output){
+ if ($output) {
Display::display_error_message(get_lang('UplUnableToSaveFile'));
}
return false;
@@ -276,11 +280,11 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
break;
// Rename the file if it exists
- case 'rename':
+ case 'rename':
$new_name = unique_name($where_to_save, $clean_name);
$store_path = $where_to_save.$new_name;
$new_file_path = $upload_path.$new_name;
-
+
if (@move_uploaded_file($uploaded_file['tmp_name'], $store_path)) {
chmod($store_path, $files_perm);
@@ -299,13 +303,15 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
}
return $new_file_path;
} else {
- Display::display_error_message(get_lang('UplUnableToSaveFile'));
+ if ($output) {
+ Display::display_error_message(get_lang('UplUnableToSaveFile'));
+ }
return false;
}
break;
// Only save the file if it doesn't exist or warn user if it does exist
- default:
+ default:
if (file_exists($store_path)) {
if ($output) {
Display::display_error_message($clean_name.' '.get_lang('UplAlreadyExists'));
@@ -316,6 +322,7 @@ function handle_uploaded_document($_course, $uploaded_file, $base_work_dir, $upl
// Put the document data in the database
$document_id = add_document($_course, $file_path, 'file', $file_size, $document_name);
+
if ($document_id) {
// Update document item_property
api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentAdded', $user_id, $to_group_id, $to_user_id, null, null, $current_session_id);
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 94bf26cd6c..7282faf919 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -4997,16 +4997,17 @@ class learnpath {
$return_audio .= '';
$audio = '';
+ /*
if (!$update_audio OR $update_audio <> 'true') {
if (!empty ($arrLP[$i]['audio'])) {
$audio .= 'Get the Flash Player to see this player.';
$audio .= '';
$audio .= '';
+ var s1 = new SWFObject("../inc/lib/mediaplayer/player.swf","ply","250","20","9","#FFFFFF");
+ s1.addParam("allowscriptaccess","always");
+ s1.addParam("flashvars","file=../../courses/' . $_course['path'] . '/document/audio/' . $arrLP[$i]['audio'] . '");
+ s1.write("container' . $i . '");
+ ';
} else {
$audio .= '';
}
@@ -5017,12 +5018,14 @@ class learnpath {
$audio .= '
'.Security::remove_XSS($arrLP[$i]['audio']).'
' . get_lang('RemoveAudio');
}
}
- }
+ }*/
$return_audio .= Display::span($icon.' '.$title).Display::tag('td', $audio, array('style'=>''));
$return_audio .= ' | ';
$move_icon = '';
+ $move_item_icon = '';
$edit_icon = '';
$delete_icon = '';
+ $audio_icon = '';$prerequisities_icon = '';
if ($is_allowed_to_edit) {
if (!$update_audio OR $update_audio <> 'true') {
@@ -5046,18 +5049,15 @@ class learnpath {
$delete_icon .= '';
$url = api_get_self() . '?cidReq='.Security::remove_XSS($_GET['cidReq']).'&view=build&id='.$arrLP[$i]['id'] .'&lp_id='.$this->lp_id;
-
- if ($arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] != 'chapter') {
+
+ if (!in_array($arrLP[$i]['item_type'], array('dokeos_chapter', 'dokeos_module', 'dir'))) {
$prerequisities_icon = Display::url(Display::return_icon('accept.png', get_lang('Prerequisites'), array(), ICON_SIZE_TINY), $url.'&action=edit_item_prereq');
+ $move_item_icon = Display::url(Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_TINY), $url.'&action=move_item');
+ $audio_icon = Display::url(Display::return_icon('audio.png', get_lang('Upload'), array(), ICON_SIZE_TINY), $url.'&action=add_audio');
}
-
- //if ($arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] != 'chapter') {
- $moves_icon = Display::url(Display::return_icon('move.png', get_lang('Move'), array(), ICON_SIZE_TINY), $url.'&action=move_item');
- //}
-
}
if ($update_audio != 'true') {
- $row = $move_icon.' '.$icon.Display::span($title_cut).Display::span($audio.$edit_icon.$prerequisities_icon.$moves_icon.$delete_icon, array('class'=>'button_actions'));
+ $row = $move_icon.' '.$icon.Display::span($title_cut).Display::span($audio.$edit_icon.$prerequisities_icon.$move_item_icon.$audio_icon.$delete_icon, array('class'=>'button_actions'));
} else {
$row = Display::span($title.$icon).Display::span($audio, array('class'=>'button_actions'));
}
@@ -5180,16 +5180,15 @@ class learnpath {
$return .= '' . Display :: return_icon('home.png', get_lang('Build'),'',ICON_SIZE_MEDIUM).'';
if ($is_allowed_to_edit) {
-
}
-
-
//$return .= '' . Display :: return_icon('move_learnpath.png', get_lang('BasicOverview'),'',ICON_SIZE_MEDIUM).'';
$return .= '' . Display :: return_icon('view_left_right.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).' ';
$return .= '' . Display :: return_icon('new_learnigpath_object.png', get_lang('NewStep'),'',ICON_SIZE_MEDIUM).'';
// echo '' . Display :: return_icon('add_learnpath_section.png', get_lang('NewChapter'),'',ICON_SIZE_MEDIUM).'';
- $return .= '' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'';
+
+ //$return .= '' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'';
+
$return .= '' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'';
$return .= '';
echo $return;
@@ -9070,6 +9069,8 @@ EOD;
$course_restorer->set_tool_copy_settings(array('learnpaths' => array('reset_dates' => true)));
$course_restorer->restore(api_get_course_id(), api_get_session_id(), false, false);
}
+
+
}
diff --git a/main/newscorm/learnpathItem.class.php b/main/newscorm/learnpathItem.class.php
index b91a35528c..a4eedcd1ea 100644
--- a/main/newscorm/learnpathItem.class.php
+++ b/main/newscorm/learnpathItem.class.php
@@ -1521,8 +1521,7 @@ class learnpathItem {
} else {
if (self::debug > 1) { error_log('New LP - Prerequisite '.$prereqs_string.' complete', 0); }
}
- //error_log('status of document'.$status);
- //var_dump($returnstatus);
+
//$returnstatus = true;
if ($returnstatus && $this->prevent_reinit == 1) {
// I would prefer check in the database.
@@ -1541,7 +1540,6 @@ class learnpathItem {
$status_array = Database :: fetch_row($rs_lp);
$status = $status_array[0];
- //var_dump($status);
$returnstatus = (($status == $this->possible_status[2]) OR ($status == $this->possible_status[3]));
if (!$returnstatus && empty($this->prereq_alert)){
$this->prereq_alert = get_lang('_prereq_not_complete');
@@ -2592,4 +2590,46 @@ class learnpathItem {
if (self::debug > 2) { error_log('New LP - End of learnpathItem::write_to_db()', 0); }
return true;
}
+
+ function add_audio() {
+ $course_info = api_get_course_info();
+ $filepath = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document/';
+
+ if (!is_dir($filepath.'audio')) {
+ mkdir($filepath.'audio', api_get_permissions_for_new_directories());
+ $audio_id = add_document($course_info, '/audio', 'folder', 0, 'audio');
+ api_item_property_update($course_info, TOOL_DOCUMENT, $audio_id, 'FolderCreated', api_get_user_id(), null, null, null, null, api_get_session_id());
+ }
+
+ $key = 'file';
+
+ if (!isset($_FILES[$key]['name']) || !isset($_FILES[$key]['tmp_name'])) {
+ return false;
+ }
+ $result = DocumentManager::upload_document($_FILES, '/audio', null, null, 0, 'rename', false, false);
+ $file_path = null;
+
+ if ($result) {
+ $file_path = basename($result['path']);
+
+ // Store the mp3 file in the lp_item table.
+ $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
+ $sql_insert_audio = "UPDATE $tbl_lp_item SET audio = '".Database::escape_string($file_path)."'
+ WHERE c_id = {$course_info['real_id']} AND id = '".Database::escape_string($this->db_id)."'";
+ Database::query($sql_insert_audio);
+ }
+ return $file_path;
+ }
+
+ function remove_audio() {
+ $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
+ $course_id = api_get_course_int_id();
+ if (empty($this->db_id)) {
+ return false;
+ }
+ $sql = "UPDATE $tbl_lp_item SET audio = '' WHERE c_id = $course_id AND id IN (".$this->db_id.")";
+ Database::query($sql);
+ }
+
+
}
diff --git a/main/newscorm/lp_add_audio.php b/main/newscorm/lp_add_audio.php
new file mode 100644
index 0000000000..76e1ba05e7
--- /dev/null
+++ b/main/newscorm/lp_add_audio.php
@@ -0,0 +1,134 @@
+ - cleaning and update
+ * @author Julio Montoya - Improving the list of templates
+ * @package chamilo.learnpath
+ */
+/**
+ * INIT SECTION
+ */
+
+$this_section = SECTION_COURSES;
+
+api_protect_course_script();
+
+include 'learnpath_functions.inc.php';
+include 'resourcelinker.inc.php';
+
+$language_file = 'learnpath';
+
+/* Constants and variables */
+
+$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
+
+$isStudentView = (int) $_REQUEST['isStudentView'];
+$learnpath_id = (int) $_REQUEST['lp_id'];
+$submit = $_POST['submit_button'];
+
+
+$type = isset($_GET['type']) ? $_GET['type'] : null;
+$action = isset($_GET['action']) ? $_GET['action'] : null;
+
+// Using the resource linker as a tool for adding resources to the learning path.
+if ($action == 'add' && $type == 'learnpathitem') {
+ $htmlHeadXtra[] = "";
+}
+if ((!$is_allowed_to_edit) || ($isStudentView)) {
+ error_log('New LP - User not authorized in lp_add_item.php');
+ header('location:lp_controller.php?action=view&lp_id='.$learnpath_id);
+ exit;
+}
+/* SHOWING THE ADMIN TOOLS */
+
+if (isset($_SESSION['gradebook'])) {
+ $gradebook = $_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook == 'view') {
+ $interbreadcrumb[] = array (
+ 'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+ 'name' => get_lang('ToolGradebook')
+ );
+}
+
+$interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths'));
+$interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => $_SESSION['oLP']->get_name());
+
+switch ($type) {
+ case 'chapter':
+ $interbreadcrumb[]= array ('url' => 'lp_controller.php?action=add_item&type=step&lp_id='.$_SESSION['oLP']->get_id(), 'name' => get_lang('NewStep'));
+ $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewChapter'));
+ break;
+ case 'document':
+ $interbreadcrumb[]= array ('url' => 'lp_controller.php?action=add_item&type=step&lp_id='.$_SESSION['oLP']->get_id(), 'name' => get_lang('NewStep'));
+ break;
+ default:
+ $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewStep'));
+ break;
+}
+
+if ($action == 'add_item' && $type == 'document' ) {
+ $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewDocumentCreated'));
+}
+
+// Theme calls.
+$show_learn_path = true;
+$lp_item_id = isset($_GET['id']) ? intval($_GET['id']) : null;
+if (empty($lp_item_id)) {
+ api_not_allowed();
+}
+
+Display::display_header(null, 'Path');
+
+$suredel = trim(get_lang('AreYouSureToDelete'));
+
+/* DISPLAY SECTION */
+
+echo $_SESSION['oLP']->build_action_menu();
+
+echo '';
+echo '';
+
+echo '
';
+
+echo '