diff --git a/main/document/create_document.php b/main/document/create_document.php index b897227f74..33317f6245 100755 --- a/main/document/create_document.php +++ b/main/document/create_document.php @@ -339,44 +339,20 @@ $group = array(); // If allowed, add element for document title if (api_get_setting('use_document_title') == 'true') { - //$group[]= $form->add_textfield('title', get_lang('Title'),true,'class="input_titles" id="title"'); - // replace the add_textfield with this $group[]=$form->createElement('text','title',get_lang('Title'),'class="input_titles" id="document_title"'); - - - //$form->applyFilter('title','trim'); - //$form->addRule('title', get_lang('ThisFieldIsRequired'), 'required'); // Added by Ivan Tcholakov, 10-OCT-2009. $form->addElement('hidden', 'filename', '', array('id' => 'filename')); // } else { - //$form->add_textfield('filename', get_lang('FileName'),true,'class="input_titles" id="filename" onblur="javascript: check_if_still_empty();"'); // replace the add_textfield with this - $group[]=$form->createElement('text', 'filename', get_lang('FileName'), 'class="input_titles" id="document_title" onblur="javascript: check_if_still_empty();"'); - - //$form->applyFilter('filename','trim'); - //$form->addRule('filename', get_lang('ThisFieldIsRequired'), 'required'); - //$form->addRule('filename', get_lang('FileExists'), 'callback', 'document_exists'); - + $group[]=$form->createElement('text', 'filename', get_lang('FileName'), 'class="input_titles" id="document_title" onblur="javascript: check_if_still_empty();"'); // Added by Ivan Tcholakov, 10-OCT-2009. $form->addElement('hidden', 'title', '', array('id' => 'title')); - // } -/* -// Selected the file where are save the news documents - -build_directory_selector($folders, $path, $group_properties['directory']); - -$subjects = $folders; - -$form->addElement('select', get_lang('CurrentDirectory'), '', $folders); -*/ - // Show read-only box only in groups if (!empty($_SESSION['_gid'])) { - //$renderer->setElementTemplate('
{element}{label}
', 'readonly'); $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly')); } @@ -406,14 +382,12 @@ if (api_get_setting('use_document_title') == 'true') { $current_session_id = api_get_session_id(); -//$form->addElement('style_submit_button', 'submit', get_lang('SaveDocument'), 'class="save"'); - // HTML-editor $renderer->setElementTemplate('
{element}
', 'content'); $form->add_html_editor('content','', false, false, $html_editor_config); -// Comment-field +// Comment-field $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit); // If we are not in the certificates creation, display a folder chooser for the @@ -515,8 +489,8 @@ if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'], $dir, $curr } } } - //$form->addElement('textarea', 'comment', get_lang('Comment'), array ('rows' => 5, 'cols' => 50)); + if ($is_certificate_mode) $form->addElement('style_submit_button', 'submit', get_lang('CreateCertificate'), 'class="save"'); else @@ -524,26 +498,14 @@ else $form->setDefaults($default); -// HTML -/* -$form->addElement('html','
'); -*/ // If form validates -> save the new document if ($form->validate()) { $values = $form->exportValues(); $readonly = isset($values['readonly']) ? 1 : 0; - $values['title'] = addslashes(trim($values['title'])); - $values['title'] = Security::remove_XSS($values['title']); - $values['title'] = replace_dangerous_char($values['title']); - $values['title'] = disable_dangerous_file($values['title']); - - $values['filename'] = addslashes(trim($values['filename'])); - $values['filename'] = Security::remove_XSS($values['filename']); - $values['filename'] = replace_dangerous_char($values['filename']); - $values['filename'] = disable_dangerous_file($values['filename']); - //die($values['curdirpath']); + $values['title'] = trim($values['title']); + if (!empty($values['curdirpath'])) { $dir = $values['curdirpath']; } @@ -556,9 +518,15 @@ if ($form->validate()) { } else { $values['filename'] = $values['title']; } + + $values['filename'] = addslashes(trim($values['filename'])); + $values['filename'] = Security::remove_XSS($values['filename']); + $values['filename'] = replace_dangerous_char($values['filename']); + $values['filename'] = disable_dangerous_file($values['filename']); + - $filename = $values['filename']; - $title = $values['title']; + $filename = $values['filename']; + $title = $values['title']; $extension = 'html'; $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY); @@ -567,7 +535,6 @@ if ($form->validate()) { $content = str_replace('', ' ', $content); } if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) { - $content = text_filter($content); $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content); // change the path of mp3 to absolute @@ -598,7 +565,7 @@ if ($form->validate()) { $file_size = filesize($filepath.$filename.'.'.$extension); $save_file_path = $dir.$filename.'.'.$extension; - $document_id = add_document($_course, $save_file_path, 'file', $file_size, $filename, null, $readonly); + $document_id = add_document($_course, $save_file_path, 'file', $file_size, $title, null, $readonly); if ($document_id) { api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentAdded', $_user['user_id'], $to_group_id, null, null, null, $current_session_id); // Update parent folders diff --git a/main/document/showinframes.php b/main/document/showinframes.php index 44bc56b8e4..dda5af5464 100755 --- a/main/document/showinframes.php +++ b/main/document/showinframes.php @@ -55,7 +55,7 @@ if (empty($document_data)) { } $header_file = $document_data['path']; -$name_to_show = cut($header_file, 80); +$name_to_show = $document_data['title']; $path_array = explode('/', str_replace('\\', '/', $header_file)); $path_array = array_map('urldecode', $path_array);