');
//print_r($docs_and_folders);
//echo('');
@@ -804,43 +802,43 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$sortable_data = array();
//while (list($key, $id) = each($docs_and_folders)) {
- foreach ($docs_and_folders as $key=>$id) {
+ foreach ($docs_and_folders as $key => $document_data) {
$row = array();
// If the item is invisible, wrap it in a span with class invisible
- $invisibility_span_open = ($id['visibility'] == 0) ? '' : '';
- $invisibility_span_close = ($id['visibility'] == 0) ? '' : '';
+ $invisibility_span_open = ($document_data['visibility'] == 0) ? '' : '';
+ $invisibility_span_close = ($document_data['visibility'] == 0) ? '' : '';
// Size (or total size of a directory)
- $size = $id['filetype'] == 'folder' ? get_total_folder_size($id['path'], $is_allowed_to_edit) : $id['size'];
+ $size = $document_data['filetype'] == 'folder' ? get_total_folder_size($document_data['path'], $is_allowed_to_edit) : $document_data['size'];
// Get the title or the basename depending on what we're using
- if ($use_document_title == 'true' && $id['title'] != '') {
- $document_name = $id['title'];
+ if ($use_document_title == 'true' && $document_data['title'] != '') {
+ $document_name = $document_data['title'];
} else {
- $document_name = basename($id['path']);
+ $document_name = basename($document_data['path']);
}
// Data for checkbox
if (($is_allowed_to_edit || $group_member_with_upload_rights) && count($docs_and_folders) > 1) {
- $row[] = $id['path'];
+ $row[] = $document_data['path'];
}
// Hide HotPotatoes Certificates and all css folders
- if ($id['path']=='/HotPotatoes_files' || $id['path']=='/certificates' || basename($id['path'])=='css'){
+ if ($document_data['path']=='/HotPotatoes_files' || $document_data['path']=='/certificates' || basename($document_data['path'])=='css'){
continue;
}
//Admin setting for Hide/Show the folders of all users
- if (api_get_setting('show_users_folders') == 'false' && ($id['path']=='/shared_folder' || strstr($id['path'], 'shared_folder_session_'))){
+ if (api_get_setting('show_users_folders') == 'false' && ($document_data['path']=='/shared_folder' || strstr($document_data['path'], 'shared_folder_session_'))){
continue;
}
//Admin setting for Hide/Show Default folders to all users
- if (api_get_setting('show_default_folders') == 'false' && ($id['path']=='/images' || $id['path']=='/flash' || $id['path']=='/audio' || $id['path']=='/video')){
+ if (api_get_setting('show_default_folders') == 'false' && ($document_data['path']=='/images' || $document_data['path']=='/flash' || $document_data['path']=='/audio' || $document_data['path']=='/video')){
continue;
}
//Admin setting for Hide/Show chat history folder
- if (api_get_setting('show_chat_folder') == 'false' && $id['path']=='/chat_files'){
+ if (api_get_setting('show_chat_folder') == 'false' && $document_data['path']=='/chat_files'){
continue;
}
@@ -848,42 +846,40 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$user_link = '';
if (isset($_SESSION['_gid']) && $_SESSION['_gid'] != '') {
- if (!empty($id['insert_user_id'])) {
- $user_info = UserManager::get_user_info_by_id($id['insert_user_id']);
+ if (!empty($document_data['insert_user_id'])) {
+ $user_info = UserManager::get_user_info_by_id($document_data['insert_user_id']);
$user_name = api_get_person_name($user_info['firstname'], $user_info['lastname']);
- $user_link = '';
+ //var_dump($xapian_data); echo '';
$ic_slide->xapian_data = serialize($xapian_data);
$di = new DokeosIndexer();
@@ -1950,7 +1948,7 @@ class DocumentManager {
$di->addChunk($ic_slide);
// Index and return a new search engine document id
$did = $di->index();
- var_dump($did);
+ //var_dump($did);
if ($did) {
// update the search_did on db
$tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
@@ -1994,12 +1992,12 @@ class DocumentManager {
}
}
- // Check for missing images in html files
+ /*// Check for missing images in html files
$missing_files = check_for_missing_files($base_work_dir.$new_path);
if ($missing_files && $show_output) {
// Show a form to upload the missing files
Display::display_normal_message(build_missing_files_form($missing_files, $path, $files['file']['name']), false);
- }
+ }*/
if (!empty($docid) && is_numeric($docid)) {
$document_data = self::get_document_data_by_id($docid, $course_info['code']);
@@ -2041,7 +2039,6 @@ class DocumentManager {
break;
case 'application/msword':
exec("catdoc $doc_path", $output, $ret_val);
- //var_dump($output);
break;
case 'text/html':
exec("html2text $doc_path", $output, $ret_val);
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 6b3a489316..e708a255bc 100755
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -813,7 +813,7 @@ function add_document($_course, $path, $filetype, $filesize, $title, $comment =
*/
function update_existing_document($_course, $document_id, $filesize, $readonly = 0) {
$document_table = Database::get_course_table(TABLE_DOCUMENT, $_course['dbName']);
- $sql = "UPDATE $document_table SET size = '$filesize' , readonly = '$readonly' WHERE id='$document_id'";
+ $sql = "UPDATE $document_table SET size = '$filesize' , readonly = '$readonly' WHERE id = $document_id";
if (Database::query($sql)) {
return true;
} else {
@@ -1355,26 +1355,28 @@ function check_for_missing_files($file) {
function build_missing_files_form($missing_files, $upload_path, $file_name) {
// Do we need a / or not?
$added_slash = ($upload_path == '/') ? '' : '/';
+ $folder_id = DocumentManager::get_document_id(api_get_course_info(), $upload_path);
// Build the form
- $form .= "".get_lang('MissingImagesDetected')."
\n"
- ."\n";
+ ."";
return $form;
}
diff --git a/main/upload/upload.document.php b/main/upload/upload.document.php
index 35b796af90..27beffd2b9 100755
--- a/main/upload/upload.document.php
+++ b/main/upload/upload.document.php
@@ -98,9 +98,8 @@ if(isset($_FILES['user_upload']))
}
}
//missing images are submitted
-if(isset($_POST['submit_image']))
-{
- $number_of_uploaded_images = count($_FILES['img_file']['name']);
+if(isset($_POST['submit_image'])) {
+ $number_of_uploaded_images = count($_FILES['img_file']['name']);
//if images are uploaded
if ($number_of_uploaded_images > 0)
{